[evolution] Updated Serbian translation



commit 0d177b338b2ca6c9fbd35cc3f6edc6c827406121
Author: Мирослав Николић <miroslavnikolic rocketmail com>
Date:   Tue Feb 23 12:16:54 2016 +0100

    Updated Serbian translation

 po/sr.po       | 8593 ++++++++++++++++--------------
 po/sr latin po |16512 +++++++++++++++++++++++++++++++++++---------------------
 2 files changed, 14905 insertions(+), 10200 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index 490539c..fac381d 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1,29 +1,25 @@
 # Serbian translation of evolution
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2012.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2016.
 # This file is distributed under the same license as the evolution package.
-# Maintainer: Игор Несторовић <jung one ekof bg ac yu>
-# Reviewed on 2005-08-22 by Игор Несторовић <igor prevod org>
-# Мирослав Николић <miroslavnikolic rocketmail com>, 2011—2014.
-# Милош Поповић <gpopac gmail com>, 2010, 2015.
-#
-#: ../shell/main.c:522
+# Игор Несторовић <igor prevod org>, 2005.
+# Милош Поповић <gpopac gmail com>, 2010—2015.
+# Мирослав Николић <miroslavnikolic rocketmail com>, 2011—2016.
 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: 2015-09-21 09:44+0000\n"
-"PO-Revision-Date: 2015-09-21 23:01+0200\n"
-"Last-Translator: Милош Поповић <gpopac gmail com>\n"
-"Language-Team: српски <gnome-sr googlegroups org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evoluti";
+"on&keywords=I18N+L10N&component=Miscellaneous\n"
+"POT-Creation-Date: 2016-02-23 05:51+0000\n"
+"PO-Revision-Date: 2016-02-23 12:09+0200\n"
+"Last-Translator: Мирослав Николић <miroslavnikolic rocketmail com>\n"
+"Language-Team: Serbian <gnom prevod org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
-"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
+"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
-"X-Generator: Gtranslator 2.91.6\n"
 
 # мало аориста ;-)
 #: ../addressbook/addressbook.error.xml.h:1
@@ -91,8 +87,8 @@ msgstr "Да обришем адресар „{0}“?"
 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:69
+#: ../addressbook/addressbook.error.xml.h:13 ../calendar/calendar.error.xml.h:7
+#: ../mail/mail.error.xml.h:67
 msgid "Do _Not Delete"
 msgstr "Не _бриши"
 
@@ -109,7 +105,7 @@ msgstr ""
 "да наставите?"
 
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:65
 msgid "_Delete From Server"
 msgstr "_Обриши са сервера"
 
@@ -126,7 +122,6 @@ msgid "Unable to perform search."
 msgstr "Претрага није могућа."
 
 #: ../addressbook/addressbook.error.xml.h:20
-#| msgid "Unable to open address book '{0}'"
 msgid "Failed to refresh address book '{0}'"
 msgstr "Не могу да освежим адресар „{0}“"
 
@@ -198,16 +193,13 @@ msgstr ""
 #: ../addressbook/addressbook.error.xml.h:34
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
 #: ../addressbook/gui/widgets/eab-contact-merging.c:723
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:4
-#: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:19
-#: ../calendar/gui/dialogs/task-page.ui.h:30
+#: ../calendar/gui/e-comp-editor-page-general.c:1357
 #: ../e-util/e-mail-signature-manager.c:327
 #: ../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:57 ../modules/mail/em-composer-prefs.c:417
-#: ../plugins/attachment-reminder/attachment-reminder.c:438
+#: ../mail/mail-config.ui.h:58 ../modules/mail/em-composer-prefs.c:417
+#: ../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
@@ -247,7 +239,7 @@ msgstr ""
 "желите да га додате?"
 
 #: ../addressbook/addressbook.error.xml.h:41
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1252
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1285
 msgid "Failed to delete contact"
 msgstr "Не могу да обришем контакт"
 
@@ -306,9 +298,6 @@ msgid "_Where:"
 msgstr "_Где:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-#: ../calendar/gui/dialogs/event-page.ui.h:16
-#: ../calendar/gui/dialogs/memo-page.ui.h:1
-#: ../calendar/gui/dialogs/task-page.ui.h:27
 msgid "Ca_tegories..."
 msgstr "Ка_тегорије..."
 
@@ -332,7 +321,6 @@ msgid "Telephone"
 msgstr "Телефон"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
-#| msgid "Address"
 msgid "SIP Address"
 msgstr "СИП адреса"
 
@@ -341,7 +329,7 @@ msgid "Instant Messaging"
 msgstr "Тренутне поруке"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../addressbook/importers/evolution-vcard-importer.c:971
+#: ../addressbook/importers/evolution-vcard-importer.c:979
 msgid "Contact"
 msgstr "Контакт"
 
@@ -350,8 +338,7 @@ msgid "_Home Page:"
 msgstr "_Лична страна:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
-#: ../calendar/gui/dialogs/event-page.c:709
-#: ../calendar/gui/dialogs/event-page.ui.h:25
+#: ../calendar/gui/e-comp-editor-event.c:621
 #: ../modules/itip-formatter/itip-view.c:1905
 msgid "_Calendar:"
 msgstr "_Календар:"
@@ -369,7 +356,7 @@ msgid "Home Page:"
 msgstr "Матична страна:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
-#: ../modules/cal-config-google/e-cal-config-google.c:92
+#: ../modules/cal-config-google/e-cal-config-google.c:94
 msgid "Calendar:"
 msgstr "Календар:"
 
@@ -442,14 +429,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:2049
+#: ../calendar/gui/e-calendar-view.c:2037
 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:2048
+#: ../calendar/gui/e-calendar-view.c:2036
 msgid "Birthday"
 msgstr "Рођендан"
 
@@ -505,7 +492,7 @@ msgstr "Посао"
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:83
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:512
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:909
-#: ../calendar/gui/e-cal-model.c:3791
+#: ../calendar/gui/e-cal-model.c:3807
 msgid "Other"
 msgstr "Друго"
 
@@ -514,6 +501,8 @@ msgid "Mailing Address"
 msgstr "Адреса становања"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
+#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
+#: ../mail/vfoldertypes.xml.in.h:53
 msgid "Notes"
 msgstr "Напомене"
 
@@ -527,15 +516,14 @@ 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/dialogs/alarm-list-dialog.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:21
-#: ../calendar/gui/dialogs/task-page.ui.h:31 ../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-name-selector-dialog.c:999 ../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 ../mail/mail-config.ui.h:58
-#: ../plugins/attachment-reminder/attachment-reminder.c:448
+#: ../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-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
+#: ../mail/mail-config.ui.h:59
+#: ../plugins/attachment-reminder/attachment-reminder.c:467
 #: ../plugins/email-custom-header/email-custom-header.c:849
 #: ../plugins/publish-calendar/publish-calendar.c:791
 #: ../plugins/publish-calendar/publish-calendar.ui.h:34
@@ -555,11 +543,10 @@ 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/dialogs/comp-editor.c:1305
+#: ../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:636
-#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3230
+#: ../e-util/e-attachment-store.c:641
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3318
 #: ../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
@@ -573,16 +560,16 @@ msgid "Certificates"
 msgstr "Уверења"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:59
-#: ../calendar/gui/dialogs/comp-editor.c:1277
-#: ../calendar/gui/dialogs/comp-editor.c:1363
-#: ../e-util/e-preferences-window.c:379 ../e-util/e-send-options.ui.h:41
+#: ../calendar/gui/e-comp-editor.c:2000 ../calendar/gui/e-comp-editor.c:2072
+#: ../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:1215 ../shell/e-shell-window-actions.c:955
+#: ../shell/e-shell.c:1223 ../shell/e-shell-window-actions.c:955
 msgid "_Help"
 msgstr "По_моћ"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:60
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:36
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1997
+#: ../mail/mail-config.ui.h:37
 msgid "Options"
 msgstr "Могућности"
 
@@ -599,15 +586,12 @@ msgstr "Могућности"
 #: ../addressbook/gui/widgets/eab-contact-merging.c:474
 #: ../addressbook/gui/widgets/eab-contact-merging.c:718
 #: ../addressbook/gui/widgets/eab-gui-util.c:318
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1332
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:15
-#: ../calendar/gui/dialogs/recurrence-page.c:2326
-#: ../composer/e-composer-actions.c:214 ../e-util/e-activity-bar.c:340
-#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:491
-#: ../e-util/e-attachment-store.c:635 ../e-util/e-attachment-view.c:421
+#: ../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
 #: ../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
@@ -615,15 +599,15 @@ msgstr "Могућности"
 #: ../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
-#: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:776
+#: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:791
 #: ../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:3229
+#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3317
 #: ../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:18
+#: ../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-vfolder-ui.c:148 ../mail/mail-vfolder-ui.c:270
 #: ../modules/backup-restore/evolution-backup-tool.c:899
@@ -643,81 +627,66 @@ msgid "_Cancel"
 msgstr "_Откажи"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
-#| msgid "Telephone"
 msgid "Show Telephone"
 msgstr "Прикажи телефон"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
-#| msgid "_To This Address"
 msgid "Show SIP Address"
 msgstr "Прикажи СИП адресу"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
-#| msgid "Instant Messaging"
 msgid "Show Instant Messaging"
 msgstr "Прикажи брзе поруке"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
-#| msgid "Web Addresses"
 msgid "Show Web Addresses"
 msgstr "Прикажи веб адресе"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:66
-#| msgid "Show the second time zone"
 msgid "Show Job section"
 msgstr "Прикажи одељак са задацима"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:67
-#| msgid "Miscellaneous"
 msgid "Show Miscellaneous"
 msgstr "Прикажи остало"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:68
-#| msgid "Mailing Address"
 msgid "Show Home Mailing Address"
 msgstr "Прикажи кућну адресу е-поште"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:69
-#| msgid "Mailing Address"
 msgid "Show Work Mailing Address"
 msgstr "Прикажи адресу е-поште на послу"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:70
-#| msgid "Mailing Address"
 msgid "Show Other Mailing Address"
 msgstr "Прикажи остале адресе е-поште"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:71
-#| msgid "Show %s"
 msgid "Show Notes"
 msgstr "Прикажи белешке"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:72
-#| msgid "Certificates"
 msgid "Show Certificates"
 msgstr "Прикажи уверења"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:262
-#: ../calendar/gui/dialogs/comp-editor.c:1326
-#: ../e-util/e-html-editor-actions.c:1111
-#| msgid "Undo"
+#: ../calendar/gui/e-comp-editor.c:2035 ../e-util/e-html-editor-actions.c:1111
 msgid "_Undo"
 msgstr "О_позови"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:264
-#: ../calendar/gui/dialogs/comp-editor.c:1328 ../e-util/e-focus-tracker.c:122
+#: ../calendar/gui/e-comp-editor.c:2037 ../e-util/e-focus-tracker.c:122
 msgid "Undo"
 msgstr "Опозови"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:269
-#: ../calendar/gui/dialogs/comp-editor.c:1333
-#: ../e-util/e-html-editor-actions.c:1097
-#| msgid "Redo"
+#: ../calendar/gui/e-comp-editor.c:2042 ../e-util/e-html-editor-actions.c:1097
 msgid "_Redo"
 msgstr "По_нови"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:271
-#: ../calendar/gui/dialogs/comp-editor.c:1335 ../e-util/e-focus-tracker.c:138
+#: ../calendar/gui/e-comp-editor.c:2044 ../e-util/e-focus-tracker.c:138
 msgid "Redo"
 msgstr "Понови"
 
@@ -741,7 +710,6 @@ msgid "Contact Editor - %s"
 msgstr "Уређивач за контакте — %s"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3240
-#| msgid "Certificates"
 msgid "X.509 certificates"
 msgstr "X.509 уверења"
 
@@ -756,18 +724,16 @@ msgid "All files"
 msgstr "Све датотеке"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
-#| msgid "OpenPGP _Key ID:"
 msgid "Open PGP key"
 msgstr "Отворени ПГП кључ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
-#| msgid "Select certificate"
 msgid "Open X.509 certificate"
 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:489 ../e-util/e-category-editor.c:146
+#: ../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-image-chooser-dialog.c:174 ../plugins/face/face.c:298
 #: ../shell/e-shell-utils.c:73 ../smime/gui/certificate-manager.c:956
@@ -776,13 +742,11 @@ msgstr "_Отвори"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3291
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3522
-#| msgid "Choose an iCalendar file"
 msgid "Chosen file is not a local file."
 msgstr "Изабрана датотека није на локалном рачунару."
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3304
 #, c-format
-#| msgid "Failed to import certificate"
 msgid "Failed to load certificate: %s"
 msgstr "Не могу да увезем уверење: %s"
 
@@ -801,13 +765,11 @@ msgid "Save PGP key"
 msgstr "Сачувај ПГП кључ"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3504
-#| msgid "Select certificate"
 msgid "Save X.509 certificate"
 msgstr "Сачувај X.506 уверење"
 
 #: ../addressbook/gui/contact-editor/e-contact-editor.c:3534
 #, c-format
-#| msgid "Failed to import certificate"
 msgid "Failed to save certificate: %s"
 msgstr "Не могу да увезем уверење: %s"
 
@@ -856,16 +818,13 @@ 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/dialogs/alarm-dialog.ui.h:9
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:3
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
-#: ../calendar/gui/dialogs/recurrence-page.c:2327
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:303
 #: ../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-rule-context.c:816 ../e-util/e-rule-editor.c:181
-#: ../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:777
+#: ../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
 #: ../e-util/e-source-selector-dialog.c:373 ../e-util/e-table-config.c:549
 #: ../e-util/e-table-config.ui.h:3 ../e-util/e-timezone-dialog.ui.h:3
@@ -876,7 +835,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:184 ../smime/gui/certificate-manager.c:1338
+#: ../shell/main.c:180 ../smime/gui/certificate-manager.c:1338
 #: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
 msgid "_OK"
 msgstr "У _реду"
@@ -1014,12 +973,12 @@ msgid "_Top"
 msgstr "_Врх"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:14
-#: ../e-util/filter.ui.h:20
+#: ../e-util/e-source-selector.c:3471 ../e-util/filter.ui.h:20
 msgid "_Up"
 msgstr "_Горе"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
-#: ../e-util/filter.ui.h:21
+#: ../e-util/e-source-selector.c:3472 ../e-util/filter.ui.h:21
 msgid "_Down"
 msgstr "До_ле"
 
@@ -1049,22 +1008,22 @@ msgid "Error removing list"
 msgstr "Грешка при уклањању листе"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1195
+#: ../modules/addressbook/e-book-shell-view-actions.c:1221
 msgid "Name contains"
 msgstr "Назив садржи"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1188
+#: ../modules/addressbook/e-book-shell-view-actions.c:1214
 msgid "Email begins with"
 msgstr "Е-пошта почиње са"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1181
-#: ../modules/calendar/e-cal-shell-view-actions.c:1611
-#: ../modules/calendar/e-memo-shell-view-actions.c:733
-#: ../modules/calendar/e-task-shell-view-actions.c:933
+#: ../modules/addressbook/e-book-shell-view-actions.c:1207
+#: ../modules/calendar/e-cal-shell-view-actions.c:1664
+#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-task-shell-view-actions.c:985
 msgid "Any field contains"
 msgstr "Поље које садржи"
 
@@ -1087,22 +1046,22 @@ msgid "Copy _Email Address"
 msgstr "Умножи електронску _адресу"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:151
-#: ../e-util/e-web-view.c:338
+#: ../e-util/e-web-view.c:340
 msgid "Copy the email address to the clipboard"
 msgstr "Умножава адресе у списак исечака"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:156
-#: ../e-util/e-web-view.c:350
+#: ../e-util/e-web-view.c:352
 msgid "_Send New Message To..."
 msgstr "_Пошаљи поруку за..."
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:158
-#: ../e-util/e-web-view.c:352
+#: ../e-util/e-web-view.c:354
 msgid "Send a mail message to this address"
 msgstr "Шаље поруку на ову адресу"
 
 #: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../e-util/e-web-view.c:1064
+#: ../e-util/e-web-view.c:1069
 #, c-format
 msgid "Click to mail %s"
 msgstr "Кликните да пошаљете %s"
@@ -1198,15 +1157,13 @@ msgstr "Видео разговор"
 
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:827
 #: ../e-util/e-send-options.c:546
-#: ../modules/calendar/e-cal-shell-view-actions.c:181
-#: ../modules/calendar/e-cal-shell-view.c:572
+#: ../modules/calendar/e-cal-shell-view-actions.c:199
+#: ../modules/calendar/e-cal-shell-view.c:579
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 msgid "Calendar"
 msgstr "Календар"
 
 #: ../addressbook/gui/widgets/eab-contact-formatter.c:828
-#: ../calendar/gui/dialogs/event-editor.c:115
-#: ../calendar/gui/dialogs/event-editor.c:342
 #: ../plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Слободно/заузето"
@@ -1459,61 +1416,60 @@ msgstr "Претрага је прекинута"
 msgid "Error modifying card"
 msgstr "Грешка при измени карте"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:649
+#: ../addressbook/gui/widgets/e-addressbook-view.c:682
 msgid "Cut selected contacts to the clipboard"
 msgstr "Сече означене контакте у списак исечака"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:655
+#: ../addressbook/gui/widgets/e-addressbook-view.c:688
 msgid "Copy selected contacts to the clipboard"
 msgstr "Умножава означене контакте у списак исечака"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:661
+#: ../addressbook/gui/widgets/e-addressbook-view.c:694
 msgid "Paste contacts from the clipboard"
 msgstr "Убацује контакте из списка исечака"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:667
-#: ../modules/addressbook/e-book-shell-view-actions.c:995
+#: ../addressbook/gui/widgets/e-addressbook-view.c:700
+#: ../modules/addressbook/e-book-shell-view-actions.c:1017
 msgid "Delete selected contacts"
 msgstr "Брише изабране контакте"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:673
+#: ../addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Select all visible contacts"
 msgstr "Означава све видљиве контакте"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1333
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Сигурно желите да обришете ове листе контакта?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1304
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1337
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Сигурно желите да обришете овај списак контакта?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1308
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1341
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Сигурно желите да обришете овај списак контакта (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1314
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1347
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Сигурно желите да обришете ове контакте?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1318
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1351
 msgid "Are you sure you want to delete this contact?"
 msgstr "Сигурно желите да обришете овај контакт?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1322
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1355
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Сигурно желите да обришете овај контакт (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1333
-#: ../calendar/gui/dialogs/comp-editor.c:1270 ../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:1067
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
-#: ../modules/calendar/e-memo-shell-view-actions.c:635
-#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1366
+#: ../calendar/gui/e-comp-editor.c:1993 ../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
 #: ../shell/e-shell-window-actions.c:813
 #: ../smime/gui/certificate-manager.c:1661 ../smime/gui/smime-ui.ui.h:10
@@ -1521,7 +1477,7 @@ msgid "_Delete"
 msgstr "_Обриши"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1480
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1513
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1542,11 +1498,11 @@ msgstr[3] ""
 "Отварање једног контакта ће такође отворити један нови прозор.\n"
 "Да ли заиста желите да прикажете све ове контакте?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1488
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1521
 msgid "_Don't Display"
 msgstr "_Не приказуј"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1489
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1522
 msgid "Display _All Contacts"
 msgstr "Прикажи _све контакте"
 
@@ -1657,7 +1613,7 @@ msgid "Title"
 msgstr "Титула"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:684
+#: ../calendar/gui/e-meeting-list-view.c:659
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Улога"
@@ -1671,10 +1627,9 @@ msgid "Journal"
 msgstr "Дневник"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../calendar/gui/dialogs/event-page.ui.h:20
-#: ../calendar/gui/e-calendar-table.etspec.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:6
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../e-util/e-categories-dialog.c:87
+#: ../calendar/gui/e-memo-table.etspec.h:4
+#: ../calendar/gui/e-task-table.etspec.h:12 ../e-util/e-categories-dialog.c:87
 msgid "Categories"
 msgstr "Категорије"
 
@@ -1722,13 +1677,13 @@ msgstr "У_већај"
 
 #. Zoom-out button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:420
-#: ../mail/e-mail-reader.c:2293
+#: ../mail/e-mail-reader.c:2385
 msgid "Zoom _Out"
 msgstr "У_мањи"
 
 #. Search button
 #: ../addressbook/gui/widgets/e-contact-map-window.c:450
-#: ../e-util/e-html-editor-actions.c:2090
+#: ../e-util/e-html-editor-actions.c:2106
 #: ../e-util/e-html-editor-find-dialog.c:195
 #: ../shell/e-shell-window-actions.c:890
 msgid "_Find"
@@ -1795,49 +1750,49 @@ msgstr ""
 #: ../addressbook/importers/evolution-csv-importer.c:746
 #: ../addressbook/importers/evolution-ldif-importer.c:548
 #: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:430
-#: ../calendar/importers/icalendar-importer.c:925
-#: ../calendar/importers/icalendar-importer.c:964 ../shell/shell.error.xml.h:1
+#: ../calendar/importers/icalendar-importer.c:485
+#: ../calendar/importers/icalendar-importer.c:980
+#: ../calendar/importers/icalendar-importer.c:1019 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Увозим..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1081
+#: ../addressbook/importers/evolution-csv-importer.c:1089
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Аутлук контакти ЦСВ или Таб (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1082
+#: ../addressbook/importers/evolution-csv-importer.c:1090
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Аутлуков увозник ЦСВ и Таб контаката"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1090
+#: ../addressbook/importers/evolution-csv-importer.c:1098
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Мозила контакти ЦСВ или Таб (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1091
+#: ../addressbook/importers/evolution-csv-importer.c:1099
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Мозилин увозник ЦСВ и Таб контаката"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1099
+#: ../addressbook/importers/evolution-csv-importer.c:1107
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Еволуција контакти ЦСВ или Таб (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1100
+#: ../addressbook/importers/evolution-csv-importer.c:1108
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Еволуцијин увозник ЦСВ и Таб контаката"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:806
+#: ../addressbook/importers/evolution-ldif-importer.c:814
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "ЛДАП облик размене података (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:807
+#: ../addressbook/importers/evolution-ldif-importer.c:815
 msgid "Evolution LDIF importer"
 msgstr "Еволуцијин ЛДИФ увозник"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:634
+#: ../addressbook/importers/evolution-vcard-importer.c:642
 msgid "vCard (.vcf, .gcrd)"
 msgstr "вКарта (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:635
+#: ../addressbook/importers/evolution-vcard-importer.c:643
 msgid "Evolution vCard Importer"
 msgstr "Еволуцијин вКарт увозник"
 
@@ -1894,97 +1849,81 @@ msgid "Failed to open client '%s': %s"
 msgstr "Не могу да отворим „%s“: %s"
 
 #: ../addressbook/util/eab-book-util.c:36
-#| msgid "Work Email"
 msgctxt "addressbook-label"
 msgid "Work Email"
 msgstr "Пословна е-пошта"
 
 #: ../addressbook/util/eab-book-util.c:37
-#| msgid "Home Email"
 msgctxt "addressbook-label"
 msgid "Home Email"
 msgstr "Кућна е-пошта"
 
 #: ../addressbook/util/eab-book-util.c:38
-#| msgid "Other Email"
 msgctxt "addressbook-label"
 msgid "Other Email"
 msgstr "Друга е-пошта"
 
 #: ../addressbook/util/eab-book-util.c:44
-#| msgid "Work"
 msgctxt "addressbook-label"
 msgid "Work SIP"
 msgstr "Пословни СИП"
 
 #: ../addressbook/util/eab-book-util.c:45
-#| msgid "Home Page"
 msgctxt "addressbook-label"
 msgid "Home SIP"
 msgstr "Кућни СИП"
 
 #: ../addressbook/util/eab-book-util.c:46
-#| msgid "Other"
 msgctxt "addressbook-label"
 msgid "Other SIP"
 msgstr "Други СИП"
 
 #: ../addressbook/util/eab-book-util.c:74
-#| msgid "AIM"
 msgctxt "addressbook-label"
 msgid "AIM"
 msgstr "АИМ"
 
 #: ../addressbook/util/eab-book-util.c:75
-#| msgid "Jabber"
 msgctxt "addressbook-label"
 msgid "Jabber"
 msgstr "Џабер"
 
 #: ../addressbook/util/eab-book-util.c:76
-#| msgid "Yahoo"
 msgctxt "addressbook-label"
 msgid "Yahoo"
 msgstr "Јаху"
 
 #: ../addressbook/util/eab-book-util.c:77
-#| msgid "Gadu-Gadu"
 msgctxt "addressbook-label"
 msgid "Gadu-Gadu"
 msgstr "Гаду-Гаду"
 
 #: ../addressbook/util/eab-book-util.c:78
-#| msgid "MSN"
 msgctxt "addressbook-label"
 msgid "MSN"
 msgstr "МСН"
 
 #: ../addressbook/util/eab-book-util.c:79
-#| msgid "ICQ"
 msgctxt "addressbook-label"
 msgid "ICQ"
 msgstr "ИЦКу"
 
 #: ../addressbook/util/eab-book-util.c:80
-#| msgid "GroupWise"
 msgctxt "addressbook-label"
 msgid "GroupWise"
 msgstr "ГроупВајз"
 
 #: ../addressbook/util/eab-book-util.c:81
-#| msgid "Skype"
 msgctxt "addressbook-label"
 msgid "Skype"
 msgstr "Скајп"
 
 #: ../addressbook/util/eab-book-util.c:82
-#| msgid "Twitter"
 msgctxt "addressbook-label"
 msgid "Twitter"
 msgstr "Твитер"
 
 #: ../addressbook/util/eab-book-util.c:83
-#| msgid "Google Features"
 msgctxt "addressbook-label"
 msgid "Google Talk"
 msgstr "Гугл ћаскање"
@@ -1994,7 +1933,6 @@ msgstr "Гугл ћаскање"
 #. * this generic label is used instead of one of the predefined labels.
 #.
 #: ../addressbook/util/eab-book-util.c:126
-#| msgid "Email"
 msgctxt "addressbook-label"
 msgid "Email"
 msgstr "Електронска пошта"
@@ -2015,7 +1953,6 @@ msgstr "СИП"
 #. * IM=Instant Messaging
 #.
 #: ../addressbook/util/eab-book-util.c:216
-#| msgid "AIM"
 msgctxt "addressbook-label"
 msgid "IM"
 msgstr "ИМ"
@@ -2025,7 +1962,6 @@ msgstr "ИМ"
 #. * this generic label is used instead of one of the predefined labels.
 #.
 #: ../addressbook/util/eab-book-util.c:271
-#| msgid "Phone"
 msgctxt "addressbook-label"
 msgid "Phone"
 msgstr "Телефон"
@@ -2046,11 +1982,7 @@ msgstr[1] "сата"
 msgstr[2] "сати"
 msgstr[3] "сат"
 
-#. 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/alarm-notify/alarm-notify-dialog.c:131
-#: ../calendar/gui/dialogs/recurrence-page.c:1253
 msgid "day"
 msgid_plural "days"
 msgstr[0] "дан"
@@ -2063,7 +1995,7 @@ msgid "Start time"
 msgstr "Време почетка"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:1
-#: ../calendar/alarm-notify/alarm-queue.c:1924
+#: ../calendar/alarm-notify/alarm-queue.c:1949
 msgid "Appointments"
 msgstr "Заказивања"
 
@@ -2076,16 +2008,13 @@ msgid "_Snooze"
 msgstr "_Дремање"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:4
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1349
-#: ../calendar/gui/dialogs/event-page.ui.h:24
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
-#: ../calendar/gui/dialogs/task-page.ui.h:32
-#: ../e-util/e-html-editor-actions.c:1120
+#: ../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
-#: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:171
-#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:62
-#: ../plugins/attachment-reminder/attachment-reminder.c:443
+#: ../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
@@ -2102,8 +2031,8 @@ msgid "_Dismiss"
 msgstr "_Занемари"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1888
-#: ../calendar/alarm-notify/alarm-queue.c:1898
+#: ../calendar/alarm-notify/alarm-queue.c:1916
+#: ../calendar/alarm-notify/alarm-queue.c:1926
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:248
 #: ../modules/itip-formatter/itip-view.c:1514
 #: ../modules/itip-formatter/itip-view.c:1625
@@ -2121,30 +2050,25 @@ msgstr "Време _дремања:"
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
 #: ../e-util/e-interval-chooser.c:143 ../e-util/filter.ui.h:8
-#: ../modules/calendar/e-cal-shell-view-actions.c:326
+#: ../modules/calendar/e-cal-shell-view-actions.c:344
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "days"
 msgstr "дана"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:11
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:18
 #: ../e-util/e-interval-chooser.c:141 ../e-util/filter.ui.h:7
 msgid "hours"
 msgstr "сати"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:12
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-#: ../calendar/gui/dialogs/event-page.ui.h:19
 #: ../e-util/e-interval-chooser.c:139 ../e-util/filter.ui.h:6
 #: ../mail/e-mail-config-provider-page.c:526
 msgid "minutes"
 msgstr "минута"
 
 #: ../calendar/alarm-notify/alarm-queue.c:1714
-#: ../calendar/alarm-notify/alarm-queue.c:1868
+#: ../calendar/alarm-notify/alarm-queue.c:1896
 msgid "No summary available."
 msgstr "Нема доступног сажетка."
 
@@ -2158,8 +2082,8 @@ msgid "No location information available."
 msgstr "Нема доступног податка о локацији."
 
 #: ../calendar/alarm-notify/alarm-queue.c:1738
-#: ../calendar/alarm-notify/alarm-queue.c:1859
-#: ../calendar/alarm-notify/alarm-queue.c:2214
+#: ../calendar/alarm-notify/alarm-queue.c:1887
+#: ../calendar/alarm-notify/alarm-queue.c:2240
 msgid "Evolution Reminders"
 msgstr "Подсетници Еволуције"
 
@@ -2173,21 +2097,21 @@ msgstr[1] "Имате %d потсетника"
 msgstr[2] "Имате %d потсетника"
 msgstr[3] "Имате један потсетник"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2032
+#: ../calendar/alarm-notify/alarm-queue.c:2058
 msgid "Warning"
 msgstr "Упозорење"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2033 ../mail/mail-dialogs.ui.h:21
+#: ../calendar/alarm-notify/alarm-queue.c:2059 ../mail/mail-dialogs.ui.h:21
 #: ../modules/mailto-handler/evolution-mailto-handler.c:114
 msgid "_No"
 msgstr "_Не"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2034
+#: ../calendar/alarm-notify/alarm-queue.c:2060
 #: ../modules/mailto-handler/evolution-mailto-handler.c:115
 msgid "_Yes"
 msgstr "_Да"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2038
+#: ../calendar/alarm-notify/alarm-queue.c:2064
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -2204,7 +2128,7 @@ msgstr ""
 "\n"
 "Да ли сте сигурни да желите да покренете овај програм?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:2053
+#: ../calendar/alarm-notify/alarm-queue.c:2079
 msgid "Do not ask me about this program again."
 msgstr "Не питај ме поново за овај програм."
 
@@ -2212,7 +2136,7 @@ msgstr "Не питај ме поново за овај програм."
 msgid "invalid time"
 msgstr "неисправно време"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
+#. 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/gui/misc.c:103
 #, c-format
@@ -2223,7 +2147,7 @@ msgstr[1] "%d сата"
 msgstr[2] "%d сати"
 msgstr[3] "Један сат"
 
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
+#. 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/gui/misc.c:109
 #, c-format
@@ -2235,7 +2159,7 @@ msgstr[2] "%d минута"
 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 of appointment"
+#. 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/gui/misc.c:113
@@ -2268,8 +2192,7 @@ msgstr "Не шаљ_и"
 msgid "_Send Notice"
 msgstr "Пошаљи по_дсетник"
 
-#: ../calendar/calendar.error.xml.h:5
-#: ../calendar/gui/dialogs/delete-comp.c:192
+#: ../calendar/calendar.error.xml.h:5 ../calendar/gui/e-cal-dialogs.c:502
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Сигурно желите да обришете овај састанак?"
@@ -2288,8 +2211,7 @@ msgstr ""
 "Уколико не пошаљете обавештење о отказивању, остали учесници можда неће "
 "знати да је задатак обрисан."
 
-#: ../calendar/calendar.error.xml.h:9
-#: ../calendar/gui/dialogs/delete-comp.c:195
+#: ../calendar/calendar.error.xml.h:9 ../calendar/gui/e-cal-dialogs.c:505
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Сигурно желите да обришете овај задатак?"
@@ -2313,8 +2235,7 @@ msgstr ""
 "Уколико не пошаљете обавештење о отказивању, остали учесници можда неће "
 "знати да је белешка обрисана."
 
-#: ../calendar/calendar.error.xml.h:13
-#: ../calendar/gui/dialogs/delete-comp.c:198
+#: ../calendar/calendar.error.xml.h:13 ../calendar/gui/e-cal-dialogs.c:508
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Сигурно желите да обришете ову белешку?"
@@ -2400,8 +2321,7 @@ msgstr "Изменили сте овај састанак, али још нис
 msgid "_Save Changes"
 msgstr "Сачувај из_мене"
 
-#: ../calendar/calendar.error.xml.h:31
-#: ../composer/mail-composer.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:31 ../composer/mail-composer.error.xml.h:13
 msgid "_Discard Changes"
 msgstr "_Одбаци измене"
 
@@ -2441,8 +2361,8 @@ msgstr ""
 "Позивнице ће бити послате ел. поштом свим учесницима и омогућиће им да "
 "одговоре."
 
-#: ../calendar/calendar.error.xml.h:40
-#: ../composer/mail-composer.error.xml.h:13 ../mail/mail.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:40 ../composer/mail-composer.error.xml.h:36
+#: ../mail/mail.error.xml.h:8
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Пошаљи"
@@ -2508,38 +2428,70 @@ msgstr ""
 "задатака буде освежен."
 
 #: ../calendar/calendar.error.xml.h:52
+#| msgid "Would you like to send this task to participants?"
+msgid "Would you like to send this memo to participants?"
+msgstr "Желите ли да пошаљете учесницима ову белешку?"
+
+#: ../calendar/calendar.error.xml.h:53
+#| msgid ""
+#| "Email invitations will be sent to all participants and allow them to "
+#| "accept this task."
+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 meeting information to participants?"
+msgid "Would you like to send updated memo information to participants?"
+msgstr "Желите ли да пошаљете учесницима освежене податке о белешки?"
+
+#: ../calendar/calendar.error.xml.h:55
+#| msgid ""
+#| "Sending updated information allows other participants to keep their task "
+#| "lists up to date."
+msgid ""
+"Sending updated information allows other participants to keep their memo "
+"lists up to date."
+msgstr ""
+"Слање освежених података омогућава осталим учесницима да њихов списак "
+"белешки буде освежен."
+
+#: ../calendar/calendar.error.xml.h:56
 msgid "Editor could not be loaded."
 msgstr "Уређивач није могао бити учитан."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:57
 msgid "Delete calendar '{0}'?"
 msgstr "Да обришем календар „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "Овај календар ће бити трајно уклоњен."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:59
 msgid "Delete task list '{0}'?"
 msgstr "Да обришем списак задатака „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "Овај списак задатака ће бити трајно уклоњен."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:61
 msgid "Delete memo list '{0}'?"
 msgstr "Да обришем списак белешки „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:62
 msgid "This memo list will be removed permanently."
 msgstr "Овај списак белешки ће бити трајно уклоњен."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:63
 msgid "Delete remote calendar '{0}'?"
 msgstr "Да обришем удаљени календар „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:64
 msgid ""
 "This will permanently remove the calendar '{0}' from the server. Are you "
 "sure you want to proceed?"
@@ -2547,11 +2499,11 @@ msgstr ""
 "Ово ће трајно уклонити календар „{0}“ са сервера. Да ли сте сигурни да "
 "желите да наставите?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:66
 msgid "Delete remote task list '{0}'?"
 msgstr "Да обришем удаљени списак задатака „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:67
 msgid ""
 "This will permanently remove the task list '{0}' from the server. Are you "
 "sure you want to proceed?"
@@ -2559,11 +2511,11 @@ msgstr ""
 "Ово ће трајно уклонити списак задатака „{0}“ са сервера. Да ли сте сигурни "
 "да желите да наставите?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:68
 msgid "Delete remote memo list '{0}'?"
 msgstr "Да обришем удаљени списак белешки „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:69
 msgid ""
 "This will permanently remove the memo list '{0}' from the server. Are you "
 "sure you want to proceed?"
@@ -2571,11 +2523,11 @@ msgstr ""
 "Ово ће трајно уклонити списак белешки „{0}“ са сервера. Да ли сте сигурни да "
 "желите да наставите?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:70
 msgid "Are you sure you want to save the appointment without a summary?"
 msgstr "Сигурно желите да сачувате заказивање без сажетка?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:71
 msgid ""
 "Adding a meaningful summary to your appointment will give you an idea of "
 "what your appointment is about."
@@ -2583,11 +2535,11 @@ msgstr ""
 "Ако додате смисаони сажетак вашем заказивању биће вам јасније у вези чега је "
 "ваш састанак."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:72
 msgid "Are you sure you want to save the task without a summary?"
 msgstr "Сигурно желите да сачувате задатак без сажетка?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:73
 msgid ""
 "Adding a meaningful summary to your task will give you an idea of what your "
 "task is about."
@@ -2595,25 +2547,25 @@ msgstr ""
 "Ако додате смисаони сажетак вашем задатку биће вам јасније у вези чега је "
 "ваш задатак."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:74
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "Сигурно желите да сачувате белешку без сажетка?"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:76
 msgid "Error loading calendar '{0}'"
 msgstr "Грешка учитавања календара „{0}“"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:77
 msgid "The calendar is not marked for offline usage."
 msgstr "Овај календар није означен за коришћење ван мреже."
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:78
 msgid "Cannot save event"
 msgstr "Не могу да сачувам догађај"
 
 #. Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:80
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
@@ -2621,12 +2573,12 @@ msgstr ""
 "Календар „{0}“ је само за читање и не може бити измењен. Изаберите други "
 "календар који прихвата заказивање."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:81
 msgid "Cannot save task"
 msgstr "Не могу да сачувам задатак"
 
 #. Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:83
 msgid ""
 "'{0}' does not support assigned tasks, please select a different task list."
 msgstr ""
@@ -2634,236 +2586,240 @@ msgstr ""
 "задатака."
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:85
 msgid "Error loading task list '{0}'"
 msgstr "Грешка учитавања списка задатака „{0}“"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:86
 msgid "The task list is not marked for offline usage."
 msgstr "Списак задатака није означен за коришћење ван мреже."
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:88
 msgid "Error loading memo list '{0}'"
 msgstr "Грешка учитавања списка белешки „{0}“"
 
-#: ../calendar/calendar.error.xml.h:85
+#: ../calendar/calendar.error.xml.h:89
 msgid "The memo list is not marked for offline usage."
 msgstr "Списак белешки није означен за коришћење ван мреже."
 
+#. Translators: {0} is the name of the calendar/memo list/task list.
+#: ../calendar/calendar.error.xml.h:91
+#| msgid "Failed to connect '{0}'"
+msgid "Failed to add timezone to '{0}'"
+msgstr "Нисам успео да додам временску зону у „{0}“"
+
+#. The {0} is a calendar/memo list/task list name, which is useless here
+#: ../calendar/calendar.error.xml.h:93
+#| msgid "Could not save attachments"
+msgid "Failed to save attachments"
+msgstr "Нисам успео да сачувам прилоге"
+
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:87
-#| msgid "Failed to copy an event into the calendar '{0}'"
+#: ../calendar/calendar.error.xml.h:95
 msgid "Failed to open calendar '{0}'"
 msgstr "Не могу да отворим календар „{0}“"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:89
-#| msgid "Failed to copy a memo into the memo list '{0}'"
+#: ../calendar/calendar.error.xml.h:97
 msgid "Failed to open memo list '{0}'"
 msgstr "Не могу да отворим списак белешки „{0}“"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:91
-#| msgid "Failed to copy a task into the task list '{0}'"
+#: ../calendar/calendar.error.xml.h:99
 msgid "Failed to open task list '{0}'"
 msgstr "Не могу да отворим списак задатака „{0}“"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:93
-#| msgid "Failed to copy an event into the calendar '{0}'"
+#: ../calendar/calendar.error.xml.h:101
 msgid "Failed to create an event in the calendar '{0}'"
 msgstr "Не могу да направим догађај у календару „{0}“"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:95
-#| msgid "Failed to copy a memo into the memo list '{0}'"
+#: ../calendar/calendar.error.xml.h:103
 msgid "Failed to create a memo in the memo list '{0}'"
 msgstr "Не могу да направим белешку у списку белешки „{0}“"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:97
-#| msgid "Failed to copy a task into the task list '{0}'"
+#: ../calendar/calendar.error.xml.h:105
 msgid "Failed to create a task in the task list '{0}'"
 msgstr "Не могу да направим задатак у списак задатака „{0}“"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:99
-#| msgid "Failed to move an event into the calendar '{0}'"
+#: ../calendar/calendar.error.xml.h:107
 msgid "Failed to modify an event in the calendar '{0}'"
 msgstr "Не могу да изменим догађај у календару „{0}“"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:101
-#| msgid "Failed to move a memo into the memo list '{0}'"
+#: ../calendar/calendar.error.xml.h:109
 msgid "Failed to modify a memo in the memo list '{0}'"
 msgstr "Не могу да изменим белешку у списку белешки „{0}“"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:103
-#| msgid "Failed to move a task into the task list '{0}'"
+#: ../calendar/calendar.error.xml.h:111
 msgid "Failed to modify a task in the task list '{0}'"
 msgstr "Не могу да изменим задатак у списку задатака „{0}“"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:105
-#| msgid "Failed to move an event into the calendar '{0}'"
+#: ../calendar/calendar.error.xml.h:113
 msgid "Failed to delete an event in the calendar '{0}'"
 msgstr "Не могу да обришем догађај из календара „{0}“"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:107
-#| msgid "Failed to move a memo into the memo list '{0}'"
+#: ../calendar/calendar.error.xml.h:115
 msgid "Failed to delete a memo in the memo list '{0}'"
 msgstr "Не могу да обришем белешку из списка белешки „{0}“"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:109
-#| msgid "Failed to move a task into the task list '{0}'"
+#: ../calendar/calendar.error.xml.h:117
 msgid "Failed to delete a task in the task list '{0}'"
 msgstr "Не могу да обришем задатак из списка задатака „{0}“"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:111
-#| msgid "Failed to move an event into the calendar '{0}'"
+#: ../calendar/calendar.error.xml.h:119
 msgid "Failed to update an event in the calendar '{0}'"
 msgstr "Не могу да ажурирам догађај из календара „{0}“"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:113
-#| msgid "Failed to move a memo into the memo list '{0}'"
+#: ../calendar/calendar.error.xml.h:121
 msgid "Failed to update a memo in the memo list '{0}'"
 msgstr "Не могу да ажурирам белешку из списка белешки „{0}“"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:115
-#| msgid "Failed to move a task into the task list '{0}'"
+#: ../calendar/calendar.error.xml.h:123
 msgid "Failed to update a task in the task list '{0}'"
 msgstr "Не могу да ажурирам задатак из списка задатака „{0}“"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:117
-#| msgid "Failed to move an event into the calendar '{0}'"
+#: ../calendar/calendar.error.xml.h:125
 msgid "Failed to send an event to the calendar '{0}'"
 msgstr "Не могу да пошаљем догађај у календар „{0}“"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:119
-#| msgid "Failed to move a memo into the memo list '{0}'"
+#: ../calendar/calendar.error.xml.h:127
 msgid "Failed to send a memo to the memo list '{0}'"
 msgstr "Не могу да пошаљем белешку у списак белешки „{0}“"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:121
-#| msgid "Failed to move a task into the task list '{0}'"
+#: ../calendar/calendar.error.xml.h:129
 msgid "Failed to send a task to the task list '{0}'"
 msgstr "Не могу да пошаљем пошаљем задатак у списак задатака „{0}“"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:123
-#| msgid "Error loading calendar '{0}'"
+#: ../calendar/calendar.error.xml.h:131
 msgid "Error creating view for the calendar '{0}'"
 msgstr "Грешка у приказивању календара „{0}“"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:125
-#| msgid "Error loading task list '{0}'"
+#: ../calendar/calendar.error.xml.h:133
 msgid "Error creating view for the task list '{0}'"
 msgstr "Грешка у приказивању списка задатака „{0}“"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:127
-#| msgid "Error loading memo list '{0}'"
+#: ../calendar/calendar.error.xml.h:135
 msgid "Error creating view for the memo list '{0}'"
 msgstr "Грешка у приказивању списка белешки „{0}“"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:129
+#: ../calendar/calendar.error.xml.h:137
 msgid "Failed to copy an event into the calendar '{0}'"
 msgstr "Не могу да умножим догађај у календар „{0}“"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:131
+#: ../calendar/calendar.error.xml.h:139
 msgid "Failed to copy a task into the task list '{0}'"
 msgstr "Не могу да умножим задатак у списак задатака „{0}“"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:133
+#: ../calendar/calendar.error.xml.h:141
 msgid "Failed to copy a memo into the memo list '{0}'"
 msgstr "Не могу да умножим белешку у списак белешки „{0}“"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:135
+#: ../calendar/calendar.error.xml.h:143
 msgid "Failed to move an event into the calendar '{0}'"
 msgstr "Не могу да преместим догађај у календар „{0}“"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:137
+#: ../calendar/calendar.error.xml.h:145
 msgid "Failed to move a task into the task list '{0}'"
 msgstr "Не могу да преместим задатак у списак задатака „{0}“"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:139
+#: ../calendar/calendar.error.xml.h:147
 msgid "Failed to move a memo into the memo list '{0}'"
 msgstr "Нисам успео преместим белешку у списак белешки „{0}“"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:141
+#: ../calendar/calendar.error.xml.h:149
+#| msgid "Failed to send an event to the calendar '{0}'"
+msgid "Failed to get an event from the calendar '{0}'"
+msgstr "Нисам успео да добавим догађај из календара „{0}“"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:151
+#| msgid "Failed to send a task to the task list '{0}'"
+msgid "Failed to get a task from the task list '{0}'"
+msgstr "Нисам успео да добавим задатак са списка задатака „{0}“"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:153
+#| msgid "Failed to send a memo to the memo list '{0}'"
+msgid "Failed to get a memo from the memo list '{0}'"
+msgstr "Нисам успео да добавим белешку са списка белешки „{0}“"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:155
 msgid "Copying an event into the calendar '{0}'"
 msgstr "Умножавам догађај у календар „{0}“"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:143
+#: ../calendar/calendar.error.xml.h:157
 msgid "Copying a task into the task list '{0}'"
 msgstr "Умножавам задатак у списак задатака „{0}“"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:145
+#: ../calendar/calendar.error.xml.h:159
 msgid "Copying a memo into the memo list '{0}'"
 msgstr "Умножавам белешку у списак белешки „{0}“"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:147
+#: ../calendar/calendar.error.xml.h:161
 msgid "Moving an event into the calendar '{0}'"
 msgstr "Премештам догађај у календар „{0}“"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:149
+#: ../calendar/calendar.error.xml.h:163
 msgid "Moving a task into the task list '{0}'"
 msgstr "Премештам задатак у списак задатака „{0}“"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:151
+#: ../calendar/calendar.error.xml.h:165
 msgid "Moving a memo into the memo list '{0}'"
 msgstr "Премештам белешку у списак белешки „{0}“"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:153
-#| msgid "Delete remote calendar '{0}'?"
+#: ../calendar/calendar.error.xml.h:167
 msgid "Failed to refresh calendar '{0}'"
 msgstr "Не могу да освежим календар „{0}“?"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:155
-#| msgid "Failed to move a task into the task list '{0}'"
+#: ../calendar/calendar.error.xml.h:169
 msgid "Failed to refresh task list '{0}'"
 msgstr "Не могу да освежим списак задатака „{0}“"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:157
-#| msgid "Failed to move a memo into the memo list '{0}'"
+#: ../calendar/calendar.error.xml.h:171
 msgid "Failed to refresh memo list '{0}'"
 msgstr "Не могу да освежим списак белешки „{0}“"
 
-#: ../calendar/calendar.error.xml.h:158
-#| msgid "Make this Occurrence _Movable"
+#: ../calendar/calendar.error.xml.h:172
 msgid "Failed to make an occurrence movable"
 msgstr "Не могу да направим ову појаву покретном"
 
-#: ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/e-calendar-table.etspec.h:4
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-task-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:1
 #: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:375
 msgid "Summary"
 msgstr "Сажетак"
@@ -2882,7 +2838,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:527 ../e-util/e-table-config.ui.h:7
+#: ../e-util/e-attachment-tree-view.c:533 ../e-util/e-table-config.ui.h:7
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Description"
 msgstr "Опис"
@@ -2908,26 +2864,22 @@ msgstr "је"
 msgid "is not"
 msgstr "није"
 
-#. To Translators: This is task classification
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2
-#: ../calendar/gui/e-cal-list-view.c:246 ../calendar/gui/e-cal-model.c:306
-#: ../calendar/gui/e-cal-model.c:313 ../calendar/gui/e-task-table.c:498
-#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:305 ../calendar/gui/e-cal-model.c:312
+#: ../calendar/gui/e-task-table.c:498 ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "Јавно"
 
-#. To Translators: This is task classification
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4
-#: ../calendar/gui/e-cal-list-view.c:247 ../calendar/gui/e-cal-model.c:315
-#: ../calendar/gui/e-task-table.c:499 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:314 ../calendar/gui/e-task-table.c:499
+#: ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "Лично"
 
-#. To Translators: This is task classification
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
-#: ../calendar/gui/e-cal-list-view.c:248 ../calendar/gui/e-cal-model.c:317
-#: ../calendar/gui/e-task-table.c:500 ../calendar/gui/memotypes.xml.h:12
-#: ../e-util/e-html-editor-page-dialog.c:117 ../e-util/e-send-options.ui.h:7
+#: ../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
+#: ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Поверљиво"
 
@@ -2942,8 +2894,8 @@ msgstr "Организатор"
 msgid "Attendee"
 msgstr "Учесник"
 
-#: ../calendar/gui/caltypes.xml.h:14
-#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../mail/message-list.etspec.h:14
 #: ../plugins/publish-calendar/publish-calendar.c:862
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
 #: ../plugins/save-calendar/csv-format.c:389
@@ -2956,29 +2908,27 @@ msgid "Category"
 msgstr "Категорија"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
+#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:51
 #: ../em-format/e-mail-formatter-print-headers.c:157
-#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
-#: ../mail/vfoldertypes.xml.in.h:48
+#: ../mail/filtertypes.xml.in.h:47 ../mail/searchtypes.xml.in.h:49
+#: ../mail/vfoldertypes.xml.in.h:50
 msgid "Attachments"
 msgstr "Прилози"
 
 #: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:46
-#: ../mail/searchtypes.xml.in.h:48 ../mail/vfoldertypes.xml.in.h:49
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:48
+#: ../mail/searchtypes.xml.in.h:50 ../mail/vfoldertypes.xml.in.h:51
 msgid "Exist"
 msgstr "Постоји"
 
 #: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:47
-#: ../mail/searchtypes.xml.in.h:49 ../mail/vfoldertypes.xml.in.h:50
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:49
+#: ../mail/searchtypes.xml.in.h:51 ../mail/vfoldertypes.xml.in.h:52
 msgid "Do Not Exist"
 msgstr "Не постоји"
 
 #: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/dialogs/event-editor.c:309
-#: ../calendar/gui/dialogs/event-editor.c:330
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:15
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2004
 msgid "Recurrence"
 msgstr "Понављање"
 
@@ -3008,1308 +2958,23 @@ msgstr "Сажетак садржи"
 msgid "Description Contains"
 msgstr "Описи"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:668
-msgid "Edit Reminder"
-msgstr "Уреди подсетник"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:896
-#: ../calendar/gui/e-alarm-list.c:424
-msgid "Pop up an alert"
-msgstr "Искачуће упозорење"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:897
-#: ../calendar/gui/e-alarm-list.c:420
-msgid "Play a sound"
-msgstr "Пушта звук"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:898
-#: ../calendar/gui/e-alarm-list.c:432
-msgid "Run a program"
-msgstr "Покреће програм"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:899
-#: ../calendar/gui/e-alarm-list.c:428
-msgid "Send an email"
-msgstr "Шаље електронску поруку"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:908
-msgid "before"
-msgstr "пре"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:909
-msgid "after"
-msgstr "после"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:918
-msgid "start of appointment"
-msgstr "заказани почетак"
-
-#: ../calendar/gui/dialogs/alarm-dialog.c:919
-msgid "end of appointment"
-msgstr "крај састанка"
-
-# bug: plural-forms
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "minute(s)"
-msgstr "минут(и)"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-msgid "hour(s)"
-msgstr "сат(и)"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
-msgid "day(s)"
-msgstr "дан(и)"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
-msgid "Add Reminder"
-msgstr "Додај подсетник"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
-#: ../calendar/gui/dialogs/event-editor.c:352
-msgid "Reminder"
-msgstr "Подсетник"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
-msgid "Repeat"
-msgstr "Понови"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the reminder"
-msgstr "По_нови подсетник"
-
-#. This is part of the sentence:
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
-msgid "extra times every"
-msgstr "прикажи још на сваких"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-msgid "Custom _message"
-msgstr "Произвољна _порука"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
-msgid "Mes_sage:"
-msgstr "По_рука:"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
-msgid "Custom reminder sound"
-msgstr "Произвољан звук подсетника"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
-msgid "_Sound:"
-msgstr "_Звук:"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
-msgid "Select A File"
-msgstr "Изаберите датотеку"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-msgid "_Program:"
-msgstr "_Програм:"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-msgid "_Arguments:"
-msgstr "_Аргументи:"
-
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-msgid "Send To:"
-msgstr "Пошаљи:"
-
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:239
-msgid "Action/Trigger"
-msgstr "Радња/покретач"
-
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
-#: ../calendar/gui/dialogs/event-page.ui.h:28
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
-msgid "Reminders"
-msgstr "Подсетници"
-
-#: ../calendar/gui/dialogs/changed-comp.c:59
-msgid "This event has been deleted."
-msgstr "Овај догађај је обрисан."
-
-#: ../calendar/gui/dialogs/changed-comp.c:63
-msgid "This task has been deleted."
-msgstr "Овај задатак је обрисан."
-
-#: ../calendar/gui/dialogs/changed-comp.c:67
-msgid "This memo has been deleted."
-msgstr "Ова белешка је обрисана."
-
-#: ../calendar/gui/dialogs/changed-comp.c:77
-#, c-format
-msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr ""
-"%s  Начинили сте измене. Да занемарим те измене и да затворим уређивач?"
-
-#: ../calendar/gui/dialogs/changed-comp.c:79
-#, c-format
-msgid "%s  You have made no changes, close the editor?"
-msgstr "%s  Нисте начинили измене, да затворим уређивач?"
-
-#: ../calendar/gui/dialogs/changed-comp.c:84
-msgid "This event has been changed."
-msgstr "Овај догађај је измењен."
-
-#: ../calendar/gui/dialogs/changed-comp.c:88
-msgid "This task has been changed."
-msgstr "Овај задатак је измењен."
-
-#: ../calendar/gui/dialogs/changed-comp.c:92
-msgid "This memo has been changed."
-msgstr "Ова белешка је измењена."
-
-#: ../calendar/gui/dialogs/changed-comp.c:102
-#, c-format
-msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr "%s  Начинили сте измене. Да занемарим те измене и да освежим уређивач?"
-
-#: ../calendar/gui/dialogs/changed-comp.c:104
-#, c-format
-msgid "%s  You have made no changes, update the editor?"
-msgstr "%s  Нисте начинили измене, да освежим уређивач?"
-
-#: ../calendar/gui/dialogs/comp-editor.c:299
-msgid "Could not save attachments"
-msgstr "Не могу да сачувам прилоге"
-
-#: ../calendar/gui/dialogs/comp-editor.c:653
-msgid "Could not update object"
-msgstr "Не могу да освежим објекат"
-
-#: ../calendar/gui/dialogs/comp-editor.c:787
-msgid "Edit Appointment"
-msgstr "Уреди заказивање"
-
-#: ../calendar/gui/dialogs/comp-editor.c:794
-#, c-format
-msgid "Meeting - %s"
-msgstr "Састанак — %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:796
-#, c-format
-msgid "Appointment - %s"
-msgstr "Заказивање — %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:802
-#, c-format
-msgid "Assigned Task - %s"
-msgstr "Додељен задатак — %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:804
-#, c-format
-msgid "Task - %s"
-msgstr "Задатак — %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:809
-#, c-format
-msgid "Memo - %s"
-msgstr "Белешка — %s"
-
-#: ../calendar/gui/dialogs/comp-editor.c:825
-msgid "No Summary"
-msgstr "Без сажетка"
-
-#: ../calendar/gui/dialogs/comp-editor.c:946
-msgid "Keep original item?"
-msgstr "Задржати оригиналну ставку?"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1109
-#: ../calendar/gui/dialogs/comp-editor.c:1137
-msgid "Unable to synchronize with the server"
-msgstr "Не могу да се усагласим са сервером"
-
-#. == Button box ==
-#: ../calendar/gui/dialogs/comp-editor.c:1249
-#: ../calendar/gui/dialogs/event-editor.c:116
-#: ../calendar/gui/dialogs/event-editor.c:310
-#: ../calendar/gui/dialogs/event-page.ui.h:29
-#: ../composer/e-composer-actions.c:334 ../e-util/e-html-editor-dialog.c:196
-#: ../e-util/e-mail-signature-editor.c:295
-#: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:388
-#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:127
-#: ../mail/em-folder-properties.c:688 ../mail/em-subscription-editor.c:1759
-#: ../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:2066
-msgid "_Close"
-msgstr "_Затвори"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1251
-msgid "Close the current window"
-msgstr "Затворите тренутни прозор"
-
-#. copy menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1256 ../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:377 ../mail/e-mail-browser.c:134
-#: ../mail/mail.error.xml.h:141 ../shell/e-shell-window-actions.c:799
-msgid "_Copy"
-msgstr "_Умножи"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1258 ../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:379
-#: ../e-util/e-web-view.c:1415 ../mail/e-mail-browser.c:136
-#: ../shell/e-shell-window-actions.c:801
-msgid "Copy the selection"
-msgstr "Умножите изабрано"
-
-#. cut menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1263 ../e-util/e-focus-tracker.c:770
-#: ../e-util/e-html-editor-actions.c:1083 ../e-util/e-text.c:2095
-#: ../mail/e-mail-browser.c:141 ../shell/e-shell-window-actions.c:806
-msgid "Cu_t"
-msgstr "_Исеци"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1265 ../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:1409
-#: ../mail/e-mail-browser.c:143 ../shell/e-shell-window-actions.c:808
-msgid "Cut the selection"
-msgstr "Исеците изабрано"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1272 ../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/dialogs/comp-editor.c:1279
-msgid "View help"
-msgstr "Погледај помоћ"
-
-#. paste menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1284 ../e-util/e-focus-tracker.c:780
-#: ../e-util/e-html-editor-actions.c:1090 ../e-util/e-text.c:2121
-#: ../mail/e-mail-browser.c:148 ../shell/e-shell-window-actions.c:834
-msgid "_Paste"
-msgstr "_Убаци"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1286 ../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:1421
-#: ../mail/e-mail-browser.c:150 ../shell/e-shell-window-actions.c:836
-msgid "Paste the clipboard"
-msgstr "Убаците из списка исечака"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1291
-#: ../composer/e-composer-actions.c:388 ../mail/e-mail-reader.c:2195
-#: ../modules/addressbook/e-book-shell-view-actions.c:1205
-#: ../modules/addressbook/e-book-shell-view-actions.c:1219
-msgid "_Print..."
-msgstr "_Штампај..."
-
-#: ../calendar/gui/dialogs/comp-editor.c:1298 ../mail/e-mail-reader.c:2202
-#: ../modules/addressbook/e-book-shell-view-actions.c:1212
-#: ../modules/calendar/e-cal-shell-view-actions.c:1642
-#: ../modules/calendar/e-memo-shell-view-actions.c:764
-#: ../modules/calendar/e-task-shell-view-actions.c:964
-msgid "Pre_view..."
-msgstr "_Преглед..."
-
-#: ../calendar/gui/dialogs/comp-editor.c:1307
-msgid "Save current changes"
-msgstr "Сачувајте текуће измене"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1312
-#: ../e-util/e-mail-signature-editor.c:304
-msgid "Save and Close"
-msgstr "Сачувај и затвори"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1314
-msgid "Save current changes and close editor"
-msgstr "Сачувајте текуће измене и затворите уређивач"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1319 ../e-util/e-focus-tracker.c:790
-#: ../e-util/e-html-editor-actions.c:1104 ../e-util/e-web-view.c:387
-#: ../mail/e-mail-browser.c:155 ../shell/e-shell-window-actions.c:911
-msgid "Select _All"
-msgstr "Изабери _све"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1321 ../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:157 ../shell/e-shell-window-actions.c:913
-msgid "Select all text"
-msgstr "Изаберите сав текст"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1342
-msgid "_Classification"
-msgstr "_Разврставање"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1356
-#: ../e-util/e-html-editor-actions.c:1127
-#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:164
-#: ../shell/e-shell-window-actions.c:948
-msgid "_File"
-msgstr "_Датотека"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1370
-#: ../e-util/e-html-editor-actions.c:1148
-msgid "_Insert"
-msgstr "_Уметни"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1377
-#: ../composer/e-composer-actions.c:378
-msgid "_Options"
-msgstr "_Могућности"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1384
-#: ../e-util/e-html-editor-actions.c:1169 ../mail/e-mail-browser.c:178
-#: ../shell/e-shell-window-actions.c:991
-#: ../smime/gui/certificate-manager.c:1651 ../smime/gui/smime-ui.ui.h:5
-msgid "_View"
-msgstr "П_реглед"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1394
-#: ../composer/e-composer-actions.c:327
-msgid "_Attachment..."
-msgstr "_Прилог..."
-
-#: ../calendar/gui/dialogs/comp-editor.c:1396
-#: ../composer/e-composer-actions.c:329 ../e-util/e-attachment-view.c:463
-msgid "Attach a file"
-msgstr "Приложите датотеку"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1404
-msgid "_Categories"
-msgstr "_Категорије"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1406
-msgid "Toggles whether to display categories"
-msgstr "Пребацује приказивање категорија"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1412
-msgid "Time _Zone"
-msgstr "Временска _зона"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1414
-msgid "Toggles whether the time zone is displayed"
-msgstr "Пребацује приказивање временске зоне"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1423
-msgid "Pu_blic"
-msgstr "_Јавно"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1425
-msgid "Classify as public"
-msgstr "Означите као јавно"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1430
-msgid "_Private"
-msgstr "Л_ично"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1432
-msgid "Classify as private"
-msgstr "Означите као лично"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1437
-msgid "_Confidential"
-msgstr "Пове_рљиво"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1439
-msgid "Classify as confidential"
-msgstr "Означите као поверљиво"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1447
-msgid "R_ole Field"
-msgstr "Поље _улоге"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1449
-msgid "Toggles whether the Role field is displayed"
-msgstr "Пребацује приказивање поља Улога"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1455
-msgid "_RSVP"
-msgstr "_Молим одговорите"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1457
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Пребацује приказивање поља Молим одговорите"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1463
-msgid "_Status Field"
-msgstr "Поље _стања"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1465
-msgid "Toggles whether the Status field is displayed"
-msgstr "Пребацује приказивање поља Стања"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1471
-msgid "_Type Field"
-msgstr "Поље _типа"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1473
-msgid "Toggles whether the Attendee Type is displayed"
-msgstr "Пребацује приказивање поља Типа"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2596
-#: ../composer/e-composer-actions.c:612
-msgid "Attach"
-msgstr "Приложи"
-
-#: ../calendar/gui/dialogs/comp-editor.c:2926
-#: ../calendar/gui/dialogs/comp-editor.c:3512
-#: ../calendar/gui/dialogs/comp-editor.c:4525
-msgid "Changes made to this item may be discarded if an update arrives"
-msgstr ""
-"Промене начињене на овој ставки могу бити занемарене ако буде ажурирано"
-
-#: ../calendar/gui/dialogs/comp-editor.c:4487
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
-msgid "attachment"
-msgstr "прилог"
-
-#: ../calendar/gui/dialogs/comp-editor.c:4557
-msgid "Unable to use current version!"
-msgstr "Не могу да користим тренутно издање!"
-
-#: ../calendar/gui/dialogs/comp-editor-page.c:440
-#, c-format
-msgid "Validation error: %s"
-msgstr "Грешка провере: %s"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:129
-#: ../calendar/gui/e-cal-ops.c:1968
-msgid "Destination is read only"
-msgstr "Одредиште је само за читање"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:209
-#, c-format
-#| msgid "Copying an event into the calendar %s"
-msgid "Copying events to the calendar '%s'"
-msgstr "Умножавам догађаје у календар „%s“"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:215
-#, c-format
-#| msgid "Copying a memo into the memo list '{0}'"
-msgid "Copying memos to the memo list '%s'"
-msgstr "Умножавам белешке у списак белешки „%s“"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:221
-#, c-format
-#| msgid "Copying a task into the task list '{0}'"
-msgid "Copying tasks to the task list '%s'"
-msgstr "Умножавам задатке у списак задатака „%s“"
-
-#: ../calendar/gui/dialogs/delete-comp.c:215
-msgid "_Delete this item from all other recipient's mailboxes?"
-msgstr ""
-"Да ли да _избришем ову ставку из свих осталих поштанских сандучића примаоца?"
-
-#: ../calendar/gui/dialogs/delete-comp.c:218
-msgid "_Retract comment"
-msgstr "_Увуци коментар"
-
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
-msgid "Enter Delegate"
-msgstr "Унеси делегата"
-
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:4
-msgid "Delegate To:"
-msgstr "Делегирај на:"
-
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:5
-msgid "Contacts..."
-msgstr "Контакти..."
-
-#: ../calendar/gui/dialogs/event-editor.c:204
-msgid "_Reminders"
-msgstr "_Подсетници"
-
-#: ../calendar/gui/dialogs/event-editor.c:206
-msgid "Set or unset reminders for this event"
-msgstr "Поставља или искључује подсетнике за овај догађај"
-
-#: ../calendar/gui/dialogs/event-editor.c:214
-msgid "Show Time as _Busy"
-msgstr "Прикажи време као _заузето"
-
-#: ../calendar/gui/dialogs/event-editor.c:216
-msgid "Toggles whether to show time as busy"
-msgstr "Пребацује приказивање времена као заузето"
-
-#: ../calendar/gui/dialogs/event-editor.c:225
-msgid "_Recurrence"
-msgstr "_Понављање"
-
-#: ../calendar/gui/dialogs/event-editor.c:227
-msgid "Make this a recurring event"
-msgstr "Нека се овај догађај понавља"
-
-#: ../calendar/gui/dialogs/event-editor.c:232 ../e-util/e-send-options.ui.h:14
-msgid "Send Options"
-msgstr "Опције слања"
-
-#: ../calendar/gui/dialogs/event-editor.c:234
-#: ../calendar/gui/dialogs/task-editor.c:95
-msgid "Insert advanced send options"
-msgstr "Уметните напредне опције слања"
-
-#: ../calendar/gui/dialogs/event-editor.c:242
-msgid "All _Day Event"
-msgstr "Целодневни догађа_ј"
-
-#: ../calendar/gui/dialogs/event-editor.c:244
-msgid "Toggles whether to have All Day Event"
-msgstr "Бира да ли дозвољава целодневне догађаје"
-
-#: ../calendar/gui/dialogs/event-editor.c:253
-msgid "_Free/Busy"
-msgstr "С_лободно/заузето"
-
-#: ../calendar/gui/dialogs/event-editor.c:255
-msgid "Query free / busy information for the attendees"
-msgstr "Затражи податак за слободно/заузето време за ове учеснике"
-
-#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3486
-msgid "Appointment"
-msgstr "Заказивање"
-
-#: ../calendar/gui/dialogs/event-editor.c:376
-#: ../calendar/gui/dialogs/event-page.ui.h:27
-#: ../calendar/gui/e-meeting-list-view.c:164
-msgid "Attendees"
-msgstr "Учесници"
-
-#: ../calendar/gui/dialogs/event-editor.c:573
-msgid "Print this event"
-msgstr "Штампајте ову поруку"
-
-#: ../calendar/gui/dialogs/event-page.c:557
-msgid "Event's start time is in the past"
-msgstr "Почетак догађаја је у прошлости"
-
-#: ../calendar/gui/dialogs/event-page.c:634
-msgid "Event cannot be edited, because the selected calendar is read only"
-msgstr ""
-"Догађај није могуће уређивати, пошто је изабрани календар само за читање"
-
-#: ../calendar/gui/dialogs/event-page.c:638
-msgid "Event cannot be fully edited, because you are not the organizer"
-msgstr "Догађај није могуће потпуно уредити, пошто нисте организатор"
-
-#: ../calendar/gui/dialogs/event-page.c:650
-#: ../calendar/gui/dialogs/event-page.c:3198
-msgid "This event has reminders"
-msgstr "Овај догађај има подсетнике"
-
-#: ../calendar/gui/dialogs/event-page.c:717
-#: ../calendar/gui/dialogs/event-page.ui.h:13
-msgid "Or_ganizer:"
-msgstr "Ор_ганизатор:"
-
-#: ../calendar/gui/dialogs/event-page.c:1309
-msgid "Event with no start date"
-msgstr "Догађај без датума почетка"
-
-#: ../calendar/gui/dialogs/event-page.c:1312
-msgid "Event with no end date"
-msgstr "Догађај без датума завршетка"
-
-#: ../calendar/gui/dialogs/event-page.c:1490
-#: ../calendar/gui/dialogs/memo-page.c:732
-#: ../calendar/gui/dialogs/task-page.c:1032
-msgid "Start date is wrong"
-msgstr "Датум почетка је погрешан"
-
-#: ../calendar/gui/dialogs/event-page.c:1501
-msgid "End date is wrong"
-msgstr "Датум завршетка је погрешан"
-
-#: ../calendar/gui/dialogs/event-page.c:1543
-msgid "Start time is wrong"
-msgstr "Време почетка је погрешно"
-
-#: ../calendar/gui/dialogs/event-page.c:1551
-msgid "End time is wrong"
-msgstr "Време завршетка је погрешно"
-
-#: ../calendar/gui/dialogs/event-page.c:1715
-#: ../calendar/gui/dialogs/memo-page.c:771
-#: ../calendar/gui/dialogs/task-page.c:1086
-msgid "An organizer is required."
-msgstr "Потребан је организатор."
-
-#: ../calendar/gui/dialogs/event-page.c:1750
-#: ../calendar/gui/dialogs/task-page.c:1121
-msgid "At least one attendee is required."
-msgstr "Најмање један учесник је потребан."
-
-#: ../calendar/gui/dialogs/event-page.c:1956
-msgid "_Delegatees"
-msgstr "Делегат_и"
-
-#: ../calendar/gui/dialogs/event-page.c:1958
-msgid "Atte_ndees"
-msgstr "Уч_есници"
-
-#: ../calendar/gui/dialogs/event-page.c:3478
-#, c-format
-msgid "%d day before appointment"
-msgid_plural "%d days before appointment"
-msgstr[0] "%d дан пре заказаног"
-msgstr[1] "%d дана пре заказаног"
-msgstr[2] "%d дана пре заказаног"
-msgstr[3] "%d дан пре заказаног"
-
-#: ../calendar/gui/dialogs/event-page.c:3484
-#, c-format
-msgid "%d hour before appointment"
-msgid_plural "%d hours before appointment"
-msgstr[0] "%d сат пре заказаног"
-msgstr[1] "%d сата пре заказаног"
-msgstr[2] "%d сати пре заказаног"
-msgstr[3] "%d сат пре заказаног"
-
-#: ../calendar/gui/dialogs/event-page.c:3490
-#, c-format
-msgid "%d minute before appointment"
-msgid_plural "%d minutes before appointment"
-msgstr[0] "%d минут пре заказаног"
-msgstr[1] "%d минута пре заказаног"
-msgstr[2] "%d минута пре заказаног"
-msgstr[3] "%d минут пре заказаног"
-
-#: ../calendar/gui/dialogs/event-page.c:3511
-#| msgid "_Custom"
-msgid "Custom"
-msgstr "Произвољно"
-
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# 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.
-#. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3518
-msgctxt "cal-reminders"
-msgid "None"
-msgstr "Ништа"
-
-#. TRANSLATORS:
-#: ../calendar/gui/dialogs/event-page.ui.h:2
-msgctxt "eventpage"
-msgid "for"
-msgstr "за"
-
-#. TRANSLATORS:
-#: ../calendar/gui/dialogs/event-page.ui.h:4
-msgctxt "eventpage"
-msgid "until"
-msgstr "до"
-
-#. TRANSLATORS: Predefined reminder
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgctxt "eventpage"
-msgid "15 minutes before appointment"
-msgstr "15 минута пре заказаног састанка"
-
-#. TRANSLATORS: Predefined reminder
-#: ../calendar/gui/dialogs/event-page.ui.h:8
-msgctxt "eventpage"
-msgid "1 hour before appointment"
-msgstr "1 сат пре заказаног састанка"
-
-#. TRANSLATORS: Predefined reminder
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-msgctxt "eventpage"
-msgid "1 day before appointment"
-msgstr "1 дан пре заказаног састанка"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:11
-msgid "_Location:"
-msgstr "_Место:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:2
-#: ../calendar/gui/dialogs/task-page.ui.h:29
-#: ../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
-msgid "_Description:"
-msgstr "_Опис:"
-
-# note(slobo): можда треба рок
-#: ../calendar/gui/dialogs/event-page.ui.h:14
-msgid "_Time:"
-msgstr "_Време:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
-msgid "Time _zone:"
-msgstr "Временска _зона:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-msgid "_Summary:"
-msgstr "_Сажетак:"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:21
-msgid "Event Description"
-msgstr "Опис догађаја"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:26
-#: ../calendar/gui/dialogs/task-page.ui.h:33
-#: ../calendar/gui/e-meeting-time-sel.c:555
-msgid "Atte_ndees..."
-msgstr "Уч_есници..."
-
-#: ../calendar/gui/dialogs/event-page.ui.h:30
-msgid "_Reminder"
-msgstr "_Подсетник"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:1
-msgid "January"
-msgstr "Јануар"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:2
-msgid "February"
-msgstr "Фебруар"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:3
-msgid "March"
-msgstr "Март"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:4
-msgid "April"
-msgstr "Април"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:5
-msgid "May"
-msgstr "Мај"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:6
-msgid "June"
-msgstr "Јун"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
-msgid "July"
-msgstr "Јул"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:8
-msgid "August"
-msgstr "Август"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:9
-msgid "September"
-msgstr "Септембар"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:10
-msgid "October"
-msgstr "Октобар"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:11
-msgid "November"
-msgstr "Новембар"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:12
-msgid "December"
-msgstr "Децембар"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
-msgid "Select Date"
-msgstr "Изаберите датум"
-
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1219
-msgid "Select _Today"
-msgstr "Изабери _данашњи дан"
-
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3490
-msgid "Memo"
-msgstr "Белешка"
-
-#: ../calendar/gui/dialogs/memo-editor.c:155
-msgid "Print this memo"
-msgstr "Штампајте ову белешку"
-
-#: ../calendar/gui/dialogs/memo-page.c:424
-msgid "Memo's start date is in the past"
-msgstr "Почетак белешке је у прошлости"
-
-#: ../calendar/gui/dialogs/memo-page.c:460
-msgid "Memo cannot be edited, because the selected memo list is read only"
-msgstr "Белешку није могуће уређивати, пошто је изабран списак само за читање"
-
-#: ../calendar/gui/dialogs/memo-page.c:464
-msgid "Memo cannot be fully edited, because you are not the organizer"
-msgstr "Белешку није могуће потпуно уредити, пошто нисте организатор"
-
-#: ../calendar/gui/dialogs/memo-page.c:1168
-#: ../em-format/e-mail-formatter-utils.c:202
-#: ../em-format/e-mail-formatter-utils.c:219
-#: ../em-format/e-mail-part-headers.c:48 ../mail/message-list.etspec.h:9
-#: ../mail/searchtypes.xml.in.h:11 ../mail/vfoldertypes.xml.in.h:11
-#: ../modules/mail/em-mailer-prefs.c:64
-msgid "To"
-msgstr "Прима"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.c:426
-#: ../calendar/gui/dialogs/task-page.ui.h:34
-msgid "_List:"
-msgstr "_Списак:"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.c:434
-#: ../calendar/gui/dialogs/task-page.ui.h:24
-msgid "Organi_zer:"
-msgstr "Органи_затор:"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:5
-msgid "T_o:"
-msgstr "_Прима:"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:6
-#: ../calendar/gui/dialogs/task-page.ui.h:26
-msgid "Sta_rt date:"
-msgstr "Датум п_очетка:"
-
-#: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.ui.h:23
-msgid "Su_mmary:"
-msgstr "Саже_так:"
-
-#: ../calendar/gui/dialogs/recur-comp.c:52
-#, c-format
-msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr "Мењате повратни догађај. Шта желите да измените?"
-
-#: ../calendar/gui/dialogs/recur-comp.c:54
-#, c-format
-msgid "You are delegating a recurring event. What would you like to delegate?"
-msgstr "Делегирате повратни догађај. Шта желите да делегирате?"
-
-#: ../calendar/gui/dialogs/recur-comp.c:58
-#, c-format
-msgid "You are modifying a recurring task. What would you like to modify?"
-msgstr "Мењате повратни задатак. Шта желите да измените?"
-
-#: ../calendar/gui/dialogs/recur-comp.c:62
-#, c-format
-msgid "You are modifying a recurring memo. What would you like to modify?"
-msgstr "Мењате повратну белешку. Шта желите да измените?"
-
-#: ../calendar/gui/dialogs/recur-comp.c:88
-msgid "This Instance Only"
-msgstr "Само овај унос"
-
-#: ../calendar/gui/dialogs/recur-comp.c:92
-msgid "This and Prior Instances"
-msgstr "Овај и претходне уносе"
-
-#: ../calendar/gui/dialogs/recur-comp.c:98
-msgid "This and Future Instances"
-msgstr "Овај и будуће уносе"
-
-#: ../calendar/gui/dialogs/recur-comp.c:103
-msgid "All Instances"
-msgstr "Све уносе"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:574
-msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Ово заказивање садржи понављања која Еволуција не може да уреди."
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1005
-msgid "Recurrence date is invalid"
-msgstr "Датум понављања није исправан"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1049
-msgid "End time of the recurrence was before event's start"
-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/dialogs/recurrence-page.c:1078
-msgid "on"
-msgstr "у"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] 
[Monday] [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/dialogs/recurrence-page.c:1159
-msgid "first"
-msgstr "првом"
-
-#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
-#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] 
[forever]'
-#. * (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/dialogs/recurrence-page.c:1165
-msgid "second"
-msgstr "другом"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] 
[Monday] [forever]'
-#. * (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/dialogs/recurrence-page.c:1170
-msgid "third"
-msgstr "трећем"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] 
[Monday] [forever]'
-#. * (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/dialogs/recurrence-page.c:1175
-msgid "fourth"
-msgstr "четвртом"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] 
[Monday] [forever]'
-#. * (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/dialogs/recurrence-page.c:1180
-msgid "fifth"
-msgstr "петом"
-
-#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] 
[Monday] [forever]'
-#. * (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/dialogs/recurrence-page.c:1185
-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/dialogs/recurrence-page.c:1209
-msgid "Other Date"
-msgstr "Други датум"
-
-#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
-#. * 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/dialogs/recurrence-page.c:1215
-msgid "1st to 10th"
-msgstr "од првог до десетог"
-
-#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
-#. * 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/dialogs/recurrence-page.c:1221
-msgid "11th to 20th"
-msgstr "од једанаестог до двадесетог"
-
-#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
-#. * 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/dialogs/recurrence-page.c:1227
-msgid "21st to 31st"
-msgstr "од двадесет првог до тридесет првог"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1254
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
-msgid "Monday"
-msgstr "Понедељак"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1255
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
-msgid "Tuesday"
-msgstr "Уторак"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1256
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
-msgid "Wednesday"
-msgstr "Среда"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1257
-#: ../modules/calendar/e-calendar-preferences.ui.h:34
-msgid "Thursday"
-msgstr "Четвртак"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1258
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
-msgid "Friday"
-msgstr "Петак"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1259
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
-msgid "Saturday"
-msgstr "Субота"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1260
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
-msgid "Sunday"
-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/dialogs/recurrence-page.c:1391
-msgid "on the"
-msgstr "на"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:1576
-msgid "occurrences"
-msgstr "појаве"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2346
-msgid "Add exception"
-msgstr "Додај изузетак"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2388
-msgid "Could not get a selection to modify."
-msgstr "Не могу да нађем избор ради мењања."
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2394
-msgid "Modify exception"
-msgstr "Измените изузетак"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2440
-msgid "Could not get a selection to delete."
-msgstr "Не могу да нађем избор ради брисања."
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2581
-msgid "Date/Time"
-msgstr "Датум/време"
-
-#. TRANSLATORS: Entire string is for example:
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:2
-msgctxt "recurrpage"
-msgid "day(s)"
-msgstr "дан(и)"
-
-#. TRANSLATORS: Entire string is for example:
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:4
-msgctxt "recurrpage"
-msgid "week(s)"
-msgstr "недеља(е)"
-
-#. TRANSLATORS: Entire string is for example:
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:6
-msgctxt "recurrpage"
-msgid "month(s)"
-msgstr "месец(и)"
-
-#. TRANSLATORS: Entire string is for example:
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:8
-msgctxt "recurrpage"
-msgid "year(s)"
-msgstr "година(е)"
-
-#. TRANSLATORS: Entire string is for example:
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:10
-msgctxt "recurrpage"
-msgid "for"
-msgstr "за"
-
-#. TRANSLATORS: Entire string is for example:
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:12
-msgctxt "recurrpage"
-msgid "until"
-msgstr "до"
-
-#. TRANSLATORS: Entire string is for example:
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:14
-msgctxt "recurrpage"
-msgid "forever"
-msgstr "увек"
-
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
-msgid "This appointment rec_urs"
-msgstr "Ово заказивање се по_навља"
-
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:17
-msgid "Every"
-msgstr "Сваких"
-
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:18
-msgid "Exceptions"
-msgstr "Изузеци"
-
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:22
-msgid "Preview"
-msgstr "Преглед"
-
-#: ../calendar/gui/dialogs/send-comp.c:172
-#: ../calendar/gui/dialogs/send-comp.c:254
-msgid "Send my reminders with this event"
-msgstr "Пошаљи моје подсетнике са овим догађајем"
-
-#: ../calendar/gui/dialogs/send-comp.c:174
-#: ../calendar/gui/dialogs/send-comp.c:256
-msgid "Notify new attendees _only"
-msgstr "Обавести _само нове учеснике"
-
-#: ../calendar/gui/dialogs/task-editor.c:93
-msgid "_Send Options"
-msgstr "Могућности _слања"
-
-#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3488
-#: ../e-util/e-send-options.c:553
-msgid "Task"
-msgstr "Задатак"
-
-#: ../calendar/gui/dialogs/task-editor.c:285
-msgid "Print this task"
-msgstr "Одштампајте овај задатак"
-
-#: ../calendar/gui/dialogs/task-page.c:330
-msgid "Task's start date is in the past"
-msgstr "Почетак задатка је у прошлости"
-
-#: ../calendar/gui/dialogs/task-page.c:331
-msgid "Task's due date is in the past"
-msgstr "Рок за завршетак задатка је у прошлости"
-
-#: ../calendar/gui/dialogs/task-page.c:364
-msgid "Task cannot be edited, because the selected task list is read only"
-msgstr "Задатак није могуће уређивати, пошто је изабрани списак само за читање"
-
-#: ../calendar/gui/dialogs/task-page.c:368
-msgid "Task cannot be fully edited, because you are not the organizer"
-msgstr "Задатак није могуће потпуно уредити, зато што нисте организатор"
-
-#: ../calendar/gui/dialogs/task-page.c:372
-msgid ""
-"Task cannot be edited, because the selected task list does not support "
-"assigned tasks"
-msgstr ""
-"Задатак није могуће уређивати, зато што изабрани списак задатака не подржава "
-"додељене задатке"
-
-#: ../calendar/gui/dialogs/task-page.c:1013
-msgid "Due date is wrong"
-msgstr "Крајњи рок је погрешан"
-
-#: ../calendar/gui/dialogs/task-page.c:1181
-#: ../calendar/gui/dialogs/task-page.c:1206
-msgid "Completed date is wrong"
-msgstr "Датум завршетка је погрешан"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:338
-#: ../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:313
-msgid "High"
-msgstr "Висок"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:340
-#: ../calendar/gui/e-cal-model.c:1856 ../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:312
-msgid "Normal"
-msgstr "Обичан"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:342
-#: ../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:311
-msgid "Low"
-msgstr "Низак"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:14
-#: ../calendar/gui/e-task-table.c:527 ../calendar/gui/tasktypes.xml.h:22
-#: ../e-util/e-send-options.ui.h:1
-msgid "Undefined"
-msgstr "Неодређен"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:323
-#: ../calendar/gui/e-cal-model-tasks.c:310
-#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:207
-#: ../calendar/gui/e-task-table.c:222 ../calendar/gui/e-task-table.c:607
-#: ../calendar/gui/print.c:3573 ../calendar/gui/tasktypes.xml.h:11
-msgid "Not Started"
-msgstr "Није започет"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:18
-#: ../calendar/gui/e-cal-component-preview.c:313
-#: ../calendar/gui/e-cal-model-tasks.c:312
-#: ../calendar/gui/e-cal-model-tasks.c:554
-#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:209
-#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:608
-#: ../calendar/gui/print.c:3576
-msgid "In Progress"
-msgstr "У току"
-
-# timezone.
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:20
-#: ../calendar/gui/e-cal-component-preview.c:316
-#: ../calendar/gui/e-cal-model-tasks.c:314
-#: ../calendar/gui/e-cal-model-tasks.c:556
-#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../calendar/gui/e-task-table.c:211 ../calendar/gui/e-task-table.c:226
-#: ../calendar/gui/e-task-table.c:609 ../calendar/gui/print.c:3579
-#: ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:379
-msgid "Completed"
-msgstr "Завршено"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:22
-#: ../calendar/gui/e-cal-component-preview.c:319
-#: ../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:3582 ../mail/mail-send-recv.c:963
-msgid "Canceled"
-msgstr "Отказано"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:25
-msgid "D_ue date:"
-msgstr "Крајњи _рок:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:28
-msgid "Time zone:"
-msgstr "Временска зона:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:35
-msgid "_Status:"
-msgstr "_Стање:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:36
-msgid "Date _completed:"
-msgstr "_Датум завршетка:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:37
-msgid "_Percent complete:"
-msgstr "П_роценат завршеног:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:38
-msgid "Priorit_y:"
-msgstr "_Важност:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:39
-msgid "C_lassification:"
-msgstr "_Разврставање:"
-
-#: ../calendar/gui/dialogs/task-page.ui.h:40
-msgid "_Web Page:"
-msgstr "_Веб страница:"
-
-#: ../calendar/gui/ea-cal-view.c:284
+#: ../calendar/gui/ea-cal-view.c:283
 msgid "New Appointment"
 msgstr "Ново заказивање"
 
-#: ../calendar/gui/ea-cal-view.c:285
+#: ../calendar/gui/ea-cal-view.c:284
 msgid "New All Day Event"
 msgstr "Нови целодневни догађај"
 
-#: ../calendar/gui/ea-cal-view.c:286
+#: ../calendar/gui/ea-cal-view.c:285
 msgid "New Meeting"
 msgstr "Нови састанак"
 
-#: ../calendar/gui/ea-cal-view.c:287
+#: ../calendar/gui/ea-cal-view.c:286
 msgid "Go to Today"
 msgstr "Иди на данашњи дан"
 
-#: ../calendar/gui/ea-cal-view.c:288
+#: ../calendar/gui/ea-cal-view.c:287
 msgid "Go to Date"
 msgstr "Иди на датум"
 
@@ -4388,7 +3053,7 @@ msgstr "Дугме за прескакање"
 msgid "Click here, you can find more events."
 msgstr "Кликните овде, можете наћи још догађаја."
 
-#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
+#. 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"
@@ -4398,7 +3063,7 @@ msgstr[1] "%d дана"
 msgstr[2] "%d дана"
 msgstr[3] "%d дан"
 
-#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
+#. Translator: Entire string is like "Pop up an alert %d weeks before start"
 #: ../calendar/gui/e-alarm-list.c:376
 #, c-format
 msgid "%d week"
@@ -4408,57 +3073,107 @@ msgstr[1] "%d недеље"
 msgstr[2] "%d недеља"
 msgstr[3] "%d недеља"
 
-#: ../calendar/gui/e-alarm-list.c:438
+#. 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
+#| msgid "Play a sound"
+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
+#| msgid "Pop up an alert"
+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
+#| msgid "Send an email"
+msgctxt "cal-reminders"
+msgid "Send an email"
+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
+#| msgid "Run a program"
+msgctxt "cal-reminders"
+msgid "Run a program"
+msgstr "Покрени програм"
+
+#: ../calendar/gui/e-alarm-list.c:439
+#| msgid "Unknown action to be performed"
+msgctxt "cal-reminders"
 msgid "Unknown action to be performed"
 msgstr "Извршиће се непозната радња"
 
-#: ../calendar/gui/e-alarm-list.c:453
+#: ../calendar/gui/e-alarm-list.c:454
 #, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "%s %s пре почетка састанка"
+#| msgid "%s %s before the start of the appointment"
+msgctxt "cal-reminders"
+msgid "%s %s before the start"
+msgstr "%s %s пре почетка"
 
-#: ../calendar/gui/e-alarm-list.c:459
+#: ../calendar/gui/e-alarm-list.c:460
 #, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "%s %s након почетка састанка"
+#| msgid "%s %s after the start of the appointment"
+msgctxt "cal-reminders"
+msgid "%s %s after the start"
+msgstr "%s %s након почетка"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:466
+#: ../calendar/gui/e-alarm-list.c:467
 #, c-format
-msgid "%s at the start of the appointment"
-msgstr "%s на почетку састанка"
+#| msgid "%s attachment"
+msgctxt "cal-reminders"
+msgid "%s at the start"
+msgstr "%s на почетку"
 
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:479
 #, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "%s %s пре краја састанка"
+#| msgid "%s %s before the end of the appointment"
+msgctxt "cal-reminders"
+msgid "%s %s before the end"
+msgstr "%s %s пре краја"
 
-#: ../calendar/gui/e-alarm-list.c:484
+#: ../calendar/gui/e-alarm-list.c:485
 #, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "%s %s након завршетка састанка"
+#| msgid "%s %s after the end of the appointment"
+msgctxt "cal-reminders"
+msgid "%s %s after the end"
+msgstr "%s %s након завршетка"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:491
+#: ../calendar/gui/e-alarm-list.c:492
 #, c-format
-msgid "%s at the end of the appointment"
-msgstr "%s на крају састанка"
+#| msgid "%s attachment"
+msgctxt "cal-reminders"
+msgid "%s at the end"
+msgstr "%s на крају"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:515
+#: ../calendar/gui/e-alarm-list.c:516
 #, c-format
+#| msgid "%s at %s"
+msgctxt "cal-reminders"
 msgid "%s at %s"
 msgstr "%s у %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:523
+#: ../calendar/gui/e-alarm-list.c:524
 #, c-format
+#| msgid "%s for an unknown trigger type"
+msgctxt "cal-reminders"
 msgid "%s for an unknown trigger type"
-msgstr "%s за непознат тип покретача"
+msgstr "%s за непознату врсту окидача"
 
 #: ../calendar/gui/ea-week-view.c:114
 #, c-format
@@ -4478,181 +3193,293 @@ msgstr "преглед календара за месец"
 msgid "calendar view for one or more weeks"
 msgstr "преглед календара за једну или више недеља"
 
-#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:768
+#: ../calendar/gui/e-cal-component-preview.c:214 ../e-util/e-filter-rule.c:768
 #: ../mail/e-mail-config-page.c:125
 msgid "Untitled"
 msgstr "Неименовано"
 
-#: ../calendar/gui/e-cal-component-preview.c:230
+#: ../calendar/gui/e-cal-component-preview.c:222
 msgid "Categories:"
 msgstr "Категорије:"
 
-#: ../calendar/gui/e-cal-component-preview.c:264
+#: ../calendar/gui/e-cal-component-preview.c:256
 msgid "Summary:"
 msgstr "Сажетак:"
 
-#: ../calendar/gui/e-cal-component-preview.c:273
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Start Date:"
 msgstr "Датум почетка:"
 
-#: ../calendar/gui/e-cal-component-preview.c:285
+#: ../calendar/gui/e-cal-component-preview.c:275
 msgid "End Date:"
 msgstr "Датум завршетка:"
 
-#: ../calendar/gui/e-cal-component-preview.c:297
+#: ../calendar/gui/e-cal-component-preview.c:286
 msgid "Due Date:"
 msgstr "Крајњи рок:"
 
-#: ../calendar/gui/e-cal-component-preview.c:309
+#: ../calendar/gui/e-cal-component-preview.c:298
 #: ../modules/itip-formatter/itip-view.c:1517
 #: ../modules/itip-formatter/itip-view.c:1634
 msgid "Status:"
 msgstr "Стање:"
 
-#: ../calendar/gui/e-cal-component-preview.c:336
+#: ../calendar/gui/e-cal-component-preview.c:302
+#: ../calendar/gui/e-cal-model-tasks.c:312
+#: ../calendar/gui/e-cal-model-tasks.c:554
+#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:608
+#: ../calendar/gui/print.c:3582
+msgid "In Progress"
+msgstr "У току"
+
+# timezone.
+#: ../calendar/gui/e-cal-component-preview.c:305
+#: ../calendar/gui/e-cal-model-tasks.c:314
+#: ../calendar/gui/e-cal-model-tasks.c:556
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../calendar/gui/e-task-table.c:211 ../calendar/gui/e-task-table.c:226
+#: ../calendar/gui/e-task-table.c:609 ../calendar/gui/print.c:3585
+#: ../calendar/gui/tasktypes.xml.h:13 ../plugins/save-calendar/csv-format.c:379
+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
+#: ../calendar/gui/e-task-table.c:222 ../calendar/gui/e-task-table.c:607
+#: ../calendar/gui/print.c:3579 ../calendar/gui/tasktypes.xml.h:11
+msgid "Not Started"
+msgstr "Није започет"
+
+#: ../calendar/gui/e-cal-component-preview.c:325
 msgid "Priority:"
 msgstr "Важност:"
 
-#: ../calendar/gui/e-cal-component-preview.c:361
+#: ../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
+msgid "High"
+msgstr "Висок"
+
+#: ../calendar/gui/e-cal-component-preview.c:329
+#: ../calendar/gui/e-cal-model.c:1872 ../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
+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
+msgid "Low"
+msgstr "Низак"
+
+#: ../calendar/gui/e-cal-component-preview.c:350
 #: ../mail/e-mail-config-service-page.c:670
 msgid "Description:"
 msgstr "Опис:"
 
-#: ../calendar/gui/e-cal-component-preview.c:392
+#: ../calendar/gui/e-cal-component-preview.c:381
 msgid "Web Page:"
 msgstr "Веб страница:"
 
 #: ../calendar/gui/e-cal-data-model.c:1633
 #, c-format
-#| msgid "Opening calendar '%s'"
 msgid "Creating view for calendar '%s'"
 msgstr "Приказујем календар „%s“"
 
 #: ../calendar/gui/e-cal-data-model.c:1637
 #, c-format
-#| msgid "Opening task list '%s'"
 msgid "Creating view for task list '%s'"
 msgstr "Приказујем списак задатака „%s“"
 
 #: ../calendar/gui/e-cal-data-model.c:1641
 #, c-format
-#| msgid "Opening memo list '%s'"
 msgid "Creating view for memo list '%s'"
 msgstr "Приказујем списак белешки „%s“"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:1
-msgid "Click to add a task"
-msgstr "Кликните да додате задатак"
+#: ../calendar/gui/e-cal-dialogs.c:214 ../calendar/gui/e-cal-ops.c:1939
+msgid "Destination is read only"
+msgstr "Одредиште је само за читање"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:2
-msgid "Start date"
-msgstr "Датум почетка"
+#: ../calendar/gui/e-cal-dialogs.c:294
+#, c-format
+msgid "Copying events to the calendar '%s'"
+msgstr "Умножавам догађаје у календар „%s“"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:670
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../e-util/e-attachment-tree-view.c:585
-#: ../mail/e-mail-account-tree-view.c:157
-msgid "Type"
-msgstr "Врста"
+#: ../calendar/gui/e-cal-dialogs.c:300
+#, c-format
+msgid "Copying memos to the memo list '%s'"
+msgstr "Умножавам белешке у списак белешки „%s“"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:5
-msgid "Completion date"
-msgstr "Датум завршетка"
+#: ../calendar/gui/e-cal-dialogs.c:306
+#, c-format
+msgid "Copying tasks to the task list '%s'"
+msgstr "Умножавам задатке у списак задатака „%s“"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:965
-msgid "Complete"
-msgstr "Завршено"
+#: ../calendar/gui/e-cal-dialogs.c:525
+msgid "_Delete this item from all other recipient's mailboxes?"
+msgstr ""
+"Да ли да _избришем ову ставку из свих осталих поштанских сандучића примаоца?"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:7
-msgid "Due date"
-msgstr "Крајњи рок"
+#: ../calendar/gui/e-cal-dialogs.c:528
+msgid "_Retract comment"
+msgstr "_Увуци коментар"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:9
-#, no-c-format
-msgid "% Complete"
-msgstr "% је завршено"
+#: ../calendar/gui/e-cal-dialogs.c:687
+msgid "Select Date"
+msgstr "Изаберите датум"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:18
-#: ../plugins/save-calendar/csv-format.c:386
-msgid "Priority"
-msgstr "Важност"
+#: ../calendar/gui/e-cal-dialogs.c:688
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
+msgid "Select _Today"
+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-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:3845
-#: ../calendar/gui/e-meeting-list-view.c:713
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/tasktypes.xml.h:8 ../mail/filtertypes.xml.in.h:34
-#: ../mail/message-list.etspec.h:1 ../mail/searchtypes.xml.in.h:36
-#: ../mail/vfoldertypes.xml.in.h:36
-msgid "Status"
-msgstr "Стање"
+#: ../calendar/gui/e-cal-dialogs.c:707
+msgid "January"
+msgstr "Јануар"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
-#: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../plugins/save-calendar/csv-format.c:380
-msgid "Created"
-msgstr "Направљено"
+#: ../calendar/gui/e-cal-dialogs.c:708
+msgid "February"
+msgstr "Фебруар"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-cal-list-view.etspec.h:8
-#: ../calendar/gui/e-memo-table.etspec.h:7
-msgid "Last modified"
-msgstr "Последње измене"
+#: ../calendar/gui/e-cal-dialogs.c:709
+msgid "March"
+msgstr "Март"
+
+#: ../calendar/gui/e-cal-dialogs.c:710
+msgid "April"
+msgstr "Април"
+
+#: ../calendar/gui/e-cal-dialogs.c:711
+msgid "May"
+msgstr "Мај"
+
+#: ../calendar/gui/e-cal-dialogs.c:712
+msgid "June"
+msgstr "Јун"
+
+#: ../calendar/gui/e-cal-dialogs.c:713
+msgid "July"
+msgstr "Јул"
+
+#: ../calendar/gui/e-cal-dialogs.c:714
+msgid "August"
+msgstr "Август"
+
+#: ../calendar/gui/e-cal-dialogs.c:715
+msgid "September"
+msgstr "Септембар"
+
+#: ../calendar/gui/e-cal-dialogs.c:716
+msgid "October"
+msgstr "Октобар"
+
+#: ../calendar/gui/e-cal-dialogs.c:717
+msgid "November"
+msgstr "Новембар"
+
+#: ../calendar/gui/e-cal-dialogs.c:718
+msgid "December"
+msgstr "Децембар"
+
+#: ../calendar/gui/e-cal-dialogs.c:868
+#, c-format
+msgid "You are modifying a recurring event. What would you like to modify?"
+msgstr "Мењате повратни догађај. Шта желите да измените?"
+
+#: ../calendar/gui/e-cal-dialogs.c:870
+#, c-format
+msgid "You are delegating a recurring event. What would you like to delegate?"
+msgstr "Делегирате повратни догађај. Шта желите да делегирате?"
 
-#: ../calendar/gui/e-calendar-view.c:459
+#: ../calendar/gui/e-cal-dialogs.c:874
+#, c-format
+msgid "You are modifying a recurring task. What would you like to modify?"
+msgstr "Мењате повратни задатак. Шта желите да измените?"
+
+#: ../calendar/gui/e-cal-dialogs.c:878
+#, c-format
+msgid "You are modifying a recurring memo. What would you like to modify?"
+msgstr "Мењате повратну белешку. Шта желите да измените?"
+
+#: ../calendar/gui/e-cal-dialogs.c:904
+msgid "This Instance Only"
+msgstr "Само овај унос"
+
+#: ../calendar/gui/e-cal-dialogs.c:908
+msgid "This and Prior Instances"
+msgstr "Овај и претходне уносе"
+
+#: ../calendar/gui/e-cal-dialogs.c:914
+msgid "This and Future Instances"
+msgstr "Овај и будуће уносе"
+
+#: ../calendar/gui/e-cal-dialogs.c:919
+msgid "All Instances"
+msgstr "Све уносе"
+
+#: ../calendar/gui/e-cal-dialogs.c:1169 ../calendar/gui/e-cal-dialogs.c:1251
+msgid "Send my reminders with this event"
+msgstr "Пошаљи моје подсетнике са овим догађајем"
+
+#: ../calendar/gui/e-cal-dialogs.c:1171 ../calendar/gui/e-cal-dialogs.c:1253
+msgid "Notify new attendees _only"
+msgstr "Обавести _само нове учеснике"
+
+#: ../calendar/gui/e-calendar-view.c:452
 msgid "Cut selected events to the clipboard"
 msgstr "Сече изабране догађаје у списак исечака"
 
-#: ../calendar/gui/e-calendar-view.c:465
+#: ../calendar/gui/e-calendar-view.c:458
 msgid "Copy selected events to the clipboard"
 msgstr "Умножава изабране догађаје у списак исечака"
 
-#: ../calendar/gui/e-calendar-view.c:471
+#: ../calendar/gui/e-calendar-view.c:464
 msgid "Paste events from the clipboard"
 msgstr "Убацује догађаје из списка исечака"
 
-#: ../calendar/gui/e-calendar-view.c:477
+#: ../calendar/gui/e-calendar-view.c:470
 msgid "Delete selected events"
 msgstr "Брише изабране догађаје"
 
-#: ../calendar/gui/e-calendar-view.c:859
+#: ../calendar/gui/e-calendar-view.c:852
 msgid "Pasted text doesn't contain valid iCalendar data"
 msgstr "Уметнути текст не садржи исправне податке из иКалендара"
 
-#: ../calendar/gui/e-calendar-view.c:870 ../calendar/gui/e-cal-ops.c:1567
-#| msgid "Default User Calendar"
+#: ../calendar/gui/e-calendar-view.c:863 ../calendar/gui/e-cal-ops.c:1536
 msgid "Default calendar not found"
 msgstr "Није пронађен подразумевани календар"
 
-#: ../calendar/gui/e-calendar-view.c:875 ../calendar/gui/e-cal-ops.c:1570
-#| msgid "Mark as default memo list"
+#: ../calendar/gui/e-calendar-view.c:868 ../calendar/gui/e-cal-ops.c:1539
 msgid "Default memo list not found"
 msgstr "Није пронађен подразумевани списак белешки"
 
-#: ../calendar/gui/e-calendar-view.c:880 ../calendar/gui/e-cal-ops.c:1573
-#| msgid "Mark as default task list"
+#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-cal-ops.c:1542
 msgid "Default task list not found"
 msgstr "Није пронађен подразумевани списак задатака"
 
-#: ../calendar/gui/e-calendar-view.c:969
+#: ../calendar/gui/e-calendar-view.c:962
 msgid "No suitable component found"
 msgstr "Није пронађена одоварајућа компонента"
 
-#: ../calendar/gui/e-calendar-view.c:1039
-#| msgid "Save as iCalendar"
+#: ../calendar/gui/e-calendar-view.c:1032
 msgid "Pasting iCalendar data"
 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:1842 ../calendar/gui/e-memo-table.c:493
+#: ../calendar/gui/e-calendar-view.c:1830 ../calendar/gui/e-memo-table.c:492
 #: ../calendar/gui/e-task-table.c:794
 #, c-format
 msgid "Organizer: %s <%s>"
@@ -4661,29 +3488,29 @@ 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:1846 ../calendar/gui/e-memo-table.c:498
+#: ../calendar/gui/e-calendar-view.c:1834 ../calendar/gui/e-memo-table.c:497
 #: ../calendar/gui/e-task-table.c:798
 #, c-format
 msgid "Organizer: %s"
 msgstr "Организатор: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:1862
-#: ../calendar/gui/e-meeting-time-sel.c:2725 ../calendar/gui/print.c:3527
+#: ../calendar/gui/e-calendar-view.c:1850
+#: ../calendar/gui/e-meeting-time-sel.c:2731 ../calendar/gui/print.c:3533
 #, c-format
 msgid "Location: %s"
 msgstr "Место: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:1902
+#: ../calendar/gui/e-calendar-view.c:1890
 #, c-format
 msgid "Time: %s %s"
 msgstr "Време: %s %s"
 
-#: ../calendar/gui/e-calendar-view.c:2281
-#: ../calendar/gui/e-calendar-view.c:2288
-#: ../calendar/gui/e-calendar-view.c:2295
-#: ../calendar/gui/e-calendar-view.c:2298
+#: ../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
 msgid "%d %b %Y"
 msgstr "%d. %b %Y."
 
@@ -4696,13 +3523,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:2286 ../calendar/gui/e-day-view.c:3052
-#: ../calendar/gui/e-day-view-top-item.c:859
+#: ../calendar/gui/e-calendar-view.c:2274 ../calendar/gui/e-day-view.c:3050
+#: ../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:2308
+#: ../calendar/gui/e-calendar-view.c:2296
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y."
 
@@ -4717,15 +3544,15 @@ 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:2312 ../calendar/gui/e-day-view.c:3036
-#: ../calendar/gui/e-day-view-top-item.c:855
+#: ../calendar/gui/e-calendar-view.c:2300 ../calendar/gui/e-day-view.c:3034
+#: ../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"
 
-#: ../calendar/gui/e-calendar-view.c:2315
-#: ../calendar/gui/e-calendar-view.c:2321
-#: ../calendar/gui/e-calendar-view.c:2324
+#: ../calendar/gui/e-calendar-view.c:2303
+#: ../calendar/gui/e-calendar-view.c:2309
+#: ../calendar/gui/e-calendar-view.c:2312
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y."
 
@@ -4738,101 +3565,124 @@ msgstr "Датум почетка"
 msgid "End Date"
 msgstr "Датум завршетка"
 
-#: ../calendar/gui/e-cal-model.c:319 ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/e-task-table.etspec.h:13
+#: ../plugins/save-calendar/csv-format.c:380
+msgid "Created"
+msgstr "Направљено"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../calendar/gui/e-task-table.etspec.h:14
+msgid "Last modified"
+msgstr "Последње измене"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:9
+#: ../calendar/gui/e-memo-table.etspec.h:8
+#: ../calendar/gui/e-task-table.etspec.h:15
+#: ../em-format/e-mail-formatter-source.c:120
+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-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:169
-#: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1250
-#: ../calendar/gui/print.c:1267 ../e-util/e-charset.c:51
+#: ../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/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "Непознато"
 
-#: ../calendar/gui/e-cal-model.c:1394 ../calendar/gui/e-cal-ops.c:596
-#: ../calendar/gui/e-cal-ops.c:1232
-#: ../modules/calendar/e-cal-base-shell-backend.c:361
+#: ../calendar/gui/e-cal-model.c:1403 ../calendar/gui/e-cal-ops.c:597
+#: ../calendar/gui/e-cal-ops.c:1233
+#: ../modules/calendar/e-cal-base-shell-backend.c:291
 #, c-format
 msgid "Source with UID '%s' not found"
 msgstr "Није пронађен извор са УИД бројем „%s“"
 
-#: ../calendar/gui/e-cal-model.c:1480 ../calendar/gui/e-cal-ops.c:185
-#: ../calendar/gui/e-cal-ops.c:1349
-#| msgid "Create a new all day event"
+#: ../calendar/gui/e-cal-model.c:1489 ../calendar/gui/e-cal-ops.c:186
+#: ../calendar/gui/e-cal-ops.c:1350
 msgid "Creating an event"
 msgstr "Правим нови догађај"
 
-#: ../calendar/gui/e-cal-model.c:1484 ../calendar/gui/e-cal-ops.c:189
-#: ../calendar/gui/e-cal-ops.c:1353
-#| msgid "Create a Mem_o"
+#: ../calendar/gui/e-cal-model.c:1493 ../calendar/gui/e-cal-ops.c:190
+#: ../calendar/gui/e-cal-ops.c:1354
 msgid "Creating a memo"
 msgstr "Правим нову белешку"
 
-#: ../calendar/gui/e-cal-model.c:1488 ../calendar/gui/e-cal-ops.c:193
-#: ../calendar/gui/e-cal-ops.c:1357
-#| msgid "Create a _Task"
+#: ../calendar/gui/e-cal-model.c:1497 ../calendar/gui/e-cal-ops.c:194
+#: ../calendar/gui/e-cal-ops.c:1358
 msgid "Creating a task"
 msgstr "Правим нови задатак"
 
-#: ../calendar/gui/e-cal-model.c:1858
+#: ../calendar/gui/e-cal-model.c:1874
 msgid "Recurring"
 msgstr "Периодичност"
 
-#: ../calendar/gui/e-cal-model.c:1860
+#: ../calendar/gui/e-cal-model.c:1876
 msgid "Assigned"
 msgstr "Додељено"
 
-#: ../calendar/gui/e-cal-model.c:1862 ../calendar/gui/e-cal-model-tasks.c:1138
+#: ../calendar/gui/e-cal-model.c:1878 ../calendar/gui/e-cal-model-tasks.c:1138
 #: ../calendar/gui/e-meeting-list-view.c:208
 #: ../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:1862 ../calendar/gui/e-cal-model-tasks.c:1138
+#: ../calendar/gui/e-cal-model.c:1878 ../calendar/gui/e-cal-model-tasks.c:1138
 #: ../calendar/gui/e-meeting-list-view.c:209
 #: ../calendar/gui/e-meeting-store.c:188
 msgid "No"
 msgstr "Не"
 
-#: ../calendar/gui/e-cal-model.c:3786
-#: ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-cal-model.c:3802 ../calendar/gui/e-meeting-list-view.c:220
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
 #: ../modules/itip-formatter/itip-view.c:6206
 msgid "Accepted"
 msgstr "Прихваћено"
 
-#: ../calendar/gui/e-cal-model.c:3787
-#: ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-cal-model.c:3803 ../calendar/gui/e-meeting-list-view.c:221
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
 #: ../modules/itip-formatter/itip-view.c:6212
 msgid "Declined"
 msgstr "Одбијено"
 
-#: ../calendar/gui/e-cal-model.c:3788
-#: ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-cal-model.c:3804 ../calendar/gui/e-meeting-list-view.c:222
 #: ../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:3789
-#: ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-cal-model.c:3805 ../calendar/gui/e-meeting-list-view.c:223
 #: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
 #: ../modules/itip-formatter/itip-view.c:6215
 msgid "Delegated"
 msgstr "Делегирано"
 
-#: ../calendar/gui/e-cal-model.c:3790
+#: ../calendar/gui/e-cal-model.c:3806
 msgid "Needs action"
 msgstr "Захтева радњу"
 
-#: ../calendar/gui/e-cal-model-calendar.c:151
+#. 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:3861 ../calendar/gui/e-meeting-list-view.c:688
+#: ../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
+#: ../mail/searchtypes.xml.in.h:38 ../mail/vfoldertypes.xml.in.h:38
+msgid "Status"
+msgstr "Стање"
+
+#: ../calendar/gui/e-cal-model-calendar.c:150
 #: ../calendar/gui/e-task-table.c:582
 msgid "Free"
 msgstr "Слободно"
 
-#: ../calendar/gui/e-cal-model-calendar.c:154
+#: ../calendar/gui/e-cal-model-calendar.c:153
 #: ../calendar/gui/e-meeting-time-sel.c:536 ../calendar/gui/e-task-table.c:583
 msgid "Busy"
 msgstr "Заузето"
@@ -4858,38 +3708,33 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ништа"
 
-#: ../calendar/gui/e-cal-ops.c:287
+#: ../calendar/gui/e-cal-ops.c:288
 msgid "Modifying an event"
 msgstr "Исправљам догађај"
 
 # mail:no-name-vfolder primary
-#: ../calendar/gui/e-cal-ops.c:291
-#| msgid "Missing name."
+#: ../calendar/gui/e-cal-ops.c:292
 msgid "Modifying a memo"
 msgstr "Исправљам белешку"
 
-#: ../calendar/gui/e-cal-ops.c:295
+#: ../calendar/gui/e-cal-ops.c:296
 msgid "Modifying a task"
 msgstr "Изправљам задатак"
 
-#: ../calendar/gui/e-cal-ops.c:394
-#| msgid "Removing attachments"
+#: ../calendar/gui/e-cal-ops.c:395
 msgid "Removing an event"
 msgstr "Уклањам догађај"
 
-#: ../calendar/gui/e-cal-ops.c:398
-#| msgid "Removing attachments"
+#: ../calendar/gui/e-cal-ops.c:399
 msgid "Removing a memo"
 msgstr "Уклањам белешку"
 
-#: ../calendar/gui/e-cal-ops.c:402
-#| msgid "Removing attachments"
+#: ../calendar/gui/e-cal-ops.c:403
 msgid "Removing a task"
 msgstr "Уклањам задатак"
 
-#: ../calendar/gui/e-cal-ops.c:493
+#: ../calendar/gui/e-cal-ops.c:494
 #, c-format
-#| msgid "Meeting information sent"
 msgid "Deleting an event"
 msgid_plural "Deleting %d events"
 msgstr[0] "Уклањам %d догађај"
@@ -4897,9 +3742,8 @@ msgstr[1] "Уклањам %d догађаја"
 msgstr[2] "Уклањам %d догађаја"
 msgstr[3] "Уклањам догађај"
 
-#: ../calendar/gui/e-cal-ops.c:497
+#: ../calendar/gui/e-cal-ops.c:498
 #, c-format
-#| msgid "Delete Memo"
 msgid "Deleting a memo"
 msgid_plural "Deleting %d memos"
 msgstr[0] "Уклањам %d белешку"
@@ -4907,9 +3751,8 @@ msgstr[1] "Уклањам %d белешке"
 msgstr[2] "Уклањам %d белешки"
 msgstr[3] "Уклањам белешку"
 
-#: ../calendar/gui/e-cal-ops.c:501
+#: ../calendar/gui/e-cal-ops.c:502
 #, c-format
-#| msgid "Delete Task"
 msgid "Deleting a task"
 msgid_plural "Deleting %d tasks"
 msgstr[0] "Уклањам %d задатак"
@@ -4917,9 +3760,8 @@ msgstr[1] "Уклањам %d задатка"
 msgstr[2] "Уклањам %d задатака"
 msgstr[3] "Уклањам белешку"
 
-#: ../calendar/gui/e-cal-ops.c:704
+#: ../calendar/gui/e-cal-ops.c:705
 #, c-format
-#| msgid "Print this event"
 msgid "Pasting an event"
 msgid_plural "Pasting %d events"
 msgstr[0] "Убацујем %d догађај"
@@ -4927,9 +3769,8 @@ msgstr[1] "Убацујем %d догађаја"
 msgstr[2] "Убацујем %d догађаја"
 msgstr[3] "Убацујем догађај"
 
-#: ../calendar/gui/e-cal-ops.c:719
+#: ../calendar/gui/e-cal-ops.c:720
 #, c-format
-#| msgid "Print this memo"
 msgid "Pasting a memo"
 msgid_plural "Pasting %d memos"
 msgstr[0] "Убацујем %d белешку"
@@ -4937,9 +3778,8 @@ msgstr[1] "Убацујем %d белешке"
 msgstr[2] "Убацујем %d белешки"
 msgstr[3] "Убацујем белешку"
 
-#: ../calendar/gui/e-cal-ops.c:734
+#: ../calendar/gui/e-cal-ops.c:735
 #, c-format
-#| msgid "Print this task"
 msgid "Pasting a task"
 msgid_plural "Pasting %d tasks"
 msgstr[0] "Убацујем %d задатак"
@@ -4947,78 +3787,65 @@ msgstr[1] "Убацујем %d задатка"
 msgstr[2] "Убацујем %d задатака"
 msgstr[3] "Убацујем задатак"
 
-#: ../calendar/gui/e-cal-ops.c:833
-#| msgid "Updating objects"
+#: ../calendar/gui/e-cal-ops.c:834
 msgid "Updating an event"
 msgstr "Ажурирам догађај"
 
-#: ../calendar/gui/e-cal-ops.c:837
-#| msgid "Updating objects"
+#: ../calendar/gui/e-cal-ops.c:838
 msgid "Updating a memo"
 msgstr "Ажурирам белешку"
 
-#: ../calendar/gui/e-cal-ops.c:841
-#| msgid "Updating objects"
+#: ../calendar/gui/e-cal-ops.c:842
 msgid "Updating a task"
 msgstr "Ажурирам задатак"
 
-#: ../calendar/gui/e-cal-ops.c:949
+#: ../calendar/gui/e-cal-ops.c:950
 #, c-format
-#| msgid "Moving an event into the calendar %s"
 msgid "Getting events to purge in the calendar '%s'"
 msgstr "Преузимам догађаје за чишћење календара „%s“"
 
-#: ../calendar/gui/e-cal-ops.c:953
+#: ../calendar/gui/e-cal-ops.c:954
 #, c-format
-#| msgid "Moving a memo into the memo list '{0}'"
 msgid "Getting memos to purge in the memo list '%s'"
 msgstr "Преузимам белешке за чишћење списка белешки „%s“"
 
-#: ../calendar/gui/e-cal-ops.c:957
+#: ../calendar/gui/e-cal-ops.c:958
 #, c-format
-#| msgid "Moving a task into the task list '{0}'"
 msgid "Getting tasks to purge in the task list '%s'"
 msgstr "Преузимам задатке за чишћење списка задатака „%s“"
 
-#: ../calendar/gui/e-cal-ops.c:983
+#: ../calendar/gui/e-cal-ops.c:984
 #, c-format
-#| msgid "Moving an event into the calendar %s"
 msgid "Purging events in the calendar '%s'"
 msgstr "Чистим догађаје из календара „%s“"
 
-#: ../calendar/gui/e-cal-ops.c:987
+#: ../calendar/gui/e-cal-ops.c:988
 #, c-format
-#| msgid "Moving a memo into the memo list '{0}'"
 msgid "Purging memos in the memo list '%s'"
 msgstr "Чистим белешке из списка белешки „%s“"
 
-#: ../calendar/gui/e-cal-ops.c:991
+#: ../calendar/gui/e-cal-ops.c:992
 #, c-format
-#| msgid "Moving a task into the task list '{0}'"
 msgid "Purging tasks in the task list '%s'"
 msgstr "Чистим задатке из списка задатака „%s“"
 
-#: ../calendar/gui/e-cal-ops.c:1091
-#| msgid "Purging"
+#: ../calendar/gui/e-cal-ops.c:1092
 msgid "Purging events"
 msgstr "Чистим догађаје"
 
-#: ../calendar/gui/e-cal-ops.c:1095
-#| msgid "Print Memos"
+#: ../calendar/gui/e-cal-ops.c:1096
 msgid "Purging memos"
 msgstr "Чистим белешке"
 
-#: ../calendar/gui/e-cal-ops.c:1099
-#| msgid "Print Tasks"
+#: ../calendar/gui/e-cal-ops.c:1100
 msgid "Purging tasks"
 msgstr "Чистим задатке"
 
-#: ../calendar/gui/e-cal-ops.c:1201
-#| msgid "Hide completed tasks"
+#: ../calendar/gui/e-cal-ops.c:1202
 msgid "Expunging completed tasks"
 msgstr "Уклањам завршене задатке"
 
-#: ../calendar/gui/e-cal-ops.c:2062
+#: ../calendar/gui/e-cal-ops.c:2033
 #, c-format
 msgid "Moving an event"
 msgid_plural "Moving %d events"
@@ -5027,9 +3854,8 @@ msgstr[1] "Премештам %d догађаја"
 msgstr[2] "Премештам %d догађаја"
 msgstr[3] "Премештам догађај"
 
-#: ../calendar/gui/e-cal-ops.c:2063
+#: ../calendar/gui/e-cal-ops.c:2034
 #, c-format
-#| msgid "Copying Items"
 msgid "Copying an event"
 msgid_plural "Copying %d events"
 msgstr[0] "Умножавам %d догађај"
@@ -5037,9 +3863,8 @@ msgstr[1] "Умножавам %d догађаја"
 msgstr[2] "Умножавам %d догађаја"
 msgstr[3] "Умножавам догађај"
 
-#: ../calendar/gui/e-cal-ops.c:2069
+#: ../calendar/gui/e-cal-ops.c:2040
 #, c-format
-#| msgid "Moving Items"
 msgid "Moving a memo"
 msgid_plural "Moving %d memos"
 msgstr[0] "Премештам %d белешку"
@@ -5047,9 +3872,8 @@ msgstr[1] "Премештам %d белешке"
 msgstr[2] "Премештам %d белешки"
 msgstr[3] "Премештам белешку"
 
-#: ../calendar/gui/e-cal-ops.c:2070
+#: ../calendar/gui/e-cal-ops.c:2041
 #, c-format
-#| msgid "Copying Items"
 msgid "Copying a memo"
 msgid_plural "Copying %d memos"
 msgstr[0] "Умножавам %d белешку"
@@ -5057,9 +3881,8 @@ msgstr[1] "Умножавам %d белешке"
 msgstr[2] "Умножавам %d белешки"
 msgstr[3] "Умножавам белешку"
 
-#: ../calendar/gui/e-cal-ops.c:2076
+#: ../calendar/gui/e-cal-ops.c:2047
 #, c-format
-#| msgid "Moving Items"
 msgid "Moving a task"
 msgid_plural "Moving %d tasks"
 msgstr[0] "Премештам %d задатак"
@@ -5067,9 +3890,8 @@ msgstr[1] "Премештам %d задатка"
 msgstr[2] "Премештам %d задатака"
 msgstr[3] "Премештам задатак"
 
-#: ../calendar/gui/e-cal-ops.c:2077
+#: ../calendar/gui/e-cal-ops.c:2048
 #, c-format
-#| msgid "Copying Items"
 msgid "Copying a task"
 msgid_plural "Copying %d tasks"
 msgstr[0] "Умножавам %d задатак"
@@ -5104,17 +3926,1273 @@ msgstr ""
 "Датум мора бити унет у облику: \n"
 "%s"
 
+#: ../calendar/gui/e-comp-editor-event.c:101
+#| msgid "Event's start time is in the past"
+msgid "Event's time is in the past"
+msgstr "Време догађаја је у прошлости"
+
+#: ../calendar/gui/e-comp-editor-event.c:202
+#| msgid "Event cannot be edited, because the selected calendar is read only"
+msgid ""
+"Event cannot be edited, because the selected calendar could not be opened"
+msgstr ""
+"Догађај се не може уређивати, пошто се изабрани календар не може отворити"
+
+#: ../calendar/gui/e-comp-editor-event.c:204
+msgid "Event cannot be edited, because the selected calendar is read only"
+msgstr ""
+"Догађај није могуће уређивати, пошто је изабрани календар само за читање"
+
+#: ../calendar/gui/e-comp-editor-event.c:206
+msgid "Event cannot be fully edited, because you are not the organizer"
+msgstr "Догађај није могуће потпуно уредити, пошто нисте организатор"
+
+#: ../calendar/gui/e-comp-editor-event.c:340
+#: ../calendar/gui/e-comp-editor-task.c:348
+#| msgid "Start date is wrong"
+msgid "Start date is not a valid date"
+msgstr "Датум почетка није исправан датум"
+
+#: ../calendar/gui/e-comp-editor-event.c:342
+#| msgid "Start time is wrong"
+msgid "Start time is not a valid time"
+msgstr "Време почетка није исправно време"
+
+#: ../calendar/gui/e-comp-editor-event.c:346
+#: ../calendar/gui/e-comp-editor-event.c:362
+#: ../calendar/gui/e-comp-editor-page-attachments.c:211
+#: ../calendar/gui/e-comp-editor.c:339 ../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
+msgid "Unknown error"
+msgstr "Непозната грешка"
+
+#: ../calendar/gui/e-comp-editor-event.c:356
+#| msgid "The calendar attached is not valid"
+msgid "End date is not a valid date"
+msgstr "Датум краја није исправан датум"
+
+#: ../calendar/gui/e-comp-editor-event.c:358
+#| msgid "Chosen file is not a local file."
+msgid "End time is not a valid time"
+msgstr "Време краја није исправно време"
+
+#: ../calendar/gui/e-comp-editor-event.c:480
+#: ../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:482
+#: ../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:488
+msgid "Time _Zone"
+msgstr "Временска _зона"
+
+#: ../calendar/gui/e-comp-editor-event.c:490
+msgid "Toggles whether the time zone is displayed"
+msgstr "Пребацује приказивање временске зоне"
+
+#: ../calendar/gui/e-comp-editor-event.c:496
+msgid "All _Day Event"
+msgstr "Целодневни догађа_ј"
+
+#: ../calendar/gui/e-comp-editor-event.c:498
+msgid "Toggles whether to have All Day Event"
+msgstr "Бира да ли дозвољава целодневне догађаје"
+
+#: ../calendar/gui/e-comp-editor-event.c:504
+msgid "Show Time as _Busy"
+msgstr "Прикажи време као _заузето"
+
+#: ../calendar/gui/e-comp-editor-event.c:506
+msgid "Toggles whether to show time as busy"
+msgstr "Пребацује приказивање времена као заузето"
+
+#: ../calendar/gui/e-comp-editor-event.c:515
+msgid "Pu_blic"
+msgstr "_Јавно"
+
+#: ../calendar/gui/e-comp-editor-event.c:517
+msgid "Classify as public"
+msgstr "Означите као јавно"
+
+#: ../calendar/gui/e-comp-editor-event.c:522
+msgid "_Private"
+msgstr "Л_ично"
+
+#: ../calendar/gui/e-comp-editor-event.c:524
+msgid "Classify as private"
+msgstr "Означите као лично"
+
+#: ../calendar/gui/e-comp-editor-event.c:529
+msgid "_Confidential"
+msgstr "Пове_рљиво"
+
+#: ../calendar/gui/e-comp-editor-event.c:531
+msgid "Classify as confidential"
+msgstr "Означите као поверљиво"
+
+#: ../calendar/gui/e-comp-editor-event.c:632
+#| msgid "_Start time:"
+msgctxt "ECompEditor"
+msgid "_Start time:"
+msgstr "Време _почетка:"
+
+#: ../calendar/gui/e-comp-editor-event.c:637
+#| msgid "_End time:"
+msgctxt "ECompEditor"
+msgid "_End time:"
+msgstr "Време _завршетка:"
+
+#: ../calendar/gui/e-comp-editor-event.c:647
+#| msgid "All _Day Event"
+msgctxt "ECompEditor"
+msgid "All da_y event"
+msgstr "Целодневни _догађај"
+
+#: ../calendar/gui/e-comp-editor-event.c:700
+#: ../calendar/gui/e-comp-editor-memo.c:192
+#: ../calendar/gui/e-comp-editor-task.c:529
+#| msgid "General"
+msgctxt "ECompEditorPage"
+msgid "General"
+msgstr "Опште"
+
+#: ../calendar/gui/e-comp-editor-event.c:703
+#: ../calendar/gui/e-comp-editor-task.c:535
+#| msgid "Reminders"
+msgctxt "ECompEditorPage"
+msgid "Reminders"
+msgstr "Подсетници"
+
+#: ../calendar/gui/e-comp-editor-event.c:706
+#| msgid "Recurrence"
+msgctxt "ECompEditorPage"
+msgid "Recurrence"
+msgstr "Понављање"
+
+#: ../calendar/gui/e-comp-editor-event.c:709
+#: ../calendar/gui/e-comp-editor-memo.c:195
+#: ../calendar/gui/e-comp-editor-task.c:538
+#| msgid "Attachments"
+msgctxt "ECompEditorPage"
+msgid "Attachments"
+msgstr "Прилози"
+
+#: ../calendar/gui/e-comp-editor-event.c:719
+msgctxt "ECompEditorPage"
+msgid "Schedule"
+msgstr "Планирање"
+
+#: ../calendar/gui/e-comp-editor-event.c:748
+#, c-format
+msgid "Meeting - %s"
+msgstr "Састанак — %s"
+
+#: ../calendar/gui/e-comp-editor-event.c:749
+#, c-format
+msgid "Appointment - %s"
+msgstr "Заказивање — %s"
+
+#: ../calendar/gui/e-comp-editor-memo.c:68
+#| msgid "Memo cannot be edited, because the selected memo list is read only"
+msgid ""
+"Memo cannot be edited, because the selected memo list could not be opened"
+msgstr ""
+"Белешка се не може уређивати, пошто се изабрани списак белешки не може "
+"отворити"
+
+#: ../calendar/gui/e-comp-editor-memo.c:70
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr "Белешку није могуће уређивати, пошто је изабран списак само за читање"
+
+#: ../calendar/gui/e-comp-editor-memo.c:72
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr "Белешку није могуће потпуно уредити, пошто нисте организатор"
+
+#: ../calendar/gui/e-comp-editor-memo.c:168
+#: ../calendar/gui/e-comp-editor-task.c:468
+msgid "_List:"
+msgstr "_Списак:"
+
+#: ../calendar/gui/e-comp-editor-memo.c:175
+#: ../calendar/gui/e-comp-editor-task.c:475
+#| msgid "Sta_rt date:"
+msgctxt "ECompEditor"
+msgid "Sta_rt date:"
+msgstr "Датум _почетка:"
+
+#: ../calendar/gui/e-comp-editor-memo.c:223
+#, c-format
+#| msgid "Assigned Task - %s"
+msgid "Assigned Memo - %s"
+msgstr "Додељена белешка — %s"
+
+#: ../calendar/gui/e-comp-editor-memo.c:224
+#, c-format
+msgid "Memo - %s"
+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
+#: ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
+#: ../mail/message-list.etspec.h:4
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Прилог"
+msgstr[1] "Прилози"
+msgstr[2] "Прилози"
+msgstr[3] "Прилог"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:206
+#: ../e-util/e-attachment.c:2542
+#, c-format
+msgid "Could not load '%s'"
+msgstr "Не могу да учитам „%s“"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:208
+#: ../e-util/e-attachment.c:2545
+#, c-format
+msgid "Could not load the attachment"
+msgstr "Не могу да учитам прилог"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:413
+#| msgid ""
+#| "Some attachments are being downloaded. Saving the task would result in "
+#| "the loss of these attachments."
+msgid ""
+"Some attachments are still being downloaded. Please wait until the download "
+"is finished."
+msgstr ""
+"Неки прилози се још увек преузимају. Сачекајте док се не заврши преузимање."
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:440
+#, 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
+#, 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
+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
+msgid "Attach a file"
+msgstr "Приложите датотеку"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:627
+#| msgid "Attachments"
+msgid "_Attachments"
+msgstr "_Прилози"
+
+#: ../calendar/gui/e-comp-editor-page-attachments.c:629
+#| msgctxt "iCalImp"
+#| msgid "has attachments"
+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
+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
+msgid "List View"
+msgstr "Преглед списком"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:313
+#, c-format
+#| msgid "Cannot find matching event in the next %d year"
+#| msgid_plural "Cannot find matching event in the next %d years"
+msgid "Cannot find attendee '%s' in the list of attendees"
+msgstr "Не могу да нађем учесника „%s“ на списку учесника"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:320
+#, c-format
+msgid "Not enough rights to delete attendee '%s'"
+msgstr "Немате довољна овлашћења за брисање учесника „%s“"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:350
+#| msgid "Failed to delete contact"
+msgid "Failed to delete selected attendee"
+msgid_plural "Failed to delete selected attendees"
+msgstr[0] "Нисам успео да обришем изабраног учесника"
+msgstr[1] "Нисам успео да обришем изабране учеснике"
+msgstr[2] "Нисам успео да обришем изабране учеснике"
+msgstr[3] "Нисам успео да обришем изабраног учесника"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:583
+#| msgid "Attendees"
+msgid "A_ttendees"
+msgstr "_Учесници"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:585
+#| msgid "Toggles whether the Attendee Type is displayed"
+msgid "Toggles whether the Attendees are displayed"
+msgstr "Окида приказивање учесника"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:594
+msgid "R_ole Field"
+msgstr "Поље _улоге"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:596
+msgid "Toggles whether the Role field is displayed"
+msgstr "Пребацује приказивање поља Улога"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:602
+msgid "_RSVP"
+msgstr "_Молим одговорите"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:604
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Пребацује приказивање поља Молим одговорите"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:610
+msgid "_Status Field"
+msgstr "Поље _стања"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:612
+msgid "Toggles whether the Status field is displayed"
+msgstr "Пребацује приказивање поља Стања"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:618
+msgid "_Type Field"
+msgstr "Поље _типа"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:620
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Пребацује приказивање поља Типа"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:945
+msgid "An organizer is required."
+msgstr "Потребан је организатор."
+
+#: ../calendar/gui/e-comp-editor-page-general.c:955
+#: ../calendar/gui/e-comp-editor-page-general.c:1086
+msgid "At least one attendee is required."
+msgstr "Најмање један учесник је потребан."
+
+#: ../calendar/gui/e-comp-editor-page-general.c:1209
+msgid "Or_ganizer:"
+msgstr "Ор_ганизатор:"
+
+#: ../calendar/gui/e-comp-editor-page-general.c:1288
+#| msgid "Atte_ndees..."
+msgctxt "ECompEditor"
+msgid "Atte_ndees..."
+msgstr "_Учесници..."
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:326
+msgid "Add exception"
+msgstr "Додај изузетак"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:364
+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
+msgid "on"
+msgstr "у"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [first] 
[Monday] [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:570
+#| msgid "first"
+msgctxt "ECompEditorPageRecur"
+msgid "first"
+msgstr "првог"
+
+#. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
+#. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] 
[forever]'
+#. * (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
+#| msgid "second"
+msgctxt "ECompEditorPageRecur"
+msgid "second"
+msgstr "другог"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] 
[Monday] [forever]'
+#. * (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
+#| msgid "third"
+msgctxt "ECompEditorPageRecur"
+msgid "third"
+msgstr "трећег"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] 
[Monday] [forever]'
+#. * (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
+#| msgid "fourth"
+msgctxt "ECompEditorPageRecur"
+msgid "fourth"
+msgstr "четвртог"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] 
[Monday] [forever]'
+#. * (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
+#| msgid "fifth"
+msgctxt "ECompEditorPageRecur"
+msgid "fifth"
+msgstr "петог"
+
+#. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] 
[Monday] [forever]'
+#. * (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
+#| msgid "last"
+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
+#| msgid "Other Date"
+msgctxt "ECompEditorPageRecur"
+msgid "Other Date"
+msgstr "Другог датума"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
+#. * 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
+#| msgid "1st to 10th"
+msgctxt "ECompEditorPageRecur"
+msgid "1st to 10th"
+msgstr "од првог до десетог"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
+#. * 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
+#| msgid "11th to 20th"
+msgctxt "ECompEditorPageRecur"
+msgid "11th to 20th"
+msgstr "од једанаестог до двадесетог"
+
+#. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
+#. * 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
+#| msgid "21st to 31st"
+msgctxt "ECompEditorPageRecur"
+msgid "21st to 31st"
+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
+#| msgid "day"
+#| msgid_plural "days"
+msgctxt "ECompEditorPageRecur"
+msgid "day"
+msgstr "дана"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:668
+#| msgid "Monday"
+msgctxt "ECompEditorPageRecur"
+msgid "Monday"
+msgstr "понедељка"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:669
+#| msgid "Tuesday"
+msgctxt "ECompEditorPageRecur"
+msgid "Tuesday"
+msgstr "уторка"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:670
+#| msgid "Wednesday"
+msgctxt "ECompEditorPageRecur"
+msgid "Wednesday"
+msgstr "среде"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:671
+#| msgid "Thursday"
+msgctxt "ECompEditorPageRecur"
+msgid "Thursday"
+msgstr "четвртка"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:672
+#| msgid "Friday"
+msgctxt "ECompEditorPageRecur"
+msgid "Friday"
+msgstr "петка"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:673
+#| msgid "Saturday"
+msgctxt "ECompEditorPageRecur"
+msgid "Saturday"
+msgstr "суботе"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:674
+#| msgid "Sunday"
+msgctxt "ECompEditorPageRecur"
+msgid "Sunday"
+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
+#| msgid "on the"
+msgctxt "ECompEditorPageRecur"
+msgid "on the"
+msgstr " "
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:993
+#| msgid "occurrences"
+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
+#| msgid "This appointment rec_urs"
+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
+#| msgid "This task recurs"
+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
+#| msgid "This memo recurs"
+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
+#| msgid "This appointment rec_urs"
+msgctxt "ECompEditorPageRecur"
+msgid "This component rec_urs"
+msgstr "Овај састојак се _понавља"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1862
+#| msgid "Recurrence date is invalid"
+msgid "Recurrence exception date is invalid"
+msgstr "Датум изузетка понављања није исправан"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1910
+#| msgid "End time of the recurrence was before event's start"
+msgid "End time of the recurrence is before the start"
+msgstr "Време завршетка понављања је пре почетка"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1953
+#| msgid "Recurrence"
+msgid "R_ecurrence"
+msgstr "_Понављање"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1955
+#| msgid "It has recurrences."
+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
+#| msgid "Every"
+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
+#| msgid "day(s)"
+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
+#| msgctxt "recurrpage"
+#| msgid "week(s)"
+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
+#| msgctxt "recurrpage"
+#| msgid "month(s)"
+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
+#| msgctxt "recurrpage"
+#| msgid "year(s)"
+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
+#| msgctxt "eventpage"
+#| msgid "for"
+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
+#| msgctxt "eventpage"
+#| msgid "until"
+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
+#| msgctxt "recurrpage"
+#| msgid "forever"
+msgctxt "ECompEditorPageRecur"
+msgid "forever"
+msgstr "увек"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2146
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Ово заказивање садржи понављања која Еволуција не може да уреди."
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2163
+msgid "Exceptions"
+msgstr "Изузеци"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2232
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1778
+#: ../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
+#: ../mail/mail-config.ui.h:64
+msgid "Re_move"
+msgstr "_Уклони"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2256
+msgid "Preview"
+msgstr "Преглед"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:41
+#| msgid "Send To:"
+msgid "Send To"
+msgstr "Пошаљи"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1555
+msgid "_Reminders"
+msgstr "_Подсетници"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1557
+#| msgid "Set or unset reminders for this event"
+msgid "Set or unset reminders"
+msgstr "Подесите или поништите подсетнике"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1610
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
+msgid "Reminders"
+msgstr "Подсетници"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1639
+msgid "_Reminder"
+msgstr "_Подсетник"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1672
+#, c-format
+#| msgid "%d day before appointment"
+#| msgid_plural "%d days before appointment"
+msgid "%d day before"
+msgid_plural "%d days before"
+msgstr[0] "%d дан пре"
+msgstr[1] "%d дана пре"
+msgstr[2] "%d дана пре"
+msgstr[3] "%d дан пре"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1679
+#, c-format
+#| msgid "%d hour before appointment"
+#| msgid_plural "%d hours before appointment"
+msgid "%d hour before"
+msgid_plural "%d hours before"
+msgstr[0] "%d сат пре"
+msgstr[1] "%d сата пре"
+msgstr[2] "%d сати пре"
+msgstr[3] "%d сат пре"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1686
+#, c-format
+#| msgid "%d minute before appointment"
+#| msgid_plural "%d minutes before appointment"
+msgid "%d minute before"
+msgid_plural "%d minutes before"
+msgstr[0] "%d минут пре"
+msgstr[1] "%d минута пре"
+msgstr[2] "%d минута пре"
+msgstr[3] "%d минут пре"
+
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# 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.
+#. Translators: "None" for "No reminder set"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1694
+msgctxt "cal-reminders"
+msgid "None"
+msgstr "Ништа"
+
+#. Translators: Predefined reminder's description
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1696
+#| msgid "15 minutes"
+msgctxt "cal-reminders"
+msgid "15 minutes before"
+msgstr "пре 15 минута"
+
+#. Translators: Predefined reminder's description
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1698
+#| msgid "1 hour ago"
+#| msgid_plural "%d hours ago"
+msgctxt "cal-reminders"
+msgid "1 hour before"
+msgstr "пре %d сат"
+
+#. Translators: Predefined reminder's description
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1700
+#| msgid "is before"
+msgctxt "cal-reminders"
+msgid "1 day before"
+msgstr "пре 1 дана"
+
+#. Translators: "Custom" for "Custom reminder set"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1712
+#| msgid "Custom"
+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
+#| msgid "minute(s)"
+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
+#| msgid "hour(s)"
+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
+#| msgid "day(s)"
+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
+#| msgid "before"
+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
+#| msgid "after"
+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
+#| msgid "Start"
+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
+#| msgid "_Send"
+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
+#| msgid "_Repeat the reminder"
+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
+#| msgid "extra times every"
+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
+#| msgid "minutes"
+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
+#| msgid "hours"
+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
+#| msgid "days"
+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
+#| msgid "Custom _message"
+msgctxt "cal-reminders"
+msgid "Custom _message"
+msgstr "Произвољна _порука"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2078
+#| msgid "Custom reminder sound"
+msgctxt "cal-reminders"
+msgid "Custom reminder _sound"
+msgstr "Произвољан _звук подсетника"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2089
+#| msgid "Select sound file"
+msgid "Select a sound file"
+msgstr "Изаберите звучну датотеку"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2117
+msgid "_Program:"
+msgstr "_Програм:"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2142
+msgid "_Arguments:"
+msgstr "_Аргументи:"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2174
+#| msgid "Send To:"
+msgid "_Send To:"
+msgstr "_Пошаљи:"
+
+#: ../calendar/gui/e-comp-editor-page-schedule.c:427
+#| msgid "_Schedule Meeting..."
+msgid "_Schedule"
+msgstr "_Закажи"
+
+#: ../calendar/gui/e-comp-editor-page-schedule.c:429
+msgid "Query free / busy information for the attendees"
+msgstr "Затражи податак за слободно/заузето време за ове учеснике"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:81
+#| msgid "_Summary:"
+msgctxt "ECompEditor"
+msgid "_Summary:"
+msgstr "_Сажетак:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:325
+#| msgid "_Location:"
+msgctxt "ECompEditor"
+msgid "_Location:"
+msgstr "_Место:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:458
+#| msgid "Ca_tegories..."
+msgctxt "ECompEditor"
+msgid "_Categories..."
+msgstr "_Категорије..."
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:555
+#| msgid "_Description:"
+msgctxt "ECompEditor"
+msgid "_Description:"
+msgstr "_Опис:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:686
+#| msgid "_Web Page:"
+msgctxt "ECompEditor"
+msgid "_Web page:"
+msgstr "_Веб страница:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1057
+#| msgid "D_ue date:"
+msgctxt "ECompEditor"
+msgid "D_ue date:"
+msgstr "Крајњи _рок:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1117
+#| msgid "Date _completed:"
+msgctxt "ECompEditor"
+msgid "Date _completed:"
+msgstr "_Датум завршетка:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1133
+#| msgid "Public"
+msgctxt "ECompEditor"
+msgid "Public"
+msgstr "Јавно"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1134
+#| msgid "Private"
+msgctxt "ECompEditor"
+msgid "Private"
+msgstr "Лично"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1135
+#| msgid "Confidential"
+msgctxt "ECompEditor"
+msgid "Confidential"
+msgstr "Поверљиво"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1144
+#| msgid "C_lassification:"
+msgctxt "ECompEditor"
+msgid "C_lassification:"
+msgstr "_Разврставање:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1157
+#| msgid "Not Started"
+msgctxt "ECompEditor"
+msgid "Not Started"
+msgstr "Није започет"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1158
+#| msgid "In Progress"
+msgctxt "ECompEditor"
+msgid "In Progress"
+msgstr "У току"
+
+# timezone.
+#: ../calendar/gui/e-comp-editor-property-parts.c:1159
+#| msgid "Completed"
+msgctxt "ECompEditor"
+msgid "Completed"
+msgstr "Завршено"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1160
+#| msgid "Canceled"
+msgctxt "ECompEditor"
+msgid "Canceled"
+msgstr "Отказано"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1169
+#| msgid "_Status:"
+msgctxt "ECompEditor"
+msgid "_Status:"
+msgstr "_Стање:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1199
+#| msgid "Undefined"
+msgctxt "ECompEditor"
+msgid "Undefined"
+msgstr "Неодређен"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1200
+#| msgid "High"
+msgctxt "ECompEditor"
+msgid "High"
+msgstr "Висок"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1201
+#| msgid "Normal"
+msgctxt "ECompEditor"
+msgid "Normal"
+msgstr "Обичан"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1202
+#| msgid "Low"
+msgctxt "ECompEditor"
+msgid "Low"
+msgstr "Низак"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1211
+#| msgid "Priorit_y:"
+msgctxt "ECompEditor"
+msgid "Priorit_y:"
+msgstr "_Важност:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1265
+#| msgid "_Percent complete:"
+msgctxt "ECompEditor"
+msgid "Percent complete:"
+msgstr "Проценат завршеног:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1346
+#| msgid "Time _zone:"
+msgctxt "ECompEditor"
+msgid "Time _zone:"
+msgstr "Временска _зона:"
+
+#: ../calendar/gui/e-comp-editor-property-parts.c:1471
+#| msgid "Show Time as _Busy"
+msgctxt "ECompEditor"
+msgid "Show time as _busy"
+msgstr "Прикажи време као _заузето"
+
+#: ../calendar/gui/e-comp-editor-task.c:75
+msgid "Task's start date is in the past"
+msgstr "Почетак задатка је у прошлости"
+
+#: ../calendar/gui/e-comp-editor-task.c:83
+msgid "Task's due date is in the past"
+msgstr "Рок за завршетак задатка је у прошлости"
+
+#: ../calendar/gui/e-comp-editor-task.c:308
+#| msgid "Task cannot be edited, because the selected task list is read only"
+msgid ""
+"Task cannot be edited, because the selected task list could not be opened"
+msgstr ""
+"Задатак се не може уређивати, пошто се изабрани списак задатака не може "
+"отворити"
+
+#: ../calendar/gui/e-comp-editor-task.c:310
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr "Задатак није могуће уређивати, пошто је изабрани списак само за читање"
+
+#: ../calendar/gui/e-comp-editor-task.c:312
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr "Задатак није могуће потпуно уредити, зато што нисте организатор"
+
+#: ../calendar/gui/e-comp-editor-task.c:359
+#| msgid "Recurrence date is invalid"
+msgid "Due date is not a valid date"
+msgstr "Датум истека није исправан датум"
+
+#: ../calendar/gui/e-comp-editor-task.c:370
+#| msgid "Completed date is wrong"
+msgid "Completed date is not a valid date"
+msgstr "Датум завршетка није исправан датум"
+
+#: ../calendar/gui/e-comp-editor-task.c:381
+#| msgid "1 minute in the future"
+#| msgid_plural "%d minutes in the future"
+msgid "Completed date cannot be in the future"
+msgstr "Датум завршетка не може бити у будућности"
+
+#: ../calendar/gui/e-comp-editor-task.c:566
+#, c-format
+msgid "Assigned Task - %s"
+msgstr "Додељен задатак — %s"
+
+#: ../calendar/gui/e-comp-editor-task.c:567
+#, c-format
+msgid "Task - %s"
+msgstr "Задатак — %s"
+
+#: ../calendar/gui/e-comp-editor.c:254
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:127
+msgid "attachment"
+msgstr "прилог"
+
+#: ../calendar/gui/e-comp-editor.c:609
+#| msgid "Send _updates to attendees"
+msgid "Sending notifications to attendees..."
+msgstr "Шаљем обавештења учесницима..."
+
+#: ../calendar/gui/e-comp-editor.c:991
+#| msgid "_Save Changes"
+msgid "Saving changes..."
+msgstr "Чувам измене..."
+
+#: ../calendar/gui/e-comp-editor.c:1247
+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:295
+#: ../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
+#: ../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
+msgid "_Close"
+msgstr "_Затвори"
+
+#: ../calendar/gui/e-comp-editor.c:1974
+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
+msgid "_Copy"
+msgstr "_Умножи"
+
+#: ../calendar/gui/e-comp-editor.c:1981 ../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
+#: ../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
+#: ../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
+#: ../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
+#: ../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
+#: ../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
+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
+#: ../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
+#: ../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
+#: ../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
+#: ../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
+#: ../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
+#: ../modules/calendar/e-task-shell-view-actions.c:1016
+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
+#: ../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
+#: ../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
+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:309 ../mail/e-mail-browser.c:166
+#: ../mail/e-mail-notes.c:917 ../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
+msgid "_Insert"
+msgstr "_Уметни"
+
+#: ../calendar/gui/e-comp-editor.c:2086 ../composer/e-composer-actions.c:378
+msgid "_Options"
+msgstr "_Могућности"
+
+#: ../calendar/gui/e-comp-editor.c:2093 ../e-util/e-html-editor-actions.c:1169
+#: ../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
+msgid "_View"
+msgstr "П_реглед"
+
+#: ../calendar/gui/e-comp-editor.c:2105
+msgid "Save current changes"
+msgstr "Сачувајте текуће измене"
+
+#: ../calendar/gui/e-comp-editor.c:2110 ../e-util/e-mail-signature-editor.c:304
+#: ../mail/e-mail-notes.c:912
+msgid "Save and Close"
+msgstr "Сачувај и затвори"
+
+#: ../calendar/gui/e-comp-editor.c:2112
+msgid "Save current changes and close editor"
+msgstr "Сачувајте текуће измене и затворите уређивач"
+
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:2138 ../calendar/gui/e-week-view.c:1694
-#: ../calendar/gui/print.c:1073 ../calendar/gui/print.c:1092
-#: ../calendar/gui/print.c:2622 ../calendar/gui/print.c:2642
+#: ../calendar/gui/e-day-view.c:2132 ../calendar/gui/e-week-view.c:1728
+#: ../calendar/gui/print.c:1072 ../calendar/gui/print.c:1091
+#: ../calendar/gui/print.c:2628 ../calendar/gui/print.c:2648
 msgid "am"
 msgstr "прп"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:2141 ../calendar/gui/e-week-view.c:1697
-#: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
-#: ../calendar/gui/print.c:2627 ../calendar/gui/print.c:2644
+#: ../calendar/gui/e-day-view.c:2135 ../calendar/gui/e-week-view.c:1731
+#: ../calendar/gui/print.c:1077 ../calendar/gui/print.c:1093
+#: ../calendar/gui/print.c:2633 ../calendar/gui/print.c:2650
 msgid "pm"
 msgstr "поп"
 
@@ -5129,13 +5207,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:3019 ../calendar/gui/e-day-view-top-item.c:851
-#: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2089
+#: ../calendar/gui/e-day-view.c:3017 ../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"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:3744
+#: ../calendar/gui/e-day-view.c:3742
 #, c-format
 msgid "Week %d"
 msgstr "%d. недеља"
@@ -5146,12 +5224,12 @@ msgstr "%d. недеља"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:804
+#: ../calendar/gui/e-day-view-time-item.c:806
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i минутни размаци"
 
-#: ../calendar/gui/e-day-view-time-item.c:829
+#: ../calendar/gui/e-day-view-time-item.c:831
 msgid "Show the second time zone"
 msgstr "Прикажи другу временску зону"
 
@@ -5161,17 +5239,17 @@ msgstr "Прикажи другу временску зону"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:846
-#: ../modules/calendar/e-calendar-preferences.c:308
-#: ../modules/calendar/e-calendar-preferences.c:360
+#: ../calendar/gui/e-day-view-time-item.c:848
+#: ../modules/calendar/e-calendar-preferences.c:303
+#: ../modules/calendar/e-calendar-preferences.c:355
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ништа"
 
-#: ../calendar/gui/e-day-view-time-item.c:880
+#: ../calendar/gui/e-day-view-time-item.c:882
 #: ../calendar/gui/e-timezone-entry.c:324
-#: ../modules/calendar/e-calendar-preferences.c:391
+#: ../modules/calendar/e-calendar-preferences.c:386
 msgid "Select..."
 msgstr "Изабери..."
 
@@ -5191,51 +5269,55 @@ msgstr "Могући учесници"
 msgid "Resources"
 msgstr "Извори"
 
+#: ../calendar/gui/e-meeting-list-view.c:164
+msgid "Attendees"
+msgstr "Учесници"
+
 #: ../calendar/gui/e-meeting-list-view.c:180
 #: ../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:1246
+#: ../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-store.c:111 ../calendar/gui/e-meeting-store.c:128
-#: ../calendar/gui/print.c:1247 ../e-util/e-table-config.ui.h:8
+#: ../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-store.c:113 ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/print.c:1248
+#: ../calendar/gui/print.c:1247
 msgid "Resource"
 msgstr "Извор"
 
 #: ../calendar/gui/e-meeting-list-view.c:183
 #: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1249
+#: ../calendar/gui/print.c:1248
 msgid "Room"
 msgstr "Соба"
 
 #: ../calendar/gui/e-meeting-list-view.c:194
 #: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:161
-#: ../calendar/gui/print.c:1263
+#: ../calendar/gui/print.c:1262
 msgid "Chair"
 msgstr "Столица"
 
 #: ../calendar/gui/e-meeting-list-view.c:195
 #: ../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:1264
+#: ../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-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/print.c:1265
+#: ../calendar/gui/print.c:1264
 msgid "Optional Participant"
 msgstr "Могући учесник"
 
 #: ../calendar/gui/e-meeting-list-view.c:197
 #: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/print.c:1266
+#: ../calendar/gui/print.c:1265
 msgid "Non-Participant"
 msgstr "Не-учесник"
 
@@ -5245,11 +5327,20 @@ msgstr "Не-учесник"
 msgid "Needs Action"
 msgstr "Потребна радња"
 
-#: ../calendar/gui/e-meeting-list-view.c:644
+#: ../calendar/gui/e-meeting-list-view.c:619
 msgid "Attendee                          "
 msgstr "Учесник                          "
 
-#: ../calendar/gui/e-meeting-list-view.c:699
+#: ../calendar/gui/e-meeting-list-view.c:645
+#: ../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
+#: ../mail/e-mail-account-tree-view.c:157
+msgid "Type"
+msgstr "Врста"
+
+#: ../calendar/gui/e-meeting-list-view.c:674
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "МВОМ"
@@ -5284,59 +5375,63 @@ msgstr "Ван канцеларије"
 msgid "No Information"
 msgstr "Нема податка"
 
+#: ../calendar/gui/e-meeting-time-sel.c:555
+msgid "Atte_ndees..."
+msgstr "Уч_есници..."
+
 #: ../calendar/gui/e-meeting-time-sel.c:574
 msgid "O_ptions"
 msgstr "_Могућности"
 
-#: ../calendar/gui/e-meeting-time-sel.c:594
+#: ../calendar/gui/e-meeting-time-sel.c:595
 msgid "Show _only working hours"
 msgstr "Прикажи _само радне сате"
 
-#: ../calendar/gui/e-meeting-time-sel.c:607
+#: ../calendar/gui/e-meeting-time-sel.c:608
 msgid "Show _zoomed out"
 msgstr "Прикажи _умањено"
 
-#: ../calendar/gui/e-meeting-time-sel.c:625
+#: ../calendar/gui/e-meeting-time-sel.c:626
 msgid "_Update free/busy"
 msgstr "_Ажурирај слободно/заузето"
 
-#: ../calendar/gui/e-meeting-time-sel.c:642
+#: ../calendar/gui/e-meeting-time-sel.c:643
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:662
+#: ../calendar/gui/e-meeting-time-sel.c:663
 msgid "_Autopick"
 msgstr "_Самоизбор"
 
-#: ../calendar/gui/e-meeting-time-sel.c:679
+#: ../calendar/gui/e-meeting-time-sel.c:680
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:700
+#: ../calendar/gui/e-meeting-time-sel.c:702
 msgid "_All people and resources"
 msgstr "_Све људе и изворе"
 
-#: ../calendar/gui/e-meeting-time-sel.c:711
+#: ../calendar/gui/e-meeting-time-sel.c:713
 msgid "All _people and one resource"
 msgstr "Све _људе и један извор"
 
-#: ../calendar/gui/e-meeting-time-sel.c:722
+#: ../calendar/gui/e-meeting-time-sel.c:724
 msgid "_Required people"
 msgstr "_Обавезне људе"
 
-#: ../calendar/gui/e-meeting-time-sel.c:732
+#: ../calendar/gui/e-meeting-time-sel.c:734
 msgid "Required people and _one resource"
 msgstr "Обавезне људе и _један извор"
 
-#: ../calendar/gui/e-meeting-time-sel.c:771
+#: ../calendar/gui/e-meeting-time-sel.c:773
 msgid "_Start time:"
 msgstr "_Време почетка:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:800
+#: ../calendar/gui/e-meeting-time-sel.c:802
 msgid "_End time:"
 msgstr "Време _завршетка:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2721
+#: ../calendar/gui/e-meeting-time-sel.c:2727
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -5345,7 +5440,7 @@ msgstr ""
 "Сажетак: %s\n"
 "Место: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2723 ../calendar/gui/print.c:3516
+#: ../calendar/gui/e-meeting-time-sel.c:2729 ../calendar/gui/print.c:3522
 #, c-format
 msgid "Summary: %s"
 msgstr "Сажетак: %s"
@@ -5374,46 +5469,46 @@ msgstr "Заједничко име"
 msgid "Language"
 msgstr "Језик"
 
-#: ../calendar/gui/e-memo-table.c:371
-#: ../modules/calendar/e-cal-shell-content.c:1599
-#: ../modules/calendar/e-memo-shell-view-actions.c:180
-#: ../modules/calendar/e-memo-shell-view-actions.c:195
-#: ../modules/calendar/e-memo-shell-view.c:308
+#: ../calendar/gui/e-memo-table.c:370
+#: ../modules/calendar/e-cal-shell-content.c:1667
+#: ../modules/calendar/e-memo-shell-view-actions.c:196
+#: ../modules/calendar/e-memo-shell-view-actions.c:211
+#: ../modules/calendar/e-memo-shell-view.c:315
 msgid "Memos"
 msgstr "Белешке"
 
-#: ../calendar/gui/e-memo-table.c:455 ../calendar/gui/e-task-table.c:757
+#: ../calendar/gui/e-memo-table.c:454 ../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:540 ../calendar/gui/e-task-table.c:839
+#: ../calendar/gui/e-memo-table.c:539 ../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:560 ../calendar/gui/e-task-table.c:858
+#: ../calendar/gui/e-memo-table.c:559 ../calendar/gui/e-task-table.c:858
 msgid "Due: "
 msgstr "Рок: "
 
-#: ../calendar/gui/e-memo-table.c:683
+#: ../calendar/gui/e-memo-table.c:682
 msgid "Cut selected memos to the clipboard"
 msgstr "Сече изабране белешке у списак исечака"
 
-#: ../calendar/gui/e-memo-table.c:689
+#: ../calendar/gui/e-memo-table.c:688
 msgid "Copy selected memos to the clipboard"
 msgstr "Умножава изабране белешке у списак исечака"
 
-#: ../calendar/gui/e-memo-table.c:695
+#: ../calendar/gui/e-memo-table.c:694
 msgid "Paste memos from the clipboard"
 msgstr "Убацује белешке из списка исечака"
 
-#: ../calendar/gui/e-memo-table.c:701
-#: ../modules/calendar/e-memo-shell-view-actions.c:531
+#: ../calendar/gui/e-memo-table.c:700
+#: ../modules/calendar/e-memo-shell-view-actions.c:560
 msgid "Delete selected memos"
 msgstr "Брише изабране белешке"
 
-#: ../calendar/gui/e-memo-table.c:707
+#: ../calendar/gui/e-memo-table.c:706
 msgid "Select all visible memos"
 msgstr "Бира све видљиве белешке"
 
@@ -5421,6 +5516,11 @@ msgstr "Бира све видљиве белешке"
 msgid "Click to add a memo"
 msgstr "Кликните да додате белешку"
 
+#: ../calendar/gui/e-task-table.c:527 ../calendar/gui/tasktypes.xml.h:22
+#: ../e-util/e-send-options.ui.h:1
+msgid "Undefined"
+msgstr "Неодређен"
+
 # Don't use any other specifiers.
 # strftime format %d = day of month, %b = abbreviated
 # month name. You can change the order but don't
@@ -5434,14 +5534,14 @@ msgstr "Кликните да додате белешку"
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2404
-#: ../calendar/importers/icalendar-importer.c:78
-#: ../calendar/importers/icalendar-importer.c:1062
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
-#: ../modules/calendar/e-cal-shell-content.c:1559
-#: ../modules/calendar/e-task-shell-view-actions.c:203
-#: ../modules/calendar/e-task-shell-view-actions.c:218
-#: ../modules/calendar/e-task-shell-view.c:466
+#: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2410
+#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/importers/icalendar-importer.c:1117
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-cal-shell-content.c:1627
+#: ../modules/calendar/e-task-shell-view-actions.c:220
+#: ../modules/calendar/e-task-shell-view-actions.c:235
+#: ../modules/calendar/e-task-shell-view.c:473
 msgid "Tasks"
 msgstr "Задаци"
 
@@ -5458,7 +5558,7 @@ msgid "Paste tasks from the clipboard"
 msgstr "Убацује задатке из списка исечака"
 
 #: ../calendar/gui/e-task-table.c:1016
-#: ../modules/calendar/e-task-shell-view-actions.c:656
+#: ../modules/calendar/e-task-shell-view-actions.c:686
 msgid "Delete selected tasks"
 msgstr "Брише изабране задатке"
 
@@ -5466,6 +5566,36 @@ msgstr "Брише изабране задатке"
 msgid "Select all visible tasks"
 msgstr "Бира све видљиве задатке"
 
+#: ../calendar/gui/e-task-table.etspec.h:1
+msgid "Click to add a task"
+msgstr "Кликните да додате задатак"
+
+#: ../calendar/gui/e-task-table.etspec.h:2
+msgid "Start date"
+msgstr "Датум почетка"
+
+#: ../calendar/gui/e-task-table.etspec.h:5
+msgid "Completion date"
+msgstr "Датум завршетка"
+
+#: ../calendar/gui/e-task-table.etspec.h:6 ../mail/mail-send-recv.c:965
+msgid "Complete"
+msgstr "Завршено"
+
+#: ../calendar/gui/e-task-table.etspec.h:7
+msgid "Due date"
+msgstr "Крајњи рок"
+
+#: ../calendar/gui/e-task-table.etspec.h:9
+#, no-c-format
+msgid "% Complete"
+msgstr "% је завршено"
+
+#: ../calendar/gui/e-task-table.etspec.h:10 ../calendar/gui/tasktypes.xml.h:18
+#: ../plugins/save-calendar/csv-format.c:386
+msgid "Priority"
+msgstr "Важност"
+
 #: ../calendar/gui/e-timezone-entry.c:335
 msgid "Select Timezone"
 msgstr "Изабери временску зону"
@@ -5475,36 +5605,36 @@ msgstr "Изабери временску зону"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2068
+#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2074
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:650 ../calendar/gui/itip-utils.c:708
+#: ../calendar/gui/itip-utils.c:842
 msgid "An organizer must be set."
 msgstr "Организатор мора бити одређен."
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:699
 msgid "At least one attendee is necessary"
 msgstr "Најмање један учесник је неопходан"
 
-#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
+#: ../calendar/gui/itip-utils.c:930 ../calendar/gui/itip-utils.c:1091
 msgid "Event information"
 msgstr "Подаци о догађају"
 
-#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
+#: ../calendar/gui/itip-utils.c:933 ../calendar/gui/itip-utils.c:1094
 msgid "Task information"
 msgstr "Подаци о задатку"
 
-#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1096
+#: ../calendar/gui/itip-utils.c:936 ../calendar/gui/itip-utils.c:1097
 msgid "Memo information"
 msgstr "Подаци о белешци"
 
-#: ../calendar/gui/itip-utils.c:938 ../calendar/gui/itip-utils.c:1114
+#: ../calendar/gui/itip-utils.c:939 ../calendar/gui/itip-utils.c:1115
 msgid "Free/Busy information"
 msgstr "Подаци слободно/заузето"
 
-#: ../calendar/gui/itip-utils.c:941
+#: ../calendar/gui/itip-utils.c:942
 msgid "Calendar information"
 msgstr "Подаци о календару"
 
@@ -5512,7 +5642,7 @@ msgstr "Подаци о календару"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:978
+#: ../calendar/gui/itip-utils.c:979
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Прихваћено"
@@ -5521,7 +5651,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:985
+#: ../calendar/gui/itip-utils.c:986
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Прихваћено с резервом"
@@ -5533,7 +5663,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:992 ../calendar/gui/itip-utils.c:1040
+#: ../calendar/gui/itip-utils.c:993 ../calendar/gui/itip-utils.c:1041
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Одбијено"
@@ -5542,7 +5672,7 @@ msgstr "Одбијено"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:999
+#: ../calendar/gui/itip-utils.c:1000
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Делегирано"
@@ -5550,7 +5680,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:1012
+#: ../calendar/gui/itip-utils.c:1013
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Освежено"
@@ -5558,7 +5688,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:1019
+#: ../calendar/gui/itip-utils.c:1020
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Откажи"
@@ -5566,7 +5696,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:1026
+#: ../calendar/gui/itip-utils.c:1027
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Освежи"
@@ -5574,170 +5704,166 @@ 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:1033
+#: ../calendar/gui/itip-utils.c:1034
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Против-предлог"
 
-#: ../calendar/gui/itip-utils.c:1111
+#: ../calendar/gui/itip-utils.c:1112
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Подаци слободно/заузето (%s до %s)"
 
-#: ../calendar/gui/itip-utils.c:1119
+#: ../calendar/gui/itip-utils.c:1120
 msgid "iCalendar information"
 msgstr "Подаци иКалендара"
 
-#: ../calendar/gui/itip-utils.c:1148
+#: ../calendar/gui/itip-utils.c:1149
 #, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "Не могу да сачувам унос, нови догађај се сукобљава са неким другим."
 
-#: ../calendar/gui/itip-utils.c:1153
-#| msgid "Unable to book a resource, error: %s"
+#: ../calendar/gui/itip-utils.c:1154
 msgid "Unable to book a resource, error: "
 msgstr "Не могу да сачувам унос, грешка: "
 
-#: ../calendar/gui/itip-utils.c:1324
+#: ../calendar/gui/itip-utils.c:1325
 msgid "You must be an attendee of the event."
 msgstr "Морате бити учесник догађаја."
 
-#: ../calendar/gui/itip-utils.c:1918
-#| msgid "Sending message"
+#: ../calendar/gui/itip-utils.c:1933
 msgid "Sending an event"
 msgstr "Шаљем догађај"
 
-#: ../calendar/gui/itip-utils.c:1922
-#| msgid "Sending message"
+#: ../calendar/gui/itip-utils.c:1937
 msgid "Sending a memo"
 msgstr "Шаљем белешку"
 
-#: ../calendar/gui/itip-utils.c:1926
-#| msgid "Sending Email"
+#: ../calendar/gui/itip-utils.c:1941
 msgid "Sending a task"
 msgstr "Шаљем задатак"
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:667
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:667
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:667
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:667
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:668
+#: ../calendar/gui/print.c:667
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:669
+#: ../calendar/gui/print.c:668
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:669
+#: ../calendar/gui/print.c:668
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:669
+#: ../calendar/gui/print.c:668
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:669
+#: ../calendar/gui/print.c:668
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:669
+#: ../calendar/gui/print.c:668
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:670
+#: ../calendar/gui/print.c:669
 msgid "31st"
 msgstr "31."
 
@@ -5745,102 +5871,114 @@ msgstr "31."
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_BAD_WEEKDAY
 #. G_DATE_MONDAY
-#: ../calendar/gui/print.c:730
+#: ../calendar/gui/print.c:729
 msgid "Mo"
 msgstr "По"
 
 #. G_DATE_TUESDAY
-#: ../calendar/gui/print.c:731
+#: ../calendar/gui/print.c:730
 msgid "Tu"
 msgstr "Ут"
 
 #. G_DATE_WEDNESDAY
-#: ../calendar/gui/print.c:732
+#: ../calendar/gui/print.c:731
 msgid "We"
 msgstr "Ср"
 
 #. G_DATE_THURSDAY
-#: ../calendar/gui/print.c:733
+#: ../calendar/gui/print.c:732
 msgid "Th"
 msgstr "Че"
 
 #. G_DATE_FRIDAY
-#: ../calendar/gui/print.c:734
+#: ../calendar/gui/print.c:733
 msgid "Fr"
 msgstr "Пе"
 
 #. G_DATE_SATURDAY
-#: ../calendar/gui/print.c:735
+#: ../calendar/gui/print.c:734
 msgid "Sa"
 msgstr "Су"
 
 #. G_DATE_SUNDAY
-#: ../calendar/gui/print.c:736
+#: ../calendar/gui/print.c:735
 msgid "Su"
 msgstr "Не"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3309
+#: ../calendar/gui/print.c:3315
 msgid " to "
 msgstr " до "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3319
+#: ../calendar/gui/print.c:3325
 msgid " (Completed "
 msgstr " (Завршено је "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3325
+#: ../calendar/gui/print.c:3331
 msgid "Completed "
 msgstr "Завршено је "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3335
+#: ../calendar/gui/print.c:3341
 msgid " (Due "
 msgstr " (Рок "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3342
+#: ../calendar/gui/print.c:3348
 msgid "Due "
 msgstr "Рок "
 
-#: ../calendar/gui/print.c:3546
+#: ../calendar/gui/print.c:3492
+msgid "Appointment"
+msgstr "Заказивање"
+
+#: ../calendar/gui/print.c:3494 ../e-util/e-send-options.c:553
+msgid "Task"
+msgstr "Задатак"
+
+#: ../calendar/gui/print.c:3496
+msgid "Memo"
+msgstr "Белешка"
+
+#: ../calendar/gui/print.c:3552
 msgid "Attendees: "
 msgstr "Присутни: "
 
-#: ../calendar/gui/print.c:3590
+#: ../calendar/gui/print.c:3596
 #, c-format
 msgid "Status: %s"
 msgstr "Стање: %s"
 
-#: ../calendar/gui/print.c:3606
+#: ../calendar/gui/print.c:3612
 #, c-format
 msgid "Priority: %s"
 msgstr "Важност: %s"
 
-#: ../calendar/gui/print.c:3624
+#: ../calendar/gui/print.c:3630
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Постотак завршеног: %i"
 
-#: ../calendar/gui/print.c:3638
+#: ../calendar/gui/print.c:3644
 #, c-format
 msgid "URL: %s"
 msgstr "Адреса: %s"
 
-#: ../calendar/gui/print.c:3652
+#: ../calendar/gui/print.c:3658
 #, c-format
 msgid "Categories: %s"
 msgstr "Категорије: %s"
 
-#: ../calendar/gui/print.c:3663
+#: ../calendar/gui/print.c:3669
 msgid "Contacts: "
 msgstr "Контакти: "
 
@@ -5863,186 +6001,209 @@ msgstr "је веће од"
 msgid "is less than"
 msgstr "је мање од"
 
-#: ../calendar/importers/icalendar-importer.c:77
+#: ../calendar/importers/icalendar-importer.c:78
 msgid "Appointments and Meetings"
 msgstr "Заказивање и састанци"
 
-#: ../calendar/importers/icalendar-importer.c:452
-#: ../calendar/importers/icalendar-importer.c:891
+#: ../calendar/importers/icalendar-importer.c:312
+#: ../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
+#: ../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
+#| msgid "Create a new calendar"
+msgid "Cre_ate new calendar"
+msgstr "Направи _нови календар"
+
+#: ../calendar/importers/icalendar-importer.c:361
+#| msgid "Create a new task list"
+msgid "Cre_ate new task list"
+msgstr "_Направи нови списак задатака"
+
+#: ../calendar/importers/icalendar-importer.c:507
+#: ../calendar/importers/icalendar-importer.c:946
 msgid "Opening calendar"
 msgstr "Отварање календара"
 
-#: ../calendar/importers/icalendar-importer.c:600
+#: ../calendar/importers/icalendar-importer.c:655
 msgid "iCalendar files (.ics)"
 msgstr "Датотеке иКалендара (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:601
+#: ../calendar/importers/icalendar-importer.c:656
 msgid "Evolution iCalendar importer"
 msgstr "Увозник иКалендара Еволуције"
 
-#: ../calendar/importers/icalendar-importer.c:693
+#: ../calendar/importers/icalendar-importer.c:748
 msgid "Reminder!"
 msgstr "Подсетник!"
 
-#: ../calendar/importers/icalendar-importer.c:777
+#: ../calendar/importers/icalendar-importer.c:832
 msgid "vCalendar files (.vcs)"
 msgstr "Датотеке вКалендара (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:778
+#: ../calendar/importers/icalendar-importer.c:833
 msgid "Evolution vCalendar importer"
 msgstr "Увозник вКалендара Еволуције"
 
-#: ../calendar/importers/icalendar-importer.c:1055
+#: ../calendar/importers/icalendar-importer.c:1110
 msgid "Calendar Events"
 msgstr "Догађаји календара"
 
-#: ../calendar/importers/icalendar-importer.c:1098
-msgid "Gnome Calendar"
+#: ../calendar/importers/icalendar-importer.c:1153
+#| msgid "New Calendar"
+msgid "GNOME Calendar"
 msgstr "Гномов календар"
 
-#: ../calendar/importers/icalendar-importer.c:1099
+#: ../calendar/importers/icalendar-importer.c:1154
 msgid "Evolution Calendar intelligent importer"
 msgstr "Интелигентни увозник календара Еволуције"
 
-#: ../calendar/importers/icalendar-importer.c:1170
-#: ../calendar/importers/icalendar-importer.c:1484
+#: ../calendar/importers/icalendar-importer.c:1225
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Састанак"
 
-#: ../calendar/importers/icalendar-importer.c:1170
-#: ../calendar/importers/icalendar-importer.c:1484
+#: ../calendar/importers/icalendar-importer.c:1225
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Догађај"
 
-#: ../calendar/importers/icalendar-importer.c:1173
-#: ../calendar/importers/icalendar-importer.c:1485
+#: ../calendar/importers/icalendar-importer.c:1228
+#: ../calendar/importers/icalendar-importer.c:1540
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Задатак"
 
-#: ../calendar/importers/icalendar-importer.c:1176
-#: ../calendar/importers/icalendar-importer.c:1486
+#: ../calendar/importers/icalendar-importer.c:1231
+#: ../calendar/importers/icalendar-importer.c:1541
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Белешка"
 
-#: ../calendar/importers/icalendar-importer.c:1185
+#: ../calendar/importers/icalendar-importer.c:1240
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "има понављања"
 
-#: ../calendar/importers/icalendar-importer.c:1190
+#: ../calendar/importers/icalendar-importer.c:1245
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "је примерак"
 
-#: ../calendar/importers/icalendar-importer.c:1195
+#: ../calendar/importers/icalendar-importer.c:1250
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "има подсетнике"
 
-#: ../calendar/importers/icalendar-importer.c:1200
+#: ../calendar/importers/icalendar-importer.c:1255
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "има прилоге"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1213
+#: ../calendar/importers/icalendar-importer.c:1268
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Јавно"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1216
+#: ../calendar/importers/icalendar-importer.c:1271
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Лично"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1219
+#: ../calendar/importers/icalendar-importer.c:1274
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Поверљиво"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1223
+#: ../calendar/importers/icalendar-importer.c:1278
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Разврставање"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1228
-#: ../calendar/importers/icalendar-importer.c:1528
+#: ../calendar/importers/icalendar-importer.c:1283
+#: ../calendar/importers/icalendar-importer.c:1583
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Сажетак"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1234
+#: ../calendar/importers/icalendar-importer.c:1289
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Место"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1242
-#: ../calendar/importers/icalendar-importer.c:1523
+#: ../calendar/importers/icalendar-importer.c:1297
+#: ../calendar/importers/icalendar-importer.c:1578
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Почетак"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1253
+#: ../calendar/importers/icalendar-importer.c:1308
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Рок"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1265
+#: ../calendar/importers/icalendar-importer.c:1320
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Крај"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1275
+#: ../calendar/importers/icalendar-importer.c:1330
 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:1299
+#: ../calendar/importers/icalendar-importer.c:1354
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Завршено"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1307
+#: ../calendar/importers/icalendar-importer.c:1362
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "Адреса"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1318
-#: ../calendar/importers/icalendar-importer.c:1321
+#: ../calendar/importers/icalendar-importer.c:1373
+#: ../calendar/importers/icalendar-importer.c:1376
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Организатор"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1341
-#: ../calendar/importers/icalendar-importer.c:1344
+#: ../calendar/importers/icalendar-importer.c:1396
+#: ../calendar/importers/icalendar-importer.c:1399
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Учесници"
 
-#: ../calendar/importers/icalendar-importer.c:1358
+#: ../calendar/importers/icalendar-importer.c:1413
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Опис"
 
-#: ../calendar/importers/icalendar-importer.c:1518
+#: ../calendar/importers/icalendar-importer.c:1573
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Врста"
@@ -6941,7 +7102,6 @@ msgid "Asia/Kashgar"
 msgstr "Азија/Кашгар"
 
 #: ../calendar/zones.h:242
-#| msgid "Asia/Katmandu"
 msgid "Asia/Kathmandu"
 msgstr "Азија/Катманду"
 
@@ -7613,7 +7773,7 @@ msgstr "Нова _порука"
 msgid "Open New Message window"
 msgstr "Отвара прозор за нову поруку"
 
-#: ../composer/e-composer-actions.c:348 ../shell/e-shell.c:1208
+#: ../composer/e-composer-actions.c:348 ../shell/e-shell.c:1216
 #: ../shell/e-shell-window-actions.c:848
 msgid "_Preferences"
 msgstr "_Поставке"
@@ -7716,14 +7876,15 @@ msgstr "Потписује ову поруку С/МИМЕ уверењем"
 
 #: ../composer/e-composer-actions.c:523
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
-#| msgid "Unicode"
-msgid "Unicode smileys"
-msgstr "Уникод смајли"
+#| msgid "Unicode smileys"
+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 smileys."
-msgstr "Користи уникод знакове за смајлије."
+#| msgid "Use Unicode characters for smileys."
+msgid "Use Unicode characters for emoticons."
+msgstr "Користи уникод знакове за смајлиће."
 
 #: ../composer/e-composer-actions.c:531
 msgid "_Bcc Field"
@@ -7746,7 +7907,6 @@ msgid "_From Override Field"
 msgstr "Прикажи поље _Шаље као име"
 
 #: ../composer/e-composer-actions.c:549
-#| msgid "Toggles whether the Role field is displayed"
 msgid ""
 "Toggles whether the From override field to change name or email address is "
 "displayed"
@@ -7762,6 +7922,10 @@ msgstr "Поље Одго_вор-за"
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Бира да ли је поље Одговор-за приказано"
 
+#: ../composer/e-composer-actions.c:612
+msgid "Attach"
+msgstr "Приложи"
+
 #: ../composer/e-composer-actions.c:618
 msgid "Save Draft"
 msgstr "Сачувај нацрт"
@@ -7769,8 +7933,8 @@ 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:319
-#: ../mail/e-mail-config-summary-page.c:331
+#: ../mail/e-mail-config-identity-page.c:323
+#: ../mail/e-mail-config-summary-page.c:332
 msgid "_Name:"
 msgstr "_Име:"
 
@@ -7823,7 +7987,7 @@ msgid "S_ubject:"
 msgstr "На_слов:"
 
 #: ../composer/e-composer-header-table.c:870
-#: ../mail/e-mail-config-identity-page.c:504
+#: ../mail/e-mail-config-identity-page.c:516
 msgid "Si_gnature:"
 msgstr "Потп_ис:"
 
@@ -7835,7 +7999,7 @@ msgstr "Кликните овде за адресар."
 msgid "Click here to select folders to post to"
 msgstr "Кликните овде да изаберете фасцикле за слање"
 
-#: ../composer/e-msg-composer.c:872
+#: ../composer/e-msg-composer.c:874
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -7843,7 +8007,7 @@ msgstr ""
 "Није могуће потписивање одлазеће поруке: није постављено уверење за "
 "потписивање за овај налог"
 
-#: ../composer/e-msg-composer.c:881
+#: ../composer/e-msg-composer.c:883
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7852,11 +8016,11 @@ msgstr ""
 "Није могуће шифровање одлазеће поруке: није постављено уверење за шифровање "
 "за овај налог"
 
-#: ../composer/e-msg-composer.c:1595 ../composer/e-msg-composer.c:2367
+#: ../composer/e-msg-composer.c:1619 ../composer/e-msg-composer.c:2645
 msgid "Compose Message"
 msgstr "Састави поруку"
 
-#: ../composer/e-msg-composer.c:4710
+#: ../composer/e-msg-composer.c:4995
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "Састављач у телу поруке не садржи текст, што не може бити измењено."
 
@@ -7910,24 +8074,12 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "Грешка у чувању самочувајуће датотеке због „{1}“."
 
 #: ../composer/mail-composer.error.xml.h:11
-msgid "Download in progress. Do you want to send the mail?"
-msgstr "Преузимање је у току. Да ли желите да пошаљете поруку?"
-
-#: ../composer/mail-composer.error.xml.h:12
-msgid ""
-" There are few attachments getting downloaded. Sending the mail will cause "
-"the mail to be sent without those pending attachments "
-msgstr ""
-" Преузима се неколико прилога. Уколико сада пошаљете поруку ови прилози неће "
-"бити послати са њом "
-
-#: ../composer/mail-composer.error.xml.h:14
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr "Да ли желите да одбаците поруку коју састављате, под називом „{0}“?"
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../composer/mail-composer.error.xml.h:12
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -7938,84 +8090,81 @@ msgstr ""
 "поруку касније."
 
 #. Response codes were chosen somewhat arbitrarily.
-#: ../composer/mail-composer.error.xml.h:18
+#: ../composer/mail-composer.error.xml.h:15
 msgid "_Continue Editing"
 msgstr "Настави _уређивање"
 
-#: ../composer/mail-composer.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:16
 msgid "_Save Draft"
 msgstr "Сачувај _нацрт"
 
-#: ../composer/mail-composer.error.xml.h:20
-#| msgid ""
-#| "Are you sure you want to discard the message, titled '{0}', you are "
-#| "composing?"
+#: ../composer/mail-composer.error.xml.h:17
 msgid "Are you sure you want to discard the message you are composing?"
 msgstr "Да ли желите да одбаците поруку коју састављате?"
 
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:18
 msgid "Could not create message."
 msgstr "Не могу да направим поруку."
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../composer/mail-composer.error.xml.h:19
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "Због „{0}“, можда буде потребно другачије подесити пошту."
 
-#: ../composer/mail-composer.error.xml.h:23
+#: ../composer/mail-composer.error.xml.h:20
 msgid "Could not read signature file &quot;{0}&quot;."
 msgstr "Не могу да прочитам датотеку потписа „{0}“."
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:21
 msgid "All accounts have been removed."
 msgstr "Сви налози су уклоњени."
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
 msgstr "Морате да подесите налог пре састављања поруке."
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:23
 msgid "An error occurred while saving to your Outbox folder."
 msgstr "Дошло је до грешке током чувања у вашој фасцикли За слање."
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:24
 msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
 msgstr "Пријављена грешка бејаше „{0}“. Порука није послата."
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:25
 msgid "An error occurred while saving to your Drafts folder."
 msgstr "Дошло је до грешке током чувања у вашој фасцикли Нацрти."
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:26
 msgid ""
 "The reported error was &quot;{0}&quot;. The message has most likely not been "
 "saved."
 msgstr "Пријављена грешка бејаше „{0}“. Порука највероватније није сачувана."
 
-#: ../composer/mail-composer.error.xml.h:30
+#: ../composer/mail-composer.error.xml.h:27
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "Дошло је до грешке током слања. Како желите да наставите?"
 
-#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:170
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:169
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "Пријављена грешка бејаше „{0}“."
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:29
 msgid "_Save to Outbox"
 msgstr "Сачувај _у „За слање“"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Try Again"
 msgstr "_Покушај опет"
 
-#: ../composer/mail-composer.error.xml.h:34
+#: ../composer/mail-composer.error.xml.h:31
 msgid "Your message was sent, but an error occurred during post-processing."
 msgstr "Ваша порука је послата, али је дошло до грешке током пост-обраде."
 
-#: ../composer/mail-composer.error.xml.h:35
+#: ../composer/mail-composer.error.xml.h:32
 msgid "Saving message to Outbox."
 msgstr "Чувам поруку у фасцикли За слање."
 
-#: ../composer/mail-composer.error.xml.h:36
+#: ../composer/mail-composer.error.xml.h:33
 msgid ""
 "The message will be saved to your local Outbox folder, because the "
 "destination service is currently unavailable. You can send the message by "
@@ -8025,13 +8174,11 @@ msgstr ""
 "одредишта тренутно недоступна. Можете послати поруку кликом на дугме Пошаљи/"
 "Прими на траци алата Еволуције."
 
-#: ../composer/mail-composer.error.xml.h:37
-#| msgid "Are you sure you want to open %d message at once?"
-#| msgid_plural "Are you sure you want to open %d messages at once?"
+#: ../composer/mail-composer.error.xml.h:34
 msgid "Are you sure you want to send the message?"
 msgstr "Да ли желите да пошаљете ову поруку?"
 
-#: ../composer/mail-composer.error.xml.h:38
+#: ../composer/mail-composer.error.xml.h:35
 msgid ""
 "A keyboard accelerator to send the message has been pressed. Either cancel "
 "sending the message, if it was done by an accident, or send the message."
@@ -8039,12 +8186,11 @@ msgstr ""
 "Пречица на тастатури за слање порука. Када се притисне овај тастер слање "
 "поруке се зауставља уколико је то урађено случајно или се порука шаље."
 
-#: ../composer/mail-composer.error.xml.h:39
-#| msgid "Are you sure you want to delete this memo?"
+#: ../composer/mail-composer.error.xml.h:37
 msgid "Are you sure you want to change the composer mode?"
 msgstr "Да ли желите да измените режим састављања поруке?"
 
-#: ../composer/mail-composer.error.xml.h:40
+#: ../composer/mail-composer.error.xml.h:38
 msgid ""
 "Turning HTML mode off will cause the text to lose all formatting. Do you "
 "want to continue?"
@@ -8052,13 +8198,11 @@ msgstr ""
 "Уколико искључиите ХТМЛ режим форматирање текста ће бити изгубљено. Да ли "
 "желите да наставите?"
 
-#: ../composer/mail-composer.error.xml.h:41
-#| msgid "Address formatting"
+#: ../composer/mail-composer.error.xml.h:39
 msgid "_Don't lose formatting"
 msgstr "_Задржи формат"
 
-#: ../composer/mail-composer.error.xml.h:42
-#| msgid "Address formatting"
+#: ../composer/mail-composer.error.xml.h:40
 msgid "Lose _formatting"
 msgstr "З_анемари формат"
 
@@ -8070,7 +8214,8 @@ msgstr "Обавештење аларма Еволуције"
 msgid "Calendar event notifications"
 msgstr "Обавештења о догађајима календара"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1092
+#: ../data/evolution.desktop.in.in.h:1 ../evolution.appdata.xml.in.h:1
+#: ../mail/e-mail-browser.c:1118
 #: ../modules/mailto-handler/evolution-mailto-handler.c:210
 #: ../shell/e-shell-window-private.c:242
 msgid "Evolution"
@@ -8087,7 +8232,7 @@ msgstr "Пакет групе"
 msgid "Evolution Mail and Calendar"
 msgstr "Еволуција — пошта и календар"
 
-#: ../data/evolution.desktop.in.in.h:4
+#: ../data/evolution.desktop.in.in.h:4 ../evolution.appdata.xml.in.h:2
 msgid "Manage your email, contacts and schedule"
 msgstr "Управљајте вашом поштом, контактима и обавезама"
 
@@ -8095,6 +8240,11 @@ msgstr "Управљајте вашом поштом, контактима и о
 msgid "email;calendar;contact;addressbook;task;"
 msgstr "ел.пошта;пошта;календар;контакт;адресар;задатак;"
 
+#: ../data/evolution.desktop.in.in.h:6
+#| msgid "New _Window"
+msgid "New Window"
+msgstr "Нови прозор"
+
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
 msgstr "Укљчивање обликовања адресе"
@@ -8210,57 +8360,46 @@ msgid "true"
 msgstr "тачно"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:22
-#| msgid "Whether to show timezone field in the event/meeting editor"
 msgid "Whether to show phone numbers in the editor"
 msgstr "Одређује да ли да прикаже број телефона у уређивачу"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:23
-#| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show SIP addresses in the editor"
 msgstr "Одређује да ли да прикаже СИП адресу у уређивачу"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:24
-#| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show IM addresses in the editor"
 msgstr "Одређује да ли да прикаже ИМ адресу у уређивачу"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:25
-#| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show mailing Home addresses in the editor"
 msgstr "Одређује да ли да прикаже кућну адресу у уређивачу"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:26
-#| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show mailing addresses Work in the editor"
 msgstr "Одређује да ли да прикаже адресу пословне е-поште у уређивачу"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:27
-#| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show mailing addresses Other in the editor"
 msgstr "Одређује да ли да прикаже адресу остале е-поште у уређивачу"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:28
-#| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show Web Addresses in the editor"
 msgstr "Одређује да ли да прикаже веб адресе у уређивачу"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:29
-#| msgid "Whether to show timezone field in the event/meeting editor"
 msgid "Whether to show job information in the editor"
 msgstr "Одређује да ли да прикаже податке о послу у уређивачу"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:30
-#| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show Miscellaneous information in the editor"
 msgstr "Одређује да ли да прикаже додатне податке у уређивачу"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:31
-#| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show notes in the editor"
 msgstr "Одређује да ли да прикаже белешке у уређивачу"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:32
-#| msgid "Whether to show categories field in the event/meeting editor"
 msgid "Whether to show Certificates tab in the editor"
 msgstr "Одређује да ли да прикаже картицу са уверењима у уређивачу"
 
@@ -8394,12 +8533,10 @@ msgid "Minute the workday starts on, 0 to 59."
 msgstr "Минут којим почиње радни дан, од 0 до 59."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
-#| msgid "Workday start hour"
 msgid "Workday start time for Monday"
 msgstr "Час којим почиње радни дан у понедељак"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
-#| msgid "Hour the workday starts on, in twenty four hour format, 0 to 23."
 msgid ""
 "Time the workday starts on, in twenty four hour format HHMM, 0000 to 2359, "
 "or -1 to use day-start-hour and day-start-minute"
@@ -8409,12 +8546,10 @@ msgstr ""
 "day-start-minute"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
-#| msgid "Workday end hour"
 msgid "Workday end time for Monday"
 msgstr "Час којим се завршава радни дан у понедељак"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
-#| msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
 msgid ""
 "Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
 "-1 to use day-end-hour and day-end-minute"
@@ -8424,12 +8559,10 @@ msgstr ""
 "day-end-minute"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
-#| msgid "Workday start minute"
 msgid "Workday start time for Tuesday"
 msgstr "Минут којим почиње радни дан у уторак"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
-#| msgid "Hour the workday ends on, in twenty four hour format, 0 to 23"
 msgid ""
 "Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
 "-1 to use day-start-hour and day-start-minute"
@@ -8439,57 +8572,46 @@ msgstr ""
 "day-start-minute"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
-#| msgid "Workday end minute"
 msgid "Workday end time for Tuesday"
 msgstr "Минут којим се завршава радни дан у уторак"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
-#| msgid "Workday start minute"
 msgid "Workday start time for Wednesday"
 msgstr "Минут којим почиње радни дан у среду"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
-#| msgid "Workday end minute"
 msgid "Workday end time for Wednesday"
 msgstr "Минут којим се завршава радни дан у среду"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
-#| msgid "Workday start hour"
 msgid "Workday start time for Thursday"
 msgstr "Час којим почиње радни дан у четвртак"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
-#| msgid "Workday end hour"
 msgid "Workday end time for Thursday"
 msgstr "Час којим се завршава радни дан у четвртак"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
-#| msgid "Workday start hour"
 msgid "Workday start time for Friday"
 msgstr "Час којим почиње радни дан у петак"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
-#| msgid "Workday end hour"
 msgid "Workday end time for Friday"
 msgstr "Час којим се завршава радни дан у петак"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
-#| msgid "Workday start hour"
 msgid "Workday start time for Saturday"
 msgstr "Час којим почиње радни дан у суботу"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
-#| msgid "Workday end hour"
 msgid "Workday end time for Saturday"
 msgstr "Час којим се завршава радни дан у суботу"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
-#| msgid "Workday start hour"
 msgid "Workday start time for Sunday"
 msgstr "Час којим почиње радни дан у недељу"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
-#| msgid "Workday end hour"
 msgid "Workday end time for Sunday"
 msgstr "Час којим се завршава радни дан у недељу"
 
@@ -8542,7 +8664,6 @@ msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
 msgstr "Јединице за подразумевани подсетник, „минути“, „сати“ или „дани“"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
-#| msgid "Default reminder value"
 msgid "Default reminder snooze interval, in minutes"
 msgstr "Подразумевано време за одлагање подсетника у минутима"
 
@@ -8833,51 +8954,62 @@ msgstr ""
 "Да ли да прикаже времена завршетка догађаја у недељним и месечним прегледима"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#| msgid "Show appointment end times in week and month views"
+msgid "Show appointment icons in the month view"
+msgstr "Приказује иконицу састанка у месечном прегледу"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#| msgid ""
+#| "Whether to display the end time of events in the week and month views"
+msgid "Whether to show icons of events in the month view"
+msgstr "Да ли ће приказати иконицу догађаја у месечном прегледу"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Show the memo preview pane"
 msgstr "Приказује преглед белешки"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 msgid "If \"true\", show the memo preview pane in the main window"
 msgstr "Уколико је изабрано, у главном прозору приказује преглед белешки"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid "Show the task preview pane"
 msgstr "Приказује преглед задатака"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 msgid "If \"true\", show the task preview pane in the main window"
 msgstr "Уколико је изабрано, у главном прозору приказује преглед задатака"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr ""
 "Приказује број недеље у дневном прегледу, у прегледу радне недеље и "
 "претраживачу датума"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr "Да ли да покаже бројеве недеља на разним местима у календару"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 msgid "Vertical position for the tag pane"
 msgstr "Усправан положај за површ ознаке"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 msgid "Highlight tasks due today"
 msgstr "Истицање задатака у току дана"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 msgid ""
 "Whether highlight tasks due today with a special color (task-due-today-color)"
 msgstr ""
 "Да ли ће задаци у току дана бити истакнути посебном бојом (боја-задатка-у-"
 "току-дана)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 msgid "Tasks due today color"
 msgstr "Боја задатка за данас"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid ""
 "Background color of tasks that are due today, in \"#rrggbb\" format. Used "
 "together with task-due-today-highlight"
@@ -8885,15 +9017,15 @@ msgstr ""
 "Боја позадине задужења за данас, у облику „#rrggbb“. Користи се заједно са "
 "истицањем-задатка-у-току-дана"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 msgid "Task preview pane position (horizontal)"
 msgstr "Позиција прегледа задатака (хоризонтално)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 msgid "Task layout style"
 msgstr "Стил размештаја"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
@@ -8903,20 +9035,19 @@ msgstr ""
 "„0“ (класичан преглед) поставља преглед испод списка задатака. "
 "„1“ (вертикалан преглед) поставља преглед поред списка задатака"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 msgid "Task preview pane position (vertical)"
 msgstr "Позиција прегледа задатака (вертикално)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
 msgid "Position of the task preview pane when oriented vertically"
 msgstr "Позиција прегледа задатака када је постављено вертикално"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
-#| msgid "Hide completed tasks"
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
 msgid "Show reminders for completed tasks"
 msgstr "Прикажи подсетнике за завршене задатке"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
 msgid ""
 "Whether to show reminders for completed tasks. When set to false, reminders "
 "for completed tasks are suppressed."
@@ -8924,22 +9055,22 @@ msgstr ""
 "Да лида прикаже подсетнике за завршене задатке. Када је стављено на нетачно "
 "(false), неће се приказивати подсетници за завршене задатке."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 msgid "Highlight overdue tasks"
 msgstr "Истицање неиспуњених задатака"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
 msgid ""
 "Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr ""
 "Да ли ће неиспуњени задаци бити истакнути посебном бојом (боја-неиспуњеног-"
 "задатка)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
 msgid "Overdue tasks color"
 msgstr "Боја неиспуњених задатака"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
 msgid ""
 "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
 "together with task-overdue-highlight."
@@ -8947,19 +9078,19 @@ msgstr ""
 "Боја позадине неиспуњених задатака, у облику „#rrggbb“. Користи се заједно "
 "са истицањем-неиспуњених-задатка."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
 msgid "Time divisions"
 msgstr "Подела времена"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
 msgid "Intervals shown in Day and Work Week views, in minutes"
 msgstr "Интервали приказани у дневним и недељним прегледима, у минутима"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
 msgid "Timezone"
 msgstr "Временска зона"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like \"America/New York\""
@@ -8967,75 +9098,75 @@ msgstr ""
 "Подразумевана временска зона коју календар користи за датум и време, као "
 "непреведено место базе временске зоне Олсен, као „Америка/Њујорк“"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
 msgid "Twenty four hour time format"
 msgstr "24-часовни облик времена"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
+#: ../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"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
 msgid "Birthday and anniversary reminder"
 msgstr "Подсетник на рођендане и годишњице"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "Да ли да постави подсетник на рођендане и годишњице"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
 msgid "Default appointment reminder"
 msgstr "Подразумевани подсетник за заказивање"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
 msgid "Whether to set a default reminder for appointments"
 msgstr "Да ли да постави подразумевани подсетник за заказивања"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
 msgid "Use system timezone"
 msgstr "Користи временску зону система"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
 msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr "Користи временску зону система уместо оне која је изабрана у Еволуцији"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
 msgid "First day of the week"
 msgstr "Први дан седмице"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
 msgid "Monday is a work day"
 msgstr "Понедељак је радни дан"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
 msgid "Tuesday is a work day"
 msgstr "Уторак је радни дан"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
 msgid "Wednesday is a work day"
 msgstr "Среда је радни дан"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
 msgid "Thursday is a work day"
 msgstr "Четвртак је радни дан"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
 msgid "Friday is a work day"
 msgstr "Петак је радни дан"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
 msgid "Saturday is a work day"
 msgstr "Субота је радни дан"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
 msgid "Sunday is a work day"
 msgstr "Недеља је радни дан"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
 msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
 msgstr "(Застарело) Дан којим почиње седмица, од недеље (0) до суботе (6)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"week-start-day-name\" instead."
@@ -9043,11 +9174,11 @@ msgstr ""
 "Овај кључ је застарео у издању 3.10 и не треба више да се користи. Уместо "
 "њега користите „week-start-day-name“."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
 msgid "(Deprecated) Work days"
 msgstr "(Застарело) Радни дани"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
 msgid ""
 "Days on which the start and end of work hours should be indicated. (This key "
 "was deprecated in version 3.10 and should no longer be used. Use the \"work-"
@@ -9131,8 +9262,11 @@ msgid "Default charset in which to compose messages"
 msgstr "Подразумевани скуп знакова за састављање порука"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
-msgid "Default charset in which to compose messages."
-msgstr "Подразумевани скуп знакова за састављање порука."
+#| msgid "Default charset in which to compose messages."
+msgid "Default charset in which to compose messages. Uses UTF-8, if not set."
+msgstr ""
+"Подразумевани скуп знакова за састављање порука. Користиће УТФ-8, ако није "
+"постављено."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
 msgid "Path where picture gallery should search for its content"
@@ -9169,7 +9303,6 @@ msgid "Automatic emoticon recognition"
 msgstr "Аутоматско препознавање смајлића"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
-#| msgid "Recognize emoticons in text and replace them with images."
 msgid ""
 "Recognize emoticons in text and replace them with images or Unicode "
 "characters."
@@ -9290,14 +9423,10 @@ msgstr ""
 "„Преглед“ након избора налога поште."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
-#| msgid "Show \"Cc\" field when sending a mail message"
 msgid "Show \"From\" override field when sending a mail message"
 msgstr "Приказује поље „Шаље“ са именом контакта при слању поруке"
 
 #: ../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."
 msgid ""
 "Show the \"From\" override field when sending a mail message. This is "
 "controlled from the View menu when a mail account is chosen."
@@ -9369,7 +9498,6 @@ msgstr ""
 "пошто се не придржавају РФЦ 2231, него користе неисправан стандард РФЦ 2047."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
-#| msgid "Saving message to Outbox."
 msgid "Send messages through Outbox folder"
 msgstr "Шаљи поруку кроз фасциклу За слање"
 
@@ -9444,7 +9572,6 @@ msgstr ""
 "„Одг“ префиксу. Један пример је „SV,AV“."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-#| msgid "Enable express mode"
 msgid "Enable developer mode"
 msgstr "Укључи режим за програмере"
 
@@ -9491,18 +9618,26 @@ msgstr ""
 "порука. У супротном ће бити приказани само када се користе."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+msgid "Wrap quoted text in replies"
+msgstr "Прелама цитирани текст у одговорима"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+msgid "If set to 'true' quoted text in replies will be wrapped."
+msgstr "Ако је изабрано цитирани текст у одговорима биће преломљен."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Save file format for drag-and-drop operation"
 msgstr "Формат датотеке чувања за радњу превлачења и убацивања"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Can be either 'mbox' or 'pdf'."
 msgstr "Може бити „mbox“ или „pdf“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Show image animations"
 msgstr "Приказивање анимираних слика"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -9510,11 +9645,11 @@ msgstr ""
 "Омогућава анимиране слике у ХТМЛ пошти. Многим корисницима сметају анимиране "
 "слике и уместо њих желе непокретне слике."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Enable or disable type ahead search feature"
 msgstr "Укључује или искључује могућност тражења куцања унапред"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -9522,11 +9657,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 magic space bar"
 msgstr "Укључује или искључује магичну размакницу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -9534,73 +9669,87 @@ msgstr ""
 "Укључите ово да би размакницом померали текст поруке при прегледању, као и "
 "списак порука и фасцикли."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 "Омогућити да користе слична подешавања приказа листе поруке за све фасцикле"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "Омогућити да користе слична подешавања приказа листе поруке за све фасцикле."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Mark citations in the message \"Preview\""
 msgstr "Означава цитате у прегледу поруке"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Означава цитате у прегледу поруке."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Citation highlight color"
 msgstr "Боја истицања цитата"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Citation highlight color."
 msgstr "Боја за истицања цитата."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Enable/disable caret mode"
 msgstr "Укључује/искључује приказ курсора"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Омогућава приказ курсора, тако да видите курсор док читате поруку."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Default charset in which to display messages"
 msgstr "Подразумевани скуп знакова за приказ порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Default charset in which to display messages."
 msgstr "Подразумевани скуп знакова за приказ порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "Самостално учитава слике за ХТМЛ поруке преко ХТТП-а"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+msgid "Show notification about missing remote content"
+msgstr "Приказује обавештење о недостајућем удаљеном садржају"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+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 "
+"show a notification about it on top of the preview panel."
+msgstr ""
+"Када преглед поруке прикаже поруку која захтева преузимање удаљеног "
+"садржаја, а преузимање није допуштено корисницима или сајту, тада приказује "
+"обавештење о томе на врху панела за преглед."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Show Animations"
 msgstr "Приказивање анимација"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Show animated images as animations."
 msgstr "Приказује анимиране слике као анимације."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Show all message headers"
 msgstr "Приказивање свих заглавља порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Show all the headers when viewing a messages."
 msgstr "Приказује сва заглавља при прегледу порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "List of headers to show when viewing a message."
 msgstr "Списак заглавља за приказивање при прегледу поруке."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 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 "
@@ -9610,38 +9759,36 @@ msgstr ""
 "која указује да ли је заглавље укључено. Искључена заглавља нису приказана "
 "уприликом прегледа пруке, али су још увек на списку у поставкама."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Show photo of the sender"
 msgstr "Приказивање слике пошиљаоца"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Приказује слику пошиљаоца у окну за читање поруке."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
-#| msgid "Show photo of the sender"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Search gravatar.com for photo of the sender"
 msgstr "Претражује gravatar.com како би нашао слику пошиљаоца"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Allow searching also at gravatar.com for photo of the sender."
 msgstr ""
 "Омогућава претрагу сајта gravatar.com како би пронашао фотографију пошиљаоца."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Mark as Seen after specified timeout"
 msgstr "Означава поруку виђеном после наведеног рока"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Mark as Seen after specified timeout."
 msgstr "Означава поруку виђеном после наведеног рока."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
-#| msgid "Mark as Seen after specified timeout"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Mark as Seen always after specified timeout"
 msgstr "Увек означава поруку виђеном после наведеног рока"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid ""
 "If set to true, the selected message will be set as unread after the timeout "
 "also after the folder change."
@@ -9649,37 +9796,47 @@ msgstr ""
 "Уколико је постављено на тачно (true), изабрана порука ће бити означена као "
 "непрочитана након одређено времена и након измене фасцикле."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Timeout for marking messages as seen"
 msgstr "Време за означавање порука као виђеним"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "Време у милисекундама за које ће поруке бити означене као виђеним."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Sender email-address column in the message list"
 msgstr "Приказ колоне е-адреса пошиљаоца у списку порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 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:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Show deleted messages in the message-list"
 msgstr "Приказивање обрисаних порука у листи порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Приказује обрисане поруке (као прецртане) у листи порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#| msgid "Show deleted messages in the message-list"
+msgid "Show junk messages in the message-list"
+msgstr "Приказивање непожељних порука на списку порука"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#| msgid "Show deleted messages (with a strike-through) in the message-list."
+msgid "Show junk messages (with a red strike-through) in the message-list."
+msgstr "Приказује непожељне поруке (прецртане црвеном бојом) на списку порука."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Enable Unmatched search folder"
 msgstr "Укључи непоклопљене фасцикле претраге"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
@@ -9687,11 +9844,11 @@ msgstr ""
 "Укључује непоклопљене фасцикле претраге унутар фасцикли претраге. Не ради "
 "ништа ако је су искључене фасцикле претраге."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Скрива преглед по фасциклама и уклања избор"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 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."
@@ -9699,31 +9856,31 @@ msgstr ""
 "Овак кључ је прочитан једном и потом враћен на „false“ (нетачно). Ово уклања "
 "пошту са списка и преглед за ту фасциклу."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "Height of the message-list pane"
 msgstr "Висина површи листе порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Height of the message-list pane."
 msgstr "Висина површи за листе порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Whether message headers are collapsed in the user interface"
 msgstr "Да ли су заглавља поруке скупљена у корисничком сучељу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Width of the message-list pane"
 msgstr "Ширина површи списка порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Width of the message-list pane."
 msgstr "Ширина површи списка порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Layout style"
 msgstr "Стил размештаја"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 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 "
@@ -9734,35 +9891,35 @@ msgstr ""
 "порука. 0 — (класичан преглед) смешта ову површ испода списка порука. 1 — "
 "(вертикалан преглед) смешта површ поред списка порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Variable width font"
 msgstr "Фонт променљиве величине"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "The variable width font for mail display."
 msgstr "Фонт променљиве величине за приказ поште."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Terminal font"
 msgstr "Фонт терминала"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid "The terminal font for mail display."
 msgstr "Фонт терминала за приказ поште."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Use custom fonts"
 msgstr "Коришћење сопствених фонтова"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "Use custom fonts for displaying mail."
 msgstr "Користи прилагођене фонтове за приказ поште."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Сажима приказ адреса у За/ЦЦ/БЦЦ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -9770,11 +9927,11 @@ msgstr ""
 "Врши сажимање приказа адреса у За/ЦЦ/БЦЦ на број одређен у address_count "
 "(број адреса)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Број адреса за приказ у КО/ЦЦ/БЦЦ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -9782,11 +9939,11 @@ msgstr ""
 "Ово подешава број адреса за приказ у подразумеваном прегледу списка порука, "
 "после чега је приказано „...“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Thread the message-list based on Subject"
 msgstr "Приказ поруке према наслову расправе"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -9794,11 +9951,11 @@ msgstr ""
 "Да ли покушати приказ расправе по наслову када поруке не садрже заглавља „In-"
 "Reply-To“ или „References“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Default value for thread expand state"
 msgstr "Подразумевана вредност за раширену расправу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -9806,11 +9963,11 @@ msgstr ""
 "Ово подешавање одређује да ли ће нити подразумевано бити раширене или "
 "скупљене. Еволуција захтева поновно покретање."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Да ли се поруке нижу на основу последње поруке у расправи"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 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 "
@@ -9819,15 +9976,11 @@ msgstr ""
 "Ово подешавање одређује да ли ће нити бити разврстани по последњој поруци "
 "једне нити, уместо по датуму. Еволуција захтева поновно покретање."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Whether sort thread children always ascending"
 msgstr "Да ли се подрасправе ређају растући"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
-#| 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 restart."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 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."
@@ -9835,11 +9988,11 @@ msgstr ""
 "Ово подешавање одређује да ли ће расправе нижег нивоа бити разврстани "
 "растући, уместо на истом начин као унутар родитељских нити."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Ређа налоге азбучним редом у стаблу фасцикле"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 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 "
@@ -9851,27 +10004,27 @@ msgstr ""
 "изузетком фасцикли „На овом рачунару“ и „Потражи“, у супротном налози бивају "
 "поређани на основу поретка који је задао корисник"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Log filter actions"
 msgstr "Дневник радњи филтера"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Log filter actions to the specified log file."
 msgstr "Бележи радње филтера у наведену датотеку дневника."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Logfile to log filter actions"
 msgstr "Дневник датотека за бележење радњи филтера"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Logfile to log filter actions."
 msgstr "Дневник датотека за бележење радњи филтера."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Flush Outbox after filtering"
 msgstr "Празни слање након филтрирања"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 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 "
@@ -9881,57 +10034,55 @@ msgstr ""
 "ове фасцикле ће се догодити само ако се користи нека радња филтера "
 "„Проследи“ и отприлике један минут после призивања последње радње."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Default forward style"
 msgstr "Подразумевани стил прослеђивања"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Default reply style"
 msgstr "Подразумевани стил одговора"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
 msgstr "Упозорење на слање поруке када се користи пречица (Ctrl + Enter)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
-#| msgid ""
-#| "Prompt the user when he or she tries to send a message without a Subject."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 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:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Prompt on empty subject"
 msgstr "Поставља упит када је наслов празан"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 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:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Prompt when emptying the trash"
 msgstr "Поставља упит приликом пражњења смећа"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "Поставља упит кориснику када покуша да испразни смеће."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Prompt when user expunges"
 msgstr "Поставља упит при пражњењу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Поставља упит кориснику када покуша да испразни фасциклу."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "Упитаће пре слања примаоцима који нису унешени као адресе поште"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -9939,19 +10090,19 @@ msgstr ""
 "Омогућава/онемогућава понављање упозорења када покушавате да пошаљете поруку "
 "примаоцима који нису унешени као адресе поште."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Prompt when user only fills Bcc"
 msgstr "Поставља упит када корисник унесе само невидљиву графитну копију (Бцц)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 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:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Поставља упит када корисник покуша да пошаље нежељени ХТМЛ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -9959,12 +10110,12 @@ msgstr ""
 "Поставља упит када корисник покуша да пошаље ХТМЛ поруку примаоцима који "
 "можда не желе да примају ХТМЛ пошту."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Поставља упит кориснику када покуша да отвори 10 или више порука одједном"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -9972,19 +10123,19 @@ msgstr ""
 "Уколико корисник покуша да отвори 10 или више порука одједном, питаће га да "
 "ли заиста жели то да уради."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Prompt while marking multiple messages"
 msgstr "Поставља упит при означавању више порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Укључује или искључује упозорење при означавању више порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Prompt when deleting messages in search folder"
 msgstr "Поставља упит код брисања порука из фасцикле претраге"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 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 "
@@ -9993,12 +10144,12 @@ msgstr ""
 "Омогућава/онемогућава понављање упозорења да је брисање поруке из фасцикле "
 "претраге трајно, а не само уклањање из резултата претраге."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 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:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 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 "
@@ -10010,12 +10161,12 @@ msgstr ""
 "фасцикли превлачењем и убацивањем у стабло фасцикли без питања, или „ask“ — "
 "(или свака друга вредност) питаће корисника."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 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:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 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 "
@@ -10027,11 +10178,11 @@ msgstr ""
 "фасцикли превлачењем и убацивањем у стабло фасцикли без питања, или „ask“ — "
 "(или свака друга вредност) питаће корисника."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Prompt when replying privately to list messages"
 msgstr "Поставља упит када одговарате приватно на листу порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 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."
@@ -10039,11 +10190,11 @@ msgstr ""
 "Омогућава/онемогућава понављање упозорења да шаљете приватан одговор на "
 "поруку која је стигла са дописне листе."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Поставља упит када дописна листа одузме приватне одговоре"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 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 "
@@ -10053,28 +10204,25 @@ msgstr ""
 "одговор на поруку која је стигла са дописне листе, али у листи заглавље "
 "„Одговор-за“ је подешено да вас преусмери да одговорите на листу."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Prompt when replying to many recipients"
 msgstr "Поставља упит када одговарате већем броју прималаца"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 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:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid ""
 "Prompt when switching composer mode and the content needs to lose its "
 "formatting"
 msgstr ""
 "Упозорење о губитку форматирања приликом пребацивања у ређим састављача"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
-#| msgid ""
-#| "It disables/enables the repeated prompts to warn that you are trying to "
-#| "send a message to recipients not entered as mail addresses"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid ""
 "It disables/enables the repeated prompts to warn that you are switching "
 "composer mode and the content needs to lose its formatting."
@@ -10082,12 +10230,11 @@ msgstr ""
 "Омогућава/онемогућава понављање упозорења када покушавате да се пребаците у "
 "режим састављача и при томе изгубите форматирање садржаја."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
-#| msgid "Prompt when replying to many recipients"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Prompt when sending to many To and CC recipients"
 msgstr "Упозорава када шаљете е-поруку великом броју прималаца"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid ""
 "Enable or disable the prompt when sending to many To and CC recipients. The "
 "'composer-many-to-cc-recips-num' defines the threshold."
@@ -10096,7 +10243,7 @@ msgstr ""
 "пошиљаоца наведених у пољима „За“ или „ЦЦ“. Вредност „composer-many-to-cc-"
 "recips-num“ одређује праг за упозорење."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid ""
 "Policy for automatically closing the message browser window when forwarding "
 "or replying to the displayed message."
@@ -10104,42 +10251,42 @@ msgstr ""
 "Политика за самостално затварање прозора прегледника порука приликом "
 "прослеђивања или одговарања на приказану поруку."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid "Empty Trash folders on exit"
 msgstr "Празни фасцикле са смећем на излазу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Празни све фасцикле са смећем при затварању Еволуције."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Најмање дана између пражњења смећа на излазу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Најмање време између пражњења смећа на излазу, у данима."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid "Last time Empty Trash was run"
 msgstr "Последње време пражњења смећа"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 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:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 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:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Level beyond which the message should be logged."
 msgstr "Ниво након којег се порука заводи у дневник."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -10147,11 +10294,11 @@ msgstr ""
 "Може имати три могуће вредности: 0 — за грешке, 1 — за упозорења и 2 — за "
 "поруке о дијагнози квара."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Show original \"Date\" header value."
 msgstr "Приказује оригиналну вредност заглавља датума."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 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 "
@@ -10161,11 +10308,11 @@ msgstr ""
 "се временске зоне разликују). Иначе увек приказује вредност заглавља „Датум“ "
 "према поставкама и временској зони корисника."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "List of Labels and their associated colors"
 msgstr "Списак ознака и њима додељених боја"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 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."
@@ -10173,46 +10320,46 @@ msgstr ""
 "Списак ознака које познаје поштански део Еволуције. Списак садржи низове "
 "облика име:боја где боја користи ХТМЛ хекса кодирање."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Check incoming mail being junk"
 msgstr "Врши проверу да ли је пристигла пошта ђубре"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid "Run junk test on incoming mail."
 msgstr "Проверава да ли има ђубрета у долазној пошти."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "Empty Junk folders on exit"
 msgstr "Празни фасцикле са ђубретом при излазу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Празни све фасцикле са ђубретом при затварању Еволуције."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Најмање дана између пражњења ђубрета на излазу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Најмање време између пражњења ђубрета на излазу, у данима."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid "Last time Empty Junk was run"
 msgstr "Време последњег пражњења ђубрета"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 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:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid "The default plugin for Junk hook"
 msgstr "Подразумевани додатак куке за ђубре"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 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 "
@@ -10222,11 +10369,11 @@ msgstr ""
 "прикључци. Уколико је поменути подразумевани прикључак искључен, преостали "
 "доступни прикључци неће бити активирани."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Утврђује да ли у адресару да прегледа адресе пошиљаоца"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 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 "
@@ -10238,7 +10385,7 @@ msgstr ""
 "самодопуњавање. Може бити споро ако су адресари (рецимо ЛДАП) означени за "
 "самодопуњавање."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -10246,7 +10393,7 @@ msgstr ""
 "Утврђује да ли само у адресару да прегледа адресе у потрази за нежељеном "
 "поштом"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 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 "
@@ -10256,13 +10403,13 @@ msgstr ""
 "да ли да се адреса тражи само у локалном адресару како би се издвојила пошта "
 "примљена од познатих пошиљалаца од оне нежељене."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Утврђује да ли да користи прилагођена заглавља приликом провере нежељене "
 "поште"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 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 "
@@ -10271,11 +10418,11 @@ msgstr ""
 "Утврђује да ли да користи прилагођена заглавља приликом провере нежељене "
 "поште. Уколико је опција укључена а заглавља наведена, провера ће бити бржа."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid "Custom headers to use while checking for junk."
 msgstr "Прилагођена заглавља за употребу приликом провере нежељене поште."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -10283,31 +10430,31 @@ msgstr ""
 "Прилагођена заглавља за употребу приликом провере нежељене поште. Елементи "
 "списка су низ формата „headername=value“ (име заглавља=вредност)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid "UID string of the default account."
 msgstr "ЈИБ низ подразумеваног налога."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "Save directory"
 msgstr "Директоријум чувања"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid "Directory for saving mail component files."
 msgstr "Директоријум за чување датотека модула за пошту."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid "Composer load/attach directory"
 msgstr "Директоријум састављача за учитавање/прилагање"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid "Directory for loading/attaching files to composer."
 msgstr "Директоријум за учитавање/прилагање датотека у састављач."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 msgid "Check for new messages on start"
 msgstr "Врши проверу за новим порукама приликом покретања"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -10315,11 +10462,11 @@ msgstr ""
 "Да ли ће вршити проверу за новим порукама приликом покретања Еволуције. Ово "
 "укључује и слање порука из фасцикле Послато."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 msgid "Check for new messages in all active accounts"
 msgstr "Врши проверу за новим порукама у свим активним налозима"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 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 "
@@ -10330,11 +10477,11 @@ msgstr ""
 "покретања Еволуције. Ова опција се користи само заједно са "
 "„send_recv_on_start“ (пошаљи_прими_при_покретању) опцијом."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid "Server synchronization interval"
 msgstr "Интервал усаглашавања са сервером"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -10342,12 +10489,11 @@ msgstr ""
 "Контролише учесталост усклађивања локалних измена са мрежним сервером поште. "
 "Интервал мора бити најмање 30 секунди."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
-#| msgid "Confirm _when expunging a folder"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 msgid "Allow expunge in virtual folders"
 msgstr "Дозволи пражњење виртуелних фасцикли"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 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 "
@@ -10359,12 +10505,12 @@ msgstr ""
 "покренута над свим фасциклама и за све избрисане поруке у виртуелној "
 "фасцикли, не само за обрисане поруке које припадају виртуелној фасцикли."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 #: ../mail/mail-config.ui.h:9
 msgid "Inherit theme colors in HTML mode"
 msgstr "Наследи боју теме из ХТМЛ режима"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 msgid ""
 "When enabled the theme colors for background, text and links are sent in "
 "resulting HTML formatted message."
@@ -10372,11 +10518,11 @@ msgstr ""
 "Када је омогућено боја позадине, текста и везе ће бити послата у крајњој "
 "ХТМЛ поруци."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 msgid "An Archive folder for On This Computer folders."
 msgstr "Фасцикла Архива унутар фасцикле На овом рачунару."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 msgid ""
 "An Archive folder to use for Messages|Archive... feature when in an On This "
 "Computer folder."
@@ -10384,11 +10530,11 @@ msgstr ""
 "Фасцикла Архива која се користи за поруке|архиве... могућност се јавља "
 "унутар фасцикле На овом рачунару."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 msgid "(Deprecated) Default forward style"
 msgstr "(Застарело) Подразумевани стил прослеђивања"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"forward-style-name\" instead."
@@ -10396,11 +10542,11 @@ msgstr ""
 "Овај кључ је застарео у издању 3.10 и не треба више да се користи. Уместо "
 "њега користите „forward-style-name“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 msgid "(Deprecated) Default reply style"
 msgstr "(Застарело) Подразумевани стил одговора"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"reply-style-name\" instead."
@@ -10408,11 +10554,11 @@ msgstr ""
 "Овај кључ је застарео у издању 3.10 и не треба више да се користи. Уместо "
 "њега користите „reply-style-name“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "(Застарело) Списак произвољних заглавља и да ли су укључена."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
+#: ../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 "
 "\"show-headers\" instead."
@@ -10420,11 +10566,11 @@ msgstr ""
 "Овај кључ је застарео у издању 3.10 и не треба више да се користи. Уместо "
 "њега користите „show-headers“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "(Застарело) Учитава слике за ХТМЛ поруке преко ХТТП-а"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
+#: ../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 "
 "\"image-loading-policy\" instead."
@@ -10432,7 +10578,7 @@ msgstr ""
 "Овај кључ је застарео у издању 3.10 и не треба више да се користи. Уместо "
 "њега користите „image-loading-policy“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
@@ -10440,7 +10586,7 @@ msgstr ""
 "(Застарело) Пита да ли да затвори прозор са поруком када корисник прослеђује "
 "или одговара на поруку приказану у прозору."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
+#: ../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 "
 "\"browser-close-on-reply-policy\" instead."
@@ -10677,10 +10823,16 @@ msgid "Mode to use when displaying mails"
 msgstr "Режим за коришћење приликом приказа поште"
 
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:2
+#, fuzzy
+#| msgid ""
+#| "The mode to use for displaying mails. \"normal\" makes Evolution choose "
+#| "the best part to show, \"prefer_plain\" makes it use the text part, if "
+#| "present, and \"only_plain\" forces Evolution to only show plain text"
 msgid ""
 "The mode to use for displaying mails. \"normal\" makes Evolution choose the "
 "best part to show, \"prefer_plain\" makes it use the text part, if present, "
-"and \"only_plain\" forces Evolution to only show plain text"
+"\"prefer_source\" makes it use the text part, if present, otherwise shows "
+"HTML source, and \"only_plain\" forces Evolution to only show plain text"
 msgstr ""
 "Режим који ће бити коришћен приликом приказивања поште. „normal“ чини да "
 "Еволуција изабере најбољи део да прикаже, „prefer_plain“ чини да користи "
@@ -10742,7 +10894,7 @@ msgstr "Полазна фасцикла избирача датотека"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Полазна фасцикла за прозорчиће избирача датотека."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:324
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:320
 msgid "Start in offline mode"
 msgstr "Започиње рад ван мреже"
 
@@ -10768,18 +10920,32 @@ msgid "Flag that enables a much simplified user interface."
 msgstr "Ознака која омогућава једноставније окружење."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
+#| msgid "Zoom large images to not be wider than the window width"
+msgid "List of button names to hide in the window switcher"
+msgstr "Списак назива дугмади за скривање у пребацивачу прозора"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
+msgid ""
+"Valid values are 'mail', 'addressbook', 'calendar', 'tasks' and 'memos'. "
+"Change of this requires restart of the application."
+msgstr ""
+"Исправне вредности су „mail“ (пошта), „addressbook“ (адресар), „calendar“ "
+"(календар), „tasks“ (задаци) и „memos“ (белешке). Измена овога захтева "
+"поновно покретање програма."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
 msgid "Window buttons are visible"
 msgstr "Дугмад прозора су видљива"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
 msgid "Whether the window buttons should be visible."
 msgstr "Да ли ће дугмад прозора бити видљива."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
 msgid "Window button style"
 msgstr "Стил дугмади прозора"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -10789,39 +10955,39 @@ msgstr ""
 "„both“ (обоје), „toolbar“ (трака алата). Ако је постављено „toolbar“, "
 "Гномово подешавање траке алата утврђује стил."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
 msgid "Toolbar is visible"
 msgstr "Трака алата је видљива"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
 msgid "Whether the toolbar should be visible."
 msgstr "Да ли ће трака алата бити видљива."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
 msgid "Sidebar is visible"
 msgstr "Бочна површ је видљива"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
 msgid "Whether the sidebar should be visible."
 msgstr "Да ли ће бочна површ бити видљива."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
 msgid "Statusbar is visible"
 msgstr "Трака статуса је видљива"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
 msgid "Whether the status bar should be visible."
 msgstr "Да ли ће трака стања бити видљива."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "ИБ или алијас дела који се подразумевано приказује по покретању."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:26
 msgid "Default sidebar width"
 msgstr "Подразумевана ширина бочне површи"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:27
 msgid "The default width for the sidebar, in pixels."
 msgstr "Подразумевана ширина бочне траке, у тачкама."
 
@@ -10862,17 +11028,6 @@ msgstr ""
 "која је одређена током компајлирања програма, обично /usr/bin/sa-learn. "
 "Наредба не треба да садржи додатне опције."
 
-#: ../em-format/e-mail-formatter-attachment.c:424
-#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
-#: ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
-#: ../mail/message-list.etspec.h:4
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "Прилог"
-msgstr[1] "Прилози"
-msgstr[2] "Прилози"
-msgstr[3] "Прилог"
-
 #: ../em-format/e-mail-formatter-attachment.c:425
 msgid "Display as attachment"
 msgstr "Прикажи као прилог"
@@ -10916,15 +11071,15 @@ msgstr "РФЦ822 порука"
 msgid "Format part as an RFC822 message"
 msgstr "Обликује део као РФЦ822 поруку"
 
-#: ../em-format/e-mail-formatter-print.c:53
+#: ../em-format/e-mail-formatter-print.c:51
 #: ../e-util/gal-view-instance-save-as-dialog.c:94
 #: ../mail/e-mail-label-tree-view.c:98
 #: ../modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Name"
 msgstr "Назив"
 
-#: ../em-format/e-mail-formatter-print.c:53
-#: ../e-util/e-attachment-tree-view.c:573 ../mail/message-list.etspec.h:10
+#: ../em-format/e-mail-formatter-print.c:51
+#: ../e-util/e-attachment-tree-view.c:579 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Величина"
 
@@ -10932,15 +11087,14 @@ 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:1632
 msgid "Subject"
 msgstr "Наслов"
 
 #. pseudo-header
 #: ../em-format/e-mail-formatter-quote-headers.c:199
 #: ../em-format/e-mail-formatter-utils.c:343
-#: ../modules/mail/em-mailer-prefs.c:1484
+#: ../modules/mail/em-mailer-prefs.c:1490
 msgid "Mailer"
 msgstr "Пошиљалац"
 
@@ -11088,14 +11242,18 @@ msgstr "Прегледај _уверење"
 msgid "This certificate is not viewable"
 msgstr "Ово уверење није читљиво"
 
-#: ../em-format/e-mail-formatter-source.c:120
-msgid "Source"
-msgstr "Извор"
-
 #: ../em-format/e-mail-formatter-source.c:121
 msgid "Display source of a MIME part"
 msgstr "Приказује извое као МИМЕ део"
 
+#: ../em-format/e-mail-formatter-utils.c:202
+#: ../em-format/e-mail-formatter-utils.c:219
+#: ../em-format/e-mail-part-headers.c:48 ../mail/message-list.etspec.h:9
+#: ../mail/searchtypes.xml.in.h:11 ../mail/vfoldertypes.xml.in.h:11
+#: ../modules/mail/em-mailer-prefs.c:64
+msgid "To"
+msgstr "Прима"
+
 #: ../em-format/e-mail-formatter-utils.c:203
 #: ../em-format/e-mail-formatter-utils.c:220
 #: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:65
@@ -11108,28 +11266,26 @@ msgstr "Цц"
 msgid "Bcc"
 msgstr "Бцц"
 
-#: ../em-format/e-mail-formatter-utils.c:564
+#: ../em-format/e-mail-formatter-utils.c:566
 msgid "GPG signed"
 msgstr "ГПГ потписано"
 
-#: ../em-format/e-mail-formatter-utils.c:570
-#| msgid "GPG encrpyted"
+#: ../em-format/e-mail-formatter-utils.c:572
 msgid "GPG encrypted"
 msgstr "ГПГ шифровано"
 
-#: ../em-format/e-mail-formatter-utils.c:576
+#: ../em-format/e-mail-formatter-utils.c:578
 msgid "S/MIME signed"
 msgstr "С/МИМЕ потписано"
 
-#: ../em-format/e-mail-formatter-utils.c:582
-#| msgid "S/MIME encrpyted"
+#: ../em-format/e-mail-formatter-utils.c:584
 msgid "S/MIME encrypted"
 msgstr "С/МИМЕ шифровано"
 
-#: ../em-format/e-mail-formatter-utils.c:591
-#: ../mail/e-mail-config-security-page.c:748
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:194
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:144
+#: ../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
 msgid "Security"
 msgstr "Безбедност"
 
@@ -11287,76 +11443,56 @@ msgstr "Затворите ову поруку (Напусти)"
 
 # bug: plural-forms
 #: ../e-util/e-alert-sink.c:246
-#| msgid "Failed to mark messages as read."
 msgid "Failed to create a thread: "
 msgstr "Не могу да започнем расправу: "
 
-#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:735
-msgid "Icon View"
-msgstr "Преглед иконицама"
-
-#: ../e-util/e-attachment-bar.c:663 ../e-util/e-attachment-paned.c:737
-msgid "List View"
-msgstr "Преглед списком"
-
 #. To Translators: This text is set as a description of an attached
 #. * 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:1223
+#: ../e-util/e-attachment.c:1227
 msgid "Attached message"
 msgstr "Приложена порука"
 
-#: ../e-util/e-attachment.c:2152 ../e-util/e-attachment.c:3149
-#| msgid "Import cancelled."
+#: ../e-util/e-attachment.c:2173 ../e-util/e-attachment.c:3170
 msgid "Operation was cancelled"
 msgstr "Радња је отказана."
 
 #. Translators: Default attachment filename.
-#: ../e-util/e-attachment.c:2312 ../e-util/e-attachment.c:3011
-#: ../e-util/e-attachment.c:3382 ../e-util/e-attachment-store.c:691
+#: ../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
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../e-util/e-attachment.c:2393 ../e-util/e-attachment.c:3442
+#: ../e-util/e-attachment.c:2414 ../e-util/e-attachment.c:3463
 msgid "A load operation is already in progress"
 msgstr "Операција учитавања је већ у току"
 
-#: ../e-util/e-attachment.c:2401 ../e-util/e-attachment.c:3450
+#: ../e-util/e-attachment.c:2422 ../e-util/e-attachment.c:3471
 msgid "A save operation is already in progress"
 msgstr "Операција чувања је већ у току"
 
-#: ../e-util/e-attachment.c:2521
-#, c-format
-msgid "Could not load '%s'"
-msgstr "Не могу да учитам „%s“"
-
-#: ../e-util/e-attachment.c:2524
-#, c-format
-msgid "Could not load the attachment"
-msgstr "Не могу да учитам прилог"
-
-#: ../e-util/e-attachment.c:2809
+#: ../e-util/e-attachment.c:2830
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Не могу да отворим „%s“"
 
-#: ../e-util/e-attachment.c:2812
+#: ../e-util/e-attachment.c:2833
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Не могу да отворим прилог"
 
-#: ../e-util/e-attachment.c:3459
+#: ../e-util/e-attachment.c:3480
 msgid "Attachment contents not loaded"
 msgstr "Садржај прилога није учитан"
 
 # * found, so just bail completely.
-#: ../e-util/e-attachment.c:3550
+#: ../e-util/e-attachment.c:3571
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Не могу да сачувам „%s“"
 
-#: ../e-util/e-attachment.c:3553
+#: ../e-util/e-attachment.c:3574
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Не могу да сачувам прилог"
@@ -11369,11 +11505,17 @@ msgstr "Особине прилога"
 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
+msgid "_Description:"
+msgstr "_Опис:"
+
 #: ../e-util/e-attachment-dialog.c:374
 msgid "MIME Type:"
 msgstr "МИМЕ врста:"
 
-#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:521
+#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:526
 msgid "_Suggest automatic display of attachment"
 msgstr "_Предложи аутоматски приказ прилога"
 
@@ -11386,12 +11528,12 @@ msgid "Set as _Background"
 msgstr "Постави као _позадину"
 
 #: ../e-util/e-attachment-icon-view.c:168
-#: ../e-util/e-attachment-tree-view.c:548
+#: ../e-util/e-attachment-tree-view.c:554
 msgid "Loading"
 msgstr "Учитавам"
 
 #: ../e-util/e-attachment-icon-view.c:180
-#: ../e-util/e-attachment-tree-view.c:560
+#: ../e-util/e-attachment-tree-view.c:566
 msgid "Saving"
 msgstr "Чувам"
 
@@ -11403,19 +11545,19 @@ msgstr "Сакриј линију при_лога"
 msgid "Show Attachment _Bar"
 msgstr "Прикажи линију п_рилога"
 
-#: ../e-util/e-attachment-store.c:486
+#: ../e-util/e-attachment-store.c:491
 msgid "Add Attachment"
 msgstr "Додај прилог"
 
-#: ../e-util/e-attachment-store.c:493 ../e-util/e-attachment-store.c:495
+#: ../e-util/e-attachment-store.c:498 ../e-util/e-attachment-store.c:500
 msgid "A_ttach"
 msgstr "При_ложи"
 
-#: ../e-util/e-attachment-store.c:533
+#: ../e-util/e-attachment-store.c:538
 msgid "Archive selected directories using this format:"
 msgstr "Аривирај изабране директоријуме у овом формату:"
 
-#: ../e-util/e-attachment-store.c:626
+#: ../e-util/e-attachment-store.c:631
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Сачувај прилог"
@@ -11423,16 +11565,15 @@ msgstr[1] "Сачувај прилоге"
 msgstr[2] "Сачувај прилоге"
 msgstr[3] "Сачувај прилог"
 
-#: ../e-util/e-attachment-store.c:653
-#| msgid "Could not load the attachment"
+#: ../e-util/e-attachment-store.c:658
 msgid "Do _not extract files from the attachment"
 msgstr "Не _распакуј датотеке из прилога"
 
-#: ../e-util/e-attachment-store.c:658
+#: ../e-util/e-attachment-store.c:663
 msgid "Save extracted files _only"
 msgstr "Сачувај _само извучене датотеке"
 
-#: ../e-util/e-attachment-store.c:663
+#: ../e-util/e-attachment-store.c:668
 msgid "Save extracted files and the original _archive"
 msgstr "Сачувај извучене датотеке и оригиналне _архиве"
 
@@ -11460,16 +11601,16 @@ msgid "A_dd Attachment..."
 msgstr "До_дај прилог..."
 
 #: ../e-util/e-attachment-view.c:468
-#: ../modules/addressbook/e-book-shell-view-actions.c:1071
-#: ../modules/calendar/e-cal-shell-view-actions.c:1240
-#: ../modules/calendar/e-memo-shell-view-actions.c:571
-#: ../modules/calendar/e-task-shell-view-actions.c:696
+#: ../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
 msgid "_Properties"
 msgstr "_Својства"
 
-#: ../e-util/e-attachment-view.c:485
+#: ../e-util/e-attachment-view.c:485 ../e-util/e-source-selector.c:3376
 msgid "_Hide"
 msgstr "_Сакриј"
 
@@ -11490,12 +11631,10 @@ msgid "_Zoom to 100%"
 msgstr "Увећај на _100%"
 
 #: ../e-util/e-attachment-view.c:515
-#| msgid "Reset the text to its original size"
 msgid "Zoom the image to its natural size"
 msgstr "Поставља увећање слике на њену оригиналну величину"
 
 #: ../e-util/e-attachment-view.c:520
-#| msgid "Close this window"
 msgid "_Zoom to window"
 msgstr "У_клопи у прозор"
 
@@ -11530,40 +11669,40 @@ msgstr "Умножава садржај књиге локално за рад в
 msgid "Ctrl-click to open a link"
 msgstr "Притисните тастер Ктрл и кликните да отворите везу"
 
-#: ../e-util/e-calendar.c:195
+#: ../e-util/e-calendar.c:207
 msgid "Previous month"
 msgstr "Претходни месец"
 
-#: ../e-util/e-calendar.c:220
+#: ../e-util/e-calendar.c:232
 msgid "Next month"
 msgstr "Следећи месец"
 
-#: ../e-util/e-calendar.c:246
+#: ../e-util/e-calendar.c:258
 msgid "Previous year"
 msgstr "Претходна година"
 
-#: ../e-util/e-calendar.c:271
+#: ../e-util/e-calendar.c:283
 msgid "Next year"
 msgstr "Следећа година"
 
-#: ../e-util/e-calendar.c:295
+#: ../e-util/e-calendar.c:307
 msgid "Month Calendar"
 msgstr "Месечни календар"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1322 ../e-util/e-calendar-item.c:2200
+#: ../e-util/e-calendar-item.c:1337 ../e-util/e-calendar-item.c:2215
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1324
+#: ../e-util/e-calendar-item.c:1339
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1361
+#: ../e-util/e-calendar-item.c:1376
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y."
@@ -11605,19 +11744,16 @@ msgid "_Available Categories:"
 msgstr "_Доступне категорије:"
 
 #: ../e-util/e-categories-editor.c:274
-#| msgid "_New"
 msgctxt "category"
 msgid "_New"
 msgstr "_Нова"
 
 #: ../e-util/e-categories-editor.c:278
-#| msgid "_Edit"
 msgctxt "category"
 msgid "_Edit"
 msgstr "_Уређивање"
 
 #: ../e-util/e-categories-editor.c:282
-#| msgid "_Delete"
 msgctxt "category"
 msgid "_Delete"
 msgstr "_Обриши"
@@ -11664,7 +11800,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:2033
+#: ../e-util/e-cell-date.c:159 ../mail/message-list.c:2052
 msgid "?"
 msgstr "?"
 
@@ -11674,7 +11810,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:1740
+#: ../modules/calendar/e-cal-shell-view-actions.c:1793
 #: ../modules/itip-formatter/itip-view.c:221
 msgid "Today"
 msgstr "Данас"
@@ -11799,7 +11935,6 @@ msgid "Cannot create a client object from extension name '%s'"
 msgstr "Не могу да направим предмет програма из назива проширења „%s“"
 
 #: ../e-util/e-color-chooser-widget.c:124
-#| msgid "Use custom fonts"
 msgid "Choose custom color"
 msgstr "Избор произвољне боје"
 
@@ -11836,7 +11971,6 @@ msgid "very dark gray"
 msgstr "веома тамнобраон"
 
 #: ../e-util/e-color-combo.c:90
-#| msgid "Mark as _Unread"
 msgid "dark red"
 msgstr "тамноцрвена"
 
@@ -11869,7 +12003,6 @@ msgid "dark grey"
 msgstr "тамносива"
 
 #: ../e-util/e-color-combo.c:99
-#| msgid "3rd"
 msgid "red"
 msgstr "црвена"
 
@@ -11902,7 +12035,6 @@ msgid "gray"
 msgstr "сива"
 
 #: ../e-util/e-color-combo.c:108
-#| msgid "Image"
 msgid "magenta"
 msgstr "магнета"
 
@@ -11927,7 +12059,6 @@ msgid "bright blue"
 msgstr "светлоплава"
 
 #: ../e-util/e-color-combo.c:114
-#| msgid "_Required people"
 msgid "red purple"
 msgstr "црвено-љубичаста"
 
@@ -11969,8 +12100,8 @@ msgstr "бела"
 
 #: ../e-util/e-color-combo.c:639 ../mail/e-mail-account-tree-view.c:134
 #: ../mail/e-mail-config-security-page.c:426
-#: ../mail/e-mail-config-security-page.c:578 ../mail/e-mail-reader.c:3899
-#: ../mail/mail-config.ui.h:72
+#: ../mail/e-mail-config-security-page.c:590 ../mail/e-mail-reader.c:4037
+#: ../mail/mail-config.ui.h:73
 msgid "Default"
 msgstr "Основно"
 
@@ -11991,8 +12122,7 @@ msgid "Drop-down combination box to select time"
 msgstr "Прозорче за избор времена"
 
 # note(slobo): можда треба рок
-#: ../e-util/e-dateedit.c:629
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
+#: ../e-util/e-dateedit.c:629 ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "Време"
 
@@ -12121,7 +12251,6 @@ msgstr "_Тужан"
 
 #. Translators: ;-)
 #: ../e-util/e-emoticon-chooser.c:44
-#| msgid "_Window"
 msgid "_Wink"
 msgstr "_Намиг"
 
@@ -12137,7 +12266,6 @@ msgstr "_Осмех"
 
 #. Translators: :-|
 #: ../e-util/e-emoticon-chooser.c:50
-#| msgid "_Plain text"
 msgid "_Plain"
 msgstr "_Равни"
 
@@ -12213,7 +12341,6 @@ msgstr "_Ђаволак"
 
 #. Translators: :-(|)
 #: ../e-util/e-emoticon-chooser.c:80
-#| msgid "_Mon"
 msgid "_Monkey"
 msgstr "_Мајмун"
 
@@ -12417,8 +12544,8 @@ msgstr "Пронађите ставке које задовољавају сле
 #: ../e-util/e-mail-identity-combo-box.c:476
 #: ../e-util/e-mail-signature-combo-box.c:367
 #: ../libemail-engine/camel-null-store.c:27
-#: ../mail/e-mail-config-summary-page.c:138
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:615
+#: ../mail/e-mail-config-summary-page.c:139
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:628
 msgid "None"
 msgstr "Ништа"
 
@@ -12456,12 +12583,10 @@ msgid "Outgoing"
 msgstr "Одлазно"
 
 #: ../e-util/e-html-editor-actions.c:58
-#| msgid "Failed to open folder."
 msgid "Failed to insert HTML file."
 msgstr "Не могу да уметнем ХТМЛ датотеку."
 
 #: ../e-util/e-html-editor-actions.c:95
-#| msgid "Failed to import certificate"
 msgid "Failed to insert text file."
 msgstr "Не могу да уметнем текстуалну датотеку."
 
@@ -12470,39 +12595,32 @@ msgid "Insert HTML File"
 msgstr "Уметни ХТМЛ датотеку"
 
 #: ../e-util/e-html-editor-actions.c:597
-#| msgid "HTML _Mode"
 msgid "HTML file"
 msgstr "ХТМЛ датотека"
 
 #: ../e-util/e-html-editor-actions.c:624
-#| msgid "Inline Image"
 msgctxt "dialog-title"
 msgid "Insert Image"
 msgstr "Уметни слику"
 
 #: ../e-util/e-html-editor-actions.c:686
-#| msgid "Increase the text size"
 msgid "Insert text file"
 msgstr "Уметни текстуалну датотеку"
 
 #: ../e-util/e-html-editor-actions.c:692
-#| msgid "Select a file"
 msgid "Text file"
 msgstr "Текстуална датотека"
 
 #: ../e-util/e-html-editor-actions.c:1078
-#| msgid "Copy selected events to the clipboard"
 msgid "Copy selected text to the clipboard"
 msgstr "Умножава изабрани текст у списак исечака"
 
 #: ../e-util/e-html-editor-actions.c:1085
-#| msgid "Cut selected events to the clipboard"
 msgid "Cut selected text to the clipboard"
 msgstr "Сече изабрани текст у списак исечака"
 
 #. Widgets are treating Ctrl + v shortcut themselves
 #: ../e-util/e-html-editor-actions.c:1092
-#| msgid "Paste events from the clipboard"
 msgid "Paste text from the clipboard"
 msgstr "Убацује текст из списка исечака"
 
@@ -12511,7 +12629,6 @@ msgid "Redo the last undone action"
 msgstr "Понавља последњу опозвану радњу"
 
 #: ../e-util/e-html-editor-actions.c:1113
-#| msgid "Copy the selection"
 msgid "Undo the last action"
 msgstr "Враћа последњу радњу"
 
@@ -12520,18 +12637,15 @@ msgid "For_mat"
 msgstr "_Формат"
 
 #: ../e-util/e-html-editor-actions.c:1141
-#| msgid "Tool_bar Style"
 msgid "_Paragraph Style"
 msgstr "Стил _пасуса"
 
 #: ../e-util/e-html-editor-actions.c:1155
 #: ../e-util/e-html-editor-image-dialog.c:635
-#| msgid "A_lignment"
 msgid "_Alignment"
 msgstr "По_равнање"
 
 #: ../e-util/e-html-editor-actions.c:1162
-#| msgid "_Languages"
 msgid "Current _Languages"
 msgstr "Тренутни _језици"
 
@@ -12556,15 +12670,10 @@ msgid "Paste _Quotation"
 msgstr "Уметни _цитат"
 
 #: ../e-util/e-html-editor-actions.c:1207
-#| msgid "_Find"
 msgid "_Find..."
 msgstr "_Нађи..."
 
 #: ../e-util/e-html-editor-actions.c:1209
-#| msgid ""
-#| "\n"
-#| "\n"
-#| "Search for the Contact."
 msgid "Search for text"
 msgstr "Текст за претрагу"
 
@@ -12573,17 +12682,14 @@ msgid "Find A_gain"
 msgstr "Н_ађи наредно"
 
 #: ../e-util/e-html-editor-actions.c:1221
-#| msgid "_Replace"
 msgid "Re_place..."
 msgstr "_Замени..."
 
 #: ../e-util/e-html-editor-actions.c:1223
-#| msgid "Search for text in the displayed contact"
 msgid "Search for and replace text"
 msgstr "Тражи жељени текст и мења га другим"
 
 #: ../e-util/e-html-editor-actions.c:1228
-#| msgid "Canceling..."
 msgid "Check _Spelling..."
 msgstr "_Провери писање..."
 
@@ -12610,7 +12716,6 @@ msgid "_Center"
 msgstr "_Средина"
 
 #: ../e-util/e-html-editor-actions.c:1261
-#| msgid "A_lignment"
 msgid "Center Alignment"
 msgstr "Средишње поравнање"
 
@@ -12621,7 +12726,6 @@ msgid "_Left"
 msgstr "_Лево"
 
 #: ../e-util/e-html-editor-actions.c:1268
-#| msgid "A_lignment"
 msgid "Left Alignment"
 msgstr "Поравнање по левој страни"
 
@@ -12632,7 +12736,6 @@ msgid "_Right"
 msgstr "_Десно"
 
 #: ../e-util/e-html-editor-actions.c:1275
-#| msgid "A_lignment"
 msgid "Right Alignment"
 msgstr "Поравнање по десној страни"
 
@@ -12646,47 +12749,38 @@ msgid "HTML editing mode"
 msgstr "Режим за уређивање ХТМЛ поруке"
 
 #: ../e-util/e-html-editor-actions.c:1290
-#| msgid "Plain Text"
 msgid "Plain _Text"
 msgstr "Обичан _текст"
 
 #: ../e-util/e-html-editor-actions.c:1292
-#| msgid "Plain Text Mode"
 msgid "Plain text editing mode"
 msgstr "Режим уређивања за обичан текст"
 
 #: ../e-util/e-html-editor-actions.c:1300
-#| msgid "Normal"
 msgid "_Normal"
 msgstr "_Обично"
 
 #: ../e-util/e-html-editor-actions.c:1307
-#| msgid "Header"
 msgid "Header _1"
 msgstr "Наслов _1"
 
 #: ../e-util/e-html-editor-actions.c:1314
-#| msgid "Header"
 msgid "Header _2"
 msgstr "Наслов _2"
 
 #: ../e-util/e-html-editor-actions.c:1321
-#| msgid "Header"
 msgid "Header _3"
 msgstr "Наслов _3"
 
 #: ../e-util/e-html-editor-actions.c:1328
-#| msgid "Header"
 msgid "Header _4"
 msgstr "Наслов _4"
 
 #: ../e-util/e-html-editor-actions.c:1335
-#| msgid "Header"
 msgid "Header _5"
 msgstr "Наслов _5"
 
 #: ../e-util/e-html-editor-actions.c:1342
-#| msgid "Header"
 msgid "Header _6"
 msgstr "Наслов _6"
 
@@ -12695,7 +12789,6 @@ msgid "_Preformatted"
 msgstr "Пр_едодређено"
 
 #: ../e-util/e-html-editor-actions.c:1356
-#| msgid "Address"
 msgid "A_ddress"
 msgstr "А_дреса"
 
@@ -12704,7 +12797,6 @@ msgid "_Blockquote"
 msgstr "_Цитирање одељка"
 
 #: ../e-util/e-html-editor-actions.c:1370
-#| msgid "D_elete Memo List"
 msgid "_Bulleted List"
 msgstr "Набрајање _симболима"
 
@@ -12722,13 +12814,11 @@ msgstr "Нарајање с_ловима"
 
 #: ../e-util/e-html-editor-actions.c:1407
 #: ../e-util/e-html-editor-actions.c:1445
-#| msgid "Save _Image..."
 msgid "_Image..."
 msgstr "_Слика..."
 
 #. Translators: This is an action tooltip
 #: ../e-util/e-html-editor-actions.c:1410
-#| msgid "Inline Image"
 msgid "Insert Image"
 msgstr "Умеће слику"
 
@@ -12738,31 +12828,26 @@ msgid "_Link..."
 msgstr "_Веза..."
 
 #: ../e-util/e-html-editor-actions.c:1417
-#| msgid "_Insert"
 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
-#| msgid "_Rename..."
 msgid "_Rule..."
 msgstr "Прави_ло..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
 #: ../e-util/e-html-editor-actions.c:1426
-#| msgid "_Insert"
 msgid "Insert Rule"
 msgstr "Умеће правило"
 
 #: ../e-util/e-html-editor-actions.c:1431
 #: ../e-util/e-html-editor-actions.c:1474
-#| msgid "_Rename..."
 msgid "_Table..."
 msgstr "_Табела..."
 
 #: ../e-util/e-html-editor-actions.c:1433
-#| msgid "_Insert"
 msgid "Insert Table"
 msgstr "Умеће табелу"
 
@@ -12771,7 +12856,6 @@ msgid "_Cell..."
 msgstr "_Ћелија"
 
 #: ../e-util/e-html-editor-actions.c:1459
-#| msgid "Save _Image..."
 msgid "Pa_ge..."
 msgstr "Ст_раница..."
 
@@ -12780,7 +12864,6 @@ msgid "Font _Size"
 msgstr "Величина _фонта"
 
 #: ../e-util/e-html-editor-actions.c:1490
-#| msgid "_Forward style:"
 msgid "_Font Style"
 msgstr "Врста фо_нта"
 
@@ -12807,7 +12890,6 @@ msgid "Italic"
 msgstr "Искошено"
 
 #: ../e-util/e-html-editor-actions.c:1524
-#| msgid "Plain Text"
 msgid "_Plain Text"
 msgstr "О_бичан текст"
 
@@ -12822,12 +12904,10 @@ msgstr "Прецртано"
 
 #: ../e-util/e-html-editor-actions.c:1540
 #: ../e-util/e-html-editor-text-dialog.c:236
-#| msgid "Undefined"
 msgid "_Underline"
 msgstr "Подв_учено"
 
 #: ../e-util/e-html-editor-actions.c:1542
-#| msgid "Undefined"
 msgid "Underline"
 msgstr "Подвучени текст"
 
@@ -12867,29 +12947,24 @@ msgid "+4"
 msgstr "+4"
 
 #: ../e-util/e-html-editor-actions.c:1619
-#| msgid "_Contents"
 msgid "Cell Contents"
 msgstr "Садржај ћелије"
 
 #: ../e-util/e-html-editor-actions.c:1626
-#| msgid "Add a Column"
 msgid "Column"
 msgstr "Колона"
 
 #: ../e-util/e-html-editor-actions.c:1633
-#| msgid "Low"
 msgid "Row"
 msgstr "Ред"
 
 #: ../e-util/e-html-editor-actions.c:1640
 #: ../e-util/e-html-editor-actions.c:1725
-#| msgid "Table Cell"
 msgid "Table"
 msgstr "Табела"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
 #: ../e-util/e-html-editor-actions.c:1650
-#| msgid "Table Cell"
 msgid "Table Delete"
 msgstr "Брисање табеле"
 
@@ -12899,12 +12974,10 @@ msgstr "Начини уноса"
 
 #. Translators: Popup menu item caption, containing all the Insert options for a table
 #: ../e-util/e-html-editor-actions.c:1665
-#| msgid "Table Cell"
 msgid "Table Insert"
 msgstr "Уметање табеле"
 
 #: ../e-util/e-html-editor-actions.c:1672
-#| msgid "_Properties"
 msgid "Properties"
 msgstr "Особине"
 
@@ -12917,7 +12990,6 @@ msgid "Column Before"
 msgstr "Колона пре"
 
 #: ../e-util/e-html-editor-actions.c:1704
-#| msgid "_Insert"
 msgid "Insert _Link"
 msgstr "Уметни _везу"
 
@@ -12934,7 +13006,6 @@ msgid "Cell..."
 msgstr "Ћелија..."
 
 #: ../e-util/e-html-editor-actions.c:1739
-#| msgid "Image"
 msgid "Image..."
 msgstr "Слика..."
 
@@ -12943,7 +13014,6 @@ msgid "Link..."
 msgstr "Веза..."
 
 #: ../e-util/e-html-editor-actions.c:1753
-#| msgid "Pager"
 msgid "Page..."
 msgstr "Страница..."
 
@@ -12953,7 +13023,6 @@ msgstr "Пасус..."
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
 #: ../e-util/e-html-editor-actions.c:1768
-#| msgid "Full _Name..."
 msgid "Rule..."
 msgstr "Правило..."
 
@@ -12962,22 +13031,18 @@ msgid "Table..."
 msgstr "Табеле..."
 
 #: ../e-util/e-html-editor-actions.c:1782
-#| msgid "Select..."
 msgid "Text..."
 msgstr "Текст..."
 
 #: ../e-util/e-html-editor-actions.c:1789
-#| msgid "_Remove"
 msgid "Remove Link"
 msgstr "Уклони везу"
 
 #: ../e-util/e-html-editor-actions.c:1806
-#| msgid "Add \"%s\" to Dictionary"
 msgid "Add Word to Dictionary"
 msgstr "Додај реч у речник"
 
 #: ../e-util/e-html-editor-actions.c:1813
-#| msgid "Color for _misspelled words:"
 msgid "Ignore Misspelled Word"
 msgstr "Занемари погрешно написане речи"
 
@@ -12986,52 +13051,45 @@ msgid "Add Word To"
 msgstr "Додај реч у"
 
 #: ../e-util/e-html-editor-actions.c:1829
-#| msgid "(no suggestions)"
 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:1937
+#: ../e-util/e-html-editor-actions.c:1950
 #, c-format
-#| msgid "Add \"%s\" to Dictionary"
 msgid "%s Dictionary"
 msgstr "%s речник"
 
-#: ../e-util/e-html-editor-actions.c:2024
+#: ../e-util/e-html-editor-actions.c:2040
 msgid "_Emoticon"
 msgstr "_Смајлић"
 
 # shell:noshell-reason title
-#: ../e-util/e-html-editor-actions.c:2025
-#| msgid "Restart Evolution"
+#: ../e-util/e-html-editor-actions.c:2041
 msgid "Insert Emoticon"
 msgstr "Уметни смајлић"
 
-#: ../e-util/e-html-editor-actions.c:2093
-#| msgid "_Replace"
+#: ../e-util/e-html-editor-actions.c:2109
 msgid "Re_place"
 msgstr "_Замени"
 
-#: ../e-util/e-html-editor-actions.c:2096
-#| msgid "Image"
+#: ../e-util/e-html-editor-actions.c:2112
 msgid "_Image"
 msgstr "_Слика"
 
-#: ../e-util/e-html-editor-actions.c:2099
+#: ../e-util/e-html-editor-actions.c:2115
 msgid "_Link"
 msgstr "_Веза"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../e-util/e-html-editor-actions.c:2103
-#| msgid "Add Rule"
+#: ../e-util/e-html-editor-actions.c:2119
 msgid "_Rule"
 msgstr "_Правило"
 
-#: ../e-util/e-html-editor-actions.c:2106
+#: ../e-util/e-html-editor-actions.c:2122
 #: ../e-util/e-html-editor-cell-dialog.c:738
-#| msgid "E_nable"
 msgid "_Table"
 msgstr "_Табела"
 
@@ -13040,17 +13098,14 @@ msgid "Paragraph Style"
 msgstr "Стил пасуса"
 
 #: ../e-util/e-html-editor.c:718
-#| msgid "Edit Reminder"
 msgid "Editing Mode"
 msgstr "Режим за уређивање"
 
 #: ../e-util/e-html-editor.c:730
-#| msgid "Unset Color"
 msgid "Font Color"
 msgstr "Боја фонта"
 
 #: ../e-util/e-html-editor.c:748
-#| msgid "Size"
 msgid "Font Size"
 msgstr "Величина фонта"
 
@@ -13100,36 +13155,30 @@ msgstr "_Водоравно:"
 
 #: ../e-util/e-html-editor-cell-dialog.c:792
 #: ../e-util/e-html-editor-image-dialog.c:625
-#| msgid "_Top"
 msgid "Top"
 msgstr "Врх"
 
 #: ../e-util/e-html-editor-cell-dialog.c:793
 #: ../e-util/e-html-editor-image-dialog.c:626
-#| msgid "_Middle:"
 msgid "Middle"
 msgstr "Средина"
 
 #: ../e-util/e-html-editor-cell-dialog.c:794
 #: ../e-util/e-html-editor-image-dialog.c:627
-#| msgid "_Bottom"
 msgid "Bottom"
 msgstr "Дно"
 
 #: ../e-util/e-html-editor-cell-dialog.c:802
-#| msgid "_Vertical View"
 msgid "_Vertical:"
 msgstr "_Усправно:"
 
 #. Wrap Text
 #: ../e-util/e-html-editor-cell-dialog.c:808
-#| msgid "Plain Text"
 msgid "_Wrap Text"
 msgstr "_Преламај текст"
 
 #. Header Style
 #: ../e-util/e-html-editor-cell-dialog.c:816
-#| msgid "Header Value"
 msgid "_Header Style"
 msgstr "Врста заглавља"
 
@@ -13163,38 +13212,32 @@ msgid "Transparent"
 msgstr "Провидна"
 
 #: ../e-util/e-html-editor-cell-dialog.c:922
-#| msgid "Color:"
 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
-#| msgid "Could not set as background"
 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
-#| msgid "Image"
 msgid "Images"
 msgstr "Слике"
 
 #: ../e-util/e-html-editor-cell-dialog.c:948
-#| msgid "Image"
 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
-#| msgid "_No image"
 msgid "_Remove image"
 msgstr "У_клони слику"
 
 #: ../e-util/e-html-editor-cell-dialog.c:975
-#| msgid "_Properties"
 msgid "Cell Properties"
 msgstr "Особине ћелије"
 
@@ -13206,7 +13249,6 @@ msgstr "Није нађено поклапање"
 
 #: ../e-util/e-html-editor-find-dialog.c:160
 #: ../e-util/e-html-editor-replace-dialog.c:247
-#| msgid "Search _Folders"
 msgid "Search _backwards"
 msgstr "Тражи у_назад"
 
@@ -13215,12 +13257,10 @@ msgid "Case _Sensitive"
 msgstr "_Разликуј велика слова"
 
 #: ../e-util/e-html-editor-find-dialog.c:174
-#| msgid "_Search"
 msgid "_Wrap Search"
 msgstr "Пре_ламај"
 
 #: ../e-util/e-html-editor-find-dialog.c:213
-#| msgid "_Find"
 msgid "Find"
 msgstr "Нађи"
 
@@ -13236,7 +13276,6 @@ msgid "_Width:"
 msgstr "_Ширина:"
 
 #: ../e-util/e-html-editor-hrule-dialog.c:393
-#| msgid "Size"
 msgid "_Size:"
 msgstr "_Величина:"
 
@@ -13246,7 +13285,6 @@ msgstr "<b>Стил</b>"
 
 #: ../e-util/e-html-editor-hrule-dialog.c:425
 #: ../e-util/e-html-editor-table-dialog.c:909
-#| msgid "A_lignment"
 msgid "_Alignment:"
 msgstr "По_равнање:"
 
@@ -13256,19 +13294,16 @@ msgid "S_haded"
 msgstr "Осен_чено"
 
 #: ../e-util/e-html-editor-hrule-dialog.c:448
-#| msgid "Folder Properties"
 msgid "Rule properties"
 msgstr "Особине правила"
 
 #: ../e-util/e-html-editor-image-dialog.c:515
 #: ../e-util/e-html-editor-paragraph-dialog.c:66
 #: ../e-util/e-html-editor-table-dialog.c:766
-#| msgid "General"
 msgid "<b>General</b>"
 msgstr "<b>Опште</b>"
 
 #: ../e-util/e-html-editor-image-dialog.c:544
-#| msgid "Source"
 msgid "_Source:"
 msgstr "И_звор:"
 
@@ -13295,7 +13330,6 @@ msgstr "<b>Веза</b>"
 
 #: ../e-util/e-html-editor-image-dialog.c:708
 #: ../e-util/e-html-editor-link-dialog.c:400
-#| msgid "URL:"
 msgid "_URL:"
 msgstr "_УРЛ:"
 
@@ -13305,17 +13339,14 @@ msgid "_Test URL..."
 msgstr "_Тест УРЛ:"
 
 #: ../e-util/e-html-editor-image-dialog.c:730
-#| msgid "Category Properties"
 msgid "Image Properties"
 msgstr "Особине слике"
 
 #: ../e-util/e-html-editor-link-dialog.c:429
-#| msgid "_Remove"
 msgid "_Remove Link"
 msgstr "_Уклони везу"
 
 #: ../e-util/e-html-editor-link-dialog.c:454
-#| msgid "_Properties"
 msgid "Link Properties"
 msgstr "Особине везе"
 
@@ -13339,8 +13370,8 @@ msgstr "Трака"
 msgid "Midnight"
 msgstr "Поноћ"
 
-#: ../e-util/e-html-editor-page-dialog.c:126 ../mail/filtertypes.xml.in.h:36
-#: ../mail/searchtypes.xml.in.h:39 ../mail/vfoldertypes.xml.in.h:39
+#: ../e-util/e-html-editor-page-dialog.c:126 ../mail/filtertypes.xml.in.h:38
+#: ../mail/searchtypes.xml.in.h:41 ../mail/vfoldertypes.xml.in.h:41
 msgid "Draft"
 msgstr "Нацрт"
 
@@ -13353,7 +13384,6 @@ msgid "<b>Colors</b>"
 msgstr "<b>Боје</b>"
 
 #: ../e-util/e-html-editor-page-dialog.c:563
-#| msgid "_Text Only"
 msgid "_Text:"
 msgstr "_Текст:"
 
@@ -13366,7 +13396,6 @@ msgid "_Visited Link:"
 msgstr "_Посећена веза:"
 
 #: ../e-util/e-html-editor-page-dialog.c:608
-#| msgid "Set as _Background"
 msgid "_Background:"
 msgstr "По_задина:"
 
@@ -13375,44 +13404,36 @@ msgid "<b>Background Image</b>"
 msgstr "<b>Позадинска слика</b>"
 
 #: ../e-util/e-html-editor-page-dialog.c:638
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
-#| msgid "Template:"
+#: ../modules/calendar/e-calendar-preferences.ui.h:78
 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:646 ../e-util/e-import-assistant.c:283
 msgid "Select a file"
 msgstr "Изаберите датотеку"
 
 #: ../e-util/e-html-editor-page-dialog.c:653
-#| msgid "_Custom"
 msgid "_Custom:"
 msgstr "_Произвољно:"
 
 #: ../e-util/e-html-editor-page-dialog.c:680
-#| msgid "_Properties"
 msgid "Page Properties"
 msgstr "Особине странице"
 
 #: ../e-util/e-html-editor-paragraph-dialog.c:83
-#| msgid "_Reply style:"
 msgid "_Style:"
 msgstr "_Стил:"
 
 #: ../e-util/e-html-editor-paragraph-dialog.c:90
-#| msgid "A_lignment"
 msgid "<b>Alignment</b>"
 msgstr "<b>Поравнање</b>"
 
 #: ../e-util/e-html-editor-paragraph-dialog.c:155
-#| msgid "Category Properties"
 msgid "Paragraph Properties"
 msgstr "Особине пасуса"
 
 #: ../e-util/e-html-editor-replace-dialog.c:163
 #, c-format
-#| msgid "occurrences"
 msgid "%d occurrence replaced"
 msgid_plural "%d occurrences replaced"
 msgstr[0] "%d појава је замењена"
@@ -13421,7 +13442,6 @@ msgstr[2] "%d појава је замењено"
 msgstr[3] "Појава је замењена"
 
 #: ../e-util/e-html-editor-replace-dialog.c:227
-#| msgid "_Replace"
 msgid "R_eplace:"
 msgstr "_Замени:"
 
@@ -13434,7 +13454,6 @@ msgid "_Case sensitive"
 msgstr "_Разликуј велика и мала слова"
 
 #: ../e-util/e-html-editor-replace-dialog.c:255
-#| msgid "_Search"
 msgid "Wra_p search"
 msgstr "Пре_ламај"
 
@@ -13448,12 +13467,10 @@ msgid "_Replace"
 msgstr "_Замени"
 
 #: ../e-util/e-html-editor-replace-dialog.c:281
-#| msgid "Reply to _All"
 msgid "Replace _All"
 msgstr "Замени _све"
 
 #: ../e-util/e-html-editor-replace-dialog.c:301
-#| msgid "_Replace"
 msgctxt "dialog-title"
 msgid "Replace"
 msgstr "Замени"
@@ -13469,19 +13486,17 @@ msgstr "<b>Предлози</b>"
 
 #. Replace
 #: ../e-util/e-html-editor-spell-check-dialog.c:555
-#| msgid "_Replace"
 msgid "Replace"
 msgstr "Замени"
 
 #. Replace All
 #: ../e-util/e-html-editor-spell-check-dialog.c:564
-#| msgid "_Replace"
 msgid "Replace All"
 msgstr "Замени све"
 
 #. Ignore
 #: ../e-util/e-html-editor-spell-check-dialog.c:573
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:110
 msgid "Ignore"
 msgstr "Занемари"
 
@@ -13492,7 +13507,6 @@ msgstr "Прескочи"
 
 #. Back
 #: ../e-util/e-html-editor-spell-check-dialog.c:591
-#| msgid "Go Back"
 msgid "Back"
 msgstr "Назад"
 
@@ -13502,12 +13516,10 @@ msgstr "<b>Речник</b>"
 
 #. Add Word button
 #: ../e-util/e-html-editor-spell-check-dialog.c:620
-#| msgid "Add Folder"
 msgid "Add word"
 msgstr "Додај реч"
 
-#: ../e-util/e-html-editor-spell-check-dialog.c:637
-#: ../mail/mail-config.ui.h:38
+#: ../e-util/e-html-editor-spell-check-dialog.c:637 ../mail/mail-config.ui.h:39
 msgid "Spell Checking"
 msgstr "Провера правописа"
 
@@ -13516,7 +13528,6 @@ msgid "_Rows:"
 msgstr "_Редови:"
 
 #: ../e-util/e-html-editor-table-dialog.c:805
-#| msgid "_Table column:"
 msgid "C_olumns:"
 msgstr "_Колоне:"
 
@@ -13525,23 +13536,19 @@ msgid "_Spacing:"
 msgstr "_Размак:"
 
 #: ../e-util/e-html-editor-table-dialog.c:873
-#| msgid "Loading"
 msgid "_Padding:"
 msgstr "_Оквир:"
 
 #: ../e-util/e-html-editor-table-dialog.c:937
 #: ../e-util/e-html-editor-text-dialog.c:261
-#| msgid "Color:"
 msgid "_Color:"
 msgstr "_Боја:"
 
 #: ../e-util/e-html-editor-table-dialog.c:963
-#| msgid "Image"
 msgid "Image:"
 msgstr "Слика:"
 
 #: ../e-util/e-html-editor-table-dialog.c:990
-#| msgid "Calendar Properties"
 msgid "Table Properties"
 msgstr "Особине табеле"
 
@@ -13550,17 +13557,14 @@ msgid "Si_ze:"
 msgstr "_Величина:"
 
 #: ../e-util/e-html-editor-text-dialog.c:296
-#| msgid "_Properties"
 msgid "Text Properties"
 msgstr "Особине текста"
 
-#: ../e-util/e-html-editor-view.c:5474
-#| msgid "Calendar Properties"
+#: ../e-util/e-html-editor-view.c:6298
 msgid "Changed property"
 msgstr "Измењена особина"
 
-#: ../e-util/e-html-editor-view.c:5475
-#| msgid "Whether to emit a beep."
+#: ../e-util/e-html-editor-view.c:6299
 msgid "Whether editor changed"
 msgstr "Да ли је уређивач променио"
 
@@ -13598,13 +13602,17 @@ msgid "Please select the information that you would like to import:"
 msgstr "Изаберите податке које желите да увезете:"
 
 #: ../e-util/e-import-assistant.c:533
+#| msgid ""
+#| "Evolution checked for settings to import from the following applications: "
+#| "Pine, Netscape, Elm, iCalendar. No importable settings found. If you "
+#| "would like to try again, please click the \"Back\" button."
 msgid ""
 "Evolution checked for settings to import from the following applications: "
-"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
-"like to try again, please click the \"Back\" button."
+"Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
+"would like to try again, please click the \"Back\" button."
 msgstr ""
 "Еволуција је проверила подешавања за увоз следећих програма: Пине, Нетскејп, "
-"Елм, иКалендар. Нема подешавања за увожење. Уколико желите да покушате "
+"Елм, иКалендар, К-пошта. Нема подешавања за увоз. Уколико желите да покушате "
 "поново, кликните на дугме „Назад“."
 
 #: ../e-util/e-import-assistant.c:559
@@ -13670,11 +13678,11 @@ msgstr "Кликните на „Примени“ да започнете ув
 msgid "Autogenerated"
 msgstr "Аутоматски састављено"
 
-#: ../e-util/e-mail-signature-editor.c:297
+#: ../e-util/e-mail-signature-editor.c:297 ../mail/e-mail-notes.c:905
 msgid "Close"
 msgstr "Затвори"
 
-#: ../e-util/e-mail-signature-editor.c:302
+#: ../e-util/e-mail-signature-editor.c:302 ../mail/e-mail-notes.c:910
 msgid "_Save and Close"
 msgstr "_Сачувај и затвори"
 
@@ -13757,7 +13765,6 @@ msgstr "Отварам списак задатака „%s“"
 
 #: ../e-util/e-misc-utils.c:2396
 #, c-format
-#| msgid "Opening calendar '%s'"
 msgid "Opening address book '%s'"
 msgstr "Отварам адресар „%s“"
 
@@ -13784,10 +13791,10 @@ msgstr "_Потражи:"
 
 #: ../e-util/e-name-selector-dialog.c:366
 #: ../e-util/e-name-selector-dialog.c:1274
-#: ../modules/addressbook/e-book-shell-view-actions.c:1157
-#: ../modules/calendar/e-cal-shell-view-actions.c:1573
-#: ../modules/calendar/e-memo-shell-view-actions.c:709
-#: ../modules/calendar/e-task-shell-view-actions.c:881
+#: ../modules/addressbook/e-book-shell-view-actions.c:1183
+#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-memo-shell-view-actions.c:760
+#: ../modules/calendar/e-task-shell-view-actions.c:933
 msgid "Any Category"
 msgstr "Било која категорија"
 
@@ -13799,8 +13806,7 @@ msgstr "Ко_нтакти"
 msgid "Search"
 msgstr "Потражи"
 
-#: ../e-util/e-name-selector-dialog.c:448
-#: ../mail/importers/pine-importer.c:429
+#: ../e-util/e-name-selector-dialog.c:448 ../mail/importers/pine-importer.c:429
 msgid "Address Book"
 msgstr "Адресар"
 
@@ -13881,7 +13887,7 @@ msgstr "_Запамти ову лозинку"
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Запамти ову лозинку до краја ове сесије"
 
-#: ../e-util/e-preferences-window.c:318
+#: ../e-util/e-preferences-window.c:321
 msgid "Evolution Preferences"
 msgstr "Подешавања Еволуције"
 
@@ -13939,7 +13945,6 @@ msgid "Configuration _URL:"
 msgstr "_Адреса подешавања:"
 
 #: ../e-util/e-proxy-editor.c:560
-#| msgid "No _Proxy for:"
 msgid "No proxy"
 msgstr "Без посредника"
 
@@ -14035,9 +14040,8 @@ msgstr "Стигао сам до врха странице, настављам 
 
 # 48x48/emblems/emblem-mail.icon.in.h:1
 #: ../e-util/e-send-options.c:538 ../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:1172
+#: ../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
 msgid "Mail"
 msgstr "Пошта"
@@ -14081,6 +14085,10 @@ msgstr "Ништа"
 msgid "Mail Receipt"
 msgstr "Признаница поште"
 
+#: ../e-util/e-send-options.ui.h:14
+msgid "Send Options"
+msgstr "Опције слања"
+
 #: ../e-util/e-send-options.ui.h:15
 msgid "R_eply requested"
 msgstr "Захтеван је о_дговор"
@@ -14194,24 +14202,55 @@ msgstr "Врста:"
 msgid "Name:"
 msgstr "Име:"
 
+#: ../e-util/e-source-config.c:813
+#| msgid "One or more values cannot be empty."
+msgid "Name cannot be empty"
+msgstr "Име не може бити празно"
+
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../e-util/e-source-config.c:1311
+#: ../e-util/e-source-config.c:1313
 msgid "Refresh every"
 msgstr "Освежи на сваких"
 
-#: ../e-util/e-source-config.c:1341 ../e-util/e-source-config.c:1411
+#: ../e-util/e-source-config.c:1343 ../e-util/e-source-config.c:1413
 msgid "Use a secure connection"
 msgstr "Користи безбедну везу"
 
-#: ../e-util/e-source-config.c:1437
-msgid "Unset _trust for SSL certificate"
-msgstr "Одзначи _поверење за ССЛ уверење"
+#: ../e-util/e-source-config.c:1439
+#| msgid "Unset _trust for SSL certificate"
+msgid "Unset _trust for SSL/TLS certificate"
+msgstr "Одзначи _поверење за ССЛ/ТЛС уверење"
 
-#: ../e-util/e-source-config.c:1473
+#: ../e-util/e-source-config.c:1475
 msgid "User"
 msgstr "Корисник"
 
+#: ../e-util/e-source-selector.c:3214
+#| msgid "Show %s"
+msgid "Show"
+msgstr "Прикажи"
+
+#: ../e-util/e-source-selector.c:3221
+#| msgid "Group Reply"
+msgid "Group name"
+msgstr "Назив групе"
+
+#: ../e-util/e-source-selector.c:3376 ../e-util/e-source-selector.c:3475
+#| msgid "Show %s"
+msgid "_Show"
+msgstr "_Прикажи"
+
+#: ../e-util/e-source-selector.c:3428
+#| msgid "Manager"
+msgid "Manage Groups"
+msgstr "Управљајте групама"
+
+#: ../e-util/e-source-selector.c:3440
+#| msgid "_Available Categories:"
+msgid "Available Groups:"
+msgstr "Доступне групе:"
+
 #: ../e-util/e-source-selector-dialog.c:236
 msgid "_Destination"
 msgstr "_Одредиште"
@@ -14223,7 +14262,6 @@ msgstr "Изаберите одредиште"
 #. Translators: %s is the language ISO code.
 #: ../e-util/e-spell-dictionary.c:266
 #, c-format
-#| msgid "Unknown"
 msgctxt "language"
 msgid "Unknown (%s)"
 msgstr "Непознато (%s)"
@@ -14232,33 +14270,31 @@ msgstr "Непознато (%s)"
 #. * second is the country name. Example: "French (France)"
 #: ../e-util/e-spell-dictionary.c:281 ../e-util/e-spell-dictionary.c:286
 #, c-format
-#| msgctxt "folder-display"
-#| msgid "%s (%u%s)"
 msgctxt "language"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:457
+#: ../e-util/e-spell-entry.c:478
 msgid "(no suggestions)"
 msgstr "(нема предлога)"
 
-#: ../e-util/e-spell-entry.c:481
+#: ../e-util/e-spell-entry.c:502
 msgid "More..."
 msgstr "Даље..."
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:566
+#: ../e-util/e-spell-entry.c:587
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "Додај „%s“ у речник"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:615
+#: ../e-util/e-spell-entry.c:636
 msgid "Ignore All"
 msgstr "Занемари све"
 
-#: ../e-util/e-spell-entry.c:647
+#: ../e-util/e-spell-entry.c:668
 msgid "Spelling Suggestions"
 msgstr "Предлози правописа"
 
@@ -14293,7 +14329,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:64
+#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:62
 msgid "The reported error was &quot;{1}&quot;."
 msgstr "Пријављена грешка бејаше „{1}“."
 
@@ -14627,94 +14663,90 @@ msgid "Flags"
 msgstr "Опције"
 
 #: ../e-util/evolution-source-viewer.c:728
-#: ../mail/e-mail-config-identity-page.c:721
+#: ../mail/e-mail-config-identity-page.c:760
 msgid "Identity"
 msgstr "Идентитет"
 
-#: ../e-util/e-web-view.c:316
+#: ../e-util/e-web-view.c:318
 msgid "_Copy Link Location"
 msgstr "_Умножи место везе"
 
-#: ../e-util/e-web-view.c:318
+#: ../e-util/e-web-view.c:320
 msgid "Copy the link to the clipboard"
 msgstr "Умножава везу у списак исечака"
 
-#: ../e-util/e-web-view.c:326
+#: ../e-util/e-web-view.c:328
 msgid "_Open Link in Browser"
 msgstr "_Отвори везу у прегледнику"
 
-#: ../e-util/e-web-view.c:328
+#: ../e-util/e-web-view.c:330
 msgid "Open the link in a web browser"
 msgstr "Отвори везу у веб претраживачу"
 
-#: ../e-util/e-web-view.c:336
+#: ../e-util/e-web-view.c:338
 msgid "_Copy Email Address"
 msgstr "_Умножи е-адресу"
 
-#: ../e-util/e-web-view.c:343
-#| msgid "Copy _Email Address"
+#: ../e-util/e-web-view.c:345
 msgid "Copy _Raw Email Address"
 msgstr "Умножи са_мо е-адресу"
 
-#: ../e-util/e-web-view.c:345
-#| msgid "Copy the email address to the clipboard"
+#: ../e-util/e-web-view.c:347
 msgid "Copy the raw email address to the clipboard"
 msgstr "Умножава само чисту адресу електронске поште у списак исечака"
 
-#: ../e-util/e-web-view.c:360
+#: ../e-util/e-web-view.c:362
 msgid "_Copy Image"
 msgstr "_Умножи слику"
 
-#: ../e-util/e-web-view.c:362
+#: ../e-util/e-web-view.c:364
 msgid "Copy the image to the clipboard"
 msgstr "Умножите слику у оставу"
 
-#: ../e-util/e-web-view.c:367
+#: ../e-util/e-web-view.c:369
 msgid "Save _Image..."
 msgstr "Сачувај _слику..."
 
-#: ../e-util/e-web-view.c:369
+#: ../e-util/e-web-view.c:371
 msgid "Save the image to a file"
 msgstr "Сачувајте слику у датотеку"
 
-#: ../e-util/e-web-view.c:389 ../e-util/e-web-view.c:1427
+#: ../e-util/e-web-view.c:391 ../e-util/e-web-view.c:1432
 msgid "Select all text and images"
 msgstr "Изабери сав текст и слике"
 
-#: ../e-util/e-web-view.c:1069
+#: ../e-util/e-web-view.c:1074
 #, c-format
 msgid "Click to call %s"
 msgstr "Кликните да позовете %s"
 
-#: ../e-util/e-web-view.c:1071
+#: ../e-util/e-web-view.c:1076
 msgid "Click to hide/unhide addresses"
 msgstr "Кликните да сакријете/откријете адресе"
 
-#: ../e-util/e-web-view.c:1082
+#: ../e-util/e-web-view.c:1087
 #, c-format
-#| msgid "Enter the recipients of the message"
 msgid "Go to the section %s of the message"
 msgstr "Иди на одељак %s ове поруке"
 
-#: ../e-util/e-web-view.c:1084
-#| msgid "Enter the recipients of the message"
+#: ../e-util/e-web-view.c:1089
 msgid "Go to the beginning of the message"
 msgstr "Иди на почетак поруке"
 
-#: ../e-util/e-web-view.c:1088
+#: ../e-util/e-web-view.c:1093
 #, c-format
 msgid "Click to open %s"
 msgstr "Кликните да отворите %s"
 
-#: ../e-util/e-web-view.c:3039
+#: ../e-util/e-web-view.c:3127
 msgid "Copying image to clipboard"
 msgstr "Умножавам слику у оставу"
 
-#: ../e-util/e-web-view.c:3227
+#: ../e-util/e-web-view.c:3315
 msgid "Save Image"
 msgstr "Сачувај слику"
 
-#: ../e-util/e-web-view.c:3263
+#: ../e-util/e-web-view.c:3351
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "Чувам слику у „%s“"
@@ -14765,7 +14797,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:103
+#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:101
 msgid "Missing name."
 msgstr "Недостаје име."
 
@@ -14797,6 +14829,15 @@ msgstr "Недостаје вредност."
 msgid "One or more values cannot be empty."
 msgstr "Једна или више вредности не могу бити празне."
 
+#: ../e-util/filter.error.xml.h:16
+#| msgid "Are you sure you want to delete the '{0}' task?"
+msgid "Are you sure you want to remove rule '{0}'?"
+msgstr "Сигурно желите да уклоните правило „{0}“?"
+
+#: ../e-util/filter.error.xml.h:17
+msgid "_Keep"
+msgstr "_Задржи"
+
 #: ../e-util/filter.ui.h:2
 msgid "the current time"
 msgstr "тренутно време"
@@ -14810,7 +14851,7 @@ msgid "a time relative to the current time"
 msgstr "време у односу на тренутно време"
 
 # bug: plural-forms
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:89
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:90
 msgid "seconds"
 msgstr "секунде"
 
@@ -14818,8 +14859,7 @@ msgstr "секунде"
 msgid "weeks"
 msgstr "недеље"
 
-#: ../e-util/filter.ui.h:10
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+#: ../e-util/filter.ui.h:10 ../plugins/publish-calendar/publish-calendar.ui.h:8
 msgid "months"
 msgstr "месеци"
 
@@ -14920,7 +14960,7 @@ msgstr "_Направи нови преглед"
 msgid "_Replace existing view"
 msgstr "_Замени постојећи преглед"
 
-#: ../e-util/widgets.error.xml.h:1
+#: ../e-util/widgets.error.xml.h:1 ../mail/mail.error.xml.h:195
 msgid "Do you wish to save your changes?"
 msgstr "Да ли желите да сачувате измене?"
 
@@ -14928,7 +14968,7 @@ msgstr "Да ли желите да сачувате измене?"
 msgid "This signature has been changed, but has not been saved."
 msgstr "Овај потпис је промењен, али није сачуван."
 
-#: ../e-util/widgets.error.xml.h:3
+#: ../e-util/widgets.error.xml.h:3 ../mail/mail.error.xml.h:197
 msgid "_Discard changes"
 msgstr "_Одбаци измене"
 
@@ -14956,7 +14996,7 @@ msgstr "Не могу да учитам потпис."
 msgid "Could not save signature."
 msgstr "Не могу да сачувам потпис."
 
-#: ../evolution.appdata.xml.in.h:1
+#: ../evolution.appdata.xml.in.h:3
 msgid ""
 "Evolution is a personal information management application that provides "
 "integrated mail, calendaring and address book functionality."
@@ -14964,7 +15004,7 @@ msgstr ""
 "Еволуција је програм за управљање личним подацима који обезбеђује обједињену "
 "функционалност поште, календара и адресара."
 
-#: ../evolution.appdata.xml.in.h:2
+#: ../evolution.appdata.xml.in.h:4
 msgid ""
 "Evolution supports a wide range of industry standard data formats and "
 "network protocols for information exchange, with an emphasis on standards "
@@ -14976,6 +15016,20 @@ msgstr ""
 "стандарда и безебдност. Еволуција може такође глатко да се обједини са "
 "Мајкрософтовом разменом посредством проширења „Услуге веб размене“ "
 
+#: ../libemail-engine/camel-sasl-oauth2-google.c:29
+#| msgid "OAuth2"
+msgid "OAuth2 Google"
+msgstr "ОАут2 Гугл"
+
+#: ../libemail-engine/camel-sasl-oauth2-google.c:30
+#| msgid ""
+#| "This option will use an OAuth 2.0 access token to connect to the server"
+msgid ""
+"This option will use an OAuth 2.0 access token to connect to the Google "
+"server"
+msgstr ""
+"Ова опција ће користити ОАут 2.0 симбол приступа да се повеже на сервер Гугла"
+
 #: ../libemail-engine/camel-sasl-xoauth2.c:26
 msgid "OAuth2"
 msgstr "ОАут2"
@@ -15041,64 +15095,63 @@ msgid "Invalid folder URI '%s'"
 msgstr "Неисправна путања фасцикле „%s“"
 
 #. Some local folders
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-properties.c:680
+#: ../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:1049
-#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1052
+#: ../modules/mail/e-mail-shell-view-private.c:1063
 msgid "Inbox"
 msgstr "Сандуче"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-tree-model.c:1222
+#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1222
 #: ../mail/importers/kmail-libs.c:147
-#: ../modules/mail/e-mail-shell-view-private.c:1047
+#: ../modules/mail/e-mail-shell-view-private.c:1050
 msgid "Drafts"
 msgstr "Нацрти"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1233
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1233
 #: ../mail/importers/kmail-libs.c:143
-#: ../modules/mail/e-mail-shell-view-private.c:1051
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 msgid "Outbox"
 msgstr "За слање"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1237
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1237
 #: ../mail/importers/kmail-libs.c:145
-#: ../modules/mail/e-mail-shell-view-private.c:1053
+#: ../modules/mail/e-mail-shell-view-private.c:1056
 msgid "Sent"
 msgstr "Послато"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1225
+#: ../libemail-engine/e-mail-session.c:129 ../mail/em-folder-tree-model.c:1225
 #: ../mail/importers/kmail-libs.c:149
-#: ../modules/mail/e-mail-shell-view-private.c:1055
+#: ../modules/mail/e-mail-shell-view-private.c:1058
 #: ../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:1261
+#: ../libemail-engine/e-mail-session.c:1262
 #, c-format
 msgid "User cancelled operation"
 msgstr "Корисник је отказао радњу"
 
-#: ../libemail-engine/e-mail-session.c:1318
+#: ../libemail-engine/e-mail-session.c:1319
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "Није достављена одредишна адреса, прослеђивање поруке је отказано."
 
-#: ../libemail-engine/e-mail-session.c:1331
+#: ../libemail-engine/e-mail-session.c:1332
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "Није пронађен идентитет за коришћење, прослеђивање поруке је отказано."
 
-#: ../libemail-engine/e-mail-session.c:2360
+#: ../libemail-engine/e-mail-session.c:2362
 #, c-format
-#| msgid "Storing folder '%s'"
 msgid "Waiting for '%s'"
 msgstr "Чекам на „%s“"
 
@@ -15109,7 +15162,6 @@ msgstr "Нема доступне услуге преноса поште"
 #: ../libemail-engine/e-mail-session-utils.c:630
 #: ../libemail-engine/mail-ops.c:719
 #, c-format
-#| msgid "Moving messages to '%s'"
 msgid "Posting message to '%s'"
 msgstr "Качим поруку на „%s“"
 
@@ -15123,7 +15175,6 @@ msgstr "Неуспела примена одлазних пропусника: %
 #: ../libemail-engine/e-mail-session-utils.c:732
 #: ../libemail-engine/mail-ops.c:779 ../libemail-engine/mail-ops.c:814
 #, c-format
-#| msgid "Moving messages to '%s'"
 msgid "Storing sent message to '%s'"
 msgstr "Чувам послату поруку у „%s“"
 
@@ -15148,17 +15199,17 @@ msgstr "Не могу да прикачим у локалну фасциклу 
 msgid "Sending message"
 msgstr "Слање поруке"
 
-#: ../libemail-engine/e-mail-store-utils.c:189
+#: ../libemail-engine/e-mail-store-utils.c:190
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Прекидање везе са „%s“"
 
-#: ../libemail-engine/e-mail-store-utils.c:265
+#: ../libemail-engine/e-mail-store-utils.c:266
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Поновно повезивање на „%s“"
 
-#: ../libemail-engine/e-mail-store-utils.c:350
+#: ../libemail-engine/e-mail-store-utils.c:351
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Припремам налог „%s“ за рад ван мреже"
@@ -15253,7 +15304,6 @@ msgstr "Избацујем смеће у „%s“"
 
 #: ../libemail-engine/mail-ops.c:1580
 #, c-format
-#| msgid "Storing folder '%s'"
 msgid "Processing folder changes in '%s'"
 msgstr "Обрађујем измене фасцикле у „%s“"
 
@@ -15337,7 +15387,7 @@ msgstr "Под_разумевано"
 
 # has "activatable" set.
 #: ../mail/e-mail-account-tree-view.c:83
-#: ../modules/mail/em-composer-prefs.c:1276
+#: ../modules/mail/em-composer-prefs.c:1282
 #: ../modules/plugin-manager/evolution-plugin-manager.c:357
 #: ../plugins/publish-calendar/publish-calendar.c:855
 msgid "Enabled"
@@ -15355,12 +15405,12 @@ msgstr "Није достављена адреса ел. поште"
 msgid "Missing domain in email address"
 msgstr "Недостаје домен у адреси ел. поште"
 
-#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:773
+#: ../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:286
+#: ../mail/e-mail-browser.c:288
 msgid "(No Subject)"
 msgstr "(Без субјекта)"
 
@@ -15382,7 +15432,12 @@ msgstr "Помоћник налога Еволуције"
 msgid "_Revise Details"
 msgstr "_Обнови појединости"
 
-#: ../mail/e-mail-config-auth-check.c:339
+#: ../mail/e-mail-config-auth-check.c:177
+#| msgid "%s authentication failed"
+msgid "Querying authentication types..."
+msgstr "Пропитујем врсте потврђивања идентитета..."
+
+#: ../mail/e-mail-config-auth-check.c:340
 msgid "Check for Supported Types"
 msgstr "Проверите за подржаним врстама"
 
@@ -15404,98 +15459,136 @@ msgstr ""
 msgid "Done"
 msgstr "Урађено"
 
-#: ../mail/e-mail-config-defaults-page.c:549
+#: ../mail/e-mail-config-defaults-page.c:371
+msgid "Checking server settings..."
+msgstr "Проверавам подешавања сервера..."
+
+#: ../mail/e-mail-config-defaults-page.c:489
+#| msgid "Use locale default"
+msgctxt "ReplyForward"
+msgid "Use global setting"
+msgstr "Користи општа подешавања"
+
+#: ../mail/e-mail-config-defaults-page.c:491 ../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
+msgctxt "ReplyForward"
+msgid "Inline (Outlook style)"
+msgstr "Унутар (Аутлук стил)"
+
+#: ../mail/e-mail-config-defaults-page.c:495 ../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
+msgctxt "ReplyForward"
+msgid "Do Not Quote"
+msgstr "Не цитирај"
+
+#: ../mail/e-mail-config-defaults-page.c:822
 msgid "Special Folders"
 msgstr "Посебне фасцикле"
 
-#: ../mail/e-mail-config-defaults-page.c:558
+#: ../mail/e-mail-config-defaults-page.c:831
 msgid "Draft Messages _Folder:"
 msgstr "Фасцикла порука _нацрта:"
 
-#: ../mail/e-mail-config-defaults-page.c:568
+#: ../mail/e-mail-config-defaults-page.c:841
 msgid "Choose a folder for saving draft messages."
 msgstr "Изаберите фасциклу за чување порука нацрта."
 
-#: ../mail/e-mail-config-defaults-page.c:582
+#: ../mail/e-mail-config-defaults-page.c:855
 msgid "Sent _Messages Folder:"
 msgstr "Фасцикла послатих _порука:"
 
-#: ../mail/e-mail-config-defaults-page.c:592
+#: ../mail/e-mail-config-defaults-page.c:865
 msgid "Choose a folder for saving sent messages."
 msgstr "Изаберите фасциклу за чување послатих порука."
 
-#: ../mail/e-mail-config-defaults-page.c:611
+#: ../mail/e-mail-config-defaults-page.c:884
 msgid "S_ave replies in the folder of the message being replied to"
 msgstr "Сачувај _одговоре у фасцикли поруке на коју се одговара"
 
-#: ../mail/e-mail-config-defaults-page.c:628
-#| msgid "Search Folders"
+#: ../mail/e-mail-config-defaults-page.c:901
 msgid "Archi_ve Folder:"
 msgstr "Фасцикла _архиве:"
 
-#: ../mail/e-mail-config-defaults-page.c:638
-#: ../modules/mail/em-mailer-prefs.c:1397
-#| msgid "Choose folders to post the message to."
+#: ../mail/e-mail-config-defaults-page.c:911
+#: ../modules/mail/em-mailer-prefs.c:1403
 msgid "Choose a folder to archive messages to."
 msgstr "Изаберите фасцикле за архивирање поруке."
 
-#: ../mail/e-mail-config-defaults-page.c:652
+#: ../mail/e-mail-config-defaults-page.c:929
 msgid "_Restore Defaults"
 msgstr "_Поврати основно"
 
-#: ../mail/e-mail-config-defaults-page.c:666
+#: ../mail/e-mail-config-defaults-page.c:946
+#| msgid "Go to Folder"
+msgid "_Lookup Folders"
+msgstr "_Претражи фасциклу"
+
+#: ../mail/e-mail-config-defaults-page.c:964
 msgid "Use a Real Folder for _Trash:"
 msgstr "Користи стварну фасциклу за _смеће:"
 
-#: ../mail/e-mail-config-defaults-page.c:667
+#: ../mail/e-mail-config-defaults-page.c:965
 msgid "Choose a folder for deleted messages."
 msgstr "Изаберите фасциклу за обрисане поруке."
 
-#: ../mail/e-mail-config-defaults-page.c:676
+#: ../mail/e-mail-config-defaults-page.c:974
 msgid "Use a Real Folder for _Junk:"
 msgstr "Користи стварну фасциклу за _ђубре:"
 
-#: ../mail/e-mail-config-defaults-page.c:677
+#: ../mail/e-mail-config-defaults-page.c:975
 msgid "Choose a folder for junk messages."
 msgstr "Изаберите фасциклу за непожељне поруке."
 
-#: ../mail/e-mail-config-defaults-page.c:694
+#: ../mail/e-mail-config-defaults-page.c:992
 msgid "Composing Messages"
 msgstr "Састављање порука"
 
-#: ../mail/e-mail-config-defaults-page.c:703
+#: ../mail/e-mail-config-defaults-page.c:1001
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Увек пошаљи _графитну копију (Цц):"
 
-#: ../mail/e-mail-config-defaults-page.c:728
+#: ../mail/e-mail-config-defaults-page.c:1026
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Увек пошаљи _невидљиву графитну копију (Бцц):"
 
-#: ../mail/e-mail-config-defaults-page.c:763
+#: ../mail/e-mail-config-defaults-page.c:1057
+#| msgid "_Reply style:"
+msgid "Re_ply style:"
+msgstr "_Стил одговора:"
+
+#: ../mail/e-mail-config-defaults-page.c:1093
 msgid "Message Receipts"
 msgstr "Признанице поруке"
 
-#: ../mail/e-mail-config-defaults-page.c:772
+#: ../mail/e-mail-config-defaults-page.c:1102
 msgid "S_end message receipts:"
 msgstr "_Пошаљи повратнице:"
 
-#: ../mail/e-mail-config-defaults-page.c:797
+#: ../mail/e-mail-config-defaults-page.c:1127
 msgid "Never"
 msgstr "Никада"
 
-#: ../mail/e-mail-config-defaults-page.c:803
+#: ../mail/e-mail-config-defaults-page.c:1133
 msgid "Always"
 msgstr "Увек"
 
-#: ../mail/e-mail-config-defaults-page.c:809
+#: ../mail/e-mail-config-defaults-page.c:1139
 msgid "Ask for each message"
 msgstr "Питај за сваку поруку"
 
-#: ../mail/e-mail-config-defaults-page.c:880
+#: ../mail/e-mail-config-defaults-page.c:1246
 msgid "Defaults"
 msgstr "Основно"
 
-#: ../mail/e-mail-config-identity-page.c:282
+#: ../mail/e-mail-config-identity-page.c:286
 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 "
@@ -15504,16 +15597,13 @@ msgstr ""
 "Унесите име и електронску адресу. „Необавезна“ поља не морају бити попуњена, "
 "осим ако не желите да ове податке укључите у поруке које шаљете."
 
-#: ../mail/e-mail-config-identity-page.c:310
-#: ../mail/e-mail-config-summary-page.c:322
+#: ../mail/e-mail-config-identity-page.c:314
+#: ../mail/e-mail-config-summary-page.c:323
 msgid "Account Information"
 msgstr "Подаци о налогу"
 
-#: ../mail/e-mail-config-identity-page.c:346
-#: ../mail/e-mail-config-summary-page.c:352
-#| msgid ""
-#| "Type the name by which you would like to refer to this account.\n"
-#| "For example, \"Work\" or \"Personal\"."
+#: ../mail/e-mail-config-identity-page.c:352
+#: ../mail/e-mail-config-summary-page.c:353
 msgid ""
 "The above name will be used to identify this account.\n"
 "Use for example, \"Work\" or \"Personal\"."
@@ -15521,39 +15611,63 @@ msgstr ""
 "Ово име ће бити корисно за препознавање налога.\n"
 "На пример, „Пословни“ или „Лични“."
 
-#: ../mail/e-mail-config-identity-page.c:363
+#: ../mail/e-mail-config-identity-page.c:369
 msgid "Required Information"
 msgstr "Обавезни подаци"
 
-#: ../mail/e-mail-config-identity-page.c:372
+#: ../mail/e-mail-config-identity-page.c:378
 msgid "Full Nam_e:"
 msgstr "_Име и презиме:"
 
-#: ../mail/e-mail-config-identity-page.c:399
+#: ../mail/e-mail-config-identity-page.c:407
 msgid "Email _Address:"
 msgstr "Адреса _ел. поште:"
 
-#: ../mail/e-mail-config-identity-page.c:446
+#: ../mail/e-mail-config-identity-page.c:456
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Додатни подаци"
 
-#: ../mail/e-mail-config-identity-page.c:455
+#: ../mail/e-mail-config-identity-page.c:465
 msgid "Re_ply-To:"
 msgstr "Од_говор:"
 
-#: ../mail/e-mail-config-identity-page.c:482
+#: ../mail/e-mail-config-identity-page.c:494
 msgid "Or_ganization:"
 msgstr "Ор_ганизација:"
 
-#: ../mail/e-mail-config-identity-page.c:537
+#: ../mail/e-mail-config-identity-page.c:549
 msgid "Add Ne_w Signature..."
 msgstr "Додај но_ви потпис..."
 
-#: ../mail/e-mail-config-identity-page.c:555
+#: ../mail/e-mail-config-identity-page.c:567
 msgid "_Look up mail server details based on the entered e-mail address"
 msgstr "Подаци за тражење сервера е-поште на основу унетих мејл адреса"
 
+#: ../mail/e-mail-config-identity-page.c:611
+#| msgid "One or more values cannot be empty."
+msgid "Full Name cannot be empty"
+msgstr "Име и презиме не може бити празно"
+
+#: ../mail/e-mail-config-identity-page.c:618
+#| msgid "One or more values cannot be empty."
+msgid "Email Address cannot be empty"
+msgstr "Адреса ел. поште не може бити празна"
+
+#: ../mail/e-mail-config-identity-page.c:623
+msgid "Email Address is not a valid email"
+msgstr "Адреса ел. поште није исправна ел. пошта"
+
+#: ../mail/e-mail-config-identity-page.c:635
+msgid "Reply To is not a valid email"
+msgstr "Прималац није исправна ел. пошта"
+
+#: ../mail/e-mail-config-identity-page.c:646
+#: ../mail/e-mail-config-summary-page.c:632
+#| msgid "One or more values cannot be empty."
+msgid "Account Name cannot be empty"
+msgstr "Име налога не може бити празно"
+
 #: ../mail/e-mail-config-lookup-page.c:70
 msgid "Looking up account details..."
 msgstr "Тражим појединости налога..."
@@ -15578,15 +15692,14 @@ msgstr "Примање поште"
 #. The first '%s' is a key ID, the second '%s' is a display name of the key.
 #: ../mail/e-mail-config-security-page.c:251
 #, c-format
-#| msgid "Task - %s"
 msgctxt "PGPKeyDescription"
 msgid "%s - %s"
 msgstr "%s - %s"
 
-#: ../mail/e-mail-config-security-page.c:340
-#: ../mail/em-folder-properties.c:603 ../mail/mail-config.ui.h:30
+#: ../mail/e-mail-config-security-page.c:340 ../mail/em-folder-properties.c:603
+#: ../mail/mail-config.ui.h:31
 #: ../modules/addressbook/autocompletion-config.c:113
-#: ../modules/calendar/e-calendar-preferences.c:625
+#: ../modules/calendar/e-calendar-preferences.c:620
 #: ../modules/calendar/e-calendar-preferences.ui.h:46
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
@@ -15609,22 +15722,22 @@ msgid "Si_gning algorithm:"
 msgstr "Алгоритам _потписивања:"
 
 #: ../mail/e-mail-config-security-page.c:429
-#: ../mail/e-mail-config-security-page.c:581 ../mail/mail-config.ui.h:73
+#: ../mail/e-mail-config-security-page.c:593 ../mail/mail-config.ui.h:74
 msgid "SHA1"
 msgstr "СХА1"
 
 #: ../mail/e-mail-config-security-page.c:432
-#: ../mail/e-mail-config-security-page.c:584 ../mail/mail-config.ui.h:74
+#: ../mail/e-mail-config-security-page.c:596 ../mail/mail-config.ui.h:75
 msgid "SHA256"
 msgstr "СХА256"
 
 #: ../mail/e-mail-config-security-page.c:435
-#: ../mail/e-mail-config-security-page.c:587 ../mail/mail-config.ui.h:75
+#: ../mail/e-mail-config-security-page.c:599 ../mail/mail-config.ui.h:76
 msgid "SHA384"
 msgstr "СХА384"
 
 #: ../mail/e-mail-config-security-page.c:438
-#: ../mail/e-mail-config-security-page.c:590 ../mail/mail-config.ui.h:76
+#: ../mail/e-mail-config-security-page.c:602 ../mail/mail-config.ui.h:77
 msgid "SHA512"
 msgstr "СХА512"
 
@@ -15633,7 +15746,6 @@ msgid "Al_ways sign outgoing messages when using this account"
 msgstr "_Увек потпиши одлазеће поруке са овог налога"
 
 #: ../mail/e-mail-config-security-page.c:466
-#| msgid "Always encrypt outgoing messages when using this account"
 msgid "Always enc_rypt outgoing messages when using this account"
 msgstr "Увек _шифруј одлазеће поруке са овог налога"
 
@@ -15645,42 +15757,46 @@ msgstr "Ув_ек и мени шифруј при слању шифроване
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Увек _веруј кључевима мог привеска при шифровању"
 
-#: ../mail/e-mail-config-security-page.c:514
+#: ../mail/e-mail-config-security-page.c:502
+msgid "Prefer _inline sign/encrypt for plain text messages"
+msgstr ""
+
+#: ../mail/e-mail-config-security-page.c:526
 msgid "Secure MIME (S/MIME)"
 msgstr "Сигурни МИМЕ (С/МИМЕ)"
 
-#: ../mail/e-mail-config-security-page.c:523
+#: ../mail/e-mail-config-security-page.c:535
 msgid "Sig_ning certificate:"
 msgstr "Уверење _потписивања:"
 
-#: ../mail/e-mail-config-security-page.c:547
-#: ../mail/e-mail-config-security-page.c:653
+#: ../mail/e-mail-config-security-page.c:559
+#: ../mail/e-mail-config-security-page.c:665
 msgid "Select"
 msgstr "Изабери"
 
-#: ../mail/e-mail-config-security-page.c:556
-#: ../mail/e-mail-config-security-page.c:662 ../mail/mail-dialogs.ui.h:5
+#: ../mail/e-mail-config-security-page.c:568
+#: ../mail/e-mail-config-security-page.c:674 ../mail/mail-dialogs.ui.h:5
 #: ../shell/e-shell-window-actions.c:876
 msgid "_Clear"
 msgstr "_Очисти"
 
-#: ../mail/e-mail-config-security-page.c:565
+#: ../mail/e-mail-config-security-page.c:577
 msgid "Signing _algorithm:"
 msgstr "Алгоритам п_отписа:"
 
-#: ../mail/e-mail-config-security-page.c:606
+#: ../mail/e-mail-config-security-page.c:618
 msgid "Always sign outgoing messages when using this account"
 msgstr "Увек потпиши одлазеће поруке са овог налога"
 
-#: ../mail/e-mail-config-security-page.c:629
+#: ../mail/e-mail-config-security-page.c:641
 msgid "Encryption certificate:"
 msgstr "Уверење за шифровање:"
 
-#: ../mail/e-mail-config-security-page.c:671
+#: ../mail/e-mail-config-security-page.c:683
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "Увек шифруј одлазеће поруке са овог налога"
 
-#: ../mail/e-mail-config-security-page.c:691
+#: ../mail/e-mail-config-security-page.c:703
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "Увек мени самом шифруј при слању шифроване поште"
 
@@ -15692,67 +15808,63 @@ msgstr "Слање поште"
 msgid "Server _Type:"
 msgstr "_Врста сервера:"
 
-#: ../mail/e-mail-config-summary-page.c:141
-msgid "SSL"
-msgstr "ССЛ"
-
-#: ../mail/e-mail-config-summary-page.c:144
+#: ../mail/e-mail-config-summary-page.c:142
 msgid "TLS"
 msgstr "ТЛС"
 
-#: ../mail/e-mail-config-summary-page.c:305
+#: ../mail/e-mail-config-summary-page.c:145
+msgid "STARTTLS"
+msgstr "СТАРТТЛС"
+
+#: ../mail/e-mail-config-summary-page.c:306
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr ""
 "Ово је сажетак подешавања која ће бити коришћена за приступ вашој пошти."
 
-#: ../mail/e-mail-config-summary-page.c:369
+#: ../mail/e-mail-config-summary-page.c:370
 msgid "Personal Details"
 msgstr "Лични подаци"
 
-#: ../mail/e-mail-config-summary-page.c:378
+#: ../mail/e-mail-config-summary-page.c:379
 msgid "Full Name:"
 msgstr "Име и презиме:"
 
-#: ../mail/e-mail-config-summary-page.c:392
+#: ../mail/e-mail-config-summary-page.c:393
 msgid "Email Address:"
 msgstr "Адреса ел. поште:"
 
-#: ../mail/e-mail-config-summary-page.c:406
+#: ../mail/e-mail-config-summary-page.c:407
 msgid "Receiving"
 msgstr "Примање"
 
-#: ../mail/e-mail-config-summary-page.c:418
+#: ../mail/e-mail-config-summary-page.c:419
 msgid "Sending"
 msgstr "Слање"
 
-#: ../mail/e-mail-config-summary-page.c:430
+#: ../mail/e-mail-config-summary-page.c:431
 msgid "Server Type:"
 msgstr "Врста сервера:"
 
-#: ../mail/e-mail-config-summary-page.c:451
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:601
+#: ../mail/e-mail-config-summary-page.c:452
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:605
 msgid "Server:"
 msgstr "Сервер:"
 
-#: ../mail/e-mail-config-summary-page.c:472
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:690
+#: ../mail/e-mail-config-summary-page.c:473
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:703
 msgid "Username:"
 msgstr "Корисничко име:"
 
-#: ../mail/e-mail-config-summary-page.c:493
+#: ../mail/e-mail-config-summary-page.c:494
 msgid "Security:"
 msgstr "Безбедност:"
 
-#: ../mail/e-mail-config-summary-page.c:784
+#: ../mail/e-mail-config-summary-page.c:787
 msgid "Account Summary"
 msgstr "Сажетак налога"
 
 #: ../mail/e-mail-config-welcome-page.c:156
-#| msgid ""
-#| "Welcome to the Evolution Mail Configuration Assistant.\n"
-#| "\n"
-#| "Click \"Continue\" to begin."
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -15771,27 +15883,27 @@ msgstr "Добродошли"
 msgid "Account Editor"
 msgstr "Уређивач налога"
 
-#: ../mail/e-mail-display.c:103
+#: ../mail/e-mail-display.c:104
 msgid "_Add to Address Book..."
 msgstr "_Додај у адресар..."
 
-#: ../mail/e-mail-display.c:110
+#: ../mail/e-mail-display.c:111
 msgid "_To This Address"
 msgstr "_На ову адресу"
 
-#: ../mail/e-mail-display.c:117
+#: ../mail/e-mail-display.c:118
 msgid "_From This Address"
 msgstr "_Са ове адресе"
 
-#: ../mail/e-mail-display.c:124
+#: ../mail/e-mail-display.c:125
 msgid "Send _Reply To..."
 msgstr "_Пошаљи одговор..."
 
-#: ../mail/e-mail-display.c:126
+#: ../mail/e-mail-display.c:127
 msgid "Send a reply message to this address"
 msgstr "Пошаљите поруку одговора на ову адресу"
 
-#: ../mail/e-mail-display.c:133
+#: ../mail/e-mail-display.c:134
 msgid "Create Search _Folder"
 msgstr "Направи фасциклу _претраге"
 
@@ -15814,44 +15926,36 @@ msgstr "Назив _фасцикле:"
 #. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
 #. The translated value should not contain spaces.
 #: ../mail/e-mail-free-form-exp.c:236
-#| msgid "Answered"
 msgctxt "ffe"
 msgid "Answered"
 msgstr "Одговорено"
 
 #: ../mail/e-mail-free-form-exp.c:237
-#| msgid "Deleted"
 msgctxt "ffe"
 msgid "Deleted"
 msgstr "Обрисано"
 
 #: ../mail/e-mail-free-form-exp.c:238
-#| msgid "Draft"
 msgctxt "ffe"
 msgid "Draft"
 msgstr "Нацрт"
 
 #: ../mail/e-mail-free-form-exp.c:239
-#| msgid "Flagged"
 msgctxt "ffe"
 msgid "Flagged"
 msgstr "Означено"
 
 #: ../mail/e-mail-free-form-exp.c:240
-#| msgid "Seen"
 msgctxt "ffe"
 msgid "Seen"
 msgstr "Виђено"
 
 #: ../mail/e-mail-free-form-exp.c:241
-#| msgid "Attachment"
-#| msgid_plural "Attachments"
 msgctxt "ffe"
 msgid "Attachment"
 msgstr "Прилог"
 
 #: ../mail/e-mail-free-form-exp.c:489
-#| msgid "now"
 msgctxt "ffe"
 msgid "no"
 msgstr "не"
@@ -15917,6 +16021,30 @@ msgstr ""
 msgid "Color"
 msgstr "Боја"
 
+#: ../mail/e-mail-notes.c:310 ../mail/e-mail-notes.c:692
+#| msgid "Messages To"
+msgid "Message Note"
+msgstr "Напомена поруке"
+
+#: ../mail/e-mail-notes.c:612
+#| msgid "Copying messages into folder %s"
+msgid "Cannot find message in its folder summary"
+msgstr "Не могу да нађем поруку у њеном сажетку фасцикле"
+
+#: ../mail/e-mail-notes.c:815
+msgid "Storing changes..."
+msgstr "Смештам измене..."
+
+#: ../mail/e-mail-notes.c:940
+#| msgid "_Edit Message"
+msgid "Edit Message Note"
+msgstr "Уредите напомену поруке"
+
+#: ../mail/e-mail-notes.c:1058
+#| msgid "Retrieving message"
+msgid "Retrieving message..."
+msgstr "Преузимам поруку..."
+
 #: ../mail/e-mail-print-config-headers.c:165
 msgid "Move selected headers to top"
 msgstr "Преместите изабрана заглавља на врх"
@@ -15945,652 +16073,685 @@ msgstr "Назив заглавља"
 msgid "Header Value"
 msgstr "Вредност заглавља"
 
-#: ../mail/e-mail-printer.c:126 ../mail/mail-config.ui.h:121
+#: ../mail/e-mail-printer.c:113 ../mail/mail-config.ui.h:123
 msgid "Headers"
 msgstr "Заглавља"
 
-#: ../mail/e-mail-printer.c:168
+#: ../mail/e-mail-printer.c:155
 #, c-format
 msgid "Page %d of %d"
 msgstr "Страница %d од %d"
 
-#: ../mail/e-mail-reader.c:351 ../mail/filtertypes.xml.in.h:62
+#: ../mail/e-mail-reader.c:352 ../mail/filtertypes.xml.in.h:65
 msgid "Move to Folder"
 msgstr "Премести у фасциклу"
 
-#: ../mail/e-mail-reader.c:351 ../mail/filtertypes.xml.in.h:63
+#: ../mail/e-mail-reader.c:352 ../mail/filtertypes.xml.in.h:66
 msgid "Copy to Folder"
 msgstr "Умножи у фасциклу"
 
-#: ../mail/e-mail-reader.c:355 ../mail/em-folder-utils.c:487
-#: ../mail/mail.error.xml.h:147
+#: ../mail/e-mail-reader.c:356 ../mail/em-folder-utils.c:487
+#: ../mail/mail.error.xml.h:146
 msgid "_Move"
 msgstr "Пре_мести"
 
-#: ../mail/e-mail-reader.c:355 ../mail/em-folder-utils.c:487
+#: ../mail/e-mail-reader.c:356 ../mail/em-folder-utils.c:487
 msgid "C_opy"
 msgstr "_Умножи"
 
-#: ../mail/e-mail-reader.c:1200 ../mail/e-mail-reader.c:1412
-#: ../mail/e-mail-reader.c:1452
+#: ../mail/e-mail-reader.c:488
+#| msgid "Deleting old messages"
+msgid "Deleting message note..."
+msgstr "Бришем напомену поруке..."
+
+#: ../mail/e-mail-reader.c:1271 ../mail/e-mail-reader.c:1483
+#: ../mail/e-mail-reader.c:1523
 msgid "_Do not ask me again."
 msgstr "_Не питај ме поново."
 
-#: ../mail/e-mail-reader.c:1458
+#: ../mail/e-mail-reader.c:1529
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Увек занемари „Одговор-за:“ за дописне листе."
 
-#: ../mail/e-mail-reader.c:1661
+#: ../mail/e-mail-reader.c:1732
 msgid "Failed to retrieve message:"
 msgstr "Не могу да довучем поруку:"
 
-#: ../mail/e-mail-reader.c:1706 ../mail/e-mail-reader.c:3041
+#: ../mail/e-mail-reader.c:1777 ../mail/e-mail-reader.c:3158
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Преузимам поруку „%s“"
 
-#: ../mail/e-mail-reader.c:1894
+#: ../mail/e-mail-reader.c:1965
 msgid "A_dd Sender to Address Book"
 msgstr "До_дај пошиљаоца у адресар"
 
-#: ../mail/e-mail-reader.c:1896
+#: ../mail/e-mail-reader.c:1967
 msgid "Add sender to address book"
 msgstr "Додај пошиљаоца у адресар"
 
-#: ../mail/e-mail-reader.c:1901
+#: ../mail/e-mail-reader.c:1972
 msgid "_Archive..."
 msgstr "_Архива..."
 
-#: ../mail/e-mail-reader.c:1903
-#| msgid "Move selected messages to another folder"
+#: ../mail/e-mail-reader.c:1974
 msgid "Move selected messages to the Archive folder for the account"
 msgstr "Премешта изабране поруке у фасциклу за архивирање поруке у овом налогу"
 
-#: ../mail/e-mail-reader.c:1908
+#: ../mail/e-mail-reader.c:1979
 msgid "Check for _Junk"
 msgstr "Провери да ли има _ђубрета"
 
-#: ../mail/e-mail-reader.c:1910
+#: ../mail/e-mail-reader.c:1981
 msgid "Filter the selected messages for junk status"
 msgstr "Филтрира да ли међу изабраним порукама има ђубрета"
 
-#: ../mail/e-mail-reader.c:1915
+#: ../mail/e-mail-reader.c:1986
 msgid "_Copy to Folder..."
 msgstr "_Умножи у фасциклу..."
 
-#: ../mail/e-mail-reader.c:1917
+#: ../mail/e-mail-reader.c:1988
 msgid "Copy selected messages to another folder"
 msgstr "Умножава изабране поруке у другу фасциклу"
 
-#: ../mail/e-mail-reader.c:1922
+#: ../mail/e-mail-reader.c:1993
 msgid "_Delete Message"
 msgstr "_Обриши поруку"
 
-#: ../mail/e-mail-reader.c:1924
+#: ../mail/e-mail-reader.c:1995
 msgid "Mark the selected messages for deletion"
 msgstr "Означите изабрану(е) поруку(е) за брисање"
 
-#: ../mail/e-mail-reader.c:1929
+#: ../mail/e-mail-reader.c:2000
+#| msgid "_Add Attachment..."
+msgid "_Add note..."
+msgstr "_Додај белешку..."
+
+#: ../mail/e-mail-reader.c:2002
+#| msgid "Create a new memo from the selected message"
+msgid "Add a note for the selected message"
+msgstr "Додајте белешку за изабрану поруку"
+
+#: ../mail/e-mail-reader.c:2007
+#| msgid "Delete Memo"
+msgid "Delete no_te"
+msgstr "Обриши _белешку"
+
+#: ../mail/e-mail-reader.c:2009
+#| msgid "Create a new event from the selected message"
+msgid "Delete the note for the selected message"
+msgstr "Обришите белешку за изабрану поруку"
+
+#: ../mail/e-mail-reader.c:2014
+msgid "_Edit note..."
+msgstr "_Уреди белешку..."
+
+#: ../mail/e-mail-reader.c:2016
+#| msgid "Create a new memo from the selected message"
+msgid "Edit a note for the selected message"
+msgstr "Уредите белешку за изабрану поруку"
+
+#: ../mail/e-mail-reader.c:2021
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Направи правило пропусника за дописну _листу..."
 
-#: ../mail/e-mail-reader.c:1931
+#: ../mail/e-mail-reader.c:2023
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Наравите правило за пропуштање порука на ову дописну листу"
 
-#: ../mail/e-mail-reader.c:1936
+#: ../mail/e-mail-reader.c:2028
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Направи правило пропусника за _примаоце..."
 
-#: ../mail/e-mail-reader.c:1938
+#: ../mail/e-mail-reader.c:2030
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Направите правило за пропуштање порука овим примаоцима"
 
-#: ../mail/e-mail-reader.c:1943
+#: ../mail/e-mail-reader.c:2035
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Направи правило пропусника за _пошиљаоца..."
 
-#: ../mail/e-mail-reader.c:1945
+#: ../mail/e-mail-reader.c:2037
 msgid "Create a rule to filter messages from this sender"
 msgstr "Направите правило за пропуштање порука са овог пошиљаоца"
 
-#: ../mail/e-mail-reader.c:1950
+#: ../mail/e-mail-reader.c:2042
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Направи правило пропусника за _наслов..."
 
-#: ../mail/e-mail-reader.c:1952
+#: ../mail/e-mail-reader.c:2044
 msgid "Create a rule to filter messages with this subject"
 msgstr "Направите правило за прпуштање порука са овим насловом"
 
-#: ../mail/e-mail-reader.c:1957
+#: ../mail/e-mail-reader.c:2049
 msgid "A_pply Filters"
 msgstr "При_мени пропуснике"
 
-#: ../mail/e-mail-reader.c:1959
+#: ../mail/e-mail-reader.c:2051
 msgid "Apply filter rules to the selected messages"
 msgstr "Примените правила пропуштања на изабране поруке"
 
-#: ../mail/e-mail-reader.c:1964
+#: ../mail/e-mail-reader.c:2056
 msgid "_Find in Message..."
 msgstr "П_ронађи у поруци..."
 
-#: ../mail/e-mail-reader.c:1966
+#: ../mail/e-mail-reader.c:2058
 msgid "Search for text in the body of the displayed message"
 msgstr "Потражите текст у телу приказане поруке"
 
-#: ../mail/e-mail-reader.c:1971
+#: ../mail/e-mail-reader.c:2063
 msgid "_Clear Flag"
 msgstr "Скло_ни ознаку"
 
-#: ../mail/e-mail-reader.c:1973
+#: ../mail/e-mail-reader.c:2065
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Уклоните ознаку за праћење са изабраних порука"
 
-#: ../mail/e-mail-reader.c:1978
+#: ../mail/e-mail-reader.c:2070
 msgid "_Flag Completed"
 msgstr "Означ_и као завршено"
 
-#: ../mail/e-mail-reader.c:1980
+#: ../mail/e-mail-reader.c:2072
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Поставите ознаку за праћење као завршену на изабраним порукама"
 
-#: ../mail/e-mail-reader.c:1985
+#: ../mail/e-mail-reader.c:2077
 msgid "Follow _Up..."
 msgstr "Сле_ди..."
 
-#: ../mail/e-mail-reader.c:1987
+#: ../mail/e-mail-reader.c:2079
 msgid "Flag the selected messages for follow-up"
 msgstr "Означите изабране поруке за праћење"
 
-#: ../mail/e-mail-reader.c:1992
+#: ../mail/e-mail-reader.c:2084
 msgid "_Attached"
 msgstr "При_ложено"
 
-#: ../mail/e-mail-reader.c:1994 ../mail/e-mail-reader.c:2001
+#: ../mail/e-mail-reader.c:2086 ../mail/e-mail-reader.c:2093
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Проследите изабрану поруку некоме као прилог"
 
-#: ../mail/e-mail-reader.c:1999
+#: ../mail/e-mail-reader.c:2091
 msgid "Forward As _Attached"
 msgstr "Проследи као _прилог"
 
-#: ../mail/e-mail-reader.c:2006
+#: ../mail/e-mail-reader.c:2098
 msgid "_Inline"
 msgstr "Унут_ар"
 
-#: ../mail/e-mail-reader.c:2008 ../mail/e-mail-reader.c:2015
+#: ../mail/e-mail-reader.c:2100 ../mail/e-mail-reader.c:2107
 msgid "Forward the selected message in the body of a new message"
 msgstr "Проследите изабрану поруку у телу нове поруке"
 
-#: ../mail/e-mail-reader.c:2013
+#: ../mail/e-mail-reader.c:2105
 msgid "Forward As _Inline"
 msgstr "Проследи као _унутар поруке"
 
-#: ../mail/e-mail-reader.c:2020
+#: ../mail/e-mail-reader.c:2112
 msgid "_Quoted"
 msgstr "_Цитирано"
 
-#: ../mail/e-mail-reader.c:2022 ../mail/e-mail-reader.c:2029
+#: ../mail/e-mail-reader.c:2114 ../mail/e-mail-reader.c:2121
 msgid "Forward the selected message quoted like a reply"
 msgstr "Проследите изабрану поруку цитирану као одговор"
 
-#: ../mail/e-mail-reader.c:2027
+#: ../mail/e-mail-reader.c:2119
 msgid "Forward As _Quoted"
 msgstr "Проследи као _цитат"
 
-#: ../mail/e-mail-reader.c:2034
+#: ../mail/e-mail-reader.c:2126
 msgid "_Load Images"
 msgstr "_Учитај слике"
 
-#: ../mail/e-mail-reader.c:2036
+#: ../mail/e-mail-reader.c:2128
 msgid "Force images in HTML mail to be loaded"
 msgstr "Присилите учитавање слика у ХТМЛ порукама"
 
-#: ../mail/e-mail-reader.c:2041 ../mail/e-mail-reader.c:2419
+#: ../mail/e-mail-reader.c:2133 ../mail/e-mail-reader.c:2523
 msgid "_Ignore Subthread"
 msgstr "За_немари подрасправу"
 
-#: ../mail/e-mail-reader.c:2043
+#: ../mail/e-mail-reader.c:2135
 msgid "Mark new mails in a subthread as read automatically"
 msgstr "Аутоматски означава нове е-поруке у овој подрасправи као прочитане"
 
-#: ../mail/e-mail-reader.c:2048 ../mail/e-mail-reader.c:2423
-#| msgid "Next _Thread"
+#: ../mail/e-mail-reader.c:2140 ../mail/e-mail-reader.c:2527
 msgid "_Ignore Thread"
 msgstr "_Занемари расправу"
 
-#: ../mail/e-mail-reader.c:2050
+#: ../mail/e-mail-reader.c:2142
 msgid "Mark new mails in this thread as read automatically"
 msgstr "Аутоматски означава нове е-поруке у овој расправи као прочитане"
 
-#: ../mail/e-mail-reader.c:2055
+#: ../mail/e-mail-reader.c:2147
 msgid "_Important"
 msgstr "_Важно"
 
-#: ../mail/e-mail-reader.c:2057
+#: ../mail/e-mail-reader.c:2149
 msgid "Mark the selected messages as important"
 msgstr "Означава изабрану поруку као важну"
 
-#: ../mail/e-mail-reader.c:2062
+#: ../mail/e-mail-reader.c:2154
 msgid "_Junk"
 msgstr "_Ђубре"
 
-#: ../mail/e-mail-reader.c:2064
+#: ../mail/e-mail-reader.c:2156
 msgid "Mark the selected messages as junk"
 msgstr "Означава изабрану поруку као нежељену пошту"
 
-#: ../mail/e-mail-reader.c:2069
+#: ../mail/e-mail-reader.c:2161
 msgid "_Not Junk"
 msgstr "Ни_је ђубре"
 
-#: ../mail/e-mail-reader.c:2071
+#: ../mail/e-mail-reader.c:2163
 msgid "Mark the selected messages as not being junk"
 msgstr "Означава изабрану поруку као пожељну пошту"
 
-#: ../mail/e-mail-reader.c:2076
+#: ../mail/e-mail-reader.c:2168
 msgid "_Read"
 msgstr "Про_читано"
 
-#: ../mail/e-mail-reader.c:2078
+#: ../mail/e-mail-reader.c:2170
 msgid "Mark the selected messages as having been read"
 msgstr "Означава изабрану поруку као прочитану"
 
-#: ../mail/e-mail-reader.c:2083 ../mail/e-mail-reader.c:2443
-#| msgid "Could not create publish thread."
+#: ../mail/e-mail-reader.c:2175 ../mail/e-mail-reader.c:2547
 msgid "Do not _Ignore Subthread"
 msgstr "Не занема_руј подрасправе"
 
-#: ../mail/e-mail-reader.c:2085
+#: ../mail/e-mail-reader.c:2177
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr "Не означава нове поруке у овој подрасправи као прочитане"
 
-#: ../mail/e-mail-reader.c:2090 ../mail/e-mail-reader.c:2447
+#: ../mail/e-mail-reader.c:2182 ../mail/e-mail-reader.c:2551
 msgid "Do not _Ignore Thread"
 msgstr "Не занемар_уј расправе"
 
-#: ../mail/e-mail-reader.c:2092
+#: ../mail/e-mail-reader.c:2184
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr "Не означава нове поруке у овој расправи као прочитане"
 
-#: ../mail/e-mail-reader.c:2097
+#: ../mail/e-mail-reader.c:2189
 msgid "Uni_mportant"
 msgstr "Не_важно"
 
-#: ../mail/e-mail-reader.c:2099
+#: ../mail/e-mail-reader.c:2191
 msgid "Mark the selected messages as unimportant"
 msgstr "Означите изабрану(е) поруку(е) као неважно"
 
-#: ../mail/e-mail-reader.c:2104
+#: ../mail/e-mail-reader.c:2196
 msgid "_Unread"
 msgstr "_Непрочитано"
 
-#: ../mail/e-mail-reader.c:2106
+#: ../mail/e-mail-reader.c:2198
 msgid "Mark the selected messages as not having been read"
 msgstr "Означите изабрану(е) поруку(е) као непрочитано"
 
-#: ../mail/e-mail-reader.c:2111
+#: ../mail/e-mail-reader.c:2203
 msgid "_Edit as New Message..."
 msgstr "_Уреди као нову поруку..."
 
-#: ../mail/e-mail-reader.c:2113
+#: ../mail/e-mail-reader.c:2205
 msgid "Open the selected messages in the composer for editing"
 msgstr "Отворите изабрану поруку у састављачу ради уређивања"
 
-#: ../mail/e-mail-reader.c:2118
+#: ../mail/e-mail-reader.c:2210
 msgid "Compose _New Message"
 msgstr "Састави _нову поруку"
 
-#: ../mail/e-mail-reader.c:2120
+#: ../mail/e-mail-reader.c:2212
 msgid "Open a window for composing a mail message"
 msgstr "Отворите прозор за састављање поруке"
 
-#: ../mail/e-mail-reader.c:2125
+#: ../mail/e-mail-reader.c:2217
 msgid "_Open in New Window"
 msgstr "_Отвори у новом прозору"
 
-#: ../mail/e-mail-reader.c:2127
+#: ../mail/e-mail-reader.c:2219
 msgid "Open the selected messages in a new window"
 msgstr "Отворите изабране поруке у новом прозору"
 
-#: ../mail/e-mail-reader.c:2132
+#: ../mail/e-mail-reader.c:2224
 msgid "_Move to Folder..."
 msgstr "_Премести у фасциклу..."
 
-#: ../mail/e-mail-reader.c:2134
+#: ../mail/e-mail-reader.c:2226
 msgid "Move selected messages to another folder"
 msgstr "Преместите изабрану(е) поруку(е) у другу фасциклу"
 
-#: ../mail/e-mail-reader.c:2139
+#: ../mail/e-mail-reader.c:2231
 msgid "_Next Message"
 msgstr "_Следећа порука"
 
-#: ../mail/e-mail-reader.c:2141
+#: ../mail/e-mail-reader.c:2233
 msgid "Display the next message"
 msgstr "Прикажите следећу поруку"
 
-#: ../mail/e-mail-reader.c:2146
+#: ../mail/e-mail-reader.c:2238
 msgid "Next _Important Message"
 msgstr "Следећа _важна порука"
 
-#: ../mail/e-mail-reader.c:2148
+#: ../mail/e-mail-reader.c:2240
 msgid "Display the next important message"
 msgstr "Прикажите следећу важну поруку"
 
-#: ../mail/e-mail-reader.c:2153
+#: ../mail/e-mail-reader.c:2245
 msgid "Next _Thread"
 msgstr "_Следећа расправа"
 
-#: ../mail/e-mail-reader.c:2155
+#: ../mail/e-mail-reader.c:2247
 msgid "Display the next thread"
 msgstr "Прикажите следећу расправу"
 
-#: ../mail/e-mail-reader.c:2160
+#: ../mail/e-mail-reader.c:2252
 msgid "Next _Unread Message"
 msgstr "Следећа _непрочитана порука"
 
-#: ../mail/e-mail-reader.c:2162
+#: ../mail/e-mail-reader.c:2254
 msgid "Display the next unread message"
 msgstr "Прикажите следећу непрочитану поруку"
 
-#: ../mail/e-mail-reader.c:2167
+#: ../mail/e-mail-reader.c:2259
 msgid "_Previous Message"
 msgstr "_Претходна порука"
 
-#: ../mail/e-mail-reader.c:2169
+#: ../mail/e-mail-reader.c:2261
 msgid "Display the previous message"
 msgstr "Прикажите претходну поруку"
 
-#: ../mail/e-mail-reader.c:2174
+#: ../mail/e-mail-reader.c:2266
 msgid "Pr_evious Important Message"
 msgstr "Пр_етходна важна порука"
 
-#: ../mail/e-mail-reader.c:2176
+#: ../mail/e-mail-reader.c:2268
 msgid "Display the previous important message"
 msgstr "Прикажите претходну важну поруку"
 
-#: ../mail/e-mail-reader.c:2181
+#: ../mail/e-mail-reader.c:2273
 msgid "Previous T_hread"
 msgstr "_Претходна тема"
 
-#: ../mail/e-mail-reader.c:2183
+#: ../mail/e-mail-reader.c:2275
 msgid "Display the previous thread"
 msgstr "Прикажите претходну тему"
 
-#: ../mail/e-mail-reader.c:2188
+#: ../mail/e-mail-reader.c:2280
 msgid "P_revious Unread Message"
 msgstr "П_ретходна непрочитана порука"
 
-#: ../mail/e-mail-reader.c:2190
+#: ../mail/e-mail-reader.c:2282
 msgid "Display the previous unread message"
 msgstr "Прикажите претходну непрочитану поруку"
 
-#: ../mail/e-mail-reader.c:2197
+#: ../mail/e-mail-reader.c:2289
 msgid "Print this message"
 msgstr "Штампајте ову поруку"
 
-#: ../mail/e-mail-reader.c:2204
+#: ../mail/e-mail-reader.c:2296
 msgid "Preview the message to be printed"
 msgstr "Прегледајте поруку пред штампу"
 
-#: ../mail/e-mail-reader.c:2209
+#: ../mail/e-mail-reader.c:2301
 msgid "Re_direct"
 msgstr "Преу_смери"
 
-#: ../mail/e-mail-reader.c:2211
+#: ../mail/e-mail-reader.c:2303
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Преусмерите (без читања) изабрану поруку некоме"
 
-#: ../mail/e-mail-reader.c:2216
+#: ../mail/e-mail-reader.c:2308
 msgid "Remo_ve Attachments"
 msgstr "_Уклони прилоге"
 
-#: ../mail/e-mail-reader.c:2218
+#: ../mail/e-mail-reader.c:2310
 msgid "Remove attachments"
 msgstr "Уклоните прилоге"
 
-#: ../mail/e-mail-reader.c:2223
+#: ../mail/e-mail-reader.c:2315
 msgid "Remove Du_plicate Messages"
 msgstr "Уклони _дуплиране поруке"
 
-#: ../mail/e-mail-reader.c:2225
+#: ../mail/e-mail-reader.c:2317
 msgid "Checks selected messages for duplicates"
 msgstr "Проверите изабране поруке за дупликате"
 
-#: ../mail/e-mail-reader.c:2230 ../mail/mail.error.xml.h:30
-#: ../modules/calendar/e-cal-shell-view-actions.c:1387
+#: ../mail/e-mail-reader.c:2322 ../mail/mail.error.xml.h:28
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
 #: ../modules/mail/e-mail-attachment-handler.c:213
 msgid "Reply to _All"
 msgstr "Одговори _свима"
 
-#: ../mail/e-mail-reader.c:2232
+#: ../mail/e-mail-reader.c:2324
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Саставите одговор свим примаоцима изабране поруке"
 
-#: ../mail/e-mail-reader.c:2237 ../mail/mail.error.xml.h:28
+#: ../mail/e-mail-reader.c:2329 ../mail/mail.error.xml.h:26
 msgid "Reply to _List"
 msgstr "Одговори на _листу"
 
-#: ../mail/e-mail-reader.c:2239
+#: ../mail/e-mail-reader.c:2331
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Саставите одговор дописној листи изабране поруке"
 
-#: ../mail/e-mail-reader.c:2244
-#: ../modules/mail/e-mail-attachment-handler.c:220
+#: ../mail/e-mail-reader.c:2336 ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr "_Одговори пошиљаоцу"
 
-#: ../mail/e-mail-reader.c:2246
+#: ../mail/e-mail-reader.c:2338
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Саставите одговор пошиљаоцу изабране поруке"
 
-#: ../mail/e-mail-reader.c:2251
+#: ../mail/e-mail-reader.c:2343
 msgid "_Save as mbox..."
 msgstr "_Сачувај као мбокс..."
 
-#: ../mail/e-mail-reader.c:2253
+#: ../mail/e-mail-reader.c:2345
 msgid "Save selected messages as an mbox file"
 msgstr "Сачувајте изабране поруке као „mbox“ датотеку"
 
-#: ../mail/e-mail-reader.c:2258
+#: ../mail/e-mail-reader.c:2350
 msgid "_Message Source"
 msgstr "Изво_рни код поруке"
 
-#: ../mail/e-mail-reader.c:2260
+#: ../mail/e-mail-reader.c:2352
 msgid "Show the raw email source of the message"
 msgstr "Прикажите изворни код електронске поруке"
 
-#: ../mail/e-mail-reader.c:2272
+#: ../mail/e-mail-reader.c:2364
 msgid "_Undelete Message"
 msgstr "П_оврати поруку"
 
-#: ../mail/e-mail-reader.c:2274
+#: ../mail/e-mail-reader.c:2366
 msgid "Undelete the selected messages"
 msgstr "Повратите изабране поруке"
 
-#: ../mail/e-mail-reader.c:2279
+#: ../mail/e-mail-reader.c:2371
 msgid "_Normal Size"
 msgstr "_Уобичајена величина"
 
-#: ../mail/e-mail-reader.c:2281
+#: ../mail/e-mail-reader.c:2373
 msgid "Reset the text to its original size"
 msgstr "Вратите текст на оригиналну величину"
 
-#: ../mail/e-mail-reader.c:2286
+#: ../mail/e-mail-reader.c:2378
 msgid "_Zoom In"
 msgstr "У_већај"
 
-#: ../mail/e-mail-reader.c:2288
+#: ../mail/e-mail-reader.c:2380
 msgid "Increase the text size"
 msgstr "Увећајте величину текста"
 
-#: ../mail/e-mail-reader.c:2295
+#: ../mail/e-mail-reader.c:2387
 msgid "Decrease the text size"
 msgstr "Умањите величину текста"
 
-#: ../mail/e-mail-reader.c:2302
+#: ../mail/e-mail-reader.c:2394
 msgid "Cre_ate"
 msgstr "_Направи"
 
-#: ../mail/e-mail-reader.c:2309
+#: ../mail/e-mail-reader.c:2401
 msgid "Ch_aracter Encoding"
 msgstr "Кодна ст_рана"
 
-#: ../mail/e-mail-reader.c:2316
+#: ../mail/e-mail-reader.c:2408
 msgid "F_orward As"
 msgstr "_Проследи као"
 
-#: ../mail/e-mail-reader.c:2323
+#: ../mail/e-mail-reader.c:2415
 msgid "_Group Reply"
 msgstr "О_дговори групи"
 
-#: ../mail/e-mail-reader.c:2330
+#: ../mail/e-mail-reader.c:2422
 msgid "_Go To"
 msgstr "_Иди на"
 
-#: ../mail/e-mail-reader.c:2337
+#: ../mail/e-mail-reader.c:2429
 msgid "Mar_k As"
 msgstr "О_значи као"
 
-#: ../mail/e-mail-reader.c:2344
+#: ../mail/e-mail-reader.c:2436
 msgid "_Message"
 msgstr "_Порука"
 
-#: ../mail/e-mail-reader.c:2351
+#: ../mail/e-mail-reader.c:2443
 msgid "_Zoom"
 msgstr "Ув_ећај"
 
-#: ../mail/e-mail-reader.c:2361
+#: ../mail/e-mail-reader.c:2453
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Направи фасциклу претраге са дописне _листе..."
 
-#: ../mail/e-mail-reader.c:2363
+#: ../mail/e-mail-reader.c:2455
 msgid "Create a search folder for this mailing list"
 msgstr "Направите фасциклу претраге за ову дописну листу"
 
-#: ../mail/e-mail-reader.c:2368
+#: ../mail/e-mail-reader.c:2460
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Направи фасциклу претраге од при_малаца..."
 
-#: ../mail/e-mail-reader.c:2370
+#: ../mail/e-mail-reader.c:2462
 msgid "Create a search folder for these recipients"
 msgstr "Направите фасциклу претраге за ове примаоце"
 
-#: ../mail/e-mail-reader.c:2375
+#: ../mail/e-mail-reader.c:2467
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Направи фасциклу претраге од по_шиљаоца..."
 
-#: ../mail/e-mail-reader.c:2377
+#: ../mail/e-mail-reader.c:2469
 msgid "Create a search folder for this sender"
 msgstr "Направите фасциклу претраге за овог пошиљаоца"
 
-#: ../mail/e-mail-reader.c:2382
+#: ../mail/e-mail-reader.c:2474
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Направи фасциклу претраге из _наслова..."
 
-#: ../mail/e-mail-reader.c:2384
+#: ../mail/e-mail-reader.c:2476
 msgid "Create a search folder for this subject"
 msgstr "Направите фасциклу претраге за овај наслов"
 
-#: ../mail/e-mail-reader.c:2411
+#: ../mail/e-mail-reader.c:2515
 msgid "Mark for Follo_w Up..."
 msgstr "Обележи за _праћење..."
 
-#: ../mail/e-mail-reader.c:2427
+#: ../mail/e-mail-reader.c:2531
 msgid "Mark as _Important"
 msgstr "Оначи као _важно"
 
-#: ../mail/e-mail-reader.c:2431
+#: ../mail/e-mail-reader.c:2535
 msgid "Mark as _Junk"
 msgstr "Означи као _ђубре"
 
-#: ../mail/e-mail-reader.c:2435
+#: ../mail/e-mail-reader.c:2539
 msgid "Mark as _Not Junk"
 msgstr "Означи да _није ђубре"
 
-#: ../mail/e-mail-reader.c:2439
+#: ../mail/e-mail-reader.c:2543
 msgid "Mar_k as Read"
 msgstr "О_значи као прочитано"
 
-#: ../mail/e-mail-reader.c:2451
+#: ../mail/e-mail-reader.c:2555
 msgid "Mark as Uni_mportant"
 msgstr "Означи као _неважно"
 
-#: ../mail/e-mail-reader.c:2455
+#: ../mail/e-mail-reader.c:2559
 msgid "Mark as _Unread"
 msgstr "Означи као _непрочитано"
 
-#: ../mail/e-mail-reader.c:2499
+#: ../mail/e-mail-reader.c:2603
 msgid "_Caret Mode"
 msgstr "Метод у_метања"
 
-#: ../mail/e-mail-reader.c:2501
+#: ../mail/e-mail-reader.c:2605
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Прикажите трепћући курсор у телу приказаних порука"
 
-#: ../mail/e-mail-reader.c:2507
+#: ../mail/e-mail-reader.c:2611
 msgid "All Message _Headers"
 msgstr "Сва _заглавља поруке"
 
-#: ../mail/e-mail-reader.c:2509
+#: ../mail/e-mail-reader.c:2613
 msgid "Show messages with all email headers"
 msgstr "Прикажите поруку са свим заглављима ел. поште"
 
-#: ../mail/e-mail-reader.c:3047
+#: ../mail/e-mail-reader.c:3164
 msgid "Retrieving message"
 msgstr "Преузимам поруку"
 
-#: ../mail/e-mail-reader.c:4078
-#: ../modules/mail/e-mail-attachment-handler.c:206
+#: ../mail/e-mail-reader.c:4216 ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "Просл_еди"
 
-#: ../mail/e-mail-reader.c:4079
+#: ../mail/e-mail-reader.c:4217
 msgid "Forward the selected message to someone"
 msgstr "Прослеђује изабрану поруку некоме"
 
-#: ../mail/e-mail-reader.c:4098
+#: ../mail/e-mail-reader.c:4236
 msgid "Group Reply"
 msgstr "Одговор групи"
 
-#: ../mail/e-mail-reader.c:4099
+#: ../mail/e-mail-reader.c:4237
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Одговорите дописној листи или свим примаоцима"
 
-#: ../mail/e-mail-reader.c:4165 ../mail/filtertypes.xml.in.h:64
+#: ../mail/e-mail-reader.c:4303 ../mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Обриши"
 
-#: ../mail/e-mail-reader.c:4177
-#: ../modules/calendar/e-cal-shell-view-actions.c:1212
+#: ../mail/e-mail-reader.c:4315
+#: ../modules/calendar/e-cal-shell-view-actions.c:1243
 msgid "Next"
 msgstr "Следеће"
 
-#: ../mail/e-mail-reader.c:4181
-#: ../modules/calendar/e-cal-shell-view-actions.c:1205
+#: ../mail/e-mail-reader.c:4319
+#: ../modules/calendar/e-cal-shell-view-actions.c:1236
 msgid "Previous"
 msgstr "Претходно"
 
-#: ../mail/e-mail-reader.c:4190 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:4328 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Одговори"
 
-#: ../mail/e-mail-reader.c:5240
+#: ../mail/e-mail-reader.c:5406
 #, c-format
 msgid "Allow remote content for anyone from %s"
 msgstr "Дозволи удаљени садржај свима са %s"
 
-#: ../mail/e-mail-reader.c:5242
+#: ../mail/e-mail-reader.c:5408
 #, c-format
 msgid "Allow remote content for %s"
 msgstr "Дозволи удаљени садржај за %s"
 
-#: ../mail/e-mail-reader.c:5259
+#: ../mail/e-mail-reader.c:5425
 #, c-format
 msgid "Allow remote content from %s"
 msgstr "Дозволи удаљени садржај свима од %s"
 
-#: ../mail/e-mail-reader.c:5316
-#| msgid "Header content"
+#: ../mail/e-mail-reader.c:5442
+#| msgid "_Do not show this message again"
+msgid "Do not show this message again"
+msgstr "Не приказуј више ову поруку"
+
+#: ../mail/e-mail-reader.c:5490
 msgid "Load remote content"
 msgstr "Учитај удаљени садржај"
 
@@ -16600,19 +16761,10 @@ msgstr "Не упозоравај ме поново"
 
 #: ../mail/e-mail-reader-utils.c:572
 #, c-format
-#| msgid "Removing folder '%s'"
 msgid "Refreshing folder '%s'"
 msgstr "Освежавам фасциклу „%s“"
 
-#: ../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:972 ../shell/e-shell.c:994
-#: ../smime/gui/certificate-manager.c:346
-msgid "Unknown error"
-msgstr "Непозната грешка"
-
 #: ../mail/e-mail-reader-utils.c:1165
-#| msgid "Preview data to be imported"
 msgid "Marking thread to be ignored"
 msgstr "Означавам расправу као занемарену"
 
@@ -16628,13 +16780,13 @@ msgstr "Означавам подрасправу као занемарену"
 msgid "Unmarking subthread from being ignored"
 msgstr "Означавам подрасправу као да није занемарена"
 
-#: ../mail/e-mail-reader-utils.c:1417
+#: ../mail/e-mail-reader-utils.c:1421
 msgid "Printing"
 msgstr "Штампам"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1654
+#: ../mail/e-mail-reader-utils.c:1658
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -16655,7 +16807,7 @@ msgstr[3] ""
 "Фасцикла „%s“ садржи %u дуплирану поруку. Да ли сте сигурни да желите да је "
 "избришете?"
 
-#: ../mail/e-mail-reader-utils.c:2485
+#: ../mail/e-mail-reader-utils.c:2489
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Сачувај поруку"
@@ -16668,7 +16820,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:2506
+#: ../mail/e-mail-reader-utils.c:2510
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Порука"
@@ -16676,11 +16828,11 @@ msgstr[1] "Поруке"
 msgstr[2] "Поруке"
 msgstr[3] "Порука"
 
-#: ../mail/e-mail-reader-utils.c:2879
+#: ../mail/e-mail-reader-utils.c:2883
 msgid "Parsing message"
 msgstr "Обрађујем поруку"
 
-#: ../mail/e-mail-request.c:204
+#: ../mail/e-mail-request.c:207
 msgid "The message has no text content."
 msgstr "Порука не садржи текст."
 
@@ -16698,13 +16850,79 @@ msgstr "Није успело %s потврђивање идентитета"
 msgid "No data source found for UID '%s'"
 msgstr "Није пронађен извор података за ЈИБ „%s“"
 
+# mail:ask-send-only-bcc primary
+#. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
+#: ../mail/em-composer-utils.c:390
+#, fuzzy, c-format
+#| msgid ""
+#| "Are you sure you want to send a message with {0} To and CC recipients?"
+msgid "Are you sure you want to send a message with %d To and CC recipients?"
+msgid_plural ""
+"Are you sure you want to send a message with %d To and CC recipients?"
+msgstr[0] "Сигурно желите да пошаљете поруку са {0} За и ЦЦ примаоца?"
+msgstr[1] "Сигурно желите да пошаљете поруку са {0} За и ЦЦ примаоца?"
+msgstr[2] "Сигурно желите да пошаљете поруку са {0} За и ЦЦ примаоца?"
+msgstr[3] "Сигурно желите да пошаљете поруку са {0} За и ЦЦ примаоца?"
+
+#. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
+#: ../mail/em-composer-utils.c:396
+#, fuzzy, c-format
+#| msgid ""
+#| "You are trying to send a message to {0} recipients in To and CC fields. "
+#| "This would result in all recipients seeing the email addresses of each "
+#| "other. In some cases this behaviour is undesired, especially if they do "
+#| "not know each other or if privacy is a concern. Consider adding "
+#| "recipients to the BCC field instead."
+msgid ""
+"You are trying to send a message to %d recipients in To and CC fields. This "
+"would result in all recipients seeing the email addresses of each other. In "
+"some cases this behaviour is undesired, especially if they do not know each "
+"other or if privacy is a concern. Consider adding recipients to the BCC "
+"field instead."
+msgid_plural ""
+"You are trying to send a message to %d recipients in To and CC fields. This "
+"would result in all recipients seeing the email addresses of each other. In "
+"some cases this behaviour is undesired, especially if they do not know each "
+"other or if privacy is a concern. Consider adding recipients to the BCC "
+"field instead."
+msgstr[0] ""
+"Покушавате да пошаљете поруку на {0} примаоца који су наведену унутар поља "
+"За и ЦЦ. Ово ће омогућити свим примаоцима да виде адресе е-поште осталих. "
+"Понекад примаоци неће бити задовољни тиме, поготову уколико се међусобно не "
+"познају или уколико им на тај начин угрожавате приватност. Да би ово избегли "
+"можете да додате примаоце у поље БЦЦ."
+msgstr[1] ""
+"Покушавате да пошаљете поруку на {0} примаоца који су наведену унутар поља "
+"За и ЦЦ. Ово ће омогућити свим примаоцима да виде адресе е-поште осталих. "
+"Понекад примаоци неће бити задовољни тиме, поготову уколико се међусобно не "
+"познају или уколико им на тај начин угрожавате приватност. Да би ово избегли "
+"можете да додате примаоце у поље БЦЦ."
+msgstr[2] ""
+"Покушавате да пошаљете поруку на {0} примаоца који су наведену унутар поља "
+"За и ЦЦ. Ово ће омогућити свим примаоцима да виде адресе е-поште осталих. "
+"Понекад примаоци неће бити задовољни тиме, поготову уколико се међусобно не "
+"познају или уколико им на тај начин угрожавате приватност. Да би ово избегли "
+"можете да додате примаоце у поље БЦЦ."
+msgstr[3] ""
+"Покушавате да пошаљете поруку на {0} примаоца који су наведену унутар поља "
+"За и ЦЦ. Ово ће омогућити свим примаоцима да виде адресе е-поште осталих. "
+"Понекад примаоци неће бити задовољни тиме, поготову уколико се међусобно не "
+"познају или уколико им на тај начин угрожавате приватност. Да би ово избегли "
+"можете да додате примаоце у поље БЦЦ."
+
+#. 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
+msgid "Waiting for attachments to load..."
+msgstr "Чекам да се учитају прилози..."
+
 # * each ${Variable} gets replaced with a value. To see a full list of available
 # * variables, see em-composer-utils.c:1514
 #. Note to translators: this is the attribution string used
 #. * 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:1603
+#: ../mail/em-composer-utils.c:1686
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -16712,24 +16930,24 @@ msgstr ""
 "У ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. у ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} пише:"
 
-#: ../mail/em-composer-utils.c:1609
+#: ../mail/em-composer-utils.c:1692
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Прослеђена порука --------"
 
-#: ../mail/em-composer-utils.c:1614
+#: ../mail/em-composer-utils.c:1697
 msgid "-----Original Message-----"
 msgstr "-----Оригинална порука-----"
 
-#: ../mail/em-composer-utils.c:2827
+#: ../mail/em-composer-utils.c:2984
 msgid "an unknown sender"
 msgstr "непознати пошиљалац"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../mail/em-composer-utils.c:3265
+#: ../mail/em-composer-utils.c:3471
 msgid "Posting destination"
 msgstr "Одредишна пошта"
 
-#: ../mail/em-composer-utils.c:3270
+#: ../mail/em-composer-utils.c:3476
 msgid "Choose folders to post the message to."
 msgstr "Изаберите фасцикле за слање поруке."
 
@@ -16788,39 +17006,33 @@ msgstr "_Архивирај ову фасциклу користећи след
 
 #. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
 #: ../mail/em-folder-properties.c:500
-#| msgid "Sent _Messages Folder:"
 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
-#| msgid "days"
 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
-#| msgid "weeks"
 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
-#| msgid "months"
 msgctxt "autoarchive"
 msgid "months"
 msgstr "месеци"
 
 #: ../mail/em-folder-properties.c:526
-#| msgid "Move selected messages to another folder"
 msgid "Move old messages to the default archive _folder"
 msgstr "Премести старе поруке међу _архивиране"
 
 #: ../mail/em-folder-properties.c:537
-#| msgid "Moving messages to '%s'"
 msgid "_Move old messages to:"
 msgstr "_Премести старе поруке у:"
 
@@ -16829,12 +17041,10 @@ msgid "AutoArchive folder"
 msgstr "Фасцикла АутоАрхиве"
 
 #: ../mail/em-folder-properties.c:541
-#| msgid "Select folder to import into"
 msgid "Select folder to use for AutoArchive"
 msgstr "Изаберите фасциклу за АутоАрхиву"
 
 #: ../mail/em-folder-properties.c:547
-#| msgid "_Delete junk messages"
 msgid "_Delete old messages"
 msgstr "_Обриши старе поруке"
 
@@ -16851,7 +17061,6 @@ msgid "<click here to select a folder>"
 msgstr "<кликните овде да изаберете фасциклу>"
 
 #: ../mail/em-folder-selector.c:398
-#| msgid "Create a new mail folder"
 msgid "Create a new folder"
 msgstr "Направите нову фасциклу"
 
@@ -16879,12 +17088,12 @@ msgstr "Премештам фасциклу „%s“"
 msgid "Copying folder %s"
 msgstr "Умножавам фасциклу „%s“"
 
-#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2467
+#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2494
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Премештам поруке у фасциклу „%s“"
 
-#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2469
+#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2496
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Умножавам поруке у фасциклу „%s“"
@@ -16937,7 +17146,7 @@ msgid "Unsubscribe From _All"
 msgstr "Одја_ви се са свих"
 
 #: ../mail/em-subscription-editor.c:1339
-#: ../modules/mail/e-mail-shell-view-private.c:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1029
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -16947,7 +17156,7 @@ msgstr[2] "%d непрочитаних, "
 msgstr[3] "%d непрочитана, "
 
 #: ../mail/em-subscription-editor.c:1343
-#: ../modules/mail/e-mail-shell-view-private.c:1036
+#: ../modules/mail/e-mail-shell-view-private.c:1039
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -17016,7 +17225,7 @@ msgid "Stop the current operation"
 msgstr "Зауставите тренутну операцију"
 
 #: ../mail/em-subscription-editor.c:1986
-#: ../modules/addressbook/e-book-shell-view-actions.c:979
+#: ../modules/addressbook/e-book-shell-view-actions.c:1001
 msgid "_Stop"
 msgstr "_Заустави"
 
@@ -17043,7 +17252,6 @@ msgid "Messages from %s"
 msgstr "Поруке које је послао %s"
 
 #: ../mail/em-utils.c:1680
-#| msgid "_Delete junk messages"
 msgid "Deleting old messages"
 msgstr "Бришем старе поруке"
 
@@ -17176,7 +17384,6 @@ msgstr "Израз"
 
 #: ../mail/filtertypes.xml.in.h:24 ../mail/searchtypes.xml.in.h:26
 #: ../mail/vfoldertypes.xml.in.h:26
-#| msgid "Expression"
 msgid "Free Form Expression"
 msgstr "Израз у слободној форми"
 
@@ -17215,164 +17422,174 @@ msgstr "Резултат"
 msgid "Size (kB)"
 msgstr "Величина (kB)"
 
+#: ../mail/filtertypes.xml.in.h:34 ../mail/searchtypes.xml.in.h:36
+#: ../mail/vfoldertypes.xml.in.h:36
+#| msgid "is greater than"
+msgid "is greater than or equal to"
+msgstr "је веће од или је једнако са"
+
 #: ../mail/filtertypes.xml.in.h:35 ../mail/searchtypes.xml.in.h:37
 #: ../mail/vfoldertypes.xml.in.h:37
+#| msgid "is less than"
+msgid "is less than or equal to"
+msgstr "је мање од или је једнако са"
+
+#: ../mail/filtertypes.xml.in.h:37 ../mail/searchtypes.xml.in.h:39
+#: ../mail/vfoldertypes.xml.in.h:39
 msgid "Replied to"
 msgstr "Одговорено"
 
-#: ../mail/filtertypes.xml.in.h:37 ../mail/searchtypes.xml.in.h:40
-#: ../mail/vfoldertypes.xml.in.h:40
+#: ../mail/filtertypes.xml.in.h:39 ../mail/searchtypes.xml.in.h:42
+#: ../mail/vfoldertypes.xml.in.h:42
 msgid "Important"
 msgstr "Важно"
 
 #. Past tense, as in "has been read".
-#: ../mail/filtertypes.xml.in.h:38 ../mail/mail-dialogs.ui.h:15
-#: ../mail/searchtypes.xml.in.h:41 ../mail/vfoldertypes.xml.in.h:41
+#: ../mail/filtertypes.xml.in.h:40 ../mail/mail-dialogs.ui.h:15
+#: ../mail/searchtypes.xml.in.h:43 ../mail/vfoldertypes.xml.in.h:43
 msgid "Read"
 msgstr "Читај"
 
-#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:128
-#: ../mail/vfoldertypes.xml.in.h:42
+#: ../mail/filtertypes.xml.in.h:41 ../mail/mail-config.ui.h:130
+#: ../mail/vfoldertypes.xml.in.h:44
 msgid "Junk"
 msgstr "Ђубре"
 
-#: ../mail/filtertypes.xml.in.h:40 ../mail/searchtypes.xml.in.h:42
-#: ../mail/vfoldertypes.xml.in.h:43
+#: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44
+#: ../mail/vfoldertypes.xml.in.h:45
 msgid "Follow Up"
 msgstr "Следи"
 
-#: ../mail/filtertypes.xml.in.h:41 ../mail/searchtypes.xml.in.h:43
-#: ../mail/vfoldertypes.xml.in.h:44
+#: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
+#: ../mail/vfoldertypes.xml.in.h:46
 msgid "is Flagged"
 msgstr "је означено"
 
-#: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44
-#: ../mail/vfoldertypes.xml.in.h:45
+#: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
+#: ../mail/vfoldertypes.xml.in.h:47
 msgid "is not Flagged"
 msgstr "није означено"
 
-#: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
-#: ../mail/vfoldertypes.xml.in.h:46
-#| msgid "% Completed"
+#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
+#: ../mail/vfoldertypes.xml.in.h:48
 msgid "is Completed"
 msgstr "је завршено"
 
-#: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
-#: ../mail/vfoldertypes.xml.in.h:47
-#| msgid "% Completed"
+#: ../mail/filtertypes.xml.in.h:46 ../mail/searchtypes.xml.in.h:48
+#: ../mail/vfoldertypes.xml.in.h:49
 msgid "is not Completed"
 msgstr "није завршено"
 
-#: ../mail/filtertypes.xml.in.h:48 ../mail/searchtypes.xml.in.h:50
-#: ../mail/vfoldertypes.xml.in.h:51
+#: ../mail/filtertypes.xml.in.h:51 ../mail/searchtypes.xml.in.h:53
+#: ../mail/vfoldertypes.xml.in.h:54
 msgid "Mailing list"
 msgstr "Дописна листа"
 
-#: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51
-#: ../mail/vfoldertypes.xml.in.h:52
+#: ../mail/filtertypes.xml.in.h:52 ../mail/searchtypes.xml.in.h:54
+#: ../mail/vfoldertypes.xml.in.h:55
 msgid "Regex Match"
 msgstr "Регизр одговара"
 
-#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
-#: ../mail/vfoldertypes.xml.in.h:53
+#: ../mail/filtertypes.xml.in.h:53 ../mail/searchtypes.xml.in.h:55
+#: ../mail/vfoldertypes.xml.in.h:56
 msgid "Message Header"
 msgstr "Заглавље поруке"
 
-#: ../mail/filtertypes.xml.in.h:51
+#: ../mail/filtertypes.xml.in.h:54
 msgid "Source Account"
 msgstr "Изворни налог"
 
-#: ../mail/filtertypes.xml.in.h:52
+#: ../mail/filtertypes.xml.in.h:55
 msgid "Pipe to Program"
 msgstr "Повежи на програм"
 
-#: ../mail/filtertypes.xml.in.h:53
+#: ../mail/filtertypes.xml.in.h:56
 msgid "returns"
 msgstr "повратно"
 
-#: ../mail/filtertypes.xml.in.h:54
+#: ../mail/filtertypes.xml.in.h:57
 msgid "does not return"
 msgstr "не враћа"
 
-#: ../mail/filtertypes.xml.in.h:55
+#: ../mail/filtertypes.xml.in.h:58
 msgid "returns greater than"
 msgstr "повратно веће од"
 
-#: ../mail/filtertypes.xml.in.h:56
+#: ../mail/filtertypes.xml.in.h:59
 msgid "returns less than"
 msgstr "повратно мање од"
 
-#: ../mail/filtertypes.xml.in.h:57
+#: ../mail/filtertypes.xml.in.h:60
 msgid "Junk Test"
 msgstr "Провера ђубрета"
 
-#: ../mail/filtertypes.xml.in.h:58
+#: ../mail/filtertypes.xml.in.h:61
 msgid "Message is Junk"
 msgstr "Порука је ђубре"
 
-#: ../mail/filtertypes.xml.in.h:59
+#: ../mail/filtertypes.xml.in.h:62
 msgid "Message is not Junk"
 msgstr "Порука није ђубре"
 
-#: ../mail/filtertypes.xml.in.h:60 ../mail/vfoldertypes.xml.in.h:54
+#: ../mail/filtertypes.xml.in.h:63 ../mail/vfoldertypes.xml.in.h:57
 msgid "Message Location"
 msgstr "Локација поруке"
 
-#: ../mail/filtertypes.xml.in.h:61 ../mail/searchtypes.xml.in.h:53
-#: ../mail/vfoldertypes.xml.in.h:55
+#: ../mail/filtertypes.xml.in.h:64 ../mail/searchtypes.xml.in.h:56
+#: ../mail/vfoldertypes.xml.in.h:58
 msgid "Match All"
 msgstr "Одговара све"
 
-#: ../mail/filtertypes.xml.in.h:65
+#: ../mail/filtertypes.xml.in.h:68
 msgid "Stop Processing"
 msgstr "Прекини обраду"
 
-#: ../mail/filtertypes.xml.in.h:66
+#: ../mail/filtertypes.xml.in.h:69
 msgid "Set Label"
 msgstr "Постави ознаку"
 
-#: ../mail/filtertypes.xml.in.h:67
+#: ../mail/filtertypes.xml.in.h:70
 msgid "Assign Color"
 msgstr "Додели боју"
 
-#: ../mail/filtertypes.xml.in.h:68
+#: ../mail/filtertypes.xml.in.h:71
 msgid "Unset Color"
 msgstr "Непостављена боја"
 
-#: ../mail/filtertypes.xml.in.h:69
+#: ../mail/filtertypes.xml.in.h:72
 msgid "Assign Score"
 msgstr "Додели резултат"
 
-#: ../mail/filtertypes.xml.in.h:70
+#: ../mail/filtertypes.xml.in.h:73
 msgid "Adjust Score"
 msgstr "Прерачунај"
 
-#: ../mail/filtertypes.xml.in.h:71
+#: ../mail/filtertypes.xml.in.h:74
 msgid "Set Status"
 msgstr "Постави статус"
 
-#: ../mail/filtertypes.xml.in.h:72 ../mail/searchtypes.xml.in.h:38
-#: ../mail/vfoldertypes.xml.in.h:38
+#: ../mail/filtertypes.xml.in.h:75 ../mail/searchtypes.xml.in.h:40
+#: ../mail/vfoldertypes.xml.in.h:40
 msgid "Deleted"
 msgstr "Обрисано"
 
-#: ../mail/filtertypes.xml.in.h:73
+#: ../mail/filtertypes.xml.in.h:76
 msgid "Unset Status"
 msgstr "Непостављен статус"
 
-#: ../mail/filtertypes.xml.in.h:74
+#: ../mail/filtertypes.xml.in.h:77
 msgid "Beep"
 msgstr "Звоно"
 
-#: ../mail/filtertypes.xml.in.h:75
+#: ../mail/filtertypes.xml.in.h:78
 msgid "Play Sound"
 msgstr "Пусти звук"
 
-#: ../mail/filtertypes.xml.in.h:76
+#: ../mail/filtertypes.xml.in.h:79
 msgid "Run Program"
 msgstr "Покрени програм"
 
-#: ../mail/filtertypes.xml.in.h:77
+#: ../mail/filtertypes.xml.in.h:80
 msgid "Forward to"
 msgstr "Проследи"
 
@@ -17418,8 +17635,7 @@ msgctxt "mboxImp"
 msgid "From"
 msgstr "Шаље"
 
-#: ../mail/importers/evolution-mbox-importer.c:568
-#: ../shell/e-shell-utils.c:173
+#: ../mail/importers/evolution-mbox-importer.c:568 ../shell/e-shell-utils.c:173
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Беркли поштанско сандуче (mbox)"
 
@@ -17429,7 +17645,6 @@ msgstr "Увозник за фасцикле облика Беркли пошт
 
 #: ../mail/importers/kmail-importer.c:263
 #, c-format
-#| msgid "Address"
 msgid "%d Address"
 msgid_plural "%d Addresses"
 msgstr[0] "%d адреса"
@@ -17438,17 +17653,15 @@ msgstr[2] "%d адреса"
 msgstr[3] "Адреса"
 
 #: ../mail/importers/kmail-importer.c:354
-#| msgid "Evolution Elm importer"
 msgid "Evolution KMail importer"
 msgstr "Еволуцијин увоз КМејлова"
 
 #: ../mail/importers/kmail-importer.c:355
-#| msgid "Import mail from Elm."
 msgid "Import mail and contacts from KMail."
 msgstr "Увози пошту и контакте из КМејла."
 
 #: ../mail/importers/kmail-libs.c:152
-#: ../modules/mail/e-mail-shell-view-private.c:1057
+#: ../modules/mail/e-mail-shell-view-private.c:1060
 msgid "Trash"
 msgstr "Смеће"
 
@@ -17457,7 +17670,6 @@ msgid "Importing mailbox"
 msgstr "Увожење поштанског сандучета"
 
 #: ../mail/importers/mail-importer.c:60
-#| msgid "Import mail from Elm."
 msgid "Importing mail and contacts from KMail"
 msgstr "Увозим пошту и контакте из КМејла."
 
@@ -17566,13 +17778,13 @@ msgid "For_mat messages in HTML"
 msgstr "Обликуј поруке у ХТМ_Л"
 
 #: ../mail/mail-config.ui.h:10
-#| msgid "Automatically insert _emoticon images"
 msgid "Automatically insert _emoticons"
 msgstr "Сам уметни _смајлиће"
 
 #: ../mail/mail-config.ui.h:11
-msgid "Use Unicode characters for smile_ys"
-msgstr "Уникод знак за _смајлије"
+#| msgid "Use Unicode characters for smileys."
+msgid "Use Un_icode characters for emoticons"
+msgstr "Користи _уникод знакове за смајлиће"
 
 #: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
@@ -17583,7 +17795,6 @@ msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "Кодирај називе датотека на начин _Аутлука/Гпоште"
 
 #: ../mail/mail-config.ui.h:14
-#| msgid "Saving message to Outbox."
 msgid "Send messages through Outbo_x folder"
 msgstr "Шаљи поруке кроз фасциклу _За слање."
 
@@ -17630,58 +17841,42 @@ msgstr ""
 "МИМЕ)"
 
 #: ../mail/mail-config.ui.h:25
-msgctxt "ReplyForward"
-msgid "Attachment"
-msgstr "Приложи"
-
-#: ../mail/mail-config.ui.h:26
-msgctxt "ReplyForward"
-msgid "Inline (Outlook style)"
-msgstr "Унутар (Аутлук стил)"
-
-#: ../mail/mail-config.ui.h:27
-msgctxt "ReplyForward"
-msgid "Quoted"
-msgstr "Цитирано"
+msgid "_Wrap quoted text in replies"
+msgstr "_Преломи цитирани текст у одговорима"
 
-#: ../mail/mail-config.ui.h:28
-msgctxt "ReplyForward"
-msgid "Do Not Quote"
-msgstr "Не цитирај"
-
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:30
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "Унутар"
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:32
 msgid "Sig_natures"
 msgstr "Пот_писи"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:33
 msgid "Signatures"
 msgstr "Потписи"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:34
 msgid "_Languages"
 msgstr "_Језици"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:35
 msgid "Languages Table"
 msgstr "Табела језика"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:36
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "Списак језика овде осликава само оне језике за које имате инсталиран речник."
 
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:38
 msgid "Check spelling while I _type"
 msgstr "Провери правопис док _куцам"
 
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -17690,81 +17885,71 @@ msgstr ""
 "пре извршавања следећих означених радњи:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Sending a message with an _empty subject line"
 msgstr "Слања поруке са празном линијом _наслова"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Слања поруке која садржи одређене само _Бцц примаоце"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:45
-#| msgid "Sending a message with only _Bcc recipients defined"
+#: ../mail/mail-config.ui.h:46
 msgid "Sending a message to many _To and CC recipients"
 msgstr "Слања поруке за много _За и ЦЦ примаоца"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Слања приватног _одговора на поруку дописне листе"
 
 # bug(slobo): вероватно извештај о достави
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Слања одговора _већем броју прималаца"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:51
+#: ../mail/mail-config.ui.h:52
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "Дозвољавања _дописној листи да преусмери приватну поруку на листу"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:53
+#: ../mail/mail-config.ui.h:54
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "Слања поруке са _примаоцима који нису унешени као адресе поште"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:55
-#| msgid "Sending a message with an _empty subject line"
+#: ../mail/mail-config.ui.h:56
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr "Слања поруке помоћу пре_чице (Ctrl + Enter)"
 
-#: ../mail/mail-config.ui.h:56
+#: ../mail/mail-config.ui.h:57
 msgid "Confirmations"
 msgstr "Потврђивања"
 
 #. Translators: Label of a frame with a list of folders for which to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:60
+#: ../mail/mail-config.ui.h:61
 msgid "Use for Folders"
 msgstr "Користи за фасцикле"
 
-#: ../mail/mail-config.ui.h:61
-msgid "A_dd"
-msgstr "_Додај"
-
-#: ../mail/mail-config.ui.h:63
-msgid "Re_move"
-msgstr "_Уклони"
-
 # bug(slobo): вероватно извештај о достави
 #. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:66
 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:67 ../modules/mail/em-composer-prefs.c:864
+#: ../mail/mail-config.ui.h:68 ../modules/mail/em-composer-prefs.c:864
 msgid "Account"
 msgstr "Налог"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:69
 msgid "Send account overrides"
 msgstr "Преписивања налога слања"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:70
 msgid ""
 "Assign which account should be used as a send account for respective folders "
 "or recipients, an override for usual send account detection. List of "
@@ -17776,230 +17961,228 @@ msgstr ""
 "Списак примаоца може да садржи делимичне адресе или називе. Делови адресе и "
 "назива се упоређују засебно."
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:71
 msgid "_Folder override has precedence over Recipient override"
 msgstr "Преписивање _фасцикле има предност над преписивањем примаоца"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:72
 msgid "Send Account"
 msgstr "Налог слања"
 
-#: ../mail/mail-config.ui.h:77 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:78 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:78 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:79 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "б"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:80
 msgid "Start up"
 msgstr "Покретање"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:81
 msgid "Check for new _messages on start"
 msgstr "Провери нове _поруке приликом покретања"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:82
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Провери нове _поруке у свим активним налозима"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:83
 msgid "Message Display"
 msgstr "Приказ поруке"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:84
 msgid "_Use the same fonts as other applications"
 msgstr "_Користи исте фонтове као други програми"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:85
 msgid "S_tandard Font:"
 msgstr "_Стандардни фонт:"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:86
 msgid "Select HTML fixed width font"
 msgstr "Изаберите ХТМЛ фонт сталне величине"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:87
 msgid "Select HTML variable width font"
 msgstr "Изаберите ХТМЛ фонт променљиве величине"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:88
 msgid "Fix_ed Width Font:"
 msgstr "Фонт _сталне ширине:"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:89
 msgid "_Mark messages as read after"
 msgstr "_Означи поруке као прочитане после"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:91
 msgid "Highlight _quotations with"
 msgstr "Нагласи _цитате са"
 
-#: ../mail/mail-config.ui.h:91
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../mail/mail-config.ui.h:92
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Pick a color"
 msgstr "Изаберите боју"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:93
 msgid "color"
 msgstr "боја"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:94
 msgid "Default character e_ncoding:"
 msgstr "Подразумеванa _кодна страна:"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:95
 msgid "Apply the same _view settings to all folders"
 msgstr "Примени иста подешавања _прегледа на свим фасциклама"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:96
 msgid "F_all back to threading messages by subject"
 msgstr "Вра_ти се на низање порука по наслову"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:97
 msgid "Delete Mail"
 msgstr "Обриши пошту"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:98
 msgid "Empty _trash folders"
 msgstr "Испразни фасцикле _смећа"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:99
 msgid "Confirm _when expunging a folder"
 msgstr "_Потврди када празниш фасциклу"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:100
 msgid "Archive Mail"
 msgstr "Архивирај поруку"
 
-#: ../mail/mail-config.ui.h:100
+#: ../mail/mail-config.ui.h:101
 msgid "On This Computer A_rchive folder:"
 msgstr "Архива на овом рачунару:"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:102
 msgid "Archive folder to use for On This Computer messages"
 msgstr ""
 "Фасцикла за архиву која се користи за поруке унутар фасцикле „На овом "
 "рачунару“"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:104
 msgid "_Show animated images"
 msgstr "Прикажи _анимиране слике"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:105
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Упозори при слању ХТМЛ поште контактима који их не желе"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:106
 msgid "Loading Remote Content"
 msgstr "Учитавам удаљени садржај"
 
-#: ../mail/mail-config.ui.h:106
-#| msgid "_Never load images from the Internet"
+#: ../mail/mail-config.ui.h:107
 msgid "_Never load remote content from the Internet"
 msgstr "_Никада не учитавај удаљени садржај са Интернета"
 
-#: ../mail/mail-config.ui.h:107
-#| msgid "_Load images only in messages from contacts"
+#: ../mail/mail-config.ui.h:108
 msgid "_Load remote content only in messages from contacts"
 msgstr "_Учитај удаљени садржај само у порукама од контакта"
 
-#: ../mail/mail-config.ui.h:108
-#| msgid "_Always load images from the Internet"
+#: ../mail/mail-config.ui.h:109
 msgid "_Always load remote content from the Internet"
 msgstr "_Увек учитај удаљени садржај са Интернета"
 
-#: ../mail/mail-config.ui.h:109
-#| msgid "_Add"
+#: ../mail/mail-config.ui.h:110
+#| msgid "_Show the photograph of sender in the message preview"
+msgid "Notify about _missing remote content in the message preview"
+msgstr "Обавести о _недостајућем удаљеном садржају у прегледу поруке"
+
+#: ../mail/mail-config.ui.h:111
 msgid "Add"
 msgstr "Додај"
 
-#: ../mail/mail-config.ui.h:110
-#| msgid "_Remove"
+#: ../mail/mail-config.ui.h:112
 msgid "Remove"
 msgstr "Уклони"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:113
 msgid "Allow for sites:"
 msgstr "Дозволи за сајтове:"
 
-#: ../mail/mail-config.ui.h:112
-#| msgid "All local folders"
+#: ../mail/mail-config.ui.h:114
 msgid "Allow for senders:"
 msgstr "Дозволи за пошиљаоце:"
 
-#: ../mail/mail-config.ui.h:113
+#: ../mail/mail-config.ui.h:115
 msgid "HTML Messages"
 msgstr "ХТМЛ поруке"
 
-#: ../mail/mail-config.ui.h:114 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:116 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Ознаке"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:117
 msgid "Sender Photograph"
 msgstr "Фотографија пошиљаоца"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:118
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Прикажи фотографију пошиљаоца у прегледу поште"
 
-#: ../mail/mail-config.ui.h:117
+#: ../mail/mail-config.ui.h:119
 msgid "Search gra_vatar.com for the photograph of sender"
 msgstr "По_тражи слику пошиљаоца на gravatar.com"
 
-#: ../mail/mail-config.ui.h:118
+#: ../mail/mail-config.ui.h:120
 msgid "Displayed Message Headers"
 msgstr "Приказана заглавља порука"
 
-#: ../mail/mail-config.ui.h:119
+#: ../mail/mail-config.ui.h:121
 msgid "Mail Headers Table"
 msgstr "Табела заглавља поште"
 
-#: ../mail/mail-config.ui.h:120
+#: ../mail/mail-config.ui.h:122
 #: ../modules/addressbook/autocompletion-config.c:116
 #: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "Формат датум/време"
 
-#: ../mail/mail-config.ui.h:122
+#: ../mail/mail-config.ui.h:124
 msgid "Check incoming _messages for junk"
 msgstr "Провери има ли ђубрета у _пристиглој пошти"
 
-#: ../mail/mail-config.ui.h:123
+#: ../mail/mail-config.ui.h:125
 msgid "_Delete junk messages"
 msgstr "_Обриши поруке ђубра"
 
-#: ../mail/mail-config.ui.h:124
-#| msgid "Junk Test"
+#: ../mail/mail-config.ui.h:126
 msgid "Junk Test Options"
 msgstr "Опције за тестирање ђубрета"
 
-#: ../mail/mail-config.ui.h:125
+#: ../mail/mail-config.ui.h:127
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Не означава_ј поруке као ђубре ако је пошиљалац у мом адресару"
 
-#: ../mail/mail-config.ui.h:126
+#: ../mail/mail-config.ui.h:128
 msgid "_Lookup in local address book only"
 msgstr "_Потражи само у локалном адресару"
 
-#: ../mail/mail-config.ui.h:127
+#: ../mail/mail-config.ui.h:129
 msgid "Check cu_stom headers for junk"
 msgstr "Провери има ли ђубрета у _прилагођеним заглављима"
 
-#: ../mail/mail-config.ui.h:129
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:224
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:174
+#: ../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
 msgid "No encryption"
 msgstr "Без шифровања"
 
-#: ../mail/mail-config.ui.h:130
+#: ../mail/mail-config.ui.h:132
 msgid "TLS encryption"
 msgstr "ТЛС шифровање"
 
-#: ../mail/mail-config.ui.h:131
+#: ../mail/mail-config.ui.h:133
 msgid "SSL encryption"
 msgstr "ССЛ шифровање"
 
@@ -18163,31 +18346,11 @@ msgstr ""
 "„Прима:“ или „ЦЦ:“ примаоца."
 
 # mail:ask-send-only-bcc primary
-#: ../mail/mail.error.xml.h:16
-#| msgid "Are you sure you want to send a message with only BCC recipients?"
-msgid "Are you sure you want to send a message with {0} To and CC recipients?"
-msgstr "Сигурно желите да пошаљете поруку са {0} За и ЦЦ примаоца?"
-
 #: ../mail/mail.error.xml.h:17
-msgid ""
-"You are trying to send a message to {0} recipients in To and CC fields. This "
-"would result in all recipients seeing the email addresses of each other. In "
-"some cases this behaviour is undesired, especially if they do not know each "
-"other or if privacy is a concern. Consider adding recipients to the BCC "
-"field instead."
-msgstr ""
-"Покушавате да пошаљете поруку на {0} примаоца који су наведену унутар поља "
-"За и ЦЦ. Ово ће омогућити свим примаоцима да виде адресе е-поште осталих. "
-"Понекад примаоци неће бити задовољни тиме, поготову уколико се међусобно не "
-"познају или уколико им на тај начин угрожавате приватност. Да би ово избегли "
-"можете да додате примаоце у поље БЦЦ."
-
-# mail:ask-send-only-bcc primary
-#: ../mail/mail.error.xml.h:19
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "Сигурно желите да пошаљете поруку са неисправном адресом?"
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:18
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -18196,11 +18359,11 @@ msgstr ""
 "{0}"
 
 # mail:ask-send-only-bcc primary
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "Сигурно желите да пошаљете поруку са неисправним адресама?"
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:21
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -18208,11 +18371,11 @@ msgstr ""
 "Следећи примаоци нису препознати као исправне адресе ел. поште:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:25
+#: ../mail/mail.error.xml.h:23
 msgid "Send private reply?"
 msgstr "Да пошаљем приватан одговор?"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:24
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
@@ -18222,11 +18385,11 @@ msgstr ""
 "покушава да преусмери ваш одговор назад на листу. Да ли сте сигурни да "
 "желите да наставите?"
 
-#: ../mail/mail.error.xml.h:27
+#: ../mail/mail.error.xml.h:25
 msgid "Reply _Privately"
 msgstr "Одговори _приватно"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:27
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
@@ -18237,11 +18400,11 @@ msgstr ""
 "наставите?"
 
 # bug(slobo): вероватно извештај о достави
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:29
 msgid "Send reply to all recipients?"
 msgstr "Да пошаљем одговоре свим примаоцима?"
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:30
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
@@ -18249,12 +18412,12 @@ msgstr ""
 "Одговарате на поруку која је послата већем броју прималаца. Да ли сте "
 "сигурни да желите СВИМА да одговорите?"
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:31
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "Ова порука се не може послати пошто нисте навели ниједног примаоца"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:32
 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."
@@ -18262,11 +18425,11 @@ msgstr ""
 "Унесите важећу адресу ел. поште у поље „Прима:“. Можете претражити адресе "
 "ел. поште кликом на дугме „Прима:“ поред поља за унос."
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:33
 msgid "Use default drafts folder?"
 msgstr "Да користим подразумевану фасциклу нацрта?"
 
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:34
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -18274,11 +18437,11 @@ msgstr ""
 "Не могу да отворим фасциклу нацрта за овај налог. Да користим системску "
 "фасциклу нацрта уместо тога?"
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:35
 msgid "Use _Default"
 msgstr "Користи _основно"
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:36
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
@@ -18286,39 +18449,38 @@ msgstr ""
 "Сигурно желите трајно да уклоните све обрисане поруке из фасцикле „{0}“?"
 
 # mail:ask-empty-trash secondary
-#: ../mail/mail.error.xml.h:39
+#: ../mail/mail.error.xml.h:37
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Уколико наставите, нећете моћи да вратите ове поруке."
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:38
 msgid "_Expunge"
 msgstr "Из_баци"
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:39
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr ""
 "Сигурно желите трајно да уклоните све обрисане поруке из свих фасцикли?"
 
-#: ../mail/mail.error.xml.h:42
-#: ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../mail/mail.error.xml.h:40 ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "_Empty Trash"
 msgstr "_Избаци смеће"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:41
 msgid "Opening too many messages at once may take a long time."
 msgstr "Отварање превише порука одједном може да потраје мало дуже."
 
-#: ../mail/mail.error.xml.h:44
+#: ../mail/mail.error.xml.h:42
 msgid "_Open Messages"
 msgstr "_Отвори поруке"
 
-#: ../mail/mail.error.xml.h:45
+#: ../mail/mail.error.xml.h:43
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Имате непослате поруке, да ли желите ипак да изађете?"
 
-#: ../mail/mail.error.xml.h:46
+#: ../mail/mail.error.xml.h:44
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -18329,59 +18491,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:50
+#: ../mail/mail.error.xml.h:48
 msgid "Error while {0}."
 msgstr "Грешка приликом {0}."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:49
 msgid "Error while performing operation."
 msgstr "Грешка током извршавања операције."
 
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "Унесите лозинку."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr "Грешка при учитавању дефиниција филтера."
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:52
 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:55
+#: ../mail/mail.error.xml.h:53
 msgid "Cannot save to file \"{0}\"."
 msgstr "Не могу да сачувам у датотеку „{0}“."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:54
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Не могу да направим директоријум за чување, због „{1}“"
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:55
 msgid "Cannot create temporary save directory."
 msgstr "Не могу да направим привремени директоријум за чување."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:56
 msgid "File exists but cannot overwrite it."
 msgstr "Датотека постоји али не могу да је препишем."
 
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:57
 msgid "File exists but is not a regular file."
 msgstr "Датотека постоји али није регуларна."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:58
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Не могу да обришем фасциклу „{0}“."
 
-#: ../mail/mail.error.xml.h:61
+#: ../mail/mail.error.xml.h:59
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Не могу да обришем системску фасциклу „{0}“."
 
 # bug: Ximian Evolution -> Evolution
 # mail:no-rename-spethal-folder secondary
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -18389,23 +18551,23 @@ msgstr ""
 "Системске фасцикле су неопходне Еволуцији да би исправно радила и не могу "
 "бити преименоване, премештене или обрисане."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:61
 msgid "Failed to expunge folder &quot;{0}&quot;."
 msgstr "Не могу да избацим фасциклу „{0}“."
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:63
 msgid "Failed to refresh folder &quot;{0}&quot;."
 msgstr "Не могу да освежим фасциклу „{0}“."
 
-#: ../mail/mail.error.xml.h:66
+#: ../mail/mail.error.xml.h:64
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Не могу да преименујем или да преместим системску фасциклу„{0}“."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:65
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Да обришем фасциклу „{0}“ и све подфасцикле?"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -18413,20 +18575,20 @@ msgstr ""
 "Уколико обришете фасциклу, сав њен садржај и садржај подфасцикли биће трајно "
 "обрисани."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:68
 msgid "Really delete folder \"{0}\"?"
 msgstr "Да обришем фасциклу „{0}“?"
 
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:69
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Уколико обришете фасциклу, сав њен садржај биће трајно обрисан."
 
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:70
 msgid "These messages are not copies."
 msgstr "Ове поруке нису умношци."
 
-#: ../mail/mail.error.xml.h:73
+#: ../mail/mail.error.xml.h:71
 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 "
@@ -18437,70 +18599,70 @@ msgstr ""
 "којима се физички налазе. Да ли заиста желите да избришете ове поруке?"
 
 # mail:no-rename-folder primary
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:72
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Не могу да преименујем „{0}“ у „{1}“."
 
 # bug: use the same message as above
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:73
 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:76
+#: ../mail/mail.error.xml.h:74
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Не могу да преместим фасциклу „{0}“ у „{1}“."
 
 # mail:no-copy-folder-nostore secondary
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:75
 msgid "Cannot open source folder. Error: {2}"
 msgstr "Не могу да отворим фасциклу извора. Грешка: {2}"
 
 # mail:no-copy-folder-to-nostore secondary
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:76
 msgid "Cannot open target folder. Error: {2}"
 msgstr "Не могу да отворим фасциклу мете. Грешка: {2}"
 
 # mail:no-copy-folder-to-nostore primary
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:77
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Не могу да умножим фасциклу „{0}“ у „{1}“."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:78
 msgid "Cannot create folder \"{0}\"."
 msgstr "Не могу да направим фасциклу „{0}“."
 
 # mail:no-move-folder-to-nostore primary
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:79
 msgid "Cannot open folder. Error: {1}"
 msgstr "Не могу да отворим фасциклу. Грешка: {1}"
 
 # mail:account-notunique primary
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:80
 msgid "Cannot save changes to account."
 msgstr "Не могу да сачувам измене на налогу."
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:81
 msgid "You have not filled in all of the required information."
 msgstr "Нисте унели све потребне податке."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:82
 msgid "You may not create two accounts with the same name."
 msgstr "Не можете да направите два налога са истим именом."
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:83
 msgid "Are you sure you want to delete this account?"
 msgstr "Сигурно желите да обришете овај налог?"
 
-#: ../mail/mail.error.xml.h:86
+#: ../mail/mail.error.xml.h:84
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Уколико наставите, подаци о налогу биће трајно обрисани."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:85
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Сигурно желите да обришете овај налог и све припадајуће елементе?"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:86
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -18508,28 +18670,28 @@ msgstr ""
 "Уколико наставите, подаци о налогу и сви\n"
 "подаци посредника биће трајно обрисани."
 
-#: ../mail/mail.error.xml.h:90
+#: ../mail/mail.error.xml.h:88
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Сигурно желите да искључите овај налог и обришете све посреднике?"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:89
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Ако наставите, сви налози посредника биће трајно уклоњени."
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:90
 msgid "Do _Not Disable"
 msgstr "Немој _искључити"
 
-#: ../mail/mail.error.xml.h:93
+#: ../mail/mail.error.xml.h:91
 msgid "_Disable"
 msgstr "_Искључи"
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:92
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "Не могу да уредим фасциклу претраге „{0}“ јер не постоји."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -18537,39 +18699,39 @@ msgstr ""
 "Ова фасцикла је можда посредно додата,\n"
 "идите у уређивач фасцикле претраге и додајте је изричито, ако желите."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:95
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Не могу да додам фасциклу претраге „{0}“."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:96
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "Фасцикла са именом „{0}“ већ постоји. Доделите јој неки други назив."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:97
 msgid "Search Folders automatically updated."
 msgstr "Фасцикле претраге су аутоматски ажуриране."
 
-#: ../mail/mail.error.xml.h:100
+#: ../mail/mail.error.xml.h:98
 msgid "Mail filters automatically updated."
 msgstr "Пропусници поште су аутоматски ажурирани."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:99
 msgid "Missing folder."
 msgstr "Недостајућа фасцикла."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:100
 msgid "You must specify a folder."
 msgstr "Морате да наведете фасциклу."
 
-#: ../mail/mail.error.xml.h:104
+#: ../mail/mail.error.xml.h:102
 msgid "You must name this Search Folder."
 msgstr "Морате да дате назив овој фасцикли претраге."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:103
 msgid "No folder selected."
 msgstr "Није изабрана ниједна фасцикла."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -18579,11 +18741,11 @@ msgstr ""
 "Било да појединачно изаберете фасцикле, и/или да изаберете све локалне "
 "фасцикле, све мрежне фасцикле или и једне и друге."
 
-#: ../mail/mail.error.xml.h:108
+#: ../mail/mail.error.xml.h:106
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Проблем при преносу старе фасцикле поште „{0}“."
 
-#: ../mail/mail.error.xml.h:109
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -18595,19 +18757,19 @@ msgstr ""
 "Можете или да игноришете ову фасциклу, да је препишете или да допуните њен "
 "садржај, или да изађете."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:111
 msgid "_Overwrite"
 msgstr "_Препиши"
 
-#: ../mail/mail.error.xml.h:114
+#: ../mail/mail.error.xml.h:112
 msgid "_Append"
 msgstr "_Прикачи"
 
-#: ../mail/mail.error.xml.h:115
+#: ../mail/mail.error.xml.h:113
 msgid "Evolution's local mail format has changed."
 msgstr "Еволуцијин локални формат поште је промењен."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:114
 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 "
@@ -18625,19 +18787,19 @@ msgstr ""
 "избришете налог након успешног пресељавања података. Уверите се да има "
 "довољно простора на диску уколико одлучите да их преселите сада."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:117
 msgid "_Exit Evolution"
 msgstr "_Изађи из Еволуције"
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:118
 msgid "_Migrate Now"
 msgstr "П_ресели сада"
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:119
 msgid "Unable to read license file."
 msgstr "Не могу да прочитам датотеку лиценце."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:120
 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."
@@ -18645,27 +18807,32 @@ msgstr ""
 "Не могу да прочитам датотеку лиценце „{0}“, због проблема са инсталацијом. "
 "Нећете моћи да користите овог достављача док не прихватите лиценцу."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:121
 msgid "Please wait."
 msgstr "Сачекајте."
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:122
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Слање упита серверу за листу подржаних механизама потврђивања идентитета."
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "Failed to query server for a list of supported authentication mechanisms."
 msgstr ""
 "Не могу да пропитам сервер за списак подржаних механизама потврђивања "
 "идентитета."
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:124
+#| msgid "Failed to retrieve messages."
+msgid "Failed to get server setup."
+msgstr "Нисам успео да добавим подешавање сервера."
+
+#: ../mail/mail.error.xml.h:125
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Ускладити фасцикле локално за рад ван мреже?"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:126
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -18673,27 +18840,27 @@ msgstr ""
 "Желите ли локално да ускладите фасцикле које су означене за коришћење ван "
 "мреже?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:127
 msgid "Do _Not Synchronize"
 msgstr "_Не усклађуј"
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:128
 msgid "_Synchronize"
 msgstr "_Усклади"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:129
 msgid "Do you want to mark all messages as read?"
 msgstr "Да ли желите да све поруке означите прочитаним?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:130
 msgid "This will mark all messages as read in the selected folder."
 msgstr "Ово означава све поруке као прочитане у изабраној фасцикли."
 
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:131
 msgid "Also mark messages in subfolders?"
 msgstr "Да означим такође и поруке у подфасциклама?"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:132
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -18701,146 +18868,138 @@ msgstr ""
 "Желите ли да означите поруке као прочитане само у тренутној фасцикли, или и "
 "оне у подфасциклама?"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:133
 msgid "In Current Folder and _Subfolders"
 msgstr "У тренутној фасцикли и _подфасциклама"
 
 # bug: requires a comment on usage
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:134
 msgid "In Current _Folder Only"
 msgstr "Само у тренутној _фасцикли"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:135
 msgid "Should Evolution close this window when replying or forwarding?"
 msgstr ""
 "Треба ли Еволуција да затвори овај прозор када одговара или прослеђује?"
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:136
 msgid "_Yes, Always"
 msgstr "_Да, увек"
 
-#: ../mail/mail.error.xml.h:138
+#: ../mail/mail.error.xml.h:137
 msgid "_No, Never"
 msgstr "_Не, никада"
 
-#: ../mail/mail.error.xml.h:139
+#: ../mail/mail.error.xml.h:138
 msgid "Copy folder in folder tree."
 msgstr "Умножите фасциклу у стабло фасцикли."
 
-#: ../mail/mail.error.xml.h:140
+#: ../mail/mail.error.xml.h:139
 msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr ""
 "Да ли сте сигурни да желите да умножите фасциклу „{0}“ у фасциклу „{1}“?"
 
-#: ../mail/mail.error.xml.h:142
-#| msgid "Do _not Send"
+#: ../mail/mail.error.xml.h:141
 msgid "Do _not copy"
 msgstr "Н_е умножавај"
 
-#: ../mail/mail.error.xml.h:143
-#| msgid "_Always"
+#: ../mail/mail.error.xml.h:142
 msgid "_Always copy"
 msgstr "_Увек умножи"
 
-#: ../mail/mail.error.xml.h:144
-#| msgid "N_ever"
+#: ../mail/mail.error.xml.h:143
 msgid "N_ever copy"
 msgstr "_Никад не умножавај"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:144
 msgid "Move folder in folder tree."
 msgstr "Преместите фасциклу у стабло фасцикли."
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:145
 msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgstr ""
 "Да ли сте сигурни да желите да преместите фасциклу „{0}“ у фасциклу „{1}“?"
 
-#: ../mail/mail.error.xml.h:148
-#| msgid "Do _not Send"
+#: ../mail/mail.error.xml.h:147
 msgid "Do _not move"
 msgstr "Н_е премештај"
 
-#: ../mail/mail.error.xml.h:149
-#| msgid "_Always"
+#: ../mail/mail.error.xml.h:148
 msgid "_Always move"
 msgstr "_Увек премести"
 
-#: ../mail/mail.error.xml.h:150
-#| msgid "N_ever"
+#: ../mail/mail.error.xml.h:149
 msgid "N_ever move"
 msgstr "_Никад не премештај"
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:150
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "Ова порука се не може послати пошто је искључен налог са којег шаљете"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:151
 msgid "Please enable the account or send using another account."
 msgstr "Омогућите налог или пошаљите користећи други налог."
 
-#: ../mail/mail.error.xml.h:153
+#: ../mail/mail.error.xml.h:152
 msgid "Mail Deletion Failed"
 msgstr "Неуспешно брисање поште"
 
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:153
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Немате довољна овлашћења да обришете ову пошту."
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:154
 msgid "\"Check Junk\" Failed"
 msgstr "Провера ђубрета није успела"
 
-#: ../mail/mail.error.xml.h:156
+#: ../mail/mail.error.xml.h:155
 msgid "\"Report Junk\" Failed"
 msgstr "Извештај за ђубре није успео"
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:156
 msgid "\"Report Not Junk\" Failed"
 msgstr "Извештавање да није ђубре није успело"
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:157
 msgid "Remove duplicate messages?"
 msgstr "Да уклоним дуплиране поруке?"
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:158
 msgid "No duplicate messages found."
 msgstr "Нису пронађене дупле поруке."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:160
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "Фасцикла „{0}“ не садржи никакве дупле поруке."
 
-#: ../mail/mail.error.xml.h:162
-#| msgid "Failed to disconnect account &quot;{0}&quot;."
+#: ../mail/mail.error.xml.h:161
 msgid "Failed to connect account &quot;{0}&quot;."
 msgstr "Не могу да се повежем на налог „{0}“."
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:162
 msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr "Не могу да прекинем везу са налогом „{0}“."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:163
 msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
 msgstr "Не могу да се одјавим са фасцикле „{0}“."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:164
 msgid "Unable to retrieve message."
 msgstr "Не могу да довучем поруку."
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:165
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:167
-#| msgid "Send mail also when in offline _mode"
+#: ../mail/mail.error.xml.h:166
 msgid "Message is not available in offline mode."
 msgstr "Порука није доступна у режиму ван мреже."
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:167
 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 "
@@ -18854,42 +19013,42 @@ msgstr ""
 "поруке за рад ван мреже. Тако ћете преузети све поруке и моћи да их читате и "
 "када нисте при интернету."
 
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:168
 msgid "Failed to open folder."
 msgstr "Не могу да отворим фасциклу."
 
 # bug: plural-forms
-#: ../mail/mail.error.xml.h:171
+#: ../mail/mail.error.xml.h:170
 msgid "Failed to find duplicate messages."
 msgstr "Не могу да пронађем дуплиране поруке."
 
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:171
 msgid "Failed to retrieve messages."
 msgstr "Не могу да довучем поруке."
 
 # bug: plural-forms
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:172
 msgid "Failed to mark messages as read."
 msgstr "Не могу да означим поруке прочитаним."
 
-#: ../mail/mail.error.xml.h:174
+#: ../mail/mail.error.xml.h:173
 msgid "Failed to remove attachments from messages."
 msgstr "Не могу да уклоним прилоге из порука."
 
-#: ../mail/mail.error.xml.h:175
+#: ../mail/mail.error.xml.h:174
 msgid "Failed to download messages for offline viewing."
 msgstr "Не могу да преузмем поруке за прегледање ван мреже."
 
 # bug: plural-forms
-#: ../mail/mail.error.xml.h:176
+#: ../mail/mail.error.xml.h:175
 msgid "Failed to save messages to disk."
 msgstr "Не могу да сачувам поруке на диск."
 
-#: ../mail/mail.error.xml.h:177
+#: ../mail/mail.error.xml.h:176
 msgid "Hidden file is attached."
 msgstr "Скривена датотека је приложена."
 
-#: ../mail/mail.error.xml.h:178
+#: ../mail/mail.error.xml.h:177
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -18897,48 +19056,47 @@ msgstr ""
 "Прилог под називом {0} је скривена датотека и може да садржи осетљиве "
 "податке. Прегледајте је пре него ли је пошаљете."
 
-#: ../mail/mail.error.xml.h:179
+#: ../mail/mail.error.xml.h:178
 msgid "Printing failed."
 msgstr "Штампање није успело."
 
-#: ../mail/mail.error.xml.h:180
+#: ../mail/mail.error.xml.h:179
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "Штампач је одговорио „{0}“."
 
-#: ../mail/mail.error.xml.h:181
+#: ../mail/mail.error.xml.h:180
 msgid "Could not perform this operation on {0}."
 msgstr "Не могу да извршим ову радњу над „{0}“."
 
-#: ../mail/mail.error.xml.h:182
+#: ../mail/mail.error.xml.h:181
 msgid "You must be working online to complete this operation."
 msgstr "Морате да будете на мрежи да бисте завршили ову радњу."
 
-#: ../mail/mail.error.xml.h:183
+#: ../mail/mail.error.xml.h:182
 msgid "Message from &quot;{0}&quot; account:"
 msgstr "Порука са „{0}“ налога:"
 
-#: ../mail/mail.error.xml.h:184
-#| msgid "Failed to move an event into the calendar '{0}'"
+#: ../mail/mail.error.xml.h:183
 msgid "Failed to mark thread to be ignored in folder '{0}'"
 msgstr "Не могу да означим расправу као занемарену унутар фасцикле „{0}“"
 
-#: ../mail/mail.error.xml.h:185
+#: ../mail/mail.error.xml.h:184
 msgid "Failed to unmark thread from being ignored in folder '{0}'"
 msgstr "Не могу да означим расправу као незанемарену унутар фасцикле „{0}“"
 
-#: ../mail/mail.error.xml.h:186
+#: ../mail/mail.error.xml.h:185
 msgid "Failed to mark subthread to be ignored in folder '{0}'"
 msgstr "Не могу да означим подрасправу као занемарену унутар фасцикле „{0}“"
 
-#: ../mail/mail.error.xml.h:187
+#: ../mail/mail.error.xml.h:186
 msgid "Failed to unmark subthread from being ignored in folder '{0}'"
 msgstr "Не могу да означим подрасправу као незанемарену унутар фасцикле „{0}“"
 
-#: ../mail/mail.error.xml.h:188
+#: ../mail/mail.error.xml.h:187
 msgid "Remote content download had been blocked for this message."
 msgstr "Преузимање удаљеног садржаја је забрањено за ову поруку."
 
-#: ../mail/mail.error.xml.h:189
+#: ../mail/mail.error.xml.h:188
 msgid ""
 "You can download remote content manually, or set to remember to download "
 "remote content for this sender or used sites."
@@ -18947,21 +19105,37 @@ msgstr ""
 "преузима са овог сајта или од овог пошиљаоца."
 
 #. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
-#: ../mail/mail.error.xml.h:191
-#| msgid " (Completed "
+#: ../mail/mail.error.xml.h:190
 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:193
+#: ../mail/mail.error.xml.h:192
 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:195
+#: ../mail/mail.error.xml.h:194
 msgid "Overdue: {0} by {1}"
 msgstr "Завршен: {0} до {1}"
 
+#: ../mail/mail.error.xml.h:196
+#| msgid "This signature has been changed, but has not been saved."
+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
+#| msgid "Failed to delete an event in the calendar '{0}'"
+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
+#| msgid "Failed to mark thread to be ignored in folder '{0}'"
+msgid "Failed to store message note in folder '{0}'"
+msgstr "Нисам успео да сместим белешку поруке у фасциклу „{0}“"
+
 #: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
 msgstr "Отказујем..."
@@ -18994,13 +19168,11 @@ msgstr "Бришем непожељно и избацујем смеће из 
 
 #: ../mail/mail-send-recv.c:1454
 #, c-format
-#| msgid "Reconnecting to '%s'"
 msgid "Deleting junk at '%s'"
 msgstr "Бришем ђубре из „%s“"
 
 #: ../mail/mail-send-recv.c:1456
 #, c-format
-#| msgid "Emptying trash in '%s'"
 msgid "Expunging trash at '%s'"
 msgstr "Избацујем смеће из „%s“"
 
@@ -19016,86 +19188,86 @@ msgstr "Уреди фасциклу претраге"
 msgid "New Search Folder"
 msgstr "Нова фасцикла претраге"
 
-#: ../mail/message-list.c:291
+#: ../mail/message-list.c:294
 msgid "Unseen"
 msgstr "Невиђено"
 
-#: ../mail/message-list.c:292
+#: ../mail/message-list.c:295
 msgid "Seen"
 msgstr "Виђено"
 
-#: ../mail/message-list.c:293
+#: ../mail/message-list.c:296
 msgid "Answered"
 msgstr "Одговорено"
 
-#: ../mail/message-list.c:294
+#: ../mail/message-list.c:297
 msgid "Forwarded"
 msgstr "Прослеђено"
 
-#: ../mail/message-list.c:295
+#: ../mail/message-list.c:298
 msgid "Multiple Unseen Messages"
 msgstr "Вишеструке невиђене поруке"
 
-#: ../mail/message-list.c:296
+#: ../mail/message-list.c:299
 msgid "Multiple Messages"
 msgstr "Вишеструке поруке"
 
-#: ../mail/message-list.c:309
+#: ../mail/message-list.c:312
 msgid "Lowest"
 msgstr "Најниже"
 
-#: ../mail/message-list.c:310
+#: ../mail/message-list.c:313
 msgid "Lower"
 msgstr "Ниже"
 
-#: ../mail/message-list.c:314
+#: ../mail/message-list.c:317
 msgid "Higher"
 msgstr "Више"
 
-#: ../mail/message-list.c:315
+#: ../mail/message-list.c:318
 msgid "Highest"
 msgstr "Највише"
 
-#: ../mail/message-list.c:459 ../mail/message-list.c:6034
+#: ../mail/message-list.c:464 ../mail/message-list.c:6168
 msgid "Generating message list"
 msgstr "Прављење листе порука"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:2041 ../modules/itip-formatter/itip-view.c:235
+#: ../mail/message-list.c:2060 ../modules/itip-formatter/itip-view.c:235
 msgid "Today %l:%M %p"
 msgstr "Данас у %l:%M %p"
 
-#: ../mail/message-list.c:2050
+#: ../mail/message-list.c:2069
 msgid "Yesterday %l:%M %p"
 msgstr "Јуче у %l:%M %p"
 
-#: ../mail/message-list.c:2062
+#: ../mail/message-list.c:2081
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:2070
+#: ../mail/message-list.c:2089
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:2072
+#: ../mail/message-list.c:2091
 msgid "%b %d %Y"
 msgstr "%d. %b %Y."
 
-#: ../mail/message-list.c:2957
+#: ../mail/message-list.c:2997
 msgid "Select all visible messages"
 msgstr "Изабери све видљиве поруке"
 
-#: ../mail/message-list.c:3622 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3699 ../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:4978
+#: ../mail/message-list.c:5105
 msgid "Follow-up"
 msgstr "Следи"
 
-#: ../mail/message-list.c:5971
+#: ../mail/message-list.c:6107
 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 "
@@ -19107,7 +19279,7 @@ msgstr ""
 "покрените нову претрагу било чишћењем исте помоћу ставке изборника „Претрага—"
 ">Очисти“ или изменивши горњи упит."
 
-#: ../mail/message-list.c:5979
+#: ../mail/message-list.c:6115
 msgid "There are no messages in this folder."
 msgstr "Нема порука у овој фасцикли."
 
@@ -19139,48 +19311,51 @@ msgstr "Поруке"
 msgid "Subject - Trimmed"
 msgstr "Наслов — скраћено"
 
+#: ../mail/message-list.etspec.h:21 ../plugins/save-calendar/csv-format.c:374
+msgid "UID"
+msgstr "ЈИБ"
+
 #: ../mail/searchtypes.xml.in.h:23 ../mail/vfoldertypes.xml.in.h:23
 msgid "Any header"
 msgstr "Било које заглавље"
 
-#: ../mail/searchtypes.xml.in.h:54
+#: ../mail/searchtypes.xml.in.h:57
 msgid "Subject or Addresses contains"
 msgstr "Наслов или адресе садрже"
 
-#: ../mail/searchtypes.xml.in.h:55
-#: ../modules/mail/e-mail-shell-view-actions.c:2136
+#: ../mail/searchtypes.xml.in.h:58
+#: ../modules/mail/e-mail-shell-view-actions.c:2159
 msgid "Recipients contain"
 msgstr "Примаоци садрже"
 
-#: ../mail/searchtypes.xml.in.h:56
-#: ../modules/mail/e-mail-shell-view-actions.c:2129
+#: ../mail/searchtypes.xml.in.h:59
+#: ../modules/mail/e-mail-shell-view-actions.c:2152
 msgid "Message contains"
 msgstr "Порука садржи"
 
-#: ../mail/searchtypes.xml.in.h:57
-#: ../modules/mail/e-mail-shell-view-actions.c:2150
+#: ../mail/searchtypes.xml.in.h:60
+#: ../modules/mail/e-mail-shell-view-actions.c:2173
 msgid "Subject contains"
 msgstr "Наслов садржи"
 
-#: ../mail/searchtypes.xml.in.h:58
-#: ../modules/mail/e-mail-shell-view-actions.c:2143
+#: ../mail/searchtypes.xml.in.h:61
+#: ../modules/mail/e-mail-shell-view-actions.c:2166
 msgid "Sender contains"
 msgstr "Пошиљалац садржи"
 
-#: ../mail/searchtypes.xml.in.h:59
-#: ../modules/mail/e-mail-shell-view-actions.c:2115
+#: ../mail/searchtypes.xml.in.h:62
+#: ../modules/mail/e-mail-shell-view-actions.c:2138
 msgid "Body contains"
 msgstr "Тело садржи"
 
-#: ../mail/searchtypes.xml.in.h:60
-#: ../modules/mail/e-mail-shell-view-actions.c:2122
-#| msgid "Expression"
+#: ../mail/searchtypes.xml.in.h:63
+#: ../modules/mail/e-mail-shell-view-actions.c:2145
 msgid "Free form expression"
 msgstr "Израз у слободној форми"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
 #: ../modules/addressbook/autocompletion-config.c:122
-#: ../modules/mail/em-mailer-prefs.c:1552
+#: ../modules/mail/em-mailer-prefs.c:1558
 msgid "_Table column:"
 msgstr "Колона _табеле:"
 
@@ -19221,7 +19396,7 @@ msgid "Contact information for %s"
 msgstr "Подаци о контакту за %s"
 
 #: ../modules/addressbook/e-book-shell-backend.c:258
-#: ../modules/addressbook/e-book-shell-view-actions.c:124
+#: ../modules/addressbook/e-book-shell-view-actions.c:139
 msgid "New Address Book"
 msgstr "Нови адресар"
 
@@ -19231,7 +19406,7 @@ msgid "_Contact"
 msgstr "_Контакт"
 
 #: ../modules/addressbook/e-book-shell-backend.c:269
-#: ../modules/addressbook/e-book-shell-view-actions.c:1023
+#: ../modules/addressbook/e-book-shell-view-actions.c:1045
 msgid "Create a new contact"
 msgstr "Направите нови контакт"
 
@@ -19241,7 +19416,7 @@ msgid "Contact _List"
 msgstr "Ли_ста контакта"
 
 #: ../modules/addressbook/e-book-shell-backend.c:276
-#: ../modules/addressbook/e-book-shell-view-actions.c:1030
+#: ../modules/addressbook/e-book-shell-view-actions.c:1052
 msgid "Create a new contact list"
 msgstr "Направите нови списак контакта"
 
@@ -19251,249 +19426,267 @@ msgid "Address _Book"
 msgstr "_Адресар"
 
 #: ../modules/addressbook/e-book-shell-backend.c:286
-#: ../modules/addressbook/e-book-shell-view-actions.c:946
+#: ../modules/addressbook/e-book-shell-view-actions.c:968
 msgid "Create a new address book"
 msgstr "Направите нови адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:197
+#: ../modules/addressbook/e-book-shell-view-actions.c:212
 msgid "Address Book Properties"
 msgstr "Поставке адресара"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:520
-#: ../modules/addressbook/e-book-shell-view-actions.c:816
+#: ../modules/addressbook/e-book-shell-view-actions.c:535
+#: ../modules/addressbook/e-book-shell-view-actions.c:831
 msgid "Save as vCard"
 msgstr "Сачувајте као вКарту"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:923
+#: ../modules/addressbook/e-book-shell-view-actions.c:938
 msgid "Co_py All Contacts To..."
 msgstr "Умножи _све контакте у..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:925
+#: ../modules/addressbook/e-book-shell-view-actions.c:940
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Умножите контакте изабраног адресара у други"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:930
+#: ../modules/addressbook/e-book-shell-view-actions.c:945
 msgid "D_elete Address Book"
 msgstr "О_бриши адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:932
+#: ../modules/addressbook/e-book-shell-view-actions.c:947
 msgid "Delete the selected address book"
 msgstr "Обришите изабрани адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:937
+#: ../modules/addressbook/e-book-shell-view-actions.c:952
+#| msgid "_Add to Address Book..."
+msgid "_Manage Address Book groups..."
+msgstr "_Управљај групама адресара..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:954
+#: ../modules/calendar/e-task-shell-view-actions.c:721
+msgid "Manage task list groups order and visibility"
+msgstr "Управљајте редоследом и видљивошћу група спискова задатака"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:959
 msgid "Mo_ve All Contacts To..."
 msgstr "Премести _све контакте у..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:939
+#: ../modules/addressbook/e-book-shell-view-actions.c:961
 msgid "Move the contacts of the selected address book to another"
 msgstr "Преместите контакте изабраног адресара у други"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:944
+#: ../modules/addressbook/e-book-shell-view-actions.c:966
 msgid "_New Address Book"
 msgstr "_Нови адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:951
+#: ../modules/addressbook/e-book-shell-view-actions.c:973
 msgid "Address _Book Properties"
 msgstr "Подешавања адреса_ра"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:953
+#: ../modules/addressbook/e-book-shell-view-actions.c:975
 msgid "Show properties of the selected address book"
 msgstr "Прикажите својства изабраног адресара"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
-#: ../modules/calendar/e-cal-shell-view-actions.c:1254
-#: ../modules/calendar/e-memo-shell-view-actions.c:578
-#: ../modules/calendar/e-task-shell-view-actions.c:703
+#: ../modules/addressbook/e-book-shell-view-actions.c:980
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 msgid "Re_fresh"
 msgstr "О_свежи"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:960
+#: ../modules/addressbook/e-book-shell-view-actions.c:982
 msgid "Refresh the selected address book"
 msgstr "Освежите изабрани адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:965
+#: ../modules/addressbook/e-book-shell-view-actions.c:987
 msgid "Address Book _Map"
 msgstr "_Мапа адресара"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:967
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
 msgid "Show map with all contacts from selected address book"
 msgstr "Прикажите мапу са свим контактима из изабраних адресара"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:972
-#: ../modules/calendar/e-cal-shell-view-actions.c:1261
-#: ../modules/calendar/e-memo-shell-view-actions.c:585
-#: ../modules/calendar/e-task-shell-view-actions.c:710
+#: ../modules/addressbook/e-book-shell-view-actions.c:994
+#: ../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
 msgid "_Rename..."
 msgstr "_Преименуј..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:974
+#: ../modules/addressbook/e-book-shell-view-actions.c:996
 msgid "Rename the selected address book"
 msgstr "Преименујте изабрани адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:981
+#: ../modules/addressbook/e-book-shell-view-actions.c:1003
 msgid "Stop loading"
 msgstr "Прекини учитавање"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:986
+#: ../modules/addressbook/e-book-shell-view-actions.c:1008
 msgid "_Copy Contact To..."
 msgstr "_Умножи контакт у..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:988
+#: ../modules/addressbook/e-book-shell-view-actions.c:1010
 msgid "Copy selected contacts to another address book"
 msgstr "Умножите изабране контакте у други адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:993
+#: ../modules/addressbook/e-book-shell-view-actions.c:1015
 msgid "_Delete Contact"
 msgstr "_Уклони Контакт"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1000
+#: ../modules/addressbook/e-book-shell-view-actions.c:1022
 msgid "_Find in Contact..."
 msgstr "_Пронађи у контакту..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1002
+#: ../modules/addressbook/e-book-shell-view-actions.c:1024
 msgid "Search for text in the displayed contact"
 msgstr "Претражите текст у приказаном контакту"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1007
+#: ../modules/addressbook/e-book-shell-view-actions.c:1029
 msgid "_Forward Contact..."
 msgstr "_Проследи контакт..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1009
+#: ../modules/addressbook/e-book-shell-view-actions.c:1031
 msgid "Send selected contacts to another person"
 msgstr "Пошаљите изабране контакте другој особи"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1014
+#: ../modules/addressbook/e-book-shell-view-actions.c:1036
 msgid "_Move Contact To..."
 msgstr "_Премести контакт у..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1016
+#: ../modules/addressbook/e-book-shell-view-actions.c:1038
 msgid "Move selected contacts to another address book"
 msgstr "Преместите изабране контакте у други адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1021
+#: ../modules/addressbook/e-book-shell-view-actions.c:1043
 msgid "_New Contact..."
 msgstr "Нови кон_такт..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1028
+#: ../modules/addressbook/e-book-shell-view-actions.c:1050
 msgid "New Contact _List..."
 msgstr "Нова _листа контакта..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../modules/addressbook/e-book-shell-view-actions.c:1057
 msgid "_Open Contact"
 msgstr "_Отвори контакт"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1037
+#: ../modules/addressbook/e-book-shell-view-actions.c:1059
 msgid "View the current contact"
 msgstr "Прегледајте текући контакт"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1042
+#: ../modules/addressbook/e-book-shell-view-actions.c:1064
 msgid "_Send Message to Contact..."
 msgstr "_Пошаљи поруку контакту..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1044
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
 msgid "Send a message to the selected contacts"
 msgstr "Пошаљите поруку изабраним контактима"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1051
-#: ../modules/calendar/e-cal-shell-view-actions.c:1417
-#: ../modules/calendar/e-task-shell-view-actions.c:768
+#: ../modules/addressbook/e-book-shell-view-actions.c:1073
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-task-shell-view-actions.c:812
 msgid "_Actions"
 msgstr "_Радње"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1058
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
-#: ../modules/calendar/e-task-shell-view-actions.c:775
+#: ../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
 msgid "_Preview"
 msgstr "_Преглед"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1079
+#: ../modules/addressbook/e-book-shell-view-actions.c:1093
+#: ../modules/calendar/e-cal-shell-view-actions.c:1491
+#: ../modules/calendar/e-memo-shell-view-actions.c:682
+#: ../modules/calendar/e-task-shell-view-actions.c:836
+#| msgid "_Manager:"
+msgid "_Manage groups..."
+msgstr "_Управљај групама..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1105
 msgid "Address Book Map"
 msgstr "Мапа адресара"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1111
+#: ../modules/addressbook/e-book-shell-view-actions.c:1137
 msgid "Contact _Preview"
 msgstr "Пре_глед контакта"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1113
+#: ../modules/addressbook/e-book-shell-view-actions.c:1139
 msgid "Show contact preview window"
 msgstr "Прикажите прозор за преглед контакта"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1119
+#: ../modules/addressbook/e-book-shell-view-actions.c:1145
 msgid "Show _Maps"
 msgstr "Прикажи _мапе"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1121
+#: ../modules/addressbook/e-book-shell-view-actions.c:1147
 msgid "Show maps in contact preview window"
 msgstr "Прикажите мапе у прозору за преглед контаката"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1140
-#: ../modules/calendar/e-memo-shell-view-actions.c:692
-#: ../modules/calendar/e-task-shell-view-actions.c:857
-#: ../modules/mail/e-mail-shell-view-actions.c:2032
+#: ../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
 msgid "_Classic View"
 msgstr "_Класични приказ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1142
+#: ../modules/addressbook/e-book-shell-view-actions.c:1168
 msgid "Show contact preview below the contact list"
 msgstr "Прикажите преглед контакта испод контакт листе"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1147
-#: ../modules/calendar/e-memo-shell-view-actions.c:699
-#: ../modules/calendar/e-task-shell-view-actions.c:864
-#: ../modules/mail/e-mail-shell-view-actions.c:2039
+#: ../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
 msgid "_Vertical View"
 msgstr "_Усправни преглед"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1149
+#: ../modules/addressbook/e-book-shell-view-actions.c:1175
 msgid "Show contact preview alongside the contact list"
 msgstr "Прикажите преглед контакта поред контакт листе"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1164
-#: ../modules/calendar/e-cal-shell-view-actions.c:1594
-#: ../modules/calendar/e-memo-shell-view-actions.c:716
-#: ../modules/calendar/e-task-shell-view-actions.c:916
+#: ../modules/addressbook/e-book-shell-view-actions.c:1190
+#: ../modules/calendar/e-cal-shell-view-actions.c:1647
+#: ../modules/calendar/e-memo-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:968
 msgid "Unmatched"
 msgstr "Не одговара"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1174
-#: ../modules/calendar/e-cal-shell-view-actions.c:1604
-#: ../modules/calendar/e-memo-shell-view-actions.c:726
-#: ../modules/calendar/e-task-shell-view-actions.c:926
-#: ../modules/mail/e-mail-shell-view-actions.c:2108
+#: ../modules/addressbook/e-book-shell-view-actions.c:1200
+#: ../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
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Напредна претрага"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1207
+#: ../modules/addressbook/e-book-shell-view-actions.c:1233
 msgid "Print all shown contacts"
 msgstr "Штампај све приказане контакте"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1214
+#: ../modules/addressbook/e-book-shell-view-actions.c:1240
 msgid "Preview the contacts to be printed"
 msgstr "Преглед контаката пред штампу"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1221
+#: ../modules/addressbook/e-book-shell-view-actions.c:1247
 msgid "Print selected contacts"
 msgstr "Штампа изабране контакте"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1236
+#: ../modules/addressbook/e-book-shell-view-actions.c:1262
 msgid "S_ave Address Book as vCard"
 msgstr "_Сачувај адресар као вКарту"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1238
+#: ../modules/addressbook/e-book-shell-view-actions.c:1264
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Сачувајте контакте изабраног адресара као вКарту"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1244
-#: ../modules/addressbook/e-book-shell-view-actions.c:1254
+#: ../modules/addressbook/e-book-shell-view-actions.c:1270
+#: ../modules/addressbook/e-book-shell-view-actions.c:1280
 msgid "_Save as vCard..."
 msgstr "_Сачувај као вКарту..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1246
+#: ../modules/addressbook/e-book-shell-view-actions.c:1272
 msgid "Save selected contacts as a vCard"
 msgstr "Сачувај изабране контакте као ВКарту"
 
@@ -19551,7 +19744,6 @@ msgid "_Restart Evolution after backup"
 msgstr "_Поново покрени Еволуцију након прављења резерве"
 
 #: ../modules/backup-restore/evolution-backup-restore.c:285
-#| msgid "_Restart Evolution after restore"
 msgid "Re_start Evolution after restore"
 msgstr "_Поново покрени Еволуцију након повраћаја"
 
@@ -19691,7 +19883,6 @@ msgid "Invalid Evolution backup file"
 msgstr "Неисправна датотека резервног примерка Еволуције"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
-#| msgid "Invalid Evolution backup file"
 msgid "File '{0}' is not a valid Evolution backup file."
 msgstr "„{0}“ није исправна резервна копија Еволуције."
 
@@ -19709,7 +19900,6 @@ msgstr ""
 "него што наставите."
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
-#| msgid "Close and Back up Evolution"
 msgid "Close and _Back up Evolution"
 msgstr "Затвори и _направи резерву Евојуције"
 
@@ -19732,7 +19922,6 @@ msgstr ""
 
 # shell:noshell-reason title
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
-#| msgid "Close and Restore Evolution"
 msgid "Close and _Restore Evolution"
 msgstr "Затвори и _врати резерву Еволуције"
 
@@ -19771,71 +19960,88 @@ msgid "Bogofilter"
 msgstr "Богофилтер"
 
 #: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:2
-#| msgid "Junk filtering software:"
 msgid "Junk filter using Bogofilter"
 msgstr "Бого-филтер непожељних порука"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:440
+#: ../modules/book-config-google/evolution-book-config-google.c:92
+#: ../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
+#| msgid "One or more values cannot be empty."
+msgid "User name cannot be empty"
+msgstr "Корисничко име не може бити празно"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:442
 msgid "Standard LDAP Port"
 msgstr "Стандардни ЛДАП порт"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:618
-msgid "LDAP over SSL (deprecated)"
-msgstr "ЛДАП или ССЛ (превазиђено)"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:448
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:631
+#| msgid "LDAP over SSL (deprecated)"
+msgid "LDAP over SSL/TLS (deprecated)"
+msgstr "ЛДАП или ССЛ/ТЛС (превазиђено)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:454
 msgid "Microsoft Global Catalog"
 msgstr "Мајкрософтов општи каталог"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
-msgid "Microsoft Global Catalog over SSL"
-msgstr "Мајкрософтов општи каталог преко ССЛ"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:460
+#| msgid "Microsoft Global Catalog over SSL"
+msgid "Microsoft Global Catalog over SSL/TLS"
+msgstr "Мајкрософтов општи каталог преко ССЛ/ТЛС-а"
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:563
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:567
 msgid "Connecting to LDAP"
 msgstr "Повезујем се на ЛДАП"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:580
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:584
 msgid "Server Information"
 msgstr "Подаци сервера"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:611
 msgid "Port:"
 msgstr "Порт:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
+#: ../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
+msgid "Port number is not valid"
+msgstr "Број прикључника није исправан"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:634
 msgid "StartTLS (recommended)"
 msgstr "ПочетниТЛС (препоручено)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:623
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:636
 msgid "Encryption:"
 msgstr "Шифровање:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:647
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:195
+#: ../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
 msgid "Authentication"
 msgstr "Потврђивање идентитета"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:670
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
 msgid "Anonymous"
 msgstr "Анонимно"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:673
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:686
 msgid "Using email address"
 msgstr "Користи адресу ел. поште"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:689
 msgid "Using distinguished name (DN)"
 msgstr "Користи посебан назив (DN)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:678
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
 msgid "Method:"
 msgstr "Начин:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:696
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Using email address\" requires anonymous access to your "
@@ -19846,36 +20052,36 @@ msgstr ""
 "приступ на ваш ЛДАП сервер."
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:698
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:711
 msgid "Using LDAP"
 msgstr "Користи ЛДАП"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:715
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:728
 #: ../modules/mail/e-mail-shell-view.c:120
 msgid "Searching"
 msgstr "Претражујем"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:737
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:750
 msgid "Search Base:"
 msgstr "Основа претраге:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:741
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:754
 msgid "Find Possible Search Bases"
 msgstr "Нађи могуће базе за претрагу"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:763
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:776
 msgid "One Level"
 msgstr "Један ниво"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:765
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
 msgid "Subtree"
 msgstr "Подстабло"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:767
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:780
 msgid "Search Scope:"
 msgstr "Обим претраге:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:772
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:785
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree.  A search scope of \"Subtree\" will include all entries "
@@ -19887,26 +20093,33 @@ msgstr ""
 "за претрагу.  Обим претраге „Један ниво“ ће укључити само уносе један ниво "
 "испод ваше базе претраге."
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:781
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
 msgid "Search Filter:"
 msgstr "Филтер претраге:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:793
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:806
 msgid "Downloading"
 msgstr "Преузимам"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:814
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:827
 msgid "Limit:"
 msgstr "Ограничење:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:838
 msgid "contacts"
 msgstr "контакти"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:830
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:843
 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
+#| msgid "One or more values cannot be empty."
+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/cal-config-webcal/evolution-cal-config-webcal.c:127
@@ -19917,18 +20130,24 @@ msgstr "Адреса:"
 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/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-google/e-google-chooser-button.c:213
+#: ../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-google/e-google-chooser-button.c:217
+#: ../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-google/e-google-chooser-button.c:221
+#: ../modules/cal-config-google/e-google-chooser-button.c:232
 msgid "Choose a Task List"
 msgstr "Изаберите списак садатака"
 
@@ -19960,7 +20179,7 @@ msgstr "Изаберите адресаре који ћете користити
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "Користи у календару за рођендане и годишњице"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:145
+#: ../modules/cal-config-google/e-google-chooser-button.c:143
 msgid "Default User Calendar"
 msgstr "Основни кориснички календар"
 
@@ -20016,23 +20235,25 @@ msgstr "Келвин (K)"
 msgid "Units:"
 msgstr "Јединице:"
 
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:321
+#| msgid "One or more values cannot be empty."
+msgid "Location cannot be empty"
+msgstr "Место не може бити празно"
+
 #: ../modules/calendar/e-cal-attachment-handler.c:287
 #: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
 msgstr "У_вези"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:337
-#| msgid "Importing Pine data"
 msgid "Importing an event"
 msgstr "Увозим догађај"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:341
-#| msgid "Importing mailbox"
 msgid "Importing a memo"
 msgstr "Увозим белешку"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:345
-#| msgid "Importing Elm data"
 msgid "Importing a task"
 msgstr "Увозим задатак"
 
@@ -20041,7 +20262,6 @@ msgid "Select a Calendar"
 msgstr "Изаберите календар"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:410
-#| msgid "D_elete Memo List"
 msgid "Select a Memo List"
 msgstr "Изаберите списак белешки"
 
@@ -20054,105 +20274,87 @@ msgid "I_mport to Calendar"
 msgstr "У_вези у календар"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:431
-#| msgid "I_mport to Tasks"
 msgid "I_mport to Memo List"
 msgstr "У_вези у списак белешки"
 
 #: ../modules/calendar/e-cal-attachment-handler.c:438
-#| msgid "I_mport to Tasks"
 msgid "I_mport to Task List"
 msgstr "У_вези у списак задатака"
 
-#: ../modules/calendar/e-cal-base-shell-backend.c:186
-#: ../modules/calendar/e-cal-shell-view-actions.c:162
-msgid "New Calendar"
-msgstr "Нови календар"
-
-#: ../modules/calendar/e-cal-base-shell-backend.c:190
-#: ../modules/calendar/e-memo-shell-view-actions.c:164
+#: ../modules/calendar/e-cal-base-shell-backend.c:187
+#: ../modules/calendar/e-memo-shell-view-actions.c:180
 msgid "New Memo List"
 msgstr "Нови списак белешке"
 
-#: ../modules/calendar/e-cal-base-shell-backend.c:194
-#: ../modules/calendar/e-task-shell-view-actions.c:187
-msgid "New Task List"
-msgstr "Нови списак задатака"
-
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:554
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:556
 #, c-format
-#| msgid "Copying an event into the calendar %s"
 msgid "Copying an event into the calendar '%s'"
 msgstr "Умножавам догађај у календар „%s“"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:555
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:557
 #, c-format
-#| msgid "Moving an event into the calendar %s"
 msgid "Moving an event into the calendar '%s'"
 msgstr "Премештам догађај у календар „%s“"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:560
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:562
 #, c-format
-#| msgid "Copying a memo into the memo list '{0}'"
 msgid "Copying a memo into the memo list '%s'"
 msgstr "Умножавам белешку у списак белешки „%s“"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:561
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:563
 #, c-format
-#| msgid "Moving a memo into the memo list '{0}'"
 msgid "Moving a memo into the memo list '%s'"
 msgstr "Премештам белешку у списак белешки „%s“"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:566
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:568
 #, c-format
-#| msgid "Copying a task into the task list '{0}'"
 msgid "Copying a task into the task list '%s'"
 msgstr "Умножавам задатак у списак задатака „%s“"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:567
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:569
 #, c-format
-#| msgid "Moving a task into the task list '{0}'"
 msgid "Moving a task into the task list '%s'"
 msgstr "Премештам задатак у списак задатака „%s“"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:684
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:686
 msgid "Calendar Selector"
 msgstr "Изборник календара"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:690
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:692
 msgid "Memo List Selector"
 msgstr "Изборник спискова белешки"
 
-#: ../modules/calendar/e-cal-base-shell-sidebar.c:695
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:697
 msgid "Task List Selector"
 msgstr "Изборник списка задатака"
 
-#: ../modules/calendar/e-calendar-preferences.c:520
+#: ../modules/calendar/e-calendar-preferences.c:515
 msgid "Selected Calendars for Alarms"
 msgstr "Изабрани календари за аларме"
 
-#: ../modules/calendar/e-calendar-preferences.c:616
+#: ../modules/calendar/e-calendar-preferences.c:611
 msgid "Meeting Invitations"
 msgstr "Позивнице за састанак"
 
-#: ../modules/calendar/e-calendar-preferences.c:642
+#: ../modules/calendar/e-calendar-preferences.c:637
 msgid "_Delete message after acting"
 msgstr "_Обриши поруку након радње"
 
-#: ../modules/calendar/e-calendar-preferences.c:656
-#: ../modules/calendar/e-calendar-preferences.c:687
+#: ../modules/calendar/e-calendar-preferences.c:651
+#: ../modules/calendar/e-calendar-preferences.c:682
 msgid "Conflict Search"
 msgstr "Претрага преклапања"
 
 #. Source selector
-#: ../modules/calendar/e-calendar-preferences.c:671
+#: ../modules/calendar/e-calendar-preferences.c:666
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Бира календаре за претрагу преклапања у састанцима"
 
-#: ../modules/calendar/e-calendar-preferences.c:1057
+#: ../modules/calendar/e-calendar-preferences.c:1058
 msgid "Ti_me and date:"
 msgstr "_Време и датум:"
 
-#: ../modules/calendar/e-calendar-preferences.c:1058
+#: ../modules/calendar/e-calendar-preferences.c:1059
 msgid "_Date only:"
 msgstr "Само _датум:"
 
@@ -20196,6 +20398,10 @@ msgstr "Дру_га зона:"
 msgid "(Shown in a Day View)"
 msgstr "(Приказано у Дневном прегледу)"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
+msgid "Time _zone:"
+msgstr "Временска _зона:"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:14
 msgid "Use s_ystem time zone"
 msgstr "Користи временску зону _система"
@@ -20213,7 +20419,7 @@ msgid "_24 hour"
 msgstr "_24 - часовни"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
-#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+#: ../modules/calendar/e-cal-shell-view-actions.c:1609
 msgid "Work Week"
 msgstr "Радна недеља"
 
@@ -20235,42 +20441,69 @@ msgstr "Почетак _дана:"
 msgid "_Mon"
 msgstr "_Пон"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
+msgid "Monday"
+msgstr "Понедељак"
+
 #. Tuesday
 #: ../modules/calendar/e-calendar-preferences.ui.h:27
 msgid "_Tue"
 msgstr "_Уто"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
+msgid "Tuesday"
+msgstr "Уторак"
+
 #. Wednesday
 #: ../modules/calendar/e-calendar-preferences.ui.h:30
 msgid "_Wed"
 msgstr "_Сре"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
+msgid "Wednesday"
+msgstr "Среда"
+
 #. Thursday
 #: ../modules/calendar/e-calendar-preferences.ui.h:33
 msgid "T_hu"
 msgstr "У_то"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
+msgid "Thursday"
+msgstr "Четвртак"
+
 #. Friday
 #: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "_Fri"
 msgstr "_Пет"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
+msgid "Friday"
+msgstr "Петак"
+
 #. Saturday
 #: ../modules/calendar/e-calendar-preferences.ui.h:39
 msgid "_Sat"
 msgstr "_Суб"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
+msgid "Saturday"
+msgstr "Субота"
+
 #. Sunday
 #: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "S_un"
 msgstr "Н_ед"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
+msgid "Sunday"
+msgstr "Недеља"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:44
 msgid "Day _ends:"
 msgstr "Крај _дана:"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
-#| msgid "Send Options"
 msgid "View Options"
 msgstr "Опције прегледа"
 
@@ -20283,97 +20516,101 @@ msgid "_Show appointment end times in week and month view"
 msgstr "_Прикажи заказана времена завршетка у недељним и месечним прегледима"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:50
+#| msgid "Show appointment end times in week and month views"
+msgid "Show appointment _icons in the month view"
+msgstr "Прикажи _иконицу састанка у месечном прегледу"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
 msgid "_Compress weekends in month view"
 msgstr "_Сажми недеље у месечни преглед"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
 msgid "Show week _numbers"
 msgstr "Прикажи _бројеве недеља"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
 msgid "Show r_ecurring events in italic in bottom left calendar"
 msgstr ""
 "Прикажи догађаје који се _понављају искошеним словима у доњем левом календару"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Sc_roll Month View by a week"
 msgstr "При_казује Месечни преглед по недељама"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../modules/calendar/e-calendar-preferences.ui.h:55
 msgid "Alerts"
 msgstr "Упозорења"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:55
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Тражи потврду за брисање ставки"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "Display"
 msgstr "Приказ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Task List"
 msgstr "Списак задатака"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
 msgid "Highlight t_asks due today"
 msgstr "Истакни _задатке у току дана"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "Highlight _overdue tasks"
 msgstr "Истакни _неиспуњене задатке"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:61
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
 msgid "_Hide completed tasks after"
 msgstr "_Сакриј завршене задатке после"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:64
+#: ../modules/calendar/e-calendar-preferences.ui.h:65
 msgid "Display reminders in _notification area only"
 msgstr "Прикажи подсетнике само у _обавештајној зони"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
-#| msgid "Delete completed tasks"
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Display reminders for completed _tasks"
 msgstr "Прикажи подсетнике за за_вршене задатке"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 msgid "Sh_ow a reminder"
 msgstr "При_кажи подсетник"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "before every appointment"
 msgstr "пре сваког заказивања"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "Show a _reminder"
 msgstr "Прикажи _подсетник"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "пре сваке годишњице/рођендана"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
+#: ../modules/calendar/e-calendar-preferences.ui.h:75
 msgid "Default _snooze time (in minutes)"
 msgstr "Подразумевано време одла_гања подсетника (у минутима)"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:75
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "Select the calendars for reminder notification"
 msgstr "Изаберите календаре за обавештење подсетника"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
 msgid "Default Free/Busy Server"
 msgstr "Подразумевани сервер слободног/заузетог времена"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:79
+#: ../modules/calendar/e-calendar-preferences.ui.h:80
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr "%u и %d ће бити замењени корисником и доменом из електронске адресе."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:80
+#: ../modules/calendar/e-calendar-preferences.ui.h:81
 msgid "Publishing Information"
 msgstr "Подаци о објављивању"
 
@@ -20383,7 +20620,7 @@ msgid "_Appointment"
 msgstr "_Заказивање"
 
 #: ../modules/calendar/e-cal-shell-backend.c:116
-#: ../modules/calendar/e-cal-shell-view-actions.c:1361
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
 msgid "Create a new appointment"
 msgstr "Прави ново заказивање"
 
@@ -20411,7 +20648,7 @@ msgid "Cale_ndar"
 msgstr "Кале_ндар"
 
 #: ../modules/calendar/e-cal-shell-backend.c:140
-#: ../modules/calendar/e-cal-shell-view-actions.c:1235
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Create a new calendar"
 msgstr "Прави нови календар"
 
@@ -20419,15 +20656,15 @@ msgstr "Прави нови календар"
 msgid "Calendar and Tasks"
 msgstr "Календар и задаци"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:181
+#: ../modules/calendar/e-cal-shell-view-actions.c:199
 msgid "Print"
 msgstr "Штампај"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:267
+#: ../modules/calendar/e-cal-shell-view-actions.c:285
 msgid "Calendar Properties"
 msgstr "Особине календара"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:296
+#: ../modules/calendar/e-cal-shell-view-actions.c:314
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -20438,340 +20675,353 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:313
+#: ../modules/calendar/e-cal-shell-view-actions.c:331
 msgid "Purge events older than"
 msgstr "Избаци догађаје старије од"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:895
-#| msgid "Make this Occurrence _Movable"
+#: ../modules/calendar/e-cal-shell-view-actions.c:926
 msgid "Making an occurrence movable"
 msgstr "Нека ова појава буде _покретна"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1055
+#: ../modules/calendar/e-cal-shell-view-actions.c:1086
 msgid "event"
 msgstr "догађај"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1057
-#: ../modules/calendar/e-cal-shell-view-memopad.c:208
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:276
-#: ../modules/calendar/e-memo-shell-view-actions.c:469
-#: ../modules/calendar/e-task-shell-view-actions.c:587
+#: ../modules/calendar/e-cal-shell-view-actions.c:1088
+#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
+#: ../modules/calendar/e-memo-shell-view-actions.c:498
+#: ../modules/calendar/e-task-shell-view-actions.c:617
 msgid "Save as iCalendar"
 msgstr "Сачувај као иКалендар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1191
-#: ../modules/calendar/e-memo-shell-view-actions.c:550
-#: ../modules/calendar/e-task-shell-view-actions.c:675
+#: ../modules/calendar/e-cal-shell-view-actions.c:1222
+#: ../modules/calendar/e-memo-shell-view-actions.c:579
+#: ../modules/calendar/e-task-shell-view-actions.c:705
 msgid "_Copy..."
 msgstr "_Умножи..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1198
+#: ../modules/calendar/e-cal-shell-view-actions.c:1229
 msgid "D_elete Calendar"
 msgstr "Об_риши календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1200
+#: ../modules/calendar/e-cal-shell-view-actions.c:1231
 msgid "Delete the selected calendar"
 msgstr "Обришите изабрани календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1207
+#: ../modules/calendar/e-cal-shell-view-actions.c:1238
 msgid "Go Back"
 msgstr "Иди назад"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1214
+#: ../modules/calendar/e-cal-shell-view-actions.c:1245
 msgid "Go Forward"
 msgstr "Иди напред"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1221
+#: ../modules/calendar/e-cal-shell-view-actions.c:1252
 msgid "Select today"
 msgstr "Изабери данашњи дан"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1226
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
 msgid "Select _Date"
 msgstr "Изабери _датум"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1228
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 msgid "Select a specific date"
 msgstr "Изаберите одређени датум"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1233
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
+#| msgid "_Save as iCalendar..."
+msgid "_Manage Calendar groups..."
+msgstr "_Управљај групама календара..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
+msgid "Manage Calendar groups order and visibility"
+msgstr "Управљајте редоследом и видљивошћу група календара"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
 msgid "_New Calendar"
 msgstr "Нови _календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1247
-#: ../modules/calendar/e-task-shell-view-actions.c:759
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
+#: ../modules/calendar/e-task-shell-view-actions.c:803
 msgid "Purg_e"
 msgstr "Изба_ци"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1249
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "Purge old appointments and meetings"
 msgstr "Избаците стара заказивања и састанке"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1256
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
 msgid "Refresh the selected calendar"
 msgstr "Освежите изабрани календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1263
+#: ../modules/calendar/e-cal-shell-view-actions.c:1301
 msgid "Rename the selected calendar"
 msgstr "Преименујте изабрани календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1268
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
 msgid "Find _Next"
 msgstr "Нађи _следеће"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1270
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
 msgid "Find next occurrence of the current search string"
 msgstr "Пронађите следеће појављивање текуће ниске претраге"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1275
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
 msgid "Find _Previous"
 msgstr "Нађи _претходно"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1277
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
 msgid "Find previous occurrence of the current search string"
 msgstr "Пронађите претходно појављивање текуће ниске претраге"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1282
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
 msgid "Stop _Running Search"
 msgstr "Заустави _текућу претрагу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
 msgid "Stop currently running search"
 msgstr "Зауставите тренутно покренуту претрагу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1289
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+#| msgid "Show _Only This Calendar"
+msgid "Sho_w All Calendars"
+msgstr "Прикажи _све календаре"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Show _Only This Calendar"
 msgstr "Прикажи _само овај календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1296
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "Cop_y to Calendar..."
 msgstr "_Умножи у календар..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1303
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 msgid "_Delegate Meeting..."
 msgstr "_Делегирај састанак..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1310
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 msgid "_Delete Appointment"
 msgstr "_Обриши заказано"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Delete selected appointments"
 msgstr "Обришите изабрана заказивања"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1317
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Delete This _Occurrence"
 msgstr "Обриши ову _појаву"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1319
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Delete this occurrence"
 msgstr "Обришите ову појаву"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1324
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "Delete All Occ_urrences"
 msgstr "Обриши све по_јаве"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1326
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Delete all occurrences"
 msgstr "Обришите све појаве"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1331
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 msgid "New All Day _Event..."
 msgstr "Нови целодневни _догађај..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1333
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
 msgid "Create a new all day event"
 msgstr "Направите нови целодневни догађај"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1338
-#: ../modules/calendar/e-cal-shell-view-memopad.c:242
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
-#: ../modules/calendar/e-memo-shell-view-actions.c:543
-#: ../modules/calendar/e-task-shell-view-actions.c:668
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
+#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:572
+#: ../modules/calendar/e-task-shell-view-actions.c:698
 msgid "_Forward as iCalendar..."
 msgstr "_Проследи као иКалендар..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1345
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "New _Meeting..."
 msgstr "Нови _састанак..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1347
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "Create a new meeting"
 msgstr "Направите нови састанак"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1352
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "Mo_ve to Calendar..."
 msgstr "Прен_еси у календар..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1359
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "New _Appointment..."
 msgstr "Ново _заказивање..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1366
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "Make this Occurrence _Movable"
 msgstr "Нека ова појава буде _покретна"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1373
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "_Open Appointment"
 msgstr "_Отвори састанак"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1375
+#: ../modules/calendar/e-cal-shell-view-actions.c:1420
 msgid "View the current appointment"
 msgstr "Прегледајте текуће заказивање"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1380
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
 msgid "_Reply"
 msgstr "_Одговори"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1394
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "_Schedule Meeting..."
 msgstr "_Закажи састанак..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1396
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Converts an appointment to a meeting"
 msgstr "Претворите заказано у састанак"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1401
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Conv_ert to Appointment..."
 msgstr "Пре_твори у заказано..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Converts a meeting to an appointment"
 msgstr "Претворите састанак у заказано"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
 msgid "Quit"
 msgstr "Изађи"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1528
+#: ../modules/calendar/e-cal-shell-view-actions.c:1581
 msgid "Day"
 msgstr "Дан"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1530
+#: ../modules/calendar/e-cal-shell-view-actions.c:1583
 msgid "Show one day"
 msgstr "Прикажи један дан"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1535
+#: ../modules/calendar/e-cal-shell-view-actions.c:1588
 msgid "List"
 msgstr "Списак"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1537
+#: ../modules/calendar/e-cal-shell-view-actions.c:1590
 msgid "Show as list"
 msgstr "Прикажи као списак"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1542
+#: ../modules/calendar/e-cal-shell-view-actions.c:1595
 msgid "Month"
 msgstr "Месец"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1544
+#: ../modules/calendar/e-cal-shell-view-actions.c:1597
 msgid "Show one month"
 msgstr "Прикажи један месец"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1549
+#: ../modules/calendar/e-cal-shell-view-actions.c:1602
 msgid "Week"
 msgstr "Недеља"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1551
+#: ../modules/calendar/e-cal-shell-view-actions.c:1604
 msgid "Show one week"
 msgstr "Прикажи једну недељу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1558
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Show one work week"
 msgstr "Прикажи једну радну недељу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1566
+#: ../modules/calendar/e-cal-shell-view-actions.c:1619
 msgid "Active Appointments"
 msgstr "Активна заказивања"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1580
+#: ../modules/calendar/e-cal-shell-view-actions.c:1633
 msgid "Next 7 Days' Appointments"
 msgstr "Заказано за следећу недељу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1587
+#: ../modules/calendar/e-cal-shell-view-actions.c:1640
 msgid "Occurs Less Than 5 Times"
 msgstr "Дешава се мање од 5 пута"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1618
-#: ../modules/calendar/e-memo-shell-view-actions.c:740
-#: ../modules/calendar/e-task-shell-view-actions.c:940
+#: ../modules/calendar/e-cal-shell-view-actions.c:1671
+#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-task-shell-view-actions.c:992
 msgid "Description contains"
 msgstr "Опис садржи"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1625
-#: ../modules/calendar/e-memo-shell-view-actions.c:747
-#: ../modules/calendar/e-task-shell-view-actions.c:947
+#: ../modules/calendar/e-cal-shell-view-actions.c:1678
+#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-task-shell-view-actions.c:999
 msgid "Summary contains"
 msgstr "Сажетак садржи"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1635
-#: ../modules/calendar/e-cal-shell-view-actions.c:1649
-#: ../modules/calendar/e-cal-shell-view-memopad.c:273
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-memo-shell-view-actions.c:757
-#: ../modules/calendar/e-memo-shell-view-actions.c:771
-#: ../modules/calendar/e-task-shell-view-actions.c:957
-#: ../modules/calendar/e-task-shell-view-actions.c:971
+#: ../modules/calendar/e-cal-shell-view-actions.c:1688
+#: ../modules/calendar/e-cal-shell-view-actions.c:1702
+#: ../modules/calendar/e-cal-shell-view-memopad.c:274
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:362
+#: ../modules/calendar/e-memo-shell-view-actions.c:808
+#: ../modules/calendar/e-memo-shell-view-actions.c:822
+#: ../modules/calendar/e-task-shell-view-actions.c:1009
+#: ../modules/calendar/e-task-shell-view-actions.c:1023
 msgid "Print..."
 msgstr "Штампај..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1637
+#: ../modules/calendar/e-cal-shell-view-actions.c:1690
 msgid "Print this calendar"
 msgstr "Штампа овај календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1644
+#: ../modules/calendar/e-cal-shell-view-actions.c:1697
 msgid "Preview the calendar to be printed"
 msgstr "Преглед календара пред штампу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1666
-#: ../modules/calendar/e-cal-shell-view-memopad.c:283
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
-#: ../modules/calendar/e-memo-shell-view-actions.c:788
-#: ../modules/calendar/e-task-shell-view-actions.c:988
+#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+#: ../modules/calendar/e-cal-shell-view-memopad.c:284
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:372
+#: ../modules/calendar/e-memo-shell-view-actions.c:839
+#: ../modules/calendar/e-task-shell-view-actions.c:1040
 msgid "_Save as iCalendar..."
 msgstr "_Сачувај као иКалендар..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1743
+#: ../modules/calendar/e-cal-shell-view-actions.c:1796
 msgid "Go To"
 msgstr "Иди на"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:206
-#: ../modules/calendar/e-memo-shell-view-actions.c:467
+#: ../modules/calendar/e-cal-shell-view-memopad.c:207
+#: ../modules/calendar/e-memo-shell-view-actions.c:496
 msgid "memo"
 msgstr "белешка"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:249
-#: ../modules/calendar/e-memo-shell-view-actions.c:599
+#: ../modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "New _Memo"
 msgstr "Нова _белешка"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-cal-shell-view-memopad.c:252
 #: ../modules/calendar/e-memo-shell-backend.c:65
-#: ../modules/calendar/e-memo-shell-view-actions.c:601
+#: ../modules/calendar/e-memo-shell-view-actions.c:644
 msgid "Create a new memo"
 msgstr "Направите једну нову белешку"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:256
-#: ../modules/calendar/e-memo-shell-view-actions.c:606
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-memo-shell-view-actions.c:649
 msgid "_Open Memo"
 msgstr "_Отвори белешку"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:258
-#: ../modules/calendar/e-memo-shell-view-actions.c:608
+#: ../modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../modules/calendar/e-memo-shell-view-actions.c:651
 msgid "View the selected memo"
 msgstr "Погледајте изабрану белешку"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:263
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
-#: ../modules/calendar/e-memo-shell-view-actions.c:613
-#: ../modules/calendar/e-task-shell-view-actions.c:752
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
+#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../modules/calendar/e-task-shell-view-actions.c:796
 msgid "Open _Web Page"
 msgstr "Отвори _Веб страницу"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:275
-#: ../modules/calendar/e-memo-shell-view-actions.c:773
+#: ../modules/calendar/e-cal-shell-view-memopad.c:276
+#: ../modules/calendar/e-memo-shell-view-actions.c:824
 msgid "Print the selected memo"
 msgstr "Штампајте изабрану белешку"
 
@@ -20809,58 +21059,58 @@ msgstr "Не могу да тражим ако нема активног кал
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:274
-#: ../modules/calendar/e-task-shell-view-actions.c:585
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:275
+#: ../modules/calendar/e-task-shell-view-actions.c:615
 msgid "task"
 msgstr "задатак"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:309
-#: ../modules/calendar/e-task-shell-view-actions.c:647
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
+#: ../modules/calendar/e-task-shell-view-actions.c:677
 msgid "_Assign Task"
 msgstr "_Додели задатак"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
-#: ../modules/calendar/e-task-shell-view-actions.c:724
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "_Mark as Complete"
 msgstr "_Означи као завршено"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:325
-#: ../modules/calendar/e-task-shell-view-actions.c:726
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
+#: ../modules/calendar/e-task-shell-view-actions.c:770
 msgid "Mark selected tasks as complete"
 msgstr "Обележите изабране задатке као завршене"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
 msgid "_Mark as Incomplete"
 msgstr "_Означи као незавршено"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
-#: ../modules/calendar/e-task-shell-view-actions.c:733
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:777
 msgid "Mark selected tasks as incomplete"
 msgstr "Обележите изабране задатке као незавршене"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
-#: ../modules/calendar/e-task-shell-view-actions.c:738
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../modules/calendar/e-task-shell-view-actions.c:782
 msgid "New _Task"
 msgstr "Нови зад_атак"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
-#: ../modules/calendar/e-task-shell-backend.c:64
-#: ../modules/calendar/e-task-shell-view-actions.c:740
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-task-shell-backend.c:63
+#: ../modules/calendar/e-task-shell-view-actions.c:784
 msgid "Create a new task"
 msgstr "Направите нови задатак"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../modules/calendar/e-task-shell-view-actions.c:789
 msgid "_Open Task"
 msgstr "_Отвори задатак"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-view-actions.c:747
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:791
 msgid "View the selected task"
 msgstr "Прегледајте изабрани задатак"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:363
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:364
+#: ../modules/calendar/e-task-shell-view-actions.c:1025
 msgid "Print the selected task"
 msgstr "Штампа изабрани задатак"
 
@@ -20884,84 +21134,97 @@ msgid "Memo Li_st"
 msgstr "Спи_сак белешки"
 
 #: ../modules/calendar/e-memo-shell-backend.c:82
-#: ../modules/calendar/e-memo-shell-view-actions.c:566
+#: ../modules/calendar/e-memo-shell-view-actions.c:602
 msgid "Create a new memo list"
 msgstr "Саставите нови списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:180
-#: ../modules/calendar/e-memo-shell-view-actions.c:195
+#: ../modules/calendar/e-memo-shell-view-actions.c:196
+#: ../modules/calendar/e-memo-shell-view-actions.c:211
 msgid "Print Memos"
 msgstr "Штампај белешке"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:236
+#: ../modules/calendar/e-memo-shell-view-actions.c:252
 msgid "Memo List Properties"
 msgstr "Особине списка задатака"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:529
+#: ../modules/calendar/e-memo-shell-view-actions.c:558
 msgid "_Delete Memo"
 msgstr "_Обриши белешку"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:536
+#: ../modules/calendar/e-memo-shell-view-actions.c:565
 msgid "_Find in Memo..."
 msgstr "П_ронађи у белешци..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:538
+#: ../modules/calendar/e-memo-shell-view-actions.c:567
 msgid "Search for text in the displayed memo"
 msgstr "Претражите текст у приказаној белешци"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:557
+#: ../modules/calendar/e-memo-shell-view-actions.c:586
 msgid "D_elete Memo List"
 msgstr "Об_риши списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:559
+#: ../modules/calendar/e-memo-shell-view-actions.c:588
 msgid "Delete the selected memo list"
 msgstr "Обришите изабрани списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:564
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
+msgid "_Manage Memo List groups..."
+msgstr "_Управљај групама спискова белешки..."
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:595
+msgid "Manage Memo List groups order and visibility"
+msgstr "Управљајте редоследом и видљивошћу група спискова белешки"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:600
 msgid "_New Memo List"
 msgstr "_Нови списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:580
+#: ../modules/calendar/e-memo-shell-view-actions.c:616
 msgid "Refresh the selected memo list"
 msgstr "Освежите изабрани списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:587
+#: ../modules/calendar/e-memo-shell-view-actions.c:623
 msgid "Rename the selected memo list"
 msgstr "Преименујте изабрани списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:592
+#: ../modules/calendar/e-memo-shell-view-actions.c:628
 msgid "Show _Only This Memo List"
 msgstr "Прикажи _само овај списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:671
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
+#| msgid "Show _Only This Memo List"
+msgid "Sho_w All Memo Lists"
+msgstr "Прикажи _све спискове белешки"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:722
 msgid "Memo _Preview"
 msgstr "_Преглед белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:673
+#: ../modules/calendar/e-memo-shell-view-actions.c:724
 msgid "Show memo preview pane"
 msgstr "Прикажите преглед белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:694
+#: ../modules/calendar/e-memo-shell-view-actions.c:745
 msgid "Show memo preview below the memo list"
 msgstr "Прикажите преглед белешки испод списка белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:701
+#: ../modules/calendar/e-memo-shell-view-actions.c:752
 msgid "Show memo preview alongside the memo list"
 msgstr "Прикажите преглед белешки поред списка белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:759
+#: ../modules/calendar/e-memo-shell-view-actions.c:810
 msgid "Print the list of memos"
 msgstr "Штампајте списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:766
+#: ../modules/calendar/e-memo-shell-view-actions.c:817
 msgid "Preview the list of memos to be printed"
 msgstr "Прегледајте списак белешки за штампу"
 
-#: ../modules/calendar/e-memo-shell-view.c:212
+#: ../modules/calendar/e-memo-shell-view.c:219
 msgid "Delete Memos"
 msgstr "Обриши белешке"
 
-#: ../modules/calendar/e-memo-shell-view.c:214
+#: ../modules/calendar/e-memo-shell-view.c:221
 msgid "Delete Memo"
 msgstr "Обриши белешку"
 
@@ -20975,45 +21238,45 @@ msgstr[2] "%d белешки"
 msgstr[3] "%d белешка"
 
 #: ../modules/calendar/e-memo-shell-view-private.c:373
-#: ../modules/calendar/e-task-shell-view-private.c:539
+#: ../modules/calendar/e-task-shell-view-private.c:550
 #, c-format
 msgid "%d selected"
 msgstr "изабраних — %d"
 
-#: ../modules/calendar/e-task-shell-backend.c:62
+#: ../modules/calendar/e-task-shell-backend.c:61
 msgctxt "New"
 msgid "_Task"
 msgstr "_Задатак"
 
-#: ../modules/calendar/e-task-shell-backend.c:69
+#: ../modules/calendar/e-task-shell-backend.c:68
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Додељен_и задатак"
 
-#: ../modules/calendar/e-task-shell-backend.c:71
+#: ../modules/calendar/e-task-shell-backend.c:70
 msgid "Create a new assigned task"
 msgstr "Направите нови додељени задатак"
 
-#: ../modules/calendar/e-task-shell-backend.c:79
+#: ../modules/calendar/e-task-shell-backend.c:78
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Списак за_датака"
 
-#: ../modules/calendar/e-task-shell-backend.c:81
-#: ../modules/calendar/e-task-shell-view-actions.c:691
+#: ../modules/calendar/e-task-shell-backend.c:80
+#: ../modules/calendar/e-task-shell-view-actions.c:728
 msgid "Create a new task list"
 msgstr "Направите нови списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:203
-#: ../modules/calendar/e-task-shell-view-actions.c:218
+#: ../modules/calendar/e-task-shell-view-actions.c:220
+#: ../modules/calendar/e-task-shell-view-actions.c:235
 msgid "Print Tasks"
 msgstr "Штампај задатке"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:259
+#: ../modules/calendar/e-task-shell-view-actions.c:276
 msgid "Task List Properties"
 msgstr "Особине списка задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:529
+#: ../modules/calendar/e-task-shell-view-actions.c:559
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -21025,107 +21288,116 @@ msgstr ""
 "\n"
 "Да обришем ове задатке?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:536
+#: ../modules/calendar/e-task-shell-view-actions.c:566
 msgid "Do not ask me again"
 msgstr "Не питај ме поново"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:654
+#: ../modules/calendar/e-task-shell-view-actions.c:684
 msgid "_Delete Task"
 msgstr "_Обриши задатак"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:661
+#: ../modules/calendar/e-task-shell-view-actions.c:691
 msgid "_Find in Task..."
 msgstr "_Пронађи у задатку..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:663
+#: ../modules/calendar/e-task-shell-view-actions.c:693
 msgid "Search for text in the displayed task"
 msgstr "Претражи текст у приказаном задатку"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:682
+#: ../modules/calendar/e-task-shell-view-actions.c:712
 msgid "D_elete Task List"
 msgstr "О_бриши списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:684
+#: ../modules/calendar/e-task-shell-view-actions.c:714
 msgid "Delete the selected task list"
 msgstr "Обришите изабрани списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:689
+#: ../modules/calendar/e-task-shell-view-actions.c:719
+msgid "_Manage Task List groups..."
+msgstr "_Управљај групама спискова задатака..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:726
 msgid "_New Task List"
 msgstr "Но_ви списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:705
+#: ../modules/calendar/e-task-shell-view-actions.c:742
 msgid "Refresh the selected task list"
 msgstr "Освежите изабрани списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:712
+#: ../modules/calendar/e-task-shell-view-actions.c:749
 msgid "Rename the selected task list"
 msgstr "Преименујте изабрани списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:754
+#| msgid "Show _Only This Task List"
+msgid "Sho_w All Task Lists"
+msgstr "Прикажи _све спискове задатака"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "Show _Only This Task List"
 msgstr "Прикажи _само овај списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:731
+#: ../modules/calendar/e-task-shell-view-actions.c:775
 msgid "Mar_k as Incomplete"
 msgstr "О_значи као незавршено"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:805
 msgid "Delete completed tasks"
 msgstr "Обришите завршене задатке"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:836
+#: ../modules/calendar/e-task-shell-view-actions.c:888
 msgid "Task _Preview"
 msgstr "Преглед за_датака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:838
+#: ../modules/calendar/e-task-shell-view-actions.c:890
 msgid "Show task preview pane"
 msgstr "Прикажите преглед задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:859
+#: ../modules/calendar/e-task-shell-view-actions.c:911
 msgid "Show task preview below the task list"
 msgstr "Прикажите преглед испод списка задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:866
+#: ../modules/calendar/e-task-shell-view-actions.c:918
 msgid "Show task preview alongside the task list"
 msgstr "Прикажите преглед поред списка задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:874
+#: ../modules/calendar/e-task-shell-view-actions.c:926
 msgid "Active Tasks"
 msgstr "Активни задаци"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:888
+#: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Completed Tasks"
 msgstr "Завршени задаци"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:895
+#: ../modules/calendar/e-task-shell-view-actions.c:947
 msgid "Next 7 Days' Tasks"
 msgstr "Задаци за следећу недељу"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:902
+#: ../modules/calendar/e-task-shell-view-actions.c:954
 msgid "Overdue Tasks"
 msgstr "Прекорачени задаци"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:909
+#: ../modules/calendar/e-task-shell-view-actions.c:961
 msgid "Tasks with Attachments"
 msgstr "Задаци са прилозима"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:959
+#: ../modules/calendar/e-task-shell-view-actions.c:1011
 msgid "Print the list of tasks"
 msgstr "Штампајте списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:966
+#: ../modules/calendar/e-task-shell-view-actions.c:1018
 msgid "Preview the list of tasks to be printed"
 msgstr "Прегледајте списак задатака пред штампу"
 
-#: ../modules/calendar/e-task-shell-view.c:316
+#: ../modules/calendar/e-task-shell-view.c:323
 msgid "Delete Tasks"
 msgstr "Обриши задатке"
 
-#: ../modules/calendar/e-task-shell-view.c:318
+#: ../modules/calendar/e-task-shell-view.c:325
 msgid "Delete Task"
 msgstr "Обриши задатак"
 
-#: ../modules/calendar/e-task-shell-view-private.c:535
+#: ../modules/calendar/e-task-shell-view-private.c:546
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -21838,114 +22110,140 @@ 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:259
+#: ../modules/mail-config/e-mail-config-google-summary.c:261
 msgid "Google Features"
 msgstr "Гугл могућности"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:268
+#: ../modules/mail-config/e-mail-config-google-summary.c:270
 msgid "Add Google Ca_lendar to this account"
 msgstr "Додај ка_лендар Гугла овом налогу"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:277
+#: ../modules/mail-config/e-mail-config-google-summary.c:279
 msgid "Add Google Con_tacts to this account"
 msgstr "Додај ко_нтакте Гугла овом налогу"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:286
+#: ../modules/mail-config/e-mail-config-google-summary.c:288
 msgid "You may need to enable IMAP access"
 msgstr "Можда ћете морати да омогућите ИМАП приступ"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:245
-#: ../modules/mail-config/e-mail-config-local-accounts.c:291
+#: ../modules/mail-config/e-mail-config-local-accounts.c:267
+#: ../modules/mail-config/e-mail-config-local-accounts.c:315
 msgid "Mail _Directory:"
 msgstr "Директоријум _поште:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:246
+#: ../modules/mail-config/e-mail-config-local-accounts.c:268
 msgid "Choose a MH mail directory"
 msgstr "Изаберите МХ директоријум поште"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:268
+#: ../modules/mail-config/e-mail-config-local-accounts.c:270
+#| msgid "One or more values cannot be empty."
+msgid "MH mail directory cannot be empty"
+msgstr "МХ директоријум поште не може бити празан"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:291
 msgid "Local Delivery _File:"
 msgstr "Месна датотека _доставе:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:269
+#: ../modules/mail-config/e-mail-config-local-accounts.c:292
 msgid "Choose a local delivery file"
 msgstr "Изаберите месну датотеку доставе"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:292
+#: ../modules/mail-config/e-mail-config-local-accounts.c:294
+#| msgid "One or more values cannot be empty."
+msgid "Local delivery file cannot be empty"
+msgstr "Месна датотека испоруке не може бити празна"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:316
 msgid "Choose a Maildir mail directory"
 msgstr "Изаберите Мејлдир директоријум поште"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:314
+#: ../modules/mail-config/e-mail-config-local-accounts.c:318
+#| msgid "Choose a Maildir mail directory"
+msgid "Maildir mail directory cannot be empty"
+msgstr "Мејлдир директоријум поште не може бити празан"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:339
 msgid "Spool _File:"
 msgstr "Датотека _припреме:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:315
+#: ../modules/mail-config/e-mail-config-local-accounts.c:340
 msgid "Choose a mbox spool file"
 msgstr "Изаберите датотеку мбокс припреме"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:337
+#: ../modules/mail-config/e-mail-config-local-accounts.c:342
+#| msgid "One or more values cannot be empty."
+msgid "Mbox spool file cannot be empty"
+msgstr "Датотека припреме Мсандучета не може бити празна"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:363
 msgid "Spool _Directory:"
 msgstr "Директоријум _припреме:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:338
+#: ../modules/mail-config/e-mail-config-local-accounts.c:364
 msgid "Choose a mbox spool directory"
 msgstr "Изаберите директоријум мбокс припреме"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:136
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:92
+#: ../modules/mail-config/e-mail-config-local-accounts.c:366
+msgid "Mbox spool directory cannot be empty"
+msgstr "Директоријум припреме Мсандучета не може бити празан"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:137
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:61
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:93
 #: ../modules/plugin-manager/evolution-plugin-manager.c:158
 msgid "Configuration"
 msgstr "Подешавање"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:154
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:155
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:111
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "_Сервер:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:168
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:169
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:124
 msgid "_Port:"
 msgstr "_Порт:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:180
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:242
+#. do not reference
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:190
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:252
 msgid "User_name:"
 msgstr "Корисничко_име:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:213
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:163
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:223
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:173
 msgid "Encryption _method:"
 msgstr "Начин _шифровања:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:228
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:178
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:238
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:188
 msgid "STARTTLS after connecting"
 msgstr "СТАРТТЛС након повезивања"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:232
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:182
-msgid "SSL on a dedicated port"
-msgstr "ССЛ на одеђеном порту"
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:242
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:192
+#| msgid "SSL on a dedicated port"
+msgid "TLS on a dedicated port"
+msgstr "ТЛС на додељеном прикључнику"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:70
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:77
 msgid "_Use custom binary, instead of 'sendmail'"
 msgstr "_Користи произвољни извршни, уместо „sendmail“"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:74
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:81
 msgid "_Custom binary:"
 msgstr "_Произвољни извршни:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:91
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:100
 msgid "U_se custom arguments"
 msgstr "Користи _произвољне аргументе"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:95
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:104
 msgid "Cus_tom arguments:"
 msgstr "Произвољни _аргументи:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:113
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:122
 msgid ""
 "Default arguments are '-i -f %F -- %R', where\n"
 "   %F - stands for the From address\n"
@@ -21955,15 +22253,21 @@ msgstr ""
 "   %F — означава адресу пошиљаоца\n"
 "   %R — означава адресе прималаца"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:128
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:137
 msgid "Send mail also when in offline _mode"
 msgstr "Пошаљи пошту такође у режиму _ван мреже"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:135
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:210
+#| msgid "One or more values cannot be empty."
+msgid "Custom binary cannot be empty"
+msgstr "Произвољни извршни не може бити празан"
+
+#. do not reference
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:145
 msgid "Ser_ver requires authentication"
 msgstr "Сер_вер тражи потврђивање идентитета"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:224
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:234
 msgid "T_ype:"
 msgstr "_Врста:"
 
@@ -22044,12 +22348,10 @@ msgid "Marking messages as read..."
 msgstr "Означавам поруке прочитаним..."
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1038
-#| msgid "Copy to Folder"
 msgid "Go to Folder"
 msgstr "Иди у фасциклу"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1042
-#| msgid "Select"
 msgid "_Select"
 msgstr "_Изабери"
 
@@ -22170,12 +22472,10 @@ msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Трајно уклоните све обрисане поруке са свих налога"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1765
-#| msgid "Copy to Folder"
 msgid "Go to _Folder"
 msgstr "Иди у _фасциклу"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:1767
-#| msgid "Click here to select folders to post to"
 msgid "Opens a dialog to select a folder to go to"
 msgstr "Отвара прозорче из кога можете изабрати да одете у одређену фасциклу"
 
@@ -22299,90 +22599,110 @@ msgid "Show deleted messages with a line through them"
 msgstr "Прикажите обрисане поруке (као прецртане)"
 
 #: ../modules/mail/e-mail-shell-view-actions.c:2004
+#| msgid "Show _Deleted Messages"
+msgid "Show _Junk Messages"
+msgstr "Прикажи _непожељне поруке"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2006
+#| msgid "Show deleted messages with a line through them"
+msgid "Show junk messages with a red line through them"
+msgstr "Прикажите непожељне поруке прецртане црвеном линијом"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2012
 msgid "_Group By Threads"
 msgstr "Групиши по _расправама"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2006
+#: ../modules/mail/e-mail-shell-view-actions.c:2014
 msgid "Threaded message list"
 msgstr "Списак порука по темама"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2012
+#: ../modules/mail/e-mail-shell-view-actions.c:2020
 msgid "_Unmatched Folder Enabled"
 msgstr "Укључена _непоклопљена фасцикла"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2014
+#: ../modules/mail/e-mail-shell-view-actions.c:2022
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Окида приликом укључивања непоклопљене фасцикле претраге"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2034
+#: ../modules/mail/e-mail-shell-view-actions.c:2042
 msgid "Show message preview below the message list"
 msgstr "Прикажите преглед поруке испод листе порука"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2041
+#: ../modules/mail/e-mail-shell-view-actions.c:2049
 msgid "Show message preview alongside the message list"
 msgstr "Прикажите преглед поруке поред списка порука"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2049
+#: ../modules/mail/e-mail-shell-view-actions.c:2057
 msgid "All Messages"
 msgstr "Све поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2056
+#: ../modules/mail/e-mail-shell-view-actions.c:2064
 msgid "Important Messages"
 msgstr "Важне поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2063
+#: ../modules/mail/e-mail-shell-view-actions.c:2071
 msgid "Last 5 Days' Messages"
 msgstr "Поруке у задњих 5 дана"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2070
+#: ../modules/mail/e-mail-shell-view-actions.c:2078
 msgid "Messages Not Junk"
 msgstr "Поруке нису ђубре"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2077
+#: ../modules/mail/e-mail-shell-view-actions.c:2085
 msgid "Messages with Attachments"
 msgstr "Поруке са прилозима"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2084
+#: ../modules/mail/e-mail-shell-view-actions.c:2092
+#| msgid "Messages with Attachments"
+msgid "Messages with Notes"
+msgstr "Поруке са белешкама"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2099
 msgid "No Label"
 msgstr "Без ознаке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2091
+#: ../modules/mail/e-mail-shell-view-actions.c:2106
 msgid "Read Messages"
 msgstr "Прочитане поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2098
+#: ../modules/mail/e-mail-shell-view-actions.c:2113
 msgid "Unread Messages"
 msgstr "Непрочитане поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2157
+#: ../modules/mail/e-mail-shell-view-actions.c:2120
+#| msgid "Message Header"
+msgid "Message Thread"
+msgstr "Тема поруке"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2180
 msgid "Subject or Addresses contain"
 msgstr "Наслов или адресе садрже"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:2167
+#: ../modules/mail/e-mail-shell-view-actions.c:2190
 msgid "All Accounts"
 msgstr "свим налозима"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:2174
+#: ../modules/mail/e-mail-shell-view-actions.c:2197
 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:2181
+#: ../modules/mail/e-mail-shell-view-actions.c:2204
 msgid "Current Folder"
 msgstr "текућој фасцикли"
 
-#: ../modules/mail/e-mail-shell-view.c:700
+#: ../modules/mail/e-mail-shell-view.c:779
 msgid "All Account Search"
 msgstr "Претрага свих налога"
 
-#: ../modules/mail/e-mail-shell-view.c:808
+#: ../modules/mail/e-mail-shell-view.c:887
 msgid "Account Search"
 msgstr "Претрага налога"
 
-#: ../modules/mail/e-mail-shell-view-private.c:954
+#: ../modules/mail/e-mail-shell-view-private.c:957
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -22391,8 +22711,8 @@ msgstr[1] "%d изабране, "
 msgstr[2] "%d изабраних, "
 msgstr[3] "%d изабрана, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:963
-#: ../modules/mail/e-mail-shell-view-private.c:980
+#: ../modules/mail/e-mail-shell-view-private.c:966
+#: ../modules/mail/e-mail-shell-view-private.c:983
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -22401,8 +22721,8 @@ msgstr[1] "%d обрисане"
 msgstr[2] "%d обрисаних"
 msgstr[3] "%d обрисана"
 
-#: ../modules/mail/e-mail-shell-view-private.c:989
-#: ../modules/mail/e-mail-shell-view-private.c:995
+#: ../modules/mail/e-mail-shell-view-private.c:992
+#: ../modules/mail/e-mail-shell-view-private.c:998
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -22411,7 +22731,7 @@ msgstr[1] "%d непожељне"
 msgstr[2] "%d непожељних"
 msgstr[3] "%d непожељна"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1002
+#: ../modules/mail/e-mail-shell-view-private.c:1005
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -22420,7 +22740,7 @@ msgstr[1] "%d нацрта"
 msgstr[2] "%d нацрта"
 msgstr[3] "%d нацрт"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1008
+#: ../modules/mail/e-mail-shell-view-private.c:1011
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -22429,7 +22749,7 @@ msgstr[1] "%d непослате"
 msgstr[2] "%d непослатих"
 msgstr[3] "%d непослата"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:1017
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -22438,10 +22758,8 @@ msgstr[1] "%d послате"
 msgstr[2] "%d послатих"
 msgstr[3] "%d послата"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1031
+#: ../modules/mail/e-mail-shell-view-private.c:1034
 #, c-format
-#| msgid "%d unread, "
-#| msgid_plural "%d unread, "
 msgid "%d unread"
 msgid_plural "%d unread"
 msgstr[0] "%d непрочитана"
@@ -22449,7 +22767,7 @@ msgstr[1] "%d непрочитане"
 msgstr[2] "%d непрочитаних"
 msgstr[3] "%d непрочитана"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1549
+#: ../modules/mail/e-mail-shell-view-private.c:1552
 msgid "Send / Receive"
 msgstr "Пошаљи / Прими"
 
@@ -22466,21 +22784,18 @@ msgid "Recipient"
 msgstr "Прималац"
 
 #: ../modules/mail/em-composer-prefs.c:1205
-#| msgid "_Save to Outbox"
 msgid "Keep in Outbox"
 msgstr "Задржи у „За слање“"
 
 #: ../modules/mail/em-composer-prefs.c:1206
-#| msgid "Send private reply?"
 msgid "Send immediately"
 msgstr "Одмах пошаљи"
 
 #: ../modules/mail/em-composer-prefs.c:1207
-#| msgid "15 minutes"
 msgid "Send after 5 minutes"
 msgstr "Пошаљи након 5 минута"
 
-#: ../modules/mail/em-composer-prefs.c:1280
+#: ../modules/mail/em-composer-prefs.c:1286
 msgid "Language(s)"
 msgstr "Језик(ци)"
 
@@ -22492,19 +22807,16 @@ msgstr "При изласку, сваки пут"
 
 # bug: requires a comment on usage
 #: ../modules/mail/em-mailer-prefs.c:80
-#| msgid "On exit, once per day"
 msgid "Once per day"
 msgstr "Једном током дана"
 
 # bug: requires a comment on usage
 #: ../modules/mail/em-mailer-prefs.c:81
-#| msgid "On exit, once per week"
 msgid "Once per week"
 msgstr "Једном током недеље"
 
 # bug: requires a comment on usage
 #: ../modules/mail/em-mailer-prefs.c:82
-#| msgid "On exit, once per month"
 msgid "Once per month"
 msgstr "Једном током месеца"
 
@@ -22521,11 +22833,11 @@ msgid "Contains Value"
 msgstr "Садржи вредност"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1554
+#: ../modules/mail/em-mailer-prefs.c:1560
 msgid "_Date header:"
 msgstr "Заглавље _датума:"
 
-#: ../modules/mail/em-mailer-prefs.c:1555
+#: ../modules/mail/em-mailer-prefs.c:1561
 msgid "Show _original header value"
 msgstr "Прикажи _оригиналну вредност заглавља"
 
@@ -22629,23 +22941,23 @@ msgstr "Прикажи ХТМЛ издање"
 msgid "Display HTML version of multipart/alternative message"
 msgstr "Приказује издање ХТМЛ-а поруке из више делова или неке друге"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
-#: ../modules/prefer-plain/plugin/config-ui.c:43
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
+#: ../modules/prefer-plain/plugin/config-ui.c:37
 msgid "Show HTML if present"
 msgstr "Прикажи ХТМЛ ако постоји"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
-#: ../modules/prefer-plain/plugin/config-ui.c:44
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:80
+#: ../modules/prefer-plain/plugin/config-ui.c:38
 msgid "Let Evolution choose the best part to show."
 msgstr "Пушта да Еволуција изабере најбољи део за приказ."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
-#: ../modules/prefer-plain/plugin/config-ui.c:47
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
+#: ../modules/prefer-plain/plugin/config-ui.c:41
 msgid "Show plain text if present"
 msgstr "Прикажи обичан текст ако постоји"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
-#: ../modules/prefer-plain/plugin/config-ui.c:48
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:84
+#: ../modules/prefer-plain/plugin/config-ui.c:42
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -22653,13 +22965,28 @@ msgstr ""
 "Приказује део са обичним текстом, ако постоји, иначе пушта да Еволуција "
 "изабере најбољи део за приказ."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
-#: ../modules/prefer-plain/plugin/config-ui.c:52
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
+#: ../modules/prefer-plain/plugin/config-ui.c:46
+#| msgid "Show plain text if present"
+msgid "Show plain text if present, or HTML source"
+msgstr "Прикажи обичан текст ако постоји, или ХТМЛ извор"
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:89
+#: ../modules/prefer-plain/plugin/config-ui.c:47
+#| msgid ""
+#| "Show plain text part, if present, otherwise let Evolution choose the best "
+#| "part to show."
+msgid "Show plain text part, if present, otherwise the HTML part source."
+msgstr ""
+"Приказује део са обичним текстом, ако постоји, у супротном извор ХТМЛ дела."
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:93
+#: ../modules/prefer-plain/plugin/config-ui.c:51
 msgid "Only ever show plain text"
 msgstr "Искључиво приказуј обичан текст"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
-#: ../modules/prefer-plain/plugin/config-ui.c:53
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:94
+#: ../modules/prefer-plain/plugin/config-ui.c:52
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -22667,11 +22994,11 @@ msgstr ""
 "Увек приказује део са обичним текстом, прилажући остале делове у поруку, по "
 "избору."
 
-#: ../modules/prefer-plain/plugin/config-ui.c:104
+#: ../modules/prefer-plain/plugin/config-ui.c:103
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Прикажи по_тиснуте ХТМЛ делове као прилоге"
 
-#: ../modules/prefer-plain/plugin/config-ui.c:126
+#: ../modules/prefer-plain/plugin/config-ui.c:125
 msgid "HTML _Mode"
 msgstr "ХТМЛ _режим"
 
@@ -22729,7 +23056,6 @@ msgid "SpamAssassin"
 msgstr "Убица спама"
 
 #: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
-#| msgid "Junk filtering software:"
 msgid "Junk filter using SpamAssassin"
 msgstr "Филтер непожељне поруке помоћу SpamAssassin"
 
@@ -23033,7 +23359,7 @@ msgstr "Надзорник веба Еволуције"
 msgid "_Do not show this message again."
 msgstr "_Не приказуј поново ову поруку."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:465
+#: ../plugins/attachment-reminder/attachment-reminder.c:484
 #: ../plugins/templates/templates.c:478
 msgid "Keywords"
 msgstr "Кључне речи"
@@ -23231,8 +23557,8 @@ msgstr ""
 msgid "_Automatically launch when a new mail is edited"
 msgstr "_Сам покрени када је нова порука измењена"
 
-#: ../plugins/external-editor/external-editor.c:484
-#: ../plugins/external-editor/external-editor.c:486
+#: ../plugins/external-editor/external-editor.c:530
+#: ../plugins/external-editor/external-editor.c:532
 msgid "Compose in External Editor"
 msgstr "Саставља у спољном уређивачу"
 
@@ -23346,60 +23672,68 @@ msgid "Not an image"
 msgstr "Није слика"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:8
-#| msgid ""
-#| "The file you selected does not look like a valid .png image. Error: {0}"
 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:364
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
 msgid "Get List _Archive"
 msgstr "Прибави _архиву листе"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
 msgid "Get an archive of the list this message belongs to"
 msgstr "Прибавља архиву листе којој ова порука припада"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:371
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
+#| msgid "_Message Source"
+msgid "Copy _Message Archive URL"
+msgstr "Умножи адресу архиве _поруке"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
+#| msgid "Redirect (bounce) the selected message to someone"
+msgid "Copy direct URL for the selected message in its archive"
+msgstr "Умножите непосредну адресу за изабрану поруку у њеној архиви"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
 msgid "Get List _Usage Information"
 msgstr "Прибави податке о _коришћењу листе"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:396
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Прибавља податке о коришћењу листе којој ова порука припада"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:378
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:401
 msgid "Contact List _Owner"
 msgstr "_Власник контакт листе"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:403
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Јавите се власнику дописне листе којој ова порука припада"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:385
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:408
 msgid "_Post Message to List"
 msgstr "_Пошаљи поруку на листу"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:410
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Саставите поруку за дописну листу којој ова порука припада"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:392
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:415
 msgid "_Subscribe to List"
 msgstr "При_јави се на листу"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:417
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Пријавите се на дописну листу којој ова порука припада"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:399
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:422
 msgid "_Unsubscribe from List"
 msgstr "О_дјави се са листе"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:401
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:424
 msgid "Unsubscribe from 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:431
 msgid "Mailing _List"
 msgstr "Дописна _листа"
 
@@ -23524,31 +23858,31 @@ msgstr "Нова пошта у Еволуцији"
 msgid "Show %s"
 msgstr "Прикажи %s"
 
-#: ../plugins/mail-notification/mail-notification.c:685
+#: ../plugins/mail-notification/mail-notification.c:687
 msgid "_Play sound when a new message arrives"
 msgstr "Звучно _обавести када стигне нова порука"
 
-#: ../plugins/mail-notification/mail-notification.c:717
+#: ../plugins/mail-notification/mail-notification.c:719
 msgid "_Beep"
 msgstr "_Запишти"
 
-#: ../plugins/mail-notification/mail-notification.c:730
+#: ../plugins/mail-notification/mail-notification.c:732
 msgid "Use sound _theme"
 msgstr "Користи звук _теме"
 
-#: ../plugins/mail-notification/mail-notification.c:749
+#: ../plugins/mail-notification/mail-notification.c:751
 msgid "Play _file:"
 msgstr "Пусти звучну _датотеку:"
 
-#: ../plugins/mail-notification/mail-notification.c:758
+#: ../plugins/mail-notification/mail-notification.c:760
 msgid "Select sound file"
 msgstr "Изаберите звучну датотеку"
 
-#: ../plugins/mail-notification/mail-notification.c:835
+#: ../plugins/mail-notification/mail-notification.c:837
 msgid "Notify new messages for _Inbox only"
 msgstr "Обавести о новим порукама само за _Сандуче"
 
-#: ../plugins/mail-notification/mail-notification.c:851
+#: ../plugins/mail-notification/mail-notification.c:853
 msgid "Show _notification when a new message arrives"
 msgstr "Прикажи _обавештење када пристигне нова порука"
 
@@ -23561,33 +23895,30 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Обавештава вас када стигне нова порука."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:229
+#: ../plugins/mail-to-task/mail-to-task.c:196
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Сачињено из поруке коју шаље %s"
 
 #. Translators: Dialog button to Cancel edit of an existing event/memo/task
-#: ../plugins/mail-to-task/mail-to-task.c:594
-#| msgid "_Cancel"
+#: ../plugins/mail-to-task/mail-to-task.c:561
 msgctxt "mail-to-task"
 msgid "_Cancel"
 msgstr "_Откажи"
 
 #. Translators: Dialog button to Edit an existing event/memo/task
-#: ../plugins/mail-to-task/mail-to-task.c:596
-#| msgid "_Edit"
+#: ../plugins/mail-to-task/mail-to-task.c:563
 msgctxt "mail-to-task"
 msgid "_Edit"
 msgstr "_Уређивање"
 
 #. Translators: Dialog button to create a New event/memo/task
-#: ../plugins/mail-to-task/mail-to-task.c:598
-#| msgid "_New"
+#: ../plugins/mail-to-task/mail-to-task.c:565
 msgctxt "mail-to-task"
 msgid "_New"
 msgstr "_Нови"
 
-#: ../plugins/mail-to-task/mail-to-task.c:616
+#: ../plugins/mail-to-task/mail-to-task.c:583
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -23596,7 +23927,7 @@ msgstr ""
 "Изабрани календар већ садржи догађај „%s“. Желите ли да уредите стари "
 "догађај?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:619
+#: ../plugins/mail-to-task/mail-to-task.c:586
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -23604,7 +23935,7 @@ msgid ""
 msgstr ""
 "Изабрани списак већ садржи задатак „%s“. Желите ли да уредите стари задатак?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:622
+#: ../plugins/mail-to-task/mail-to-task.c:589
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -23612,7 +23943,7 @@ msgid ""
 msgstr ""
 "Изабрани списак већ садржи белешку „%s“. Желите ли да уредите стару белешку?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:642
+#: ../plugins/mail-to-task/mail-to-task.c:609
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -23633,7 +23964,7 @@ msgstr[3] ""
 "Изабрали сте %d пошта да преведете у догађаје. Да ли заиста желите све да их "
 "додате?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:649
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -23654,7 +23985,7 @@ msgstr[3] ""
 "Изабрали сте %d пошта да преведете у задатке. Да ли заиста желите све да их "
 "додате?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:656
+#: ../plugins/mail-to-task/mail-to-task.c:623
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -23675,29 +24006,29 @@ msgstr[3] ""
 "Изабрали сте %d пошта да преведете у белешке. Да ли заиста желите све да их "
 "додате?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:677
+#: ../plugins/mail-to-task/mail-to-task.c:644
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Да ли желите да наставите са превођењем преосталих пошта?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:753
+#: ../plugins/mail-to-task/mail-to-task.c:720
 msgid "[No Summary]"
 msgstr "[Без сажетка]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:766
+#: ../plugins/mail-to-task/mail-to-task.c:733
 msgid "Invalid object returned from a server"
 msgstr "Неисправан објекат враћен са сервера"
 
-#: ../plugins/mail-to-task/mail-to-task.c:821
+#: ../plugins/mail-to-task/mail-to-task.c:787
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Дошло је до грешке у обради: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:857
+#: ../plugins/mail-to-task/mail-to-task.c:823
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Не могу да отворим календар. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:861
+#: ../plugins/mail-to-task/mail-to-task.c:827
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -23705,7 +24036,7 @@ msgstr ""
 "Изабрани календар је само за читање, стога не можете направити догађај. "
 "Изаберите други календар."
 
-#: ../plugins/mail-to-task/mail-to-task.c:864
+#: ../plugins/mail-to-task/mail-to-task.c:830
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
@@ -23713,7 +24044,7 @@ msgstr ""
 "Изабрани списак задатака је само за читање, стога не можете направити "
 "задатак. Изаберите други списак задатака."
 
-#: ../plugins/mail-to-task/mail-to-task.c:867
+#: ../plugins/mail-to-task/mail-to-task.c:833
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
@@ -23721,35 +24052,35 @@ msgstr ""
 "Изабрани списак белешки је само за читање, стога не можете направити "
 "белешку. Изаберите други списак белешки."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1269
+#: ../plugins/mail-to-task/mail-to-task.c:1235
 msgid "Create an _Appointment"
 msgstr "Направи _заказивање"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1271
+#: ../plugins/mail-to-task/mail-to-task.c:1237
 msgid "Create a new event from the selected message"
 msgstr "Прави нови догађај од изабране поруке"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1276
+#: ../plugins/mail-to-task/mail-to-task.c:1242
 msgid "Create a Mem_o"
 msgstr "Направи белешк_у"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1278
+#: ../plugins/mail-to-task/mail-to-task.c:1244
 msgid "Create a new memo from the selected message"
 msgstr "Прави нову белешку од изабране поруке"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1283
+#: ../plugins/mail-to-task/mail-to-task.c:1249
 msgid "Create a _Task"
 msgstr "Направи _задатак"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1285
+#: ../plugins/mail-to-task/mail-to-task.c:1251
 msgid "Create a new task from the selected message"
 msgstr "Прави нови задатак од изабране поруке"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1293
+#: ../plugins/mail-to-task/mail-to-task.c:1259
 msgid "Create a _Meeting"
 msgstr "Направи _састанак"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1295
+#: ../plugins/mail-to-task/mail-to-task.c:1261
 msgid "Create a new meeting from the selected message"
 msgstr "Прави нови састанак од изабране поруке"
 
@@ -23757,18 +24088,20 @@ msgstr "Прави нови састанак од изабране поруке"
 msgid "Convert a mail message to a task."
 msgstr "Претвара поруку у задатак."
 
+#: ../plugins/pst-import/evolution-pst.metainfo.xml.in.h:1
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Outlook PST import"
 msgstr "Аутлук ПСТ увоз"
 
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
-msgid "Outlook personal folders (.pst)"
-msgstr "Личне фасцикле Аутлука (.pst)"
-
+#: ../plugins/pst-import/evolution-pst.metainfo.xml.in.h:2
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
 msgid "Import Outlook messages from PST file"
 msgstr "Увози Аутлук поруке из ПСТ датотеке"
 
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+msgid "Outlook personal folders (.pst)"
+msgstr "Личне фасцикле Аутлука (.pst)"
+
 #: ../plugins/pst-import/pst-importer.c:526
 msgid "_Mail"
 msgstr "_Пошта"
@@ -23957,10 +24290,6 @@ msgstr "Измените место"
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:374
-msgid "UID"
-msgstr "ЈИБ"
-
 #: ../plugins/save-calendar/csv-format.c:376
 msgid "Description List"
 msgstr "Списак описа"
@@ -24100,40 +24429,39 @@ msgstr "Сачувај као _шаблон"
 msgid "Save as Template"
 msgstr "Чува као шаблон"
 
-#: ../shell/e-shell.c:337
+#: ../shell/e-shell.c:380
 msgid "Preparing to go offline..."
 msgstr "Припремам се за рад ван мреже..."
 
-#: ../shell/e-shell.c:390
+#: ../shell/e-shell.c:409
 msgid "Preparing to go online..."
 msgstr "Припремам се за рад на мрежи..."
 
-#: ../shell/e-shell.c:501
+#: ../shell/e-shell.c:520
 msgid "Preparing to quit"
 msgstr "Припремам се да изађем"
 
-#: ../shell/e-shell.c:507
+#: ../shell/e-shell.c:526
 msgid "Preparing to quit..."
 msgstr "Припремам се да изађем..."
 
-#: ../shell/e-shell.c:1024
+#: ../shell/e-shell.c:1043
 msgid "Credentials are required to connect to the destination host."
 msgstr "Потребна су овлашћења за приступање циљном, удаљеном рачунару."
 
-#: ../shell/e-shell.c:1203 ../shell/e-shell-window-actions.c:827
+#: ../shell/e-shell.c:1211 ../shell/e-shell-window-actions.c:827
 msgid "New _Window"
 msgstr "Нови _прозор"
 
-#: ../shell/e-shell.c:1214
-#| msgid "_Quick Reference"
+#: ../shell/e-shell.c:1222
 msgid "Quick _Reference"
 msgstr "Кратак _подсетник"
 
-#: ../shell/e-shell.c:1216 ../shell/e-shell-window-actions.c:764
+#: ../shell/e-shell.c:1224 ../shell/e-shell-window-actions.c:764
 msgid "_About"
 msgstr "_О програму"
 
-#: ../shell/e-shell.c:1217 ../shell/e-shell-window-actions.c:862
+#: ../shell/e-shell.c:1225 ../shell/e-shell-window-actions.c:862
 msgid "_Quit"
 msgstr "_Изађи"
 
@@ -24449,14 +24777,13 @@ msgstr "Изабери преглед: %s"
 msgid "Delete view: %s"
 msgstr "Обриши преглед: %s"
 
-#: ../shell/e-shell-window-actions.c:1741
+#: ../shell/e-shell-window-actions.c:1748
 msgid "Execute these search parameters"
 msgstr "Извршите ове параметре претраге"
 
 #. Translators: a 'New' toolbar button caption which is context sensitive and
 #. runs one of the actions under File->New menu
-#: ../shell/e-shell-window.c:555
-#| msgid "New"
+#: ../shell/e-shell-window.c:567
 msgctxt "toolbar-button"
 msgid "New"
 msgstr "Нова"
@@ -24468,7 +24795,7 @@ msgid "%s - Evolution"
 msgstr "%s — Еволуција"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:199
+#: ../shell/main.c:195
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -24503,7 +24830,7 @@ msgstr ""
 "Надамо се да ћете уживати у плодовима нашег напорног рада, и \n"
 "жељно ишчекујемо ваш допринос!\n"
 
-#: ../shell/main.c:223
+#: ../shell/main.c:219
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -24511,13 +24838,13 @@ msgstr ""
 "Хвала\n"
 "Тим Еволуције\n"
 
-#: ../shell/main.c:229
+#: ../shell/main.c:225
 msgid "Do not tell me again"
 msgstr "Немој ми поново рећи"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:318
+#: ../shell/main.c:314
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -24525,40 +24852,40 @@ msgstr ""
 "Покреће Еволуцију приказујући одређене компоненте. Доступне опције су: "
 "„mail“, „calendar“, „contacts“, „tasks“ и „memos“"
 
-#: ../shell/main.c:322
+#: ../shell/main.c:318
 msgid "Apply the given geometry to the main window"
 msgstr "Примени дату геометрију на главни прозор"
 
-#: ../shell/main.c:326
+#: ../shell/main.c:322
 msgid "Start in online mode"
 msgstr "Почни рад на мрежи"
 
-#: ../shell/main.c:328
+#: ../shell/main.c:324
 msgid "Ignore network availability"
 msgstr "Занемари доступност мреже"
 
-#: ../shell/main.c:331
+#: ../shell/main.c:327
 msgid "Forcibly shut down Evolution"
 msgstr "Силом угаси Еволуцију"
 
-#: ../shell/main.c:334
+#: ../shell/main.c:330
 msgid "Disable loading of any plugins."
 msgstr "Искључи учитавање свих додатака."
 
-#: ../shell/main.c:336
+#: ../shell/main.c:332
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Искључи окно за преглед поште, контакта и задатака."
 
-#: ../shell/main.c:340
+#: ../shell/main.c:336
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Увози адресе датотека датих као остатак аргумената."
 
 # shell:noshell-reason title
-#: ../shell/main.c:342
+#: ../shell/main.c:338
 msgid "Request a running Evolution process to quit"
 msgstr "Захтева крај покренутог процеса Еволуције"
 
-#: ../shell/main.c:419
+#: ../shell/main.c:415
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
@@ -24567,7 +24894,7 @@ msgstr ""
 "Не могу да покренем Еволуцију.  Други примерак Еволуције можда не одговара. "
 "Грешка система: %s"
 
-#: ../shell/main.c:473 ../shell/main.c:478
+#: ../shell/main.c:469 ../shell/main.c:474
 msgid "- The Evolution PIM and Email Client"
 msgstr "— Еволуција руководилац личним податацима и клијент ел. поште"
 
@@ -24629,7 +24956,6 @@ msgstr ""
 "Еволуцију 3."
 
 #: ../shell/shell.error.xml.h:11
-#| msgid "Unknown background operation"
 msgid "Close Evolution with pending background operations?"
 msgstr "Да ли да затворим Еволуцију и откажем тренутне радње?"
 
@@ -24648,57 +24974,46 @@ msgid "_Close Immediately"
 msgstr "Одмах _изађи"
 
 #: ../shell/shell.error.xml.h:14
-#| msgid "Waiting..."
 msgid "Keep _Waiting"
 msgstr "_Сачекај"
 
 #: ../shell/shell.error.xml.h:15
-#| msgid "Unable to open address book '{0}'"
 msgid "Failed to get values from '{0}'"
 msgstr "Не могу да добијем исправне вредности од „{0}“"
 
 #: ../shell/shell.error.xml.h:16
-#| msgid "Failed to move an event into the calendar '{0}'"
 msgid "Failed to invoke authenticate for '{0}'"
 msgstr "Не могу да се пријавим на „{0}“"
 
 #: ../shell/shell.error.xml.h:17
-#| msgid "Failed to open client '%s': %s"
 msgid "Failed to connect '{0}'"
 msgstr "Не могу да се повежем на „{0}“"
 
 #: ../shell/shell.error.xml.h:18
-#| msgid "_Recover"
 msgid "_Reconnect"
 msgstr "_Поново се повежи"
 
 #: ../shell/shell.error.xml.h:19
-#| msgid "Unable to open address book '{0}'"
 msgid "Failed to connect address book '{0}'"
 msgstr "Не могу да се повежем на адресар „{0}“"
 
 #: ../shell/shell.error.xml.h:20
-#| msgid "Failed to copy an event into the calendar '{0}'"
 msgid "Failed to connect calendar '{0}'"
 msgstr "Не могу да се повежем на календар „{0}“"
 
 #: ../shell/shell.error.xml.h:21
-#| msgid "Failed to disconnect account &quot;{0}&quot;."
 msgid "Failed to connect mail account '{0}'"
 msgstr "Не могу да се повежем на налог електронске поште „{0}“"
 
 #: ../shell/shell.error.xml.h:22
-#| msgid "Failed to copy a memo into the memo list '{0}'"
 msgid "Failed to connect memo list '{0}'"
 msgstr "Не могу да се повежем на списа белешки „{0}“"
 
 #: ../shell/shell.error.xml.h:23
-#| msgid "Failed to copy a task into the task list '{0}'"
 msgid "Failed to connect task list '{0}'"
 msgstr "Не могу да се повежем на списак задатака „{0}“"
 
 #: ../shell/shell.error.xml.h:24
-#| msgid "Failed to copy an event into the calendar '{0}'"
 msgid "Failed to prompt for credentials for '{0}'"
 msgstr "Не могу да затражим пуномоћје за „{0}“"
 
@@ -24745,72 +25060,60 @@ msgstr ""
 "\n"
 "Уредите поставке поверења:"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:84 ../smime/gui/certificate-manager.c:103
 #: ../smime/gui/certificate-manager.c:123
 msgid "Certificate Name"
 msgstr "Назив уверења"
 
-#: ../smime/gui/certificate-manager.c:85
-#: ../smime/gui/certificate-manager.c:105
+#: ../smime/gui/certificate-manager.c:85 ../smime/gui/certificate-manager.c:105
 msgid "Issued To Organization"
 msgstr "Издато је организацији"
 
-#: ../smime/gui/certificate-manager.c:86
-#: ../smime/gui/certificate-manager.c:106
+#: ../smime/gui/certificate-manager.c:86 ../smime/gui/certificate-manager.c:106
 msgid "Issued To Organizational Unit"
 msgstr "Издато је организационој јединици"
 
-#: ../smime/gui/certificate-manager.c:87
-#: ../smime/gui/certificate-manager.c:107
+#: ../smime/gui/certificate-manager.c:87 ../smime/gui/certificate-manager.c:107
 #: ../smime/gui/certificate-manager.c:125
 msgid "Serial Number"
 msgstr "Серијски број"
 
-#: ../smime/gui/certificate-manager.c:88
-#: ../smime/gui/certificate-manager.c:108
+#: ../smime/gui/certificate-manager.c:88 ../smime/gui/certificate-manager.c:108
 #: ../smime/gui/certificate-manager.c:126
 msgid "Purposes"
 msgstr "Намене"
 
-#: ../smime/gui/certificate-manager.c:89
-#: ../smime/gui/certificate-manager.c:109
+#: ../smime/gui/certificate-manager.c:89 ../smime/gui/certificate-manager.c:109
 #: ../smime/gui/certificate-manager.c:127
 msgid "Issued By"
 msgstr "Издавач"
 
-#: ../smime/gui/certificate-manager.c:90
-#: ../smime/gui/certificate-manager.c:110
+#: ../smime/gui/certificate-manager.c:90 ../smime/gui/certificate-manager.c:110
 #: ../smime/gui/certificate-manager.c:128
 msgid "Issued By Organization"
 msgstr "Издала је организација"
 
-#: ../smime/gui/certificate-manager.c:91
-#: ../smime/gui/certificate-manager.c:111
+#: ../smime/gui/certificate-manager.c:91 ../smime/gui/certificate-manager.c:111
 #: ../smime/gui/certificate-manager.c:129
 msgid "Issued By Organizational Unit"
 msgstr "Издала је организациона јединица"
 
-#: ../smime/gui/certificate-manager.c:92
-#: ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:92 ../smime/gui/certificate-manager.c:112
 #: ../smime/gui/certificate-manager.c:130
 msgid "Issued"
 msgstr "Издато"
 
-#: ../smime/gui/certificate-manager.c:93
-#: ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:93 ../smime/gui/certificate-manager.c:113
 #: ../smime/gui/certificate-manager.c:131
 msgid "Expires"
 msgstr "Истиче"
 
-#: ../smime/gui/certificate-manager.c:94
-#: ../smime/gui/certificate-manager.c:114
+#: ../smime/gui/certificate-manager.c:94 ../smime/gui/certificate-manager.c:114
 #: ../smime/gui/certificate-manager.c:132
 msgid "SHA1 Fingerprint"
 msgstr "СХА1 отисак"
 
-#: ../smime/gui/certificate-manager.c:95
-#: ../smime/gui/certificate-manager.c:115
+#: ../smime/gui/certificate-manager.c:95 ../smime/gui/certificate-manager.c:115
 #: ../smime/gui/certificate-manager.c:133
 msgid "MD5 Fingerprint"
 msgstr "МД5 Отисак"
@@ -24835,19 +25138,16 @@ msgid "%s-backup.p12"
 msgstr "%s-резервна-копија.p12"
 
 #: ../smime/gui/certificate-manager.c:730
-#| msgid "Certificate"
 msgid "Backup Certificate"
 msgstr "Резервна копија уверења"
 
 #. filename selection
 #: ../smime/gui/certificate-manager.c:744
-#| msgid "F_ilename:"
 msgid "_File name:"
 msgstr "_Назив датотеке:"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
 #: ../smime/gui/certificate-manager.c:749
-#| msgid "Select a file"
 msgid "Please select a file..."
 msgstr "Изаберите датотеку..."
 
@@ -24866,7 +25166,6 @@ msgstr ""
 "Морате да поставите лозинку како би наставили са прављењем резервне копије."
 
 #: ../smime/gui/certificate-manager.c:788
-#| msgid "_Password:"
 msgid "_Repeat Password:"
 msgstr "Поновите _лозинку:"
 
@@ -24888,12 +25187,10 @@ msgstr ""
 "Запишите је негде на сигурно место."
 
 #: ../smime/gui/certificate-manager.c:860
-#| msgid "No email address provided"
 msgid "No file name provided"
 msgstr "Није дат назив датотеке"
 
 #: ../smime/gui/certificate-manager.c:864
-#| msgid "Failed to import certificate"
 msgid "Failed to backup key and certificate"
 msgstr "Не могу да направим резервну копију кључа и уверења"
 
@@ -24911,7 +25208,6 @@ msgid "Ask when used"
 msgstr "Питај приликом употребе"
 
 #: ../smime/gui/certificate-manager.c:1121
-#| msgid "Never"
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "Никада"
@@ -24937,7 +25233,6 @@ msgid "Temporarily"
 msgstr "Привремено"
 
 #: ../smime/gui/certificate-manager.c:1335
-#| msgid "Certificate Authority Trust"
 msgid "Change certificate trust"
 msgstr "Измена поверења за уверење"
 
@@ -24952,7 +25247,6 @@ msgid "_Ask when used"
 msgstr "П_итај приликом коришћења"
 
 #: ../smime/gui/certificate-manager.c:1372
-#| msgid "Unset _trust for SSL certificate"
 msgctxt "CamelTrust"
 msgid "_Never trust this certificate"
 msgstr "_Никада не веруј овом уверењу"
@@ -24968,21 +25262,16 @@ msgid "_Marginally trusted"
 msgstr "_Делимично поверење"
 
 #: ../smime/gui/certificate-manager.c:1375
-#| msgid "R_eply requested"
 msgctxt "CamelTrust"
 msgid "_Fully trusted"
 msgstr "_Потпуно поверење"
 
 #: ../smime/gui/certificate-manager.c:1376
-#| msgid "R_eply requested"
 msgctxt "CamelTrust"
 msgid "_Ultimately trusted"
 msgstr "_Неограничено поверење"
 
 #: ../smime/gui/certificate-manager.c:1380
-#| msgid ""
-#| "Before trusting this CA for any purpose, you should examine its "
-#| "certificate and its policy and procedures (if available)."
 msgid ""
 "Before trusting this site, you should examine its certificate and its policy "
 "and procedures (if available)."
@@ -24991,17 +25280,14 @@ msgstr ""
 "(ако су доступни)."
 
 #: ../smime/gui/certificate-manager.c:1395
-#| msgid "_View Certificate"
 msgid "_Display certificate"
 msgstr "Прикажи _уверење"
 
 #: ../smime/gui/certificate-manager.c:1600
-#| msgid "You have certificates on file that identify these people:"
 msgid "You have certificates on file that identify these mail servers:"
 msgstr "Поседујете уверења у датотеци која одређују ове сервере е-поште:"
 
 #: ../smime/gui/certificate-manager.c:1631
-#| msgid "_List name:"
 msgid "Host name"
 msgstr "Име удаљеног рачунара"
 
@@ -25010,7 +25296,6 @@ msgid "Issuer"
 msgstr "Издавач"
 
 #: ../smime/gui/certificate-manager.c:1634
-#| msgid "Fingerprints"
 msgid "Fingerprint"
 msgstr "Отисак прста"
 
@@ -25019,19 +25304,18 @@ msgid "Trust"
 msgstr "Поверење"
 
 #: ../smime/gui/certificate-manager.c:1656
-#| msgid "_Edit CA Trust"
 msgid "_Edit Trust"
 msgstr "_Уреди поверење"
 
-#: ../smime/gui/certificate-manager.c:1975
+#: ../smime/gui/certificate-manager.c:1977
 msgid "All PKCS12 files"
 msgstr "Све ПКЦС12 датотеке"
 
-#: ../smime/gui/certificate-manager.c:1992
+#: ../smime/gui/certificate-manager.c:1994
 msgid "All email certificate files"
 msgstr "Све датотеке уверења поште"
 
-#: ../smime/gui/certificate-manager.c:2009
+#: ../smime/gui/certificate-manager.c:2011
 msgid "All CA certificate files"
 msgstr "Све датотеке ЦА уверења"
 
@@ -25139,7 +25423,6 @@ msgstr ""
 "политику и процедуре (ако су доступни)."
 
 #: ../smime/gui/smime-ui.ui.h:25
-#| msgid "Certificate"
 msgid "C_ertificate:"
 msgstr "У_верење:"
 
@@ -25186,7 +25469,6 @@ msgstr "Унесите лозинку за ПКЦС12 датотеку:"
 
 #: ../smime/lib/e-pkcs12.c:328
 #, c-format
-#| msgid "Unable to book a resource, error: %s"
 msgid "Unable to create export context, err_code: %i"
 msgstr "Не могу да направим садржај за извоз, код грешке: %i"
 
@@ -25197,19 +25479,16 @@ msgstr "Не могу да подесим интегритет лозинке, 
 
 #: ../smime/lib/e-pkcs12.c:345
 #, c-format
-#| msgid "Unable to book a resource, error: %s"
 msgid "Unable to create safe bag, err_code: %i"
 msgstr "Не могу да направим безбедну врећу, код грешке: %i"
 
 #: ../smime/lib/e-pkcs12.c:363
 #, c-format
-#| msgid "Unable to book a resource, error: %s"
 msgid "Unable to add key/cert to the store, err_code: %i"
 msgstr "Не могу да додам кључ/уверење у оставу, код грешке: %i"
 
 #: ../smime/lib/e-pkcs12.c:381
 #, c-format
-#| msgid "Unable to book a resource, error: %s"
 msgid "Unable to write store to disk, err_code: %i"
 msgstr "Не могу упишем и сачувам на диск, код грешке: %i"
 
@@ -25289,6 +25568,236 @@ msgstr "Са _роком"
 msgid "With _Status"
 msgstr "Са _стањем"
 
+#~ msgid "Edit Reminder"
+#~ msgstr "Уреди подсетник"
+
+#~ msgid "start of appointment"
+#~ msgstr "заказани почетак"
+
+#~ msgid "end of appointment"
+#~ msgstr "крај састанка"
+
+#~ msgid "Add Reminder"
+#~ msgstr "Додај подсетник"
+
+#~ msgid "Reminder"
+#~ msgstr "Подсетник"
+
+#~ msgid "Repeat"
+#~ msgstr "Понови"
+
+#~ msgid "Mes_sage:"
+#~ msgstr "По_рука:"
+
+#~ msgid "_Sound:"
+#~ msgstr "_Звук:"
+
+#~ msgid "Select A File"
+#~ msgstr "Изаберите датотеку"
+
+#~ msgid "Action/Trigger"
+#~ msgstr "Радња/покретач"
+
+#~ msgid "This event has been deleted."
+#~ msgstr "Овај догађај је обрисан."
+
+#~ msgid "This task has been deleted."
+#~ msgstr "Овај задатак је обрисан."
+
+#~ msgid "This memo has been deleted."
+#~ msgstr "Ова белешка је обрисана."
+
+#~ msgid ""
+#~ "%s  You have made changes. Forget those changes and close the editor?"
+#~ msgstr ""
+#~ "%s  Начинили сте измене. Да занемарим те измене и да затворим уређивач?"
+
+#~ msgid "%s  You have made no changes, close the editor?"
+#~ msgstr "%s  Нисте начинили измене, да затворим уређивач?"
+
+#~ msgid "This event has been changed."
+#~ msgstr "Овај догађај је измењен."
+
+#~ msgid "This task has been changed."
+#~ msgstr "Овај задатак је измењен."
+
+#~ msgid "This memo has been changed."
+#~ msgstr "Ова белешка је измењена."
+
+#~ msgid ""
+#~ "%s  You have made changes. Forget those changes and update the editor?"
+#~ msgstr ""
+#~ "%s  Начинили сте измене. Да занемарим те измене и да освежим уређивач?"
+
+#~ msgid "%s  You have made no changes, update the editor?"
+#~ msgstr "%s  Нисте начинили измене, да освежим уређивач?"
+
+#~ msgid "Could not update object"
+#~ msgstr "Не могу да освежим објекат"
+
+#~ msgid "Edit Appointment"
+#~ msgstr "Уреди заказивање"
+
+#~ msgid "Keep original item?"
+#~ msgstr "Задржати оригиналну ставку?"
+
+#~ msgid "Unable to synchronize with the server"
+#~ msgstr "Не могу да се усагласим са сервером"
+
+#~ msgid "Changes made to this item may be discarded if an update arrives"
+#~ msgstr ""
+#~ "Промене начињене на овој ставки могу бити занемарене ако буде ажурирано"
+
+#~ msgid "Unable to use current version!"
+#~ msgstr "Не могу да користим тренутно издање!"
+
+#~ msgid "Validation error: %s"
+#~ msgstr "Грешка провере: %s"
+
+#~ msgid "Enter Delegate"
+#~ msgstr "Унеси делегата"
+
+#~ msgid "Delegate To:"
+#~ msgstr "Делегирај на:"
+
+#~ msgid "Contacts..."
+#~ msgstr "Контакти..."
+
+#~ msgid "_Recurrence"
+#~ msgstr "_Понављање"
+
+#~ msgid "Make this a recurring event"
+#~ msgstr "Нека се овај догађај понавља"
+
+#~ msgid "Insert advanced send options"
+#~ msgstr "Уметните напредне опције слања"
+
+#~ msgid "_Free/Busy"
+#~ msgstr "С_лободно/заузето"
+
+#~ msgid "Print this event"
+#~ msgstr "Штампајте ову поруку"
+
+#~ msgid "This event has reminders"
+#~ msgstr "Овај догађај има подсетнике"
+
+#~ msgid "Event with no start date"
+#~ msgstr "Догађај без датума почетка"
+
+#~ msgid "Event with no end date"
+#~ msgstr "Догађај без датума завршетка"
+
+#~ msgid "End date is wrong"
+#~ msgstr "Датум завршетка је погрешан"
+
+#~ msgid "End time is wrong"
+#~ msgstr "Време завршетка је погрешно"
+
+#~ msgid "_Delegatees"
+#~ msgstr "Делегат_и"
+
+#~ msgid "Atte_ndees"
+#~ msgstr "Уч_есници"
+
+#~ msgctxt "eventpage"
+#~ msgid "15 minutes before appointment"
+#~ msgstr "15 минута пре заказаног састанка"
+
+#~ msgctxt "eventpage"
+#~ msgid "1 hour before appointment"
+#~ msgstr "1 сат пре заказаног састанка"
+
+#~ msgctxt "eventpage"
+#~ msgid "1 day before appointment"
+#~ msgstr "1 дан пре заказаног састанка"
+
+# note(slobo): можда треба рок
+#~ msgid "_Time:"
+#~ msgstr "_Време:"
+
+#~ msgid "Event Description"
+#~ msgstr "Опис догађаја"
+
+#~ msgid "Print this memo"
+#~ msgstr "Штампајте ову белешку"
+
+#~ msgid "Memo's start date is in the past"
+#~ msgstr "Почетак белешке је у прошлости"
+
+#~ msgid "Organi_zer:"
+#~ msgstr "Органи_затор:"
+
+#~ msgid "T_o:"
+#~ msgstr "_Прима:"
+
+#~ msgid "Su_mmary:"
+#~ msgstr "Саже_так:"
+
+#~ msgid "Could not get a selection to modify."
+#~ msgstr "Не могу да нађем избор ради мењања."
+
+#~ msgid "Could not get a selection to delete."
+#~ msgstr "Не могу да нађем избор ради брисања."
+
+#~ msgid "Date/Time"
+#~ msgstr "Датум/време"
+
+#~ msgctxt "recurrpage"
+#~ msgid "day(s)"
+#~ msgstr "дан(и)"
+
+#~ msgctxt "recurrpage"
+#~ msgid "for"
+#~ msgstr "за"
+
+#~ msgctxt "recurrpage"
+#~ msgid "until"
+#~ msgstr "до"
+
+#~ msgid "_Send Options"
+#~ msgstr "Могућности _слања"
+
+#~ msgid "Print this task"
+#~ msgstr "Одштампајте овај задатак"
+
+#~ msgid ""
+#~ "Task cannot be edited, because the selected task list does not support "
+#~ "assigned tasks"
+#~ msgstr ""
+#~ "Задатак није могуће уређивати, зато што изабрани списак задатака не "
+#~ "подржава додељене задатке"
+
+#~ msgid "Due date is wrong"
+#~ msgstr "Крајњи рок је погрешан"
+
+#~ msgid "Time zone:"
+#~ msgstr "Временска зона:"
+
+#~ msgid "%s at the start of the appointment"
+#~ msgstr "%s на почетку састанка"
+
+#~ msgid "%s at the end of the appointment"
+#~ msgstr "%s на крају састанка"
+
+#~ msgid "Gnome Calendar"
+#~ msgstr "Гномов календар"
+
+#~ msgid "Download in progress. Do you want to send the mail?"
+#~ msgstr "Преузимање је у току. Да ли желите да пошаљете поруку?"
+
+#~ msgid ""
+#~ " There are few attachments getting downloaded. Sending the mail will "
+#~ "cause the mail to be sent without those pending attachments "
+#~ msgstr ""
+#~ " Преузима се неколико прилога. Уколико сада пошаљете поруку ови прилози "
+#~ "неће бити послати са њом "
+
+#~ msgid "SSL"
+#~ msgstr "ССЛ"
+
+#~ msgid "Use Unicode characters for smile_ys"
+#~ msgstr "Уникод знак за _смајлије"
+
 #~ msgid "Web addresses"
 #~ msgstr "Веб адресе"
 
diff --git a/po/sr latin po b/po/sr latin po
index 775c6e3..57f10d2 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -1,18 +1,16 @@
 # Serbian translation of evolution
-# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2012.
+# Courtesy of Prevod.org team (http://prevod.org/) -- 2003—2016.
 # This file is distributed under the same license as the evolution package.
-# Maintainer: Igor Nestorović <jung one ekof bg ac yu>
-# Reviewed on 2005-08-22 by Igor Nestorović <igor prevod org>
-# Miloš Popović <gpopac gmail com>, 2010.
-# Miroslav Nikolić <miroslavnikolic rocketmail com>, 2011—2014.
-#: ../shell/main.c:554
+# Igor Nestorović <igor prevod org>, 2005.
+# Miloš Popović <gpopac gmail com>, 2010—2015.
+# Miroslav Nikolić <miroslavnikolic rocketmail com>, 2011—2016.
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolut";
-"ion&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2014-03-16 05:28+0000\n"
-"PO-Revision-Date: 2014-03-16 11:14+0200\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evoluti";
+"on&keywords=I18N+L10N&component=Miscellaneous\n"
+"POT-Creation-Date: 2016-02-23 05:51+0000\n"
+"PO-Revision-Date: 2016-02-23 12:09+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic rocketmail com>\n"
 "Language-Team: Serbian <gnom prevod org>\n"
 "Language: sr\n"
@@ -26,7 +24,7 @@ msgstr ""
 # malo aorista ;-)
 #: ../addressbook/addressbook.error.xml.h:1
 msgid "This address book could not be opened."
-msgstr "Ovaj adresar nije mogao biti otvoren."
+msgstr "Ne mogu da otvorim ovaj adresar."
 
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
@@ -38,7 +36,7 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid "Failed to authenticate with LDAP server."
-msgstr "Nisam uspeo da potvrdim identitet na LDAP serveru."
+msgstr "Ne mogu da potvrdim identitet na LDAP serveru."
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid ""
@@ -89,8 +87,8 @@ msgstr "Da obrišem adresar „{0}“?"
 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:66
+#: ../addressbook/addressbook.error.xml.h:13 ../calendar/calendar.error.xml.h:7
+#: ../mail/mail.error.xml.h:67
 msgid "Do _Not Delete"
 msgstr "Ne _briši"
 
@@ -107,7 +105,7 @@ msgstr ""
 "da nastavite?"
 
 #: ../addressbook/addressbook.error.xml.h:16
-#: ../calendar/calendar.error.xml.h:61
+#: ../calendar/calendar.error.xml.h:65
 msgid "_Delete From Server"
 msgstr "_Obriši sa servera"
 
@@ -116,7 +114,6 @@ msgid "Category editor not available."
 msgstr "Uređivač kategorija nije dostupan."
 
 #: ../addressbook/addressbook.error.xml.h:18
-#| msgid "Unable to open address book"
 msgid "Unable to open address book '{0}'"
 msgstr "Ne mogu da otvorim adresar „{0}“"
 
@@ -125,24 +122,28 @@ msgid "Unable to perform search."
 msgstr "Pretraga nije moguća."
 
 #: ../addressbook/addressbook.error.xml.h:20
+msgid "Failed to refresh address book '{0}'"
+msgstr "Ne mogu da osvežim adresar „{0}“"
+
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "Would you like to save your changes?"
 msgstr "Da li želite li da sačuvate izmene?"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "Izmenili ste ovaj kontakt. Da li želite da sačuvate ove izmene?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "_Discard"
 msgstr "_Odbaci"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Cannot move contact."
-msgstr "Kontakt nije moguće premestiti."
+msgstr "Ne mogu da premestim kontakt."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:25
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -150,38 +151,38 @@ msgstr ""
 "Pokušavate da premestite kontakt iz jednog adresara u drugi ali se on ne "
 "može ukloniti iz izvora. Želite li da sačuvate umnožak umesto toga?"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:26
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr ""
 "Slika koju ste izabrali je prevelika. Da li želite li da joj promenite "
 "veličinu i da je sačuvate?"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "_Resize"
 msgstr "_Promeni veličinu"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "_Use as it is"
 msgstr "_Koristi tako kako je"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "_Do not save"
 msgstr "_Ne čuvaj"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to save {0}."
 msgstr "Ne mogu da sačuvam {0}."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Greška pri čuvanju {0} u {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Address '{0}' already exists."
 msgstr "Adresa „{0}“ već postoji."
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
@@ -189,30 +190,27 @@ msgstr ""
 "Kontakt sa ovom adresom već postoji. Želite li ipak da dodate novu kartu sa "
 "istom adresom?"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:34
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
-#: ../addressbook/gui/widgets/eab-contact-merging.c:626
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:4
-#: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:19
-#: ../calendar/gui/dialogs/task-page.ui.h:30 ../e-util/filter.ui.h:16
+#: ../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-name-selector-dialog.c:995 ../mail/e-mail-account-manager.c:719
-#: ../mail/e-mail-label-manager.c:373 ../mail/em-vfolder-editor-rule.c:392
-#: ../mail/em-vfolder-editor-rule.c:622 ../mail/mail-config.ui.h:51
-#: ../modules/mail/em-composer-prefs.c:443
-#: ../plugins/attachment-reminder/attachment-reminder.c:557
-#: ../plugins/email-custom-header/email-custom-header.c:838
+#: ../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
+#: ../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
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:35
 msgid "Some addresses already exist in this contact list."
 msgstr "Neke adrese već postoje na ovom spisku kontakata."
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You are trying to add addresses that are part of this list already. Would "
 "you like to add them anyway?"
@@ -220,19 +218,19 @@ msgstr ""
 "Pokušavate da dodate adrese koje su već deo ove liste. Da li ipak želite da "
 "ih dodate?"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "Skip duplicates"
 msgstr "Preskoči duplikate"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "Add with duplicates"
 msgstr "Dodaj sa duplikatima"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "List '{0}' is already in this contact list."
 msgstr "Spisak „{0}“ je već na ovom spisku kontakata."
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
 msgid ""
 "A contact list named '{0}' is already in this contact list. Would you like "
 "to add it anyway?"
@@ -240,21 +238,21 @@ msgstr ""
 "Spisak kontakata pod nazivom „{0}“ se već nalazi na ovom spisku. Da li ipak "
 "želite da ga dodate?"
 
-#: ../addressbook/addressbook.error.xml.h:40
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1250
+#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1285
 msgid "Failed to delete contact"
-msgstr "Nisam uspeo da obrišem kontakt"
+msgstr "Ne mogu da obrišem kontakt"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:42
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "Nemate dovoljna ovlašćenja da brišete kontakte iz ovog adresara."
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:43
 msgid "Cannot add new contact"
 msgstr "Nije moguće dodati novi kontakt"
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:44
+#: ../addressbook/addressbook.error.xml.h:45
 msgid ""
 "'{0}' is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
@@ -262,12 +260,12 @@ msgstr ""
 "Adresar „{0}“ je samo za čitanje i nije podložan izmenama. Izaberite drugi "
 "adresar sa bočne trake u pregledu Kontakti."
 
-#: ../addressbook/addressbook.error.xml.h:45
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "Cannot save a contact, address book is still opening"
 msgstr "Ne mogu da sačuvam kontakt, adresar se još uvek otvara"
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:47
+#: ../addressbook/addressbook.error.xml.h:48
 msgid ""
 "Cannot save a contact to the address book '{0}', because it is still "
 "opening. Either wait till it's opened, or select a different address book."
@@ -276,9 +274,9 @@ msgstr ""
 "sačekajte dok se ne otvori, ili izaberite neki drugi adresar."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:734
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:756
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3037
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:727
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:749
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3110
 msgid "Contact Editor"
 msgstr "Uređivač za kontakte"
 
@@ -300,9 +298,6 @@ msgid "_Where:"
 msgstr "_Gde:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:6
-#: ../calendar/gui/dialogs/event-page.ui.h:16
-#: ../calendar/gui/dialogs/memo-page.ui.h:1
-#: ../calendar/gui/dialogs/task-page.ui.h:27
 msgid "Ca_tegories..."
 msgstr "Ka_tegorije..."
 
@@ -311,81 +306,79 @@ msgid "Full _Name..."
 msgstr "Puno _ime..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-msgid "_Wants to receive HTML mail"
-msgstr "_Želi da prima HTML poštu"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/widgets/eab-contact-merging.c:408
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:749
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1163
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:980
 msgid "Email"
 msgstr "El. pošta"
 
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+msgid "_Wants to receive HTML mail"
+msgstr "_Želi da prima HTML poštu"
+
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Telephone"
 msgstr "Telefon"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+msgid "SIP Address"
+msgstr "SIP adresa"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 msgid "Instant Messaging"
 msgstr "Trenutne poruke"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/importers/evolution-vcard-importer.c:971
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/importers/evolution-vcard-importer.c:979
 msgid "Contact"
 msgstr "Kontakt"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "_Home Page:"
 msgstr "_Lična strana:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
-#: ../calendar/gui/dialogs/event-page.c:709
-#: ../calendar/gui/dialogs/event-page.ui.h:25
-#: ../modules/itip-formatter/itip-view.c:1891
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../calendar/gui/e-comp-editor-event.c:621
+#: ../modules/itip-formatter/itip-view.c:1905
 msgid "_Calendar:"
 msgstr "_Kalendar:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "_Free/Busy:"
 msgstr "S_lobodno/zauzeto:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "_Video Chat:"
 msgstr "_Video razgovor:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 msgid "Home Page:"
 msgstr "Matična strana:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../modules/cal-config-google/evolution-cal-config-google.c:96
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../modules/cal-config-google/e-cal-config-google.c:94
 msgid "Calendar:"
 msgstr "Kalendar:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 msgid "Free/Busy:"
 msgstr "Slobodno/zauzeto:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 msgid "Video Chat:"
 msgstr "Video razgovor:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "_Blog:"
 msgstr "_Blog:"
 
 #. Translators: an accessibility name
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Blog:"
 msgstr "Blog:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Addresses"
-msgstr "Veb adrese"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
-msgid "Web addresses"
+msgid "Web Addresses"
 msgstr "Veb adrese"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
@@ -434,19 +427,16 @@ msgid "_Anniversary:"
 msgstr "_Godišnjica:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:692
-#: ../calendar/gui/e-calendar-view.c:2288
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:875
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:47
+#: ../calendar/gui/e-calendar-view.c:2037
 msgid "Anniversary"
 msgstr "Godišnjica"
 
-#. XXX Allow the category icons to be referenced as named
-#. *     icons, since GtkAction does not support GdkPixbufs.
-#. Get the icon file for some default category.  Doesn't matter
-#. * which, so long as it has an icon.  We're just interested in
-#. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:691
-#: ../calendar/gui/e-calendar-view.c:2287 ../shell/main.c:127
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:874
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:46
+#: ../calendar/gui/e-calendar-view.c:2036
 msgid "Birthday"
 msgstr "Rođendan"
 
@@ -479,32 +469,30 @@ msgid "_PO Box:"
 msgstr "_Poštanski broj:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../composer/e-composer-from-header.c:123
 msgid "_Address:"
 msgstr "_Adresa:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/e-contact-map.c:371
 #: ../addressbook/gui/widgets/eab-contact-display.c:356
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:80
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:82
+#: ../addressbook/gui/widgets/e-contact-map.c:369
 msgid "Home"
 msgstr "Kuća"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/e-contact-map.c:384
 #: ../addressbook/gui/widgets/eab-contact-display.c:353
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:79
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:673
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:842
+#: ../addressbook/gui/widgets/e-contact-map.c:382
 msgid "Work"
 msgstr "Posao"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:367
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:726
-#: ../calendar/gui/e-cal-model.c:3957
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:83
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:512
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:909
+#: ../calendar/gui/e-cal-model.c:3807
 msgid "Other"
 msgstr "Drugo"
 
@@ -513,173 +501,287 @@ msgid "Mailing Address"
 msgstr "Adresa stanovanja"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:51
+#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
+#: ../mail/vfoldertypes.xml.in.h:53
 msgid "Notes"
 msgstr "Napomene"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:52
-#: ../calendar/gui/dialogs/comp-editor.c:1250
-#: ../calendar/gui/dialogs/comp-editor.c:1336 ../e-util/e-send-options.ui.h:41
-#: ../e-util/e-preferences-window.c:379
+msgid "Add _PGP"
+msgstr "Dodaj P_GP"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
+msgid "Add _X.509"
+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-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
+#: ../mail/mail-config.ui.h:59
+#: ../plugins/attachment-reminder/attachment-reminder.c:467
+#: ../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
+msgid "_Remove"
+msgstr "_Ukloni"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:55
+msgid "Load P_GP"
+msgstr "Učitaj _PGP"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:56
+msgid "_Load X.509"
+msgstr "Učitaj X.5_09"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:57
+#: ../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
+#: ../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
+msgid "_Save"
+msgstr "_Sačuvaj"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:58
+#: ../modules/addressbook/e-book-shell-backend.c:314
+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
+#: ../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-window-actions.c:1086
+#: ../shell/e-shell.c:1223 ../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
+#: ../mail/mail-config.ui.h:37
+msgid "Options"
+msgstr "Mogućnosti"
+
 #. This is only shown if the EActivity has a GCancellable.
 #. no flags
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3575
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:223
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:61
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3273
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3506
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4321
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:222
 #: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
 #: ../addressbook/gui/contact-editor/fullname.ui.h:14
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
-#: ../addressbook/gui/widgets/eab-contact-merging.c:362
-#: ../addressbook/gui/widgets/eab-contact-merging.c:621
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+#: ../addressbook/gui/widgets/eab-contact-merging.c:474
+#: ../addressbook/gui/widgets/eab-contact-merging.c:718
 #: ../addressbook/gui/widgets/eab-gui-util.c:318
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:15
-#: ../calendar/gui/dialogs/recurrence-page.c:2322
-#: ../composer/e-composer-actions.c:204 ../e-util/e-send-options.ui.h:42
-#: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
-#: ../e-util/e-activity-bar.c:299 ../e-util/e-attachment-dialog.c:311
-#: ../e-util/e-attachment-store.c:464 ../e-util/e-attachment-store.c:545
-#: ../e-util/e-attachment-view.c:370 ../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-filter-datespec.c:291
-#: ../e-util/e-mail-signature-script-dialog.c:366 ../e-util/e-passwords.c:468
+#: ../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
+#: ../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-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
-#: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:776
-#: ../e-util/e-source-config-dialog.c:375
-#: ../e-util/e-source-selector-dialog.c:348 ../e-util/e-table-config.c:548
-#: ../e-util/e-web-view.c:3092 ../e-util/evolution-source-viewer.c:832
+#: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:791
+#: ../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/gal-view-instance-save-as-dialog.c:269
-#: ../mail/e-mail-config-window.c:331 ../mail/e-mail-label-dialog.c:196
-#: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:278
-#: ../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:635
-#: ../mail/mail-send-recv.c:717 ../mail/mail-vfolder-ui.c:148
-#: ../mail/mail-vfolder-ui.c:270
-#: ../modules/backup-restore/evolution-backup-tool.c:949
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:278
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:188
-#: ../modules/calendar/e-cal-attachment-handler.c:317
+#: ../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-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
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
-#: ../plugins/face/face.c:291 ../plugins/mail-to-task/mail-to-task.c:593
-#: ../plugins/publish-calendar/publish-calendar.c:806
+#: ../plugins/face/face.c:297
+#: ../plugins/publish-calendar/publish-calendar.c:790
 #: ../plugins/publish-calendar/url-editor-dialog.c:421
-#: ../plugins/save-calendar/save-calendar.c:189 ../shell/e-shell-content.c:659
-#: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:70
-#: ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:623
-#: ../smime/gui/e-cert-selector.c:232 ../smime/gui/smime-ui.ui.h:23
-#| msgid "Cancel"
+#: ../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
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "_Cancel"
 msgstr "_Otkaži"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
-#: ../addressbook/gui/widgets/eab-contact-merging.c:624
-#: ../calendar/calendar.error.xml.h:47
-#: ../calendar/gui/dialogs/comp-editor.c:1278
-#: ../composer/e-composer-actions.c:205 ../composer/e-composer-actions.c:296
-#: ../e-util/e-attachment-store.c:546
-#: ../e-util/e-mail-signature-script-dialog.c:370 ../e-util/e-web-view.c:3093
-#: ../e-util/gal-view-instance-save-as-dialog.c:270
-#: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:135
-msgid "_Save"
-msgstr "_Sačuvaj"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
+msgid "Show Telephone"
+msgstr "Prikaži telefon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:599
-msgid "AIM"
-msgstr "AIM"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
+msgid "Show SIP Address"
+msgstr "Prikaži SIP adresu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:602
-msgid "Jabber"
-msgstr "Džaber"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
+msgid "Show Instant Messaging"
+msgstr "Prikaži brze poruke"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:604
-msgid "Yahoo"
-msgstr "Jahu"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
+msgid "Show Web Addresses"
+msgstr "Prikaži veb adrese"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:605
-msgid "Gadu-Gadu"
-msgstr "Gadu-Gadu"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:66
+msgid "Show Job section"
+msgstr "Prikaži odeljak sa zadacima"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:603
-msgid "MSN"
-msgstr "MSN"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:67
+msgid "Show Miscellaneous"
+msgstr "Prikaži ostalo"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:601
-msgid "ICQ"
-msgstr "ICKu"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:68
+msgid "Show Home Mailing Address"
+msgstr "Prikaži kućnu adresu e-pošte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
-msgid "GroupWise"
-msgstr "GroupVajz"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:69
+msgid "Show Work Mailing Address"
+msgstr "Prikaži adresu e-pošte na poslu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:606
-msgid "Skype"
-msgstr "Skajp"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:70
+msgid "Show Other Mailing Address"
+msgstr "Prikaži ostale adrese e-pošte"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:607
-msgid "Twitter"
-msgstr "Tviter"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:71
+msgid "Show Notes"
+msgstr "Prikaži beleške"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
-#: ../calendar/gui/dialogs/comp-editor.c:1301 ../e-util/e-focus-tracker.c:121
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:72
+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
+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
 msgid "Undo"
 msgstr "Opozovi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:278
-#: ../calendar/gui/dialogs/comp-editor.c:1308 ../e-util/e-focus-tracker.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:269
+#: ../calendar/gui/e-comp-editor.c:2042 ../e-util/e-html-editor-actions.c:1097
+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
 msgid "Redo"
-msgstr "Vrati"
+msgstr "Ponovi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:303
 #: ../addressbook/gui/widgets/eab-gui-util.c:503
 msgid "Error adding contact"
 msgstr "Greška pri dodavanju kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:323
 msgid "Error modifying contact"
 msgstr "Greška pri izmeni kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:343
 msgid "Error removing contact"
 msgstr "Greška pri uklanjanju kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:750
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3031
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:743
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3104
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Uređivač za kontakte — %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3572
-msgid "Please select an image for this contact"
-msgstr "Izaberite sliku za ovaj kontakt"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3240
+msgid "X.509 certificates"
+msgstr "X.509 uverenja"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3245
+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
+msgid "All files"
+msgstr "Sve datoteke"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3576
-#: ../e-util/e-category-editor.c:146 ../plugins/face/face.c:292
-#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:624
-#| msgid "Open"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+msgid "Open PGP key"
+msgstr "Otvoreni PGP ključ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3271
+msgid "Open X.509 certificate"
+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-image-chooser-dialog.c:174 ../plugins/face/face.c:298
+#: ../shell/e-shell-utils.c:73 ../smime/gui/certificate-manager.c:956
 msgid "_Open"
 msgstr "_Otvori"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3577
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3291
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3522
+msgid "Chosen file is not a local file."
+msgstr "Izabrana datoteka nije na lokalnom računaru."
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3304
+#, c-format
+msgid "Failed to load certificate: %s"
+msgstr "Ne mogu da uvezem uverenje: %s"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3333
+msgctxt "cert-kind"
+msgid "X.509"
+msgstr "X.509"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3333
+msgctxt "cert-kind"
+msgid "PGP"
+msgstr "PGP"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3504
+msgid "Save PGP key"
+msgstr "Sačuvaj PGP ključ"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3504
+msgid "Save X.509 certificate"
+msgstr "Sačuvaj X.506 uverenje"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3534
+#, c-format
+msgid "Failed to save certificate: %s"
+msgstr "Ne mogu da uvezem uverenje: %s"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4318
+msgid "Please select an image for this contact"
+msgstr "Izaberite sliku za ovaj kontakt"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4323
 msgid "_No image"
 msgstr "_Bez slike"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3926
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4672
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -687,57 +789,54 @@ msgstr ""
 "Podaci o kontaktu nisu ispravni:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3932
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4678
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "„%s“ ima neispravan format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3940
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4686
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "„%s“ ne može biti budući datum"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3948
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4694
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s„%s“ ima neispravan format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3961
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3975
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4707
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4721
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s„%s“ je prazan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3990
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4736
 msgid "Invalid contact."
 msgstr "Neispravan kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:224
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:223
 #: ../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/dialogs/alarm-dialog.ui.h:9
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:3
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
-#: ../calendar/gui/dialogs/recurrence-page.c:2323
-#: ../e-util/e-send-options.ui.h:43 ../e-util/e-table-config.ui.h:3
-#: ../e-util/e-timezone-dialog.ui.h:3 ../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-filter-datespec.c:292
-#: ../e-util/e-passwords.c:469 ../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:777 ../e-util/e-source-config-dialog.c:376
-#: ../e-util/e-source-selector-dialog.c:349 ../e-util/e-table-config.c:549
-#: ../mail/e-mail-config-window.c:332 ../mail/e-mail-tag-editor.c:243
-#: ../mail/em-folder-selector.c:279 ../mail/mail-config.ui.h:3
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:303
+#: ../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-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
+#: ../e-util/e-source-selector-dialog.c:373 ../e-util/e-table-config.c:549
+#: ../e-util/e-table-config.ui.h:3 ../e-util/e-timezone-dialog.ui.h:3
+#: ../mail/e-mail-config-window.c:331 ../mail/e-mail-tag-editor.c:243
+#: ../mail/em-folder-selector.c:43 ../mail/mail-config.ui.h:3
 #: ../mail/mail-dialogs.ui.h:26 ../mail/mail-vfolder-ui.c:149
 #: ../mail/mail-vfolder-ui.c:271
 #: ../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:167 ../smime/gui/e-cert-selector.c:233
-#: ../smime/gui/smime-ui.ui.h:24
-#| msgid "OK"
+#: ../shell/main.c:180 ../smime/gui/certificate-manager.c:1338
+#: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
 msgid "_OK"
 msgstr "U _redu"
 
@@ -749,15 +848,15 @@ msgstr "Brzo dodavanje kontakta"
 msgid "_Edit Full"
 msgstr "_Uredi potpuno"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:507
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:505
 msgid "_Full name"
 msgstr "_Ime i prezime"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:520
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:518
 msgid "E_mail"
 msgstr "E-_pošta"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:533
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:531
 msgid "_Select Address Book"
 msgstr "_Izaberi adresar"
 
@@ -860,24 +959,6 @@ msgstr "Dodajte el. poštu na spisak"
 msgid "Remove an email address from the List"
 msgstr "Uklonite adresu el. pošte sa spiska"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:21
-#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/filter.ui.h:18
-#: ../e-util/e-attachment-view.c:424 ../e-util/e-filter-rule.c:224
-#: ../e-util/e-mail-signature-manager.c:367
-#: ../e-util/e-name-selector-dialog.c:999 ../mail/e-mail-label-manager.c:391
-#: ../mail/em-filter-rule.c:440 ../mail/em-vfolder-editor-rule.c:627
-#: ../mail/mail-config.ui.h:52
-#: ../plugins/attachment-reminder/attachment-reminder.c:567
-#: ../plugins/email-custom-header/email-custom-header.c:848
-#: ../plugins/publish-calendar/publish-calendar.c:807
-#: ../plugins/publish-calendar/publish-calendar.ui.h:34
-#: ../plugins/templates/templates.c:463
-msgid "_Remove"
-msgstr "_Ukloni"
-
 #: ../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"
@@ -892,13 +973,12 @@ msgid "_Top"
 msgstr "_Vrh"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:14
-#: ../e-util/filter.ui.h:20
-#| msgid "_Update"
+#: ../e-util/e-source-selector.c:3471 ../e-util/filter.ui.h:20
 msgid "_Up"
 msgstr "_Gore"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
-#: ../e-util/filter.ui.h:21
+#: ../e-util/e-source-selector.c:3472 ../e-util/filter.ui.h:21
 msgid "_Down"
 msgstr "Do_le"
 
@@ -911,44 +991,263 @@ msgstr "D_no"
 msgid "Contact List Members"
 msgstr "Članovi kontakt liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1486
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1487
 msgid "_Members"
 msgstr "_Članovi"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1626
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1627
 msgid "Error adding list"
 msgstr "Greška pri dodavanju liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1646
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1647
 msgid "Error modifying list"
 msgstr "Greška pri izmeni liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1666
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1667
 msgid "Error removing list"
 msgstr "Greška pri uklanjanju liste"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:243
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../modules/addressbook/e-book-shell-view-actions.c:1221
+msgid "Name contains"
+msgstr "Naziv sadrži"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../modules/addressbook/e-book-shell-view-actions.c:1214
+msgid "Email begins with"
+msgstr "E-pošta počinje sa"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30
+#: ../modules/addressbook/e-book-shell-view-actions.c:1207
+#: ../modules/calendar/e-cal-shell-view-actions.c:1664
+#: ../modules/calendar/e-memo-shell-view-actions.c:784
+#: ../modules/calendar/e-task-shell-view-actions.c:985
+msgid "Any field contains"
+msgstr "Polje koje sadrži"
+
+# note(slobo): message thread, niz --> bolji prevod je rasprava
+# note(slobo): ponegde sam za summary koristio --> „u kratkim crtama“
+# note(slobo): za memo sam koristio --> beleške
+# note(slobo): upgrading memo: dopuna beleške je bolje od nadogradnja beleške
+# note(slobo): set alarm, postavi alarm ... proba na par mesta --> „navij sat“
+# note(slobo): filter, filter -->  propusnik, proba na par mesta
+# note(slobo): address book, adresar --> imenik na par mesta proba
+# 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
+msgid "evolution address book"
+msgstr "Adresar Evolucije"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:149
+msgid "Copy _Email Address"
+msgstr "Umnoži elektronsku _adresu"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:151
+#: ../e-util/e-web-view.c:340
+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
+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
+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
+#, c-format
+msgid "Click to mail %s"
+msgstr "Kliknite da pošaljete %s"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:141
+msgid "Open map"
+msgstr "Otvorite mapu"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:437
+msgid "SIP"
+msgstr "SIP"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
+msgid "List Members:"
+msgstr "Članovi liste:"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:753
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Nickname"
+msgstr "Nadimak"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:754
+msgid "AIM"
+msgstr "AIM"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:755
+msgid "GroupWise"
+msgstr "GroupVajz"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:756
+msgid "ICQ"
+msgstr "ICKu"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:757
+msgid "Jabber"
+msgstr "Džaber"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:758
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:759
+msgid "Yahoo"
+msgstr "Jahu"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:760
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:761
+msgid "Skype"
+msgstr "Skajp"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:762
+msgid "Twitter"
+msgstr "Tviter"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:819
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Company"
+msgstr "Preduzeće"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:820
+msgid "Department"
+msgstr "Odeljenje"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:821
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Office"
+msgstr "Kancelarija"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:822
+msgid "Profession"
+msgstr "Zanimanje"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:823
+msgid "Position"
+msgstr "Položaj"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:824
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Manager"
+msgstr "Rukovodilac"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:825
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+msgid "Assistant"
+msgstr "Pomoćnik"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:826
+msgid "Video Chat"
+msgstr "Video razgovor"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:827
+#: ../e-util/e-send-options.c:546
+#: ../modules/calendar/e-cal-shell-view-actions.c:199
+#: ../modules/calendar/e-cal-shell-view.c:579
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Calendar"
+msgstr "Kalendar"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:828
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Free/Busy"
+msgstr "Slobodno/zauzeto"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:829
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:870
+msgid "Phone"
+msgstr "Telefon"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:830
+msgid "Fax"
+msgstr "Faks"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:832
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:873
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:899
+msgid "Address"
+msgstr "Adresa"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:868
+msgid "Home Page"
+msgstr "Matična stranica"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:869
+msgid "Web Log"
+msgstr "Veb log"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:871
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Mobile Phone"
+msgstr "Mobilni telefon"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:876
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+msgid "Spouse"
+msgstr "Supružnik"
+
+# Create the default Person calendar
+# Create the default Person task list
+# orange
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:886
+msgid "Personal"
+msgstr "Lično"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:931
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+msgid "Note"
+msgstr "Napomena"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1127
+msgid "List Members"
+msgstr "Članovi liste"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1148
+msgid "Job Title"
+msgstr "Zvanje na poslu"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1189
+msgid "Home page"
+msgstr "Matična stranica"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1199
+msgid "Blog"
+msgstr "Blog"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:261
 #: ../calendar/gui/tasktypes.xml.h:14
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:345
+#: ../addressbook/gui/widgets/eab-contact-merging.c:457
 msgid "Merge Contact"
 msgstr "Pripoji kontakt"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:363
-#: ../addressbook/gui/widgets/eab-contact-merging.c:627
+#: ../addressbook/gui/widgets/eab-contact-merging.c:475
+#: ../addressbook/gui/widgets/eab-contact-merging.c:724
 msgid "_Merge"
 msgstr "_Stopi"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:616
+#: ../addressbook/gui/widgets/eab-contact-merging.c:713
 msgid "Duplicate Contact Detected"
 msgstr "Otkriven dupli kontakt"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:674
-#| msgid ""
-#| "The name or email of this contact already exists in this folder. Would "
-#| "you like to save the changes anyway?"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:771
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to save the changes anyway?"
@@ -956,10 +1255,7 @@ msgstr ""
 "Naziv ili adresa el. 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:677
-#| msgid ""
-#| "The name or email address of this contact already exists\n"
-#| "in this folder.  Would you like to add it anyway?"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:774
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to add it anyway?"
@@ -967,42 +1263,133 @@ msgstr ""
 "Naziv ili adresa el. pošte ovog kontakta već postoji\n"
 "u ovoj fascikli. Da li ipak želite da ga dodate?"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:692
+#: ../addressbook/gui/widgets/eab-contact-merging.c:789
 msgid "Changed Contact:"
 msgstr "Izmenjen kontakt:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:694
+#: ../addressbook/gui/widgets/eab-contact-merging.c:791
 msgid "New Contact:"
 msgstr "Novi kontakt:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:733
+#: ../addressbook/gui/widgets/eab-contact-merging.c:830
 msgid "Conflicting Contact:"
 msgstr "Sporan kontakt:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:735
-#| msgid "Contact: "
+#: ../addressbook/gui/widgets/eab-contact-merging.c:832
 msgid "Old Contact:"
 msgstr "Stari kontakt: "
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1150
-msgid "Name contains"
-msgstr "Naziv sadrži"
+#: ../addressbook/gui/widgets/eab-gui-util.c:121
+msgid ""
+"This address book cannot be opened. This either means this book is not "
+"marked for offline usage or not yet downloaded for offline usage. Please "
+"load the address book once in online mode to download its contents."
+msgstr ""
+"Ne mogu da otvorim ovaj adresar. To znači da on ili nije označen za "
+"korišćenje van mreže ili da još nije preuzet za rad van mreže. Učitajte "
+"adresar kada se povežete radi preuzimanja njegovog sadržaja."
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1143
-msgid "Email begins with"
-msgstr "E-pošta počinje sa"
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#, c-format
+msgid ""
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
+msgstr ""
+"Ne mogu da otvorim ovaj adresar.  Proverite da li postoji putanja %s i da li "
+"imate prava pristupa."
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1136
-#: ../modules/calendar/e-cal-shell-view-actions.c:1770
-#: ../modules/calendar/e-memo-shell-view-actions.c:790
-#: ../modules/calendar/e-task-shell-view-actions.c:989
-msgid "Any field contains"
-msgstr "Polje koje sadrži"
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
+msgstr ""
+"Ovo izdanje Evolucije nema u sebi podršku za LDAP.  Ukoliko želite da "
+"koristite LDAP u Evoluciji, morate da instalirate paket Evolucije sa "
+"podrškom za LDAP."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
+msgid ""
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
+msgstr ""
+"Ne mogu da otvorim ovaj adresar.  To znači da ste ili uneli pogrešnu adresu, "
+"ili je server nedostupan."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
+msgid "Detailed error message:"
+msgstr "Detalji greške:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this address book."
+msgstr ""
+"Broj karti koje odgovaraju upitu je veći od broja na koji je server \n"
+"podešen da odgovori ili koji je Evolucija podešena da prikaže.\n"
+"Preciznije oblikujte upit ili povećajte ograničenje\n"
+"broja rezultata u postavkama adresara za server direktorijuma."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:218
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"configured for this address book.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this address book."
+msgstr ""
+"Vreme za izvršavanje ovog upita je preko ograničenja servera ili\n"
+"ograničenja koje ste podesili za ovaj adresar. Preciznije oblikujte\n"
+"upit ili povećajte vremensko ograničenje u postavkama servera\n"
+"direktorijuma za ovaj adresar."
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:226
+#, c-format
+msgid "The backend for this address book was unable to parse this query. %s"
+msgstr "Osnovni proces ovog adresara nije mogao da obradi upit. %s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:231
+#, c-format
+msgid "The backend for this address book refused to perform this query. %s"
+msgstr "Osnovni proces ovog adresara je odbio da obavi ovaj upit. %s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:237
+#: ../addressbook/gui/widgets/eab-gui-util.c:243
+#, c-format
+msgid "This query did not complete successfully. %s"
+msgstr "Ovaj upit nije uspešno završen. %s"
+
+#. This is a filename. Translators take note.
+#: ../addressbook/gui/widgets/eab-gui-util.c:265
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
+msgid "Select Address Book"
+msgstr "Izaberi adresar"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:398
+msgid "list"
+msgstr "spisak"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:587
+msgid "Move contact to"
+msgstr "Premesti kontakt u"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:589
+msgid "Copy contact to"
+msgstr "Umnoži kontakt u"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:592
+msgid "Move contacts to"
+msgstr "Premesti kontakte u"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
+msgid "Copy contacts to"
+msgstr "Umnoži kontakte u"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
@@ -1025,73 +1412,72 @@ msgstr "Greška pri učitavanju pregleda knjige"
 msgid "Search Interrupted"
 msgstr "Pretraga je prekinuta"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:203
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:221
 msgid "Error modifying card"
 msgstr "Greška pri izmeni karte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:648
+#: ../addressbook/gui/widgets/e-addressbook-view.c:682
 msgid "Cut selected contacts to the clipboard"
 msgstr "Seče označene kontakte u spisak isečaka"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:654
+#: ../addressbook/gui/widgets/e-addressbook-view.c:688
 msgid "Copy selected contacts to the clipboard"
 msgstr "Umnožava označene kontakte u spisak isečaka"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:660
+#: ../addressbook/gui/widgets/e-addressbook-view.c:694
 msgid "Paste contacts from the clipboard"
 msgstr "Ubacuje kontakte iz spiska isečaka"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:666
-#: ../modules/addressbook/e-book-shell-view-actions.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:700
+#: ../modules/addressbook/e-book-shell-view-actions.c:1017
 msgid "Delete selected contacts"
 msgstr "Briše izabrane kontakte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:672
+#: ../addressbook/gui/widgets/e-addressbook-view.c:706
 msgid "Select all visible contacts"
 msgstr "Označava sve vidljive kontakte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1333
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Sigurno želite da obrišete ove liste kontakta?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1337
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Sigurno želite da obrišete ovaj spisak kontakta?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1341
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Sigurno želite da obrišete ovaj spisak kontakta (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1347
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Sigurno želite da obrišete ove kontakte?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1351
 msgid "Are you sure you want to delete this contact?"
 msgstr "Sigurno želite da obrišete ovaj kontakt?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1355
 #, c-format
 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:1331
-#: ../calendar/gui/dialogs/comp-editor.c:1243
-#: ../e-util/e-categories-editor.c:282 ../e-util/e-focus-tracker.c:740
-#: ../e-util/evolution-source-viewer.c:803
-#: ../mail/e-mail-account-manager.c:737
-#: ../modules/addressbook/e-book-shell-view-actions.c:1022
-#: ../modules/calendar/e-cal-shell-view-actions.c:1593
-#: ../modules/calendar/e-memo-shell-view-actions.c:692
-#: ../modules/calendar/e-task-shell-view-actions.c:844
-#: ../modules/mail/e-mail-shell-view-actions.c:1561
-#: ../shell/e-shell-window-actions.c:944 ../smime/gui/smime-ui.ui.h:10
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1366
+#: ../calendar/gui/e-comp-editor.c:1993 ../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
+#: ../shell/e-shell-window-actions.c:813
+#: ../smime/gui/certificate-manager.c:1661 ../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
 msgstr "_Obriši"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1476
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1513
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1112,11 +1498,11 @@ msgstr[3] ""
 "Otvaranje jednog kontakta će takođe otvoriti jedan novi prozor.\n"
 "Da li zaista želite da prikažete sve ove kontakte?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1521
 msgid "_Don't Display"
 msgstr "_Ne prikazuj"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1522
 msgid "Display _All Contacts"
 msgstr "Prikaži _sve kontakte"
 
@@ -1132,11 +1518,6 @@ msgstr "Dato ime"
 msgid "Family Name"
 msgstr "Prezime"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
-msgid "Nickname"
-msgstr "Nadimak"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Email 2"
 msgstr "2. elektronska adresa"
@@ -1189,11 +1570,6 @@ msgstr "Kućni faks"
 msgid "ISDN Phone"
 msgstr "ISDN telefon"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:689
-msgid "Mobile Phone"
-msgstr "Mobilni telefon"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Other Phone"
 msgstr "Drugi telefon"
@@ -1228,40 +1604,20 @@ msgstr "Teleks"
 msgid "TTYTDD"
 msgstr "TTUTDD"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
-msgid "Company"
-msgstr "Preduzeće"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Unit"
 msgstr "Jedinica"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
-msgid "Office"
-msgstr "Kancelarija"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Titula"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:666
+#: ../calendar/gui/e-meeting-list-view.c:659
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Uloga"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
-msgid "Manager"
-msgstr "Rukovodilac"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:657
-msgid "Assistant"
-msgstr "Pomoćnik"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
 msgstr "Veb stranica"
@@ -1271,47 +1627,69 @@ msgid "Journal"
 msgstr "Dnevnik"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:43
-#: ../calendar/gui/dialogs/event-page.ui.h:20
-#: ../calendar/gui/e-calendar-table.etspec.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:6
-#: ../calendar/gui/e-memo-table.etspec.h:4 ../e-util/e-categories-dialog.c:87
+#: ../calendar/gui/e-memo-table.etspec.h:4
+#: ../calendar/gui/e-task-table.etspec.h:12 ../e-util/e-categories-dialog.c:87
 msgid "Categories"
 msgstr "Kategorije"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:693
-msgid "Spouse"
-msgstr "Supružnik"
+#: ../addressbook/gui/widgets/ea-minicard.c:33
+msgid "Open"
+msgstr "Otvori"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:748
-msgid "Note"
-msgstr "Napomena"
+#: ../addressbook/gui/widgets/ea-minicard.c:159
+msgid "Contact List: "
+msgstr "Spisak kontakta: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:160
+msgid "Contact: "
+msgstr "Kontakt: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:187
+msgid "evolution minicard"
+msgstr "minikarta evolucije"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:35
+msgid "New Contact"
+msgstr "Novi kontakt"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+msgid "New Contact List"
+msgstr "Nova kontakt lista"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:176
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "trenutna fascikla adresara %s ima %d kartu"
+msgstr[1] "trenutna fascikla adresara %s ima %d karte"
+msgstr[2] "trenutna fascikla adresara %s ima %d karti"
+msgstr[3] "trenutna fascikla adresara %s ima jednu kartu"
 
-#: ../addressbook/gui/widgets/e-contact-map-window.c:375
+#: ../addressbook/gui/widgets/e-contact-map-window.c:377
 msgid "Contacts Map"
 msgstr "Karta kontakata"
 
 #. Zoom-in button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:410
-#| msgid "_Zoom In"
+#: ../addressbook/gui/widgets/e-contact-map-window.c:412
 msgid "Zoom _In"
 msgstr "U_većaj"
 
 #. Zoom-out button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:418
-#: ../mail/e-mail-reader.c:2226
+#: ../addressbook/gui/widgets/e-contact-map-window.c:420
+#: ../mail/e-mail-reader.c:2385
 msgid "Zoom _Out"
 msgstr "U_manji"
 
 #. Search button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:448
-#: ../shell/e-shell-window-actions.c:1021
-#| msgid "_Find Now"
+#: ../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
+#: ../shell/e-shell-window-actions.c:890
 msgid "_Find"
 msgstr "_Nađi"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -1321,7 +1699,7 @@ msgstr ""
 "\n"
 "Tražim kontakte..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -1335,7 +1713,7 @@ msgstr ""
 "\n"
 "ili kliknite dvaput ovde da napravite novi kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:196
+#: ../addressbook/gui/widgets/e-minicard-view.c:194
 msgid ""
 "\n"
 "\n"
@@ -1349,7 +1727,7 @@ msgstr ""
 "\n"
 "Kliknite dvaput da napravite nov kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:200
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1359,7 +1737,7 @@ msgstr ""
 "\n"
 "Pretraga za kontaktima."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:202
+#: ../addressbook/gui/widgets/e-minicard-view.c:200
 msgid ""
 "\n"
 "\n"
@@ -1369,381 +1747,98 @@ msgstr ""
 "\n"
 "Nema stavki za prikazivanje."
 
-#: ../addressbook/gui/widgets/e-minicard.c:92
-msgid "Work Email"
-msgstr "Poslovna el. pošta"
-
-#: ../addressbook/gui/widgets/e-minicard.c:93
-msgid "Home Email"
-msgstr "Kućna el. pošta"
-
-#: ../addressbook/gui/widgets/e-minicard.c:94
-#: ../addressbook/gui/widgets/e-minicard.c:827
-msgid "Other Email"
-msgstr "Druga el. pošta"
-
-# note(slobo): message thread, niz --> bolji prevod je rasprava
-# note(slobo): ponegde sam za summary koristio --> „u kratkim crtama“
-# note(slobo): za memo sam koristio --> beleške
-# note(slobo): upgrading memo: dopuna beleške je bolje od nadogradnja beleške
-# note(slobo): set alarm, postavi alarm ... proba na par mesta --> „navij sat“
-# note(slobo): filter, filter -->  propusnik, proba na par mesta
-# note(slobo): address book, adresar --> imenik na par mesta proba
-# 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
-msgid "evolution address book"
-msgstr "Adresar Evolucije"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:35
-msgid "New Contact"
-msgstr "Novi kontakt"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
-msgid "New Contact List"
-msgstr "Nova kontakt lista"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:176
-#, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "trenutna fascikla adresara %s ima %d kartu"
-msgstr[1] "trenutna fascikla adresara %s ima %d karte"
-msgstr[2] "trenutna fascikla adresara %s ima %d karti"
-msgstr[3] "trenutna fascikla adresara %s ima jednu kartu"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:33
-msgid "Open"
-msgstr "Otvori"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:159
-msgid "Contact List: "
-msgstr "Spisak kontakta: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:160
-msgid "Contact: "
-msgstr "Kontakt: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:187
-msgid "evolution minicard"
-msgstr "minikarta evolucije"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:149
-msgid "Copy _Email Address"
-msgstr "Umnoži elektronsku _adresu"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:151
-#: ../e-util/e-web-view-gtkhtml.c:427 ../e-util/e-web-view.c:304
-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-gtkhtml.c:432 ../e-util/e-web-view.c:309
-msgid "_Send New Message To..."
-msgstr "_Pošalji poruku za..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:158
-#: ../e-util/e-web-view-gtkhtml.c:434 ../e-util/e-web-view.c:311
-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-gtkhtml.c:969 ../e-util/e-web-view.c:992
-#, c-format
-msgid "Click to mail %s"
-msgstr "Kliknite da pošaljete %s"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:136
-msgid "Open map"
-msgstr "Otvorite mapu"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:535
-msgid "List Members:"
-msgstr "Članovi liste:"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
-msgid "Department"
-msgstr "Odeljenje"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
-msgid "Profession"
-msgstr "Zanimanje"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
-msgid "Position"
-msgstr "Položaj"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:658
-msgid "Video Chat"
-msgstr "Video razgovor"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:659
-#: ../e-util/e-send-options.c:545
-#: ../modules/calendar/e-cal-shell-view-actions.c:215
-#: ../modules/calendar/e-cal-shell-view-actions.c:244
-#: ../modules/calendar/e-cal-shell-view.c:590
-#: ../plugins/publish-calendar/publish-calendar.ui.h:21
-msgid "Calendar"
-msgstr "Kalendar"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:660
-#: ../calendar/gui/dialogs/event-editor.c:115
-#: ../calendar/gui/dialogs/event-editor.c:342
-#: ../plugins/publish-calendar/publish-calendar.ui.h:2
-msgid "Free/Busy"
-msgstr "Slobodno/zauzeto"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:661
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:688
-msgid "Phone"
-msgstr "Telefon"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:662
-msgid "Fax"
-msgstr "Faks"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:663
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:690
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:716
-msgid "Address"
-msgstr "Adresa"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
-msgid "Home Page"
-msgstr "Matična stranica"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:687
-msgid "Web Log"
-msgstr "Veb log"
-
-# Create the default Person calendar
-# Create the default Person task list
-# orange
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
-msgid "Personal"
-msgstr "Lično"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:944
-msgid "List Members"
-msgstr "Članovi liste"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:965
-msgid "Job Title"
-msgstr "Zvanje na poslu"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1006
-msgid "Home page"
-msgstr "Matična stranica"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1016
-msgid "Blog"
-msgstr "Blog"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:121
-msgid ""
-"This address book cannot be opened. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents."
-msgstr ""
-"Ne mogu da otvorim ovaj adresar. To znači da on ili nije označen za "
-"korišćenje van mreže ili da još nije preuzet za rad van mreže. Učitajte "
-"adresar kada se povežete radi preuzimanja njegovog sadržaja."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
-#, c-format
-msgid ""
-"This address book cannot be opened.  Please check that the path %s exists "
-"and that permissions are set to access it."
-msgstr ""
-"Ne mogu da otvorim ovaj adresar.  Proverite da li postoji putanja %s i da li "
-"imate prava pristupa."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  To "
-"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
-msgstr ""
-"Ovo izdanje Evolucije nema u sebi podršku za LDAP.  Ukoliko želite da "
-"koristite LDAP u Evoluciji, morate da instalirate paket Evolucije sa "
-"podrškom za LDAP."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:162
-msgid ""
-"This address book cannot be opened.  This either means that an incorrect URI "
-"was entered, or the server is unreachable."
-msgstr ""
-"Ne mogu da otvorim ovaj adresar.  To znači da ste ili uneli pogrešnu adresu, "
-"ili je server nedostupan."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
-msgid "Detailed error message:"
-msgstr "Detalji greške:"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this address book."
-msgstr ""
-"Broj karti koje odgovaraju upitu je veći od broja na koji je server \n"
-"podešen da odgovori ili koji je Evolucija podešena da prikaže.\n"
-"Preciznije oblikujte upit ili povećajte ograničenje\n"
-"broja rezultata u postavkama adresara za server direktorijuma."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:218
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"configured for this address book.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this address book."
-msgstr ""
-"Vreme za izvršavanje ovog upita je preko ograničenja servera ili\n"
-"ograničenja koje ste podesili za ovaj adresar. Preciznije oblikujte\n"
-"upit ili povećajte vremensko ograničenje u postavkama servera\n"
-"direktorijuma za ovaj adresar."
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:226
-#, c-format
-msgid "The backend for this address book was unable to parse this query. %s"
-msgstr "Osnovni proces ovog adresara nije mogao da obradi upit. %s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:231
-#, c-format
-msgid "The backend for this address book refused to perform this query. %s"
-msgstr "Osnovni proces ovog adresara je odbio da obavi ovaj upit. %s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:237
-#: ../addressbook/gui/widgets/eab-gui-util.c:243
-#, c-format
-msgid "This query did not complete successfully. %s"
-msgstr "Ovaj upit nije uspešno završen. %s"
-
-#. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:265
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
-msgid "Select Address Book"
-msgstr "Izaberi adresar"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:398
-msgid "list"
-msgstr "spisak"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:587
-msgid "Move contact to"
-msgstr "Premesti kontakt u"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:589
-msgid "Copy contact to"
-msgstr "Umnoži kontakt u"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:592
-msgid "Move contacts to"
-msgstr "Premesti kontakte u"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
-msgid "Copy contacts to"
-msgstr "Umnoži kontakte u"
-
 #: ../addressbook/importers/evolution-csv-importer.c:746
 #: ../addressbook/importers/evolution-ldif-importer.c:548
 #: ../addressbook/importers/evolution-vcard-importer.c:249
-#: ../calendar/importers/icalendar-importer.c:439
-#: ../calendar/importers/icalendar-importer.c:934
-#: ../calendar/importers/icalendar-importer.c:973 ../shell/shell.error.xml.h:1
+#: ../calendar/importers/icalendar-importer.c:485
+#: ../calendar/importers/icalendar-importer.c:980
+#: ../calendar/importers/icalendar-importer.c:1019 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Uvozim..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1081
+#: ../addressbook/importers/evolution-csv-importer.c:1089
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Autluk kontakti CSV ili Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1082
+#: ../addressbook/importers/evolution-csv-importer.c:1090
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Autlukov uvoznik CSV i Tab kontakata"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1090
+#: ../addressbook/importers/evolution-csv-importer.c:1098
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozila kontakti CSV ili Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1091
+#: ../addressbook/importers/evolution-csv-importer.c:1099
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozilin uvoznik CSV i Tab kontakata"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1099
+#: ../addressbook/importers/evolution-csv-importer.c:1107
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolucija kontakti CSV ili Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1100
+#: ../addressbook/importers/evolution-csv-importer.c:1108
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolucijin uvoznik CSV i Tab kontakata"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:806
+#: ../addressbook/importers/evolution-ldif-importer.c:814
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP oblik razmene podataka (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:807
+#: ../addressbook/importers/evolution-ldif-importer.c:815
 msgid "Evolution LDIF importer"
 msgstr "Evolucijin LDIF uvoznik"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:634
+#: ../addressbook/importers/evolution-vcard-importer.c:642
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vKarta (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:635
+#: ../addressbook/importers/evolution-vcard-importer.c:643
 msgid "Evolution vCard Importer"
 msgstr "Evolucijin vKart uvoznik"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:763
+#: ../addressbook/printing/e-contact-print.c:874
 #, c-format
 msgid "Page %d"
 msgstr "%d. stranica"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:58
+#: ../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:59
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "OUTPUTFILE"
 msgstr "IZLAZNA-DATOTEKA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
+#: ../addressbook/tools/evolution-addressbook-export.c:58
 msgid "List local address book folders"
 msgstr "Navodi fascikle lokalnog adresara"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../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:66
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../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:147
+#: ../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:178
+#: ../addressbook/tools/evolution-addressbook-export.c:156
 msgid "Unhandled error"
 msgstr "Nepoznata greška"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:624
+#: ../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"
@@ -1751,7 +1846,125 @@ 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 "Nisam uspeo da otvorim „%s“: %s"
+msgstr "Ne mogu da otvorim „%s“: %s"
+
+#: ../addressbook/util/eab-book-util.c:36
+msgctxt "addressbook-label"
+msgid "Work Email"
+msgstr "Poslovna e-pošta"
+
+#: ../addressbook/util/eab-book-util.c:37
+msgctxt "addressbook-label"
+msgid "Home Email"
+msgstr "Kućna e-pošta"
+
+#: ../addressbook/util/eab-book-util.c:38
+msgctxt "addressbook-label"
+msgid "Other Email"
+msgstr "Druga e-pošta"
+
+#: ../addressbook/util/eab-book-util.c:44
+msgctxt "addressbook-label"
+msgid "Work SIP"
+msgstr "Poslovni SIP"
+
+#: ../addressbook/util/eab-book-util.c:45
+msgctxt "addressbook-label"
+msgid "Home SIP"
+msgstr "Kućni SIP"
+
+#: ../addressbook/util/eab-book-util.c:46
+msgctxt "addressbook-label"
+msgid "Other SIP"
+msgstr "Drugi SIP"
+
+#: ../addressbook/util/eab-book-util.c:74
+msgctxt "addressbook-label"
+msgid "AIM"
+msgstr "AIM"
+
+#: ../addressbook/util/eab-book-util.c:75
+msgctxt "addressbook-label"
+msgid "Jabber"
+msgstr "Džaber"
+
+#: ../addressbook/util/eab-book-util.c:76
+msgctxt "addressbook-label"
+msgid "Yahoo"
+msgstr "Jahu"
+
+#: ../addressbook/util/eab-book-util.c:77
+msgctxt "addressbook-label"
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/util/eab-book-util.c:78
+msgctxt "addressbook-label"
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/util/eab-book-util.c:79
+msgctxt "addressbook-label"
+msgid "ICQ"
+msgstr "ICKu"
+
+#: ../addressbook/util/eab-book-util.c:80
+msgctxt "addressbook-label"
+msgid "GroupWise"
+msgstr "GroupVajz"
+
+#: ../addressbook/util/eab-book-util.c:81
+msgctxt "addressbook-label"
+msgid "Skype"
+msgstr "Skajp"
+
+#: ../addressbook/util/eab-book-util.c:82
+msgctxt "addressbook-label"
+msgid "Twitter"
+msgstr "Tviter"
+
+#: ../addressbook/util/eab-book-util.c:83
+msgctxt "addressbook-label"
+msgid "Google Talk"
+msgstr "Gugl ćaskanje"
+
+#. To Translators:
+#. * if an email address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#.
+#: ../addressbook/util/eab-book-util.c:126
+msgctxt "addressbook-label"
+msgid "Email"
+msgstr "Elektronska pošta"
+
+#. To Translators:
+#. * if a SIP address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#. * SIP=Session Initiation Protocol, used for voice over IP
+#.
+#: ../addressbook/util/eab-book-util.c:173
+msgctxt "addressbook-label"
+msgid "SIP"
+msgstr "SIP"
+
+#. To Translators:
+#. * if an IM address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#. * IM=Instant Messaging
+#.
+#: ../addressbook/util/eab-book-util.c:216
+msgctxt "addressbook-label"
+msgid "IM"
+msgstr "IM"
+
+#. To Translators:
+#. * if a phone number type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#.
+#: ../addressbook/util/eab-book-util.c:271
+msgctxt "addressbook-label"
+msgid "Phone"
+msgstr "Telefon"
 
 #: ../calendar/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
@@ -1769,11 +1982,7 @@ msgstr[1] "sata"
 msgstr[2] "sati"
 msgstr[3] "sat"
 
-#. 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/alarm-notify/alarm-notify-dialog.c:131
-#: ../calendar/gui/dialogs/recurrence-page.c:1249
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dan"
@@ -1781,11 +1990,12 @@ msgstr[1] "dana"
 msgstr[2] "dana"
 msgstr[3] "dan"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:343
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:358
 msgid "Start time"
 msgstr "Vreme početka"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:1
+#: ../calendar/alarm-notify/alarm-queue.c:1949
 msgid "Appointments"
 msgstr "Zakazivanja"
 
@@ -1798,39 +2008,34 @@ msgid "_Snooze"
 msgstr "_Dremanje"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:4
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1322
-#: ../calendar/gui/dialogs/event-page.ui.h:24
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
-#: ../calendar/gui/dialogs/task-page.ui.h:32 ../e-util/filter.ui.h:17
-#: ../e-util/e-categories-editor.c:278
-#: ../e-util/e-mail-signature-manager.c:357
-#: ../mail/e-mail-account-manager.c:728 ../mail/e-mail-browser.c:170
-#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:56
-#: ../plugins/attachment-reminder/attachment-reminder.c:562
-#: ../plugins/email-custom-header/email-custom-header.c:843
-#: ../plugins/mail-to-task/mail-to-task.c:594
+#: ../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
+#: ../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:1072
+#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:941
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "_Edit"
 msgstr "_Uređivanje"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#| msgid "Print"
 msgid "_Print"
 msgstr "_Štampaj"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:165
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:164
 msgid "_Dismiss"
 msgstr "_Zanemari"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1835
-#: ../calendar/alarm-notify/alarm-queue.c:1845
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:249
-#: ../modules/itip-formatter/itip-view.c:1503
-#: ../modules/itip-formatter/itip-view.c:1614
+#: ../calendar/alarm-notify/alarm-queue.c:1916
+#: ../calendar/alarm-notify/alarm-queue.c:1926
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:248
+#: ../modules/itip-formatter/itip-view.c:1514
+#: ../modules/itip-formatter/itip-view.c:1625
 msgid "Location:"
 msgstr "Mesto:"
 
@@ -1845,50 +2050,45 @@ msgstr "Vreme _dremanja:"
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../e-util/filter.ui.h:8
-#: ../e-util/e-interval-chooser.c:142
-#: ../modules/calendar/e-cal-shell-view-actions.c:351
+#: ../e-util/e-interval-chooser.c:143 ../e-util/filter.ui.h:8
+#: ../modules/calendar/e-cal-shell-view-actions.c:344
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "days"
 msgstr "dana"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:11
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/filter.ui.h:7
-#: ../e-util/e-interval-chooser.c:140
+#: ../e-util/e-interval-chooser.c:141 ../e-util/filter.ui.h:7
 msgid "hours"
 msgstr "sati"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:12
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/filter.ui.h:6
-#: ../e-util/e-interval-chooser.c:138
+#: ../e-util/e-interval-chooser.c:139 ../e-util/filter.ui.h:6
 #: ../mail/e-mail-config-provider-page.c:526
 msgid "minutes"
 msgstr "minuta"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1678
-#: ../calendar/alarm-notify/alarm-queue.c:1815
+#: ../calendar/alarm-notify/alarm-queue.c:1714
+#: ../calendar/alarm-notify/alarm-queue.c:1896
 msgid "No summary available."
 msgstr "Nema dostupnog sažetka."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1687
-#: ../calendar/alarm-notify/alarm-queue.c:1689
+#: ../calendar/alarm-notify/alarm-queue.c:1723
+#: ../calendar/alarm-notify/alarm-queue.c:1725
 msgid "No description available."
 msgstr "Nema dostupnog opisa."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1697
+#: ../calendar/alarm-notify/alarm-queue.c:1733
 msgid "No location information available."
 msgstr "Nema dostupnog podatka o lokaciji."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1702
-#: ../calendar/alarm-notify/alarm-queue.c:1806
-#: ../calendar/alarm-notify/alarm-queue.c:2147
+#: ../calendar/alarm-notify/alarm-queue.c:1738
+#: ../calendar/alarm-notify/alarm-queue.c:1887
+#: ../calendar/alarm-notify/alarm-queue.c:2240
 msgid "Evolution Reminders"
 msgstr "Podsetnici Evolucije"
 
 # bug(slobo): plural-forms. Report this one to bugzilla.gnome.org
-#: ../calendar/alarm-notify/alarm-queue.c:1746
+#: ../calendar/alarm-notify/alarm-queue.c:1782
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
@@ -1897,22 +2097,21 @@ msgstr[1] "Imate %d potsetnika"
 msgstr[2] "Imate %d potsetnika"
 msgstr[3] "Imate jedan potsetnik"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1965
+#: ../calendar/alarm-notify/alarm-queue.c:2058
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1966 ../mail/mail-dialogs.ui.h:21
-#: ../mail/mail.error.xml.h:139
+#: ../calendar/alarm-notify/alarm-queue.c:2059 ../mail/mail-dialogs.ui.h:21
 #: ../modules/mailto-handler/evolution-mailto-handler.c:114
 msgid "_No"
 msgstr "_Ne"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1967 ../mail/mail.error.xml.h:138
+#: ../calendar/alarm-notify/alarm-queue.c:2060
 #: ../modules/mailto-handler/evolution-mailto-handler.c:115
 msgid "_Yes"
 msgstr "_Da"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1971
+#: ../calendar/alarm-notify/alarm-queue.c:2064
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1929,7 +2128,7 @@ msgstr ""
 "\n"
 "Da li ste sigurni da želite da pokrenete ovaj program?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1986
+#: ../calendar/alarm-notify/alarm-queue.c:2079
 msgid "Do not ask me about this program again."
 msgstr "Ne pitaj me ponovo za ovaj program."
 
@@ -1937,8 +2136,8 @@ msgstr "Ne pitaj me ponovo za ovaj program."
 msgid "invalid time"
 msgstr "neispravno vreme"
 
-#. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:369
+#. 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/gui/misc.c:103
 #, c-format
 msgid "%d hour"
@@ -1948,8 +2147,8 @@ msgstr[1] "%d sata"
 msgstr[2] "%d sati"
 msgstr[3] "Jedan sat"
 
-#. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:375
+#. 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/gui/misc.c:109
 #, c-format
 msgid "%d minute"
@@ -1960,9 +2159,9 @@ msgstr[2] "%d minuta"
 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 of appointment"
+#. 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:381
+#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:394
 #: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d second"
@@ -1993,8 +2192,7 @@ msgstr "Ne šalj_i"
 msgid "_Send Notice"
 msgstr "Pošalji po_dsetnik"
 
-#: ../calendar/calendar.error.xml.h:5
-#: ../calendar/gui/dialogs/delete-comp.c:192
+#: ../calendar/calendar.error.xml.h:5 ../calendar/gui/e-cal-dialogs.c:502
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Sigurno želite da obrišete ovaj sastanak?"
@@ -2013,8 +2211,7 @@ msgstr ""
 "Ukoliko ne pošaljete obaveštenje o otkazivanju, ostali učesnici možda neće "
 "znati da je zadatak obrisan."
 
-#: ../calendar/calendar.error.xml.h:9
-#: ../calendar/gui/dialogs/delete-comp.c:195
+#: ../calendar/calendar.error.xml.h:9 ../calendar/gui/e-cal-dialogs.c:505
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Sigurno želite da obrišete ovaj zadatak?"
@@ -2038,8 +2235,7 @@ msgstr ""
 "Ukoliko ne pošaljete obaveštenje o otkazivanju, ostali učesnici možda neće "
 "znati da je beleška obrisana."
 
-#: ../calendar/calendar.error.xml.h:13
-#: ../calendar/gui/dialogs/delete-comp.c:198
+#: ../calendar/calendar.error.xml.h:13 ../calendar/gui/e-cal-dialogs.c:508
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Sigurno želite da obrišete ovu belešku?"
@@ -2125,8 +2321,7 @@ msgstr "Izmenili ste ovaj sastanak, ali još niste sačuvali."
 msgid "_Save Changes"
 msgstr "Sačuvaj iz_mene"
 
-#: ../calendar/calendar.error.xml.h:31
-#: ../composer/mail-composer.error.xml.h:16
+#: ../calendar/calendar.error.xml.h:31 ../composer/mail-composer.error.xml.h:13
 msgid "_Discard Changes"
 msgstr "_Odbaci izmene"
 
@@ -2166,8 +2361,8 @@ msgstr ""
 "Pozivnice će biti poslate el. poštom svim učesnicima i omogućiće im da "
 "odgovore."
 
-#: ../calendar/calendar.error.xml.h:40
-#: ../composer/mail-composer.error.xml.h:13 ../mail/mail.error.xml.h:8
+#: ../calendar/calendar.error.xml.h:40 ../composer/mail-composer.error.xml.h:36
+#: ../mail/mail.error.xml.h:8
 #: ../plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:5
 msgid "_Send"
 msgstr "_Pošalji"
@@ -2233,38 +2428,70 @@ msgstr ""
 "zadataka bude osvežen."
 
 #: ../calendar/calendar.error.xml.h:52
+#| msgid "Would you like to send this task to participants?"
+msgid "Would you like to send this memo to participants?"
+msgstr "Želite li da pošaljete učesnicima ovu belešku?"
+
+#: ../calendar/calendar.error.xml.h:53
+#| msgid ""
+#| "Email invitations will be sent to all participants and allow them to "
+#| "accept this task."
+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."
+
+#: ../calendar/calendar.error.xml.h:54
+#| msgid "Would you like to send updated meeting information to participants?"
+msgid "Would you like to send updated memo information to participants?"
+msgstr "Želite li da pošaljete učesnicima osvežene podatke o beleški?"
+
+#: ../calendar/calendar.error.xml.h:55
+#| msgid ""
+#| "Sending updated information allows other participants to keep their task "
+#| "lists up to date."
+msgid ""
+"Sending updated information allows other participants to keep their memo "
+"lists up to date."
+msgstr ""
+"Slanje osveženih podataka omogućava ostalim učesnicima da njihov spisak "
+"beleški bude osvežen."
+
+#: ../calendar/calendar.error.xml.h:56
 msgid "Editor could not be loaded."
 msgstr "Uređivač nije mogao biti učitan."
 
-#: ../calendar/calendar.error.xml.h:53
+#: ../calendar/calendar.error.xml.h:57
 msgid "Delete calendar '{0}'?"
 msgstr "Da obrišem kalendar „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:54
+#: ../calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "Ovaj kalendar će biti trajno uklonjen."
 
-#: ../calendar/calendar.error.xml.h:55
+#: ../calendar/calendar.error.xml.h:59
 msgid "Delete task list '{0}'?"
 msgstr "Da obrišem spisak zadataka „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:56
+#: ../calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "Ovaj spisak zadataka će biti trajno uklonjen."
 
-#: ../calendar/calendar.error.xml.h:57
+#: ../calendar/calendar.error.xml.h:61
 msgid "Delete memo list '{0}'?"
 msgstr "Da obrišem spisak beleški „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:58
+#: ../calendar/calendar.error.xml.h:62
 msgid "This memo list will be removed permanently."
 msgstr "Ovaj spisak beleški će biti trajno uklonjen."
 
-#: ../calendar/calendar.error.xml.h:59
+#: ../calendar/calendar.error.xml.h:63
 msgid "Delete remote calendar '{0}'?"
 msgstr "Da obrišem udaljeni kalendar „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:60
+#: ../calendar/calendar.error.xml.h:64
 msgid ""
 "This will permanently remove the calendar '{0}' from the server. Are you "
 "sure you want to proceed?"
@@ -2272,11 +2499,11 @@ msgstr ""
 "Ovo će trajno ukloniti kalendar „{0}“ sa servera. Da li ste sigurni da "
 "želite da nastavite?"
 
-#: ../calendar/calendar.error.xml.h:62
+#: ../calendar/calendar.error.xml.h:66
 msgid "Delete remote task list '{0}'?"
 msgstr "Da obrišem udaljeni spisak zadataka „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:63
+#: ../calendar/calendar.error.xml.h:67
 msgid ""
 "This will permanently remove the task list '{0}' from the server. Are you "
 "sure you want to proceed?"
@@ -2284,11 +2511,11 @@ msgstr ""
 "Ovo će trajno ukloniti spisak zadataka „{0}“ sa servera. Da li ste sigurni "
 "da želite da nastavite?"
 
-#: ../calendar/calendar.error.xml.h:64
+#: ../calendar/calendar.error.xml.h:68
 msgid "Delete remote memo list '{0}'?"
 msgstr "Da obrišem udaljeni spisak beleški „{0}“?"
 
-#: ../calendar/calendar.error.xml.h:65
+#: ../calendar/calendar.error.xml.h:69
 msgid ""
 "This will permanently remove the memo list '{0}' from the server. Are you "
 "sure you want to proceed?"
@@ -2296,11 +2523,11 @@ msgstr ""
 "Ovo će trajno ukloniti spisak beleški „{0}“ sa servera. Da li ste sigurni da "
 "želite da nastavite?"
 
-#: ../calendar/calendar.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:70
 msgid "Are you sure you want to save the appointment without a summary?"
 msgstr "Sigurno želite da sačuvate zakazivanje bez sažetka?"
 
-#: ../calendar/calendar.error.xml.h:67
+#: ../calendar/calendar.error.xml.h:71
 msgid ""
 "Adding a meaningful summary to your appointment will give you an idea of "
 "what your appointment is about."
@@ -2308,11 +2535,11 @@ msgstr ""
 "Ako dodate smisaoni sažetak vašem zakazivanju biće vam jasnije u vezi čega je "
 "vaš sastanak."
 
-#: ../calendar/calendar.error.xml.h:68
+#: ../calendar/calendar.error.xml.h:72
 msgid "Are you sure you want to save the task without a summary?"
 msgstr "Sigurno želite da sačuvate zadatak bez sažetka?"
 
-#: ../calendar/calendar.error.xml.h:69
+#: ../calendar/calendar.error.xml.h:73
 msgid ""
 "Adding a meaningful summary to your task will give you an idea of what your "
 "task is about."
@@ -2320,25 +2547,25 @@ msgstr ""
 "Ako dodate smisaoni sažetak vašem zadatku biće vam jasnije u vezi čega je "
 "vaš zadatak."
 
-#: ../calendar/calendar.error.xml.h:70
+#: ../calendar/calendar.error.xml.h:74
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "Sigurno želite da sačuvate belešku bez sažetka?"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:72
+#: ../calendar/calendar.error.xml.h:76
 msgid "Error loading calendar '{0}'"
 msgstr "Greška učitavanja kalendara „{0}“"
 
-#: ../calendar/calendar.error.xml.h:73
+#: ../calendar/calendar.error.xml.h:77
 msgid "The calendar is not marked for offline usage."
 msgstr "Ovaj kalendar nije označen za korišćenje van mreže."
 
-#: ../calendar/calendar.error.xml.h:74
+#: ../calendar/calendar.error.xml.h:78
 msgid "Cannot save event"
 msgstr "Ne mogu da sačuvam događaj"
 
 #. Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:76
+#: ../calendar/calendar.error.xml.h:80
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
@@ -2346,12 +2573,12 @@ msgstr ""
 "Kalendar „{0}“ je samo za čitanje i ne može biti izmenjen. Izaberite drugi "
 "kalendar koji prihvata zakazivanje."
 
-#: ../calendar/calendar.error.xml.h:77
+#: ../calendar/calendar.error.xml.h:81
 msgid "Cannot save task"
 msgstr "Ne mogu da sačuvam zadatak"
 
 #. Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:83
 msgid ""
 "'{0}' does not support assigned tasks, please select a different task list."
 msgstr ""
@@ -2359,104 +2586,259 @@ msgstr ""
 "zadataka."
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:81
+#: ../calendar/calendar.error.xml.h:85
 msgid "Error loading task list '{0}'"
 msgstr "Greška učitavanja spiska zadataka „{0}“"
 
-#: ../calendar/calendar.error.xml.h:82
+#: ../calendar/calendar.error.xml.h:86
 msgid "The task list is not marked for offline usage."
 msgstr "Spisak zadataka nije označen za korišćenje van mreže."
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:84
+#: ../calendar/calendar.error.xml.h:88
 msgid "Error loading memo list '{0}'"
 msgstr "Greška učitavanja spiska beleški „{0}“"
 
-#: ../calendar/calendar.error.xml.h:85
+#: ../calendar/calendar.error.xml.h:89
 msgid "The memo list is not marked for offline usage."
 msgstr "Spisak beleški nije označen za korišćenje van mreže."
 
+#. Translators: {0} is the name of the calendar/memo list/task list.
+#: ../calendar/calendar.error.xml.h:91
+#| msgid "Failed to connect '{0}'"
+msgid "Failed to add timezone to '{0}'"
+msgstr "Nisam uspeo da dodam vremensku zonu u „{0}“"
+
+#. The {0} is a calendar/memo list/task list name, which is useless here
+#: ../calendar/calendar.error.xml.h:93
+#| msgid "Could not save attachments"
+msgid "Failed to save attachments"
+msgstr "Nisam uspeo da sačuvam priloge"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:95
+msgid "Failed to open calendar '{0}'"
+msgstr "Ne mogu da otvorim kalendar „{0}“"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:97
+msgid "Failed to open memo list '{0}'"
+msgstr "Ne mogu da otvorim spisak beleški „{0}“"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:99
+msgid "Failed to open task list '{0}'"
+msgstr "Ne mogu da otvorim spisak zadataka „{0}“"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:101
+msgid "Failed to create an event in the calendar '{0}'"
+msgstr "Ne mogu da napravim događaj u kalendaru „{0}“"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:103
+msgid "Failed to create a memo in the memo list '{0}'"
+msgstr "Ne mogu da napravim belešku u spisku beleški „{0}“"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:105
+msgid "Failed to create a task in the task list '{0}'"
+msgstr "Ne mogu da napravim zadatak u spisak zadataka „{0}“"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:107
+msgid "Failed to modify an event in the calendar '{0}'"
+msgstr "Ne mogu da izmenim događaj u kalendaru „{0}“"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:109
+msgid "Failed to modify a memo in the memo list '{0}'"
+msgstr "Ne mogu da izmenim belešku u spisku beleški „{0}“"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:111
+msgid "Failed to modify a task in the task list '{0}'"
+msgstr "Ne mogu da izmenim zadatak u spisku zadataka „{0}“"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:113
+msgid "Failed to delete an event in the calendar '{0}'"
+msgstr "Ne mogu da obrišem događaj iz kalendara „{0}“"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:115
+msgid "Failed to delete a memo in the memo list '{0}'"
+msgstr "Ne mogu da obrišem belešku iz spiska beleški „{0}“"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:117
+msgid "Failed to delete a task in the task list '{0}'"
+msgstr "Ne mogu da obrišem zadatak iz spiska zadataka „{0}“"
+
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:87
+#: ../calendar/calendar.error.xml.h:119
+msgid "Failed to update an event in the calendar '{0}'"
+msgstr "Ne mogu da ažuriram događaj iz kalendara „{0}“"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:121
+msgid "Failed to update a memo in the memo list '{0}'"
+msgstr "Ne mogu da ažuriram belešku iz spiska beleški „{0}“"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:123
+msgid "Failed to update a task in the task list '{0}'"
+msgstr "Ne mogu da ažuriram zadatak iz spiska zadataka „{0}“"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:125
+msgid "Failed to send an event to the calendar '{0}'"
+msgstr "Ne mogu da pošaljem događaj u kalendar „{0}“"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:127
+msgid "Failed to send a memo to the memo list '{0}'"
+msgstr "Ne mogu da pošaljem belešku u spisak beleški „{0}“"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:129
+msgid "Failed to send a task to the task list '{0}'"
+msgstr "Ne mogu da pošaljem pošaljem zadatak u spisak zadataka „{0}“"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:131
+msgid "Error creating view for the calendar '{0}'"
+msgstr "Greška u prikazivanju kalendara „{0}“"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:133
+msgid "Error creating view for the task list '{0}'"
+msgstr "Greška u prikazivanju spiska zadataka „{0}“"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:135
+msgid "Error creating view for the memo list '{0}'"
+msgstr "Greška u prikazivanju spiska beleški „{0}“"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:137
 msgid "Failed to copy an event into the calendar '{0}'"
-msgstr "Nisam uspeo da umnožim događaj u kalendar „{0}“"
+msgstr "Ne mogu da umnožim događaj u kalendar „{0}“"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:139
 msgid "Failed to copy a task into the task list '{0}'"
-msgstr "Nisam uspeo da umnožim zadatak u spisak zadataka „{0}“"
+msgstr "Ne mogu da umnožim zadatak u spisak zadataka „{0}“"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:91
+#: ../calendar/calendar.error.xml.h:141
 msgid "Failed to copy a memo into the memo list '{0}'"
-msgstr "Nisam uspeo da umnožim belešku u spisak beleški „{0}“"
+msgstr "Ne mogu da umnožim belešku u spisak beleški „{0}“"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:93
+#: ../calendar/calendar.error.xml.h:143
 msgid "Failed to move an event into the calendar '{0}'"
-msgstr "Nisam uspeo da premestim događaj u kalendar „{0}“"
+msgstr "Ne mogu da premestim događaj u kalendar „{0}“"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:95
+#: ../calendar/calendar.error.xml.h:145
 msgid "Failed to move a task into the task list '{0}'"
-msgstr "Nisam uspeo da premestim zadatak u spisak zadataka „{0}“"
+msgstr "Ne mogu da premestim zadatak u spisak zadataka „{0}“"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:97
+#: ../calendar/calendar.error.xml.h:147
 msgid "Failed to move a memo into the memo list '{0}'"
 msgstr "Nisam uspeo premestim belešku u spisak beleški „{0}“"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:99
+#: ../calendar/calendar.error.xml.h:149
+#| msgid "Failed to send an event to the calendar '{0}'"
+msgid "Failed to get an event from the calendar '{0}'"
+msgstr "Nisam uspeo da dobavim događaj iz kalendara „{0}“"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:151
+#| msgid "Failed to send a task to the task list '{0}'"
+msgid "Failed to get a task from the task list '{0}'"
+msgstr "Nisam uspeo da dobavim zadatak sa spiska zadataka „{0}“"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:153
+#| msgid "Failed to send a memo to the memo list '{0}'"
+msgid "Failed to get a memo from the memo list '{0}'"
+msgstr "Nisam uspeo da dobavim belešku sa spiska beleški „{0}“"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:155
 msgid "Copying an event into the calendar '{0}'"
 msgstr "Umnožavam događaj u kalendar „{0}“"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:101
+#: ../calendar/calendar.error.xml.h:157
 msgid "Copying a task into the task list '{0}'"
 msgstr "Umnožavam zadatak u spisak zadataka „{0}“"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:103
+#: ../calendar/calendar.error.xml.h:159
 msgid "Copying a memo into the memo list '{0}'"
 msgstr "Umnožavam belešku u spisak beleški „{0}“"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:105
+#: ../calendar/calendar.error.xml.h:161
 msgid "Moving an event into the calendar '{0}'"
 msgstr "Premeštam događaj u kalendar „{0}“"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:107
+#: ../calendar/calendar.error.xml.h:163
 msgid "Moving a task into the task list '{0}'"
 msgstr "Premeštam zadatak u spisak zadataka „{0}“"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:109
+#: ../calendar/calendar.error.xml.h:165
 msgid "Moving a memo into the memo list '{0}'"
 msgstr "Premeštam belešku u spisak beleški „{0}“"
 
-#: ../calendar/gui/caltypes.xml.h:1
-#: ../calendar/gui/e-calendar-table.etspec.h:4
-#: ../calendar/gui/e-cal-list-view.etspec.h:3
-#: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:167
+msgid "Failed to refresh calendar '{0}'"
+msgstr "Ne mogu da osvežim kalendar „{0}“?"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:169
+msgid "Failed to refresh task list '{0}'"
+msgstr "Ne mogu da osvežim spisak zadataka „{0}“"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:171
+msgid "Failed to refresh memo list '{0}'"
+msgstr "Ne mogu da osvežim spisak beleški „{0}“"
+
+#: ../calendar/calendar.error.xml.h:172
+msgid "Failed to make an occurrence movable"
+msgstr "Ne mogu da napravim ovu pojavu pokretnom"
+
+#: ../calendar/gui/caltypes.xml.h:1 ../calendar/gui/e-cal-list-view.etspec.h:3
+#: ../calendar/gui/e-memo-table.etspec.h:2
+#: ../calendar/gui/e-task-table.etspec.h:4 ../calendar/gui/memotypes.xml.h:1
 #: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:375
 msgid "Summary"
 msgstr "Sažetak"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:55
+#: ../calendar/gui/tasktypes.xml.h:2 ../mail/filtertypes.xml.in.h:2
+#: ../mail/searchtypes.xml.in.h:2 ../mail/vfoldertypes.xml.in.h:2
 msgid "contains"
 msgstr "sadrži"
 
 #: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:56
+#: ../calendar/gui/tasktypes.xml.h:3 ../mail/filtertypes.xml.in.h:3
+#: ../mail/searchtypes.xml.in.h:3 ../mail/vfoldertypes.xml.in.h:3
 msgid "does not contain"
 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-table-config.ui.h:7 ../e-util/e-attachment-tree-view.c:527
+#: ../e-util/e-attachment-tree-view.c:533 ../e-util/e-table-config.ui.h:7
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Description"
 msgstr "Opis"
@@ -2471,34 +2853,32 @@ msgid "Classification"
 msgstr "Razvrstavanje"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:8
-#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:75
+#: ../calendar/gui/tasktypes.xml.h:9 ../mail/filtertypes.xml.in.h:4
+#: ../mail/searchtypes.xml.in.h:4 ../mail/vfoldertypes.xml.in.h:4
 msgid "is"
 msgstr "je"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:73
+#: ../calendar/gui/tasktypes.xml.h:10 ../mail/filtertypes.xml.in.h:5
+#: ../mail/searchtypes.xml.in.h:5 ../mail/vfoldertypes.xml.in.h:5
 msgid "is not"
 msgstr "nije"
 
-#. To Translators: This is task classification
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2
-#: ../calendar/gui/e-cal-list-view.c:249 ../calendar/gui/e-cal-model.c:453
-#: ../calendar/gui/e-cal-model.c:460 ../calendar/gui/e-task-table.c:546
-#: ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:241
+#: ../calendar/gui/e-cal-model.c:305 ../calendar/gui/e-cal-model.c:312
+#: ../calendar/gui/e-task-table.c:498 ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "Javno"
 
-#. To Translators: This is task classification
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4
-#: ../calendar/gui/e-cal-list-view.c:250 ../calendar/gui/e-cal-model.c:462
-#: ../calendar/gui/e-task-table.c:547 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:242
+#: ../calendar/gui/e-cal-model.c:314 ../calendar/gui/e-task-table.c:499
+#: ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "Lično"
 
-#. To Translators: This is task classification
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
-#: ../calendar/gui/e-cal-list-view.c:251 ../calendar/gui/e-cal-model.c:464
-#: ../calendar/gui/e-task-table.c:548 ../calendar/gui/memotypes.xml.h:12
+#: ../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
 #: ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Poverljivo"
@@ -2514,40 +2894,41 @@ msgstr "Organizator"
 msgid "Attendee"
 msgstr "Učesnik"
 
-#: ../calendar/gui/caltypes.xml.h:14
-#: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
-#: ../plugins/publish-calendar/publish-calendar.c:903
+#: ../calendar/gui/caltypes.xml.h:14 ../calendar/gui/e-cal-list-view.etspec.h:5
+#: ../mail/message-list.etspec.h:14
+#: ../plugins/publish-calendar/publish-calendar.c:862
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
 #: ../plugins/save-calendar/csv-format.c:389
 msgid "Location"
 msgstr "Mesto"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:326
+#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:327
 msgid "Category"
 msgstr "Kategorija"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
-#: ../em-format/e-mail-formatter-print-headers.c:203
-#: ../mail/em-filter-i18n.h:6
+#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:51
+#: ../em-format/e-mail-formatter-print-headers.c:157
+#: ../mail/filtertypes.xml.in.h:47 ../mail/searchtypes.xml.in.h:49
+#: ../mail/vfoldertypes.xml.in.h:50
 msgid "Attachments"
 msgstr "Prilozi"
 
 #: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:18
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:48
+#: ../mail/searchtypes.xml.in.h:50 ../mail/vfoldertypes.xml.in.h:51
 msgid "Exist"
 msgstr "Postoji"
 
 #: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:49
+#: ../mail/searchtypes.xml.in.h:51 ../mail/vfoldertypes.xml.in.h:52
 msgid "Do Not Exist"
 msgstr "Ne postoji"
 
 #: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/dialogs/event-editor.c:309
-#: ../calendar/gui/dialogs/event-editor.c:330
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:15
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2004
 msgid "Recurrence"
 msgstr "Ponavljanje"
 
@@ -2577,980 +2958,1356 @@ msgstr "Sažetak sadrži"
 msgid "Description Contains"
 msgstr "Opisi"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:668
-msgid "Edit Reminder"
-msgstr "Uredi podsetnik"
+#: ../calendar/gui/ea-cal-view.c:283
+msgid "New Appointment"
+msgstr "Novo zakazivanje"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:896
-#: ../calendar/gui/e-alarm-list.c:411
-msgid "Pop up an alert"
-msgstr "Iskačuće upozorenje"
+#: ../calendar/gui/ea-cal-view.c:284
+msgid "New All Day Event"
+msgstr "Novi celodnevni događaj"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:897
-#: ../calendar/gui/e-alarm-list.c:407
-msgid "Play a sound"
-msgstr "Pušta zvuk"
+#: ../calendar/gui/ea-cal-view.c:285
+msgid "New Meeting"
+msgstr "Novi sastanak"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:898
-#: ../calendar/gui/e-alarm-list.c:419
-msgid "Run a program"
-msgstr "Pokreće program"
+#: ../calendar/gui/ea-cal-view.c:286
+msgid "Go to Today"
+msgstr "Idi na današnji dan"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:899
-#: ../calendar/gui/e-alarm-list.c:415
-msgid "Send an email"
-msgstr "Šalje elektronsku poruku"
+#: ../calendar/gui/ea-cal-view.c:287
+msgid "Go to Date"
+msgstr "Idi na datum"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:908
-msgid "before"
-msgstr "pre"
+#: ../calendar/gui/ea-cal-view-event.c:234
+msgid "It has reminders."
+msgstr "Ima podsetnike."
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:909
-msgid "after"
-msgstr "posle"
+#: ../calendar/gui/ea-cal-view-event.c:237
+msgid "It has recurrences."
+msgstr "Ima ponavljanja."
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:918
-msgid "start of appointment"
-msgstr "zakazani početak"
+#: ../calendar/gui/ea-cal-view-event.c:240
+msgid "It is a meeting."
+msgstr "To je sastanak."
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:919
-msgid "end of appointment"
-msgstr "kraj sastanka"
+#: ../calendar/gui/ea-cal-view-event.c:247
+#, c-format
+msgid "Calendar Event: Summary is %s."
+msgstr "Kalendarski događaj: sažetak je %s."
 
-# bug: plural-forms
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:1
-msgid "minute(s)"
-msgstr "minut(i)"
+#: ../calendar/gui/ea-cal-view-event.c:250
+msgid "Calendar Event: It has no summary."
+msgstr "Kalendarski događaj: nema sažetka."
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:2
-msgid "hour(s)"
-msgstr "sat(i)"
+#: ../calendar/gui/ea-cal-view-event.c:273
+msgid "calendar view event"
+msgstr "događaj pregleda kalendara"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:3
-msgid "day(s)"
-msgstr "dan(i)"
+#: ../calendar/gui/ea-cal-view-event.c:505
+msgid "Grab Focus"
+msgstr "Fokusiraj"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:7
-msgid "Add Reminder"
-msgstr "Dodaj podsetnik"
+#: ../calendar/gui/ea-day-view.c:107 ../calendar/gui/ea-week-view.c:107
+#, c-format
+msgid "It has %d event."
+msgid_plural "It has %d events."
+msgstr[0] "Ima %d događaj."
+msgstr[1] "Ima %d događaja."
+msgstr[2] "Ima %d događaja."
+msgstr[3] "Ima %d događaj."
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
-#: ../calendar/gui/dialogs/event-editor.c:352
-msgid "Reminder"
-msgstr "Podsetnik"
+#. To translators: Here, "It" is either like "Work Week View: July
+#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
+#: ../calendar/gui/ea-day-view.c:114 ../calendar/gui/ea-week-view.c:110
+msgid "It has no events."
+msgstr "Nema događaja."
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
-msgid "Repeat"
-msgstr "Ponovi"
+#: ../calendar/gui/ea-day-view.c:121
+#, c-format
+msgid "Work Week View: %s. %s"
+msgstr "Pregled radne nedelje: %s. %s"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-msgid "_Repeat the reminder"
-msgstr "Po_novi podsetnik"
+#: ../calendar/gui/ea-day-view.c:128
+#, c-format
+msgid "Day View: %s. %s"
+msgstr "Dnevni pregled: %s. %s"
 
-#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
-msgid "extra times every"
-msgstr "prikaži još na svakih"
+#: ../calendar/gui/ea-day-view.c:157
+msgid "calendar view for a work week"
+msgstr "pregled kalendara za radnu nedelju"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:32
-msgid "Options"
-msgstr "Mogućnosti"
+#: ../calendar/gui/ea-day-view.c:159
+msgid "calendar view for one or more days"
+msgstr "pregled kalendara za jedan ili više dana"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
-msgid "Custom _message"
-msgstr "Proizvoljna _poruka"
+#: ../calendar/gui/ea-day-view-main-item.c:266
+#: ../calendar/gui/ea-week-view-main-item.c:295
+msgid "a table to view and select the current time range"
+msgstr "tabela za prikaz i izbor tekućeg vremenskog raspona"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
-msgid "Mes_sage:"
-msgstr "Po_ruka:"
+#: ../calendar/gui/ea-jump-button.c:150
+msgid "Jump button"
+msgstr "Dugme za preskakanje"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
-msgid "Custom reminder sound"
-msgstr "Proizvoljan zvuk podsetnika"
+#: ../calendar/gui/ea-jump-button.c:159
+msgid "Click here, you can find more events."
+msgstr "Kliknite ovde, možete naći još događaja."
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
-msgid "_Sound:"
-msgstr "_Zvuk:"
+#. 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"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
-msgid "Select A File"
-msgstr "Izaberite datoteku"
+#. Translator: Entire string is like "Pop up an alert %d weeks before start"
+#: ../calendar/gui/e-alarm-list.c:376
+#, c-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d nedelja"
+msgstr[1] "%d nedelje"
+msgstr[2] "%d nedelja"
+msgstr[3] "%d nedelja"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
-msgid "_Program:"
-msgstr "_Program:"
+#. 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
+#| msgid "Play a sound"
+msgctxt "cal-reminders"
+msgid "Play a sound"
+msgstr "Pusti zvuk"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
-msgid "_Arguments:"
-msgstr "_Argumenti:"
+#. 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
+#| msgid "Pop up an alert"
+msgctxt "cal-reminders"
+msgid "Pop up an alert"
+msgstr "Izbaci upozorenje"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
-msgid "Send To:"
-msgstr "Pošalji:"
+#. 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
+#| msgid "Send an email"
+msgctxt "cal-reminders"
+msgid "Send an email"
+msgstr "Pošalji el. poštu"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:239
-msgid "Action/Trigger"
-msgstr "Radnja/pokretač"
+#. 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
+#| msgid "Run a program"
+msgctxt "cal-reminders"
+msgid "Run a program"
+msgstr "Pokreni program"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
-#: ../calendar/gui/dialogs/event-page.ui.h:28
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
-msgid "Reminders"
-msgstr "Podsetnici"
+#: ../calendar/gui/e-alarm-list.c:439
+#| msgid "Unknown action to be performed"
+msgctxt "cal-reminders"
+msgid "Unknown action to be performed"
+msgstr "Izvršiće se nepoznata radnja"
 
-#: ../calendar/gui/dialogs/changed-comp.c:59
-msgid "This event has been deleted."
-msgstr "Ovaj događaj je obrisan."
+#: ../calendar/gui/e-alarm-list.c:454
+#, c-format
+#| msgid "%s %s before the start of the appointment"
+msgctxt "cal-reminders"
+msgid "%s %s before the start"
+msgstr "%s %s pre početka"
 
-#: ../calendar/gui/dialogs/changed-comp.c:63
-msgid "This task has been deleted."
-msgstr "Ovaj zadatak je obrisan."
+#: ../calendar/gui/e-alarm-list.c:460
+#, c-format
+#| msgid "%s %s after the start of the appointment"
+msgctxt "cal-reminders"
+msgid "%s %s after the start"
+msgstr "%s %s nakon početka"
 
-#: ../calendar/gui/dialogs/changed-comp.c:67
-msgid "This memo has been deleted."
-msgstr "Ova beleška je obrisana."
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:467
+#, c-format
+#| msgid "%s attachment"
+msgctxt "cal-reminders"
+msgid "%s at the start"
+msgstr "%s na početku"
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/e-alarm-list.c:479
 #, c-format
-msgid "%s  You have made changes. Forget those changes and close the editor?"
-msgstr ""
-"%s  Načinili ste izmene. Da zanemarim te izmene i da zatvorim uređivač?"
+#| msgid "%s %s before the end of the appointment"
+msgctxt "cal-reminders"
+msgid "%s %s before the end"
+msgstr "%s %s pre kraja"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/e-alarm-list.c:485
 #, c-format
-msgid "%s  You have made no changes, close the editor?"
-msgstr "%s  Niste načinili izmene, da zatvorim uređivač?"
+#| msgid "%s %s after the end of the appointment"
+msgctxt "cal-reminders"
+msgid "%s %s after the end"
+msgstr "%s %s nakon završetka"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
-msgid "This event has been changed."
-msgstr "Ovaj događaj je izmenjen."
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound"
+#: ../calendar/gui/e-alarm-list.c:492
+#, c-format
+#| msgid "%s attachment"
+msgctxt "cal-reminders"
+msgid "%s at the end"
+msgstr "%s na kraju"
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
-msgid "This task has been changed."
-msgstr "Ovaj zadatak je izmenjen."
+#. Translator: The first %s refers to the base, which would be actions like
+#. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
+#: ../calendar/gui/e-alarm-list.c:516
+#, c-format
+#| msgid "%s at %s"
+msgctxt "cal-reminders"
+msgid "%s at %s"
+msgstr "%s u %s"
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
-msgid "This memo has been changed."
-msgstr "Ova beleška je izmenjena."
+#. Translator: The %s refers to the base, which would be actions like
+#. * "Play a sound". "Trigger types" are absolute or relative dates
+#: ../calendar/gui/e-alarm-list.c:524
+#, c-format
+#| msgid "%s for an unknown trigger type"
+msgctxt "cal-reminders"
+msgid "%s for an unknown trigger type"
+msgstr "%s za nepoznatu vrstu okidača"
 
-#: ../calendar/gui/dialogs/changed-comp.c:102
+#: ../calendar/gui/ea-week-view.c:114
 #, c-format
-msgid "%s  You have made changes. Forget those changes and update the editor?"
-msgstr "%s  Načinili ste izmene. Da zanemarim te izmene i da osvežim uređivač?"
+msgid "Month View: %s. %s"
+msgstr "Mesečni pregled: %s. %s"
 
-#: ../calendar/gui/dialogs/changed-comp.c:104
+#: ../calendar/gui/ea-week-view.c:119
 #, c-format
-msgid "%s  You have made no changes, update the editor?"
-msgstr "%s  Niste načinili izmene, da osvežim uređivač?"
+msgid "Week View: %s. %s"
+msgstr "Nedeljni pregled: %s. %s"
+
+#: ../calendar/gui/ea-week-view.c:148
+msgid "calendar view for a month"
+msgstr "pregled kalendara za mesec"
+
+#: ../calendar/gui/ea-week-view.c:150
+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
+msgid "Untitled"
+msgstr "Neimenovano"
+
+#: ../calendar/gui/e-cal-component-preview.c:222
+msgid "Categories:"
+msgstr "Kategorije:"
+
+#: ../calendar/gui/e-cal-component-preview.c:256
+msgid "Summary:"
+msgstr "Sažetak:"
+
+#: ../calendar/gui/e-cal-component-preview.c:264
+msgid "Start Date:"
+msgstr "Datum početka:"
+
+#: ../calendar/gui/e-cal-component-preview.c:275
+msgid "End Date:"
+msgstr "Datum završetka:"
+
+#: ../calendar/gui/e-cal-component-preview.c:286
+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
+msgid "Status:"
+msgstr "Stanje:"
+
+#: ../calendar/gui/e-cal-component-preview.c:302
+#: ../calendar/gui/e-cal-model-tasks.c:312
+#: ../calendar/gui/e-cal-model-tasks.c:554
+#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:608
+#: ../calendar/gui/print.c:3582
+msgid "In Progress"
+msgstr "U toku"
+
+# timezone.
+#: ../calendar/gui/e-cal-component-preview.c:305
+#: ../calendar/gui/e-cal-model-tasks.c:314
+#: ../calendar/gui/e-cal-model-tasks.c:556
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../calendar/gui/e-task-table.c:211 ../calendar/gui/e-task-table.c:226
+#: ../calendar/gui/e-task-table.c:609 ../calendar/gui/print.c:3585
+#: ../calendar/gui/tasktypes.xml.h:13 ../plugins/save-calendar/csv-format.c:379
+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
+#: ../calendar/gui/e-task-table.c:222 ../calendar/gui/e-task-table.c:607
+#: ../calendar/gui/print.c:3579 ../calendar/gui/tasktypes.xml.h:11
+msgid "Not Started"
+msgstr "Nije započet"
+
+#: ../calendar/gui/e-cal-component-preview.c:325
+msgid "Priority:"
+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
+msgid "High"
+msgstr "Visok"
 
-#: ../calendar/gui/dialogs/comp-editor.c:271
-msgid "Could not save attachments"
-msgstr "Ne mogu da sačuvam priloge"
+#: ../calendar/gui/e-cal-component-preview.c:329
+#: ../calendar/gui/e-cal-model.c:1872 ../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
+msgid "Normal"
+msgstr "Običan"
 
-#: ../calendar/gui/dialogs/comp-editor.c:626
-msgid "Could not update object"
-msgstr "Ne mogu da osvežim objekat"
+#: ../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
+msgid "Low"
+msgstr "Nizak"
 
-#: ../calendar/gui/dialogs/comp-editor.c:760
-msgid "Edit Appointment"
-msgstr "Uredi zakazivanje"
+#: ../calendar/gui/e-cal-component-preview.c:350
+#: ../mail/e-mail-config-service-page.c:670
+msgid "Description:"
+msgstr "Opis:"
+
+#: ../calendar/gui/e-cal-component-preview.c:381
+msgid "Web Page:"
+msgstr "Veb stranica:"
 
-#: ../calendar/gui/dialogs/comp-editor.c:767
+#: ../calendar/gui/e-cal-data-model.c:1633
 #, c-format
-msgid "Meeting - %s"
-msgstr "Sastanak — %s"
+msgid "Creating view for calendar '%s'"
+msgstr "Prikazujem kalendar „%s“"
 
-#: ../calendar/gui/dialogs/comp-editor.c:769
+#: ../calendar/gui/e-cal-data-model.c:1637
 #, c-format
-msgid "Appointment - %s"
-msgstr "Zakazivanje — %s"
+msgid "Creating view for task list '%s'"
+msgstr "Prikazujem spisak zadataka „%s“"
 
-#: ../calendar/gui/dialogs/comp-editor.c:775
+#: ../calendar/gui/e-cal-data-model.c:1641
 #, c-format
-msgid "Assigned Task - %s"
-msgstr "Dodeljen zadatak — %s"
+msgid "Creating view for memo list '%s'"
+msgstr "Prikazujem spisak beleški „%s“"
 
-#: ../calendar/gui/dialogs/comp-editor.c:777
+#: ../calendar/gui/e-cal-dialogs.c:214 ../calendar/gui/e-cal-ops.c:1939
+msgid "Destination is read only"
+msgstr "Odredište je samo za čitanje"
+
+#: ../calendar/gui/e-cal-dialogs.c:294
 #, c-format
-msgid "Task - %s"
-msgstr "Zadatak — %s"
+msgid "Copying events to the calendar '%s'"
+msgstr "Umnožavam događaje u kalendar „%s“"
 
-#: ../calendar/gui/dialogs/comp-editor.c:782
+#: ../calendar/gui/e-cal-dialogs.c:300
 #, c-format
-msgid "Memo - %s"
-msgstr "Beleška — %s"
+msgid "Copying memos to the memo list '%s'"
+msgstr "Umnožavam beleške u spisak beleški „%s“"
 
-#: ../calendar/gui/dialogs/comp-editor.c:798
-msgid "No Summary"
-msgstr "Bez sažetka"
+#: ../calendar/gui/e-cal-dialogs.c:306
+#, c-format
+msgid "Copying tasks to the task list '%s'"
+msgstr "Umnožavam zadatke u spisak zadataka „%s“"
 
-#: ../calendar/gui/dialogs/comp-editor.c:919
-msgid "Keep original item?"
-msgstr "Zadržati originalnu stavku?"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1082
-#: ../calendar/gui/dialogs/comp-editor.c:1110
-msgid "Unable to synchronize with the server"
-msgstr "Ne mogu da se usaglasim sa serverom"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1222
-#: ../calendar/gui/dialogs/event-editor.c:116
-#: ../calendar/gui/dialogs/event-editor.c:310
-#: ../calendar/gui/dialogs/event-page.ui.h:29
-#: ../composer/e-composer-actions.c:275
-#: ../e-util/e-mail-signature-editor.c:307
-#: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:388
-#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:126
-#: ../mail/em-folder-properties.c:418 ../mail/em-subscription-editor.c:1714
-#: ../modules/plugin-manager/evolution-plugin-manager.c:256
-#: ../shell/e-shell-window-actions.c:343 ../shell/e-shell-window-actions.c:909
-#: ../smime/gui/certificate-manager.c:1182
-msgid "_Close"
-msgstr "_Zatvori"
+#: ../calendar/gui/e-cal-dialogs.c:525
+msgid "_Delete this item from all other recipient's mailboxes?"
+msgstr ""
+"Da li da _izbrišem ovu stavku iz svih ostalih poštanskih sandučića primaoca?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1224
-msgid "Close the current window"
-msgstr "Zatvorite trenutni prozor"
+#: ../calendar/gui/e-cal-dialogs.c:528
+msgid "_Retract comment"
+msgstr "_Uvuci komentar"
 
-#. copy menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1229 ../e-util/e-focus-tracker.c:730
-#: ../e-util/e-text.c:2085 ../e-util/e-web-view-gtkhtml.c:452
-#: ../e-util/e-web-view.c:336 ../mail/e-mail-browser.c:133
-#: ../shell/e-shell-window-actions.c:930
-#| msgid "_Copy..."
-msgid "_Copy"
-msgstr "_Umnoži"
+#: ../calendar/gui/e-cal-dialogs.c:687
+msgid "Select Date"
+msgstr "Izaberite datum"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1231 ../e-util/e-focus-tracker.c:174
-#: ../e-util/e-focus-tracker.c:230 ../e-util/e-focus-tracker.c:731
-#: ../e-util/e-web-view-gtkhtml.c:454 ../e-util/e-web-view-gtkhtml.c:1295
-#: ../e-util/e-web-view.c:338 ../e-util/e-web-view.c:1307
-#: ../mail/e-mail-browser.c:135 ../shell/e-shell-window-actions.c:932
-msgid "Copy the selection"
-msgstr "Umnožite izabrano"
+#: ../calendar/gui/e-cal-dialogs.c:688
+#: ../modules/calendar/e-cal-shell-view-actions.c:1250
+msgid "Select _Today"
+msgstr "Izaberi _današnji dan"
 
-#. cut menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1236 ../e-util/e-focus-tracker.c:725
-#: ../e-util/e-text.c:2071 ../mail/e-mail-browser.c:140
-#: ../shell/e-shell-window-actions.c:937
-msgid "Cu_t"
-msgstr "_Iseci"
+#: ../calendar/gui/e-cal-dialogs.c:707
+msgid "January"
+msgstr "Januar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1238 ../e-util/e-focus-tracker.c:167
-#: ../e-util/e-focus-tracker.c:223 ../e-util/e-focus-tracker.c:726
-#: ../e-util/e-web-view-gtkhtml.c:1289 ../e-util/e-web-view.c:1301
-#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:939
-msgid "Cut the selection"
-msgstr "Isecite izabrano"
+#: ../calendar/gui/e-cal-dialogs.c:708
+msgid "February"
+msgstr "Februar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1245 ../e-util/e-focus-tracker.c:188
-#: ../e-util/e-focus-tracker.c:244 ../e-util/e-focus-tracker.c:741
-#: ../shell/e-shell-window-actions.c:946
-msgid "Delete the selection"
-msgstr "Obrišite izbor"
+#: ../calendar/gui/e-cal-dialogs.c:709
+msgid "March"
+msgstr "Mart"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1252
-msgid "View help"
-msgstr "Pogledaj pomoć"
+#: ../calendar/gui/e-cal-dialogs.c:710
+msgid "April"
+msgstr "April"
 
-#. paste menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1257 ../e-util/e-focus-tracker.c:735
-#: ../e-util/e-text.c:2097 ../mail/e-mail-browser.c:147
-#: ../shell/e-shell-window-actions.c:965
-#| msgid "_Pascal"
-msgid "_Paste"
-msgstr "_Ubaci"
+#: ../calendar/gui/e-cal-dialogs.c:711
+msgid "May"
+msgstr "Maj"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1259 ../e-util/e-focus-tracker.c:181
-#: ../e-util/e-focus-tracker.c:237 ../e-util/e-focus-tracker.c:736
-#: ../e-util/e-web-view-gtkhtml.c:1301 ../e-util/e-web-view.c:1313
-#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:967
-msgid "Paste the clipboard"
-msgstr "Ubacite iz spiska isečaka"
+#: ../calendar/gui/e-cal-dialogs.c:712
+msgid "June"
+msgstr "Jun"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1264
-#: ../composer/e-composer-actions.c:329 ../mail/e-mail-reader.c:2128
-#: ../modules/addressbook/e-book-shell-view-actions.c:1160
-#: ../modules/addressbook/e-book-shell-view-actions.c:1174
-msgid "_Print..."
-msgstr "_Štampaj..."
+#: ../calendar/gui/e-cal-dialogs.c:713
+msgid "July"
+msgstr "Jul"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1271 ../mail/e-mail-reader.c:2135
-#: ../modules/addressbook/e-book-shell-view-actions.c:1167
-#: ../modules/calendar/e-cal-shell-view-actions.c:1801
-#: ../modules/calendar/e-memo-shell-view-actions.c:821
-#: ../modules/calendar/e-task-shell-view-actions.c:1020
-#| msgid "Preview"
-msgid "Pre_view..."
-msgstr "_Pregled..."
+#: ../calendar/gui/e-cal-dialogs.c:714
+msgid "August"
+msgstr "Avgust"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1280
-msgid "Save current changes"
-msgstr "Sačuvajte tekuće izmene"
+#: ../calendar/gui/e-cal-dialogs.c:715
+msgid "September"
+msgstr "Septembar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1285
-#: ../e-util/e-mail-signature-editor.c:316
-msgid "Save and Close"
-msgstr "Sačuvaj i zatvori"
+#: ../calendar/gui/e-cal-dialogs.c:716
+msgid "October"
+msgstr "Oktobar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1287
-msgid "Save current changes and close editor"
-msgstr "Sačuvajte tekuće izmene i zatvorite uređivač"
+#: ../calendar/gui/e-cal-dialogs.c:717
+msgid "November"
+msgstr "Novembar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292 ../e-util/e-focus-tracker.c:745
-#: ../e-util/e-web-view-gtkhtml.c:462 ../e-util/e-web-view.c:346
-#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1042
-#| msgid "Select All"
-msgid "Select _All"
-msgstr "Izaberi _sve"
+#: ../calendar/gui/e-cal-dialogs.c:718
+msgid "December"
+msgstr "Decembar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1294 ../e-util/e-focus-tracker.c:195
-#: ../e-util/e-focus-tracker.c:251 ../e-util/e-focus-tracker.c:746
-#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:1044
-msgid "Select all text"
-msgstr "Izaberite sav tekst"
+#: ../calendar/gui/e-cal-dialogs.c:868
+#, c-format
+msgid "You are modifying a recurring event. What would you like to modify?"
+msgstr "Menjate povratni događaj. Šta želite da izmenite?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1315
-msgid "_Classification"
-msgstr "_Razvrstavanje"
+#: ../calendar/gui/e-cal-dialogs.c:870
+#, c-format
+msgid "You are delegating a recurring event. What would you like to delegate?"
+msgstr "Delegirate povratni događaj. Šta želite da delegirate?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1329
-#: ../e-util/e-mail-signature-editor.c:321 ../mail/e-mail-browser.c:163
-#: ../shell/e-shell-window-actions.c:1079
-msgid "_File"
-msgstr "_Datoteka"
+#: ../calendar/gui/e-cal-dialogs.c:874
+#, c-format
+msgid "You are modifying a recurring task. What would you like to modify?"
+msgstr "Menjate povratni zadatak. Šta želite da izmenite?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1343
-msgid "_Insert"
-msgstr "_Umetni"
+#: ../calendar/gui/e-cal-dialogs.c:878
+#, c-format
+msgid "You are modifying a recurring memo. What would you like to modify?"
+msgstr "Menjate povratnu belešku. Šta želite da izmenite?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1350
-#: ../composer/e-composer-actions.c:319
-msgid "_Options"
-msgstr "_Mogućnosti"
+#: ../calendar/gui/e-cal-dialogs.c:904
+msgid "This Instance Only"
+msgstr "Samo ovaj unos"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1357 ../mail/e-mail-browser.c:177
-#: ../shell/e-shell-window-actions.c:1121 ../smime/gui/smime-ui.ui.h:5
-msgid "_View"
-msgstr "P_regled"
+#: ../calendar/gui/e-cal-dialogs.c:908
+msgid "This and Prior Instances"
+msgstr "Ovaj i prethodne unose"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1367
-#: ../composer/e-composer-actions.c:268
-msgid "_Attachment..."
-msgstr "_Prilog..."
+#: ../calendar/gui/e-cal-dialogs.c:914
+msgid "This and Future Instances"
+msgstr "Ovaj i buduće unose"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1369
-#: ../composer/e-composer-actions.c:270 ../e-util/e-attachment-view.c:412
-msgid "Attach a file"
-msgstr "Priložite datoteku"
+#: ../calendar/gui/e-cal-dialogs.c:919
+msgid "All Instances"
+msgstr "Sve unose"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1377
-msgid "_Categories"
-msgstr "_Kategorije"
+#: ../calendar/gui/e-cal-dialogs.c:1169 ../calendar/gui/e-cal-dialogs.c:1251
+msgid "Send my reminders with this event"
+msgstr "Pošalji moje podsetnike sa ovim događajem"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1379
-msgid "Toggles whether to display categories"
-msgstr "Prebacuje prikazivanje kategorija"
+#: ../calendar/gui/e-cal-dialogs.c:1171 ../calendar/gui/e-cal-dialogs.c:1253
+msgid "Notify new attendees _only"
+msgstr "Obavesti _samo nove učesnike"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1385
-msgid "Time _Zone"
-msgstr "Vremenska _zona"
+#: ../calendar/gui/e-calendar-view.c:452
+msgid "Cut selected events to the clipboard"
+msgstr "Seče izabrane događaje u spisak isečaka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
-msgid "Toggles whether the time zone is displayed"
-msgstr "Prebacuje prikazivanje vremenske zone"
+#: ../calendar/gui/e-calendar-view.c:458
+msgid "Copy selected events to the clipboard"
+msgstr "Umnožava izabrane događaje u spisak isečaka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
-msgid "Pu_blic"
-msgstr "_Javno"
+#: ../calendar/gui/e-calendar-view.c:464
+msgid "Paste events from the clipboard"
+msgstr "Ubacuje događaje iz spiska isečaka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1398
-msgid "Classify as public"
-msgstr "Označite kao javno"
+#: ../calendar/gui/e-calendar-view.c:470
+msgid "Delete selected events"
+msgstr "Briše izabrane događaje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
-msgid "_Private"
-msgstr "L_ično"
+#: ../calendar/gui/e-calendar-view.c:852
+msgid "Pasted text doesn't contain valid iCalendar data"
+msgstr "Umetnuti tekst ne sadrži ispravne podatke iz iKalendara"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1405
-msgid "Classify as private"
-msgstr "Označite kao lično"
+#: ../calendar/gui/e-calendar-view.c:863 ../calendar/gui/e-cal-ops.c:1536
+msgid "Default calendar not found"
+msgstr "Nije pronađen podrazumevani kalendar"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
-msgid "_Confidential"
-msgstr "Pove_rljivo"
+#: ../calendar/gui/e-calendar-view.c:868 ../calendar/gui/e-cal-ops.c:1539
+msgid "Default memo list not found"
+msgstr "Nije pronađen podrazumevani spisak beleški"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1412
-msgid "Classify as confidential"
-msgstr "Označite kao poverljivo"
+#: ../calendar/gui/e-calendar-view.c:873 ../calendar/gui/e-cal-ops.c:1542
+msgid "Default task list not found"
+msgstr "Nije pronađen podrazumevani spisak zadataka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
-msgid "R_ole Field"
-msgstr "Polje _uloge"
+#: ../calendar/gui/e-calendar-view.c:962
+msgid "No suitable component found"
+msgstr "Nije pronađena odovarajuća komponenta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
-msgid "Toggles whether the Role field is displayed"
-msgstr "Prebacuje prikazivanje polja Uloga"
+#: ../calendar/gui/e-calendar-view.c:1032
+msgid "Pasting iCalendar data"
+msgstr "Ubacujem podatke iz iKalendara"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1428
-msgid "_RSVP"
-msgstr "_Molim odgovorite"
+#. 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-task-table.c:794
+#, c-format
+msgid "Organizer: %s <%s>"
+msgstr "Organizator: %s <%s>"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
-msgid "Toggles whether the RSVP field is displayed"
-msgstr "Prebacuje prikazivanje polja Molim odgovorite"
+#. 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-task-table.c:798
+#, c-format
+msgid "Organizer: %s"
+msgstr "Organizator: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1436
-msgid "_Status Field"
-msgstr "Polje _stanja"
+#. 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
+#, c-format
+msgid "Location: %s"
+msgstr "Mesto: %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
-msgid "Toggles whether the Status field is displayed"
-msgstr "Prebacuje prikazivanje polja Stanja"
+#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#: ../calendar/gui/e-calendar-view.c:1890
+#, c-format
+msgid "Time: %s %s"
+msgstr "Vreme: %s %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1444
-msgid "_Type Field"
-msgstr "Polje _tipa"
+#: ../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
+msgid "%d %b %Y"
+msgstr "%d. %b %Y."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
-msgid "Toggles whether the Attendee Type is displayed"
-msgstr "Prebacuje prikazivanje polja Tipa"
+# Don't use any other specifiers.
+# strftime format %d = day of month, %b = abbreviated
+# month name. You can change the order but don't
+# change the specifiers or add anything.
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. * Don't use any other specifiers.
+#. 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-day-view-top-item.c:851
+#: ../calendar/gui/e-week-view-main-item.c:230
+msgid "%d %b"
+msgstr "%d. %b"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../composer/e-composer-actions.c:487
-msgid "Attach"
-msgstr "Priloži"
+#: ../calendar/gui/e-calendar-view.c:2296
+msgid "%A %d %b %Y"
+msgstr "%A, %d. %b %Y."
 
-#: ../calendar/gui/dialogs/comp-editor.c:2563
-#: ../calendar/gui/dialogs/comp-editor.c:2773
-#: ../calendar/gui/dialogs/comp-editor.c:3786
-msgid "Changes made to this item may be discarded if an update arrives"
-msgstr ""
-"Promene načinjene na ovoj stavki mogu biti zanemarene ako bude ažurirano"
+# %b = abbreviated month name. Don't use any other specifiers.
+# strftime format %a = abbreviated weekday name,
+# %d = day of month, %b = abbreviated month name.
+# You can change the order but don't change the
+# specifiers or add anything.
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. * %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. * %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-day-view-top-item.c:847
+#: ../calendar/gui/e-week-view-main-item.c:216
+msgid "%a %d %b"
+msgstr "%a %d %b"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3748
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:120
-msgid "attachment"
-msgstr "prilog"
+#: ../calendar/gui/e-calendar-view.c:2303
+#: ../calendar/gui/e-calendar-view.c:2309
+#: ../calendar/gui/e-calendar-view.c:2312
+msgid "%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
+msgid "Start Date"
+msgstr "Datum početka"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:2
+msgid "End Date"
+msgstr "Datum završetka"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:7
+#: ../calendar/gui/e-memo-table.etspec.h:6
+#: ../calendar/gui/e-task-table.etspec.h:13
+#: ../plugins/save-calendar/csv-format.c:380
+msgid "Created"
+msgstr "Napravljeno"
+
+#: ../calendar/gui/e-cal-list-view.etspec.h:8
+#: ../calendar/gui/e-memo-table.etspec.h:7
+#: ../calendar/gui/e-task-table.etspec.h:14
+msgid "Last modified"
+msgstr "Poslednje izmene"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3818
-msgid "Unable to use current version!"
-msgstr "Ne mogu da koristim trenutno izdanje!"
+#: ../calendar/gui/e-cal-list-view.etspec.h:9
+#: ../calendar/gui/e-memo-table.etspec.h:8
+#: ../calendar/gui/e-task-table.etspec.h:15
+#: ../em-format/e-mail-formatter-source.c:120
+msgid "Source"
+msgstr "Izvor"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:440
+#: ../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-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/plugin-manager/evolution-plugin-manager.c:99
+msgid "Unknown"
+msgstr "Nepoznato"
+
+#: ../calendar/gui/e-cal-model.c:1403 ../calendar/gui/e-cal-ops.c:597
+#: ../calendar/gui/e-cal-ops.c:1233
+#: ../modules/calendar/e-cal-base-shell-backend.c:291
 #, c-format
-msgid "Validation error: %s"
-msgstr "Greška provere: %s"
+msgid "Source with UID '%s' not found"
+msgstr "Nije pronađen izvor sa UID brojem „%s“"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:120
-msgid "Could not open destination"
-msgstr "Ne mogu da otvorim odredište"
+#: ../calendar/gui/e-cal-model.c:1489 ../calendar/gui/e-cal-ops.c:186
+#: ../calendar/gui/e-cal-ops.c:1350
+msgid "Creating an event"
+msgstr "Pravim novi događaj"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:130
-msgid "Destination is read only"
-msgstr "Odredište je samo za čitanje"
+#: ../calendar/gui/e-cal-model.c:1493 ../calendar/gui/e-cal-ops.c:190
+#: ../calendar/gui/e-cal-ops.c:1354
+msgid "Creating a memo"
+msgstr "Pravim novu belešku"
+
+#: ../calendar/gui/e-cal-model.c:1497 ../calendar/gui/e-cal-ops.c:194
+#: ../calendar/gui/e-cal-ops.c:1358
+msgid "Creating a task"
+msgstr "Pravim novi zadatak"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:172
-msgid "Cannot create object"
-msgstr "Ne mogu da napravim objekat"
+#: ../calendar/gui/e-cal-model.c:1874
+msgid "Recurring"
+msgstr "Periodičnost"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:203
-msgid "Could not open source"
-msgstr "Ne mogu da otvorim izvor"
+#: ../calendar/gui/e-cal-model.c:1876
+msgid "Assigned"
+msgstr "Dodeljeno"
 
-#: ../calendar/gui/dialogs/delete-comp.c:215
-msgid "_Delete this item from all other recipient's mailboxes?"
+#: ../calendar/gui/e-cal-model.c:1878 ../calendar/gui/e-cal-model-tasks.c:1138
+#: ../calendar/gui/e-meeting-list-view.c:208
+#: ../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:1878 ../calendar/gui/e-cal-model-tasks.c:1138
+#: ../calendar/gui/e-meeting-list-view.c:209
+#: ../calendar/gui/e-meeting-store.c:188
+msgid "No"
+msgstr "Ne"
+
+#: ../calendar/gui/e-cal-model.c:3802 ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../modules/itip-formatter/itip-view.c:6206
+msgid "Accepted"
+msgstr "Prihvaćeno"
+
+#: ../calendar/gui/e-cal-model.c:3803 ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../modules/itip-formatter/itip-view.c:6212
+msgid "Declined"
+msgstr "Odbijeno"
+
+#: ../calendar/gui/e-cal-model.c:3804 ../calendar/gui/e-meeting-list-view.c:222
+#: ../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:3805 ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
+#: ../modules/itip-formatter/itip-view.c:6215
+msgid "Delegated"
+msgstr "Delegirano"
+
+#: ../calendar/gui/e-cal-model.c:3806
+msgid "Needs action"
+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:3861 ../calendar/gui/e-meeting-list-view.c:688
+#: ../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
+#: ../mail/searchtypes.xml.in.h:38 ../mail/vfoldertypes.xml.in.h:38
+msgid "Status"
+msgstr "Stanje"
+
+#: ../calendar/gui/e-cal-model-calendar.c:150
+#: ../calendar/gui/e-task-table.c:582
+msgid "Free"
+msgstr "Slobodno"
+
+#: ../calendar/gui/e-cal-model-calendar.c:153
+#: ../calendar/gui/e-meeting-time-sel.c:536 ../calendar/gui/e-task-table.c:583
+msgid "Busy"
+msgstr "Zauzeto"
+
+#: ../calendar/gui/e-cal-model-tasks.c:498
+msgid ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"45.436845,125.862501"
 msgstr ""
-"Da li da _izbrišem ovu stavku iz svih ostalih poštanskih sandučića primaoca?"
+"Geografsko mesto mora biti uneto u obliku: \n"
+"\n"
+"45.436845,125.862501"
 
-#: ../calendar/gui/dialogs/delete-comp.c:218
-msgid "_Retract comment"
-msgstr "_Uvuci komentar"
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# 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.
+#. Translators: "None" for task's status
+#: ../calendar/gui/e-cal-model-tasks.c:550
+msgctxt "cal-task-status"
+msgid "None"
+msgstr "Ništa"
+
+#: ../calendar/gui/e-cal-ops.c:288
+msgid "Modifying an event"
+msgstr "Ispravljam događaj"
+
+# mail:no-name-vfolder primary
+#: ../calendar/gui/e-cal-ops.c:292
+msgid "Modifying a memo"
+msgstr "Ispravljam belešku"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:54
+#: ../calendar/gui/e-cal-ops.c:296
+msgid "Modifying a task"
+msgstr "Izpravljam zadatak"
+
+#: ../calendar/gui/e-cal-ops.c:395
+msgid "Removing an event"
+msgstr "Uklanjam događaj"
+
+#: ../calendar/gui/e-cal-ops.c:399
+msgid "Removing a memo"
+msgstr "Uklanjam belešku"
+
+#: ../calendar/gui/e-cal-ops.c:403
+msgid "Removing a task"
+msgstr "Uklanjam zadatak"
+
+#: ../calendar/gui/e-cal-ops.c:494
 #, c-format
-msgid "The event could not be deleted due to a dbus error: %s"
-msgstr "Događaj ne može biti obrisan zbog dbas greške: %s"
+msgid "Deleting an event"
+msgid_plural "Deleting %d events"
+msgstr[0] "Uklanjam %d događaj"
+msgstr[1] "Uklanjam %d događaja"
+msgstr[2] "Uklanjam %d događaja"
+msgstr[3] "Uklanjam događaj"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:58
+#: ../calendar/gui/e-cal-ops.c:498
 #, c-format
-msgid "The task could not be deleted due to a dbus error: %s"
-msgstr "Zadatak ne može biti obrisan zbog dbas greške: %s"
+msgid "Deleting a memo"
+msgid_plural "Deleting %d memos"
+msgstr[0] "Uklanjam %d belešku"
+msgstr[1] "Uklanjam %d beleške"
+msgstr[2] "Uklanjam %d beleški"
+msgstr[3] "Uklanjam belešku"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:62
+#: ../calendar/gui/e-cal-ops.c:502
 #, c-format
-msgid "The memo could not be deleted due to a dbus error: %s"
-msgstr "Beleška ne može biti obrisana zbog dbas greške: %s"
+msgid "Deleting a task"
+msgid_plural "Deleting %d tasks"
+msgstr[0] "Uklanjam %d zadatak"
+msgstr[1] "Uklanjam %d zadatka"
+msgstr[2] "Uklanjam %d zadataka"
+msgstr[3] "Uklanjam belešku"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:66
+#: ../calendar/gui/e-cal-ops.c:705
 #, c-format
-msgid "The item could not be deleted due to a dbus error: %s"
-msgstr "Stavka ne može biti obrisana zbog dbas greške: %s"
+msgid "Pasting an event"
+msgid_plural "Pasting %d events"
+msgstr[0] "Ubacujem %d događaj"
+msgstr[1] "Ubacujem %d događaja"
+msgstr[2] "Ubacujem %d događaja"
+msgstr[3] "Ubacujem događaj"
 
-#: ../calendar/gui/dialogs/delete-error.c:73
-msgid "The event could not be deleted because permission was denied"
-msgstr "Događaj ne može biti obrisan jer je odbijena dozvola"
+#: ../calendar/gui/e-cal-ops.c:720
+#, c-format
+msgid "Pasting a memo"
+msgid_plural "Pasting %d memos"
+msgstr[0] "Ubacujem %d belešku"
+msgstr[1] "Ubacujem %d beleške"
+msgstr[2] "Ubacujem %d beleški"
+msgstr[3] "Ubacujem belešku"
 
-#: ../calendar/gui/dialogs/delete-error.c:76
-msgid "The task could not be deleted because permission was denied"
-msgstr "Zadatak ne može biti obrisan jer je odbijena dozvola"
+#: ../calendar/gui/e-cal-ops.c:735
+#, c-format
+msgid "Pasting a task"
+msgid_plural "Pasting %d tasks"
+msgstr[0] "Ubacujem %d zadatak"
+msgstr[1] "Ubacujem %d zadatka"
+msgstr[2] "Ubacujem %d zadataka"
+msgstr[3] "Ubacujem zadatak"
 
-#: ../calendar/gui/dialogs/delete-error.c:79
-msgid "The memo could not be deleted because permission was denied"
-msgstr "Beleška ne može biti obrisana jer je odbijena dozvola"
+#: ../calendar/gui/e-cal-ops.c:834
+msgid "Updating an event"
+msgstr "Ažuriram događaj"
 
-#: ../calendar/gui/dialogs/delete-error.c:82
-msgid "The item could not be deleted because permission was denied"
-msgstr "Stavka ne može biti obrisana jer je odbijena dozvola"
+#: ../calendar/gui/e-cal-ops.c:838
+msgid "Updating a memo"
+msgstr "Ažuriram belešku"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:90
-#, c-format
-msgid "The event could not be deleted due to an error: %s"
-msgstr "Događaj ne može biti obrisan zbog greške: %s"
+#: ../calendar/gui/e-cal-ops.c:842
+msgid "Updating a task"
+msgstr "Ažuriram zadatak"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:94
+#: ../calendar/gui/e-cal-ops.c:950
 #, c-format
-msgid "The task could not be deleted due to an error: %s"
-msgstr "Zadatak ne može biti obrisan zbog greške: %s"
+msgid "Getting events to purge in the calendar '%s'"
+msgstr "Preuzimam događaje za čišćenje kalendara „%s“"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:98
+#: ../calendar/gui/e-cal-ops.c:954
 #, c-format
-msgid "The memo could not be deleted due to an error: %s"
-msgstr "Beleška ne može biti obrisana zbog greške: %s"
+msgid "Getting memos to purge in the memo list '%s'"
+msgstr "Preuzimam beleške za čišćenje spiska beleški „%s“"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:102
+#: ../calendar/gui/e-cal-ops.c:958
 #, c-format
-msgid "The item could not be deleted due to an error: %s"
-msgstr "Stavka ne može biti obrisana zbog greške: %s"
-
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
-msgid "Enter Delegate"
-msgstr "Unesi delegata"
+msgid "Getting tasks to purge in the task list '%s'"
+msgstr "Preuzimam zadatke za čišćenje spiska zadataka „%s“"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:4
-msgid "Delegate To:"
-msgstr "Delegiraj na:"
+#: ../calendar/gui/e-cal-ops.c:984
+#, c-format
+msgid "Purging events in the calendar '%s'"
+msgstr "Čistim događaje iz kalendara „%s“"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:5
-msgid "Contacts..."
-msgstr "Kontakti..."
+#: ../calendar/gui/e-cal-ops.c:988
+#, c-format
+msgid "Purging memos in the memo list '%s'"
+msgstr "Čistim beleške iz spiska beleški „%s“"
 
-#: ../calendar/gui/dialogs/event-editor.c:204
-msgid "_Reminders"
-msgstr "_Podsetnici"
+#: ../calendar/gui/e-cal-ops.c:992
+#, c-format
+msgid "Purging tasks in the task list '%s'"
+msgstr "Čistim zadatke iz spiska zadataka „%s“"
 
-#: ../calendar/gui/dialogs/event-editor.c:206
-msgid "Set or unset reminders for this event"
-msgstr "Postavlja ili isključuje podsetnike za ovaj događaj"
+#: ../calendar/gui/e-cal-ops.c:1092
+msgid "Purging events"
+msgstr "Čistim događaje"
 
-#: ../calendar/gui/dialogs/event-editor.c:214
-msgid "Show Time as _Busy"
-msgstr "Prikaži vreme kao _zauzeto"
+#: ../calendar/gui/e-cal-ops.c:1096
+msgid "Purging memos"
+msgstr "Čistim beleške"
 
-#: ../calendar/gui/dialogs/event-editor.c:216
-msgid "Toggles whether to show time as busy"
-msgstr "Prebacuje prikazivanje vremena kao zauzeto"
+#: ../calendar/gui/e-cal-ops.c:1100
+msgid "Purging tasks"
+msgstr "Čistim zadatke"
 
-#: ../calendar/gui/dialogs/event-editor.c:225
-msgid "_Recurrence"
-msgstr "_Ponavljanje"
+#: ../calendar/gui/e-cal-ops.c:1202
+msgid "Expunging completed tasks"
+msgstr "Uklanjam završene zadatke"
 
-#: ../calendar/gui/dialogs/event-editor.c:227
-msgid "Make this a recurring event"
-msgstr "Neka se ovaj događaj ponavlja"
+#: ../calendar/gui/e-cal-ops.c:2033
+#, c-format
+msgid "Moving an event"
+msgid_plural "Moving %d events"
+msgstr[0] "Premeštam %d događaj"
+msgstr[1] "Premeštam %d događaja"
+msgstr[2] "Premeštam %d događaja"
+msgstr[3] "Premeštam događaj"
 
-#: ../calendar/gui/dialogs/event-editor.c:232 ../e-util/e-send-options.ui.h:14
-msgid "Send Options"
-msgstr "Opcije slanja"
+#: ../calendar/gui/e-cal-ops.c:2034
+#, c-format
+msgid "Copying an event"
+msgid_plural "Copying %d events"
+msgstr[0] "Umnožavam %d događaj"
+msgstr[1] "Umnožavam %d događaja"
+msgstr[2] "Umnožavam %d događaja"
+msgstr[3] "Umnožavam događaj"
 
-#: ../calendar/gui/dialogs/event-editor.c:234
-#: ../calendar/gui/dialogs/task-editor.c:95
-msgid "Insert advanced send options"
-msgstr "Umetnite napredne opcije slanja"
+#: ../calendar/gui/e-cal-ops.c:2040
+#, c-format
+msgid "Moving a memo"
+msgid_plural "Moving %d memos"
+msgstr[0] "Premeštam %d belešku"
+msgstr[1] "Premeštam %d beleške"
+msgstr[2] "Premeštam %d beleški"
+msgstr[3] "Premeštam belešku"
 
-#: ../calendar/gui/dialogs/event-editor.c:242
-msgid "All _Day Event"
-msgstr "Celodnevni događa_j"
+#: ../calendar/gui/e-cal-ops.c:2041
+#, c-format
+msgid "Copying a memo"
+msgid_plural "Copying %d memos"
+msgstr[0] "Umnožavam %d belešku"
+msgstr[1] "Umnožavam %d beleške"
+msgstr[2] "Umnožavam %d beleški"
+msgstr[3] "Umnožavam belešku"
 
-#: ../calendar/gui/dialogs/event-editor.c:244
-msgid "Toggles whether to have All Day Event"
-msgstr "Bira da li dozvoljava celodnevne događaje"
+#: ../calendar/gui/e-cal-ops.c:2047
+#, c-format
+msgid "Moving a task"
+msgid_plural "Moving %d tasks"
+msgstr[0] "Premeštam %d zadatak"
+msgstr[1] "Premeštam %d zadatka"
+msgstr[2] "Premeštam %d zadataka"
+msgstr[3] "Premeštam zadatak"
 
-#: ../calendar/gui/dialogs/event-editor.c:253
-msgid "_Free/Busy"
-msgstr "S_lobodno/zauzeto"
+#: ../calendar/gui/e-cal-ops.c:2048
+#, c-format
+msgid "Copying a task"
+msgid_plural "Copying %d tasks"
+msgstr[0] "Umnožavam %d zadatak"
+msgstr[1] "Umnožavam %d zadatka"
+msgstr[2] "Umnožavam %d zadataka"
+msgstr[3] "Umnožavam zadatak"
 
-#: ../calendar/gui/dialogs/event-editor.c:255
-msgid "Query free / busy information for the attendees"
-msgstr "Zatraži podatak za slobodno/zauzeto vreme za ove učesnike"
+# strptime format of a weekday, a date and a time,
+# in 24-hour format.
+# strftime format of a weekday, a date and a
+# time, in 24-hour format.
+#. strftime format of a weekday, a date and a time, 24-hour.
+#: ../calendar/gui/e-cell-date-edit-text.c:165
+msgid "%a %m/%d/%Y %H:%M:%S"
+msgstr "%a %d. %m. %Y. %H:%M:%S"
 
-#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3496
-msgid "Appointment"
-msgstr "Zakazivanje"
+# strptime format of a weekday, a date and a time,
+# in 12-hour format.
+# strftime format of a weekday, a date and a
+# time, in 12-hour format.
+#. strftime format of a weekday, a date and a time, 12-hour.
+#: ../calendar/gui/e-cell-date-edit-text.c:168
+msgid "%a %m/%d/%Y %I:%M:%S %p"
+msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 
-#: ../calendar/gui/dialogs/event-editor.c:376
-#: ../calendar/gui/dialogs/event-page.ui.h:27
-#: ../calendar/gui/e-meeting-list-view.c:164
-msgid "Attendees"
-msgstr "Učesnici"
+#: ../calendar/gui/e-cell-date-edit-text.c:176
+#, c-format
+msgid ""
+"The date must be entered in the format: \n"
+"%s"
+msgstr ""
+"Datum mora biti unet u obliku: \n"
+"%s"
 
-#: ../calendar/gui/dialogs/event-editor.c:573
-msgid "Print this event"
-msgstr "Štampajte ovu poruku"
+#: ../calendar/gui/e-comp-editor-event.c:101
+#| msgid "Event's start time is in the past"
+msgid "Event's time is in the past"
+msgstr "Vreme događaja je u prošlosti"
 
-#: ../calendar/gui/dialogs/event-page.c:557
-msgid "Event's start time is in the past"
-msgstr "Početak događaja je u prošlosti"
+#: ../calendar/gui/e-comp-editor-event.c:202
+#| msgid "Event cannot be edited, because the selected calendar is read only"
+msgid ""
+"Event cannot be edited, because the selected calendar could not be opened"
+msgstr ""
+"Događaj se ne može uređivati, pošto se izabrani kalendar ne može otvoriti"
 
-#: ../calendar/gui/dialogs/event-page.c:634
+#: ../calendar/gui/e-comp-editor-event.c:204
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr ""
 "Događaj nije moguće uređivati, pošto je izabrani kalendar samo za čitanje"
 
-#: ../calendar/gui/dialogs/event-page.c:638
+#: ../calendar/gui/e-comp-editor-event.c:206
 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/dialogs/event-page.c:650
-#: ../calendar/gui/dialogs/event-page.c:3171
-msgid "This event has reminders"
-msgstr "Ovaj događaj ima podsetnike"
+#: ../calendar/gui/e-comp-editor-event.c:340
+#: ../calendar/gui/e-comp-editor-task.c:348
+#| msgid "Start date is wrong"
+msgid "Start date is not a valid date"
+msgstr "Datum početka nije ispravan datum"
+
+#: ../calendar/gui/e-comp-editor-event.c:342
+#| msgid "Start time is wrong"
+msgid "Start time is not a valid time"
+msgstr "Vreme početka nije ispravno vreme"
+
+#: ../calendar/gui/e-comp-editor-event.c:346
+#: ../calendar/gui/e-comp-editor-event.c:362
+#: ../calendar/gui/e-comp-editor-page-attachments.c:211
+#: ../calendar/gui/e-comp-editor.c:339 ../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
+msgid "Unknown error"
+msgstr "Nepoznata greška"
 
-#: ../calendar/gui/dialogs/event-page.c:717
-#: ../calendar/gui/dialogs/event-page.ui.h:13
-msgid "Or_ganizer:"
-msgstr "Or_ganizator:"
+#: ../calendar/gui/e-comp-editor-event.c:356
+#| msgid "The calendar attached is not valid"
+msgid "End date is not a valid date"
+msgstr "Datum kraja nije ispravan datum"
 
-#: ../calendar/gui/dialogs/event-page.c:1302
-msgid "Event with no start date"
-msgstr "Događaj bez datuma početka"
+#: ../calendar/gui/e-comp-editor-event.c:358
+#| msgid "Chosen file is not a local file."
+msgid "End time is not a valid time"
+msgstr "Vreme kraja nije ispravno vreme"
 
-#: ../calendar/gui/dialogs/event-page.c:1305
-msgid "Event with no end date"
-msgstr "Događaj bez datuma završetka"
+#: ../calendar/gui/e-comp-editor-event.c:480
+#: ../calendar/gui/e-comp-editor-memo.c:106
+#: ../calendar/gui/e-comp-editor-task.c:406
+msgid "_Categories"
+msgstr "_Kategorije"
 
-#: ../calendar/gui/dialogs/event-page.c:1483
-#: ../calendar/gui/dialogs/memo-page.c:732
-#: ../calendar/gui/dialogs/task-page.c:1030
-msgid "Start date is wrong"
-msgstr "Datum početka je pogrešan"
+#: ../calendar/gui/e-comp-editor-event.c:482
+#: ../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/dialogs/event-page.c:1494
-msgid "End date is wrong"
-msgstr "Datum završetka je pogrešan"
+#: ../calendar/gui/e-comp-editor-event.c:488
+msgid "Time _Zone"
+msgstr "Vremenska _zona"
 
-#: ../calendar/gui/dialogs/event-page.c:1518
-msgid "Start time is wrong"
-msgstr "Vreme početka je pogrešno"
+#: ../calendar/gui/e-comp-editor-event.c:490
+msgid "Toggles whether the time zone is displayed"
+msgstr "Prebacuje prikazivanje vremenske zone"
 
-#: ../calendar/gui/dialogs/event-page.c:1526
-msgid "End time is wrong"
-msgstr "Vreme završetka je pogrešno"
+#: ../calendar/gui/e-comp-editor-event.c:496
+msgid "All _Day Event"
+msgstr "Celodnevni događa_j"
 
-#: ../calendar/gui/dialogs/event-page.c:1690
-#: ../calendar/gui/dialogs/memo-page.c:771
-#: ../calendar/gui/dialogs/task-page.c:1084
-msgid "An organizer is required."
-msgstr "Potreban je organizator."
+#: ../calendar/gui/e-comp-editor-event.c:498
+msgid "Toggles whether to have All Day Event"
+msgstr "Bira da li dozvoljava celodnevne događaje"
 
-#: ../calendar/gui/dialogs/event-page.c:1725
-#: ../calendar/gui/dialogs/task-page.c:1119
-msgid "At least one attendee is required."
-msgstr "Najmanje jedan učesnik je potreban."
+#: ../calendar/gui/e-comp-editor-event.c:504
+msgid "Show Time as _Busy"
+msgstr "Prikaži vreme kao _zauzeto"
 
-#: ../calendar/gui/dialogs/event-page.c:1931
-msgid "_Delegatees"
-msgstr "Delegat_i"
+#: ../calendar/gui/e-comp-editor-event.c:506
+msgid "Toggles whether to show time as busy"
+msgstr "Prebacuje prikazivanje vremena kao zauzeto"
 
-#: ../calendar/gui/dialogs/event-page.c:1933
-msgid "Atte_ndees"
-msgstr "Uč_esnici"
+#: ../calendar/gui/e-comp-editor-event.c:515
+msgid "Pu_blic"
+msgstr "_Javno"
 
-#: ../calendar/gui/dialogs/event-page.c:3451
-#, c-format
-msgid "%d day before appointment"
-msgid_plural "%d days before appointment"
-msgstr[0] "%d dan pre zakazanog"
-msgstr[1] "%d dana pre zakazanog"
-msgstr[2] "%d dana pre zakazanog"
-msgstr[3] "%d dan pre zakazanog"
+#: ../calendar/gui/e-comp-editor-event.c:517
+msgid "Classify as public"
+msgstr "Označite kao javno"
 
-#: ../calendar/gui/dialogs/event-page.c:3457
-#, c-format
-msgid "%d hour before appointment"
-msgid_plural "%d hours before appointment"
-msgstr[0] "%d sat pre zakazanog"
-msgstr[1] "%d sata pre zakazanog"
-msgstr[2] "%d sati pre zakazanog"
-msgstr[3] "%d sat pre zakazanog"
+#: ../calendar/gui/e-comp-editor-event.c:522
+msgid "_Private"
+msgstr "L_ično"
 
-#: ../calendar/gui/dialogs/event-page.c:3463
-#, c-format
-msgid "%d minute before appointment"
-msgid_plural "%d minutes before appointment"
-msgstr[0] "%d minut pre zakazanog"
-msgstr[1] "%d minuta pre zakazanog"
-msgstr[2] "%d minuta pre zakazanog"
-msgstr[3] "%d minut pre zakazanog"
+#: ../calendar/gui/e-comp-editor-event.c:524
+msgid "Classify as private"
+msgstr "Označite kao lično"
 
-#: ../calendar/gui/dialogs/event-page.c:3484
-msgid "Customize"
-msgstr "Prilagodi"
+#: ../calendar/gui/e-comp-editor-event.c:529
+msgid "_Confidential"
+msgstr "Pove_rljivo"
 
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# 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.
-#. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3491
-msgctxt "cal-reminders"
-msgid "None"
-msgstr "Ništa"
+#: ../calendar/gui/e-comp-editor-event.c:531
+msgid "Classify as confidential"
+msgstr "Označite kao poverljivo"
 
-#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] 
minutes
-#: ../calendar/gui/dialogs/event-page.ui.h:2
-msgctxt "eventpage"
-msgid "for"
-msgstr "za"
+#: ../calendar/gui/e-comp-editor-event.c:632
+#| msgid "_Start time:"
+msgctxt "ECompEditor"
+msgid "_Start time:"
+msgstr "Vreme _početka:"
 
-#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
-#: ../calendar/gui/dialogs/event-page.ui.h:4
-msgctxt "eventpage"
-msgid "until"
-msgstr "do"
+#: ../calendar/gui/e-comp-editor-event.c:637
+#| msgid "_End time:"
+msgctxt "ECompEditor"
+msgid "_End time:"
+msgstr "Vreme _završetka:"
 
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:6
-msgctxt "eventpage"
-msgid "15 minutes before appointment"
-msgstr "15 minuta pre zakazanog sastanka"
-
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:8
-msgctxt "eventpage"
-msgid "1 hour before appointment"
-msgstr "1 sat pre zakazanog sastanka"
-
-#. TRANSLATORS: Predefined reminder's description
-#: ../calendar/gui/dialogs/event-page.ui.h:10
-msgctxt "eventpage"
-msgid "1 day before appointment"
-msgstr "1 dan pre zakazanog sastanka"
-
-#: ../calendar/gui/dialogs/event-page.ui.h:11
-msgid "_Location:"
-msgstr "_Mesto:"
+#: ../calendar/gui/e-comp-editor-event.c:647
+#| msgid "All _Day Event"
+msgctxt "ECompEditor"
+msgid "All da_y event"
+msgstr "Celodnevni _događaj"
+
+#: ../calendar/gui/e-comp-editor-event.c:700
+#: ../calendar/gui/e-comp-editor-memo.c:192
+#: ../calendar/gui/e-comp-editor-task.c:529
+#| msgid "General"
+msgctxt "ECompEditorPage"
+msgid "General"
+msgstr "Opšte"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:12
-#: ../calendar/gui/dialogs/memo-page.ui.h:2
-#: ../calendar/gui/dialogs/task-page.ui.h:29
-#: ../e-util/e-attachment-dialog.c:356
-msgid "_Description:"
-msgstr "_Opis:"
+#: ../calendar/gui/e-comp-editor-event.c:703
+#: ../calendar/gui/e-comp-editor-task.c:535
+#| msgid "Reminders"
+msgctxt "ECompEditorPage"
+msgid "Reminders"
+msgstr "Podsetnici"
 
-# note(slobo): možda treba rok
-#: ../calendar/gui/dialogs/event-page.ui.h:14
-msgid "_Time:"
-msgstr "_Vreme:"
+#: ../calendar/gui/e-comp-editor-event.c:706
+#| msgid "Recurrence"
+msgctxt "ECompEditorPage"
+msgid "Recurrence"
+msgstr "Ponavljanje"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:15
-#: ../modules/calendar/e-calendar-preferences.ui.h:13
-msgid "Time _zone:"
-msgstr "Vremenska _zona:"
+#: ../calendar/gui/e-comp-editor-event.c:709
+#: ../calendar/gui/e-comp-editor-memo.c:195
+#: ../calendar/gui/e-comp-editor-task.c:538
+#| msgid "Attachments"
+msgctxt "ECompEditorPage"
+msgid "Attachments"
+msgstr "Prilozi"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:17
-msgid "_Summary:"
-msgstr "_Sažetak:"
+#: ../calendar/gui/e-comp-editor-event.c:719
+msgctxt "ECompEditorPage"
+msgid "Schedule"
+msgstr "Planiranje"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:21
-msgid "Event Description"
-msgstr "Opis događaja"
+#: ../calendar/gui/e-comp-editor-event.c:748
+#, c-format
+msgid "Meeting - %s"
+msgstr "Sastanak — %s"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:26
-#: ../calendar/gui/dialogs/task-page.ui.h:33
-#: ../calendar/gui/e-meeting-time-sel.c:547
-msgid "Atte_ndees..."
-msgstr "Uč_esnici..."
+#: ../calendar/gui/e-comp-editor-event.c:749
+#, c-format
+msgid "Appointment - %s"
+msgstr "Zakazivanje — %s"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:30
-msgid "_Reminder"
-msgstr "_Podsetnik"
+#: ../calendar/gui/e-comp-editor-memo.c:68
+#| msgid "Memo cannot be edited, because the selected memo list is read only"
+msgid ""
+"Memo cannot be edited, because the selected memo list could not be opened"
+msgstr ""
+"Beleška se ne može uređivati, pošto se izabrani spisak beleški ne može "
+"otvoriti"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:31
-msgid "Custom Reminder:"
-msgstr "Proizvoljan podsetnik:"
+#: ../calendar/gui/e-comp-editor-memo.c:70
+msgid "Memo cannot be edited, because the selected memo list is read only"
+msgstr "Belešku nije moguće uređivati, pošto je izabran spisak samo za čitanje"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:1
-msgid "January"
-msgstr "Januar"
+#: ../calendar/gui/e-comp-editor-memo.c:72
+msgid "Memo cannot be fully edited, because you are not the organizer"
+msgstr "Belešku nije moguće potpuno urediti, pošto niste organizator"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:2
-msgid "February"
-msgstr "Februar"
+#: ../calendar/gui/e-comp-editor-memo.c:168
+#: ../calendar/gui/e-comp-editor-task.c:468
+msgid "_List:"
+msgstr "_Spisak:"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:3
-msgid "March"
-msgstr "Mart"
+#: ../calendar/gui/e-comp-editor-memo.c:175
+#: ../calendar/gui/e-comp-editor-task.c:475
+#| msgid "Sta_rt date:"
+msgctxt "ECompEditor"
+msgid "Sta_rt date:"
+msgstr "Datum _početka:"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:4
-msgid "April"
-msgstr "April"
+#: ../calendar/gui/e-comp-editor-memo.c:223
+#, c-format
+#| msgid "Assigned Task - %s"
+msgid "Assigned Memo - %s"
+msgstr "Dodeljena beleška — %s"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:5
-msgid "May"
-msgstr "Maj"
+#: ../calendar/gui/e-comp-editor-memo.c:224
+#, c-format
+msgid "Memo - %s"
+msgstr "Beleška — %s"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:6
-msgid "June"
-msgstr "Jun"
+#: ../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
+#: ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
+#: ../mail/message-list.etspec.h:4
+msgid "Attachment"
+msgid_plural "Attachments"
+msgstr[0] "Prilog"
+msgstr[1] "Prilozi"
+msgstr[2] "Prilozi"
+msgstr[3] "Prilog"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:7
-msgid "July"
-msgstr "Jul"
+#: ../calendar/gui/e-comp-editor-page-attachments.c:206
+#: ../e-util/e-attachment.c:2542
+#, c-format
+msgid "Could not load '%s'"
+msgstr "Ne mogu da učitam „%s“"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:8
-msgid "August"
-msgstr "Avgust"
+#: ../calendar/gui/e-comp-editor-page-attachments.c:208
+#: ../e-util/e-attachment.c:2545
+#, c-format
+msgid "Could not load the attachment"
+msgstr "Ne mogu da učitam prilog"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:9
-msgid "September"
-msgstr "Septembar"
+#: ../calendar/gui/e-comp-editor-page-attachments.c:413
+#| msgid ""
+#| "Some attachments are being downloaded. Saving the task would result in "
+#| "the loss of these attachments."
+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/dialogs/goto-dialog.ui.h:10
-msgid "October"
-msgstr "Oktobar"
+#: ../calendar/gui/e-comp-editor-page-attachments.c:440
+#, 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/dialogs/goto-dialog.ui.h:11
-msgid "November"
-msgstr "Novembar"
+#: ../calendar/gui/e-comp-editor-page-attachments.c:457
+#, 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/dialogs/goto-dialog.ui.h:12
-msgid "December"
-msgstr "Decembar"
+#: ../calendar/gui/e-comp-editor-page-attachments.c:618
+#: ../composer/e-composer-actions.c:327
+msgid "_Attachment..."
+msgstr "_Prilog..."
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:13
-msgid "Select Date"
-msgstr "Izaberite datum"
+#: ../calendar/gui/e-comp-editor-page-attachments.c:620
+#: ../composer/e-composer-actions.c:329 ../e-util/e-attachment-view.c:463
+msgid "Attach a file"
+msgstr "Priložite datoteku"
 
-#: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1378
-msgid "Select _Today"
-msgstr "Izaberi _današnji dan"
+#: ../calendar/gui/e-comp-editor-page-attachments.c:627
+#| msgid "Attachments"
+msgid "_Attachments"
+msgstr "_Prilozi"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3500
-msgid "Memo"
-msgstr "Beleška"
+#: ../calendar/gui/e-comp-editor-page-attachments.c:629
+#| msgctxt "iCalImp"
+#| msgid "has attachments"
+msgid "Show attachments"
+msgstr "Prikažite priloge"
 
-#: ../calendar/gui/dialogs/memo-editor.c:155
-msgid "Print this memo"
-msgstr "Štampajte ovu belešku"
+#: ../calendar/gui/e-comp-editor-page-attachments.c:781
+#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:735
+msgid "Icon View"
+msgstr "Pregled ikonicama"
 
-#: ../calendar/gui/dialogs/memo-page.c:424
-msgid "Memo's start date is in the past"
-msgstr "Početak beleške je u prošlosti"
+#: ../calendar/gui/e-comp-editor-page-attachments.c:783
+#: ../e-util/e-attachment-bar.c:663 ../e-util/e-attachment-paned.c:737
+msgid "List View"
+msgstr "Pregled spiskom"
 
-#: ../calendar/gui/dialogs/memo-page.c:460
-msgid "Memo cannot be edited, because the selected memo list is read only"
-msgstr "Belešku nije moguće uređivati, pošto je izabran spisak samo za čitanje"
+#: ../calendar/gui/e-comp-editor-page-general.c:313
+#, c-format
+#| msgid "Cannot find matching event in the next %d year"
+#| msgid_plural "Cannot find matching event in the next %d years"
+msgid "Cannot find attendee '%s' in the list of attendees"
+msgstr "Ne mogu da nađem učesnika „%s“ na spisku učesnika"
 
-#: ../calendar/gui/dialogs/memo-page.c:464
-msgid "Memo cannot be fully edited, because you are not the organizer"
-msgstr "Belešku nije moguće potpuno urediti, pošto niste organizator"
+#: ../calendar/gui/e-comp-editor-page-general.c:320
+#, c-format
+msgid "Not enough rights to delete attendee '%s'"
+msgstr "Nemate dovoljna ovlašćenja za brisanje učesnika „%s“"
 
-#: ../calendar/gui/dialogs/memo-page.c:1166
-#: ../em-format/e-mail-formatter-utils.c:201
-#: ../em-format/e-mail-formatter-utils.c:218
-#: ../em-format/e-mail-part-headers.c:48 ../mail/em-filter-i18n.h:52
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:65
-msgid "To"
-msgstr "Prima"
+#: ../calendar/gui/e-comp-editor-page-general.c:350
+#| msgid "Failed to delete contact"
+msgid "Failed to delete selected attendee"
+msgid_plural "Failed to delete selected attendees"
+msgstr[0] "Nisam uspeo da obrišem izabranog učesnika"
+msgstr[1] "Nisam uspeo da obrišem izabrane učesnike"
+msgstr[2] "Nisam uspeo da obrišem izabrane učesnike"
+msgstr[3] "Nisam uspeo da obrišem izabranog učesnika"
 
-#: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.c:426
-#: ../calendar/gui/dialogs/task-page.ui.h:34
-msgid "_List:"
-msgstr "_Spisak:"
+#: ../calendar/gui/e-comp-editor-page-general.c:583
+#| msgid "Attendees"
+msgid "A_ttendees"
+msgstr "_Učesnici"
 
-#: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.c:434
-#: ../calendar/gui/dialogs/task-page.ui.h:24
-msgid "Organi_zer:"
-msgstr "Organi_zator:"
+#: ../calendar/gui/e-comp-editor-page-general.c:585
+#| msgid "Toggles whether the Attendee Type is displayed"
+msgid "Toggles whether the Attendees are displayed"
+msgstr "Okida prikazivanje učesnika"
 
-#: ../calendar/gui/dialogs/memo-page.ui.h:5
-msgid "T_o:"
-msgstr "_Prima:"
+#: ../calendar/gui/e-comp-editor-page-general.c:594
+msgid "R_ole Field"
+msgstr "Polje _uloge"
 
-#: ../calendar/gui/dialogs/memo-page.ui.h:6
-#: ../calendar/gui/dialogs/task-page.ui.h:26
-msgid "Sta_rt date:"
-msgstr "Datum p_očetka:"
+#: ../calendar/gui/e-comp-editor-page-general.c:596
+msgid "Toggles whether the Role field is displayed"
+msgstr "Prebacuje prikazivanje polja Uloga"
 
-#: ../calendar/gui/dialogs/memo-page.ui.h:7
-#: ../calendar/gui/dialogs/task-page.ui.h:23
-msgid "Su_mmary:"
-msgstr "Saže_tak:"
+#: ../calendar/gui/e-comp-editor-page-general.c:602
+msgid "_RSVP"
+msgstr "_Molim odgovorite"
 
-#: ../calendar/gui/dialogs/recur-comp.c:52
-#, c-format
-msgid "You are modifying a recurring event. What would you like to modify?"
-msgstr "Menjate povratni događaj. Šta želite da izmenite?"
+#: ../calendar/gui/e-comp-editor-page-general.c:604
+msgid "Toggles whether the RSVP field is displayed"
+msgstr "Prebacuje prikazivanje polja Molim odgovorite"
 
-#: ../calendar/gui/dialogs/recur-comp.c:54
-#, c-format
-msgid "You are delegating a recurring event. What would you like to delegate?"
-msgstr "Delegirate povratni događaj. Šta želite da delegirate?"
+#: ../calendar/gui/e-comp-editor-page-general.c:610
+msgid "_Status Field"
+msgstr "Polje _stanja"
 
-#: ../calendar/gui/dialogs/recur-comp.c:58
-#, c-format
-msgid "You are modifying a recurring task. What would you like to modify?"
-msgstr "Menjate povratni zadatak. Šta želite da izmenite?"
+#: ../calendar/gui/e-comp-editor-page-general.c:612
+msgid "Toggles whether the Status field is displayed"
+msgstr "Prebacuje prikazivanje polja Stanja"
 
-#: ../calendar/gui/dialogs/recur-comp.c:62
-#, c-format
-msgid "You are modifying a recurring memo. What would you like to modify?"
-msgstr "Menjate povratnu belešku. Šta želite da izmenite?"
+#: ../calendar/gui/e-comp-editor-page-general.c:618
+msgid "_Type Field"
+msgstr "Polje _tipa"
 
-#: ../calendar/gui/dialogs/recur-comp.c:88
-msgid "This Instance Only"
-msgstr "Samo ovaj unos"
+#: ../calendar/gui/e-comp-editor-page-general.c:620
+msgid "Toggles whether the Attendee Type is displayed"
+msgstr "Prebacuje prikazivanje polja Tipa"
 
-#: ../calendar/gui/dialogs/recur-comp.c:92
-msgid "This and Prior Instances"
-msgstr "Ovaj i prethodne unose"
+#: ../calendar/gui/e-comp-editor-page-general.c:945
+msgid "An organizer is required."
+msgstr "Potreban je organizator."
 
-#: ../calendar/gui/dialogs/recur-comp.c:98
-msgid "This and Future Instances"
-msgstr "Ovaj i buduće unose"
+#: ../calendar/gui/e-comp-editor-page-general.c:955
+#: ../calendar/gui/e-comp-editor-page-general.c:1086
+msgid "At least one attendee is required."
+msgstr "Najmanje jedan učesnik je potreban."
 
-#: ../calendar/gui/dialogs/recur-comp.c:103
-msgid "All Instances"
-msgstr "Sve unose"
+#: ../calendar/gui/e-comp-editor-page-general.c:1209
+msgid "Or_ganizer:"
+msgstr "Or_ganizator:"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:574
-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-general.c:1288
+#| msgid "Atte_ndees..."
+msgctxt "ECompEditor"
+msgid "Atte_ndees..."
+msgstr "_Učesnici..."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1001
-msgid "Recurrence date is invalid"
-msgstr "Datum ponavljanja nije ispravan"
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:326
+msgid "Add exception"
+msgstr "Dodaj izuzetak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
-msgid "End time of the recurrence was before event's start"
-msgstr "Vreme završetka ponavljanja je pre početka događaja"
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:364
+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/dialogs/recurrence-page.c:1074
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:489
 msgid "on"
 msgstr "u"
 
@@ -3558,62 +4315,78 @@ 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/dialogs/recurrence-page.c:1155
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:570
+#| msgid "first"
+msgctxt "ECompEditorPageRecur"
 msgid "first"
-msgstr "prvom"
+msgstr "prvog"
 
 #. TRANSLATORS: here, "second" is the ordinal number (like "third"), not the time division (like "minute")
 #. * Entire string is for example: This appointment recurs/Every [x] month(s) on the [second] [Monday] 
[forever]'
 #. * (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/dialogs/recurrence-page.c:1161
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:576
+#| msgid "second"
+msgctxt "ECompEditorPageRecur"
 msgid "second"
-msgstr "drugom"
+msgstr "drugog"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [third] 
[Monday] [forever]'
 #. * (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/dialogs/recurrence-page.c:1166
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:581
+#| msgid "third"
+msgctxt "ECompEditorPageRecur"
 msgid "third"
-msgstr "trećem"
+msgstr "trećeg"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fourth] 
[Monday] [forever]'
 #. * (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/dialogs/recurrence-page.c:1171
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:586
+#| msgid "fourth"
+msgctxt "ECompEditorPageRecur"
 msgid "fourth"
-msgstr "četvrtom"
+msgstr "četvrtog"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [fifth] 
[Monday] [forever]'
 #. * (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/dialogs/recurrence-page.c:1176
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:591
+#| msgid "fifth"
+msgctxt "ECompEditorPageRecur"
 msgid "fifth"
-msgstr "petom"
+msgstr "petog"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [last] 
[Monday] [forever]'
 #. * (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/dialogs/recurrence-page.c:1181
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:596
+#| msgid "last"
+msgctxt "ECompEditorPageRecur"
 msgid "last"
-msgstr "poslednjem"
+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/dialogs/recurrence-page.c:1205
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:623
+#| msgid "Other Date"
+msgctxt "ECompEditorPageRecur"
 msgid "Other Date"
-msgstr "Drugi datum"
+msgstr "Drugog datuma"
 
 #. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
 #. * 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/dialogs/recurrence-page.c:1211
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:629
+#| msgid "1st to 10th"
+msgctxt "ECompEditorPageRecur"
 msgid "1st to 10th"
 msgstr "od prvog do desetog"
 
@@ -3621,7 +4394,9 @@ 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/dialogs/recurrence-page.c:1217
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:635
+#| msgid "11th to 20th"
+msgctxt "ECompEditorPageRecur"
 msgid "11th to 20th"
 msgstr "od jedanaestog do dvadesetog"
 
@@ -3629,868 +4404,795 @@ 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/dialogs/recurrence-page.c:1223
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:641
+#| msgid "21st to 31st"
+msgctxt "ECompEditorPageRecur"
 msgid "21st to 31st"
-msgstr "od dvadeset prvog do trideset prvog"
+msgstr "od dvadesetprvog do tridesetprvog"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1250
-#: ../modules/calendar/e-calendar-preferences.ui.h:25
+#. 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
+#| msgid "day"
+#| msgid_plural "days"
+msgctxt "ECompEditorPageRecur"
+msgid "day"
+msgstr "dana"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:668
+#| msgid "Monday"
+msgctxt "ECompEditorPageRecur"
 msgid "Monday"
-msgstr "Ponedeljak"
+msgstr "ponedeljka"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1251
-#: ../modules/calendar/e-calendar-preferences.ui.h:28
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:669
+#| msgid "Tuesday"
+msgctxt "ECompEditorPageRecur"
 msgid "Tuesday"
-msgstr "Utorak"
+msgstr "utorka"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1252
-#: ../modules/calendar/e-calendar-preferences.ui.h:31
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:670
+#| msgid "Wednesday"
+msgctxt "ECompEditorPageRecur"
 msgid "Wednesday"
-msgstr "Sreda"
+msgstr "srede"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1253
-#: ../modules/calendar/e-calendar-preferences.ui.h:34
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:671
+#| msgid "Thursday"
+msgctxt "ECompEditorPageRecur"
 msgid "Thursday"
-msgstr "Četvrtak"
+msgstr "četvrtka"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1254
-#: ../modules/calendar/e-calendar-preferences.ui.h:37
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:672
+#| msgid "Friday"
+msgctxt "ECompEditorPageRecur"
 msgid "Friday"
-msgstr "Petak"
+msgstr "petka"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1255
-#: ../modules/calendar/e-calendar-preferences.ui.h:40
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:673
+#| msgid "Saturday"
+msgctxt "ECompEditorPageRecur"
 msgid "Saturday"
-msgstr "Subota"
+msgstr "subote"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1256
-#: ../modules/calendar/e-calendar-preferences.ui.h:43
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:674
+#| msgid "Sunday"
+msgctxt "ECompEditorPageRecur"
 msgid "Sunday"
-msgstr "Nedelja"
+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/dialogs/recurrence-page.c:1387
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:803
+#| msgid "on the"
+msgctxt "ECompEditorPageRecur"
 msgid "on the"
-msgstr "na"
+msgstr " "
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1572
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:993
+#| msgid "occurrences"
+msgctxt "ECompEditorPageRecur"
 msgid "occurrences"
 msgstr "pojave"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2342
-msgid "Add exception"
-msgstr "Dodaj izuzetak"
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2384
-msgid "Could not get a selection to modify."
-msgstr "Ne mogu da nađem izbor radi menjanja."
-
-#: ../calendar/gui/dialogs/recurrence-page.c:2390
-msgid "Modify exception"
-msgstr "Izmenite izuzetak"
+#. 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
+#| msgid "This appointment rec_urs"
+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
+#| msgid "This task recurs"
+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
+#| msgid "This memo recurs"
+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
+#| msgid "This appointment rec_urs"
+msgctxt "ECompEditorPageRecur"
+msgid "This component rec_urs"
+msgstr "Ovaj sastojak se _ponavlja"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1862
+#| msgid "Recurrence date is invalid"
+msgid "Recurrence exception date is invalid"
+msgstr "Datum izuzetka ponavljanja nije ispravan"
+
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1910
+#| msgid "End time of the recurrence was before event's start"
+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
+#| msgid "Recurrence"
+msgid "R_ecurrence"
+msgstr "_Ponavljanje"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2436
-msgid "Could not get a selection to delete."
-msgstr "Ne mogu da nađem izbor radi brisanja."
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:1955
+#| msgid "It has recurrences."
+msgid "Set or unset recurrence"
+msgstr "Podesite ili poništite ponavljanje"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2577
-msgid "Date/Time"
-msgstr "Datum/vreme"
+#. 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
+#| msgid "Every"
+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/dialogs/recurrence-page.ui.h:2
-msgctxt "recurrpage"
+#. 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
+#| msgid "day(s)"
+msgctxt "ECompEditorPageRecur"
 msgid "day(s)"
-msgstr "dan(i)"
+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/dialogs/recurrence-page.ui.h:4
-msgctxt "recurrpage"
+#. 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
+#| msgctxt "recurrpage"
+#| msgid "week(s)"
+msgctxt "ECompEditorPageRecur"
 msgid "week(s)"
-msgstr "nedelja(e)"
+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/dialogs/recurrence-page.ui.h:6
-msgctxt "recurrpage"
+#. 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
+#| msgctxt "recurrpage"
+#| msgid "month(s)"
+msgctxt "ECompEditorPageRecur"
 msgid "month(s)"
-msgstr "mesec(i)"
+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/dialogs/recurrence-page.ui.h:8
-msgctxt "recurrpage"
+#. 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
+#| msgctxt "recurrpage"
+#| msgid "year(s)"
+msgctxt "ECompEditorPageRecur"
 msgid "year(s)"
-msgstr "godina(e)"
+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/dialogs/recurrence-page.ui.h:10
-msgctxt "recurrpage"
+#. 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
+#| msgctxt "eventpage"
+#| msgid "for"
+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/dialogs/recurrence-page.ui.h:12
-msgctxt "recurrpage"
+#. 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
+#| msgctxt "eventpage"
+#| msgid "until"
+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/dialogs/recurrence-page.ui.h:14
-msgctxt "recurrpage"
+#. 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
+#| msgctxt "recurrpage"
+#| msgid "forever"
+msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "uvek"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:16
-msgid "This appointment rec_urs"
-msgstr "Ovo zakazivanje se po_navlja"
-
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:17
-msgid "Every"
-msgstr "Svakih"
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2146
+msgid "This appointment contains recurrences that Evolution cannot edit."
+msgstr "Ovo zakazivanje sadrži ponavljanja koja Evolucija ne može da uredi."
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:18
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2163
 msgid "Exceptions"
 msgstr "Izuzeci"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:22
-msgid "Preview"
-msgstr "Pregled"
-
-#: ../calendar/gui/dialogs/send-comp.c:172
-#: ../calendar/gui/dialogs/send-comp.c:254
-msgid "Send my reminders with this event"
-msgstr "Pošalji moje podsetnike sa ovim događajem"
-
-#: ../calendar/gui/dialogs/send-comp.c:174
-#: ../calendar/gui/dialogs/send-comp.c:256
-msgid "Notify new attendees _only"
-msgstr "Obavesti _samo nove učesnike"
-
-#: ../calendar/gui/dialogs/task-editor.c:93
-msgid "_Send Options"
-msgstr "Mogućnosti _slanja"
-
-#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3498
-#: ../e-util/e-send-options.c:552
-msgid "Task"
-msgstr "Zadatak"
-
-#: ../calendar/gui/dialogs/task-editor.c:285
-msgid "Print this task"
-msgstr "Odštampajte ovaj zadatak"
-
-#: ../calendar/gui/dialogs/task-page.c:330
-msgid "Task's start date is in the past"
-msgstr "Početak zadatka je u prošlosti"
-
-#: ../calendar/gui/dialogs/task-page.c:331
-msgid "Task's due date is in the past"
-msgstr "Rok za završetak zadatka je u prošlosti"
-
-#: ../calendar/gui/dialogs/task-page.c:364
-msgid "Task cannot be edited, because the selected task list is read only"
-msgstr "Zadatak nije moguće uređivati, pošto je izabrani spisak samo za čitanje"
-
-#: ../calendar/gui/dialogs/task-page.c:368
-msgid "Task cannot be fully edited, because you are not the organizer"
-msgstr "Zadatak nije moguće potpuno urediti, zato što niste organizator"
-
-#: ../calendar/gui/dialogs/task-page.c:372
-msgid ""
-"Task cannot be edited, because the selected task list does not support "
-"assigned tasks"
-msgstr ""
-"Zadatak nije moguće uređivati, zato što izabrani spisak zadataka ne podržava "
-"dodeljene zadatke"
-
-#: ../calendar/gui/dialogs/task-page.c:1011
-msgid "Due date is wrong"
-msgstr "Krajnji rok je pogrešan"
-
-#: ../calendar/gui/dialogs/task-page.c:1179
-#: ../calendar/gui/dialogs/task-page.c:1204
-msgid "Completed date is wrong"
-msgstr "Datum završetka je pogrešan"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:336
-#: ../calendar/gui/e-task-table.c:572 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:309
-msgid "High"
-msgstr "Visok"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:338
-#: ../calendar/gui/e-cal-model.c:1665 ../calendar/gui/e-task-table.c:573
-#: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:308
-msgid "Normal"
-msgstr "Običan"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:340
-#: ../calendar/gui/e-task-table.c:574 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:307
-msgid "Low"
-msgstr "Nizak"
-
-#. To Translators: This is task priority
-#: ../calendar/gui/dialogs/task-page.ui.h:14
-#: ../calendar/gui/e-task-table.c:575 ../calendar/gui/tasktypes.xml.h:22
-#: ../e-util/e-send-options.ui.h:1
-msgid "Undefined"
-msgstr "Neodređen"
-
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:321
-#: ../calendar/gui/e-cal-model-tasks.c:310
-#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:655
-#: ../calendar/gui/print.c:3582 ../calendar/gui/tasktypes.xml.h:11
-msgid "Not Started"
-msgstr "Nije započet"
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2232
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1778
+#: ../mail/mail-config.ui.h:62
+msgid "A_dd"
+msgstr "_Dodaj"
 
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:18
-#: ../calendar/gui/e-cal-component-preview.c:311
-#: ../calendar/gui/e-cal-model-tasks.c:312
-#: ../calendar/gui/e-cal-model-tasks.c:554
-#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:656
-#: ../calendar/gui/print.c:3585
-msgid "In Progress"
-msgstr "U toku"
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2248
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1786
+#: ../mail/mail-config.ui.h:64
+msgid "Re_move"
+msgstr "_Ukloni"
 
-# timezone.
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:20
-#: ../calendar/gui/e-cal-component-preview.c:314
-#: ../calendar/gui/e-cal-model-tasks.c:314
-#: ../calendar/gui/e-cal-model-tasks.c:556
-#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../calendar/gui/e-task-table.c:217 ../calendar/gui/e-task-table.c:232
-#: ../calendar/gui/e-task-table.c:657 ../calendar/gui/print.c:3588
-#: ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:379
-msgid "Completed"
-msgstr "Završeno"
+#: ../calendar/gui/e-comp-editor-page-recurrence.c:2256
+msgid "Preview"
+msgstr "Pregled"
 
-#. To Translators: This is task status
-#: ../calendar/gui/dialogs/task-page.ui.h:22
-#: ../calendar/gui/e-cal-component-preview.c:317
-#: ../calendar/gui/e-cal-model-tasks.c:316
-#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:219
-#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:658
-#: ../calendar/gui/print.c:3591 ../mail/mail-send-recv.c:855
-msgid "Canceled"
-msgstr "Otkazano"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:41
+#| msgid "Send To:"
+msgid "Send To"
+msgstr "Pošalji"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:25
-msgid "D_ue date:"
-msgstr "Krajnji _rok:"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1555
+msgid "_Reminders"
+msgstr "_Podsetnici"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:28
-msgid "Time zone:"
-msgstr "Vremenska zona:"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1557
+#| msgid "Set or unset reminders for this event"
+msgid "Set or unset reminders"
+msgstr "Podesite ili poništite podsetnike"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:35
-msgid "_Status:"
-msgstr "_Stanje:"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1610
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
+msgid "Reminders"
+msgstr "Podsetnici"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:36
-msgid "Date _completed:"
-msgstr "_Datum završetka:"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1639
+msgid "_Reminder"
+msgstr "_Podsetnik"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:37
-msgid "_Percent complete:"
-msgstr "P_rocenat završenog:"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1672
+#, c-format
+#| msgid "%d day before appointment"
+#| msgid_plural "%d days before appointment"
+msgid "%d day before"
+msgid_plural "%d days before"
+msgstr[0] "%d dan pre"
+msgstr[1] "%d dana pre"
+msgstr[2] "%d dana pre"
+msgstr[3] "%d dan pre"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1679
+#, c-format
+#| msgid "%d hour before appointment"
+#| msgid_plural "%d hours before appointment"
+msgid "%d hour before"
+msgid_plural "%d hours before"
+msgstr[0] "%d sat pre"
+msgstr[1] "%d sata pre"
+msgstr[2] "%d sati pre"
+msgstr[3] "%d sat pre"
+
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1686
+#, c-format
+#| msgid "%d minute before appointment"
+#| msgid_plural "%d minutes before appointment"
+msgid "%d minute before"
+msgid_plural "%d minutes before"
+msgstr[0] "%d minut pre"
+msgstr[1] "%d minuta pre"
+msgstr[2] "%d minuta pre"
+msgstr[3] "%d minut pre"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:38
-msgid "Priorit_y:"
-msgstr "_Važnost:"
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# 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.
+#. Translators: "None" for "No reminder set"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1694
+msgctxt "cal-reminders"
+msgid "None"
+msgstr "Ništa"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:39
-msgid "C_lassification:"
-msgstr "_Razvrstavanje:"
+#. Translators: Predefined reminder's description
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1696
+#| msgid "15 minutes"
+msgctxt "cal-reminders"
+msgid "15 minutes before"
+msgstr "pre 15 minuta"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:40
-msgid "_Web Page:"
-msgstr "_Veb stranica:"
+#. Translators: Predefined reminder's description
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1698
+#| msgid "1 hour ago"
+#| msgid_plural "%d hours ago"
+msgctxt "cal-reminders"
+msgid "1 hour before"
+msgstr "pre %d sat"
 
-#: ../calendar/gui/ea-cal-view.c:281
-msgid "New Appointment"
-msgstr "Novo zakazivanje"
+#. Translators: Predefined reminder's description
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1700
+#| msgid "is before"
+msgctxt "cal-reminders"
+msgid "1 day before"
+msgstr "pre 1 dana"
 
-#: ../calendar/gui/ea-cal-view.c:282
-msgid "New All Day Event"
-msgstr "Novi celodnevni događaj"
+#. Translators: "Custom" for "Custom reminder set"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1712
+#| msgid "Custom"
+msgctxt "cal-reminders"
+msgid "Custom"
+msgstr "Proizvoljno"
 
-#: ../calendar/gui/ea-cal-view.c:283
-msgid "New Meeting"
-msgstr "Novi sastanak"
+# bug: plural-forms
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1863
+#| msgid "minute(s)"
+msgctxt "cal-reminders"
+msgid "minute(s)"
+msgstr "minut(a)"
 
-#: ../calendar/gui/ea-cal-view.c:284
-msgid "Go to Today"
-msgstr "Idi na današnji dan"
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1865
+#| msgid "hour(s)"
+msgctxt "cal-reminders"
+msgid "hour(s)"
+msgstr "sat(a)"
 
-#: ../calendar/gui/ea-cal-view.c:285
-msgid "Go to Date"
-msgstr "Idi na datum"
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1867
+#| msgid "day(s)"
+msgctxt "cal-reminders"
+msgid "day(s)"
+msgstr "dan(a)"
 
-#: ../calendar/gui/ea-cal-view-event.c:297
-msgid "It has reminders."
-msgstr "Ima podsetnike."
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1884
+#| msgid "before"
+msgctxt "cal-reminders"
+msgid "before"
+msgstr "pre"
 
-#: ../calendar/gui/ea-cal-view-event.c:300
-msgid "It has recurrences."
-msgstr "Ima ponavljanja."
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1886
+#| msgid "after"
+msgctxt "cal-reminders"
+msgid "after"
+msgstr "posle"
 
-#: ../calendar/gui/ea-cal-view-event.c:303
-msgid "It is a meeting."
-msgstr "To je sastanak."
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1902
+#| msgid "Start"
+msgctxt "cal-reminders"
+msgid "start"
+msgstr "početka"
 
-#: ../calendar/gui/ea-cal-view-event.c:310
-#, c-format
-msgid "Calendar Event: Summary is %s."
-msgstr "Kalendarski događaj: sažetak je %s."
+#. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1904
+#| msgid "_Send"
+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
+#| msgid "_Repeat the reminder"
+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
+#| msgid "extra times every"
+msgctxt "cal-reminders"
+msgid "extra times every"
+msgstr "prikaži još na svakih"
 
-#: ../calendar/gui/ea-cal-view-event.c:313
-msgid "Calendar Event: It has no summary."
-msgstr "Kalendarski događaj: nema sažetka."
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1989
+#| msgid "minutes"
+msgctxt "cal-reminders"
+msgid "minutes"
+msgstr "minuta"
 
-#: ../calendar/gui/ea-cal-view-event.c:336
-msgid "calendar view event"
-msgstr "događaj pregleda kalendara"
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1991
+#| msgid "hours"
+msgctxt "cal-reminders"
+msgid "hours"
+msgstr "sati"
 
-#: ../calendar/gui/ea-cal-view-event.c:568
-msgid "Grab Focus"
-msgstr "Fokusiraj"
+#. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
+#: ../calendar/gui/e-comp-editor-page-reminders.c:1993
+#| msgid "days"
+msgctxt "cal-reminders"
+msgid "days"
+msgstr "dana"
 
-#: ../calendar/gui/ea-day-view.c:111 ../calendar/gui/ea-week-view.c:110
-#, c-format
-msgid "It has %d event."
-msgid_plural "It has %d events."
-msgstr[0] "Ima %d događaj."
-msgstr[1] "Ima %d događaja."
-msgstr[2] "Ima %d događaja."
-msgstr[3] "Ima %d događaj."
+#. 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
+#| msgid "Custom _message"
+msgctxt "cal-reminders"
+msgid "Custom _message"
+msgstr "Proizvoljna _poruka"
 
-#. To translators: Here, "It" is either like "Work Week View: July
-#. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:118 ../calendar/gui/ea-week-view.c:113
-msgid "It has no events."
-msgstr "Nema događaja."
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2078
+#| msgid "Custom reminder sound"
+msgctxt "cal-reminders"
+msgid "Custom reminder _sound"
+msgstr "Proizvoljan _zvuk podsetnika"
 
-#: ../calendar/gui/ea-day-view.c:126
-#, c-format
-msgid "Work Week View: %s. %s"
-msgstr "Pregled radne nedelje: %s. %s"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2089
+#| msgid "Select sound file"
+msgid "Select a sound file"
+msgstr "Izaberite zvučnu datoteku"
 
-#: ../calendar/gui/ea-day-view.c:133
-#, c-format
-msgid "Day View: %s. %s"
-msgstr "Dnevni pregled: %s. %s"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2117
+msgid "_Program:"
+msgstr "_Program:"
 
-#: ../calendar/gui/ea-day-view.c:167
-msgid "calendar view for a work week"
-msgstr "pregled kalendara za radnu nedelju"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2142
+msgid "_Arguments:"
+msgstr "_Argumenti:"
 
-#: ../calendar/gui/ea-day-view.c:169
-msgid "calendar view for one or more days"
-msgstr "pregled kalendara za jedan ili više dana"
+#: ../calendar/gui/e-comp-editor-page-reminders.c:2174
+#| msgid "Send To:"
+msgid "_Send To:"
+msgstr "_Pošalji:"
 
-#: ../calendar/gui/ea-day-view-main-item.c:266
-#: ../calendar/gui/ea-week-view-main-item.c:293
-msgid "a table to view and select the current time range"
-msgstr "tabela za prikaz i izbor tekućeg vremenskog raspona"
+#: ../calendar/gui/e-comp-editor-page-schedule.c:427
+#| msgid "_Schedule Meeting..."
+msgid "_Schedule"
+msgstr "_Zakaži"
 
-#: ../calendar/gui/ea-gnome-calendar.c:47
-#: ../calendar/gui/ea-gnome-calendar.c:55
-#: ../calendar/importers/icalendar-importer.c:1107
-msgid "Gnome Calendar"
-msgstr "Gnomov kalendar"
+#: ../calendar/gui/e-comp-editor-page-schedule.c:429
+msgid "Query free / busy information for the attendees"
+msgstr "Zatraži podatak za slobodno/zauzeto vreme za ove učesnike"
 
-#: ../calendar/gui/ea-gnome-calendar.c:206
-#: ../modules/calendar/e-cal-shell-view-private.c:1190
-msgid "%A %d %b %Y"
-msgstr "%A, %d. %b %Y."
+#: ../calendar/gui/e-comp-editor-property-parts.c:81
+#| msgid "_Summary:"
+msgctxt "ECompEditor"
+msgid "_Summary:"
+msgstr "_Sažetak:"
 
-# %b = abbreviated month name. Don't use any other specifiers.
-# strftime format %a = abbreviated weekday name,
-# %d = day of month, %b = abbreviated month name.
-# You can change the order but don't change the
-# specifiers or add anything.
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. * %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. * %d = day of month, %b = abbreviated month name.
-#. * You can change the order but don't change the
-#. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:210 ../calendar/gui/e-day-view.c:2796
-#: ../calendar/gui/e-day-view-top-item.c:858
-#: ../calendar/gui/e-week-view-main-item.c:218
-#: ../modules/calendar/e-cal-shell-view-private.c:1194
-msgid "%a %d %b"
-msgstr "%a %d %b"
+#: ../calendar/gui/e-comp-editor-property-parts.c:325
+#| msgid "_Location:"
+msgctxt "ECompEditor"
+msgid "_Location:"
+msgstr "_Mesto:"
 
-#: ../calendar/gui/ea-gnome-calendar.c:213
-#: ../calendar/gui/ea-gnome-calendar.c:219
-#: ../calendar/gui/ea-gnome-calendar.c:222
-#: ../modules/calendar/e-cal-shell-view-private.c:1197
-#: ../modules/calendar/e-cal-shell-view-private.c:1203
-#: ../modules/calendar/e-cal-shell-view-private.c:1206
-msgid "%a %d %b %Y"
-msgstr "%a %d %b %Y."
+#: ../calendar/gui/e-comp-editor-property-parts.c:458
+#| msgid "Ca_tegories..."
+msgctxt "ECompEditor"
+msgid "_Categories..."
+msgstr "_Kategorije..."
 
-#: ../calendar/gui/ea-gnome-calendar.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:249
-#: ../calendar/gui/ea-gnome-calendar.c:256
-#: ../calendar/gui/ea-gnome-calendar.c:259
-#: ../modules/calendar/e-cal-shell-view-private.c:1223
-#: ../modules/calendar/e-cal-shell-view-private.c:1234
-#: ../modules/calendar/e-cal-shell-view-private.c:1241
-#: ../modules/calendar/e-cal-shell-view-private.c:1244
-msgid "%d %b %Y"
-msgstr "%d. %b %Y."
+#: ../calendar/gui/e-comp-editor-property-parts.c:555
+#| msgid "_Description:"
+msgctxt "ECompEditor"
+msgid "_Description:"
+msgstr "_Opis:"
 
-# Don't use any other specifiers.
-# strftime format %d = day of month, %b = abbreviated
-# month name. You can change the order but don't
-# change the specifiers or add anything.
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. * Don't use any other specifiers.
-#. 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/ea-gnome-calendar.c:246 ../calendar/gui/e-day-view.c:2812
-#: ../calendar/gui/e-day-view-top-item.c:862
-#: ../calendar/gui/e-week-view-main-item.c:232
-#: ../modules/calendar/e-cal-shell-view-private.c:1230
-msgid "%d %b"
-msgstr "%d. %b"
+#: ../calendar/gui/e-comp-editor-property-parts.c:686
+#| msgid "_Web Page:"
+msgctxt "ECompEditor"
+msgid "_Web page:"
+msgstr "_Veb stranica:"
 
-#: ../calendar/gui/ea-jump-button.c:150
-msgid "Jump button"
-msgstr "Dugme za preskakanje"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1057
+#| msgid "D_ue date:"
+msgctxt "ECompEditor"
+msgid "D_ue date:"
+msgstr "Krajnji _rok:"
 
-#: ../calendar/gui/ea-jump-button.c:159
-msgid "Click here, you can find more events."
-msgstr "Kliknite ovde, možete naći još događaja."
+#: ../calendar/gui/e-comp-editor-property-parts.c:1117
+#| msgid "Date _completed:"
+msgctxt "ECompEditor"
+msgid "Date _completed:"
+msgstr "_Datum završetka:"
 
-#. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:357 ../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"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1133
+#| msgid "Public"
+msgctxt "ECompEditor"
+msgid "Public"
+msgstr "Javno"
 
-#. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:363
-#, c-format
-msgid "%d week"
-msgid_plural "%d weeks"
-msgstr[0] "%d nedelja"
-msgstr[1] "%d nedelje"
-msgstr[2] "%d nedelja"
-msgstr[3] "%d nedelja"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1134
+#| msgid "Private"
+msgctxt "ECompEditor"
+msgid "Private"
+msgstr "Lično"
 
-#: ../calendar/gui/e-alarm-list.c:425
-msgid "Unknown action to be performed"
-msgstr "Izvršiće se nepoznata radnja"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1135
+#| msgid "Confidential"
+msgctxt "ECompEditor"
+msgid "Confidential"
+msgstr "Poverljivo"
 
-#: ../calendar/gui/e-alarm-list.c:440
-#, c-format
-msgid "%s %s before the start of the appointment"
-msgstr "%s %s pre početka sastanka"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1144
+#| msgid "C_lassification:"
+msgctxt "ECompEditor"
+msgid "C_lassification:"
+msgstr "_Razvrstavanje:"
 
-#: ../calendar/gui/e-alarm-list.c:446
-#, c-format
-msgid "%s %s after the start of the appointment"
-msgstr "%s %s nakon početka sastanka"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1157
+#| msgid "Not Started"
+msgctxt "ECompEditor"
+msgid "Not Started"
+msgstr "Nije započet"
 
-#. Translator: The %s refers to the base, which would be actions like
-#. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:453
-#, c-format
-msgid "%s at the start of the appointment"
-msgstr "%s na početku sastanka"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1158
+#| msgid "In Progress"
+msgctxt "ECompEditor"
+msgid "In Progress"
+msgstr "U toku"
 
-#: ../calendar/gui/e-alarm-list.c:465
-#, c-format
-msgid "%s %s before the end of the appointment"
-msgstr "%s %s pre kraja sastanka"
+# timezone.
+#: ../calendar/gui/e-comp-editor-property-parts.c:1159
+#| msgid "Completed"
+msgctxt "ECompEditor"
+msgid "Completed"
+msgstr "Završeno"
 
-#: ../calendar/gui/e-alarm-list.c:471
-#, c-format
-msgid "%s %s after the end of the appointment"
-msgstr "%s %s nakon završetka sastanka"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1160
+#| msgid "Canceled"
+msgctxt "ECompEditor"
+msgid "Canceled"
+msgstr "Otkazano"
 
-#. Translator: The %s refers to the base, which would be actions like
-#. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:478
-#, c-format
-msgid "%s at the end of the appointment"
-msgstr "%s na kraju sastanka"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1169
+#| msgid "_Status:"
+msgctxt "ECompEditor"
+msgid "_Status:"
+msgstr "_Stanje:"
 
-#. Translator: The first %s refers to the base, which would be actions like
-#. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:502
-#, c-format
-msgid "%s at %s"
-msgstr "%s u %s"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1199
+#| msgid "Undefined"
+msgctxt "ECompEditor"
+msgid "Undefined"
+msgstr "Neodređen"
 
-#. Translator: The %s refers to the base, which would be actions like
-#. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:510
-#, c-format
-msgid "%s for an unknown trigger type"
-msgstr "%s za nepoznat tip pokretača"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1200
+#| msgid "High"
+msgctxt "ECompEditor"
+msgid "High"
+msgstr "Visok"
 
-#: ../calendar/gui/ea-week-view.c:119
-#, c-format
-msgid "Month View: %s. %s"
-msgstr "Mesečni pregled: %s. %s"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1201
+#| msgid "Normal"
+msgctxt "ECompEditor"
+msgid "Normal"
+msgstr "Običan"
 
-#: ../calendar/gui/ea-week-view.c:124
-#, c-format
-msgid "Week View: %s. %s"
-msgstr "Nedeljni pregled: %s. %s"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1202
+#| msgid "Low"
+msgctxt "ECompEditor"
+msgid "Low"
+msgstr "Nizak"
 
-#: ../calendar/gui/ea-week-view.c:158
-msgid "calendar view for a month"
-msgstr "pregled kalendara za mesec"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1211
+#| msgid "Priorit_y:"
+msgctxt "ECompEditor"
+msgid "Priorit_y:"
+msgstr "_Važnost:"
 
-#: ../calendar/gui/ea-week-view.c:160
-msgid "calendar view for one or more weeks"
-msgstr "pregled kalendara za jednu ili više nedelja"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1265
+#| msgid "_Percent complete:"
+msgctxt "ECompEditor"
+msgid "Percent complete:"
+msgstr "Procenat završenog:"
 
-#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:757
-#: ../mail/e-mail-config-page.c:125
-msgid "Untitled"
-msgstr "Neimenovano"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1346
+#| msgid "Time _zone:"
+msgctxt "ECompEditor"
+msgid "Time _zone:"
+msgstr "Vremenska _zona:"
 
-#: ../calendar/gui/e-cal-component-preview.c:230
-msgid "Categories:"
-msgstr "Kategorije:"
+#: ../calendar/gui/e-comp-editor-property-parts.c:1471
+#| msgid "Show Time as _Busy"
+msgctxt "ECompEditor"
+msgid "Show time as _busy"
+msgstr "Prikaži vreme kao _zauzeto"
 
-#: ../calendar/gui/e-cal-component-preview.c:262
-msgid "Summary:"
-msgstr "Sažetak:"
+#: ../calendar/gui/e-comp-editor-task.c:75
+msgid "Task's start date is in the past"
+msgstr "Početak zadatka je u prošlosti"
 
-#: ../calendar/gui/e-cal-component-preview.c:271
-msgid "Start Date:"
-msgstr "Datum početka:"
+#: ../calendar/gui/e-comp-editor-task.c:83
+msgid "Task's due date is in the past"
+msgstr "Rok za završetak zadatka je u prošlosti"
 
-#: ../calendar/gui/e-cal-component-preview.c:283
-msgid "End Date:"
-msgstr "Datum završetka:"
+#: ../calendar/gui/e-comp-editor-task.c:308
+#| msgid "Task cannot be edited, because the selected task list is read only"
+msgid ""
+"Task cannot be edited, because the selected task list could not be opened"
+msgstr ""
+"Zadatak se ne može uređivati, pošto se izabrani spisak zadataka ne može "
+"otvoriti"
 
-#: ../calendar/gui/e-cal-component-preview.c:295
-msgid "Due Date:"
-msgstr "Krajnji rok:"
+#: ../calendar/gui/e-comp-editor-task.c:310
+msgid "Task cannot be edited, because the selected task list is read only"
+msgstr "Zadatak nije moguće uređivati, pošto je izabrani spisak samo za čitanje"
 
-#: ../calendar/gui/e-cal-component-preview.c:307
-#: ../modules/itip-formatter/itip-view.c:1506
-#: ../modules/itip-formatter/itip-view.c:1623
-msgid "Status:"
-msgstr "Stanje:"
+#: ../calendar/gui/e-comp-editor-task.c:312
+msgid "Task cannot be fully edited, because you are not the organizer"
+msgstr "Zadatak nije moguće potpuno urediti, zato što niste organizator"
 
-#: ../calendar/gui/e-cal-component-preview.c:334
-msgid "Priority:"
-msgstr "Važnost:"
+#: ../calendar/gui/e-comp-editor-task.c:359
+#| msgid "Recurrence date is invalid"
+msgid "Due date is not a valid date"
+msgstr "Datum isteka nije ispravan datum"
 
-#: ../calendar/gui/e-cal-component-preview.c:359
-#: ../mail/e-mail-config-service-page.c:671
-msgid "Description:"
-msgstr "Opis:"
+#: ../calendar/gui/e-comp-editor-task.c:370
+#| msgid "Completed date is wrong"
+msgid "Completed date is not a valid date"
+msgstr "Datum završetka nije ispravan datum"
 
-#: ../calendar/gui/e-cal-component-preview.c:390
-msgid "Web Page:"
-msgstr "Veb stranica:"
+#: ../calendar/gui/e-comp-editor-task.c:381
+#| msgid "1 minute in the future"
+#| msgid_plural "%d minutes in the future"
+msgid "Completed date cannot be in the future"
+msgstr "Datum završetka ne može biti u budućnosti"
 
-#: ../calendar/gui/e-calendar-selector.c:356
-#: ../modules/calendar/e-cal-shell-view-private.c:1096
+#: ../calendar/gui/e-comp-editor-task.c:566
 #, c-format
-msgid "Copying an event into the calendar %s"
-msgstr "Umnožavam događaj u kalendar „%s“"
+msgid "Assigned Task - %s"
+msgstr "Dodeljen zadatak — %s"
 
-#: ../calendar/gui/e-calendar-selector.c:357
-#: ../modules/calendar/e-cal-shell-view-private.c:1095
+#: ../calendar/gui/e-comp-editor-task.c:567
 #, c-format
-msgid "Moving an event into the calendar %s"
-msgstr "Premeštam događaj u kalendar „%s“"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:1
-msgid "Click to add a task"
-msgstr "Kliknite da dodate zadatak"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:2
-msgid "Start date"
-msgstr "Datum početka"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:652
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:4
-#: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../e-util/e-attachment-tree-view.c:585
-#: ../mail/e-mail-account-tree-view.c:158
-msgid "Type"
-msgstr "Vrsta"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:5
-msgid "Completion date"
-msgstr "Datum završetka"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:857
-msgid "Complete"
-msgstr "Završeno"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:7
-msgid "Due date"
-msgstr "Krajnji rok"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:9
-#, no-c-format
-msgid "% Complete"
-msgstr "% je završeno"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:10
-#: ../calendar/gui/tasktypes.xml.h:18
-#: ../plugins/save-calendar/csv-format.c:386
-msgid "Priority"
-msgstr "Važnost"
-
-#. 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-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:4011
-#: ../calendar/gui/e-meeting-list-view.c:695
-#: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:49
-#: ../mail/message-list.etspec.h:1
-msgid "Status"
-msgstr "Stanje"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:13
-#: ../calendar/gui/e-cal-list-view.etspec.h:7
-#: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../plugins/save-calendar/csv-format.c:380
-msgid "Created"
-msgstr "Napravljeno"
-
-#: ../calendar/gui/e-calendar-table.etspec.h:14
-#: ../calendar/gui/e-cal-list-view.etspec.h:8
-#: ../calendar/gui/e-memo-table.etspec.h:7
-msgid "Last modified"
-msgstr "Poslednje izmene"
-
-#: ../calendar/gui/e-calendar-view.c:448
-msgid "Cut selected events to the clipboard"
-msgstr "Seče izabrane događaje u spisak isečaka"
-
-#: ../calendar/gui/e-calendar-view.c:454
-msgid "Copy selected events to the clipboard"
-msgstr "Umnožava izabrane događaje u spisak isečaka"
-
-#: ../calendar/gui/e-calendar-view.c:460
-msgid "Paste events from the clipboard"
-msgstr "Ubacuje događaje iz spiska isečaka"
+msgid "Task - %s"
+msgstr "Zadatak — %s"
 
-#: ../calendar/gui/e-calendar-view.c:466
-msgid "Delete selected events"
-msgstr "Briše izabrane događaje"
+#: ../calendar/gui/e-comp-editor.c:254
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:127
+msgid "attachment"
+msgstr "prilog"
 
-#: ../calendar/gui/e-calendar-view.c:486 ../calendar/gui/e-memo-table.c:182
-#: ../calendar/gui/e-task-table.c:269
-msgid "Deleting selected objects"
-msgstr "Brišem izabrane objekte"
+#: ../calendar/gui/e-comp-editor.c:609
+#| msgid "Send _updates to attendees"
+msgid "Sending notifications to attendees..."
+msgstr "Šaljem obaveštenja učesnicima..."
 
-#: ../calendar/gui/e-calendar-view.c:648 ../calendar/gui/e-memo-table.c:877
-#: ../calendar/gui/e-task-table.c:1175
-msgid "Updating objects"
-msgstr "Ažuriram objekat"
+#: ../calendar/gui/e-comp-editor.c:991
+#| msgid "_Save Changes"
+msgid "Saving changes..."
+msgstr "Čuvam izmene..."
 
-#. 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:2094 ../calendar/gui/e-memo-table.c:552
-#: ../calendar/gui/e-task-table.c:839
-#, c-format
-msgid "Organizer: %s <%s>"
-msgstr "Organizator: %s <%s>"
+#: ../calendar/gui/e-comp-editor.c:1247
+msgid "No Summary"
+msgstr "Bez sažetka"
 
-#. 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:2098 ../calendar/gui/e-memo-table.c:557
-#: ../calendar/gui/e-task-table.c:843
-#, c-format
-msgid "Organizer: %s"
-msgstr "Organizator: %s"
+#. == 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:295
+#: ../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
+#: ../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
+msgid "_Close"
+msgstr "_Zatvori"
 
-#. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2114
-#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3536
-#, c-format
-msgid "Location: %s"
-msgstr "Mesto: %s"
+#: ../calendar/gui/e-comp-editor.c:1974
+msgid "Close the current window"
+msgstr "Zatvorite trenutni prozor"
 
-#. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2145
-#, c-format
-msgid "Time: %s %s"
-msgstr "Vreme: %s %s"
+#. 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
+msgid "_Copy"
+msgstr "_Umnoži"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:1
-#: ../calendar/gui/e-memo-table.etspec.h:5
-msgid "Start Date"
-msgstr "Datum početka"
+#: ../calendar/gui/e-comp-editor.c:1981 ../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
+#: ../shell/e-shell-window-actions.c:801
+msgid "Copy the selection"
+msgstr "Umnožite izabrano"
 
-#: ../calendar/gui/e-cal-list-view.etspec.h:2
-msgid "End Date"
-msgstr "Datum završetka"
+#. 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
+#: ../mail/e-mail-browser.c:143 ../shell/e-shell-window-actions.c:806
+msgid "Cu_t"
+msgstr "_Iseci"
 
-#: ../calendar/gui/e-cal-model.c:466 ../calendar/gui/e-meeting-list-view.c:184
-#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../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:1250
-#: ../calendar/gui/print.c:1267 ../e-util/e-charset.c:51
-#: ../modules/itip-formatter/itip-view.c:3510
-#: ../modules/itip-formatter/itip-view.c:6097
-#: ../modules/plugin-manager/evolution-plugin-manager.c:99
-msgid "Unknown"
-msgstr "Nepoznato"
+#: ../calendar/gui/e-comp-editor.c:1988 ../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
+#: ../mail/e-mail-browser.c:145 ../shell/e-shell-window-actions.c:808
+msgid "Cut the selection"
+msgstr "Isecite izabrano"
 
-#: ../calendar/gui/e-cal-model.c:1667
-msgid "Recurring"
-msgstr "Periodičnost"
+#: ../calendar/gui/e-comp-editor.c:1995 ../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-cal-model.c:1669
-msgid "Assigned"
-msgstr "Dodeljeno"
+#: ../calendar/gui/e-comp-editor.c:2002
+msgid "View help"
+msgstr "Pogledaj pomoć"
 
-#: ../calendar/gui/e-cal-model.c:1671 ../calendar/gui/e-cal-model-tasks.c:1165
-#: ../calendar/gui/e-meeting-list-view.c:208
-#: ../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"
+#. 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
+#: ../mail/e-mail-browser.c:150 ../shell/e-shell-window-actions.c:834
+msgid "_Paste"
+msgstr "_Ubaci"
 
-#: ../calendar/gui/e-cal-model.c:1671 ../calendar/gui/e-cal-model-tasks.c:1165
-#: ../calendar/gui/e-meeting-list-view.c:209
-#: ../calendar/gui/e-meeting-store.c:188
-msgid "No"
-msgstr "Ne"
+#: ../calendar/gui/e-comp-editor.c:2009 ../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
+#: ../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-cal-model.c:3952
-#: ../calendar/gui/e-meeting-list-view.c:220
-#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../modules/itip-formatter/itip-view.c:6085
-msgid "Accepted"
-msgstr "Prihvaćeno"
+#: ../calendar/gui/e-comp-editor.c:2014 ../composer/e-composer-actions.c:388
+#: ../mail/e-mail-reader.c:2287
+#: ../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-cal-model.c:3953
-#: ../calendar/gui/e-meeting-list-view.c:221
-#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../modules/itip-formatter/itip-view.c:6091
-msgid "Declined"
-msgstr "Odbijeno"
+#: ../calendar/gui/e-comp-editor.c:2021 ../mail/e-mail-reader.c:2294
+#: ../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
+#: ../modules/calendar/e-task-shell-view-actions.c:1016
+msgid "Pre_view..."
+msgstr "_Pregled..."
 
-#: ../calendar/gui/e-cal-model.c:3954
-#: ../calendar/gui/e-meeting-list-view.c:222
-#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../calendar/gui/e-meeting-time-sel.c:527
-msgid "Tentative"
-msgstr "Sa rezervom"
+#: ../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
+#: ../mail/e-mail-browser.c:157 ../shell/e-shell-window-actions.c:911
+msgid "Select _All"
+msgstr "Izaberi _sve"
 
-#: ../calendar/gui/e-cal-model.c:3955
-#: ../calendar/gui/e-meeting-list-view.c:223
-#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../modules/itip-formatter/itip-view.c:6094
-msgid "Delegated"
-msgstr "Delegirano"
+#: ../calendar/gui/e-comp-editor.c:2030 ../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-cal-model.c:3956
-msgid "Needs action"
-msgstr "Zahteva radnju"
+#: ../calendar/gui/e-comp-editor.c:2051
+msgid "_Classification"
+msgstr "_Razvrstavanje"
 
-#: ../calendar/gui/e-cal-model-calendar.c:124
-#: ../calendar/gui/e-task-table.c:630
-msgid "Free"
-msgstr "Slobodno"
+#: ../calendar/gui/e-comp-editor.c:2065 ../e-util/e-html-editor-actions.c:1127
+#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:166
+#: ../mail/e-mail-notes.c:917 ../shell/e-shell-window-actions.c:948
+msgid "_File"
+msgstr "_Datoteka"
 
-#: ../calendar/gui/e-cal-model-calendar.c:127
-#: ../calendar/gui/e-meeting-time-sel.c:528 ../calendar/gui/e-task-table.c:631
-msgid "Busy"
-msgstr "Zauzeto"
+#: ../calendar/gui/e-comp-editor.c:2079 ../e-util/e-html-editor-actions.c:1148
+msgid "_Insert"
+msgstr "_Umetni"
 
-#: ../calendar/gui/e-cal-model-tasks.c:498
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Geografsko mesto mora biti uneto u obliku: \n"
-"\n"
-"45.436845,125.862501"
+#: ../calendar/gui/e-comp-editor.c:2086 ../composer/e-composer-actions.c:378
+msgid "_Options"
+msgstr "_Mogućnosti"
 
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# 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.
-#. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:550
-msgctxt "cal-task-status"
-msgid "None"
-msgstr "Ništa"
+#: ../calendar/gui/e-comp-editor.c:2093 ../e-util/e-html-editor-actions.c:1169
+#: ../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
+msgid "_View"
+msgstr "P_regled"
 
-# strptime format of a weekday, a date and a time,
-# in 24-hour format.
-# strftime format of a weekday, a date and a
-# time, in 24-hour format.
-#. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:158
-msgid "%a %m/%d/%Y %H:%M:%S"
-msgstr "%a %d. %m. %Y. %H:%M:%S"
+#: ../calendar/gui/e-comp-editor.c:2105
+msgid "Save current changes"
+msgstr "Sačuvajte tekuće izmene"
 
-# strptime format of a weekday, a date and a time,
-# in 12-hour format.
-# strftime format of a weekday, a date and a
-# time, in 12-hour format.
-#. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:161
-msgid "%a %m/%d/%Y %I:%M:%S %p"
-msgstr "%a %d. %m. %Y. %I:%M:%S %p"
+#: ../calendar/gui/e-comp-editor.c:2110 ../e-util/e-mail-signature-editor.c:304
+#: ../mail/e-mail-notes.c:912
+msgid "Save and Close"
+msgstr "Sačuvaj i zatvori"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:169
-#, c-format
-msgid ""
-"The date must be entered in the format: \n"
-"%s"
-msgstr ""
-"Datum mora biti unet u obliku: \n"
-"%s"
+#: ../calendar/gui/e-comp-editor.c:2112
+msgid "Save current changes and close editor"
+msgstr "Sačuvajte tekuće izmene i zatvorite uređivač"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1986 ../calendar/gui/e-week-view.c:1540
-#: ../calendar/gui/print.c:1073 ../calendar/gui/print.c:1092
-#: ../calendar/gui/print.c:2633 ../calendar/gui/print.c:2653
+#: ../calendar/gui/e-day-view.c:2132 ../calendar/gui/e-week-view.c:1728
+#: ../calendar/gui/print.c:1072 ../calendar/gui/print.c:1091
+#: ../calendar/gui/print.c:2628 ../calendar/gui/print.c:2648
 msgid "am"
 msgstr "prp"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1989 ../calendar/gui/e-week-view.c:1543
-#: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
-#: ../calendar/gui/print.c:2638 ../calendar/gui/print.c:2655
+#: ../calendar/gui/e-day-view.c:2135 ../calendar/gui/e-week-view.c:1731
+#: ../calendar/gui/print.c:1077 ../calendar/gui/print.c:1093
+#: ../calendar/gui/print.c:2633 ../calendar/gui/print.c:2650
 msgid "pm"
 msgstr "pop"
 
@@ -4505,13 +5207,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:2779 ../calendar/gui/e-day-view-top-item.c:854
-#: ../calendar/gui/e-week-view-main-item.c:209 ../calendar/gui/print.c:2089
+#: ../calendar/gui/e-day-view.c:3017 ../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"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:3443
+#: ../calendar/gui/e-day-view.c:3742
 #, c-format
 msgid "Week %d"
 msgstr "%d. nedelja"
@@ -4522,12 +5224,12 @@ msgstr "%d. nedelja"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:800
+#: ../calendar/gui/e-day-view-time-item.c:806
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutni razmaci"
 
-#: ../calendar/gui/e-day-view-time-item.c:825
+#: ../calendar/gui/e-day-view-time-item.c:831
 msgid "Show the second time zone"
 msgstr "Prikaži drugu vremensku zonu"
 
@@ -4537,17 +5239,17 @@ msgstr "Prikaži drugu vremensku zonu"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:842
-#: ../modules/calendar/e-calendar-preferences.c:305
-#: ../modules/calendar/e-calendar-preferences.c:357
+#: ../calendar/gui/e-day-view-time-item.c:848
+#: ../modules/calendar/e-calendar-preferences.c:303
+#: ../modules/calendar/e-calendar-preferences.c:355
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ništa"
 
-#: ../calendar/gui/e-day-view-time-item.c:876
-#: ../calendar/gui/e-timezone-entry.c:323
-#: ../modules/calendar/e-calendar-preferences.c:388
+#: ../calendar/gui/e-day-view-time-item.c:882
+#: ../calendar/gui/e-timezone-entry.c:324
+#: ../modules/calendar/e-calendar-preferences.c:386
 msgid "Select..."
 msgstr "Izaberi..."
 
@@ -4567,51 +5269,55 @@ msgstr "Mogući učesnici"
 msgid "Resources"
 msgstr "Izvori"
 
+#: ../calendar/gui/e-meeting-list-view.c:164
+msgid "Attendees"
+msgstr "Učesnici"
+
 #: ../calendar/gui/e-meeting-list-view.c:180
 #: ../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:1246
+#: ../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-store.c:111 ../calendar/gui/e-meeting-store.c:128
-#: ../calendar/gui/print.c:1247 ../e-util/e-table-config.ui.h:8
+#: ../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-store.c:113 ../calendar/gui/e-meeting-store.c:130
-#: ../calendar/gui/print.c:1248
+#: ../calendar/gui/print.c:1247
 msgid "Resource"
 msgstr "Izvor"
 
 #: ../calendar/gui/e-meeting-list-view.c:183
 #: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
-#: ../calendar/gui/print.c:1249
+#: ../calendar/gui/print.c:1248
 msgid "Room"
 msgstr "Soba"
 
 #: ../calendar/gui/e-meeting-list-view.c:194
 #: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:161
-#: ../calendar/gui/print.c:1263
+#: ../calendar/gui/print.c:1262
 msgid "Chair"
 msgstr "Stolica"
 
 #: ../calendar/gui/e-meeting-list-view.c:195
 #: ../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:1264
+#: ../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-store.c:148 ../calendar/gui/e-meeting-store.c:165
-#: ../calendar/gui/print.c:1265
+#: ../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-store.c:150 ../calendar/gui/e-meeting-store.c:167
-#: ../calendar/gui/print.c:1266
+#: ../calendar/gui/print.c:1265
 msgid "Non-Participant"
 msgstr "Ne-učesnik"
 
@@ -4621,11 +5327,20 @@ msgstr "Ne-učesnik"
 msgid "Needs Action"
 msgstr "Potrebna radnja"
 
-#: ../calendar/gui/e-meeting-list-view.c:626
+#: ../calendar/gui/e-meeting-list-view.c:619
 msgid "Attendee                          "
 msgstr "Učesnik                          "
 
-#: ../calendar/gui/e-meeting-list-view.c:681
+#: ../calendar/gui/e-meeting-list-view.c:645
+#: ../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
+#: ../mail/e-mail-account-tree-view.c:157
+msgid "Type"
+msgstr "Vrsta"
+
+#: ../calendar/gui/e-meeting-list-view.c:674
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "MVOM"
@@ -4634,85 +5349,89 @@ msgstr "MVOM"
 msgid "In Process"
 msgstr "U toku"
 
-#: ../calendar/gui/e-meeting-store.c:1909
+#: ../calendar/gui/e-meeting-store.c:1881
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 "Unesite lozinku da pristupite podacima „slobodan/zauzet“ na serveru „%s“ kao "
 "korisnik „%s“"
 
-#: ../calendar/gui/e-meeting-store.c:1919
+#: ../calendar/gui/e-meeting-store.c:1891
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Razlog neuspeha: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1924
+#: ../calendar/gui/e-meeting-store.c:1896
 #: ../plugins/publish-calendar/publish-calendar.c:351
 #: ../smime/gui/component.c:63
 msgid "Enter password"
 msgstr "Upišite lozinku"
 
-#: ../calendar/gui/e-meeting-time-sel.c:529
+#: ../calendar/gui/e-meeting-time-sel.c:537
 msgid "Out of Office"
 msgstr "Van kancelarije"
 
-#: ../calendar/gui/e-meeting-time-sel.c:531
+#: ../calendar/gui/e-meeting-time-sel.c:539
 msgid "No Information"
 msgstr "Nema podatka"
 
-#: ../calendar/gui/e-meeting-time-sel.c:566
+#: ../calendar/gui/e-meeting-time-sel.c:555
+msgid "Atte_ndees..."
+msgstr "Uč_esnici..."
+
+#: ../calendar/gui/e-meeting-time-sel.c:574
 msgid "O_ptions"
 msgstr "_Mogućnosti"
 
-#: ../calendar/gui/e-meeting-time-sel.c:586
+#: ../calendar/gui/e-meeting-time-sel.c:595
 msgid "Show _only working hours"
 msgstr "Prikaži _samo radne sate"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:608
 msgid "Show _zoomed out"
 msgstr "Prikaži _umanjeno"
 
-#: ../calendar/gui/e-meeting-time-sel.c:617
+#: ../calendar/gui/e-meeting-time-sel.c:626
 msgid "_Update free/busy"
 msgstr "_Ažuriraj slobodno/zauzeto"
 
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../calendar/gui/e-meeting-time-sel.c:643
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:654
+#: ../calendar/gui/e-meeting-time-sel.c:663
 msgid "_Autopick"
 msgstr "_Samoizbor"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:680
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:692
+#: ../calendar/gui/e-meeting-time-sel.c:702
 msgid "_All people and resources"
 msgstr "_Sve ljude i izvore"
 
-#: ../calendar/gui/e-meeting-time-sel.c:703
+#: ../calendar/gui/e-meeting-time-sel.c:713
 msgid "All _people and one resource"
 msgstr "Sve _ljude i jedan izvor"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:724
 msgid "_Required people"
 msgstr "_Obavezne ljude"
 
-#: ../calendar/gui/e-meeting-time-sel.c:724
+#: ../calendar/gui/e-meeting-time-sel.c:734
 msgid "Required people and _one resource"
 msgstr "Obavezne ljude i _jedan izvor"
 
-#: ../calendar/gui/e-meeting-time-sel.c:763
+#: ../calendar/gui/e-meeting-time-sel.c:773
 msgid "_Start time:"
 msgstr "_Vreme početka:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:792
+#: ../calendar/gui/e-meeting-time-sel.c:802
 msgid "_End time:"
 msgstr "Vreme _završetka:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2660
+#: ../calendar/gui/e-meeting-time-sel.c:2727
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -4721,7 +5440,7 @@ msgstr ""
 "Sažetak: %s\n"
 "Mesto: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3525
+#: ../calendar/gui/e-meeting-time-sel.c:2729 ../calendar/gui/print.c:3522
 #, c-format
 msgid "Summary: %s"
 msgstr "Sažetak: %s"
@@ -4750,46 +5469,46 @@ msgstr "Zajedničko ime"
 msgid "Language"
 msgstr "Jezik"
 
-#: ../calendar/gui/e-memo-table.c:433
-#: ../modules/calendar/e-cal-shell-content.c:481
+#: ../calendar/gui/e-memo-table.c:370
+#: ../modules/calendar/e-cal-shell-content.c:1667
+#: ../modules/calendar/e-memo-shell-view-actions.c:196
 #: ../modules/calendar/e-memo-shell-view-actions.c:211
-#: ../modules/calendar/e-memo-shell-view-actions.c:226
-#: ../modules/calendar/e-memo-shell-view.c:306
+#: ../modules/calendar/e-memo-shell-view.c:315
 msgid "Memos"
 msgstr "Beleške"
 
-#: ../calendar/gui/e-memo-table.c:514 ../calendar/gui/e-task-table.c:802
+#: ../calendar/gui/e-memo-table.c:454 ../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:601 ../calendar/gui/e-task-table.c:886
+#: ../calendar/gui/e-memo-table.c:539 ../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:620 ../calendar/gui/e-task-table.c:904
+#: ../calendar/gui/e-memo-table.c:559 ../calendar/gui/e-task-table.c:858
 msgid "Due: "
 msgstr "Rok: "
 
-#: ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-memo-table.c:682
 msgid "Cut selected memos to the clipboard"
 msgstr "Seče izabrane beleške u spisak isečaka"
 
-#: ../calendar/gui/e-memo-table.c:747
+#: ../calendar/gui/e-memo-table.c:688
 msgid "Copy selected memos to the clipboard"
 msgstr "Umnožava izabrane beleške u spisak isečaka"
 
-#: ../calendar/gui/e-memo-table.c:753
+#: ../calendar/gui/e-memo-table.c:694
 msgid "Paste memos from the clipboard"
 msgstr "Ubacuje beleške iz spiska isečaka"
 
-#: ../calendar/gui/e-memo-table.c:759
-#: ../modules/calendar/e-memo-shell-view-actions.c:588
+#: ../calendar/gui/e-memo-table.c:700
+#: ../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:765
+#: ../calendar/gui/e-memo-table.c:706
 msgid "Select all visible memos"
 msgstr "Bira sve vidljive beleške"
 
@@ -4797,6 +5516,11 @@ msgstr "Bira sve vidljive beleške"
 msgid "Click to add a memo"
 msgstr "Kliknite da dodate belešku"
 
+#: ../calendar/gui/e-task-table.c:527 ../calendar/gui/tasktypes.xml.h:22
+#: ../e-util/e-send-options.ui.h:1
+msgid "Undefined"
+msgstr "Neodređen"
+
 # Don't use any other specifiers.
 # strftime format %d = day of month, %b = abbreviated
 # month name. You can change the order but don't
@@ -4805,44 +5529,74 @@ msgstr "Kliknite da dodate belešku"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:603
+#: ../calendar/gui/e-task-table.c:555
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:720 ../calendar/gui/print.c:2414
-#: ../calendar/importers/icalendar-importer.c:78
-#: ../calendar/importers/icalendar-importer.c:1071
-#: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:438
-#: ../modules/calendar/e-task-shell-view-actions.c:234
-#: ../modules/calendar/e-task-shell-view-actions.c:249
-#: ../modules/calendar/e-task-shell-view.c:461
+#: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2410
+#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/importers/icalendar-importer.c:1117
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-cal-shell-content.c:1627
+#: ../modules/calendar/e-task-shell-view-actions.c:220
+#: ../modules/calendar/e-task-shell-view-actions.c:235
+#: ../modules/calendar/e-task-shell-view.c:473
 msgid "Tasks"
 msgstr "Zadaci"
 
-#: ../calendar/gui/e-task-table.c:1039
+#: ../calendar/gui/e-task-table.c:998
 msgid "Cut selected tasks to the clipboard"
 msgstr "Seče izabrane zadatke u spisak isečaka"
 
-#: ../calendar/gui/e-task-table.c:1045
+#: ../calendar/gui/e-task-table.c:1004
 msgid "Copy selected tasks to the clipboard"
 msgstr "Umnožava izabrane zadatke u spisak isečaka"
 
-#: ../calendar/gui/e-task-table.c:1051
+#: ../calendar/gui/e-task-table.c:1010
 msgid "Paste tasks from the clipboard"
 msgstr "Ubacuje zadatke iz spiska isečaka"
 
-#: ../calendar/gui/e-task-table.c:1057
-#: ../modules/calendar/e-task-shell-view-actions.c:712
+#: ../calendar/gui/e-task-table.c:1016
+#: ../modules/calendar/e-task-shell-view-actions.c:686
 msgid "Delete selected tasks"
 msgstr "Briše izabrane zadatke"
 
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-task-table.c:1022
 msgid "Select all visible tasks"
 msgstr "Bira sve vidljive zadatke"
 
-#: ../calendar/gui/e-timezone-entry.c:334
+#: ../calendar/gui/e-task-table.etspec.h:1
+msgid "Click to add a task"
+msgstr "Kliknite da dodate zadatak"
+
+#: ../calendar/gui/e-task-table.etspec.h:2
+msgid "Start date"
+msgstr "Datum početka"
+
+#: ../calendar/gui/e-task-table.etspec.h:5
+msgid "Completion date"
+msgstr "Datum završetka"
+
+#: ../calendar/gui/e-task-table.etspec.h:6 ../mail/mail-send-recv.c:965
+msgid "Complete"
+msgstr "Završeno"
+
+#: ../calendar/gui/e-task-table.etspec.h:7
+msgid "Due date"
+msgstr "Krajnji rok"
+
+#: ../calendar/gui/e-task-table.etspec.h:9
+#, no-c-format
+msgid "% Complete"
+msgstr "% je završeno"
+
+#: ../calendar/gui/e-task-table.etspec.h:10 ../calendar/gui/tasktypes.xml.h:18
+#: ../plugins/save-calendar/csv-format.c:386
+msgid "Priority"
+msgstr "Važnost"
+
+#: ../calendar/gui/e-timezone-entry.c:335
 msgid "Select Timezone"
 msgstr "Izaberi vremensku zonu"
 
@@ -4851,40 +5605,36 @@ msgstr "Izaberi vremensku zonu"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:226 ../calendar/gui/print.c:2068
+#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2074
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2371
-msgid "Purging"
-msgstr "Brisanje"
-
-#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
-#: ../calendar/gui/itip-utils.c:841
+#: ../calendar/gui/itip-utils.c:650 ../calendar/gui/itip-utils.c:708
+#: ../calendar/gui/itip-utils.c:842
 msgid "An organizer must be set."
 msgstr "Organizator mora biti određen."
 
-#: ../calendar/gui/itip-utils.c:698
+#: ../calendar/gui/itip-utils.c:699
 msgid "At least one attendee is necessary"
 msgstr "Najmanje jedan učesnik je neophodan"
 
-#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
+#: ../calendar/gui/itip-utils.c:930 ../calendar/gui/itip-utils.c:1091
 msgid "Event information"
 msgstr "Podaci o događaju"
 
-#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
+#: ../calendar/gui/itip-utils.c:933 ../calendar/gui/itip-utils.c:1094
 msgid "Task information"
 msgstr "Podaci o zadatku"
 
-#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1096
+#: ../calendar/gui/itip-utils.c:936 ../calendar/gui/itip-utils.c:1097
 msgid "Memo information"
 msgstr "Podaci o belešci"
 
-#: ../calendar/gui/itip-utils.c:938 ../calendar/gui/itip-utils.c:1114
+#: ../calendar/gui/itip-utils.c:939 ../calendar/gui/itip-utils.c:1115
 msgid "Free/Busy information"
 msgstr "Podaci slobodno/zauzeto"
 
-#: ../calendar/gui/itip-utils.c:941
+#: ../calendar/gui/itip-utils.c:942
 msgid "Calendar information"
 msgstr "Podaci o kalendaru"
 
@@ -4892,7 +5642,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:978
+#: ../calendar/gui/itip-utils.c:979
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Prihvaćeno"
@@ -4901,7 +5651,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:985
+#: ../calendar/gui/itip-utils.c:986
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Prihvaćeno s rezervom"
@@ -4913,7 +5663,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:992 ../calendar/gui/itip-utils.c:1040
+#: ../calendar/gui/itip-utils.c:993 ../calendar/gui/itip-utils.c:1041
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Odbijeno"
@@ -4922,7 +5672,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:999
+#: ../calendar/gui/itip-utils.c:1000
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegirano"
@@ -4930,7 +5680,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:1012
+#: ../calendar/gui/itip-utils.c:1013
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Osveženo"
@@ -4938,7 +5688,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:1019
+#: ../calendar/gui/itip-utils.c:1020
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Otkaži"
@@ -4946,7 +5696,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:1026
+#: ../calendar/gui/itip-utils.c:1027
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Osveži"
@@ -4954,154 +5704,166 @@ 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:1033
+#: ../calendar/gui/itip-utils.c:1034
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Protiv-predlog"
 
-#: ../calendar/gui/itip-utils.c:1111
+#: ../calendar/gui/itip-utils.c:1112
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Podaci slobodno/zauzeto (%s do %s)"
 
-#: ../calendar/gui/itip-utils.c:1119
+#: ../calendar/gui/itip-utils.c:1120
 msgid "iCalendar information"
 msgstr "Podaci iKalendara"
 
-#: ../calendar/gui/itip-utils.c:1147
+#: ../calendar/gui/itip-utils.c:1149
+#, 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:1155
-#, c-format
-msgid "Unable to book a resource, error: %s"
-msgstr "Ne mogu da sačuvam unos, greška: %s"
+#: ../calendar/gui/itip-utils.c:1154
+msgid "Unable to book a resource, error: "
+msgstr "Ne mogu da sačuvam unos, greška: "
 
-#: ../calendar/gui/itip-utils.c:1327
+#: ../calendar/gui/itip-utils.c:1325
 msgid "You must be an attendee of the event."
 msgstr "Morate biti učesnik događaja."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/itip-utils.c:1933
+msgid "Sending an event"
+msgstr "Šaljem događaj"
+
+#: ../calendar/gui/itip-utils.c:1937
+msgid "Sending a memo"
+msgstr "Šaljem belešku"
+
+#: ../calendar/gui/itip-utils.c:1941
+msgid "Sending a task"
+msgstr "Šaljem zadatak"
+
+#: ../calendar/gui/print.c:663
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:663
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:663
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:663
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:663
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:664
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:664
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:664
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:664
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:664
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:665
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:665
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:665
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:665
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:665
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:666
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:666
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:666
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:666
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:666
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:667
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:667
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:667
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:667
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:667
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:668
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:668
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:668
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:668
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:668
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:669
 msgid "31st"
 msgstr "31."
 
@@ -5109,102 +5871,114 @@ msgstr "31."
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_BAD_WEEKDAY
 #. G_DATE_MONDAY
-#: ../calendar/gui/print.c:726
+#: ../calendar/gui/print.c:729
 msgid "Mo"
 msgstr "Po"
 
 #. G_DATE_TUESDAY
-#: ../calendar/gui/print.c:727
+#: ../calendar/gui/print.c:730
 msgid "Tu"
 msgstr "Ut"
 
 #. G_DATE_WEDNESDAY
-#: ../calendar/gui/print.c:728
+#: ../calendar/gui/print.c:731
 msgid "We"
 msgstr "Sr"
 
 #. G_DATE_THURSDAY
-#: ../calendar/gui/print.c:729
+#: ../calendar/gui/print.c:732
 msgid "Th"
 msgstr "Če"
 
 #. G_DATE_FRIDAY
-#: ../calendar/gui/print.c:730
+#: ../calendar/gui/print.c:733
 msgid "Fr"
 msgstr "Pe"
 
 #. G_DATE_SATURDAY
-#: ../calendar/gui/print.c:731
+#: ../calendar/gui/print.c:734
 msgid "Sa"
 msgstr "Su"
 
 #. G_DATE_SUNDAY
-#: ../calendar/gui/print.c:732
+#: ../calendar/gui/print.c:735
 msgid "Su"
 msgstr "Ne"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3319
+#: ../calendar/gui/print.c:3315
 msgid " to "
 msgstr " do "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3329
+#: ../calendar/gui/print.c:3325
 msgid " (Completed "
 msgstr " (Završeno je "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3335
+#: ../calendar/gui/print.c:3331
 msgid "Completed "
 msgstr "Završeno je "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3345
+#: ../calendar/gui/print.c:3341
 msgid " (Due "
 msgstr " (Rok "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3352
+#: ../calendar/gui/print.c:3348
 msgid "Due "
 msgstr "Rok "
 
-#: ../calendar/gui/print.c:3555
+#: ../calendar/gui/print.c:3492
+msgid "Appointment"
+msgstr "Zakazivanje"
+
+#: ../calendar/gui/print.c:3494 ../e-util/e-send-options.c:553
+msgid "Task"
+msgstr "Zadatak"
+
+#: ../calendar/gui/print.c:3496
+msgid "Memo"
+msgstr "Beleška"
+
+#: ../calendar/gui/print.c:3552
 msgid "Attendees: "
 msgstr "Prisutni: "
 
-#: ../calendar/gui/print.c:3599
+#: ../calendar/gui/print.c:3596
 #, c-format
 msgid "Status: %s"
 msgstr "Stanje: %s"
 
-#: ../calendar/gui/print.c:3615
+#: ../calendar/gui/print.c:3612
 #, c-format
 msgid "Priority: %s"
 msgstr "Važnost: %s"
 
-#: ../calendar/gui/print.c:3633
+#: ../calendar/gui/print.c:3630
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Postotak završenog: %i"
 
-#: ../calendar/gui/print.c:3647
+#: ../calendar/gui/print.c:3644
 #, c-format
 msgid "URL: %s"
 msgstr "Adresa: %s"
 
-#: ../calendar/gui/print.c:3661
+#: ../calendar/gui/print.c:3658
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
-#: ../calendar/gui/print.c:3672
+#: ../calendar/gui/print.c:3669
 msgid "Contacts: "
 msgstr "Kontakti: "
 
@@ -5217,190 +5991,219 @@ msgstr "U toku"
 msgid "% Completed"
 msgstr "% je završeno"
 
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:69
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/filtertypes.xml.in.h:31
+#: ../mail/searchtypes.xml.in.h:33 ../mail/vfoldertypes.xml.in.h:33
 msgid "is greater than"
 msgstr "je veće od"
 
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:70
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/filtertypes.xml.in.h:32
+#: ../mail/searchtypes.xml.in.h:34 ../mail/vfoldertypes.xml.in.h:34
 msgid "is less than"
 msgstr "je manje od"
 
-#: ../calendar/importers/icalendar-importer.c:77
+#: ../calendar/importers/icalendar-importer.c:78
 msgid "Appointments and Meetings"
 msgstr "Zakazivanje i sastanci"
 
-#: ../calendar/importers/icalendar-importer.c:461
-#: ../calendar/importers/icalendar-importer.c:900
+#: ../calendar/importers/icalendar-importer.c:312
+#: ../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
+#: ../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
+#| msgid "Create a new calendar"
+msgid "Cre_ate new calendar"
+msgstr "Napravi _novi kalendar"
+
+#: ../calendar/importers/icalendar-importer.c:361
+#| msgid "Create a new task list"
+msgid "Cre_ate new task list"
+msgstr "_Napravi novi spisak zadataka"
+
+#: ../calendar/importers/icalendar-importer.c:507
+#: ../calendar/importers/icalendar-importer.c:946
 msgid "Opening calendar"
 msgstr "Otvaranje kalendara"
 
-#: ../calendar/importers/icalendar-importer.c:609
+#: ../calendar/importers/icalendar-importer.c:655
 msgid "iCalendar files (.ics)"
 msgstr "Datoteke iKalendara (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:610
+#: ../calendar/importers/icalendar-importer.c:656
 msgid "Evolution iCalendar importer"
 msgstr "Uvoznik iKalendara Evolucije"
 
-#: ../calendar/importers/icalendar-importer.c:702
+#: ../calendar/importers/icalendar-importer.c:748
 msgid "Reminder!"
 msgstr "Podsetnik!"
 
-#: ../calendar/importers/icalendar-importer.c:786
+#: ../calendar/importers/icalendar-importer.c:832
 msgid "vCalendar files (.vcs)"
 msgstr "Datoteke vKalendara (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:787
+#: ../calendar/importers/icalendar-importer.c:833
 msgid "Evolution vCalendar importer"
 msgstr "Uvoznik vKalendara Evolucije"
 
-#: ../calendar/importers/icalendar-importer.c:1064
+#: ../calendar/importers/icalendar-importer.c:1110
 msgid "Calendar Events"
 msgstr "Događaji kalendara"
 
-#: ../calendar/importers/icalendar-importer.c:1108
+#: ../calendar/importers/icalendar-importer.c:1153
+#| msgid "New Calendar"
+msgid "GNOME Calendar"
+msgstr "Gnomov kalendar"
+
+#: ../calendar/importers/icalendar-importer.c:1154
 msgid "Evolution Calendar intelligent importer"
 msgstr "Inteligentni uvoznik kalendara Evolucije"
 
-#: ../calendar/importers/icalendar-importer.c:1179
-#: ../calendar/importers/icalendar-importer.c:1493
+#: ../calendar/importers/icalendar-importer.c:1225
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Sastanak"
 
-#: ../calendar/importers/icalendar-importer.c:1179
-#: ../calendar/importers/icalendar-importer.c:1493
+#: ../calendar/importers/icalendar-importer.c:1225
+#: ../calendar/importers/icalendar-importer.c:1539
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Događaj"
 
-#: ../calendar/importers/icalendar-importer.c:1182
-#: ../calendar/importers/icalendar-importer.c:1494
+#: ../calendar/importers/icalendar-importer.c:1228
+#: ../calendar/importers/icalendar-importer.c:1540
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Zadatak"
 
-#: ../calendar/importers/icalendar-importer.c:1185
-#: ../calendar/importers/icalendar-importer.c:1495
+#: ../calendar/importers/icalendar-importer.c:1231
+#: ../calendar/importers/icalendar-importer.c:1541
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Beleška"
 
-#: ../calendar/importers/icalendar-importer.c:1194
+#: ../calendar/importers/icalendar-importer.c:1240
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "ima ponavljanja"
 
-#: ../calendar/importers/icalendar-importer.c:1199
+#: ../calendar/importers/icalendar-importer.c:1245
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "je primerak"
 
-#: ../calendar/importers/icalendar-importer.c:1204
+#: ../calendar/importers/icalendar-importer.c:1250
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "ima podsetnike"
 
-#: ../calendar/importers/icalendar-importer.c:1209
+#: ../calendar/importers/icalendar-importer.c:1255
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "ima priloge"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1222
+#: ../calendar/importers/icalendar-importer.c:1268
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Javno"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1225
+#: ../calendar/importers/icalendar-importer.c:1271
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Lično"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1228
+#: ../calendar/importers/icalendar-importer.c:1274
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Poverljivo"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1232
+#: ../calendar/importers/icalendar-importer.c:1278
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Razvrstavanje"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1237
-#: ../calendar/importers/icalendar-importer.c:1537
+#: ../calendar/importers/icalendar-importer.c:1283
+#: ../calendar/importers/icalendar-importer.c:1583
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Sažetak"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1289
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Mesto"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1251
-#: ../calendar/importers/icalendar-importer.c:1532
+#: ../calendar/importers/icalendar-importer.c:1297
+#: ../calendar/importers/icalendar-importer.c:1578
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Početak"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1262
+#: ../calendar/importers/icalendar-importer.c:1308
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Rok"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1274
+#: ../calendar/importers/icalendar-importer.c:1320
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Kraj"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1284
+#: ../calendar/importers/icalendar-importer.c:1330
 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:1308
+#: ../calendar/importers/icalendar-importer.c:1354
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Završeno"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1316
+#: ../calendar/importers/icalendar-importer.c:1362
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "Adresa"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1327
-#: ../calendar/importers/icalendar-importer.c:1330
+#: ../calendar/importers/icalendar-importer.c:1373
+#: ../calendar/importers/icalendar-importer.c:1376
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organizator"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1350
-#: ../calendar/importers/icalendar-importer.c:1353
+#: ../calendar/importers/icalendar-importer.c:1396
+#: ../calendar/importers/icalendar-importer.c:1399
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Učesnici"
 
-#: ../calendar/importers/icalendar-importer.c:1367
+#: ../calendar/importers/icalendar-importer.c:1413
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Opis"
 
-#: ../calendar/importers/icalendar-importer.c:1527
+#: ../calendar/importers/icalendar-importer.c:1573
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Vrsta"
@@ -6299,7 +7102,7 @@ msgid "Asia/Kashgar"
 msgstr "Azija/Kašgar"
 
 #: ../calendar/zones.h:242
-msgid "Asia/Katmandu"
+msgid "Asia/Kathmandu"
 msgstr "Azija/Katmandu"
 
 #: ../calendar/zones.h:243
@@ -6954,158 +7757,194 @@ msgstr "Pacifik/Volis"
 msgid "Pacific/Yap"
 msgstr "Pacifik/Jap"
 
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:212
 msgid "Save as..."
 msgstr "Sačuvaj kao..."
 
-#: ../composer/e-composer-actions.c:277
+#: ../composer/e-composer-actions.c:336
 msgid "Close the current file"
 msgstr "Zatvorite trenutnu datoteku"
 
-#: ../composer/e-composer-actions.c:282
+#: ../composer/e-composer-actions.c:341
 msgid "New _Message"
 msgstr "Nova _poruka"
 
-#: ../composer/e-composer-actions.c:284
+#: ../composer/e-composer-actions.c:343
 msgid "Open New Message window"
 msgstr "Otvara prozor za novu poruku"
 
-#: ../composer/e-composer-actions.c:289 ../shell/e-shell-window-actions.c:979
-#| msgid "Mail Preferences"
+#: ../composer/e-composer-actions.c:348 ../shell/e-shell.c:1216
+#: ../shell/e-shell-window-actions.c:848
 msgid "_Preferences"
 msgstr "_Postavke"
 
-#: ../composer/e-composer-actions.c:291 ../shell/e-shell-window-actions.c:981
+#: ../composer/e-composer-actions.c:350 ../shell/e-shell-window-actions.c:850
 msgid "Configure Evolution"
 msgstr "Podesi Evoluciju"
 
-#: ../composer/e-composer-actions.c:298
+#: ../composer/e-composer-actions.c:357
 msgid "Save the current file"
 msgstr "Sačuvajte trenutnu datoteku"
 
-#: ../composer/e-composer-actions.c:303
+#: ../composer/e-composer-actions.c:362
 msgid "Save _As..."
 msgstr "Sačuvaj _kao..."
 
-#: ../composer/e-composer-actions.c:305
+#: ../composer/e-composer-actions.c:364
 msgid "Save the current file with a different name"
 msgstr "Sačuvajte trenutnu datoteku pod drugim imenom"
 
-#: ../composer/e-composer-actions.c:312
+#: ../composer/e-composer-actions.c:371
 msgid "Character _Encoding"
 msgstr "Ko_dna strana"
 
-#: ../composer/e-composer-actions.c:336
+#: ../composer/e-composer-actions.c:395
 msgid "Print Pre_view"
 msgstr "Pregled pred _štampu"
 
-#: ../composer/e-composer-actions.c:343
+#: ../composer/e-composer-actions.c:402
 msgid "Save as _Draft"
 msgstr "Sačuvaj kao _nacrt"
 
-#: ../composer/e-composer-actions.c:345
+#: ../composer/e-composer-actions.c:404
 msgid "Save as draft"
 msgstr "Sačuvajte kao nacrt"
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:409
 msgid "S_end"
 msgstr "Poš_alji"
 
-#: ../composer/e-composer-actions.c:352
+#: ../composer/e-composer-actions.c:411
 msgid "Send this message"
 msgstr "Pošaljite ovu poruku"
 
-#: ../composer/e-composer-actions.c:360
+#: ../composer/e-composer-actions.c:419
 msgid "PGP _Encrypt"
 msgstr "PGP _šifruj"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:421
 msgid "Encrypt this message with PGP"
 msgstr "Šifrujte ovu poruku pomoću PGP-a"
 
-#: ../composer/e-composer-actions.c:368
+#: ../composer/e-composer-actions.c:427
 msgid "PGP _Sign"
 msgstr "PGP _potpiši"
 
-#: ../composer/e-composer-actions.c:370
+#: ../composer/e-composer-actions.c:429
 msgid "Sign this message with your PGP key"
 msgstr "Potpišite ovu poruku pomoću PGP ključa"
 
-#: ../composer/e-composer-actions.c:376
+#: ../composer/e-composer-actions.c:435
 msgid "_Picture Gallery"
 msgstr "Galerija _slika"
 
-#: ../composer/e-composer-actions.c:378
+#: ../composer/e-composer-actions.c:437
 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:384
+#: ../composer/e-composer-actions.c:443
 msgid "_Prioritize Message"
 msgstr "V_ažnost poruke"
 
-#: ../composer/e-composer-actions.c:386
+#: ../composer/e-composer-actions.c:445
 msgid "Set the message priority to high"
 msgstr "Postavlja važnost poruke na visoko"
 
-#: ../composer/e-composer-actions.c:392
+#: ../composer/e-composer-actions.c:451
 msgid "Re_quest Read Receipt"
 msgstr "T_raži povratnicu"
 
-#: ../composer/e-composer-actions.c:394
+#: ../composer/e-composer-actions.c:453
 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:400
+#: ../composer/e-composer-actions.c:459
 msgid "S/MIME En_crypt"
 msgstr "S/MIME _šifruj"
 
-#: ../composer/e-composer-actions.c:402
+#: ../composer/e-composer-actions.c:461
 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:408
+#: ../composer/e-composer-actions.c:467
 msgid "S/MIME Sig_n"
 msgstr "S/MIME _potpiši"
 
-#: ../composer/e-composer-actions.c:410
+#: ../composer/e-composer-actions.c:469
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Potpisuje ovu poruku S/MIME uverenjem"
 
-#: ../composer/e-composer-actions.c:416
+#: ../composer/e-composer-actions.c:523
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
+#| msgid "Unicode smileys"
+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 smileys."
+msgid "Use Unicode characters for emoticons."
+msgstr "Koristi unikod znakove za smajliće."
+
+#: ../composer/e-composer-actions.c:531
 msgid "_Bcc Field"
 msgstr "_Bcc polje"
 
-#: ../composer/e-composer-actions.c:418
+#: ../composer/e-composer-actions.c:533
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Bira da li je polje Bcc prikazano"
 
-#: ../composer/e-composer-actions.c:424
+#: ../composer/e-composer-actions.c:539
 msgid "_Cc Field"
 msgstr "_Cc polje"
 
-#: ../composer/e-composer-actions.c:426
+#: ../composer/e-composer-actions.c:541
 msgid "Toggles whether the CC field is displayed"
 msgstr "Bira da li je polje CC prikazano"
 
-#: ../composer/e-composer-actions.c:432
+#: ../composer/e-composer-actions.c:547
+msgid "_From Override Field"
+msgstr "Prikaži polje _Šalje kao ime"
+
+#: ../composer/e-composer-actions.c:549
+msgid ""
+"Toggles whether the From override field to change name or email address is "
+"displayed"
+msgstr ""
+"Određuje da li se prikazuje ime osobe ili adrese elektronske pošte u polju "
+"„Šalje“"
+
+#: ../composer/e-composer-actions.c:555
 msgid "_Reply-To Field"
 msgstr "Polje Odgo_vor-za"
 
-#: ../composer/e-composer-actions.c:434
+#: ../composer/e-composer-actions.c:557
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Bira da li je polje Odgovor-za prikazano"
 
-#: ../composer/e-composer-actions.c:493
+#: ../composer/e-composer-actions.c:612
+msgid "Attach"
+msgstr "Priloži"
+
+#: ../composer/e-composer-actions.c:618
 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-summary-page.c:332
+msgid "_Name:"
+msgstr "_Ime:"
+
 #: ../composer/e-composer-header-table.c:38
 msgid "Enter the recipients of the message"
 msgstr "Unesite primaoce poruke"
 
 #: ../composer/e-composer-header-table.c:40
 msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Unesite adrese koje će primiti grafitnu kopiju (cc) poruke"
+msgstr "Unesite adrese koje će primiti grafitnu kopiju (CC) poruke"
 
 #: ../composer/e-composer-header-table.c:43
 msgid ""
@@ -7115,7 +7954,7 @@ msgstr ""
 "Unesite adrese koje će primiti grafitnu kopiju poruke bez pojavljivanja u "
 "listi primalaca poruke"
 
-#: ../composer/e-composer-header-table.c:771
+#: ../composer/e-composer-header-table.c:829
 msgid "Fr_om:"
 msgstr "Š_alje:"
 
@@ -7123,44 +7962,44 @@ msgstr "Š_alje:"
 # * Create this before we call create_from_optionmenu,
 # * because that causes from_changed to be called, which
 # * expects the reply_to fields to be initialized.
-#: ../composer/e-composer-header-table.c:778
+#: ../composer/e-composer-header-table.c:836
 msgid "_Reply-To:"
 msgstr "_Odgovor-za:"
 
-#: ../composer/e-composer-header-table.c:783
+#: ../composer/e-composer-header-table.c:841
 msgid "_To:"
 msgstr "_Prima:"
 
-#: ../composer/e-composer-header-table.c:789
+#: ../composer/e-composer-header-table.c:847
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:795
+#: ../composer/e-composer-header-table.c:853
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:800
+#: ../composer/e-composer-header-table.c:858
 msgid "_Post To:"
 msgstr "Objavi _na:"
 
-#: ../composer/e-composer-header-table.c:804
+#: ../composer/e-composer-header-table.c:862
 msgid "S_ubject:"
 msgstr "Na_slov:"
 
-#: ../composer/e-composer-header-table.c:812
-#: ../mail/e-mail-config-identity-page.c:488
+#: ../composer/e-composer-header-table.c:870
+#: ../mail/e-mail-config-identity-page.c:516
 msgid "Si_gnature:"
 msgstr "Potp_is:"
 
-#: ../composer/e-composer-name-header.c:234
+#: ../composer/e-composer-name-header.c:233
 msgid "Click here for the address book"
 msgstr "Kliknite ovde za adresar."
 
-#: ../composer/e-composer-post-header.c:183
+#: ../composer/e-composer-post-header.c:182
 msgid "Click here to select folders to post to"
 msgstr "Kliknite ovde da izaberete fascikle za slanje"
 
-#: ../composer/e-msg-composer.c:879
+#: ../composer/e-msg-composer.c:874
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -7168,7 +8007,7 @@ msgstr ""
 "Nije moguće potpisivanje odlazeće poruke: nije postavljeno uverenje za "
 "potpisivanje za ovaj nalog"
 
-#: ../composer/e-msg-composer.c:888
+#: ../composer/e-msg-composer.c:883
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7177,18 +8016,14 @@ msgstr ""
 "Nije moguće šifrovanje odlazeće poruke: nije postavljeno uverenje za šifrovanje "
 "za ovaj nalog"
 
-#: ../composer/e-msg-composer.c:1569 ../composer/e-msg-composer.c:1981
+#: ../composer/e-msg-composer.c:1619 ../composer/e-msg-composer.c:2645
 msgid "Compose Message"
 msgstr "Sastavi poruku"
 
-#: ../composer/e-msg-composer.c:4243
+#: ../composer/e-msg-composer.c:4995
 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."
 
-#: ../composer/e-msg-composer.c:4943
-msgid "Untitled Message"
-msgstr "Neimenovana poruka"
-
 #: ../composer/mail-composer.error.xml.h:1
 msgid "You cannot attach the file &quot;{0}&quot; to this message."
 msgstr "Ne možete priložiti datoteku „{0}“ ovoj poruci."
@@ -7239,24 +8074,12 @@ msgid "Error saving to autosave because &quot;{1}&quot;."
 msgstr "Greška u čuvanju samočuvajuće datoteke zbog „{1}“."
 
 #: ../composer/mail-composer.error.xml.h:11
-msgid "Download in progress. Do you want to send the mail?"
-msgstr "Preuzimanje je u toku. Da li želite da pošaljete poruku?"
-
-#: ../composer/mail-composer.error.xml.h:12
-msgid ""
-" There are few attachments getting downloaded. Sending the mail will cause "
-"the mail to be sent without those pending attachments "
-msgstr ""
-" Preuzima se nekoliko priloga. Ukoliko sada pošaljete poruku ovi prilozi neće "
-"biti poslati sa njom "
-
-#: ../composer/mail-composer.error.xml.h:14
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr "Sigurno želite da odbacite poruku, naslovljenu „{0}“, koju sastavljate?"
+msgstr "Da li želite da odbacite poruku koju sastavljate, pod nazivom „{0}“?"
 
-#: ../composer/mail-composer.error.xml.h:15
+#: ../composer/mail-composer.error.xml.h:12
 msgid ""
 "Closing this composer window will discard the message permanently, unless "
 "you choose to save the message in your Drafts folder. This will allow you to "
@@ -7267,77 +8090,81 @@ msgstr ""
 "poruku kasnije."
 
 #. Response codes were chosen somewhat arbitrarily.
-#: ../composer/mail-composer.error.xml.h:18
+#: ../composer/mail-composer.error.xml.h:15
 msgid "_Continue Editing"
 msgstr "Nastavi _uređivanje"
 
-#: ../composer/mail-composer.error.xml.h:19
+#: ../composer/mail-composer.error.xml.h:16
 msgid "_Save Draft"
 msgstr "Sačuvaj _nacrt"
 
-#: ../composer/mail-composer.error.xml.h:20
+#: ../composer/mail-composer.error.xml.h:17
+msgid "Are you sure you want to discard the message you are composing?"
+msgstr "Da li želite da odbacite poruku koju sastavljate?"
+
+#: ../composer/mail-composer.error.xml.h:18
 msgid "Could not create message."
 msgstr "Ne mogu da napravim poruku."
 
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:19
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "Zbog „{0}“, možda bude potrebno drugačije podesiti poštu."
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../composer/mail-composer.error.xml.h:20
 msgid "Could not read signature file &quot;{0}&quot;."
 msgstr "Ne mogu da pročitam datoteku potpisa „{0}“."
 
-#: ../composer/mail-composer.error.xml.h:23
+#: ../composer/mail-composer.error.xml.h:21
 msgid "All accounts have been removed."
 msgstr "Svi nalozi su uklonjeni."
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:22
 msgid "You need to configure an account before you can compose mail."
 msgstr "Morate da podesite nalog pre sastavljanja poruke."
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:23
 msgid "An error occurred while saving to your Outbox folder."
 msgstr "Došlo je do greške tokom čuvanja u vašoj fascikli Za slanje."
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:24
 msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
 msgstr "Prijavljena greška bejaše „{0}“. Poruka nije poslata."
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:25
 msgid "An error occurred while saving to your Drafts folder."
 msgstr "Došlo je do greške tokom čuvanja u vašoj fascikli Nacrti."
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:26
 msgid ""
 "The reported error was &quot;{0}&quot;. The message has most likely not been "
 "saved."
 msgstr "Prijavljena greška bejaše „{0}“. Poruka najverovatnije nije sačuvana."
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:27
 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:30 ../mail/mail.error.xml.h:156
+#: ../composer/mail-composer.error.xml.h:28 ../mail/mail.error.xml.h:169
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "Prijavljena greška bejaše „{0}“."
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:29
 msgid "_Save to Outbox"
 msgstr "Sačuvaj _u „Za slanje“"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:30
 msgid "_Try Again"
 msgstr "_Pokušaj opet"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:31
 msgid "Your message was sent, but an error occurred during post-processing."
 msgstr "Vaša poruka je poslata, ali je došlo do greške tokom post-obrade."
 
-#: ../composer/mail-composer.error.xml.h:34
+#: ../composer/mail-composer.error.xml.h:32
 msgid "Saving message to Outbox."
 msgstr "Čuvam poruku u fascikli Za slanje."
 
-#: ../composer/mail-composer.error.xml.h:35
+#: ../composer/mail-composer.error.xml.h:33
 msgid ""
 "The message will be saved to your local Outbox folder, because the "
 "destination service is currently unavailable. You can send the message by "
@@ -7347,6 +8174,38 @@ msgstr ""
 "odredišta trenutno nedostupna. Možete poslati poruku klikom na dugme Pošalji/"
 "Primi na traci alata Evolucije."
 
+#: ../composer/mail-composer.error.xml.h:34
+msgid "Are you sure you want to send the message?"
+msgstr "Da li želite da pošaljete ovu poruku?"
+
+#: ../composer/mail-composer.error.xml.h:35
+msgid ""
+"A keyboard accelerator to send the message has been pressed. Either cancel "
+"sending the message, if it was done by an accident, or send the message."
+msgstr ""
+"Prečica na tastaturi za slanje poruka. Kada se pritisne ovaj taster slanje "
+"poruke se zaustavlja ukoliko je to urađeno slučajno ili se poruka šalje."
+
+#: ../composer/mail-composer.error.xml.h:37
+msgid "Are you sure you want to change the composer mode?"
+msgstr "Da li želite da izmenite režim sastavljanja poruke?"
+
+#: ../composer/mail-composer.error.xml.h:38
+msgid ""
+"Turning HTML mode off will cause the text to lose all formatting. Do you "
+"want to continue?"
+msgstr ""
+"Ukoliko isključiite HTML režim formatiranje teksta će biti izgubljeno. Da li "
+"želite da nastavite?"
+
+#: ../composer/mail-composer.error.xml.h:39
+msgid "_Don't lose formatting"
+msgstr "_Zadrži format"
+
+#: ../composer/mail-composer.error.xml.h:40
+msgid "Lose _formatting"
+msgstr "Z_anemari format"
+
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
 msgstr "Obaveštenje alarma Evolucije"
@@ -7355,27 +8214,8 @@ msgstr "Obaveštenje alarma Evolucije"
 msgid "Calendar event notifications"
 msgstr "Obaveštenja o događajima kalendara"
 
-#: ../data/evolution.appdata.xml.in.h:1
-msgid ""
-"Evolution is a personal information management application that provides "
-"integrated mail, calendaring and address book functionality."
-msgstr ""
-"Evolucija je program za upravljanje ličnim podacima koji obezbeđuje objedinjenu "
-"funkcionalnost pošte, kalendara i adresara."
-
-#: ../data/evolution.appdata.xml.in.h:2
-msgid ""
-"Evolution supports a wide range of industry standard data formats and "
-"network protocols for information exchange, with an emphasis on standards "
-"compliance and security. Evolution can also integrate smoothly with "
-"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
-msgstr ""
-"Evolucija podržava širok opseg zapisa industrijskih standardnih podataka i "
-"mrežnih protokola za razmenu informacija, sa naglaskom na saglasnost "
-"standarda i bezebdnost. Evolucija može takođe glatko da se objedini sa "
-"Majkrosoftovom razmenom posredstvom proširenja „Usluge veb razmene“ "
-
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1032
+#: ../data/evolution.desktop.in.in.h:1 ../evolution.appdata.xml.in.h:1
+#: ../mail/e-mail-browser.c:1118
 #: ../modules/mailto-handler/evolution-mailto-handler.c:210
 #: ../shell/e-shell-window-private.c:242
 msgid "Evolution"
@@ -7384,7 +8224,7 @@ msgstr "Evolucija"
 # bug(slobo): tooltip bi mogao da bude i „Pošaljite e-poruku prijateljima i pored
 # ovako uštogljenih originala
 # msgstr "Paket poslovnih programa"
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:82
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-utils.c:418
 msgid "Groupware Suite"
 msgstr "Paket grupe"
 
@@ -7392,15 +8232,19 @@ msgstr "Paket grupe"
 msgid "Evolution Mail and Calendar"
 msgstr "Evolucija — pošta i kalendar"
 
-#: ../data/evolution.desktop.in.in.h:4
+#: ../data/evolution.desktop.in.in.h:4 ../evolution.appdata.xml.in.h:2
 msgid "Manage your email, contacts and schedule"
 msgstr "Upravljajte vašom poštom, kontaktima i obavezama"
 
 #: ../data/evolution.desktop.in.in.h:5
-#| msgid "mail;calendar;contact;addressbook;task;"
 msgid "email;calendar;contact;addressbook;task;"
 msgstr "el.pošta;pošta;kalendar;kontakt;adresar;zadatak;"
 
+#: ../data/evolution.desktop.in.in.h:6
+#| msgid "New _Window"
+msgid "New Window"
+msgstr "Novi prozor"
+
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
 msgstr "Ukljčivanje oblikovanja adrese"
@@ -7511,6 +8355,54 @@ msgstr "Prikaži površ za pregled"
 msgid "Whether to show the preview pane."
 msgstr "Da li će biti prikazana površ za pregled."
 
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:21
+msgid "true"
+msgstr "tačno"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:22
+msgid "Whether to show phone numbers in the editor"
+msgstr "Određuje da li da prikaže broj telefona u uređivaču"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:23
+msgid "Whether to show SIP addresses in the editor"
+msgstr "Određuje da li da prikaže SIP adresu u uređivaču"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:24
+msgid "Whether to show IM addresses in the editor"
+msgstr "Određuje da li da prikaže IM adresu u uređivaču"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:25
+msgid "Whether to show mailing Home addresses in the editor"
+msgstr "Određuje da li da prikaže kućnu adresu u uređivaču"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:26
+msgid "Whether to show mailing addresses Work in the editor"
+msgstr "Određuje da li da prikaže adresu poslovne e-pošte u uređivaču"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:27
+msgid "Whether to show mailing addresses Other in the editor"
+msgstr "Određuje da li da prikaže adresu ostale e-pošte u uređivaču"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:28
+msgid "Whether to show Web Addresses in the editor"
+msgstr "Određuje da li da prikaže veb adrese u uređivaču"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:29
+msgid "Whether to show job information in the editor"
+msgstr "Određuje da li da prikaže podatke o poslu u uređivaču"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:30
+msgid "Whether to show Miscellaneous information in the editor"
+msgstr "Određuje da li da prikaže dodatne podatke u uređivaču"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:31
+msgid "Whether to show notes in the editor"
+msgstr "Određuje da li da prikaže beleške u uređivaču"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:32
+msgid "Whether to show Certificates tab in the editor"
+msgstr "Određuje da li da prikaže karticu sa uverenjima u uređivaču"
+
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
 msgid "Convert mail messages to Unicode"
 msgstr "Prebacuje poruke pošte u Unikod"
@@ -7523,6 +8415,21 @@ msgstr ""
 "Prebacuje tekst poruke u Unikod UTF-8 radi objedinjavanja spam/ham predmeta "
 "čiji su uzrok različiti kodni rasporedi."
 
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:3
+msgid "Full path command to run Bogofilter"
+msgstr "Puna putanja do naredbe za Bogo-filter"
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:4
+msgid ""
+"Full path to a Bogofilter command. If not set, then a compile-time path is "
+"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."
+
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
 msgid "Save directory for reminder audio"
 msgstr "Direktorijum čuvanja za zvuk podsetnika"
@@ -7626,10 +8533,93 @@ msgid "Minute the workday starts on, 0 to 59."
 msgstr "Minut kojim počinje radni dan, od 0 do 59."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:23
+msgid "Workday start time for Monday"
+msgstr "Čas kojim počinje radni dan u ponedeljak"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
+msgid ""
+"Time the workday starts on, in twenty four hour format HHMM, 0000 to 2359, "
+"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"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
+msgid "Workday end time for Monday"
+msgstr "Čas kojim se završava radni dan u ponedeljak"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
+msgid ""
+"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
+"-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"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
+msgid "Workday start time for Tuesday"
+msgstr "Minut kojim počinje radni dan u utorak"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
+msgid ""
+"Time the workday ends on, in twenty four hour format HHMM, 0000 to 2359, or "
+"-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"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
+msgid "Workday end time for Tuesday"
+msgstr "Minut kojim se završava radni dan u utorak"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
+msgid "Workday start time for Wednesday"
+msgstr "Minut kojim počinje radni dan u sredu"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
+msgid "Workday end time for Wednesday"
+msgstr "Minut kojim se završava radni dan u sredu"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
+msgid "Workday start time for Thursday"
+msgstr "Čas kojim počinje radni dan u četvrtak"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
+msgid "Workday end time for Thursday"
+msgstr "Čas kojim se završava radni dan u četvrtak"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
+msgid "Workday start time for Friday"
+msgstr "Čas kojim počinje radni dan u petak"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
+msgid "Workday end time for Friday"
+msgstr "Čas kojim se završava radni dan u petak"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
+msgid "Workday start time for Saturday"
+msgstr "Čas kojim počinje radni dan u subotu"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
+msgid "Workday end time for Saturday"
+msgstr "Čas kojim se završava radni dan u subotu"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
+msgid "Workday start time for Sunday"
+msgstr "Čas kojim počinje radni dan u nedelju"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
+msgid "Workday end time for Sunday"
+msgstr "Čas kojim se završava radni dan u nedelju"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
 msgid "The second timezone for a Day View"
 msgstr "Druga vremenska zona u Dnevnom pregledu"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:24
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a 'timezone' key"
@@ -7637,19 +8627,19 @@ msgstr ""
 "Prikazuje drugu vremensku zonu u Dnevnom pregledu, ukoliko je podešena. "
 "Vrednost je slična onoj koja je korišćena u ključu „timezone“"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:25
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
 msgid "Recently used second time zones in a Day View"
 msgstr "Nedavno korišćene druge vremenske zone u Dnevnom pregledu"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:26
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
 msgid "List of recently used second time zones in a Day View"
 msgstr "Spisak nedavno korišćenih drugih vremenskih zona u Dnevnom pregledu"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:27
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
 msgid "Maximum number of recently used timezones to remember"
 msgstr "Najveći broj nedavno korišćenih vremenskih zona za pamćenje"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:28
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
 msgid ""
 "Maximum number of recently used timezones to remember in a 'day-second-"
 "zones' list"
@@ -7657,104 +8647,116 @@ msgstr ""
 "Najveći broj nedavno korišćenih vremenskih zona za pamćenje u spisku "
 "„day_second_zones“"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:29
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
 msgid "Default reminder value"
 msgstr "Podrazumevana vrednost podsetnika"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:30
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
 msgid "Number of units for determining a default reminder"
 msgstr "Broj jedinica za određivanje podrazumevanog podsetnika"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:31
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
 msgid "Default reminder units"
 msgstr "Podrazumevane jedinice podsetnika"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:32
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
 msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
 msgstr "Jedinice za podrazumevani podsetnik, „minuti“, „sati“ ili „dani“"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
+msgid "Default reminder snooze interval, in minutes"
+msgstr "Podrazumevano vreme za odlaganje podsetnika u minutima"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
+msgid ""
+"Default reminder snooze interval, in minutes, to be filled in the reminder "
+"notification dialog"
+msgstr ""
+"Podrazumevano vreme za odlaganje podsetnika u minutima, koje se unosi u "
+"prozorče sa obeveštenjima podsetnika"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Prikaži polje kategorije u uređivaču događaja/sastanaka/zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:34
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Da li da prikaže polje kategorije u uređivaču događaja/sastanaka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:35
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Prikaži polje uloge u uređivaču događaja/zadataka/sastanaka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:36
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "Da li da prikaže polje sa ulogom u uređivaču događaja/zadataka/sastanaka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:37
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Prikaži polje Molim odgovorite u uređivaču događaja/zadataka/sastanaka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:38
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Da li da prikaže polje Molim odgovorite u uređivaču događaja/zadataka/"
 "sastanaka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:39
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Prikaži polje stanja u uređivaču događaja/zadataka/sastanaka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Da li da prikaže polje statusa u uređivaču događaja/zadataka/sastanaka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:41
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Prikaži polje vremenske zone u uređivaču događaja/sastanaka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:42
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Da li da prikaže polje vremenske zone u uređivaču događaja/sastanaka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:43
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Prikaži polje tipa u uređivaču događaja/zadataka/sastanaka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:44
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Da li da prikaže polje tipa u uređivaču događaja/zadataka/sastanaka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
 msgid "Hide completed tasks"
 msgstr "Sakrij završene zadatke"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:46
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
 msgid "Whether to hide completed tasks in the tasks view"
 msgstr "Da li da sakrije završene zadatke u pregledu zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:47
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
 msgid "Hide task units"
 msgstr "Sakrij jedinice zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:48
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
 msgid ""
 "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days\""
 msgstr ""
 "Jedinice za određivanje kada sakriti zaduženja, „minuti“, „sati“ ili „dani“"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
 msgid "Hide task value"
 msgstr "Sakrij vrednost zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
 msgid "Number of units for determining when to hide tasks"
 msgstr "Broj jedinica za određivanje kada sakriti zadatke"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
 msgid "Horizontal pane position"
 msgstr "Pozicija položene površi"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels"
@@ -7762,54 +8764,54 @@ msgstr ""
 "Pozicija položene površi, između dela kalendara za datum i spiska zadataka "
 "kada nije postavljen mesečni pregled, u pikselima"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
 msgid "Last reminder time"
 msgstr "Poslednje vreme podsetnika"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
 msgid "Time the last reminder ran, in time_t"
 msgstr "Vreme poslednjeg pokretanja podsetnika, u „time_t“"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
 msgid "Marcus Bains Line Color - Day View"
 msgstr "Boja Markus Bejns linije - Dnevni pregled"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
 msgid "Color to draw the Marcus Bains line in the Day View"
 msgstr "Boja za iscrtavanje Markus Bejns linije u Dnevnom pregledu"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
 msgid "Marcus Bains Line Color - Time bar"
 msgstr "Boja Markus Bejns linije - traka vremena"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
+#: ../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)"
 msgstr ""
 "Boja za iscrtavanje Markus Bejns linije u traci vremena (podrazumevano je "
 "prazno)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
 msgid "Marcus Bains Line"
 msgstr "Markus Bejns linija"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
 msgid ""
 "Whether to draw the Marcus Bains Line (line at current time) in the calendar"
 msgstr "Da li da u kalendaru iscrta Markus Bejns liniju (na trenutno vreme)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
 msgid "Memo preview pane position (horizontal)"
 msgstr "Pozicija pregleda beleški (vertikalno)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
 msgid "Position of the task preview pane when oriented horizontally"
 msgstr "Pozicija pregleda zadataka kada je postavljeno horizontalno"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
 msgid "Memo layout style"
 msgstr "Stil razmeštaja beleške"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the memo list. \"0\" (Classic View) places the preview pane below the memo "
@@ -7819,19 +8821,19 @@ msgstr ""
 "„0“ (klasičan pregled) postavlja pregled ispod spiska beleški. "
 "„1“ (vertikalan pregled) postavlja pregled pored spiska beleški"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:84
 msgid "Memo preview pane position (vertical)"
 msgstr "Pozicija pregleda beleške (vertikalno)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
 msgid "Position of the memo preview pane when oriented vertically"
 msgstr "Pozicija pregleda bečeški kada je postavljeno vertikalno"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
 msgid "Month view horizontal pane position"
 msgstr "Pozicija položene površi Mesečnog pregleda"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
 msgid ""
 "Position of the horizontal pane, between the view and the date navigator "
 "calendar and task list in the month view, in pixels"
@@ -7839,43 +8841,43 @@ msgstr ""
 "Pozicija položene površi, između pregleda i dela kalendara za datum i spiska "
 "zadataka u mesečnom pregledu, u pikselima"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
 msgid "Scroll Month View by a week, not by a month"
 msgstr "Da li da prikaže Mesečni pregled po nedeljama, umesto mesecima"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
 msgid "Whether to scroll a Month View by a week, not by a month"
 msgstr "Da li da prikaže Mesečni pregled po nedeljama, umesto mesecima"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
 msgid "Reminder programs"
 msgstr "Programi podsetnika"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
 msgid "Programs that are allowed to be run by reminders"
 msgstr "Programi koji mogu biti pokrenuti podsetnicima"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
 msgid "Show display reminders in notification tray"
 msgstr "Prikazuje podsetnike u obaveštajnoj zoni"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
 msgid "Whether or not to use the notification tray for display reminders"
 msgstr "Da li da koristi obaveštajnu zonu za prikazivanje podsetnika"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
 msgid "Preferred New button item"
 msgstr "Željena stavka novog dugmeta"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
 msgid "Name of the preferred New toolbar button item"
 msgstr "Naziv željene stavke novog dugmeta trake alata"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 msgid "Primary calendar"
 msgstr "Primarni kalendar"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
 msgid ""
 "The UID of the selected (or \"primary\") calendar in the sidebar of the "
 "\"Calendar\" view"
@@ -7883,33 +8885,33 @@ msgstr ""
 "JIB izabranog (ili „primarnog“) kalendara u bočnoj površi u pregledu "
 "„Kalendar“"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 msgid "Primary memo list"
 msgstr "Primarni spisak beleški"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
 msgid ""
 "The UID of the selected (or \"primary\") memo list in the sidebar of the "
 "\"Memos\" view"
 msgstr ""
 "JIB izabrane (ili „primarne“) beleške u bočnoj površi u pregledu „Beleške“"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 msgid "Primary task list"
 msgstr "Primarni spisak zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
 msgid ""
 "The UID of the selected (or \"primary\") task list in the sidebar of the "
 "\"Tasks\" view"
 msgstr ""
 "JIB izabranog (ili „primarnog“) zadatka u bočnoj površi u pregledu „Zadaci“"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
 msgid "Free/busy template URL"
 msgstr "Model adresa za slobodno/zauzeto vreme"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -7918,21 +8920,21 @@ msgstr ""
 "Model adrese za korišćenje u povraćaju vremena slobodno/zauzeto, %u se "
 "zamenjuje korisničkim delom elektronske adrese, a %d domenom"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 msgid "Recurrent Events in Italic"
 msgstr "Događaji ponavljanja iskošenim slovima"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
 msgid "Show days with recurrent events in italic font in bottom left calendar"
 msgstr ""
 "Prikazuje dane sa događajima koji se ponavljaju iskošenim slovnim likom u "
 "donjem levom kalendaru"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
 msgid "Search range for time-based searching in years"
 msgstr "Opseg pretrage za pretraživanje na osnovu vremena u godinama"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 msgid ""
 "How many years can the time-based search go forward or backward from "
 "currently selected day when searching for another occurrence; default is ten "
@@ -7942,61 +8944,72 @@ msgstr ""
 "trenutno izabranog dana prilikom pretrage za još jednim dešavanjem; osnovno "
 "je deset godina"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 msgid "Show appointment end times in week and month views"
 msgstr "Prikazuje vremena zakazanog završetka u nedeljnim i mesečnim pregledima"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
 msgid "Whether to display the end time of events in the week and month views"
 msgstr ""
 "Da li da prikaže vremena završetka događaja u nedeljnim i mesečnim pregledima"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#| msgid "Show appointment end times in week and month views"
+msgid "Show appointment icons in the month view"
+msgstr "Prikazuje ikonicu sastanka u mesečnom pregledu"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#| msgid ""
+#| "Whether to display the end time of events in the week and month views"
+msgid "Whether to show icons of events in the month view"
+msgstr "Da li će prikazati ikonicu događaja u mesečnom pregledu"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Show the memo preview pane"
 msgstr "Prikazuje pregled beleški"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 msgid "If \"true\", show the memo preview pane in the main window"
 msgstr "Ukoliko je izabrano, u glavnom prozoru prikazuje pregled beleški"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid "Show the task preview pane"
 msgstr "Prikazuje pregled zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 msgid "If \"true\", show the task preview pane in the main window"
 msgstr "Ukoliko je izabrano, u glavnom prozoru prikazuje pregled zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr ""
 "Prikazuje broj nedelje u dnevnom pregledu, u pregledu radne nedelje i "
 "pretraživaču datuma"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr "Da li da pokaže brojeve nedelja na raznim mestima u kalendaru"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 msgid "Vertical position for the tag pane"
 msgstr "Uspravan položaj za površ oznake"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 msgid "Highlight tasks due today"
 msgstr "Isticanje zadataka u toku dana"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 msgid ""
 "Whether highlight tasks due today with a special color (task-due-today-color)"
 msgstr ""
 "Da li će zadaci u toku dana biti istaknuti posebnom bojom (boja-zadatka-u-"
 "toku-dana)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 msgid "Tasks due today color"
 msgstr "Boja zadatka za danas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid ""
 "Background color of tasks that are due today, in \"#rrggbb\" format. Used "
 "together with task-due-today-highlight"
@@ -8004,15 +9017,15 @@ msgstr ""
 "Boja pozadine zaduženja za danas, u obliku „#rrggbb“. Koristi se zajedno sa "
 "isticanjem-zadatka-u-toku-dana"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 msgid "Task preview pane position (horizontal)"
 msgstr "Pozicija pregleda zadataka (horizontalno)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 msgid "Task layout style"
 msgstr "Stil razmeštaja"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. \"0\" (Classic View) places the preview pane below the task "
@@ -8022,30 +9035,42 @@ msgstr ""
 "„0“ (klasičan pregled) postavlja pregled ispod spiska zadataka. "
 "„1“ (vertikalan pregled) postavlja pregled pored spiska zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 msgid "Task preview pane position (vertical)"
 msgstr "Pozicija pregleda zadataka (vertikalno)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
 msgid "Position of the task preview pane when oriented vertically"
 msgstr "Pozicija pregleda zadataka kada je postavljeno vertikalno"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+msgid "Show reminders for completed tasks"
+msgstr "Prikaži podsetnike za završene zadatke"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+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."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 msgid "Highlight overdue tasks"
 msgstr "Isticanje neispunjenih zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
 msgid ""
 "Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr ""
 "Da li će neispunjeni zadaci biti istaknuti posebnom bojom (boja-neispunjenog-"
 "zadatka)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
 msgid "Overdue tasks color"
 msgstr "Boja neispunjenih zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
 msgid ""
 "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
 "together with task-overdue-highlight."
@@ -8053,19 +9078,19 @@ msgstr ""
 "Boja pozadine neispunjenih zadataka, u obliku „#rrggbb“. Koristi se zajedno "
 "sa isticanjem-neispunjenih-zadatka."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
 msgid "Time divisions"
 msgstr "Podela vremena"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
 msgid "Intervals shown in Day and Work Week views, in minutes"
 msgstr "Intervali prikazani u dnevnim i nedeljnim pregledima, u minutima"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
 msgid "Timezone"
 msgstr "Vremenska zona"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like \"America/New York\""
@@ -8073,75 +9098,75 @@ msgstr ""
 "Podrazumevana vremenska zona koju kalendar koristi za datum i vreme, kao "
 "neprevedeno mesto baze vremenske zone Olsen, kao „Amerika/Njujork“"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
 msgid "Twenty four hour time format"
 msgstr "24-časovni oblik vremena"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../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"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
 msgid "Birthday and anniversary reminder"
 msgstr "Podsetnik na rođendane i godišnjice"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "Da li da postavi podsetnik na rođendane i godišnjice"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
 msgid "Default appointment reminder"
 msgstr "Podrazumevani podsetnik za zakazivanje"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
 msgid "Whether to set a default reminder for appointments"
 msgstr "Da li da postavi podrazumevani podsetnik za zakazivanja"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
 msgid "Use system timezone"
 msgstr "Koristi vremensku zonu sistema"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
 msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr "Koristi vremensku zonu sistema umesto one koja je izabrana u Evoluciji"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
 msgid "First day of the week"
 msgstr "Prvi dan sedmice"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
 msgid "Monday is a work day"
 msgstr "Ponedeljak je radni dan"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
 msgid "Tuesday is a work day"
 msgstr "Utorak je radni dan"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
 msgid "Wednesday is a work day"
 msgstr "Sreda je radni dan"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
 msgid "Thursday is a work day"
 msgstr "Četvrtak je radni dan"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
 msgid "Friday is a work day"
 msgstr "Petak je radni dan"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
 msgid "Saturday is a work day"
 msgstr "Subota je radni dan"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
 msgid "Sunday is a work day"
 msgstr "Nedelja je radni dan"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
 msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
 msgstr "(Zastarelo) Dan kojim počinje sedmica, od nedelje (0) do subote (6)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"week-start-day-name\" instead."
@@ -8149,11 +9174,11 @@ msgstr ""
 "Ovaj ključ je zastareo u izdanju 3.10 i ne treba više da se koristi. Umesto "
 "njega koristite „week-start-day-name“."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
 msgid "(Deprecated) Work days"
 msgstr "(Zastarelo) Radni dani"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
 msgid ""
 "Days on which the start and end of work hours should be indicated. (This key "
 "was deprecated in version 3.10 and should no longer be used. Use the \"work-"
@@ -8237,8 +9262,11 @@ msgid "Default charset in which to compose messages"
 msgstr "Podrazumevani skup znakova za sastavljanje poruka"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:4
-msgid "Default charset in which to compose messages."
-msgstr "Podrazumevani skup znakova za sastavljanje poruka."
+#| msgid "Default charset in which to compose messages."
+msgid "Default charset in which to compose messages. Uses UTF-8, if not set."
+msgstr ""
+"Podrazumevani skup znakova za sastavljanje poruka. Koristiće UTF-8, ako nije "
+"postavljeno."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:5
 msgid "Path where picture gallery should search for its content"
@@ -8275,14 +9303,17 @@ msgid "Automatic emoticon recognition"
 msgstr "Automatsko prepoznavanje smajlića"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
-msgid "Recognize emoticons in text and replace them with images."
-msgstr "Prepoznaje smajliće u tekstu i zamenjuje ih slikama."
+msgid ""
+"Recognize emoticons in text and replace them with images or Unicode "
+"characters."
+msgstr ""
+"Prepoznaje smajliće u tekstu i zamenjuje ih slikama ili Unikod znakovima."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
 msgid "Attribute message"
 msgstr "Priložena poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author"
@@ -8290,11 +9321,11 @@ msgstr ""
 "Tekst koji se ubacuje kada odgovarate na poruku, pripisujući poruku "
 "originalnom autoru"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
 msgid "Forward message"
 msgstr "Prosleđuje poruku"
 
-#: ../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 forwarding a message, saying that the "
 "forwarded message follows"
@@ -8302,11 +9333,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:17
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
 msgid "Original message"
 msgstr "Originalna poruka"
 
-#: ../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 replying to a message (top posting), saying "
 "that the original message follows"
@@ -8314,11 +9345,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:19
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
 msgid "Group Reply replies to list"
 msgstr "Grupisanje odgovora Odgovori na spisku"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
 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 "
@@ -8329,11 +9360,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:21
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
 msgid "Put the cursor at the bottom of replies"
 msgstr "Postavlja kursor na dno odgovora"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
 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 "
@@ -8343,30 +9374,22 @@ 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:23
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
 msgid "Always request read receipt"
 msgstr "Uvek traži povratnicu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
 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:25
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
 msgid "Send HTML mail by default"
 msgstr "Podrazumevano slanje HTML pošte"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
 msgid "Send HTML mail by default."
 msgstr "Šalje HTML poštu po podrazumevanoj vrednosti."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
-msgid "Spell checking color"
-msgstr "Boja za proveru pravopisa"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
-msgid "Underline color for misspelled words when using inline spelling."
-msgstr "Boja za podvlačenje pravopisnih greški prilikom provere pravopisa."
-
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
 msgid "Spell checking languages"
 msgstr "Jezici za proveru pravopisa"
@@ -8400,10 +9423,22 @@ msgstr ""
 "„Pregled“ nakon izbora naloga pošte."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+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
+msgid ""
+"Show the \"From\" override field when sending a mail message. This is "
+"controlled from the View menu when a mail account is chosen."
+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
 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:36
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -8411,11 +9446,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:37
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
 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:38
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -8423,11 +9458,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:39
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
 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:40
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -8435,11 +9470,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:41
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
 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:42
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
 msgid ""
 "Automatically enable PGP or S/MIME signatures when replying to a message "
 "which is also PGP or S/MIME signed."
@@ -8447,11 +9482,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:43
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
 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:44
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
 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, "
@@ -8462,11 +9497,23 @@ 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:45
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+msgid "Send messages through Outbox folder"
+msgstr "Šalji poruku kroz fasciklu Za slanje"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+msgid ""
+"Always save messages to Outbox folder when sending, to let a user choose "
+"when the messages should be sent."
+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
 msgid "Put personalized signatures at the top of replies"
 msgstr "Postavlja personalizovane potpise iznad odgovora"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
 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 "
@@ -8476,11 +9523,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:47
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
 msgid "Do not add signature delimiter"
 msgstr "Ne dodaje razdvojnik potpisa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -8488,11 +9535,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:49
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
 msgid "Ignore list Reply-To:"
 msgstr "Zanemaruje listu „Odgovor-za:“"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
 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. "
@@ -8510,11 +9557,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:51
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
 msgid "List of localized 'Re'"
 msgstr "Spisak lokalizovanih „Odg“"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 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\" "
@@ -8524,19 +9571,73 @@ 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:53
+#: ../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"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+msgid "Will autowrap lines after given number of characters."
+msgstr "Automatski prelama linije teksta nakon zadatog broja znakova."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+msgid ""
+"Number of To and CC recipients to ask 'prompt-on-many-to-cc-recips' from"
+msgstr ""
+"Broj Za i CC primaoca nakon koga se pojavljuje „prompt-on-many-to-cc-recips“"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+msgid ""
+"When to ask, when the number of To and CC recipients reaches this value."
+msgstr ""
+"Kada se postavlja pitanje. Kada bron Za i CC primaoca dostigne ovu vrednost."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+msgid "Whether to always show Sign and Encrypt buttons on the toolbar"
+msgstr ""
+"Da li se prikazuju dugmići za potpis i šifrovanje unutar palete sa alata"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+msgid ""
+"If set to 'true', the Sign and Encrypt buttons for either PGP or S/MIME are "
+"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."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+msgid "Wrap quoted text in replies"
+msgstr "Prelama citirani tekst u odgovorima"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+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 "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:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Can be either 'mbox' or 'pdf'."
 msgstr "Može biti „mbox“ ili „pdf“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Show image animations"
 msgstr "Prikazivanje animiranih slika"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -8544,11 +9645,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:57
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 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:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -8556,11 +9657,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:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 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:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -8568,73 +9669,87 @@ 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:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 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:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 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:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Mark citations in the message \"Preview\""
 msgstr "Označava citate u pregledu poruke"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Označava citate u pregledu poruke."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Citation highlight color"
 msgstr "Boja isticanja citata"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Citation highlight color."
 msgstr "Boja za isticanja citata."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Enable/disable caret mode"
 msgstr "Uključuje/isključuje prikaz kursora"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 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:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Default charset in which to display messages"
 msgstr "Podrazumevani skup znakova za prikaz poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Default charset in which to display messages."
 msgstr "Podrazumevani skup znakova za prikaz poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 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:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+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
+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 "
+"show a notification about it on top of the preview panel."
+msgstr ""
+"Kada pregled poruke prikaže poruku koja zahteva preuzimanje udaljenog "
+"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
 msgid "Show Animations"
 msgstr "Prikazivanje animacija"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Show animated images as animations."
 msgstr "Prikazuje animirane slike kao animacije."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Show all message headers"
 msgstr "Prikazivanje svih zaglavlja poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 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:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 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:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 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 "
@@ -8644,69 +9759,84 @@ 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:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Show photo of the sender"
 msgstr "Prikazivanje slike pošiljaoca"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 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:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+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
+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
 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:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 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:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+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
+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."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 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:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 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:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 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:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 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:86
-msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view"
-msgstr ""
-"Utvrđuje da li da koristi isti font u poljima „Šalje“ and „Naslov“ u uspravnom "
-"pregledu kolone „Poruke“"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
-msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view."
-msgstr ""
-"Utvrđuje da li da koristi isti font u poljima „Šalje“ and „Naslov“ u uspravnom "
-"pregledu kolone „Poruke“."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Show deleted messages in the message-list"
 msgstr "Prikazivanje obrisanih poruka u listi poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 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:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#| msgid "Show deleted messages in the message-list"
+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
+#| msgid "Show deleted messages (with a strike-through) in the message-list."
+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
 msgid "Enable Unmatched search folder"
 msgstr "Uključi nepoklopljene fascikle pretrage"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
@@ -8714,11 +9844,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:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 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:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 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."
@@ -8726,31 +9856,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:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "Height of the message-list pane"
 msgstr "Visina površi liste poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Height of the message-list pane."
 msgstr "Visina površi za liste poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 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:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Width of the message-list pane"
 msgstr "Širina površi spiska poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Width of the message-list pane."
 msgstr "Širina površi spiska poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Layout style"
 msgstr "Stil razmeštaja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 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 "
@@ -8761,47 +9891,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:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Variable width font"
 msgstr "Font promenljive veličine"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 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:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Terminal font"
 msgstr "Font terminala"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid "The terminal font for mail display."
 msgstr "Font terminala za prikaz pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Use custom fonts"
 msgstr "Korišćenje sopstvenih fontova"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 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:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Sažima prikaz adresa u TO/CC/BCC"
+msgstr "Sažima prikaz adresa u Za/CC/BCC"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr ""
-"Vrši sažimanje prikaza adresa u TO/CC/BCC na broj određen u address_count "
+"Vrši sažimanje prikaza adresa u Za/CC/BCC na broj određen u address_count "
 "(broj adresa)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 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:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -8809,11 +9939,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:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Thread the message-list based on Subject"
 msgstr "Prikaz poruke prema naslovu rasprave"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -8821,11 +9951,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:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Default value for thread expand state"
 msgstr "Podrazumevana vrednost za raširenu raspravu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -8833,11 +9963,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:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 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:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 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 "
@@ -8846,11 +9976,23 @@ 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:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+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
+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."
+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
 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:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 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 "
@@ -8862,27 +10004,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:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Log filter actions"
 msgstr "Dnevnik radnji filtera"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 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:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Logfile to log filter actions"
 msgstr "Dnevnik datoteka za beleženje radnji filtera"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Logfile to log filter actions."
 msgstr "Dnevnik datoteka za beleženje radnji filtera."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Flush Outbox after filtering"
 msgstr "Prazni slanje nakon filtriranja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 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 "
@@ -8892,44 +10034,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:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Default forward style"
 msgstr "Podrazumevani stil prosleđivanja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Default reply style"
 msgstr "Podrazumevani stil odgovora"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
+msgstr "Upozorenje na slanje poruke kada se koristi prečica (Ctrl + Enter)"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+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
 msgid "Prompt on empty subject"
 msgstr "Postavlja upit kada je naslov prazan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 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:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Prompt when emptying the trash"
 msgstr "Postavlja upit prilikom pražnjenja smeća"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 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:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Prompt when user expunges"
 msgstr "Postavlja upit pri pražnjenju"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 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:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 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:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -8937,19 +10090,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:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 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:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 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:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 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:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -8957,12 +10110,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:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 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:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -8970,19 +10123,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:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Prompt while marking multiple messages"
 msgstr "Postavlja upit pri označavanju više poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 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:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 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:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 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 "
@@ -8991,12 +10144,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:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 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:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 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 "
@@ -9008,12 +10161,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:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 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:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 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 "
@@ -9025,11 +10178,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:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 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:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 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."
@@ -9037,11 +10190,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:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 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:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 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 "
@@ -9051,18 +10204,46 @@ 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:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 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:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 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:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+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
+msgid ""
+"It disables/enables the repeated prompts to warn that you are switching "
+"composer mode and the content needs to lose its formatting."
+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
+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
+msgid ""
+"Enable or disable the prompt when sending to many To and CC recipients. The "
+"'composer-many-to-cc-recips-num' defines the threshold."
+msgstr ""
+"Omogućava ili onemogućava upozorenje kada se poruka šalje na veliki broj "
+"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
 msgid ""
 "Policy for automatically closing the message browser window when forwarding "
 "or replying to the displayed message."
@@ -9070,42 +10251,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:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid "Empty Trash folders on exit"
 msgstr "Prazni fascikle sa smećem na izlazu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 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:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 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:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 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:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid "Last time Empty Trash was run"
 msgstr "Poslednje vreme pražnjenja smeća"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 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:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 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:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 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:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -9113,11 +10294,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:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Show original \"Date\" header value."
 msgstr "Prikazuje originalnu vrednost zaglavlja datuma."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 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 "
@@ -9127,11 +10308,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:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "List of Labels and their associated colors"
 msgstr "Spisak oznaka i njima dodeljenih boja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 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."
@@ -9139,46 +10320,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:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 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:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 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:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "Empty Junk folders on exit"
 msgstr "Prazni fascikle sa đubretom pri izlazu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 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:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 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:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 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:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid "Last time Empty Junk was run"
 msgstr "Vreme poslednjeg pražnjenja đubreta"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 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:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid "The default plugin for Junk hook"
 msgstr "Podrazumevani dodatak kuke za đubre"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 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 "
@@ -9188,11 +10369,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:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 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:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 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 "
@@ -9204,7 +10385,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:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -9212,7 +10393,7 @@ 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:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 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 "
@@ -9222,13 +10403,13 @@ msgstr ""
 "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:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 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:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 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 "
@@ -9237,11 +10418,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:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 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:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -9249,31 +10430,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:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid "UID string of the default account."
 msgstr "JIB niz podrazumevanog naloga."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "Save directory"
 msgstr "Direktorijum čuvanja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 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:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid "Composer load/attach directory"
 msgstr "Direktorijum sastavljača za učitavanje/prilaganje"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 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:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 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:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -9281,11 +10462,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:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 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:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 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 "
@@ -9296,11 +10477,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:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid "Server synchronization interval"
 msgstr "Interval usaglašavanja sa serverom"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -9308,11 +10489,52 @@ 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:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
+msgid "Allow expunge in virtual folders"
+msgstr "Dozvoli pražnjenje virtuelnih fascikli"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+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 "
+"in all folders for all deleted messages within the virtual folder, not only "
+"for deleted messages belonging to the virtual folder."
+msgstr ""
+"Dozvoljava pražnjenje virtuelnih fascikli, što znači da možete pozvati naredbu "
+"Fascikla -> Izbaci i nad virtuelnim fasciklama. Pri tome će naredba biti "
+"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
+#: ../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
+msgid ""
+"When enabled the theme colors for background, text and links are sent in "
+"resulting HTML formatted message."
+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
+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
+msgid ""
+"An Archive folder to use for Messages|Archive... feature when in an On This "
+"Computer folder."
+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
 msgid "(Deprecated) Default forward style"
 msgstr "(Zastarelo) Podrazumevani stil prosleđivanja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"forward-style-name\" instead."
@@ -9320,11 +10542,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:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 msgid "(Deprecated) Default reply style"
 msgstr "(Zastarelo) Podrazumevani stil odgovora"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"reply-style-name\" instead."
@@ -9332,11 +10554,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:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
 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:203
+#: ../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 "
 "\"show-headers\" instead."
@@ -9344,11 +10566,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:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
 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:205
+#: ../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 "
 "\"image-loading-policy\" instead."
@@ -9356,7 +10578,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:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
@@ -9364,7 +10586,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:207
+#: ../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 "
 "\"browser-close-on-reply-policy\" instead."
@@ -9601,10 +10823,16 @@ msgid "Mode to use when displaying mails"
 msgstr "Režim za korišćenje prilikom prikaza pošte"
 
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:2
+#, fuzzy
+#| msgid ""
+#| "The mode to use for displaying mails. \"normal\" makes Evolution choose "
+#| "the best part to show, \"prefer_plain\" makes it use the text part, if "
+#| "present, and \"only_plain\" forces Evolution to only show plain text"
 msgid ""
 "The mode to use for displaying mails. \"normal\" makes Evolution choose the "
 "best part to show, \"prefer_plain\" makes it use the text part, if present, "
-"and \"only_plain\" forces Evolution to only show plain text"
+"\"prefer_source\" makes it use the text part, if present, otherwise shows "
+"HTML source, and \"only_plain\" forces Evolution to only show plain text"
 msgstr ""
 "Režim koji će biti korišćen prilikom prikazivanja pošte. „normal“ čini da "
 "Evolucija izabere najbolji deo da prikaže, „prefer_plain“ čini da koristi "
@@ -9666,7 +10894,7 @@ msgstr "Polazna fascikla izbirača datoteka"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Polazna fascikla za prozorčiće izbirača datoteka."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:307
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:320
 msgid "Start in offline mode"
 msgstr "Započinje rad van mreže"
 
@@ -9692,18 +10920,32 @@ msgid "Flag that enables a much simplified user interface."
 msgstr "Oznaka koja omogućava jednostavnije okruženje."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:13
+#| msgid "Zoom large images to not be wider than the window width"
+msgid "List of button names to hide in the window switcher"
+msgstr "Spisak naziva dugmadi za skrivanje u prebacivaču prozora"
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
+msgid ""
+"Valid values are 'mail', 'addressbook', 'calendar', 'tasks' and 'memos'. "
+"Change of this requires restart of the application."
+msgstr ""
+"Ispravne vrednosti su „mail“ (pošta), „addressbook“ (adresar), „calendar“ "
+"(kalendar), „tasks“ (zadaci) i „memos“ (beleške). Izmena ovoga zahteva "
+"ponovno pokretanje programa."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
 msgid "Window buttons are visible"
 msgstr "Dugmad prozora su vidljiva"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:14
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
 msgid "Whether the window buttons should be visible."
 msgstr "Da li će dugmad prozora biti vidljiva."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:15
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
 msgid "Window button style"
 msgstr "Stil dugmadi prozora"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:16
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
 msgid ""
 "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
 "\"toolbar\". If \"toolbar\" is set, the style of the buttons is determined "
@@ -9713,39 +10955,39 @@ msgstr ""
 "„both“ (oboje), „toolbar“ (traka alata). Ako je postavljeno „toolbar“, "
 "Gnomovo podešavanje trake alata utvrđuje stil."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:17
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
 msgid "Toolbar is visible"
 msgstr "Traka alata je vidljiva"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
 msgid "Whether the toolbar should be visible."
 msgstr "Da li će traka alata biti vidljiva."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
 msgid "Sidebar is visible"
 msgstr "Bočna površ je vidljiva"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:20
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
 msgid "Whether the sidebar should be visible."
 msgstr "Da li će bočna površ biti vidljiva."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:21
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
 msgid "Statusbar is visible"
 msgstr "Traka statusa je vidljiva"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
 msgid "Whether the status bar should be visible."
 msgstr "Da li će traka stanja biti vidljiva."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "IB ili alijas dela koji se podrazumevano prikazuje po pokretanju."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:26
 msgid "Default sidebar width"
 msgstr "Podrazumevana širina bočne površi"
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:25
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:27
 msgid "The default width for the sidebar, in pixels."
 msgstr "Podrazumevana širina bočne trake, u tačkama."
 
@@ -9757,18 +10999,36 @@ msgstr "Koristi samo lokalne provere spama."
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Koristi samo lokalne provere spama (bez DNS-a)."
 
-#: ../em-format/e-mail-formatter-attachment.c:405
-#: ../e-util/e-attachment-bar.c:100 ../e-util/e-attachment-bar.c:105
-#: ../e-util/e-attachment-paned.c:175 ../e-util/e-attachment-paned.c:180
-#: ../mail/message-list.etspec.h:4
-msgid "Attachment"
-msgid_plural "Attachments"
-msgstr[0] "Prilog"
-msgstr[1] "Prilozi"
-msgstr[2] "Prilozi"
-msgstr[3] "Prilog"
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
+msgid "Full path command to run spamassassin"
+msgstr "Puna putanja do naredbe za ubicu nepoželjnih poruka (spamassassin)"
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
+msgid ""
+"Full path to a spamassassin command. If not set, then a compile-time path is "
+"used, usually /usr/bin/spamassassin. The command should not contain any "
+"other arguments."
+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 "
+"opcije."
 
-#: ../em-format/e-mail-formatter-attachment.c:406
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
+msgid "Full path command to run sa-learn"
+msgstr "Puna putanja do naredbe sa-learn"
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
+msgid ""
+"Full path to a sa-learn command. If not set, then a compile-time path is "
+"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. "
+"Naredba ne treba da sadrži dodatne opcije."
+
+#: ../em-format/e-mail-formatter-attachment.c:425
 msgid "Display as attachment"
 msgstr "Prikaži kao prilog"
 
@@ -9781,8 +11041,8 @@ msgid "Play the attachment in embedded audio player"
 msgstr "Pusti prilog u ugrađenom programu"
 
 #: ../em-format/e-mail-formatter-headers.c:102
-#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:273
-#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:63
+#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:277
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:62
 msgid "From"
 msgstr "Šalje"
 
@@ -9790,7 +11050,7 @@ msgstr "Šalje"
 msgid "(no subject)"
 msgstr "(bez naslova)"
 
-#: ../em-format/e-mail-formatter-headers.c:328
+#: ../em-format/e-mail-formatter-headers.c:329
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Poruku šalje „%s“ na ime „%s“"
@@ -9811,84 +11071,61 @@ msgstr "RFC822 poruka"
 msgid "Format part as an RFC822 message"
 msgstr "Oblikuje deo kao RFC822 poruku"
 
-#: ../em-format/e-mail-formatter-print.c:53
+#: ../em-format/e-mail-formatter-print.c:51
 #: ../e-util/gal-view-instance-save-as-dialog.c:94
 #: ../mail/e-mail-label-tree-view.c:98
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1322
-#: ../modules/cal-config-google/e-google-chooser.c:236
 #: ../modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Name"
 msgstr "Naziv"
 
-#: ../em-format/e-mail-formatter-print.c:53
-#: ../e-util/e-attachment-tree-view.c:573 ../mail/message-list.etspec.h:10
+#: ../em-format/e-mail-formatter-print.c:51
+#: ../e-util/e-attachment-tree-view.c:579 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Veličina"
 
-#: ../em-format/e-mail-formatter-print-headers.c:143
-msgid "GPG signed"
-msgstr "GPG potpisano"
-
-#: ../em-format/e-mail-formatter-print-headers.c:149
-msgid "GPG encrpyted"
-msgstr "GPG šifrovano"
-
-#: ../em-format/e-mail-formatter-print-headers.c:155
-msgid "S/MIME signed"
-msgstr "S/MIME potpisano"
-
-#: ../em-format/e-mail-formatter-print-headers.c:161
-msgid "S/MIME encrpyted"
-msgstr "S/MIME šifrovano"
-
-#: ../em-format/e-mail-formatter-print-headers.c:170
-#: ../mail/e-mail-config-security-page.c:645
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:194
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:128
-msgid "Security"
-msgstr "Bezbednost"
-
-#: ../em-format/e-mail-formatter-quote-headers.c:167
-#: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:278
-#: ../mail/em-filter-i18n.h:51 ../mail/message-list.etspec.h:6
-#: ../modules/mail/em-mailer-prefs.c:68
+#: ../em-format/e-mail-formatter-quote-headers.c:180
+#: ../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
 msgid "Subject"
 msgstr "Naslov"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:186
-#: ../em-format/e-mail-formatter-utils.c:342
-#: ../modules/mail/em-mailer-prefs.c:1144
+#: ../em-format/e-mail-formatter-quote-headers.c:199
+#: ../em-format/e-mail-formatter-utils.c:343
+#: ../modules/mail/em-mailer-prefs.c:1490
 msgid "Mailer"
 msgstr "Pošiljalac"
 
 #: ../em-format/e-mail-formatter-quote-text-enriched.c:94
-#: ../em-format/e-mail-formatter-text-enriched.c:98
+#: ../em-format/e-mail-formatter-text-enriched.c:102
 msgid "Richtext"
 msgstr "Bogati tekst"
 
 #: ../em-format/e-mail-formatter-quote-text-enriched.c:95
-#: ../em-format/e-mail-formatter-text-enriched.c:99
+#: ../em-format/e-mail-formatter-text-enriched.c:103
 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:359
+#: ../em-format/e-mail-formatter-text-html.c:385
 msgid "HTML"
 msgstr "HTML"
 
 #: ../em-format/e-mail-formatter-quote-text-html.c:96
-#: ../em-format/e-mail-formatter-text-html.c:360
+#: ../em-format/e-mail-formatter-text-html.c:386
 msgid "Format part as HTML"
 msgstr "Oblikuje deo kao HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:121
-#: ../em-format/e-mail-formatter-text-plain.c:197
+#: ../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
 msgid "Plain Text"
 msgstr "Običan tekst"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:122
-#: ../em-format/e-mail-formatter-text-plain.c:198
+#: ../em-format/e-mail-formatter-quote-text-plain.c:124
+#: ../em-format/e-mail-formatter-text-plain.c:199
 msgid "Format part as plain text"
 msgstr "Oblikuje deo kao običan tekst"
 
@@ -9997,7 +11234,7 @@ msgstr ""
 "u dogledno vreme vidi sadržaj ove poruke."
 
 #: ../em-format/e-mail-formatter-secure-button.c:187
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../shell/shell.error.xml.h:28 ../smime/gui/smime-ui.ui.h:22
 msgid "_View Certificate"
 msgstr "Pregledaj _uverenje"
 
@@ -10005,26 +11242,53 @@ msgstr "Pregledaj _uverenje"
 msgid "This certificate is not viewable"
 msgstr "Ovo uverenje nije čitljivo"
 
-#: ../em-format/e-mail-formatter-source.c:120
-msgid "Source"
-msgstr "Izvor"
-
 #: ../em-format/e-mail-formatter-source.c:121
 msgid "Display source of a MIME part"
 msgstr "Prikazuje izvoe kao MIME deo"
 
 #: ../em-format/e-mail-formatter-utils.c:202
 #: ../em-format/e-mail-formatter-utils.c:219
-#: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:66
-msgid "Cc"
-msgstr "Cc"
+#: ../em-format/e-mail-part-headers.c:48 ../mail/message-list.etspec.h:9
+#: ../mail/searchtypes.xml.in.h:11 ../mail/vfoldertypes.xml.in.h:11
+#: ../modules/mail/em-mailer-prefs.c:64
+msgid "To"
+msgstr "Prima"
 
 #: ../em-format/e-mail-formatter-utils.c:203
 #: ../em-format/e-mail-formatter-utils.c:220
-#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:67
+#: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:65
+msgid "Cc"
+msgstr "Cc"
+
+#: ../em-format/e-mail-formatter-utils.c:204
+#: ../em-format/e-mail-formatter-utils.c:221
+#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:66
 msgid "Bcc"
 msgstr "Bcc"
 
+#: ../em-format/e-mail-formatter-utils.c:566
+msgid "GPG signed"
+msgstr "GPG potpisano"
+
+#: ../em-format/e-mail-formatter-utils.c:572
+msgid "GPG encrypted"
+msgstr "GPG šifrovano"
+
+#: ../em-format/e-mail-formatter-utils.c:578
+msgid "S/MIME signed"
+msgstr "S/MIME potpisano"
+
+#: ../em-format/e-mail-formatter-utils.c:584
+msgid "S/MIME encrypted"
+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
+msgid "Security"
+msgstr "Bezbednost"
+
 #: ../em-format/e-mail-parser-application-mbox.c:87
 #, c-format
 msgid "Error parsing MBOX part: %s"
@@ -10035,12 +11299,12 @@ msgstr "Greška obrade MBOKS dela: %s"
 msgid "Could not parse S/MIME message: %s"
 msgstr "Ne mogu da obradim S/MIME poruku: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:79
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:77
 #, c-format
 msgid "Could not parse PGP message: %s"
 msgstr "Ne mogu da obradim PGP poruku: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:82
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:80
 #: ../em-format/e-mail-parser-multipart-signed.c:135
 #, c-format
 msgid "Error verifying signature: %s"
@@ -10093,364 +11357,42 @@ msgstr "Ne mogu da obradim PGP/MIME poruku: %s"
 msgid "Unsupported signature format"
 msgstr "Nepodržan oblik potpisa"
 
-#: ../em-format/e-mail-part-headers.c:47 ../modules/mail/em-mailer-prefs.c:64
+#: ../em-format/e-mail-part-headers.c:47 ../modules/mail/em-mailer-prefs.c:63
 msgid "Reply-To"
 msgstr "Odgovor"
 
-#: ../em-format/e-mail-part-headers.c:52 ../e-util/e-dateedit.c:549
-#: ../e-util/e-dateedit.c:572 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:69
+#: ../em-format/e-mail-part-headers.c:52 ../e-util/e-dateedit.c:552
+#: ../e-util/e-dateedit.c:575 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:68
 msgid "Date"
 msgstr "Datum"
 
-#: ../em-format/e-mail-part-headers.c:53 ../modules/mail/em-mailer-prefs.c:70
+#: ../em-format/e-mail-part-headers.c:53 ../modules/mail/em-mailer-prefs.c:69
 msgid "Newsgroups"
 msgstr "Grupe vesti"
 
-#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:70
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "Lice"
 
-#: ../em-format/e-mail-part-utils.c:508
+#: ../em-format/e-mail-part-utils.c:544
 #, c-format
 msgid "%s attachment"
 msgstr "%s prilog"
 
-#: ../e-util/e-send-options.ui.h:3
-msgid "Standard"
-msgstr "Obično"
-
-#: ../e-util/e-send-options.ui.h:6
-msgid "Proprietary"
-msgstr "Vlasničko"
-
-#: ../e-util/e-send-options.ui.h:8
-msgid "Secret"
-msgstr "Tajno"
-
-#: ../e-util/e-send-options.ui.h:9
-msgid "Top Secret"
-msgstr "Strogo poverljivo"
-
-#: ../e-util/e-send-options.ui.h:10
-msgid "For Your Eyes Only"
-msgstr "Samo za vaše oči"
-
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# 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.
-#. Translators: Used in send options dialog
-#: ../e-util/e-send-options.ui.h:12
-msgctxt "send-options"
-msgid "None"
-msgstr "Ništa"
-
-#: ../e-util/e-send-options.ui.h:13
-msgid "Mail Receipt"
-msgstr "Priznanica pošte"
-
-#: ../e-util/e-send-options.ui.h:15
-msgid "R_eply requested"
-msgstr "Zahtevan je o_dgovor"
-
-#: ../e-util/e-send-options.ui.h:16
-msgctxt "ESendOptionsWithin"
-msgid "Wi_thin"
-msgstr "Un_utar"
-
-#: ../e-util/e-send-options.ui.h:17
-msgctxt "ESendOptionsWithin"
-msgid "days"
-msgstr "dana"
-
-#: ../e-util/e-send-options.ui.h:18
-msgid "_When convenient"
-msgstr "Kada je z_godno"
-
-#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:847
-msgid "Replies"
-msgstr "Odgovori"
-
-#: ../e-util/e-send-options.ui.h:20
-msgid "_Delay message delivery"
-msgstr "_Odloži isporuku poruke"
-
-#: ../e-util/e-send-options.ui.h:21
-msgctxt "ESendOptionsAfter"
-msgid "_After"
-msgstr "_Posle"
-
-#: ../e-util/e-send-options.ui.h:22
-msgctxt "ESendOptionsAfter"
-msgid "days"
-msgstr "dana"
-
-#: ../e-util/e-send-options.ui.h:23
-msgid "_Set expiration date"
-msgstr "Postavi _rok"
-
-#: ../e-util/e-send-options.ui.h:24
-msgctxt "ESendOptions"
-msgid "_Until"
-msgstr "_Do"
-
-#: ../e-util/e-send-options.ui.h:25
-msgid "Delivery Options"
-msgstr "Opcije isporuke"
-
-#: ../e-util/e-send-options.ui.h:26
-msgid "_Priority:"
-msgstr "_Važnost:"
-
-#: ../e-util/e-send-options.ui.h:27
-msgid "_Classification:"
-msgstr "_Klasifikacija:"
-
-#: ../e-util/e-send-options.ui.h:28
-msgid "Gene_ral Options"
-msgstr "Opš_te opcije"
-
-#: ../e-util/e-send-options.ui.h:29
-msgid "Creat_e a sent item to track information"
-msgstr "Na_pravi poslatu stavku za praćenje podatka"
-
-#: ../e-util/e-send-options.ui.h:30
-msgid "_Delivered"
-msgstr "_Isporučeno"
-
-#: ../e-util/e-send-options.ui.h:31
-msgid "Deli_vered and opened"
-msgstr "Ispo_ručeno i otvoreno"
-
-#: ../e-util/e-send-options.ui.h:32
-msgid "_All information"
-msgstr "_Svi podaci"
-
-#: ../e-util/e-send-options.ui.h:33
-msgid "A_uto-delete sent item"
-msgstr "A_utomatski obriši poslatu stavku"
-
-#: ../e-util/e-send-options.ui.h:34
-msgid "Status Tracking"
-msgstr "Praćenje statusa"
-
-#: ../e-util/e-send-options.ui.h:35
-msgid "_When opened:"
-msgstr "Kada je o_tvoreno:"
-
-#: ../e-util/e-send-options.ui.h:36
-msgid "When decli_ned:"
-msgstr "Kada je _odbijeno:"
-
-#: ../e-util/e-send-options.ui.h:37
-msgid "When co_mpleted:"
-msgstr "Kad je _završeno:"
-
-#: ../e-util/e-send-options.ui.h:38
-msgid "When acce_pted:"
-msgstr "Kada je _prihvaćeno:"
-
-#: ../e-util/e-send-options.ui.h:39
-msgid "Return Notification"
-msgstr "Povratno obaveštenje"
-
-#: ../e-util/e-send-options.ui.h:40
-msgid "Sta_tus Tracking"
-msgstr "Praćenje sta_tusa"
-
-#: ../e-util/e-table-config.ui.h:2
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:282
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:192
-#| msgid "_Append"
-msgid "_Apply"
-msgstr "_Primeni"
-
-#: ../e-util/e-table-config.ui.h:4
-msgid "_Sort..."
-msgstr "_Razvrstaj..."
-
-#: ../e-util/e-table-config.ui.h:5
-msgid "_Group By..."
-msgstr "_Grupiši po..."
-
-#: ../e-util/e-table-config.ui.h:6
-msgid "_Fields Shown..."
-msgstr "Prikazana _polja..."
-
-#: ../e-util/e-table-config.ui.h:9
-msgid "Clear _All"
-msgstr "Očisti _sve"
-
-#: ../e-util/e-table-config.ui.h:10
-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:1753
-msgid "Ascending"
-msgstr "Rastuće"
-
-#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1753
-msgid "Descending"
-msgstr "Opadajuće"
-
-#: ../e-util/e-table-config.ui.h:13
-msgid "Group Items By"
-msgstr "Grupiši stavke po"
-
-#: ../e-util/e-table-config.ui.h:14
-msgid "Show _field in View"
-msgstr "Prikaži _polje u pregledu"
-
-#: ../e-util/e-table-config.ui.h:15
-msgid "Then By"
-msgstr "Onda po"
-
-#: ../e-util/e-table-config.ui.h:16
-msgid "Show field i_n View"
-msgstr "Prikaži polje _u pregledu"
-
-#: ../e-util/e-table-config.ui.h:17
-msgid "Show field in _View"
-msgstr "Prikaži polje u p_regledu"
-
-#: ../e-util/e-table-config.ui.h:18
-msgid "Sort"
-msgstr "Razvrstaj"
-
-#: ../e-util/e-table-config.ui.h:19
-msgid "Clear All"
-msgstr "Očisti sve"
-
-#: ../e-util/e-table-config.ui.h:20
-msgid "Sort Items By"
-msgstr "Razvrstaj stavke po"
-
-#: ../e-util/e-timezone-dialog.ui.h:1
-msgid "Select a Time Zone"
-msgstr "Izaberite vremensku zonu"
-
-#: ../e-util/e-timezone-dialog.ui.h:4
-msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-"Use the right mouse button to zoom out."
-msgstr ""
-"Koristite levi taster miša da uvećate mapu i izaberete vremensku zonu.\n"
-"Koristite desni taster miša za umanjivanje."
-
-#: ../e-util/e-timezone-dialog.ui.h:6
-msgid "Time Zones"
-msgstr "Vremenske zone"
-
-#: ../e-util/e-timezone-dialog.ui.h:7
-msgid "_Selection"
-msgstr "_Izbor"
-
-#: ../e-util/e-timezone-dialog.ui.h:8
-msgid "Timezone drop-down combination box"
-msgstr "Prozorče za podešavanje vremenske zone"
-
-#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1243
-#: ../mail/em-utils.c:229
-msgid "Incoming"
-msgstr "Dolazno"
-
-#: ../e-util/filter.ui.h:2
-msgid "the current time"
-msgstr "trenutno vreme"
-
-#: ../e-util/filter.ui.h:3
-msgid "the time you specify"
-msgstr "vreme koje odredite"
-
-#: ../e-util/filter.ui.h:4
-msgid "a time relative to the current time"
-msgstr "vreme u odnosu na trenutno vreme"
-
-# bug: plural-forms
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:83
-msgid "seconds"
-msgstr "sekunde"
-
-#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
-msgid "weeks"
-msgstr "nedelje"
-
-#: ../e-util/filter.ui.h:10
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
-msgid "months"
-msgstr "meseci"
-
-#: ../e-util/filter.ui.h:11
-msgid "years"
-msgstr "godine"
-
-#: ../e-util/filter.ui.h:12
-msgid "ago"
-msgstr "pre"
-
-#: ../e-util/filter.ui.h:13
-msgid "in the future"
-msgstr "u budućnosti"
-
-#: ../e-util/filter.ui.h:14
-msgid "Show filters for mail:"
-msgstr "Prikaži propusnike pošte:"
-
-#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
-msgid "_Filter Rules"
-msgstr "Pr_avila filtera"
-
-#: ../e-util/filter.ui.h:23
-msgid "Compare against"
-msgstr "Uporedi sa"
-
-#: ../e-util/filter.ui.h:24
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Datum poruke će biti upoređen sa\n"
-"trenutnim vremenom kada se filtriranje desilo."
-
-#: ../e-util/filter.ui.h:26
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Datum poruke će biti upoređen sa\n"
-"00:00 navedenog datuma."
-
-#: ../e-util/filter.ui.h:28
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Datum poruke će biti upoređen sa\n"
-"vremenom kada se filtriranje desilo."
-
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
-msgid "_Create new view"
-msgstr "_Napravi novi pregled"
-
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../e-util/e-mail-signature-script-dialog.c:416
-#: ../mail/e-mail-config-identity-page.c:310
-#: ../mail/e-mail-config-summary-page.c:340
-msgid "_Name:"
-msgstr "_Ime:"
+#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
+msgid "%d %B %Y"
+msgstr "%d %B %Y."
 
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
-msgid "_Replace existing view"
-msgstr "_Zameni postojeći pregled"
+#: ../e-util/ea-calendar-item.c:326
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Kalendar: od %s do %s"
 
-#: ../e-util/e-activity-proxy.c:308
-#: ../modules/mail/e-mail-shell-view-actions.c:1724
-msgid "Cancel"
-msgstr "Otkaži"
+#: ../e-util/ea-calendar-item.c:363
+msgid "evolution calendar item"
+msgstr "stavka kalendara evolucije"
 
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:258
@@ -10482,23 +11424,78 @@ msgstr "%s (otkazujem)"
 msgid "%s"
 msgstr "%s"
 
+#. Translators: This is a running activity whose percent complete is known.
 #: ../e-util/e-activity.c:275
+#: ../modules/calendar/e-cal-base-shell-content.c:144
 #, c-format
 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
+msgid "Cancel"
+msgstr "Otkaži"
+
 #. Translators: Escape is a keyboard binding.
-#: ../e-util/e-alert-bar.c:118
+#: ../e-util/e-alert-bar.c:124
 msgid "Close this message (Escape)"
 msgstr "Zatvorite ovu poruku (Napusti)"
 
-#: ../e-util/e-attachment-bar.c:659 ../e-util/e-attachment-paned.c:702
-msgid "Icon View"
-msgstr "Pregled ikonicama"
+# bug: plural-forms
+#: ../e-util/e-alert-sink.c:246
+msgid "Failed to create a thread: "
+msgstr "Ne mogu da započnem raspravu: "
 
-#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:704
-msgid "List View"
-msgstr "Pregled spiskom"
+#. To Translators: This text is set as a description of an attached
+#. * 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
+msgid "Attached message"
+msgstr "Priložena poruka"
+
+#: ../e-util/e-attachment.c:2173 ../e-util/e-attachment.c:3170
+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
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../e-util/e-attachment.c:2414 ../e-util/e-attachment.c:3463
+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
+msgid "A save operation is already in progress"
+msgstr "Operacija čuvanja je već u toku"
+
+#: ../e-util/e-attachment.c:2830
+#, c-format
+msgid "Could not open '%s'"
+msgstr "Ne mogu da otvorim „%s“"
+
+#: ../e-util/e-attachment.c:2833
+#, c-format
+msgid "Could not open the attachment"
+msgstr "Ne mogu da otvorim prilog"
+
+#: ../e-util/e-attachment.c:3480
+msgid "Attachment contents not loaded"
+msgstr "Sadržaj priloga nije učitan"
+
+# * found, so just bail completely.
+#: ../e-util/e-attachment.c:3571
+#, c-format
+msgid "Could not save '%s'"
+msgstr "Ne mogu da sačuvam „%s“"
+
+#: ../e-util/e-attachment.c:3574
+#, c-format
+msgid "Could not save the attachment"
+msgstr "Ne mogu da sačuvam prilog"
 
 #: ../e-util/e-attachment-dialog.c:317
 msgid "Attachment Properties"
@@ -10508,49 +11505,59 @@ msgstr "Osobine priloga"
 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
+msgid "_Description:"
+msgstr "_Opis:"
+
 #: ../e-util/e-attachment-dialog.c:374
 msgid "MIME Type:"
 msgstr "MIME vrsta:"
 
-#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:482
+#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:526
 msgid "_Suggest automatic display of attachment"
 msgstr "_Predloži automatski prikaz priloga"
 
-#: ../e-util/e-attachment-handler-image.c:96
+#: ../e-util/e-attachment-handler-image.c:98
 msgid "Could not set as background"
 msgstr "Ne mogu da postavim kao pozadinu"
 
-#: ../e-util/e-attachment-handler-image.c:146
+#: ../e-util/e-attachment-handler-image.c:148
 msgid "Set as _Background"
 msgstr "Postavi kao _pozadinu"
 
-#: ../e-util/e-attachment-icon-view.c:165
-#: ../e-util/e-attachment-tree-view.c:548
+#: ../e-util/e-attachment-icon-view.c:168
+#: ../e-util/e-attachment-tree-view.c:554
 msgid "Loading"
 msgstr "Učitavam"
 
-#: ../e-util/e-attachment-icon-view.c:177
-#: ../e-util/e-attachment-tree-view.c:560
+#: ../e-util/e-attachment-icon-view.c:180
+#: ../e-util/e-attachment-tree-view.c:566
 msgid "Saving"
 msgstr "Čuvam"
 
-#: ../e-util/e-attachment-paned.c:103
+#: ../e-util/e-attachment-paned.c:107
 msgid "Hide Attachment _Bar"
 msgstr "Sakrij liniju pri_loga"
 
-#: ../e-util/e-attachment-paned.c:105 ../e-util/e-attachment-paned.c:718
+#: ../e-util/e-attachment-paned.c:116 ../e-util/e-attachment-paned.c:751
 msgid "Show Attachment _Bar"
 msgstr "Prikaži liniju p_riloga"
 
-#: ../e-util/e-attachment-store.c:462
+#: ../e-util/e-attachment-store.c:491
 msgid "Add Attachment"
 msgstr "Dodaj prilog"
 
-#: ../e-util/e-attachment-store.c:465
+#: ../e-util/e-attachment-store.c:498 ../e-util/e-attachment-store.c:500
 msgid "A_ttach"
 msgstr "Pri_loži"
 
-#: ../e-util/e-attachment-store.c:536
+#: ../e-util/e-attachment-store.c:538
+msgid "Archive selected directories using this format:"
+msgstr "Ariviraj izabrane direktorijume u ovom formatu:"
+
+#: ../e-util/e-attachment-store.c:631
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Sačuvaj prilog"
@@ -10558,123 +11565,92 @@ msgstr[1] "Sačuvaj priloge"
 msgstr[2] "Sačuvaj priloge"
 msgstr[3] "Sačuvaj prilog"
 
-#. Translators: Default attachment filename.
-#: ../e-util/e-attachment-store.c:567 ../e-util/e-attachment.c:2058
-#: ../e-util/e-attachment.c:2721
-msgid "attachment.dat"
-msgstr "attachment.dat"
+#: ../e-util/e-attachment-store.c:658
+msgid "Do _not extract files from the attachment"
+msgstr "Ne _raspakuj datoteke iz priloga"
 
-#: ../e-util/e-attachment-view.c:377
+#: ../e-util/e-attachment-store.c:663
+msgid "Save extracted files _only"
+msgstr "Sačuvaj _samo izvučene datoteke"
+
+#: ../e-util/e-attachment-store.c:668
+msgid "Save extracted files and the original _archive"
+msgstr "Sačuvaj izvučene datoteke i originalne _arhive"
+
+#: ../e-util/e-attachment-view.c:428
 msgid "Open With Other Application..."
 msgstr "Otvori drugim programom..."
 
-#: ../e-util/e-attachment-view.c:384
+#: ../e-util/e-attachment-view.c:435
 msgid "S_ave All"
 msgstr "Sač_uvaj sve"
 
-#: ../e-util/e-attachment-view.c:391
-#| msgid "Sa_ve"
+#: ../e-util/e-attachment-view.c:442
 msgid "Sa_ve As"
 msgstr "Sačuvaj _kao"
 
-#: ../e-util/e-attachment-view.c:400
+#: ../e-util/e-attachment-view.c:451
 #: ../plugins/save-calendar/save-calendar.c:349
 #: ../plugins/save-calendar/save-calendar.c:380
 #: ../plugins/save-calendar/save-calendar.c:411
-#| msgid "Save _As..."
 msgid "Save _As"
 msgstr "Sačuvaj _kao"
 
-#: ../e-util/e-attachment-view.c:410
+#: ../e-util/e-attachment-view.c:461
 msgid "A_dd Attachment..."
 msgstr "Do_daj prilog..."
 
-#: ../e-util/e-attachment-view.c:417
-#: ../modules/addressbook/e-book-shell-view-actions.c:1026
-#: ../modules/calendar/e-cal-shell-view-actions.c:1399
-#: ../modules/calendar/e-memo-shell-view-actions.c:628
-#: ../modules/calendar/e-task-shell-view-actions.c:752
-#: ../modules/mail/e-mail-shell-view-actions.c:1526
-#: ../modules/mail/e-mail-shell-view-actions.c:1596
+#: ../e-util/e-attachment-view.c:468
+#: ../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
 msgid "_Properties"
 msgstr "_Svojstva"
 
-#: ../e-util/e-attachment-view.c:434
+#: ../e-util/e-attachment-view.c:485 ../e-util/e-source-selector.c:3376
 msgid "_Hide"
 msgstr "_Sakrij"
 
-#: ../e-util/e-attachment-view.c:441
+#: ../e-util/e-attachment-view.c:492
 msgid "Hid_e All"
 msgstr "Sak_rij sve"
 
-#: ../e-util/e-attachment-view.c:448
+#: ../e-util/e-attachment-view.c:499
 msgid "_View Inline"
 msgstr "Pre_gledaj unutar"
 
-#: ../e-util/e-attachment-view.c:455
+#: ../e-util/e-attachment-view.c:506
 msgid "Vie_w All Inline"
 msgstr "Pre_gledaj sve unutar"
 
-#: ../e-util/e-attachment-view.c:785
-#, c-format
-msgid "Open With \"%s\""
-msgstr "Otvori programom „%s“"
-
-#: ../e-util/e-attachment-view.c:788
-#, c-format
-msgid "Open this attachment in %s"
-msgstr "Otvori ovaj prilog u „%s“"
-
-#. To Translators: This text is set as a description of an attached
-#. * 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:1108
-msgid "Attached message"
-msgstr "Priložena poruka"
-
-#: ../e-util/e-attachment.c:2139 ../e-util/e-attachment.c:3027
-msgid "A load operation is already in progress"
-msgstr "Operacija učitavanja je već u toku"
-
-#: ../e-util/e-attachment.c:2147 ../e-util/e-attachment.c:3035
-msgid "A save operation is already in progress"
-msgstr "Operacija čuvanja je već u toku"
-
-#: ../e-util/e-attachment.c:2267
-#, c-format
-msgid "Could not load '%s'"
-msgstr "Ne mogu da učitam „%s“"
-
-#: ../e-util/e-attachment.c:2270
-#, c-format
-msgid "Could not load the attachment"
-msgstr "Ne mogu da učitam prilog"
+#: ../e-util/e-attachment-view.c:513
+msgid "_Zoom to 100%"
+msgstr "Uvećaj na _100%"
 
-#: ../e-util/e-attachment.c:2574
-#, c-format
-msgid "Could not open '%s'"
-msgstr "Ne mogu da otvorim „%s“"
+#: ../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.c:2577
-#, c-format
-msgid "Could not open the attachment"
-msgstr "Ne mogu da otvorim prilog"
+#: ../e-util/e-attachment-view.c:520
+msgid "_Zoom to window"
+msgstr "U_klopi u prozor"
 
-#: ../e-util/e-attachment.c:3044
-msgid "Attachment contents not loaded"
-msgstr "Sadržaj priloga nije učitan"
+#: ../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"
 
-# * found, so just bail completely.
-#: ../e-util/e-attachment.c:3124
+#: ../e-util/e-attachment-view.c:880
 #, c-format
-msgid "Could not save '%s'"
-msgstr "Ne mogu da sačuvam „%s“"
+msgid "Open With \"%s\""
+msgstr "Otvori programom „%s“"
 
-#: ../e-util/e-attachment.c:3127
+#: ../e-util/e-attachment-view.c:883
 #, c-format
-msgid "Could not save the attachment"
-msgstr "Ne mogu da sačuvam prilog"
+msgid "Open this attachment in %s"
+msgstr "Otvori ovaj prilog u „%s“"
 
 #: ../e-util/e-book-source-config.c:97
 msgid "Mark as default address book"
@@ -10689,75 +11665,75 @@ msgid "Copy book content locally for offline operation"
 msgstr "Umnožava sadržaj knjige lokalno za rad van mreže"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
-#: ../e-util/e-buffer-tagger.c:407
+#: ../e-util/e-buffer-tagger.c:412
 msgid "Ctrl-click to open a link"
 msgstr "Pritisnite taster Ktrl i kliknite da otvorite vezu"
 
-#: ../e-util/e-cal-source-config.c:169
-msgid "Mark as default calendar"
-msgstr "Označava kao osnovni kalendar"
-
-#: ../e-util/e-cal-source-config.c:172
-msgid "Mark as default task list"
-msgstr "Označava kao osnovni spisak zadataka"
-
-#: ../e-util/e-cal-source-config.c:175
-msgid "Mark as default memo list"
-msgstr "Označava kao osnovni spisak beleški"
+#: ../e-util/e-calendar.c:207
+msgid "Previous month"
+msgstr "Prethodni mesec"
 
-#: ../e-util/e-cal-source-config.c:200
-msgid "Color:"
-msgstr "Boja:"
+#: ../e-util/e-calendar.c:232
+msgid "Next month"
+msgstr "Sledeći mesec"
 
-#: ../e-util/e-cal-source-config.c:405
-msgid "Copy calendar contents locally for offline operation"
-msgstr "Umnožava sadržaj kalendara lokalno za rad van mreže"
+#: ../e-util/e-calendar.c:258
+msgid "Previous year"
+msgstr "Prethodna godina"
 
-#: ../e-util/e-cal-source-config.c:409
-msgid "Copy task list contents locally for offline operation"
-msgstr "Umnožava sadržaj spiska zadataka lokalno za rad van mreže"
+#: ../e-util/e-calendar.c:283
+msgid "Next year"
+msgstr "Sledeća godina"
 
-#: ../e-util/e-cal-source-config.c:413
-msgid "Copy memo list contents locally for offline operation"
-msgstr "Umnožava sadržaj spiska beleški lokalno za rad van mreže"
+#: ../e-util/e-calendar.c:307
+msgid "Month Calendar"
+msgstr "Mesečni kalendar"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1326 ../e-util/e-calendar-item.c:2194
+#: ../e-util/e-calendar-item.c:1337 ../e-util/e-calendar-item.c:2215
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1328
+#: ../e-util/e-calendar-item.c:1339
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1365
+#: ../e-util/e-calendar-item.c:1376
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y."
 
-#: ../e-util/e-calendar.c:189
-msgid "Previous month"
-msgstr "Prethodni mesec"
+#: ../e-util/e-cal-source-config.c:169
+msgid "Mark as default calendar"
+msgstr "Označava kao osnovni kalendar"
 
-#: ../e-util/e-calendar.c:214
-msgid "Next month"
-msgstr "Sledeći mesec"
+#: ../e-util/e-cal-source-config.c:172
+msgid "Mark as default task list"
+msgstr "Označava kao osnovni spisak zadataka"
 
-#: ../e-util/e-calendar.c:240
-msgid "Previous year"
-msgstr "Prethodna godina"
+#: ../e-util/e-cal-source-config.c:175
+msgid "Mark as default memo list"
+msgstr "Označava kao osnovni spisak beleški"
 
-#: ../e-util/e-calendar.c:265
-msgid "Next year"
-msgstr "Sledeća godina"
+#: ../e-util/e-cal-source-config.c:200
+msgid "Color:"
+msgstr "Boja:"
 
-#: ../e-util/e-calendar.c:289
-msgid "Month Calendar"
-msgstr "Mesečni kalendar"
+#: ../e-util/e-cal-source-config.c:428
+msgid "Copy calendar contents locally for offline operation"
+msgstr "Umnožava sadržaj kalendara lokalno za rad van mreže"
+
+#: ../e-util/e-cal-source-config.c:432
+msgid "Copy task list contents locally for offline operation"
+msgstr "Umnožava sadržaj spiska zadataka lokalno za rad van mreže"
+
+#: ../e-util/e-cal-source-config.c:436
+msgid "Copy memo list contents locally for offline operation"
+msgstr "Umnožava sadržaj spiska beleški lokalno za rad van mreže"
 
 #: ../e-util/e-categories-editor.c:223
 msgid "Currently _used categories:"
@@ -10767,17 +11743,26 @@ msgstr "Trenutno _korišćene kategorije:"
 msgid "_Available Categories:"
 msgstr "_Dostupne kategorije:"
 
-#: ../e-util/e-categories-editor.c:274 ../mail/em-folder-selector.c:269
-#: ../plugins/mail-to-task/mail-to-task.c:595
-#: ../shell/e-shell-window-actions.c:1100
+#: ../e-util/e-categories-editor.c:274
+msgctxt "category"
 msgid "_New"
-msgstr "_Novo"
+msgstr "_Nova"
+
+#: ../e-util/e-categories-editor.c:278
+msgctxt "category"
+msgid "_Edit"
+msgstr "_Uređivanje"
+
+#: ../e-util/e-categories-editor.c:282
+msgctxt "category"
+msgid "_Delete"
+msgstr "_Obriši"
 
-#: ../e-util/e-categories-selector.c:321
+#: ../e-util/e-categories-selector.c:322
 msgid "Icon"
 msgstr "Ikonica"
 
-#: ../e-util/e-category-completion.c:299
+#: ../e-util/e-category-completion.c:307
 #, c-format
 msgid "Create category \"%s\""
 msgstr "Izrada kategorije „%s“"
@@ -10814,14 +11799,19 @@ msgstr ""
 msgid "popup list"
 msgstr "iskačuća lista"
 
-#: ../e-util/e-cell-date-edit.c:298
+#: ../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
+msgid "?"
+msgstr "?"
+
+#: ../e-util/e-cell-date-edit.c:303
 msgid "Now"
 msgstr "Sada"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-cell-date-edit.c:306 ../e-util/e-datetime-format.c:208
-#: ../modules/calendar/e-cal-shell-view-actions.c:1899
-#: ../modules/itip-formatter/itip-view.c:223
+#: ../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
 msgid "Today"
 msgstr "Danas"
 
@@ -10832,40 +11822,24 @@ msgstr "Danas"
 # is not permitted.
 #. Translators: "None" as a label of a button to unset date in a
 #. * date table cell.
-#: ../e-util/e-cell-date-edit.c:316
+#: ../e-util/e-cell-date-edit.c:321
 msgctxt "table-date"
 msgid "None"
 msgstr "Ništa"
 
-#: ../e-util/e-cell-date-edit.c:324 ../mail/e-mail-label-dialog.c:200
+#: ../e-util/e-cell-date-edit.c:329 ../mail/e-mail-label-dialog.c:200
 msgid "OK"
 msgstr "U redu"
 
-#: ../e-util/e-cell-date-edit.c:872
+#: ../e-util/e-cell-date-edit.c:878
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Vreme mora biti u formatu: %s"
 
-#: ../e-util/e-cell-date.c:50 ../mail/message-list.c:1853
-msgid "?"
-msgstr "?"
-
-#: ../e-util/e-cell-percent.c:79
+#: ../e-util/e-cell-percent.c:81
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Vrednost procenta mora biti između 0 i 100"
 
-#: ../e-util/e-charset-combo-box.c:99
-msgid "Character Encoding"
-msgstr "Kodna strana"
-
-#: ../e-util/e-charset-combo-box.c:122
-msgid "Enter the character set to use"
-msgstr "Izaberite kodnu stranu za korišćenje"
-
-#: ../e-util/e-charset-combo-box.c:368
-msgid "Other..."
-msgstr "Drugo..."
-
 #: ../e-util/e-charset.c:52
 msgid "Arabic"
 msgstr "Arapski"
@@ -10943,38 +11917,220 @@ msgstr "Ukrajinski"
 msgid "Visual"
 msgstr "Vizuelni"
 
-#: ../e-util/e-client-cache.c:1189
+#: ../e-util/e-charset-combo-box.c:99
+msgid "Character Encoding"
+msgstr "Kodna strana"
+
+#: ../e-util/e-charset-combo-box.c:119
+msgid "Enter the character set to use"
+msgstr "Izaberite kodnu stranu za korišćenje"
+
+#: ../e-util/e-charset-combo-box.c:365
+msgid "Other..."
+msgstr "Drugo..."
+
+#: ../e-util/e-client-cache.c:1148 ../e-util/e-client-cache.c:1279
 #, c-format
 msgid "Cannot create a client object from extension name '%s'"
 msgstr "Ne mogu da napravim predmet programa iz naziva proširenja „%s“"
 
-#: ../e-util/e-dateedit.c:523
+#: ../e-util/e-color-chooser-widget.c:124
+msgid "Choose custom color"
+msgstr "Izbor proizvoljne boje"
+
+#: ../e-util/e-color-combo.c:81
+msgid "black"
+msgstr "crna"
+
+#: ../e-util/e-color-combo.c:82
+msgid "light brown"
+msgstr "svetlobraon"
+
+#: ../e-util/e-color-combo.c:83
+msgid "brown gold"
+msgstr "zlatno-braon"
+
+#: ../e-util/e-color-combo.c:84
+msgid "dark green #2"
+msgstr "tamnozelena #2"
+
+#: ../e-util/e-color-combo.c:85
+msgid "navy"
+msgstr "mornarska"
+
+#: ../e-util/e-color-combo.c:86
+msgid "dark blue"
+msgstr "tamnoplava"
+
+#: ../e-util/e-color-combo.c:87
+msgid "purple #2"
+msgstr "ljubičasta #2"
+
+#: ../e-util/e-color-combo.c:88
+msgid "very dark gray"
+msgstr "veoma tamnobraon"
+
+#: ../e-util/e-color-combo.c:90
+msgid "dark red"
+msgstr "tamnocrvena"
+
+#: ../e-util/e-color-combo.c:91
+msgid "red-orange"
+msgstr "crveno-narandžasta"
+
+#: ../e-util/e-color-combo.c:92
+msgid "gold"
+msgstr "zlatna"
+
+#: ../e-util/e-color-combo.c:93
+msgid "dark green"
+msgstr "tamnozelena"
+
+#: ../e-util/e-color-combo.c:94
+msgid "dull blue"
+msgstr "bledoplava"
+
+#: ../e-util/e-color-combo.c:95
+msgid "blue"
+msgstr "plava"
+
+#: ../e-util/e-color-combo.c:96
+msgid "dull purple"
+msgstr "bledoljubičasta"
+
+#: ../e-util/e-color-combo.c:97
+msgid "dark grey"
+msgstr "tamnosiva"
+
+#: ../e-util/e-color-combo.c:99
+msgid "red"
+msgstr "crvena"
+
+#: ../e-util/e-color-combo.c:100
+msgid "orange"
+msgstr "narandžasta"
+
+#: ../e-util/e-color-combo.c:101
+msgid "lime"
+msgstr "žuto-zelena"
+
+#: ../e-util/e-color-combo.c:102
+msgid "dull green"
+msgstr "bledo-zelena"
+
+#: ../e-util/e-color-combo.c:103
+msgid "dull blue #2"
+msgstr "bledoplava #2"
+
+#: ../e-util/e-color-combo.c:104
+msgid "sky blue #2"
+msgstr "neboplava #2"
+
+#: ../e-util/e-color-combo.c:105
+msgid "purple"
+msgstr "ljubičasta"
+
+#: ../e-util/e-color-combo.c:106
+msgid "gray"
+msgstr "siva"
+
+#: ../e-util/e-color-combo.c:108
+msgid "magenta"
+msgstr "magneta"
+
+#: ../e-util/e-color-combo.c:109
+msgid "bright orange"
+msgstr "svetlonarandžasta"
+
+#: ../e-util/e-color-combo.c:110
+msgid "yellow"
+msgstr "žuta"
+
+#: ../e-util/e-color-combo.c:111
+msgid "green"
+msgstr "zelena"
+
+#: ../e-util/e-color-combo.c:112
+msgid "cyan"
+msgstr "cijan"
+
+#: ../e-util/e-color-combo.c:113
+msgid "bright blue"
+msgstr "svetloplava"
+
+#: ../e-util/e-color-combo.c:114
+msgid "red purple"
+msgstr "crveno-ljubičasta"
+
+#: ../e-util/e-color-combo.c:115
+msgid "light grey"
+msgstr "svetlosiva"
+
+#: ../e-util/e-color-combo.c:117
+msgid "pink"
+msgstr "roze"
+
+#: ../e-util/e-color-combo.c:118
+msgid "light orange"
+msgstr "svetlonarandžasta"
+
+#: ../e-util/e-color-combo.c:119
+msgid "light yellow"
+msgstr "svetložuta"
+
+#: ../e-util/e-color-combo.c:120
+msgid "light green"
+msgstr "svetlozelena"
+
+#: ../e-util/e-color-combo.c:121
+msgid "light cyan"
+msgstr "svetlocijan"
+
+#: ../e-util/e-color-combo.c:122
+msgid "light blue"
+msgstr "svetloplava"
+
+#: ../e-util/e-color-combo.c:123
+msgid "light purple"
+msgstr "svetloljubičasta"
+
+#: ../e-util/e-color-combo.c:124
+msgid "white"
+msgstr "bela"
+
+#: ../e-util/e-color-combo.c:639 ../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/mail-config.ui.h:73
+msgid "Default"
+msgstr "Osnovno"
+
+#: ../e-util/e-dateedit.c:526
 msgid "Date and Time"
 msgstr "Datum i vreme"
 
-#: ../e-util/e-dateedit.c:548
+#: ../e-util/e-dateedit.c:551
 msgid "Text entry to input date"
 msgstr "Deo teksta za unos datuma"
 
-#: ../e-util/e-dateedit.c:571
+#: ../e-util/e-dateedit.c:574
 msgid "Click this button to show a calendar"
 msgstr "Pritisnite na ovo dugme da prikažete kalendar"
 
-#: ../e-util/e-dateedit.c:625
+#: ../e-util/e-dateedit.c:628
 msgid "Drop-down combination box to select time"
 msgstr "Prozorče za izbor vremena"
 
 # note(slobo): možda treba rok
-#: ../e-util/e-dateedit.c:626
-#: ../modules/calendar/e-calendar-preferences.ui.h:9
+#: ../e-util/e-dateedit.c:629 ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "Vreme"
 
-#: ../e-util/e-dateedit.c:700
+#: ../e-util/e-dateedit.c:703
 msgid "No_w"
 msgstr "_Sada"
 
-#: ../e-util/e-dateedit.c:707
+#: ../e-util/e-dateedit.c:710
 msgid "_Today"
 msgstr "_Danas"
 
@@ -10985,7 +12141,7 @@ msgstr "_Danas"
 # is not permitted.
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../e-util/e-dateedit.c:716
+#: ../e-util/e-dateedit.c:719
 msgid "_None"
 msgstr "_Ništa"
 
@@ -10996,21 +12152,21 @@ msgstr "_Ništa"
 # is not permitted.
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../e-util/e-dateedit.c:1838 ../e-util/e-dateedit.c:2086
+#: ../e-util/e-dateedit.c:1841 ../e-util/e-dateedit.c:2089
 msgctxt "date"
 msgid "None"
 msgstr "Ništa"
 
-#: ../e-util/e-dateedit.c:1978
+#: ../e-util/e-dateedit.c:1981
 msgid "Invalid Date Value"
 msgstr "Neispravan datum"
 
-#: ../e-util/e-dateedit.c:2023
+#: ../e-util/e-dateedit.c:2026
 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:251
+#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:249
 msgid "Tomorrow"
 msgstr "Sutra"
 
@@ -11074,15 +12230,120 @@ msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Sledeće %a"
 
-#: ../e-util/e-datetime-format.c:352 ../e-util/e-datetime-format.c:362
-#: ../e-util/e-datetime-format.c:371
+#: ../e-util/e-datetime-format.c:351 ../e-util/e-datetime-format.c:361
+#: ../e-util/e-datetime-format.c:370
 msgid "Use locale default"
 msgstr "Koristi podrazumevani lokalitet"
 
-#: ../e-util/e-datetime-format.c:576
+#: ../e-util/e-datetime-format.c:575
 msgid "Format:"
 msgstr "Oblik:"
 
+#. Translators: :-)
+#: ../e-util/e-emoticon-chooser.c:40
+msgid "_Smile"
+msgstr "_Smajli"
+
+#. Translators: :-(
+#: ../e-util/e-emoticon-chooser.c:42
+msgid "S_ad"
+msgstr "_Tužan"
+
+#. Translators: ;-)
+#: ../e-util/e-emoticon-chooser.c:44
+msgid "_Wink"
+msgstr "_Namig"
+
+#. Translators: :-P
+#: ../e-util/e-emoticon-chooser.c:46
+msgid "Ton_gue"
+msgstr "_Jezik"
+
+#. Translators: :-))
+#: ../e-util/e-emoticon-chooser.c:48
+msgid "Laug_h"
+msgstr "_Osmeh"
+
+#. Translators: :-|
+#: ../e-util/e-emoticon-chooser.c:50
+msgid "_Plain"
+msgstr "_Ravni"
+
+#. Translators: :-!
+#: ../e-util/e-emoticon-chooser.c:52
+msgid "Smi_rk"
+msgstr "_Zlobni"
+
+#. Translators: :"-)
+#: ../e-util/e-emoticon-chooser.c:54
+msgid "_Embarrassed"
+msgstr "_Postiđeni"
+
+#. Translators: :-D
+#: ../e-util/e-emoticon-chooser.c:56
+msgid "_Big Smile"
+msgstr "_Veliki osmeh"
+
+#. Translators: :-/
+#: ../e-util/e-emoticon-chooser.c:58
+msgid "Uncer_tain"
+msgstr "Nes_igurni"
+
+#. Translators: :-O
+#: ../e-util/e-emoticon-chooser.c:60
+msgid "S_urprise"
+msgstr "Za_čuđeni"
+
+#. Translators: :-S
+#: ../e-util/e-emoticon-chooser.c:62
+msgid "W_orried"
+msgstr "Za_rinuti"
+
+#. Translators: :-*
+#: ../e-util/e-emoticon-chooser.c:64
+msgid "_Kiss"
+msgstr "Polj_ubac"
+
+#. Translators: X-(
+#: ../e-util/e-emoticon-chooser.c:66
+msgid "A_ngry"
+msgstr "_Ljuti"
+
+#. Translators: B-)
+#: ../e-util/e-emoticon-chooser.c:68
+msgid "_Cool"
+msgstr "_Kul"
+
+#. Translators: O:-)
+#: ../e-util/e-emoticon-chooser.c:70
+msgid "Ange_l"
+msgstr "_Anđeo"
+
+#. Translators: :'(
+#: ../e-util/e-emoticon-chooser.c:72
+msgid "Cr_ying"
+msgstr "Up_lakani"
+
+#. Translators: :-Q
+#: ../e-util/e-emoticon-chooser.c:74
+msgid "S_ick"
+msgstr "Bol_esni"
+
+#. Translators: |-)
+#: ../e-util/e-emoticon-chooser.c:76
+msgid "Tire_d"
+msgstr "U_moran"
+
+#. Translators: >:-)
+#: ../e-util/e-emoticon-chooser.c:78
+msgid "De_vilish"
+msgstr "_Đavolak"
+
+#. Translators: :-(|)
+#: ../e-util/e-emoticon-chooser.c:80
+msgid "_Monkey"
+msgstr "_Majmun"
+
 #: ../e-util/e-file-utils.c:120
 msgid "(Unknown Filename)"
 msgstr "(Nepoznato ime datoteke)"
@@ -11250,23 +12511,23 @@ msgstr "Izaberite vreme za poređenje"
 msgid "Choose a File"
 msgstr "Izaberite datoteku"
 
-#: ../e-util/e-filter-rule.c:750
+#: ../e-util/e-filter-rule.c:761
 msgid "R_ule name:"
 msgstr "Naziv _pravila:"
 
-#: ../e-util/e-filter-rule.c:800
+#: ../e-util/e-filter-rule.c:811
 msgid "all the following conditions"
 msgstr "svim sledećim uslovima"
 
-#: ../e-util/e-filter-rule.c:801
+#: ../e-util/e-filter-rule.c:812
 msgid "any of the following conditions"
 msgstr "bilo kom od sledećih uslova"
 
-#: ../e-util/e-filter-rule.c:807
+#: ../e-util/e-filter-rule.c:818
 msgid "_Find items which match:"
 msgstr "_Pronađi stavke koje odgovaraju:"
 
-#: ../e-util/e-filter-rule.c:830
+#: ../e-util/e-filter-rule.c:841
 msgid "Find items that meet the following conditions"
 msgstr "Pronađite stavke koje zadovoljavaju sledeće uslove"
 
@@ -11279,38 +12540,1034 @@ msgstr "Pronađite stavke koje zadovoljavaju sledeće uslove"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../e-util/e-filter-rule.c:845 ../e-util/e-mail-identity-combo-box.c:473
-#: ../e-util/e-mail-signature-combo-box.c:368 ../e-util/e-proxy-editor.c:549
+#: ../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-mail-signature-combo-box.c:367
 #: ../libemail-engine/camel-null-store.c:27
-#: ../mail/e-mail-config-summary-page.c:138
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
+#: ../mail/e-mail-config-summary-page.c:139
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:628
 msgid "None"
 msgstr "Ništa"
 
-#: ../e-util/e-filter-rule.c:846
+#: ../e-util/e-filter-rule.c:857
 msgid "All related"
 msgstr "Sve povezano"
 
-#: ../e-util/e-filter-rule.c:848
+#: ../e-util/e-filter-rule.c:858 ../e-util/e-send-options.ui.h:19
+msgid "Replies"
+msgstr "Odgovori"
+
+#: ../e-util/e-filter-rule.c:859
 msgid "Replies and parents"
 msgstr "Odgovori i nadređeno"
 
-#: ../e-util/e-filter-rule.c:849
+#: ../e-util/e-filter-rule.c:860
 msgid "No reply or parent"
 msgstr "Nema odgovora ili roditelja"
 
-#: ../e-util/e-filter-rule.c:852
+#: ../e-util/e-filter-rule.c:863
 msgid "I_nclude threads:"
 msgstr "Uključi _niti:"
 
-#: ../e-util/e-filter-rule.c:929
+#: ../e-util/e-filter-rule.c:942
 msgid "A_dd Condition"
 msgstr "Dodaj _uslov"
 
-#: ../e-util/e-filter-rule.c:1243 ../mail/em-utils.c:230
+#: ../e-util/e-filter-rule.c:1256 ../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
 msgid "Outgoing"
 msgstr "Odlazno"
 
+#: ../e-util/e-html-editor-actions.c:58
+msgid "Failed to insert HTML file."
+msgstr "Ne mogu da umetnem HTML datoteku."
+
+#: ../e-util/e-html-editor-actions.c:95
+msgid "Failed to insert text file."
+msgstr "Ne mogu da umetnem tekstualnu datoteku."
+
+#: ../e-util/e-html-editor-actions.c:591
+msgid "Insert HTML File"
+msgstr "Umetni HTML datoteku"
+
+#: ../e-util/e-html-editor-actions.c:597
+msgid "HTML file"
+msgstr "HTML datoteka"
+
+#: ../e-util/e-html-editor-actions.c:624
+msgctxt "dialog-title"
+msgid "Insert Image"
+msgstr "Umetni sliku"
+
+#: ../e-util/e-html-editor-actions.c:686
+msgid "Insert text file"
+msgstr "Umetni tekstualnu datoteku"
+
+#: ../e-util/e-html-editor-actions.c:692
+msgid "Text file"
+msgstr "Tekstualna datoteka"
+
+#: ../e-util/e-html-editor-actions.c:1078
+msgid "Copy selected text to the clipboard"
+msgstr "Umnožava izabrani tekst u spisak isečaka"
+
+#: ../e-util/e-html-editor-actions.c:1085
+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
+msgid "Paste text from the clipboard"
+msgstr "Ubacuje tekst iz spiska isečaka"
+
+#: ../e-util/e-html-editor-actions.c:1099
+msgid "Redo the last undone action"
+msgstr "Ponavlja poslednju opozvanu radnju"
+
+#: ../e-util/e-html-editor-actions.c:1113
+msgid "Undo the last action"
+msgstr "Vraća poslednju radnju"
+
+#: ../e-util/e-html-editor-actions.c:1134
+msgid "For_mat"
+msgstr "_Format"
+
+#: ../e-util/e-html-editor-actions.c:1141
+msgid "_Paragraph Style"
+msgstr "Stil _pasusa"
+
+#: ../e-util/e-html-editor-actions.c:1155
+#: ../e-util/e-html-editor-image-dialog.c:635
+msgid "_Alignment"
+msgstr "Po_ravnanje"
+
+#: ../e-util/e-html-editor-actions.c:1162
+msgid "Current _Languages"
+msgstr "Trenutni _jezici"
+
+#: ../e-util/e-html-editor-actions.c:1179
+msgid "_Increase Indent"
+msgstr "_Veće uvlačenje"
+
+#: ../e-util/e-html-editor-actions.c:1181
+msgid "Increase Indent"
+msgstr "Veće uvlačenje"
+
+#: ../e-util/e-html-editor-actions.c:1186
+msgid "_HTML File..."
+msgstr "_HTML datoteka..."
+
+#: ../e-util/e-html-editor-actions.c:1193
+msgid "Te_xt File..."
+msgstr "_Tekstualna datoteka"
+
+#: ../e-util/e-html-editor-actions.c:1200
+msgid "Paste _Quotation"
+msgstr "Umetni _citat"
+
+#: ../e-util/e-html-editor-actions.c:1207
+msgid "_Find..."
+msgstr "_Nađi..."
+
+#: ../e-util/e-html-editor-actions.c:1209
+msgid "Search for text"
+msgstr "Tekst za pretragu"
+
+#: ../e-util/e-html-editor-actions.c:1214
+msgid "Find A_gain"
+msgstr "N_ađi naredno"
+
+#: ../e-util/e-html-editor-actions.c:1221
+msgid "Re_place..."
+msgstr "_Zameni..."
+
+#: ../e-util/e-html-editor-actions.c:1223
+msgid "Search for and replace text"
+msgstr "Traži željeni tekst i menja ga drugim"
+
+#: ../e-util/e-html-editor-actions.c:1228
+msgid "Check _Spelling..."
+msgstr "_Proveri pisanje..."
+
+#: ../e-util/e-html-editor-actions.c:1235
+msgid "_Decrease Indent"
+msgstr "_Manje uvlačenje"
+
+#: ../e-util/e-html-editor-actions.c:1237
+msgid "Decrease Indent"
+msgstr "Manje uvlačenje"
+
+#: ../e-util/e-html-editor-actions.c:1242
+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-paragraph-dialog.c:110
+msgid "_Center"
+msgstr "_Sredina"
+
+#: ../e-util/e-html-editor-actions.c:1261
+msgid "Center Alignment"
+msgstr "Središnje poravnanje"
+
+#. Left
+#: ../e-util/e-html-editor-actions.c:1266
+#: ../e-util/e-html-editor-paragraph-dialog.c:101
+msgid "_Left"
+msgstr "_Levo"
+
+#: ../e-util/e-html-editor-actions.c:1268
+msgid "Left Alignment"
+msgstr "Poravnanje po levoj strani"
+
+#. Right
+#: ../e-util/e-html-editor-actions.c:1273
+#: ../e-util/e-html-editor-paragraph-dialog.c:119
+msgid "_Right"
+msgstr "_Desno"
+
+#: ../e-util/e-html-editor-actions.c:1275
+msgid "Right Alignment"
+msgstr "Poravnanje po desnoj strani"
+
+#: ../e-util/e-html-editor-actions.c:1283
+#: ../modules/text-highlight/languages.c:72
+msgid "_HTML"
+msgstr "_HTML"
+
+#: ../e-util/e-html-editor-actions.c:1285
+msgid "HTML editing mode"
+msgstr "Režim za uređivanje HTML poruke"
+
+#: ../e-util/e-html-editor-actions.c:1290
+msgid "Plain _Text"
+msgstr "Običan _tekst"
+
+#: ../e-util/e-html-editor-actions.c:1292
+msgid "Plain text editing mode"
+msgstr "Režim uređivanja za običan tekst"
+
+#: ../e-util/e-html-editor-actions.c:1300
+msgid "_Normal"
+msgstr "_Obično"
+
+#: ../e-util/e-html-editor-actions.c:1307
+msgid "Header _1"
+msgstr "Naslov _1"
+
+#: ../e-util/e-html-editor-actions.c:1314
+msgid "Header _2"
+msgstr "Naslov _2"
+
+#: ../e-util/e-html-editor-actions.c:1321
+msgid "Header _3"
+msgstr "Naslov _3"
+
+#: ../e-util/e-html-editor-actions.c:1328
+msgid "Header _4"
+msgstr "Naslov _4"
+
+#: ../e-util/e-html-editor-actions.c:1335
+msgid "Header _5"
+msgstr "Naslov _5"
+
+#: ../e-util/e-html-editor-actions.c:1342
+msgid "Header _6"
+msgstr "Naslov _6"
+
+#: ../e-util/e-html-editor-actions.c:1349
+msgid "_Preformatted"
+msgstr "Pr_edodređeno"
+
+#: ../e-util/e-html-editor-actions.c:1356
+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
+msgid "_Bulleted List"
+msgstr "Nabrajanje _simbolima"
+
+#: ../e-util/e-html-editor-actions.c:1377
+msgid "_Roman Numeral List"
+msgstr "Nabrajanje _rimskim brojevima"
+
+#: ../e-util/e-html-editor-actions.c:1384
+msgid "Numbered _List"
+msgstr "Nabrajanje _brojevima"
+
+#: ../e-util/e-html-editor-actions.c:1391
+msgid "_Alphabetical List"
+msgstr "Narajanje s_lovima"
+
+#: ../e-util/e-html-editor-actions.c:1407
+#: ../e-util/e-html-editor-actions.c:1445
+msgid "_Image..."
+msgstr "_Slika..."
+
+#. Translators: This is an action tooltip
+#: ../e-util/e-html-editor-actions.c:1410
+msgid "Insert Image"
+msgstr "Umeće sliku"
+
+#: ../e-util/e-html-editor-actions.c:1415
+#: ../e-util/e-html-editor-actions.c:1452
+msgid "_Link..."
+msgstr "_Veza..."
+
+#: ../e-util/e-html-editor-actions.c:1417
+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
+msgid "_Rule..."
+msgstr "Pravi_lo..."
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1426
+msgid "Insert Rule"
+msgstr "Umeće pravilo"
+
+#: ../e-util/e-html-editor-actions.c:1431
+#: ../e-util/e-html-editor-actions.c:1474
+msgid "_Table..."
+msgstr "_Tabela..."
+
+#: ../e-util/e-html-editor-actions.c:1433
+msgid "Insert Table"
+msgstr "Umeće tabelu"
+
+#: ../e-util/e-html-editor-actions.c:1438
+msgid "_Cell..."
+msgstr "_Ćelija"
+
+#: ../e-util/e-html-editor-actions.c:1459
+msgid "Pa_ge..."
+msgstr "St_ranica..."
+
+#: ../e-util/e-html-editor-actions.c:1483
+msgid "Font _Size"
+msgstr "Veličina _fonta"
+
+#: ../e-util/e-html-editor-actions.c:1490
+msgid "_Font Style"
+msgstr "Vrsta fo_nta"
+
+#: ../e-util/e-html-editor-actions.c:1497
+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
+msgid "_Bold"
+msgstr "_Podebljano"
+
+#: ../e-util/e-html-editor-actions.c:1510
+msgid "Bold"
+msgstr "Podebljano"
+
+#: ../e-util/e-html-editor-actions.c:1516
+#: ../e-util/e-html-editor-text-dialog.c:225
+msgid "_Italic"
+msgstr "_Iskošeno"
+
+#: ../e-util/e-html-editor-actions.c:1518
+msgid "Italic"
+msgstr "Iskošeno"
+
+#: ../e-util/e-html-editor-actions.c:1524
+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
+msgid "_Strikethrough"
+msgstr "Pre_crtano"
+
+#: ../e-util/e-html-editor-actions.c:1534
+msgid "Strikethrough"
+msgstr "Precrtano"
+
+#: ../e-util/e-html-editor-actions.c:1540
+#: ../e-util/e-html-editor-text-dialog.c:236
+msgid "_Underline"
+msgstr "Podv_učeno"
+
+#: ../e-util/e-html-editor-actions.c:1542
+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
+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
+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
+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
+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
+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
+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
+msgid "+4"
+msgstr "+4"
+
+#: ../e-util/e-html-editor-actions.c:1619
+msgid "Cell Contents"
+msgstr "Sadržaj ćelije"
+
+#: ../e-util/e-html-editor-actions.c:1626
+msgid "Column"
+msgstr "Kolona"
+
+#: ../e-util/e-html-editor-actions.c:1633
+msgid "Row"
+msgstr "Red"
+
+#: ../e-util/e-html-editor-actions.c:1640
+#: ../e-util/e-html-editor-actions.c:1725
+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
+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
+msgid "Table Insert"
+msgstr "Umetanje tabele"
+
+#: ../e-util/e-html-editor-actions.c:1672
+msgid "Properties"
+msgstr "Osobine"
+
+#: ../e-util/e-html-editor-actions.c:1690
+msgid "Column After"
+msgstr "Kolona nakon"
+
+#: ../e-util/e-html-editor-actions.c:1697
+msgid "Column Before"
+msgstr "Kolona pre"
+
+#: ../e-util/e-html-editor-actions.c:1704
+msgid "Insert _Link"
+msgstr "Umetni _vezu"
+
+#: ../e-util/e-html-editor-actions.c:1711
+msgid "Row Above"
+msgstr "Red iznad"
+
+#: ../e-util/e-html-editor-actions.c:1718
+msgid "Row Below"
+msgstr "Red ispod"
+
+#: ../e-util/e-html-editor-actions.c:1732
+msgid "Cell..."
+msgstr "Ćelija..."
+
+#: ../e-util/e-html-editor-actions.c:1739
+msgid "Image..."
+msgstr "Slika..."
+
+#: ../e-util/e-html-editor-actions.c:1746
+msgid "Link..."
+msgstr "Veza..."
+
+#: ../e-util/e-html-editor-actions.c:1753
+msgid "Page..."
+msgstr "Stranica..."
+
+#: ../e-util/e-html-editor-actions.c:1760
+msgid "Paragraph..."
+msgstr "Pasus..."
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1768
+msgid "Rule..."
+msgstr "Pravilo..."
+
+#: ../e-util/e-html-editor-actions.c:1775
+msgid "Table..."
+msgstr "Tabele..."
+
+#: ../e-util/e-html-editor-actions.c:1782
+msgid "Text..."
+msgstr "Tekst..."
+
+#: ../e-util/e-html-editor-actions.c:1789
+msgid "Remove Link"
+msgstr "Ukloni vezu"
+
+#: ../e-util/e-html-editor-actions.c:1806
+msgid "Add Word to Dictionary"
+msgstr "Dodaj reč u rečnik"
+
+#: ../e-util/e-html-editor-actions.c:1813
+msgid "Ignore Misspelled Word"
+msgstr "Zanemari pogrešno napisane reči"
+
+#: ../e-util/e-html-editor-actions.c:1820
+msgid "Add Word To"
+msgstr "Dodaj reč u"
+
+#: ../e-util/e-html-editor-actions.c:1829
+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
+#, c-format
+msgid "%s Dictionary"
+msgstr "%s rečnik"
+
+#: ../e-util/e-html-editor-actions.c:2040
+msgid "_Emoticon"
+msgstr "_Smajlić"
+
+# shell:noshell-reason title
+#: ../e-util/e-html-editor-actions.c:2041
+msgid "Insert Emoticon"
+msgstr "Umetni smajlić"
+
+#: ../e-util/e-html-editor-actions.c:2109
+msgid "Re_place"
+msgstr "_Zameni"
+
+#: ../e-util/e-html-editor-actions.c:2112
+msgid "_Image"
+msgstr "_Slika"
+
+#: ../e-util/e-html-editor-actions.c:2115
+msgid "_Link"
+msgstr "_Veza"
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:2119
+msgid "_Rule"
+msgstr "_Pravilo"
+
+#: ../e-util/e-html-editor-actions.c:2122
+#: ../e-util/e-html-editor-cell-dialog.c:738
+msgid "_Table"
+msgstr "_Tabela"
+
+#: ../e-util/e-html-editor.c:704
+msgid "Paragraph Style"
+msgstr "Stil pasusa"
+
+#: ../e-util/e-html-editor.c:718
+msgid "Editing Mode"
+msgstr "Režim za uređivanje"
+
+#: ../e-util/e-html-editor.c:730
+msgid "Font Color"
+msgstr "Boja fonta"
+
+#: ../e-util/e-html-editor.c:748
+msgid "Font Size"
+msgstr "Veličina fonta"
+
+#: ../e-util/e-html-editor-cell-dialog.c:698
+msgid "<b>Scope</b>"
+msgstr "<b>Opseg</b>"
+
+#: ../e-util/e-html-editor-cell-dialog.c:712
+msgid "C_ell"
+msgstr "_Ćelija"
+
+#: ../e-util/e-html-editor-cell-dialog.c:725
+msgid "_Row"
+msgstr "_Red"
+
+#: ../e-util/e-html-editor-cell-dialog.c:751
+msgid "Col_umn"
+msgstr "_Kolona"
+
+#: ../e-util/e-html-editor-cell-dialog.c:761
+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
+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
+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
+msgid "Right"
+msgstr "Desno"
+
+# Beleške:
+# Dodaj belešku
+#: ../e-util/e-html-editor-cell-dialog.c:784
+msgid "_Horizontal:"
+msgstr "_Vodoravno:"
+
+#: ../e-util/e-html-editor-cell-dialog.c:792
+#: ../e-util/e-html-editor-image-dialog.c:625
+msgid "Top"
+msgstr "Vrh"
+
+#: ../e-util/e-html-editor-cell-dialog.c:793
+#: ../e-util/e-html-editor-image-dialog.c:626
+msgid "Middle"
+msgstr "Sredina"
+
+#: ../e-util/e-html-editor-cell-dialog.c:794
+#: ../e-util/e-html-editor-image-dialog.c:627
+msgid "Bottom"
+msgstr "Dno"
+
+#: ../e-util/e-html-editor-cell-dialog.c:802
+msgid "_Vertical:"
+msgstr "_Uspravno:"
+
+#. Wrap Text
+#: ../e-util/e-html-editor-cell-dialog.c:808
+msgid "_Wrap Text"
+msgstr "_Prelamaj tekst"
+
+#. Header Style
+#: ../e-util/e-html-editor-cell-dialog.c:816
+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
+msgid "<b>Layout</b>"
+msgstr "<b>Raspored</b>"
+
+#. Width
+#: ../e-util/e-html-editor-cell-dialog.c:841
+msgid "_Width"
+msgstr "_Širina"
+
+#: ../e-util/e-html-editor-cell-dialog.c:880
+msgid "Row S_pan:"
+msgstr "_Raspon reda:"
+
+#: ../e-util/e-html-editor-cell-dialog.c:894
+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
+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
+msgid "Transparent"
+msgstr "Providna"
+
+#: ../e-util/e-html-editor-cell-dialog.c:922
+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
+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
+msgid "Images"
+msgstr "Slike"
+
+#: ../e-util/e-html-editor-cell-dialog.c:948
+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
+msgid "_Remove image"
+msgstr "U_kloni sliku"
+
+#: ../e-util/e-html-editor-cell-dialog.c:975
+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
+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
+msgid "Search _backwards"
+msgstr "Traži u_nazad"
+
+#: ../e-util/e-html-editor-find-dialog.c:167
+msgid "Case _Sensitive"
+msgstr "_Razlikuj velika slova"
+
+#: ../e-util/e-html-editor-find-dialog.c:174
+msgid "_Wrap Search"
+msgstr "Pre_lamaj"
+
+#: ../e-util/e-html-editor-find-dialog.c:213
+msgid "Find"
+msgstr "Nađi"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:348
+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
+msgid "_Width:"
+msgstr "_Širina:"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:393
+msgid "_Size:"
+msgstr "_Veličina:"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:400
+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
+msgid "_Alignment:"
+msgstr "Po_ravnanje:"
+
+#. Shaded
+#: ../e-util/e-html-editor-hrule-dialog.c:431
+msgid "S_haded"
+msgstr "Osen_čeno"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:448
+msgid "Rule properties"
+msgstr "Osobine pravila"
+
+#: ../e-util/e-html-editor-image-dialog.c:515
+#: ../e-util/e-html-editor-paragraph-dialog.c:66
+#: ../e-util/e-html-editor-table-dialog.c:766
+msgid "<b>General</b>"
+msgstr "<b>Opšte</b>"
+
+#: ../e-util/e-html-editor-image-dialog.c:544
+msgid "_Source:"
+msgstr "I_zvor:"
+
+#: ../e-util/e-html-editor-image-dialog.c:607
+msgid "_Height:"
+msgstr "_Visina:"
+
+#: ../e-util/e-html-editor-image-dialog.c:648
+msgid "_X-Padding:"
+msgstr "X-_popuna:"
+
+#: ../e-util/e-html-editor-image-dialog.c:664
+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
+msgid "_Border:"
+msgstr "_Ivica"
+
+#: ../e-util/e-html-editor-image-dialog.c:690
+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
+msgid "_URL:"
+msgstr "_URL:"
+
+#: ../e-util/e-html-editor-image-dialog.c:713
+#: ../e-util/e-html-editor-link-dialog.c:405
+msgid "_Test URL..."
+msgstr "_Test URL:"
+
+#: ../e-util/e-html-editor-image-dialog.c:730
+msgid "Image Properties"
+msgstr "Osobine slike"
+
+#: ../e-util/e-html-editor-link-dialog.c:429
+msgid "_Remove Link"
+msgstr "_Ukloni vezu"
+
+#: ../e-util/e-html-editor-link-dialog.c:454
+msgid "Link Properties"
+msgstr "Osobine veze"
+
+#: ../e-util/e-html-editor-page-dialog.c:72
+msgid "Perforated Paper"
+msgstr "Perforiran papir"
+
+#: ../e-util/e-html-editor-page-dialog.c:81
+msgid "Blue Ink"
+msgstr "Plavo mastilo"
+
+#: ../e-util/e-html-editor-page-dialog.c:90
+msgid "Paper"
+msgstr "Papir"
+
+#: ../e-util/e-html-editor-page-dialog.c:99
+msgid "Ribbon"
+msgstr "Traka"
+
+#: ../e-util/e-html-editor-page-dialog.c:108
+msgid "Midnight"
+msgstr "Ponoć"
+
+#: ../e-util/e-html-editor-page-dialog.c:126 ../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
+msgid "Graph Paper"
+msgstr "Milimetarski papir"
+
+#: ../e-util/e-html-editor-page-dialog.c:544
+msgid "<b>Colors</b>"
+msgstr "<b>Boje</b>"
+
+#: ../e-util/e-html-editor-page-dialog.c:563
+msgid "_Text:"
+msgstr "_Tekst:"
+
+#: ../e-util/e-html-editor-page-dialog.c:578
+msgid "_Link:"
+msgstr "_Veza:"
+
+#: ../e-util/e-html-editor-page-dialog.c:593
+msgid "_Visited Link:"
+msgstr "_Posećena veza:"
+
+#: ../e-util/e-html-editor-page-dialog.c:608
+msgid "_Background:"
+msgstr "Po_zadina:"
+
+#: ../e-util/e-html-editor-page-dialog.c:616
+msgid "<b>Background Image</b>"
+msgstr "<b>Pozadinska slika</b>"
+
+#: ../e-util/e-html-editor-page-dialog.c:638
+#: ../modules/calendar/e-calendar-preferences.ui.h:78
+msgid "_Template:"
+msgstr "_Šablon:"
+
+#: ../e-util/e-html-editor-page-dialog.c:646 ../e-util/e-import-assistant.c:283
+msgid "Select a file"
+msgstr "Izaberite datoteku"
+
+#: ../e-util/e-html-editor-page-dialog.c:653
+msgid "_Custom:"
+msgstr "_Proizvoljno:"
+
+#: ../e-util/e-html-editor-page-dialog.c:680
+msgid "Page Properties"
+msgstr "Osobine stranice"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:83
+msgid "_Style:"
+msgstr "_Stil:"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:90
+msgid "<b>Alignment</b>"
+msgstr "<b>Poravnanje</b>"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:155
+msgid "Paragraph Properties"
+msgstr "Osobine pasusa"
+
+#: ../e-util/e-html-editor-replace-dialog.c:163
+#, c-format
+msgid "%d occurrence replaced"
+msgid_plural "%d occurrences replaced"
+msgstr[0] "%d pojava je zamenjena"
+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
+msgid "R_eplace:"
+msgstr "_Zameni:"
+
+#: ../e-util/e-html-editor-replace-dialog.c:239
+msgid "_With:"
+msgstr "_Širina:"
+
+#: ../e-util/e-html-editor-replace-dialog.c:251
+msgid "_Case sensitive"
+msgstr "_Razlikuj velika i mala slova"
+
+#: ../e-util/e-html-editor-replace-dialog.c:255
+msgid "Wra_p search"
+msgstr "Pre_lamaj"
+
+#: ../e-util/e-html-editor-replace-dialog.c:265
+msgid "_Skip"
+msgstr "Pres_koči"
+
+#: ../e-util/e-html-editor-replace-dialog.c:273
+#: ../e-util/e-system.error.xml.h:3
+msgid "_Replace"
+msgstr "_Zameni"
+
+#: ../e-util/e-html-editor-replace-dialog.c:281
+msgid "Replace _All"
+msgstr "Zameni _sve"
+
+#: ../e-util/e-html-editor-replace-dialog.c:301
+msgctxt "dialog-title"
+msgid "Replace"
+msgstr "Zameni"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:88
+#, c-format
+msgid "<b>Suggestions for '%s'</b>"
+msgstr "<b>Predlog za „%s“</b>"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:520
+msgid "<b>Suggestions</b>"
+msgstr "<b>Predlozi</b>"
+
+#. Replace
+#: ../e-util/e-html-editor-spell-check-dialog.c:555
+msgid "Replace"
+msgstr "Zameni"
+
+#. Replace All
+#: ../e-util/e-html-editor-spell-check-dialog.c:564
+msgid "Replace All"
+msgstr "Zameni sve"
+
+#. Ignore
+#: ../e-util/e-html-editor-spell-check-dialog.c:573
+#: ../mail/mail.error.xml.h:110
+msgid "Ignore"
+msgstr "Zanemari"
+
+#. Skip
+#: ../e-util/e-html-editor-spell-check-dialog.c:582
+msgid "Skip"
+msgstr "Preskoči"
+
+#. Back
+#: ../e-util/e-html-editor-spell-check-dialog.c:591
+msgid "Back"
+msgstr "Nazad"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:600
+msgid "<b>Dictionary</b>"
+msgstr "<b>Rečnik</b>"
+
+#. Add Word button
+#: ../e-util/e-html-editor-spell-check-dialog.c:620
+msgid "Add word"
+msgstr "Dodaj reč"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:637 ../mail/mail-config.ui.h:39
+msgid "Spell Checking"
+msgstr "Provera pravopisa"
+
+#: ../e-util/e-html-editor-table-dialog.c:788
+msgid "_Rows:"
+msgstr "_Redovi:"
+
+#: ../e-util/e-html-editor-table-dialog.c:805
+msgid "C_olumns:"
+msgstr "_Kolone:"
+
+#: ../e-util/e-html-editor-table-dialog.c:856
+msgid "_Spacing:"
+msgstr "_Razmak:"
+
+#: ../e-util/e-html-editor-table-dialog.c:873
+msgid "_Padding:"
+msgstr "_Okvir:"
+
+#: ../e-util/e-html-editor-table-dialog.c:937
+#: ../e-util/e-html-editor-text-dialog.c:261
+msgid "_Color:"
+msgstr "_Boja:"
+
+#: ../e-util/e-html-editor-table-dialog.c:963
+msgid "Image:"
+msgstr "Slika:"
+
+#: ../e-util/e-html-editor-table-dialog.c:990
+msgid "Table Properties"
+msgstr "Osobine tabele"
+
+#: ../e-util/e-html-editor-text-dialog.c:281
+msgid "Si_ze:"
+msgstr "_Veličina:"
+
+#: ../e-util/e-html-editor-text-dialog.c:296
+msgid "Text Properties"
+msgstr "Osobine teksta"
+
+#: ../e-util/e-html-editor-view.c:6298
+msgid "Changed property"
+msgstr "Izmenjena osobina"
+
+#: ../e-util/e-html-editor-view.c:6299
+msgid "Whether editor changed"
+msgstr "Da li je uređivač promenio"
+
 #: ../e-util/e-import-assistant.c:256
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
@@ -11319,10 +13576,6 @@ msgstr ""
 "Izaberite datoteku koju želite da uvezete u Evoluciju i iz liste izaberite "
 "kojeg je tipa ta datoteka."
 
-#: ../e-util/e-import-assistant.c:283
-msgid "Select a file"
-msgstr "Izaberite datoteku"
-
 #: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
 msgid "File _type:"
 msgstr "_Vrsta datoteke:"
@@ -11344,22 +13597,26 @@ 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:201
+#: ../modules/startup-wizard/e-mail-config-import-page.c:200
 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
+#| msgid ""
+#| "Evolution checked for settings to import from the following applications: "
+#| "Pine, Netscape, Elm, iCalendar. No importable settings found. If you "
+#| "would like to try again, please click the \"Back\" button."
 msgid ""
 "Evolution checked for settings to import from the following applications: "
-"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
-"like to try again, please click the \"Back\" button."
+"Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
+"would like to try again, please click the \"Back\" button."
 msgstr ""
 "Evolucija je proverila podešavanja za uvoz sledećih programa: Pine, Netskejp, "
-"Elm, iKalendar. Nema podešavanja za uvoženje. Ukoliko želite da pokušate "
+"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:230
+#: ../modules/startup-wizard/e-mail-config-import-page.c:229
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
@@ -11417,27 +13674,27 @@ msgstr "Izaberite datoteku"
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Kliknite na „Primeni“ da započnete uvoz datoteke u Evoluciju."
 
-#: ../e-util/e-mail-signature-combo-box.c:377
+#: ../e-util/e-mail-signature-combo-box.c:376
 msgid "Autogenerated"
 msgstr "Automatski sastavljeno"
 
-#: ../e-util/e-mail-signature-editor.c:309
+#: ../e-util/e-mail-signature-editor.c:297 ../mail/e-mail-notes.c:905
 msgid "Close"
 msgstr "Zatvori"
 
-#: ../e-util/e-mail-signature-editor.c:314
+#: ../e-util/e-mail-signature-editor.c:302 ../mail/e-mail-notes.c:910
 msgid "_Save and Close"
 msgstr "_Sačuvaj i zatvori"
 
-#: ../e-util/e-mail-signature-editor.c:528
+#: ../e-util/e-mail-signature-editor.c:529
 msgid "Edit Signature"
 msgstr "Uredi potpis"
 
-#: ../e-util/e-mail-signature-editor.c:548
+#: ../e-util/e-mail-signature-editor.c:562
 msgid "_Signature Name:"
 msgstr "Naziv _potpisa:"
 
-#: ../e-util/e-mail-signature-editor.c:594
+#: ../e-util/e-mail-signature-editor.c:598
 msgid "Unnamed"
 msgstr "Bez imena"
 
@@ -11445,15 +13702,15 @@ msgstr "Bez imena"
 msgid "Add _Script"
 msgstr "Dodaj sk_riptu"
 
-#: ../e-util/e-mail-signature-manager.c:419
+#: ../e-util/e-mail-signature-manager.c:426
 msgid "Add Signature Script"
 msgstr "Dodaj skriptu za potpis"
 
-#: ../e-util/e-mail-signature-manager.c:489
+#: ../e-util/e-mail-signature-manager.c:497
 msgid "Edit Signature Script"
 msgstr "Uredi skriptu potpisa"
 
-#: ../e-util/e-mail-signature-script-dialog.c:394
+#: ../e-util/e-mail-signature-script-dialog.c:393
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -11463,11 +13720,11 @@ msgstr ""
 "potpis. Naziv koji ste dali će biti korišćen\n"
 "samo za prikaz."
 
-#: ../e-util/e-mail-signature-script-dialog.c:445
+#: ../e-util/e-mail-signature-script-dialog.c:444
 msgid "S_cript:"
 msgstr "S_kripta:"
 
-#: ../e-util/e-mail-signature-script-dialog.c:476
+#: ../e-util/e-mail-signature-script-dialog.c:475
 msgid "Script file must be executable."
 msgstr "Datoteka skripte mora biti izvršna."
 
@@ -11483,14 +13740,39 @@ 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:246
+#: ../e-util/e-misc-utils.c:251
 msgid "Could not open the link."
 msgstr "Ne mogu da otvorim vezu."
 
-#: ../e-util/e-misc-utils.c:293
+#: ../e-util/e-misc-utils.c:334
 msgid "Could not display help for Evolution."
 msgstr "Ne mogu da prikažem pomoć za Evoluciju."
 
+#: ../e-util/e-misc-utils.c:2387
+#, c-format
+msgid "Opening calendar '%s'"
+msgstr "Otvaram kalendar „%s“"
+
+#: ../e-util/e-misc-utils.c:2390
+#, c-format
+msgid "Opening memo list '%s'"
+msgstr "Otvaram spisak beleški „%s“"
+
+#: ../e-util/e-misc-utils.c:2393
+#, c-format
+msgid "Opening task list '%s'"
+msgstr "Otvaram spisak zadataka „%s“"
+
+#: ../e-util/e-misc-utils.c:2396
+#, c-format
+msgid "Opening address book '%s'"
+msgstr "Otvaram adresar „%s“"
+
+#: ../e-util/e-misc-utils.c:3138
+#: ../modules/mailto-handler/evolution-mailto-handler.c:148
+msgid "_Do not show this message again"
+msgstr "_Ne prikazuj više ovu poruku"
+
 #: ../e-util/e-name-selector-dialog.c:277
 msgid "Show Contacts"
 msgstr "Prikaži kontakte"
@@ -11509,10 +13791,10 @@ msgstr "_Potraži:"
 
 #: ../e-util/e-name-selector-dialog.c:366
 #: ../e-util/e-name-selector-dialog.c:1274
-#: ../modules/addressbook/e-book-shell-view-actions.c:1112
-#: ../modules/calendar/e-cal-shell-view-actions.c:1732
-#: ../modules/calendar/e-memo-shell-view-actions.c:766
-#: ../modules/calendar/e-task-shell-view-actions.c:937
+#: ../modules/addressbook/e-book-shell-view-actions.c:1183
+#: ../modules/calendar/e-cal-shell-view-actions.c:1626
+#: ../modules/calendar/e-memo-shell-view-actions.c:760
+#: ../modules/calendar/e-task-shell-view-actions.c:933
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
 
@@ -11524,14 +13806,13 @@ msgstr "Ko_ntakti"
 msgid "Search"
 msgstr "Potraži"
 
-#: ../e-util/e-name-selector-dialog.c:448
-#: ../mail/importers/pine-importer.c:427
+#: ../e-util/e-name-selector-dialog.c:448 ../mail/importers/pine-importer.c:429
 msgid "Address Book"
 msgstr "Adresar"
 
 #: ../e-util/e-name-selector-dialog.c:451
 #: ../modules/addressbook/e-book-shell-backend.c:303
-#: ../modules/addressbook/e-book-shell-view.c:371
+#: ../modules/addressbook/e-book-shell-view.c:373
 msgid "Contacts"
 msgstr "Kontakti"
 
@@ -11540,73 +13821,73 @@ msgid "Select Contacts from Address Book"
 msgstr "Izaberite kontakte iz adresara"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../e-util/e-name-selector-entry.c:3038
+#: ../e-util/e-name-selector-entry.c:3186
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "_Raširi %s unutar"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3054
+#: ../e-util/e-name-selector-entry.c:3202
 #, c-format
 msgid "Cop_y %s"
 msgstr "_Umnoži %s"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3065
+#: ../e-util/e-name-selector-entry.c:3213
 #, c-format
 msgid "C_ut %s"
 msgstr "_Iseci %s"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3083
+#: ../e-util/e-name-selector-entry.c:3231
 #, c-format
 msgid "_Edit %s"
 msgstr "_Uredi %s"
 
-#: ../e-util/e-name-selector-list.c:583
+#: ../e-util/e-name-selector-list.c:584
 #, c-format
 msgid "_Delete %s"
 msgstr "_Obriši %s"
 
-#: ../e-util/e-online-button.c:30
+#: ../e-util/e-online-button.c:32
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr ""
 "Evolucija je trenutno na mreži.  Kliknite na ovo dugme za rad van mreže."
 
-#: ../e-util/e-online-button.c:33
+#: ../e-util/e-online-button.c:35
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr ""
 "Evolucija trenutno nije na mreži.  Kliknite na ovo dugme da se povežete."
 
-#: ../e-util/e-online-button.c:36
+#: ../e-util/e-online-button.c:38
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Evolucija trenutno nije na mreži jer mreža nije dostupna."
 
-#: ../e-util/e-passwords.c:125
+#: ../e-util/e-passwords.c:127
 msgid "Keyring key is unusable: no user or host name"
 msgstr "Ključ priveska nije upotrebljiv: nema korisnika niti domaćina"
 
-#: ../e-util/e-passwords.c:445
+#: ../e-util/e-passwords.c:447
 msgid "You have the Caps Lock key on."
 msgstr "Uključili ste velika slova."
 
-#: ../e-util/e-passwords.c:576
+#: ../e-util/e-passwords.c:578
 msgid "_Remember this passphrase"
 msgstr "_Zapamti ovu lozinku"
 
-#: ../e-util/e-passwords.c:577
+#: ../e-util/e-passwords.c:579
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_Zapamti ovu lozinku do kraja ove sesije"
 
-#: ../e-util/e-passwords.c:582
+#: ../e-util/e-passwords.c:584
 msgid "_Remember this password"
 msgstr "_Zapamti ovu lozinku"
 
-#: ../e-util/e-passwords.c:583
+#: ../e-util/e-passwords.c:585
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamti ovu lozinku do kraja ove sesije"
 
-#: ../e-util/e-preferences-window.c:318
+#: ../e-util/e-preferences-window.c:321
 msgid "Evolution Preferences"
 msgstr "Podešavanja Evolucije"
 
@@ -11623,71 +13904,67 @@ msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "Sistem za štampanje nije ponudio nikakve dodatne detalje o grešci."
 
-#: ../e-util/e-proxy-editor.c:314
-#| msgid "Method:"
+#: ../e-util/e-proxy-editor.c:325
 msgid "_Method:"
 msgstr "_Način:"
 
-#: ../e-util/e-proxy-editor.c:336
+#: ../e-util/e-proxy-editor.c:347
 msgid "Defer to Desktop Settings"
 msgstr "Teži podešavanjima radne površi"
 
-#: ../e-util/e-proxy-editor.c:340
+#: ../e-util/e-proxy-editor.c:351
 msgid "_Open Desktop Settings"
 msgstr "_Otvori podešavanja radne površi"
 
-#: ../e-util/e-proxy-editor.c:366
-#| msgid "January"
+#: ../e-util/e-proxy-editor.c:377
 msgid "Manual"
 msgstr "Ručno"
 
-#: ../e-util/e-proxy-editor.c:385
-#| msgid "H_TTP Proxy:"
+#: ../e-util/e-proxy-editor.c:396
 msgid "_HTTP Proxy:"
 msgstr "_HTTP posrednik:"
 
-#: ../e-util/e-proxy-editor.c:416
-#| msgid "H_TTP Proxy:"
+#: ../e-util/e-proxy-editor.c:427
 msgid "H_TTPS Proxy:"
 msgstr "H_TTPS posrednik:"
 
-#: ../e-util/e-proxy-editor.c:447
-#| msgid "SOC_KS Proxy:"
+#: ../e-util/e-proxy-editor.c:458
 msgid "_Socks Proxy:"
 msgstr "_Soks posrednik:"
 
-#: ../e-util/e-proxy-editor.c:478
-#| msgid "Ignore"
+#: ../e-util/e-proxy-editor.c:489
 msgid "_Ignore Hosts:"
 msgstr "_Zanemari domaćine:"
 
-#: ../e-util/e-proxy-editor.c:504
-#| msgid "Automatic Contacts"
+#: ../e-util/e-proxy-editor.c:515
 msgid "Automatic"
 msgstr "Samostalno"
 
-#: ../e-util/e-proxy-editor.c:523
-#| msgid "Configuration"
+#: ../e-util/e-proxy-editor.c:534
 msgid "Configuration _URL:"
 msgstr "_Adresa podešavanja:"
 
-#: ../e-util/e-proxy-editor.c:552
+#: ../e-util/e-proxy-editor.c:560
+msgid "No proxy"
+msgstr "Bez posrednika"
+
+#: ../e-util/e-proxy-editor.c:563
 msgid "Use a direct connection, no proxying required."
 msgstr "Koristi neposrednu vezu, nije potrebno posredovanje."
 
-#: ../e-util/e-proxy-preferences.c:177
+#: ../e-util/e-proxy-preferences.c:213
 msgid "Switch to Basic Proxy Preferences"
 msgstr "Prebaci se na osnovne postavke posrednika"
 
-#: ../e-util/e-proxy-preferences.c:179
+#: ../e-util/e-proxy-preferences.c:215
 msgid "Switch to Advanced Proxy Preferences"
 msgstr "Prebaci se na napredne postavke posrednika"
 
-#: ../e-util/e-proxy-preferences.c:463
+#: ../e-util/e-proxy-preferences.c:526
 msgid "Apply custom proxy settings to these accounts:"
 msgstr "Primeni proizvoljna podešavanja posrednika na ove naloge:"
 
-#: ../e-util/e-proxy-preferences.c:498
+#: ../e-util/e-proxy-preferences.c:561
 msgid ""
 "<b>Advanced Proxy Preferences</b> lets you define alternate network proxies "
 "and apply them to specific accounts"
@@ -11696,17 +13973,14 @@ msgstr ""
 "mrežne posrednike i da ih primenite na posebne naloge"
 
 #: ../e-util/e-proxy-selector.c:85
-#| msgid "_Custom binary:"
 msgid "Custom Proxy"
 msgstr "Proizvoljni posrednik"
 
 #: ../e-util/e-proxy-selector.c:487
-#| msgid "Create a new appointment"
 msgid "Create a new proxy profile"
 msgstr "Napravite novi profil posrednika"
 
 #: ../e-util/e-proxy-selector.c:492
-#| msgid "Delete the selected memo list"
 msgid "Delete the selected proxy profile"
 msgstr "Obrišite izabrani profil posrednika"
 
@@ -11719,117 +13993,308 @@ msgid "Edit Rule"
 msgstr "Uredi pravilo"
 
 # bug: plural-forms if put as "%d matches"
-#: ../e-util/e-search-bar.c:82
+#: ../e-util/e-search-bar.c:83
 #, c-format
 msgid "Matches: %u"
 msgstr "Poklapanja: %u"
 
-#: ../e-util/e-search-bar.c:566
+#: ../e-util/e-search-bar.c:569
 msgid "Close the find bar"
 msgstr "Zatvori traku pretrage"
 
-#: ../e-util/e-search-bar.c:574
+#: ../e-util/e-search-bar.c:577
 msgid "Fin_d:"
 msgstr "Pro_nađi:"
 
-#: ../e-util/e-search-bar.c:586
+#: ../e-util/e-search-bar.c:589
 msgid "Clear the search"
 msgstr "Očisti pretragu"
 
-#: ../e-util/e-search-bar.c:610
+#: ../e-util/e-search-bar.c:613
 msgid "_Previous"
 msgstr "_Prethodno"
 
-#: ../e-util/e-search-bar.c:613
+#: ../e-util/e-search-bar.c:616
 msgid "Find the previous occurrence of the phrase"
 msgstr "Nađi prethodno pojavljivanje izraza"
 
-#: ../e-util/e-search-bar.c:622
+#: ../e-util/e-search-bar.c:625
 msgid "_Next"
 msgstr "_Sledeće"
 
-#: ../e-util/e-search-bar.c:625
+#: ../e-util/e-search-bar.c:628
 msgid "Find the next occurrence of the phrase"
 msgstr "Nađi sledeće pojavljivanje izraza"
 
-#: ../e-util/e-search-bar.c:634
+#: ../e-util/e-search-bar.c:637
 msgid "Mat_ch case"
 msgstr "_Uporedi veličinu slova"
 
-#: ../e-util/e-search-bar.c:662
+#: ../e-util/e-search-bar.c:665
 msgid "Reached bottom of page, continued from top"
 msgstr "Stigao sam do dna stranice, nastavljam sa vrha"
 
-#: ../e-util/e-search-bar.c:684
+#: ../e-util/e-search-bar.c:687
 msgid "Reached top of page, continued from bottom"
 msgstr "Stigao sam do vrha stranice, nastavljam sa dna"
 
 # 48x48/emblems/emblem-mail.icon.in.h:1
-#: ../e-util/e-send-options.c:537 ../mail/importers/elm-importer.c:327
-#: ../mail/importers/pine-importer.c:420
-#: ../modules/mail/e-mail-shell-view.c:1097
+#: ../e-util/e-send-options.c:538 ../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
 msgid "Mail"
 msgstr "Pošta"
 
-#: ../e-util/e-send-options.c:569
+#: ../e-util/e-send-options.c:570
 msgid "When de_leted:"
 msgstr "Kada je obri_sano:"
 
-#: ../e-util/e-source-config.c:680 ../e-util/e-source-config.c:684
+#: ../e-util/e-send-options.ui.h:3
+msgid "Standard"
+msgstr "Obično"
+
+#: ../e-util/e-send-options.ui.h:6
+msgid "Proprietary"
+msgstr "Vlasničko"
+
+#: ../e-util/e-send-options.ui.h:8
+msgid "Secret"
+msgstr "Tajno"
+
+#: ../e-util/e-send-options.ui.h:9
+msgid "Top Secret"
+msgstr "Strogo poverljivo"
+
+#: ../e-util/e-send-options.ui.h:10
+msgid "For Your Eyes Only"
+msgstr "Samo za vaše oči"
+
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# 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.
+#. Translators: Used in send options dialog
+#: ../e-util/e-send-options.ui.h:12
+msgctxt "send-options"
+msgid "None"
+msgstr "Ništa"
+
+#: ../e-util/e-send-options.ui.h:13
+msgid "Mail Receipt"
+msgstr "Priznanica pošte"
+
+#: ../e-util/e-send-options.ui.h:14
+msgid "Send Options"
+msgstr "Opcije slanja"
+
+#: ../e-util/e-send-options.ui.h:15
+msgid "R_eply requested"
+msgstr "Zahtevan je o_dgovor"
+
+#: ../e-util/e-send-options.ui.h:16
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "Un_utar"
+
+#: ../e-util/e-send-options.ui.h:17
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "dana"
+
+#: ../e-util/e-send-options.ui.h:18
+msgid "_When convenient"
+msgstr "Kada je z_godno"
+
+#: ../e-util/e-send-options.ui.h:20
+msgid "_Delay message delivery"
+msgstr "_Odloži isporuku poruke"
+
+#: ../e-util/e-send-options.ui.h:21
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_Posle"
+
+#: ../e-util/e-send-options.ui.h:22
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "dana"
+
+#: ../e-util/e-send-options.ui.h:23
+msgid "_Set expiration date"
+msgstr "Postavi _rok"
+
+#: ../e-util/e-send-options.ui.h:24
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_Do"
+
+#: ../e-util/e-send-options.ui.h:25
+msgid "Delivery Options"
+msgstr "Opcije isporuke"
+
+#: ../e-util/e-send-options.ui.h:26
+msgid "_Priority:"
+msgstr "_Važnost:"
+
+#: ../e-util/e-send-options.ui.h:27
+msgid "_Classification:"
+msgstr "_Klasifikacija:"
+
+#: ../e-util/e-send-options.ui.h:28
+msgid "Gene_ral Options"
+msgstr "Opš_te opcije"
+
+#: ../e-util/e-send-options.ui.h:29
+msgid "Creat_e a sent item to track information"
+msgstr "Na_pravi poslatu stavku za praćenje podatka"
+
+#: ../e-util/e-send-options.ui.h:30
+msgid "_Delivered"
+msgstr "_Isporučeno"
+
+#: ../e-util/e-send-options.ui.h:31
+msgid "Deli_vered and opened"
+msgstr "Ispo_ručeno i otvoreno"
+
+#: ../e-util/e-send-options.ui.h:32
+msgid "_All information"
+msgstr "_Svi podaci"
+
+#: ../e-util/e-send-options.ui.h:33
+msgid "A_uto-delete sent item"
+msgstr "A_utomatski obriši poslatu stavku"
+
+#: ../e-util/e-send-options.ui.h:34
+msgid "Status Tracking"
+msgstr "Praćenje statusa"
+
+#: ../e-util/e-send-options.ui.h:35
+msgid "_When opened:"
+msgstr "Kada je o_tvoreno:"
+
+#: ../e-util/e-send-options.ui.h:36
+msgid "When decli_ned:"
+msgstr "Kada je _odbijeno:"
+
+#: ../e-util/e-send-options.ui.h:37
+msgid "When co_mpleted:"
+msgstr "Kad je _završeno:"
+
+#: ../e-util/e-send-options.ui.h:38
+msgid "When acce_pted:"
+msgstr "Kada je _prihvaćeno:"
+
+#: ../e-util/e-send-options.ui.h:39
+msgid "Return Notification"
+msgstr "Povratno obaveštenje"
+
+#: ../e-util/e-send-options.ui.h:40
+msgid "Sta_tus Tracking"
+msgstr "Praćenje sta_tusa"
+
+#: ../e-util/e-source-config.c:690 ../e-util/e-source-config.c:694
 msgid "Type:"
 msgstr "Vrsta:"
 
-#: ../e-util/e-source-config.c:692 ../e-util/e-source-config.c:696
+#: ../e-util/e-source-config.c:702 ../e-util/e-source-config.c:706
 msgid "Name:"
 msgstr "Ime:"
 
+#: ../e-util/e-source-config.c:813
+#| msgid "One or more values cannot be empty."
+msgid "Name cannot be empty"
+msgstr "Ime ne može biti prazno"
+
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../e-util/e-source-config.c:1301
+#: ../e-util/e-source-config.c:1313
 msgid "Refresh every"
 msgstr "Osveži na svakih"
 
-#: ../e-util/e-source-config.c:1331 ../e-util/e-source-config.c:1401
+#: ../e-util/e-source-config.c:1343 ../e-util/e-source-config.c:1413
 msgid "Use a secure connection"
 msgstr "Koristi bezbednu vezu"
 
-#: ../e-util/e-source-config.c:1427
-msgid "Unset _trust for SSL certificate"
-msgstr "Odznači _poverenje za SSL uverenje"
+#: ../e-util/e-source-config.c:1439
+#| msgid "Unset _trust for SSL certificate"
+msgid "Unset _trust for SSL/TLS certificate"
+msgstr "Odznači _poverenje za SSL/TLS uverenje"
 
-#: ../e-util/e-source-config.c:1463
+#: ../e-util/e-source-config.c:1475
 msgid "User"
 msgstr "Korisnik"
 
-#: ../e-util/e-source-selector-dialog.c:226
+#: ../e-util/e-source-selector.c:3214
+#| msgid "Show %s"
+msgid "Show"
+msgstr "Prikaži"
+
+#: ../e-util/e-source-selector.c:3221
+#| msgid "Group Reply"
+msgid "Group name"
+msgstr "Naziv grupe"
+
+#: ../e-util/e-source-selector.c:3376 ../e-util/e-source-selector.c:3475
+#| msgid "Show %s"
+msgid "_Show"
+msgstr "_Prikaži"
+
+#: ../e-util/e-source-selector.c:3428
+#| msgid "Manager"
+msgid "Manage Groups"
+msgstr "Upravljajte grupama"
+
+#: ../e-util/e-source-selector.c:3440
+#| msgid "_Available Categories:"
+msgid "Available Groups:"
+msgstr "Dostupne grupe:"
+
+#: ../e-util/e-source-selector-dialog.c:236
 msgid "_Destination"
 msgstr "_Odredište"
 
-#: ../e-util/e-source-selector-dialog.c:339
+#: ../e-util/e-source-selector-dialog.c:364
 msgid "Select destination"
 msgstr "Izaberite odredište"
 
+#. Translators: %s is the language ISO code.
+#: ../e-util/e-spell-dictionary.c:266
+#, c-format
+msgctxt "language"
+msgid "Unknown (%s)"
+msgstr "Nepoznato (%s)"
+
+#. Translators: The first %s is the language name, and the
+#. * second is the country name. Example: "French (France)"
+#: ../e-util/e-spell-dictionary.c:281 ../e-util/e-spell-dictionary.c:286
+#, c-format
+msgctxt "language"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:383
+#: ../e-util/e-spell-entry.c:478
 msgid "(no suggestions)"
 msgstr "(nema predloga)"
 
-#: ../e-util/e-spell-entry.c:407
+#: ../e-util/e-spell-entry.c:502
 msgid "More..."
 msgstr "Dalje..."
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:478
+#: ../e-util/e-spell-entry.c:587
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "Dodaj „%s“ u rečnik"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:529
+#: ../e-util/e-spell-entry.c:636
 msgid "Ignore All"
 msgstr "Zanemari sve"
 
-#: ../e-util/e-spell-entry.c:557
+#: ../e-util/e-spell-entry.c:668
 msgid "Spelling Suggestions"
 msgstr "Predlozi pravopisa"
 
@@ -11843,10 +14308,6 @@ msgid ""
 msgstr ""
 "Već postoji datoteka u „{0}“. Ukoliko je zamenite prepisaćete njen sadržaj."
 
-#: ../e-util/e-system.error.xml.h:3
-msgid "_Replace"
-msgstr "_Zameni"
-
 #: ../e-util/e-system.error.xml.h:4
 msgid "Cannot save file \"{0}\"."
 msgstr "Ne mogu da sačuvam datoteku „{0}“."
@@ -11866,19 +14327,19 @@ msgstr "Ne mogu da otvorim datoteku „{0}“."
 
 #: ../e-util/e-system.error.xml.h:7
 msgid "Failed to remove data source &quot;{0}&quot;."
-msgstr "Nisam uspeo da uklonim izvor podataka „{0}“."
+msgstr "Ne mogu da uklonim izvor podataka „{0}“."
 
-#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:61
+#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:62
 msgid "The reported error was &quot;{1}&quot;."
 msgstr "Prijavljena greška bejaše „{1}“."
 
 #: ../e-util/e-system.error.xml.h:9
 msgid "Failed to update data source &quot;{0}&quot;."
-msgstr "Nisam uspeo da osvežim izvor podataka „{0}“."
+msgstr "Ne mogu da osvežim izvor podataka „{0}“."
 
 #: ../e-util/e-system.error.xml.h:10
 msgid "Failed to delete resource &quot;{0}&quot;."
-msgstr "Nisam uspeo da obrišem resurs „{0}“."
+msgstr "Ne mogu da obrišem resurs „{0}“."
 
 #: ../e-util/e-system.error.xml.h:11
 msgid ""
@@ -11941,29 +14402,29 @@ msgstr "Pozadinac spiska beleški koji uslužuje „{0}“ je naišao na grešku
 msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
 msgstr "Pozadinac spiska zadataka koji uslužuje „{0}“ je naišao na grešku."
 
-#: ../e-util/e-table-click-to-add.c:680
+#: ../e-util/e-table-click-to-add.c:689
 #: ../e-util/gal-a11y-e-table-click-to-add.c:61
 #: ../e-util/gal-a11y-e-table-click-to-add.c:142
 msgid "click to add"
 msgstr "kliknite da dodate"
 
-#: ../e-util/e-table-column-selector.c:265
+#: ../e-util/e-table-column-selector.c:264
 msgid "Move selected column names to top"
 msgstr "Premestite izabrane nazive stupca na vrh"
 
-#: ../e-util/e-table-column-selector.c:270
+#: ../e-util/e-table-column-selector.c:269
 msgid "Move selected column names up one row"
 msgstr "Premestite izabrane nazive stupca jedan red na gore"
 
-#: ../e-util/e-table-column-selector.c:275
+#: ../e-util/e-table-column-selector.c:274
 msgid "Move selected column names down one row"
 msgstr "Premestite izabrane nazive stupca jedan red na dole"
 
-#: ../e-util/e-table-column-selector.c:280
+#: ../e-util/e-table-column-selector.c:279
 msgid "Move selected column names to bottom"
 msgstr "Premestite izabrane nazive stupca na dno"
 
-#: ../e-util/e-table-column-selector.c:285
+#: ../e-util/e-table-column-selector.c:284
 msgid "Select all column names"
 msgstr "Izaberite sve nazive stupca"
 
@@ -11991,9 +14452,69 @@ msgstr "Prikaži polja"
 msgid "Choose the order of information to appear in the message list."
 msgstr "Izaberite redosled podataka za prikazivanje na spisku poruka."
 
-#: ../e-util/e-table-field-chooser-dialog.c:226
-msgid "Add a Column"
-msgstr "Dodaj kolonu"
+#: ../e-util/e-table-config.ui.h:2
+msgid "_Apply"
+msgstr "_Primeni"
+
+#: ../e-util/e-table-config.ui.h:4
+msgid "_Sort..."
+msgstr "_Razvrstaj..."
+
+#: ../e-util/e-table-config.ui.h:5
+msgid "_Group By..."
+msgstr "_Grupiši po..."
+
+#: ../e-util/e-table-config.ui.h:6
+msgid "_Fields Shown..."
+msgstr "Prikazana _polja..."
+
+#: ../e-util/e-table-config.ui.h:9
+msgid "Clear _All"
+msgstr "Očisti _sve"
+
+#: ../e-util/e-table-config.ui.h:10
+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
+msgid "Ascending"
+msgstr "Rastuće"
+
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1755
+msgid "Descending"
+msgstr "Opadajuće"
+
+#: ../e-util/e-table-config.ui.h:13
+msgid "Group Items By"
+msgstr "Grupiši stavke po"
+
+#: ../e-util/e-table-config.ui.h:14
+msgid "Show _field in View"
+msgstr "Prikaži _polje u pregledu"
+
+#: ../e-util/e-table-config.ui.h:15
+msgid "Then By"
+msgstr "Onda po"
+
+#: ../e-util/e-table-config.ui.h:16
+msgid "Show field i_n View"
+msgstr "Prikaži polje _u pregledu"
+
+#: ../e-util/e-table-config.ui.h:17
+msgid "Show field in _View"
+msgstr "Prikaži polje u p_regledu"
+
+#: ../e-util/e-table-config.ui.h:18
+msgid "Sort"
+msgstr "Razvrstaj"
+
+#: ../e-util/e-table-config.ui.h:19
+msgid "Clear All"
+msgstr "Očisti sve"
+
+#: ../e-util/e-table-config.ui.h:20
+msgid "Sort Items By"
+msgstr "Razvrstaj stavke po"
 
 #: ../e-util/e-table-field-chooser.c:166
 msgid ""
@@ -12003,6 +14524,10 @@ msgstr ""
 "Za dodavanje kolone u tabelu, prevucite\n"
 "je na mesto gde želite da se pojavi."
 
+#: ../e-util/e-table-field-chooser-dialog.c:226
+msgid "Add a Column"
+msgstr "Dodaj kolonu"
+
 #: ../e-util/e-table-group-container.c:368
 #, c-format
 msgid "%s: %s (%d item)"
@@ -12021,71 +14546,67 @@ msgstr[1] "%s (%d stavke)"
 msgstr[2] "%s (%d stavki)"
 msgstr[3] "%s (jedna stavka)"
 
-#: ../e-util/e-table-header-item.c:1576
+#: ../e-util/e-table-header-item.c:1578
 msgid "Customize Current View"
 msgstr "Prilagodite trenutni pregled"
 
-#: ../e-util/e-table-header-item.c:1599
+#: ../e-util/e-table-header-item.c:1601
 msgid "Sort _Ascending"
 msgstr "Razvrstaj _rastuće"
 
-#: ../e-util/e-table-header-item.c:1602
+#: ../e-util/e-table-header-item.c:1604
 msgid "Sort _Descending"
 msgstr "Razvrstaj _opadajuće"
 
-#: ../e-util/e-table-header-item.c:1605
+#: ../e-util/e-table-header-item.c:1607
 msgid "_Unsort"
 msgstr "_Ne razvrstavaj"
 
-#: ../e-util/e-table-header-item.c:1608
+#: ../e-util/e-table-header-item.c:1610
 msgid "Group By This _Field"
 msgstr "Grupiši po ovome _polju"
 
-#: ../e-util/e-table-header-item.c:1611
+#: ../e-util/e-table-header-item.c:1613
 msgid "Group By _Box"
 msgstr "Grupiši po _okviru"
 
-#: ../e-util/e-table-header-item.c:1615
+#: ../e-util/e-table-header-item.c:1617
 msgid "Remove This _Column"
 msgstr "Ukloni ovu _kolonu"
 
-#: ../e-util/e-table-header-item.c:1618
+#: ../e-util/e-table-header-item.c:1620
 msgid "Add a C_olumn..."
 msgstr "Dodaj ko_lonu..."
 
-#: ../e-util/e-table-header-item.c:1622
+#: ../e-util/e-table-header-item.c:1624
 msgid "A_lignment"
 msgstr "Po_ravnanje"
 
-#: ../e-util/e-table-header-item.c:1625
+#: ../e-util/e-table-header-item.c:1627
 msgid "B_est Fit"
 msgstr "Na_jbolje uklapanje"
 
-#: ../e-util/e-table-header-item.c:1628
+#: ../e-util/e-table-header-item.c:1630
 msgid "Format Column_s..."
 msgstr "Oblikuj kolo_ne..."
 
-#: ../e-util/e-table-header-item.c:1632
+#: ../e-util/e-table-header-item.c:1634
 msgid "Custo_mize Current View..."
 msgstr "Prila_godi trenutni pregled..."
 
-#: ../e-util/e-table-header-item.c:1703
+#: ../e-util/e-table-header-item.c:1705
 msgid "_Sort By"
 msgstr "_Poređaj po"
 
 #. Custom
-#: ../e-util/e-table-header-item.c:1726
+#: ../e-util/e-table-header-item.c:1728
 msgid "_Custom"
 msgstr "_Proizvoljno"
 
-#: ../e-util/e-text.c:2110
+#: ../e-util/e-text.c:2134
 msgid "Select All"
 msgstr "Izaberi sve"
 
-#: ../e-util/e-text.c:2123
-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.
@@ -12095,6 +14616,31 @@ msgstr "Načini unosa"
 msgid "UTC"
 msgstr "KUV"
 
+#: ../e-util/e-timezone-dialog.ui.h:1
+msgid "Select a Time Zone"
+msgstr "Izaberite vremensku zonu"
+
+#: ../e-util/e-timezone-dialog.ui.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
+msgstr ""
+"Koristite levi taster miša da uvećate mapu i izaberete vremensku zonu.\n"
+"Koristite desni taster miša za umanjivanje."
+
+#: ../e-util/e-timezone-dialog.ui.h:6
+msgid "Time Zones"
+msgstr "Vremenske zone"
+
+#: ../e-util/e-timezone-dialog.ui.h:7
+msgid "_Selection"
+msgstr "_Izbor"
+
+#: ../e-util/e-timezone-dialog.ui.h:8
+msgid "Timezone drop-down combination box"
+msgstr "Prozorče za podešavanje vremenske zone"
+
 #: ../e-util/e-url-entry.c:108
 msgid "Click here to open the URL"
 msgstr "Kliknite ovde da otvorite adresu"
@@ -12103,123 +14649,124 @@ msgstr "Kliknite ovde da otvorite adresu"
 msgid "Enter a URL here"
 msgstr "Ovde unesite adresu"
 
-#: ../e-util/e-web-view-gtkhtml.c:405 ../e-util/e-web-view.c:282
+#: ../e-util/evolution-source-viewer.c:637
+msgid "Evolution Source Viewer"
+msgstr "Prikazivač izvora Evolucije"
+
+#. Translators: The name that is displayed in the user interface
+#: ../e-util/evolution-source-viewer.c:667
+msgid "Display Name"
+msgstr "Naziv prikaza"
+
+#: ../e-util/evolution-source-viewer.c:676
+msgid "Flags"
+msgstr "Opcije"
+
+#: ../e-util/evolution-source-viewer.c:728
+#: ../mail/e-mail-config-identity-page.c:760
+msgid "Identity"
+msgstr "Identitet"
+
+#: ../e-util/e-web-view.c:318
 msgid "_Copy Link Location"
 msgstr "_Umnoži mesto veze"
 
-#: ../e-util/e-web-view-gtkhtml.c:407 ../e-util/e-web-view.c:284
+#: ../e-util/e-web-view.c:320
 msgid "Copy the link to the clipboard"
 msgstr "Umnožava vezu u spisak isečaka"
 
-#: ../e-util/e-web-view-gtkhtml.c:415 ../e-util/e-web-view.c:292
+#: ../e-util/e-web-view.c:328
 msgid "_Open Link in Browser"
 msgstr "_Otvori vezu u pregledniku"
 
-#: ../e-util/e-web-view-gtkhtml.c:417 ../e-util/e-web-view.c:294
+#: ../e-util/e-web-view.c:330
 msgid "Open the link in a web browser"
 msgstr "Otvori vezu u veb pretraživaču"
 
-#: ../e-util/e-web-view-gtkhtml.c:425 ../e-util/e-web-view.c:302
+#: ../e-util/e-web-view.c:338
 msgid "_Copy Email Address"
-msgstr "_Umnoži adresu el. pošte"
+msgstr "_Umnoži e-adresu"
 
-#: ../e-util/e-web-view-gtkhtml.c:442 ../e-util/e-web-view.c:319
+#: ../e-util/e-web-view.c:345
+msgid "Copy _Raw Email Address"
+msgstr "Umnoži sa_mo e-adresu"
+
+#: ../e-util/e-web-view.c:347
+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
 msgid "_Copy Image"
 msgstr "_Umnoži sliku"
 
-#: ../e-util/e-web-view-gtkhtml.c:444 ../e-util/e-web-view.c:321
+#: ../e-util/e-web-view.c:364
 msgid "Copy the image to the clipboard"
 msgstr "Umnožite sliku u ostavu"
 
-#: ../e-util/e-web-view-gtkhtml.c:464 ../e-util/e-web-view-gtkhtml.c:1307
-#: ../e-util/e-web-view.c:348 ../e-util/e-web-view.c:1319
+#: ../e-util/e-web-view.c:369
+msgid "Save _Image..."
+msgstr "Sačuvaj _sliku..."
+
+#: ../e-util/e-web-view.c:371
+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
 msgid "Select all text and images"
 msgstr "Izaberi sav tekst i slike"
 
-#: ../e-util/e-web-view-gtkhtml.c:971 ../e-util/e-web-view-gtkhtml.c:973
-#: ../e-util/e-web-view-gtkhtml.c:975 ../e-util/e-web-view.c:994
-#: ../e-util/e-web-view.c:996 ../e-util/e-web-view.c:998
+#: ../e-util/e-web-view.c:1074
 #, c-format
 msgid "Click to call %s"
 msgstr "Kliknite da pozovete %s"
 
-#: ../e-util/e-web-view-gtkhtml.c:977 ../e-util/e-web-view.c:1000
+#: ../e-util/e-web-view.c:1076
 msgid "Click to hide/unhide addresses"
 msgstr "Kliknite da sakrijete/otkrijete adrese"
 
-#: ../e-util/e-web-view-gtkhtml.c:979 ../e-util/e-web-view.c:1002
+#: ../e-util/e-web-view.c:1087
 #, c-format
-msgid "Click to open %s"
-msgstr "Kliknite da otvorite %s"
+msgid "Go to the section %s of the message"
+msgstr "Idi na odeljak %s ove poruke"
 
-#: ../e-util/e-web-view.c:326
-msgid "Save _Image..."
-msgstr "Sačuvaj _sliku..."
+#: ../e-util/e-web-view.c:1089
+msgid "Go to the beginning of the message"
+msgstr "Idi na početak poruke"
 
-#: ../e-util/e-web-view.c:328
-msgid "Save the image to a file"
-msgstr "Sačuvajte sliku u datoteku"
+#: ../e-util/e-web-view.c:1093
+#, c-format
+msgid "Click to open %s"
+msgstr "Kliknite da otvorite %s"
 
-#: ../e-util/e-web-view.c:2902
+#: ../e-util/e-web-view.c:3127
 msgid "Copying image to clipboard"
 msgstr "Umnožavam sliku u ostavu"
 
-#: ../e-util/e-web-view.c:3090
+#: ../e-util/e-web-view.c:3315
 msgid "Save Image"
 msgstr "Sačuvaj sliku"
 
-#: ../e-util/e-web-view.c:3126
+#: ../e-util/e-web-view.c:3351
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "Čuvam sliku u „%s“"
 
-#: ../e-util/e-widget-undo.c:429
+#: ../e-util/e-widget-undo.c:430
 msgid "Undo 'Insert text'"
 msgstr "Poništi „Umetni tekst“"
 
-#: ../e-util/e-widget-undo.c:431
+#: ../e-util/e-widget-undo.c:432
 msgid "Redo 'Insert text'"
 msgstr "Povrati „Umetni tekst“"
 
-#: ../e-util/e-widget-undo.c:445
+#: ../e-util/e-widget-undo.c:446
 msgid "Undo 'Delete text'"
 msgstr "Poništi „Obriši tekst“"
 
-#: ../e-util/e-widget-undo.c:447
+#: ../e-util/e-widget-undo.c:448
 msgid "Redo 'Delete text'"
 msgstr "Povrati „Obriši tekst“"
 
-#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
-msgid "%d %B %Y"
-msgstr "%d %B %Y."
-
-#: ../e-util/ea-calendar-item.c:326
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "Kalendar: od %s do %s"
-
-#: ../e-util/ea-calendar-item.c:363
-msgid "evolution calendar item"
-msgstr "stavka kalendara evolucije"
-
-#: ../e-util/evolution-source-viewer.c:636
-msgid "Evolution Source Viewer"
-msgstr "Prikazivač izvora Evolucije"
-
-#. Translators: The name that is displayed in the user interface
-#: ../e-util/evolution-source-viewer.c:666
-msgid "Display Name"
-msgstr "Naziv prikaza"
-
-#: ../e-util/evolution-source-viewer.c:675
-msgid "Flags"
-msgstr "Opcije"
-
-#: ../e-util/evolution-source-viewer.c:727
-#: ../mail/e-mail-config-identity-page.c:677
-msgid "Identity"
-msgstr "Identitet"
-
 #: ../e-util/filter.error.xml.h:1
 msgid "Missing date."
 msgstr "Nedostaje datum."
@@ -12250,7 +14797,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:100
+#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:101
 msgid "Missing name."
 msgstr "Nedostaje ime."
 
@@ -12267,7 +14814,6 @@ msgid "Please choose another name."
 msgstr "Izaberite drugo ime."
 
 #: ../e-util/filter.error.xml.h:12
-#| msgid "Missing date."
 msgid "Missing condition."
 msgstr "Nedostaje uslov."
 
@@ -12276,7 +14822,6 @@ msgid "Filter should have at least one condition."
 msgstr "Propusnik treba da ima barem jedan uslov."
 
 #: ../e-util/filter.error.xml.h:14
-#| msgid "Missing date."
 msgid "Missing value."
 msgstr "Nedostaje vrednost."
 
@@ -12284,13 +14829,104 @@ msgstr "Nedostaje vrednost."
 msgid "One or more values cannot be empty."
 msgstr "Jedna ili više vrednosti ne mogu biti prazne."
 
+#: ../e-util/filter.error.xml.h:16
+#| msgid "Are you sure you want to delete the '{0}' task?"
+msgid "Are you sure you want to remove rule '{0}'?"
+msgstr "Sigurno želite da uklonite pravilo „{0}“?"
+
+#: ../e-util/filter.error.xml.h:17
+msgid "_Keep"
+msgstr "_Zadrži"
+
+#: ../e-util/filter.ui.h:2
+msgid "the current time"
+msgstr "trenutno vreme"
+
+#: ../e-util/filter.ui.h:3
+msgid "the time you specify"
+msgstr "vreme koje odredite"
+
+#: ../e-util/filter.ui.h:4
+msgid "a time relative to the current time"
+msgstr "vreme u odnosu na trenutno vreme"
+
+# bug: plural-forms
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:90
+msgid "seconds"
+msgstr "sekunde"
+
+#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
+msgid "weeks"
+msgstr "nedelje"
+
+#: ../e-util/filter.ui.h:10 ../plugins/publish-calendar/publish-calendar.ui.h:8
+msgid "months"
+msgstr "meseci"
+
+#: ../e-util/filter.ui.h:11
+msgid "years"
+msgstr "godine"
+
+#: ../e-util/filter.ui.h:12
+msgid "ago"
+msgstr "pre"
+
+#: ../e-util/filter.ui.h:13
+msgid "in the future"
+msgstr "u budućnosti"
+
+#: ../e-util/filter.ui.h:14
+msgid "Show filters for mail:"
+msgstr "Prikaži propusnike pošte:"
+
+#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
+msgid "_Filter Rules"
+msgstr "Pr_avila filtera"
+
+#: ../e-util/filter.ui.h:23
+msgid "Compare against"
+msgstr "Uporedi sa"
+
+#: ../e-util/filter.ui.h:24
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Datum poruke će biti upoređen sa\n"
+"trenutnim vremenom kada se filtriranje desilo."
+
+#: ../e-util/filter.ui.h:26
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Datum poruke će biti upoređen sa\n"
+"00:00 navedenog datuma."
+
+#: ../e-util/filter.ui.h:28
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Datum poruke će biti upoređen sa\n"
+"vremenom kada se filtriranje desilo."
+
+#: ../e-util/gal-a11y-e-cell.c:130
+msgid "Table Cell"
+msgstr "Ćelija tabele"
+
 #. Translators: description of a "popup" action
 #: ../e-util/gal-a11y-e-cell-popup.c:127
 msgid "popup a child"
 msgstr "iskačuće izvedeno"
 
+#. Translators: description of an "edit" action
+#: ../e-util/gal-a11y-e-cell-text.c:631
+msgid "begin editing this cell"
+msgstr "počinje uređivanje ove ćelije"
+
 #. Translators: description of a "toggle" action
-#: ../e-util/gal-a11y-e-cell-toggle.c:179
+#: ../e-util/gal-a11y-e-cell-toggle.c:185
 msgid "toggle the cell"
 msgstr "biranje ćelije"
 
@@ -12304,10 +14940,6 @@ msgstr "razgranava red u Establo koje sdrži ovu ćeliju"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "skuplja red u Establo koje sadrži ovu ćeliju"
 
-#: ../e-util/gal-a11y-e-cell.c:122
-msgid "Table Cell"
-msgstr "Ćelija tabele"
-
 #: ../e-util/gal-a11y-e-table-click-to-add.c:71
 msgid "click"
 msgstr "klik"
@@ -12320,7 +14952,15 @@ msgstr "razvrstavanje"
 msgid "Save Current View"
 msgstr "Sačuvaj trenutni pregled"
 
-#: ../e-util/widgets.error.xml.h:1
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
+msgid "_Create new view"
+msgstr "_Napravi novi pregled"
+
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
+msgid "_Replace existing view"
+msgstr "_Zameni postojeći pregled"
+
+#: ../e-util/widgets.error.xml.h:1 ../mail/mail.error.xml.h:195
 msgid "Do you wish to save your changes?"
 msgstr "Da li želite da sačuvate izmene?"
 
@@ -12328,7 +14968,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
+#: ../e-util/widgets.error.xml.h:3 ../mail/mail.error.xml.h:197
 msgid "_Discard changes"
 msgstr "_Odbaci izmene"
 
@@ -12356,6 +14996,40 @@ msgstr "Ne mogu da učitam potpis."
 msgid "Could not save signature."
 msgstr "Ne mogu da sačuvam potpis."
 
+#: ../evolution.appdata.xml.in.h:3
+msgid ""
+"Evolution is a personal information management application that provides "
+"integrated mail, calendaring and address book functionality."
+msgstr ""
+"Evolucija je program za upravljanje ličnim podacima koji obezbeđuje objedinjenu "
+"funkcionalnost pošte, kalendara i adresara."
+
+#: ../evolution.appdata.xml.in.h:4
+msgid ""
+"Evolution supports a wide range of industry standard data formats and "
+"network protocols for information exchange, with an emphasis on standards "
+"compliance and security. Evolution can also integrate smoothly with "
+"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
+msgstr ""
+"Evolucija podržava širok opseg zapisa industrijskih standardnih podataka i "
+"mrežnih protokola za razmenu informacija, sa naglaskom na saglasnost "
+"standarda i bezebdnost. Evolucija može takođe glatko da se objedini sa "
+"Majkrosoftovom razmenom posredstvom proširenja „Usluge veb razmene“ "
+
+#: ../libemail-engine/camel-sasl-oauth2-google.c:29
+#| msgid "OAuth2"
+msgid "OAuth2 Google"
+msgstr "OAut2 Gugl"
+
+#: ../libemail-engine/camel-sasl-oauth2-google.c:30
+#| msgid ""
+#| "This option will use an OAuth 2.0 access token to connect to the server"
+msgid ""
+"This option will use an OAuth 2.0 access token to connect to the Google "
+"server"
+msgstr ""
+"Ova opcija će koristiti OAut 2.0 simbol pristupa da se poveže na server Gugla"
+
 #: ../libemail-engine/camel-sasl-xoauth2.c:26
 msgid "OAuth2"
 msgstr "OAut2"
@@ -12365,53 +15039,48 @@ msgid "This option will use an OAuth 2.0 access token to connect to the server"
 msgstr ""
 "Ova opcija će koristiti OAut 2.0 simbol pristupa da se poveže na server"
 
-#: ../libemail-engine/e-mail-authenticator.c:181
-#, c-format
-msgid "Invalid authentication result code (%d)"
-msgstr "Neispravan kod rezultata potvrđivanja identiteta (%d)"
-
-#: ../libemail-engine/e-mail-folder-utils.c:113
+#: ../libemail-engine/e-mail-folder-utils.c:115
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Čuvam poruku u fasciklu „%s“"
 
-#: ../libemail-engine/e-mail-folder-utils.c:571
+#: ../libemail-engine/e-mail-folder-utils.c:574
 msgid "Forwarded messages"
 msgstr "Prosleđene poruke"
 
-#: ../libemail-engine/e-mail-folder-utils.c:681
-#: ../libemail-engine/e-mail-folder-utils.c:932
+#: ../libemail-engine/e-mail-folder-utils.c:684
+#: ../libemail-engine/e-mail-folder-utils.c:935
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
-msgstr[0] "Dovlačim %d poruku"
-msgstr[1] "Dovlačim %d poruke"
-msgstr[2] "Dovlačim %d poruka"
-msgstr[3] "Dovlačim jednu poruku"
+msgstr[0] "Preuzimam %d poruku"
+msgstr[1] "Preuzimam %d poruke"
+msgstr[2] "Preuzimam %d poruka"
+msgstr[3] "Preuzimam poruku"
 
-#: ../libemail-engine/e-mail-folder-utils.c:775
+#: ../libemail-engine/e-mail-folder-utils.c:778
 msgid "Scanning messages for duplicates"
 msgstr "Tražim duplikate u porukama"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1145
+#: ../libemail-engine/e-mail-folder-utils.c:1148
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Uklanjam fasciklu „%s“"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1325
+#: ../libemail-engine/e-mail-folder-utils.c:1328
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Datoteka „%s“ je uklonjena."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1329
+#: ../libemail-engine/e-mail-folder-utils.c:1332
 msgid "File has been removed."
 msgstr "Datoteka je uklonjena."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1388
+#: ../libemail-engine/e-mail-folder-utils.c:1391
 msgid "Removing attachments"
 msgstr "Uklanjam priloge"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1552
+#: ../libemail-engine/e-mail-folder-utils.c:1555
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
@@ -12420,114 +15089,127 @@ msgstr[1] "Čuvam %d poruke"
 msgstr[2] "Čuvam %d poruka"
 msgstr[3] "Čuvam jednu poruku"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1930
+#: ../libemail-engine/e-mail-folder-utils.c:1933
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Neispravna putanja fascikle „%s“"
 
-#: ../libemail-engine/e-mail-session-utils.c:539
-msgid "No mail transport service available"
-msgstr "Nema dostupne usluge prenosa pošte"
-
-#: ../libemail-engine/e-mail-session-utils.c:639
-#: ../libemail-engine/mail-ops.c:707
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Neuspela primena odlaznih propusnika: %s"
-
-#: ../libemail-engine/e-mail-session-utils.c:688
-#: ../libemail-engine/mail-ops.c:750
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-msgstr ""
-"Nisam uspeo da prikačim u %s: %s\n"
-"Umesto toga prikačiću u lokalnu fasciklu „Poslato“."
-
-#: ../libemail-engine/e-mail-session-utils.c:714
-#: ../libemail-engine/mail-ops.c:774
-#, c-format
-msgid "Failed to append to local 'Sent' folder: %s"
-msgstr "Nisam uspeo da prikačim u lokalnu fasciklu „Poslato“: %s"
-
-#: ../libemail-engine/e-mail-session-utils.c:915
-#: ../libemail-engine/mail-ops.c:906 ../libemail-engine/mail-ops.c:1008
-msgid "Sending message"
-msgstr "Slanje poruke"
-
-#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:410
-#: ../mail/em-folder-tree-model.c:1160
-#: ../modules/mail/e-mail-shell-view-private.c:1060
-#: ../modules/mail/e-mail-shell-view-private.c:1071
+#. 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
 msgid "Inbox"
 msgstr "Sanduče"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:1153
-#: ../modules/mail/e-mail-shell-view-private.c:1058
+#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1222
+#: ../mail/importers/kmail-libs.c:147
+#: ../modules/mail/e-mail-shell-view-private.c:1050
 msgid "Drafts"
 msgstr "Nacrti"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:1164
-#: ../modules/mail/e-mail-shell-view-private.c:1062
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1233
+#: ../mail/importers/kmail-libs.c:143
+#: ../modules/mail/e-mail-shell-view-private.c:1054
 msgid "Outbox"
 msgstr "Za slanje"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:1168
-#: ../modules/mail/e-mail-shell-view-private.c:1064
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1237
+#: ../mail/importers/kmail-libs.c:145
+#: ../modules/mail/e-mail-shell-view-private.c:1056
 msgid "Sent"
 msgstr "Poslato"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:1156
-#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../libemail-engine/e-mail-session.c:129 ../mail/em-folder-tree-model.c:1225
+#: ../mail/importers/kmail-libs.c:149
+#: ../modules/mail/e-mail-shell-view-private.c:1058
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1080 ../plugins/templates/templates.c:1379
-#: ../plugins/templates/templates.c:1389
+#: ../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:1245
+#: ../libemail-engine/e-mail-session.c:1262
 #, c-format
 msgid "User cancelled operation"
 msgstr "Korisnik je otkazao radnju"
 
-#: ../libemail-engine/e-mail-session.c:1373
-#, c-format
-msgid "%s authentication failed"
-msgstr "Nije uspelo %s potvrđivanje identiteta"
-
-#: ../libemail-engine/e-mail-session.c:1423
-#, c-format
-msgid "No data source found for UID '%s'"
-msgstr "Nije pronađen izvor podataka za JIB „%s“"
-
-#: ../libemail-engine/e-mail-session.c:1486
+#: ../libemail-engine/e-mail-session.c:1319
 #, 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:1499
+#: ../libemail-engine/e-mail-session.c:1332
 #, 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-store-utils.c:189
+#: ../libemail-engine/e-mail-session.c:2362
+#, c-format
+msgid "Waiting for '%s'"
+msgstr "Čekam na „%s“"
+
+#: ../libemail-engine/e-mail-session-utils.c:540
+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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+msgstr ""
+"Ne mogu da prikačim u %s: %s\n"
+"Umesto toga prikačiću u lokalnu fasciklu „Poslato“."
+
+#: ../libemail-engine/e-mail-session-utils.c:751
+#: ../libemail-engine/mail-ops.c:831
+#, 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
+msgid "Sending message"
+msgstr "Slanje poruke"
+
+#: ../libemail-engine/e-mail-store-utils.c:190
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Prekidanje veze sa „%s“"
 
-#: ../libemail-engine/e-mail-store-utils.c:265
+#: ../libemail-engine/e-mail-store-utils.c:266
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Ponovno povezivanje na „%s“"
 
-#: ../libemail-engine/e-mail-store-utils.c:350
+#: ../libemail-engine/e-mail-store-utils.c:351
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Pripremam nalog „%s“ za rad van mreže"
@@ -12544,17 +15226,17 @@ msgid ""
 ">Message Filters.\n"
 "Original error was: %s"
 msgstr ""
-"Nisam uspeo 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 "
+"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"
 "Izvorna greška beše: %s"
 
 #: ../libemail-engine/mail-ops.c:229
 #, c-format
 msgid "Fetching mail from '%s'"
-msgstr "Dovlačim poštu sa „%s“"
+msgstr "Preuzimam poštu sa „%s“"
 
-#: ../libemail-engine/mail-ops.c:701
+#: ../libemail-engine/mail-ops.c:749
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -12562,64 +15244,69 @@ msgid ""
 ">Message Filters.\n"
 "Original error was: %s"
 msgstr ""
-"Nisam uspeo 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 "
+"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"
 "Izvorna greška beše: %s"
 
-#: ../libemail-engine/mail-ops.c:917
+#: ../libemail-engine/mail-ops.c:990
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Šaljem poruku %d od %d"
 
 # bug: plural-forms
-#: ../libemail-engine/mail-ops.c:969
+#: ../libemail-engine/mail-ops.c:1042
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
-msgstr[0] "Nisam uspeo da pošaljem %d od %d poruke"
-msgstr[1] "Nisam uspeo da pošaljem %d od %d poruka"
-msgstr[2] "Nisam uspeo da pošaljem %d od %d poruka"
-msgstr[3] "Nisam uspeo da pošaljem %d od %d poruke"
+msgstr[0] "Ne mogu da pošaljem %d od %d poruke"
+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:975
+#: ../libemail-engine/mail-ops.c:1048
 msgid "Canceled."
 msgstr "Otkazano."
 
-#: ../libemail-engine/mail-ops.c:977
+#: ../libemail-engine/mail-ops.c:1050
 msgid "Complete."
 msgstr "Završeno."
 
-#: ../libemail-engine/mail-ops.c:1089
+#: ../libemail-engine/mail-ops.c:1164
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Premeštam poruke u „%s“"
 
-#: ../libemail-engine/mail-ops.c:1090
+#: ../libemail-engine/mail-ops.c:1165
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Umnožavam poruke u „%s“"
 
-#: ../libemail-engine/mail-ops.c:1209
+#: ../libemail-engine/mail-ops.c:1284
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Smeštam fasciklu „%s“"
 
-#: ../libemail-engine/mail-ops.c:1337
+#: ../libemail-engine/mail-ops.c:1412
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Praznim i smeštam nalog „%s“"
 
-#: ../libemail-engine/mail-ops.c:1338
+#: ../libemail-engine/mail-ops.c:1413
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Smeštam nalog „%s“"
 
-#: ../libemail-engine/mail-ops.c:1413
+#: ../libemail-engine/mail-ops.c:1488
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Izbacujem smeće u „%s“"
 
+#: ../libemail-engine/mail-ops.c:1580
+#, c-format
+msgid "Processing folder changes in '%s'"
+msgstr "Obrađujem izmene fascikle u „%s“"
+
 #: ../libemail-engine/mail-tools.c:70
 #, c-format
 msgid "Could not create spool directory '%s': %s"
@@ -12686,83 +15373,75 @@ msgstr "Otvori naloge na _mreži"
 msgid "This account was created through the Online Accounts service."
 msgstr "Ovaj nalog je napravljen putem usluge naloga na mreži."
 
-#: ../mail/e-mail-account-manager.c:690
+#: ../mail/e-mail-account-manager.c:689
 msgid "_Reset Order"
 msgstr "_Ponovo postavi redosled"
 
-#: ../mail/e-mail-account-manager.c:703
+#: ../mail/e-mail-account-manager.c:702
 msgid "You can drag and drop account names to reorder them."
 msgstr "Možete da prevučete i ubacite nazive naloga da ih ponovo poređate."
 
-#: ../mail/e-mail-account-manager.c:746
+#: ../mail/e-mail-account-manager.c:745
 msgid "De_fault"
 msgstr "Pod_razumevano"
 
 # has "activatable" set.
-#: ../mail/e-mail-account-tree-view.c:84
-#: ../modules/mail/em-composer-prefs.c:1191
-#: ../modules/plugin-manager/evolution-plugin-manager.c:358
-#: ../plugins/publish-calendar/publish-calendar.c:896
+#: ../mail/e-mail-account-tree-view.c:83
+#: ../modules/mail/em-composer-prefs.c:1282
+#: ../modules/plugin-manager/evolution-plugin-manager.c:357
+#: ../plugins/publish-calendar/publish-calendar.c:855
 msgid "Enabled"
 msgstr "Uključen"
 
-#: ../mail/e-mail-account-tree-view.c:108
+#: ../mail/e-mail-account-tree-view.c:107
 msgid "Account Name"
 msgstr "Naziv naloga"
 
-#: ../mail/e-mail-account-tree-view.c:135
-#: ../mail/e-mail-config-security-page.c:335
-#: ../mail/e-mail-config-security-page.c:475 ../mail/e-mail-reader.c:3602
-#: ../mail/mail-config.ui.h:66
-msgid "Default"
-msgstr "Osnovno"
-
-#: ../mail/e-mail-autoconfig.c:611
+#: ../mail/e-mail-autoconfig.c:619
 msgid "No email address provided"
 msgstr "Nije dostavljena adresa el. pošte"
 
-#: ../mail/e-mail-autoconfig.c:620
+#: ../mail/e-mail-autoconfig.c:628
 msgid "Missing domain in email address"
 msgstr "Nedostaje domen u adresi el. pošte"
 
-#: ../mail/e-mail-backend.c:841
-msgid "Unknown background operation"
-msgstr "Nepoznata pozadinska radnja"
-
-#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:904
-#: ../shell/e-shell-window-actions.c:911 ../shell/e-shell-window-actions.c:918
+#: ../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:285
+#: ../mail/e-mail-browser.c:288
 msgid "(No Subject)"
 msgstr "(Bez subjekta)"
 
 #. GtkAssistant's back button label.
 #: ../mail/e-mail-config-assistant.c:46
-#| msgid "Go Back"
 msgid "Go _Back"
 msgstr "Idi _nazad"
 
 #. GtkAssistant sinks the floating button reference.
-#: ../mail/e-mail-config-assistant.c:114
+#: ../mail/e-mail-config-assistant.c:115
 msgid "_Skip Lookup"
 msgstr "_Preskoči pretragu"
 
-#: ../mail/e-mail-config-assistant.c:654
+#: ../mail/e-mail-config-assistant.c:660
 msgid "Evolution Account Assistant"
 msgstr "Pomoćnik naloga Evolucije"
 
-#: ../mail/e-mail-config-assistant.c:936
-#| msgid "_Restore Defaults"
+#: ../mail/e-mail-config-assistant.c:952
 msgid "_Revise Details"
 msgstr "_Obnovi pojedinosti"
 
-#: ../mail/e-mail-config-auth-check.c:350
+#: ../mail/e-mail-config-auth-check.c:177
+#| msgid "%s authentication failed"
+msgid "Querying authentication types..."
+msgstr "Propitujem vrste potvrđivanja identiteta..."
+
+#: ../mail/e-mail-config-auth-check.c:340
 msgid "Check for Supported Types"
 msgstr "Proverite za podržanim vrstama"
 
-#: ../mail/e-mail-config-confirm-page.c:156
+#: ../mail/e-mail-config-confirm-page.c:155
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12776,91 +15455,140 @@ msgstr ""
 "\n"
 "Kliknite „Primeni“ da sačuvate postavke."
 
-#: ../mail/e-mail-config-confirm-page.c:168
+#: ../mail/e-mail-config-confirm-page.c:167
 msgid "Done"
 msgstr "Urađeno"
 
-#: ../mail/e-mail-config-defaults-page.c:549
+#: ../mail/e-mail-config-defaults-page.c:371
+msgid "Checking server settings..."
+msgstr "Proveravam podešavanja servera..."
+
+#: ../mail/e-mail-config-defaults-page.c:489
+#| msgid "Use locale default"
+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
+msgctxt "ReplyForward"
+msgid "Attachment"
+msgstr "Priloži"
+
+#: ../mail/e-mail-config-defaults-page.c:493 ../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
+msgctxt "ReplyForward"
+msgid "Quoted"
+msgstr "Citirano"
+
+#: ../mail/e-mail-config-defaults-page.c:497 ../mail/mail-config.ui.h:29
+msgctxt "ReplyForward"
+msgid "Do Not Quote"
+msgstr "Ne citiraj"
+
+#: ../mail/e-mail-config-defaults-page.c:822
 msgid "Special Folders"
 msgstr "Posebne fascikle"
 
-#: ../mail/e-mail-config-defaults-page.c:558
+#: ../mail/e-mail-config-defaults-page.c:831
 msgid "Draft Messages _Folder:"
 msgstr "Fascikla poruka _nacrta:"
 
-#: ../mail/e-mail-config-defaults-page.c:568
+#: ../mail/e-mail-config-defaults-page.c:841
 msgid "Choose a folder for saving draft messages."
 msgstr "Izaberite fasciklu za čuvanje poruka nacrta."
 
-#: ../mail/e-mail-config-defaults-page.c:582
+#: ../mail/e-mail-config-defaults-page.c:855
 msgid "Sent _Messages Folder:"
 msgstr "Fascikla poslatih _poruka:"
 
-#: ../mail/e-mail-config-defaults-page.c:592
+#: ../mail/e-mail-config-defaults-page.c:865
 msgid "Choose a folder for saving sent messages."
 msgstr "Izaberite fasciklu za čuvanje poslatih poruka."
 
-#: ../mail/e-mail-config-defaults-page.c:611
+#: ../mail/e-mail-config-defaults-page.c:884
 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:628
+#: ../mail/e-mail-config-defaults-page.c:901
+msgid "Archi_ve Folder:"
+msgstr "Fascikla _arhive:"
+
+#: ../mail/e-mail-config-defaults-page.c:911
+#: ../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
 msgid "_Restore Defaults"
 msgstr "_Povrati osnovno"
 
-#: ../mail/e-mail-config-defaults-page.c:642
+#: ../mail/e-mail-config-defaults-page.c:946
+#| msgid "Go to Folder"
+msgid "_Lookup Folders"
+msgstr "_Pretraži fasciklu"
+
+#: ../mail/e-mail-config-defaults-page.c:964
 msgid "Use a Real Folder for _Trash:"
 msgstr "Koristi stvarnu fasciklu za _smeće:"
 
-#: ../mail/e-mail-config-defaults-page.c:643
+#: ../mail/e-mail-config-defaults-page.c:965
 msgid "Choose a folder for deleted messages."
 msgstr "Izaberite fasciklu za obrisane poruke."
 
-#: ../mail/e-mail-config-defaults-page.c:652
+#: ../mail/e-mail-config-defaults-page.c:974
 msgid "Use a Real Folder for _Junk:"
 msgstr "Koristi stvarnu fasciklu za _đubre:"
 
-#: ../mail/e-mail-config-defaults-page.c:653
+#: ../mail/e-mail-config-defaults-page.c:975
 msgid "Choose a folder for junk messages."
 msgstr "Izaberite fasciklu za nepoželjne poruke."
 
-#: ../mail/e-mail-config-defaults-page.c:670
+#: ../mail/e-mail-config-defaults-page.c:992
 msgid "Composing Messages"
 msgstr "Sastavljanje poruka"
 
-#: ../mail/e-mail-config-defaults-page.c:679
+#: ../mail/e-mail-config-defaults-page.c:1001
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr "Uvek pošalji _grafitnu kopiju (cc):"
+msgstr "Uvek pošalji _grafitnu kopiju (Cc):"
 
-#: ../mail/e-mail-config-defaults-page.c:704
+#: ../mail/e-mail-config-defaults-page.c:1026
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Uvek pošalji _nevidljivu grafitnu kopiju (Bcc):"
 
-#: ../mail/e-mail-config-defaults-page.c:739
+#: ../mail/e-mail-config-defaults-page.c:1057
+#| msgid "_Reply style:"
+msgid "Re_ply style:"
+msgstr "_Stil odgovora:"
+
+#: ../mail/e-mail-config-defaults-page.c:1093
 msgid "Message Receipts"
 msgstr "Priznanice poruke"
 
-#: ../mail/e-mail-config-defaults-page.c:748
+#: ../mail/e-mail-config-defaults-page.c:1102
 msgid "S_end message receipts:"
 msgstr "_Pošalji povratnice:"
 
-#: ../mail/e-mail-config-defaults-page.c:773
+#: ../mail/e-mail-config-defaults-page.c:1127
 msgid "Never"
 msgstr "Nikada"
 
-#: ../mail/e-mail-config-defaults-page.c:779
+#: ../mail/e-mail-config-defaults-page.c:1133
 msgid "Always"
 msgstr "Uvek"
 
-#: ../mail/e-mail-config-defaults-page.c:785
+#: ../mail/e-mail-config-defaults-page.c:1139
 msgid "Ask for each message"
 msgstr "Pitaj za svaku poruku"
 
-#: ../mail/e-mail-config-defaults-page.c:856
+#: ../mail/e-mail-config-defaults-page.c:1246
 msgid "Defaults"
 msgstr "Osnovno"
 
-#: ../mail/e-mail-config-identity-page.c:265
+#: ../mail/e-mail-config-identity-page.c:286
 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 "
@@ -12869,50 +15597,78 @@ 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:293
+#: ../mail/e-mail-config-identity-page.c:314
 #: ../mail/e-mail-config-summary-page.c:323
 msgid "Account Information"
 msgstr "Podaci o nalogu"
 
-#: ../mail/e-mail-config-identity-page.c:302
-#: ../mail/e-mail-config-summary-page.c:332
+#: ../mail/e-mail-config-identity-page.c:352
+#: ../mail/e-mail-config-summary-page.c:353
 msgid ""
-"Type the name by which you would like to refer to this account.\n"
-"For example, \"Work\" or \"Personal\"."
+"The above name will be used to identify this account.\n"
+"Use for example, \"Work\" or \"Personal\"."
 msgstr ""
-"Upišite ime po kome želite da nazovete ovaj nalog.\n"
+"Ovo ime će biti korisno za prepoznavanje naloga.\n"
 "Na primer, „Poslovni“ ili „Lični“."
 
-#: ../mail/e-mail-config-identity-page.c:347
+#: ../mail/e-mail-config-identity-page.c:369
 msgid "Required Information"
 msgstr "Obavezni podaci"
 
-#: ../mail/e-mail-config-identity-page.c:356
+#: ../mail/e-mail-config-identity-page.c:378
 msgid "Full Nam_e:"
 msgstr "_Ime i prezime:"
 
-#: ../mail/e-mail-config-identity-page.c:383
+#: ../mail/e-mail-config-identity-page.c:407
 msgid "Email _Address:"
 msgstr "Adresa _el. pošte:"
 
-#: ../mail/e-mail-config-identity-page.c:430
+#: ../mail/e-mail-config-identity-page.c:456
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Dodatni podaci"
 
-#: ../mail/e-mail-config-identity-page.c:439
+#: ../mail/e-mail-config-identity-page.c:465
 msgid "Re_ply-To:"
 msgstr "Od_govor:"
 
-#: ../mail/e-mail-config-identity-page.c:466
+#: ../mail/e-mail-config-identity-page.c:494
 msgid "Or_ganization:"
 msgstr "Or_ganizacija:"
 
-#: ../mail/e-mail-config-identity-page.c:521
+#: ../mail/e-mail-config-identity-page.c:549
 msgid "Add Ne_w Signature..."
 msgstr "Dodaj no_vi potpis..."
 
-#: ../mail/e-mail-config-lookup-page.c:67
+#: ../mail/e-mail-config-identity-page.c:567
+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 "One or more values cannot be empty."
+msgid "Full Name cannot be empty"
+msgstr "Ime i prezime ne može biti prazno"
+
+#: ../mail/e-mail-config-identity-page.c:618
+#| msgid "One or more values cannot be empty."
+msgid "Email Address cannot be empty"
+msgstr "Adresa el. pošte ne može biti prazna"
+
+#: ../mail/e-mail-config-identity-page.c:623
+msgid "Email Address is not a valid email"
+msgstr "Adresa el. pošte nije ispravna el. pošta"
+
+#: ../mail/e-mail-config-identity-page.c:635
+msgid "Reply To is not a valid email"
+msgstr "Primalac nije ispravna el. pošta"
+
+#: ../mail/e-mail-config-identity-page.c:646
+#: ../mail/e-mail-config-summary-page.c:632
+#| msgid "One or more values cannot be empty."
+msgid "Account Name cannot be empty"
+msgstr "Ime naloga ne može biti prazno"
+
+#: ../mail/e-mail-config-lookup-page.c:70
 msgid "Looking up account details..."
 msgstr "Tražim pojedinosti naloga..."
 
@@ -12924,7 +15680,7 @@ msgstr "Vršim proveru za novom poštom"
 msgid "Check for _new messages every"
 msgstr "Proveri za _novu poštu svakih"
 
-#: ../mail/e-mail-config-provider-page.c:699
+#: ../mail/e-mail-config-provider-page.c:698
 msgid "Receiving Options"
 msgstr "Opcije za primanje"
 
@@ -12932,100 +15688,115 @@ msgstr "Opcije za primanje"
 msgid "Receiving Email"
 msgstr "Primanje pošte"
 
-#: ../mail/e-mail-config-security-page.c:260
-#: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:26
+#. Translators: This string is to describe a PGP key in a combo box in mail account's preferences.
+#. The first '%s' is a key ID, the second '%s' is a display name of the key.
+#: ../mail/e-mail-config-security-page.c:251
+#, c-format
+msgctxt "PGPKeyDescription"
+msgid "%s - %s"
+msgstr "%s - %s"
+
+#: ../mail/e-mail-config-security-page.c:340 ../mail/em-folder-properties.c:603
+#: ../mail/mail-config.ui.h:31
 #: ../modules/addressbook/autocompletion-config.c:113
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
-#: ../modules/itip-formatter/plugin/config-ui.c:90
+#: ../modules/calendar/e-calendar-preferences.c:620
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "Opšte"
 
-#: ../mail/e-mail-config-security-page.c:269
+#: ../mail/e-mail-config-security-page.c:349
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ne potpisuj zahteve za s_astanke (Autluk kompatibilnost)"
 
-#: ../mail/e-mail-config-security-page.c:291
+#: ../mail/e-mail-config-security-page.c:371
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "Prilično dobra privatnost (OpenPGP)"
 
-#: ../mail/e-mail-config-security-page.c:300
+#: ../mail/e-mail-config-security-page.c:380
 msgid "OpenPGP _Key ID:"
 msgstr "IB OpenPGP _ključa:"
 
-#: ../mail/e-mail-config-security-page.c:322
+#: ../mail/e-mail-config-security-page.c:413
 msgid "Si_gning algorithm:"
 msgstr "Algoritam _potpisivanja:"
 
-#: ../mail/e-mail-config-security-page.c:338
-#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:67
+#: ../mail/e-mail-config-security-page.c:429
+#: ../mail/e-mail-config-security-page.c:593 ../mail/mail-config.ui.h:74
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../mail/e-mail-config-security-page.c:341
-#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:68
+#: ../mail/e-mail-config-security-page.c:432
+#: ../mail/e-mail-config-security-page.c:596 ../mail/mail-config.ui.h:75
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../mail/e-mail-config-security-page.c:344
-#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:69
+#: ../mail/e-mail-config-security-page.c:435
+#: ../mail/e-mail-config-security-page.c:599 ../mail/mail-config.ui.h:76
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../mail/e-mail-config-security-page.c:347
-#: ../mail/e-mail-config-security-page.c:487 ../mail/mail-config.ui.h:70
+#: ../mail/e-mail-config-security-page.c:438
+#: ../mail/e-mail-config-security-page.c:602 ../mail/mail-config.ui.h:77
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/e-mail-config-security-page.c:363
+#: ../mail/e-mail-config-security-page.c:454
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "_Uvek potpiši odlazeće poruke sa ovog naloga"
 
-#: ../mail/e-mail-config-security-page.c:375
+#: ../mail/e-mail-config-security-page.c:466
+msgid "Always enc_rypt outgoing messages when using this account"
+msgstr "Uvek _šifruj odlazeće poruke sa ovog naloga"
+
+#: ../mail/e-mail-config-security-page.c:478
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Uv_ek i meni šifruj pri slanju šifrovane pošte"
 
-#: ../mail/e-mail-config-security-page.c:387
+#: ../mail/e-mail-config-security-page.c:490
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Uvek _veruj ključevima mog priveska pri šifrovanju"
 
-#: ../mail/e-mail-config-security-page.c:411
+#: ../mail/e-mail-config-security-page.c:502
+msgid "Prefer _inline sign/encrypt for plain text messages"
+msgstr ""
+
+#: ../mail/e-mail-config-security-page.c:526
 msgid "Secure MIME (S/MIME)"
 msgstr "Sigurni MIME (S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:420
+#: ../mail/e-mail-config-security-page.c:535
 msgid "Sig_ning certificate:"
 msgstr "Uverenje _potpisivanja:"
 
-#: ../mail/e-mail-config-security-page.c:444
-#: ../mail/e-mail-config-security-page.c:550
+#: ../mail/e-mail-config-security-page.c:559
+#: ../mail/e-mail-config-security-page.c:665
 msgid "Select"
 msgstr "Izaberi"
 
-#: ../mail/e-mail-config-security-page.c:453
-#: ../mail/e-mail-config-security-page.c:559 ../mail/mail-dialogs.ui.h:5
-#: ../shell/e-shell-window-actions.c:1007
-#| msgid "_Clear Flag"
+#: ../mail/e-mail-config-security-page.c:568
+#: ../mail/e-mail-config-security-page.c:674 ../mail/mail-dialogs.ui.h:5
+#: ../shell/e-shell-window-actions.c:876
 msgid "_Clear"
 msgstr "_Očisti"
 
-#: ../mail/e-mail-config-security-page.c:462
+#: ../mail/e-mail-config-security-page.c:577
 msgid "Signing _algorithm:"
 msgstr "Algoritam p_otpisa:"
 
-#: ../mail/e-mail-config-security-page.c:503
+#: ../mail/e-mail-config-security-page.c:618
 msgid "Always sign outgoing messages when using this account"
 msgstr "Uvek potpiši odlazeće poruke sa ovog naloga"
 
-#: ../mail/e-mail-config-security-page.c:526
+#: ../mail/e-mail-config-security-page.c:641
 msgid "Encryption certificate:"
 msgstr "Uverenje za šifrovanje:"
 
-#: ../mail/e-mail-config-security-page.c:568
+#: ../mail/e-mail-config-security-page.c:683
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "Uvek šifruj odlazeće poruke sa ovog naloga"
 
-#: ../mail/e-mail-config-security-page.c:588
+#: ../mail/e-mail-config-security-page.c:703
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "Uvek meni samom šifruj pri slanju šifrovane pošte"
 
@@ -13033,63 +15804,63 @@ msgstr "Uvek meni samom šifruj pri slanju šifrovane pošte"
 msgid "Sending Email"
 msgstr "Slanje pošte"
 
-#: ../mail/e-mail-config-service-page.c:639
+#: ../mail/e-mail-config-service-page.c:638
 msgid "Server _Type:"
 msgstr "_Vrsta servera:"
 
-#: ../mail/e-mail-config-summary-page.c:141
-msgid "SSL"
-msgstr "SSL"
-
-#: ../mail/e-mail-config-summary-page.c:144
+#: ../mail/e-mail-config-summary-page.c:142
 msgid "TLS"
 msgstr "TLS"
 
+#: ../mail/e-mail-config-summary-page.c:145
+msgid "STARTTLS"
+msgstr "STARTTLS"
+
 #: ../mail/e-mail-config-summary-page.c:306
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr ""
 "Ovo je sažetak podešavanja koja će biti korišćena za pristup vašoj pošti."
 
-#: ../mail/e-mail-config-summary-page.c:371
+#: ../mail/e-mail-config-summary-page.c:370
 msgid "Personal Details"
 msgstr "Lični podaci"
 
-#: ../mail/e-mail-config-summary-page.c:380
+#: ../mail/e-mail-config-summary-page.c:379
 msgid "Full Name:"
 msgstr "Ime i prezime:"
 
-#: ../mail/e-mail-config-summary-page.c:394
+#: ../mail/e-mail-config-summary-page.c:393
 msgid "Email Address:"
 msgstr "Adresa el. pošte:"
 
-#: ../mail/e-mail-config-summary-page.c:408
+#: ../mail/e-mail-config-summary-page.c:407
 msgid "Receiving"
 msgstr "Primanje"
 
-#: ../mail/e-mail-config-summary-page.c:420
+#: ../mail/e-mail-config-summary-page.c:419
 msgid "Sending"
 msgstr "Slanje"
 
-#: ../mail/e-mail-config-summary-page.c:432
+#: ../mail/e-mail-config-summary-page.c:431
 msgid "Server Type:"
 msgstr "Vrsta servera:"
 
-#: ../mail/e-mail-config-summary-page.c:453
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
+#: ../mail/e-mail-config-summary-page.c:452
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:605
 msgid "Server:"
 msgstr "Server:"
 
-#: ../mail/e-mail-config-summary-page.c:474
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:696
+#: ../mail/e-mail-config-summary-page.c:473
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:703
 msgid "Username:"
 msgstr "Korisničko ime:"
 
-#: ../mail/e-mail-config-summary-page.c:495
+#: ../mail/e-mail-config-summary-page.c:494
 msgid "Security:"
 msgstr "Bezbednost:"
 
-#: ../mail/e-mail-config-summary-page.c:786
+#: ../mail/e-mail-config-summary-page.c:787
 msgid "Account Summary"
 msgstr "Sažetak naloga"
 
@@ -13097,9 +15868,9 @@ msgstr "Sažetak naloga"
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Continue\" to begin."
+"Click \"Next\" to begin."
 msgstr ""
-"Dobrodošli u Pomoćnika podešavanja pošte Evolucije.\n"
+"Dobrodošli u Pomoćnika podešavanja pošte unutar Evolucije.\n"
 "\n"
 "Kliknite „Nastavi“ da započnete."
 
@@ -13108,37 +15879,93 @@ msgstr ""
 msgid "Welcome"
 msgstr "Dobrodošli"
 
-#: ../mail/e-mail-config-window.c:326
+#: ../mail/e-mail-config-window.c:325
 msgid "Account Editor"
 msgstr "Uređivač naloga"
 
-#: ../mail/e-mail-display.c:95
+#: ../mail/e-mail-display.c:104
 msgid "_Add to Address Book..."
 msgstr "_Dodaj u adresar..."
 
-#: ../mail/e-mail-display.c:102
+#: ../mail/e-mail-display.c:111
 msgid "_To This Address"
 msgstr "_Na ovu adresu"
 
-#: ../mail/e-mail-display.c:109
+#: ../mail/e-mail-display.c:118
 msgid "_From This Address"
 msgstr "_Sa ove adrese"
 
-#: ../mail/e-mail-display.c:116
+#: ../mail/e-mail-display.c:125
 msgid "Send _Reply To..."
 msgstr "_Pošalji odgovor..."
 
-#: ../mail/e-mail-display.c:118
+#: ../mail/e-mail-display.c:127
 msgid "Send a reply message to this address"
 msgstr "Pošaljite poruku odgovora na ovu adresu"
 
-#: ../mail/e-mail-display.c:125
+#: ../mail/e-mail-display.c:134
 msgid "Create Search _Folder"
 msgstr "Napravi fasciklu _pretrage"
 
-#. Label + combo box has a 12px left margin so it's
-#. * aligned with the junk mail options above it.
-#: ../mail/e-mail-junk-options.c:297
+#: ../mail/e-mail-folder-create-dialog.c:327
+msgid "Create Folder"
+msgstr "Napravi fasciklu"
+
+#: ../mail/e-mail-folder-create-dialog.c:331
+msgid "Specify where to create the folder:"
+msgstr "Navedite gde napraviti fasciklu:"
+
+#: ../mail/e-mail-folder-create-dialog.c:334
+msgid "C_reate"
+msgstr "_Napravi"
+
+#: ../mail/e-mail-folder-create-dialog.c:351
+msgid "Folder _name:"
+msgstr "Naziv _fascikle:"
+
+#. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
+#. The translated value should not contain spaces.
+#: ../mail/e-mail-free-form-exp.c:236
+msgctxt "ffe"
+msgid "Answered"
+msgstr "Odgovoreno"
+
+#: ../mail/e-mail-free-form-exp.c:237
+msgctxt "ffe"
+msgid "Deleted"
+msgstr "Obrisano"
+
+#: ../mail/e-mail-free-form-exp.c:238
+msgctxt "ffe"
+msgid "Draft"
+msgstr "Nacrt"
+
+#: ../mail/e-mail-free-form-exp.c:239
+msgctxt "ffe"
+msgid "Flagged"
+msgstr "Označeno"
+
+#: ../mail/e-mail-free-form-exp.c:240
+msgctxt "ffe"
+msgid "Seen"
+msgstr "Viđeno"
+
+#: ../mail/e-mail-free-form-exp.c:241
+msgctxt "ffe"
+msgid "Attachment"
+msgstr "Prilog"
+
+#: ../mail/e-mail-free-form-exp.c:489
+msgctxt "ffe"
+msgid "no"
+msgstr "ne"
+
+#: ../mail/e-mail-free-form-exp.c:490
+msgctxt "ffe"
+msgid "false"
+msgstr "netačno"
+
+#: ../mail/e-mail-junk-options.c:295
 msgid "Junk filtering software:"
 msgstr "Softver za filtriranje nepoželjne:"
 
@@ -13146,12 +15973,12 @@ msgstr "Softver za filtriranje nepoželjne:"
 msgid "_Label name:"
 msgstr "Naziv _oznake:"
 
-#: ../mail/e-mail-label-list-store.c:56
+#: ../mail/e-mail-label-list-store.c:57
 msgid "I_mportant"
 msgstr "_Važno"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:57
+#: ../mail/e-mail-label-list-store.c:58
 msgid "_Work"
 msgstr "Po_sao"
 
@@ -13159,22 +15986,22 @@ msgstr "Po_sao"
 # Create the default Person task list
 # orange
 #. orange
-#: ../mail/e-mail-label-list-store.c:58
+#: ../mail/e-mail-label-list-store.c:59
 msgid "_Personal"
 msgstr "L_ično"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:59
+#: ../mail/e-mail-label-list-store.c:60
 msgid "_To Do"
 msgstr "Za uradi_ti"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:60
+#: ../mail/e-mail-label-list-store.c:61
 msgid "_Later"
 msgstr "Kasni_je"
 
 #: ../mail/e-mail-label-manager.c:171
-#: ../modules/mail/e-mail-shell-view-actions.c:1028
+#: ../modules/mail/e-mail-shell-view-actions.c:1143
 msgid "Add Label"
 msgstr "Dodajte natpis"
 
@@ -13194,635 +16021,772 @@ msgstr ""
 msgid "Color"
 msgstr "Boja"
 
-#: ../mail/e-mail-print-config-headers.c:166
+#: ../mail/e-mail-notes.c:310 ../mail/e-mail-notes.c:692
+#| msgid "Messages To"
+msgid "Message Note"
+msgstr "Napomena poruke"
+
+#: ../mail/e-mail-notes.c:612
+#| msgid "Copying messages into folder %s"
+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
+msgid "Storing changes..."
+msgstr "Smeštam izmene..."
+
+#: ../mail/e-mail-notes.c:940
+#| msgid "_Edit Message"
+msgid "Edit Message Note"
+msgstr "Uredite napomenu poruke"
+
+#: ../mail/e-mail-notes.c:1058
+#| msgid "Retrieving message"
+msgid "Retrieving message..."
+msgstr "Preuzimam poruku..."
+
+#: ../mail/e-mail-print-config-headers.c:165
 msgid "Move selected headers to top"
 msgstr "Premestite izabrana zaglavlja na vrh"
 
-#: ../mail/e-mail-print-config-headers.c:171
+#: ../mail/e-mail-print-config-headers.c:170
 msgid "Move selected headers up one row"
 msgstr "Premestite izabrana zaglavlja jedan red na gore"
 
-#: ../mail/e-mail-print-config-headers.c:176
+#: ../mail/e-mail-print-config-headers.c:175
 msgid "Move selected headers down one row"
 msgstr "Premestite izabrana zaglavlja jedan red na dole"
 
-#: ../mail/e-mail-print-config-headers.c:181
+#: ../mail/e-mail-print-config-headers.c:180
 msgid "Move selected headers to bottom"
 msgstr "Premestite izabrana zaglavlja na dno"
 
-#: ../mail/e-mail-print-config-headers.c:186
+#: ../mail/e-mail-print-config-headers.c:185
 msgid "Select all headers"
 msgstr "Izaberite sva zaglavlja"
 
-#: ../mail/e-mail-print-config-headers.c:205
+#: ../mail/e-mail-print-config-headers.c:204
 msgid "Header Name"
 msgstr "Naziv zaglavlja"
 
-#: ../mail/e-mail-print-config-headers.c:214
+#: ../mail/e-mail-print-config-headers.c:213
 msgid "Header Value"
 msgstr "Vrednost zaglavlja"
 
-#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:106
+#: ../mail/e-mail-printer.c:113 ../mail/mail-config.ui.h:123
 msgid "Headers"
 msgstr "Zaglavlja"
 
-#: ../mail/e-mail-printer.c:166
+#: ../mail/e-mail-printer.c:155
 #, c-format
 msgid "Page %d of %d"
 msgstr "Stranica %d od %d"
 
-#: ../mail/e-mail-reader.c:348 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:352 ../mail/filtertypes.xml.in.h:65
+msgid "Move to Folder"
+msgstr "Premesti u fasciklu"
+
+#: ../mail/e-mail-reader.c:352 ../mail/filtertypes.xml.in.h:66
 msgid "Copy to Folder"
 msgstr "Umnoži u fasciklu"
 
-#: ../mail/e-mail-reader.c:348 ../mail/em-folder-utils.c:505
+#: ../mail/e-mail-reader.c:356 ../mail/em-folder-utils.c:487
+#: ../mail/mail.error.xml.h:146
+msgid "_Move"
+msgstr "Pre_mesti"
+
+#: ../mail/e-mail-reader.c:356 ../mail/em-folder-utils.c:487
 msgid "C_opy"
 msgstr "_Umnoži"
 
-#: ../mail/e-mail-reader.c:848 ../mail/em-filter-i18n.h:33
-msgid "Move to Folder"
-msgstr "Premesti u fasciklu"
-
-#: ../mail/e-mail-reader.c:848 ../mail/em-folder-utils.c:505
-msgid "_Move"
-msgstr "Pre_mesti"
+#: ../mail/e-mail-reader.c:488
+#| msgid "Deleting old messages"
+msgid "Deleting message note..."
+msgstr "Brišem napomenu poruke..."
 
-#: ../mail/e-mail-reader.c:1174 ../mail/e-mail-reader.c:1386
-#: ../mail/e-mail-reader.c:1426
+#: ../mail/e-mail-reader.c:1271 ../mail/e-mail-reader.c:1483
+#: ../mail/e-mail-reader.c:1523
 msgid "_Do not ask me again."
 msgstr "_Ne pitaj me ponovo."
 
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1529
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Uvek zanemari „Odgovor-za:“ za dopisne liste."
 
-#: ../mail/e-mail-reader.c:1634
+#: ../mail/e-mail-reader.c:1732
 msgid "Failed to retrieve message:"
-msgstr "Nisam uspeo da dovučem poruku:"
+msgstr "Ne mogu da dovučem poruku:"
 
-#: ../mail/e-mail-reader.c:1674 ../mail/e-mail-reader.c:2843
+#: ../mail/e-mail-reader.c:1777 ../mail/e-mail-reader.c:3158
 #, c-format
 msgid "Retrieving message '%s'"
-msgstr "Dovlačim poruku „%s“"
+msgstr "Preuzimam poruku „%s“"
 
-#: ../mail/e-mail-reader.c:1862
+#: ../mail/e-mail-reader.c:1965
 msgid "A_dd Sender to Address Book"
 msgstr "Do_daj pošiljaoca u adresar"
 
-#: ../mail/e-mail-reader.c:1864
+#: ../mail/e-mail-reader.c:1967
 msgid "Add sender to address book"
 msgstr "Dodaj pošiljaoca u adresar"
 
-#: ../mail/e-mail-reader.c:1869
+#: ../mail/e-mail-reader.c:1972
+msgid "_Archive..."
+msgstr "_Arhiva..."
+
+#: ../mail/e-mail-reader.c:1974
+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
 msgid "Check for _Junk"
 msgstr "Proveri da li ima _đubreta"
 
-#: ../mail/e-mail-reader.c:1871
+#: ../mail/e-mail-reader.c:1981
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrira da li među izabranim porukama ima đubreta"
 
-#: ../mail/e-mail-reader.c:1876
+#: ../mail/e-mail-reader.c:1986
 msgid "_Copy to Folder..."
 msgstr "_Umnoži u fasciklu..."
 
-#: ../mail/e-mail-reader.c:1878
+#: ../mail/e-mail-reader.c:1988
 msgid "Copy selected messages to another folder"
 msgstr "Umnožava izabrane poruke u drugu fasciklu"
 
-#: ../mail/e-mail-reader.c:1883
+#: ../mail/e-mail-reader.c:1993
 msgid "_Delete Message"
 msgstr "_Obriši poruku"
 
-#: ../mail/e-mail-reader.c:1885
+#: ../mail/e-mail-reader.c:1995
 msgid "Mark the selected messages for deletion"
 msgstr "Označite izabranu(e) poruku(e) za brisanje"
 
-#: ../mail/e-mail-reader.c:1890
+#: ../mail/e-mail-reader.c:2000
+#| msgid "_Add Attachment..."
+msgid "_Add note..."
+msgstr "_Dodaj belešku..."
+
+#: ../mail/e-mail-reader.c:2002
+#| msgid "Create a new memo from the selected message"
+msgid "Add a note for the selected message"
+msgstr "Dodajte belešku za izabranu poruku"
+
+#: ../mail/e-mail-reader.c:2007
+#| msgid "Delete Memo"
+msgid "Delete no_te"
+msgstr "Obriši _belešku"
+
+#: ../mail/e-mail-reader.c:2009
+#| msgid "Create a new event from the selected message"
+msgid "Delete the note for the selected message"
+msgstr "Obrišite belešku za izabranu poruku"
+
+#: ../mail/e-mail-reader.c:2014
+msgid "_Edit note..."
+msgstr "_Uredi belešku..."
+
+#: ../mail/e-mail-reader.c:2016
+#| msgid "Create a new memo from the selected message"
+msgid "Edit a note for the selected message"
+msgstr "Uredite belešku za izabranu poruku"
+
+#: ../mail/e-mail-reader.c:2021
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Napravi pravilo propusnika za dopisnu _listu..."
 
-#: ../mail/e-mail-reader.c:1892
+#: ../mail/e-mail-reader.c:2023
 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:1897
+#: ../mail/e-mail-reader.c:2028
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Napravi pravilo propusnika za _primaoce..."
 
-#: ../mail/e-mail-reader.c:1899
+#: ../mail/e-mail-reader.c:2030
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Napravite pravilo za propuštanje poruka ovim primaocima"
 
-#: ../mail/e-mail-reader.c:1904
+#: ../mail/e-mail-reader.c:2035
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Napravi pravilo propusnika za _pošiljaoca..."
 
-#: ../mail/e-mail-reader.c:1906
+#: ../mail/e-mail-reader.c:2037
 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:1911
+#: ../mail/e-mail-reader.c:2042
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Napravi pravilo propusnika za _naslov..."
 
-#: ../mail/e-mail-reader.c:1913
+#: ../mail/e-mail-reader.c:2044
 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:1918
+#: ../mail/e-mail-reader.c:2049
 msgid "A_pply Filters"
 msgstr "Pri_meni propusnike"
 
-#: ../mail/e-mail-reader.c:1920
+#: ../mail/e-mail-reader.c:2051
 msgid "Apply filter rules to the selected messages"
 msgstr "Primenite pravila propuštanja na izabrane poruke"
 
-#: ../mail/e-mail-reader.c:1925
+#: ../mail/e-mail-reader.c:2056
 msgid "_Find in Message..."
 msgstr "P_ronađi u poruci..."
 
-#: ../mail/e-mail-reader.c:1927
+#: ../mail/e-mail-reader.c:2058
 msgid "Search for text in the body of the displayed message"
 msgstr "Potražite tekst u telu prikazane poruke"
 
-#: ../mail/e-mail-reader.c:1932
+#: ../mail/e-mail-reader.c:2063
 msgid "_Clear Flag"
 msgstr "Sklo_ni oznaku"
 
-#: ../mail/e-mail-reader.c:1934
+#: ../mail/e-mail-reader.c:2065
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Uklonite oznaku za praćenje sa izabranih poruka"
 
-#: ../mail/e-mail-reader.c:1939
+#: ../mail/e-mail-reader.c:2070
 msgid "_Flag Completed"
 msgstr "Označ_i kao završeno"
 
-#: ../mail/e-mail-reader.c:1941
+#: ../mail/e-mail-reader.c:2072
 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:1946
+#: ../mail/e-mail-reader.c:2077
 msgid "Follow _Up..."
 msgstr "Sle_di..."
 
-#: ../mail/e-mail-reader.c:1948
+#: ../mail/e-mail-reader.c:2079
 msgid "Flag the selected messages for follow-up"
 msgstr "Označite izabrane poruke za praćenje"
 
-#: ../mail/e-mail-reader.c:1953
+#: ../mail/e-mail-reader.c:2084
 msgid "_Attached"
 msgstr "Pri_loženo"
 
-#: ../mail/e-mail-reader.c:1955 ../mail/e-mail-reader.c:1962
+#: ../mail/e-mail-reader.c:2086 ../mail/e-mail-reader.c:2093
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Prosledite izabranu poruku nekome kao prilog"
 
-#: ../mail/e-mail-reader.c:1960
+#: ../mail/e-mail-reader.c:2091
 msgid "Forward As _Attached"
 msgstr "Prosledi kao _prilog"
 
-#: ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:2098
 msgid "_Inline"
 msgstr "Unut_ar"
 
-#: ../mail/e-mail-reader.c:1969 ../mail/e-mail-reader.c:1976
+#: ../mail/e-mail-reader.c:2100 ../mail/e-mail-reader.c:2107
 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:1974
+#: ../mail/e-mail-reader.c:2105
 msgid "Forward As _Inline"
 msgstr "Prosledi kao _unutar poruke"
 
-#: ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:2112
 msgid "_Quoted"
 msgstr "_Citirano"
 
-#: ../mail/e-mail-reader.c:1983 ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:2114 ../mail/e-mail-reader.c:2121
 msgid "Forward the selected message quoted like a reply"
 msgstr "Prosledite izabranu poruku citiranu kao odgovor"
 
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:2119
 msgid "Forward As _Quoted"
 msgstr "Prosledi kao _citat"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:2126
 msgid "_Load Images"
 msgstr "_Učitaj slike"
 
-#: ../mail/e-mail-reader.c:1997
+#: ../mail/e-mail-reader.c:2128
 msgid "Force images in HTML mail to be loaded"
 msgstr "Prisilite učitavanje slika u HTML porukama"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2133 ../mail/e-mail-reader.c:2523
+msgid "_Ignore Subthread"
+msgstr "Za_nemari podraspravu"
+
+#: ../mail/e-mail-reader.c:2135
+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
+msgid "_Ignore Thread"
+msgstr "_Zanemari raspravu"
+
+#: ../mail/e-mail-reader.c:2142
+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
 msgid "_Important"
 msgstr "_Važno"
 
-#: ../mail/e-mail-reader.c:2004
+#: ../mail/e-mail-reader.c:2149
 msgid "Mark the selected messages as important"
-msgstr "Označite izabranu(e) poruku(e) kao važno"
+msgstr "Označava izabranu poruku kao važnu"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:2154
 msgid "_Junk"
 msgstr "_Đubre"
 
-#: ../mail/e-mail-reader.c:2011
+#: ../mail/e-mail-reader.c:2156
 msgid "Mark the selected messages as junk"
-msgstr "Označite izabranu(e) poruku(e) kao neželjenu poštu"
+msgstr "Označava izabranu poruku kao neželjenu poštu"
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:2161
 msgid "_Not Junk"
 msgstr "Ni_je đubre"
 
-#: ../mail/e-mail-reader.c:2018
+#: ../mail/e-mail-reader.c:2163
 msgid "Mark the selected messages as not being junk"
-msgstr "Označite izabranu(e) poruku(e) da nije neželjena pošta"
+msgstr "Označava izabranu poruku kao poželjnu poštu"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:2168
 msgid "_Read"
-msgstr "Pro_čitaj"
+msgstr "Pro_čitano"
 
-#: ../mail/e-mail-reader.c:2025
+#: ../mail/e-mail-reader.c:2170
 msgid "Mark the selected messages as having been read"
-msgstr "Označite izabranu(e) poruku(e) kao pročitano"
+msgstr "Označava izabranu poruku kao pročitanu"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:2175 ../mail/e-mail-reader.c:2547
+msgid "Do not _Ignore Subthread"
+msgstr "Ne zanema_ruj podrasprave"
+
+#: ../mail/e-mail-reader.c:2177
+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
+msgid "Do not _Ignore Thread"
+msgstr "Ne zanemar_uj rasprave"
+
+#: ../mail/e-mail-reader.c:2184
+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
 msgid "Uni_mportant"
 msgstr "Ne_važno"
 
-#: ../mail/e-mail-reader.c:2032
+#: ../mail/e-mail-reader.c:2191
 msgid "Mark the selected messages as unimportant"
 msgstr "Označite izabranu(e) poruku(e) kao nevažno"
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:2196
 msgid "_Unread"
 msgstr "_Nepročitano"
 
-#: ../mail/e-mail-reader.c:2039
+#: ../mail/e-mail-reader.c:2198
 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:2044
+#: ../mail/e-mail-reader.c:2203
 msgid "_Edit as New Message..."
 msgstr "_Uredi kao novu poruku..."
 
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:2205
 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:2051
+#: ../mail/e-mail-reader.c:2210
 msgid "Compose _New Message"
 msgstr "Sastavi _novu poruku"
 
-#: ../mail/e-mail-reader.c:2053
+#: ../mail/e-mail-reader.c:2212
 msgid "Open a window for composing a mail message"
 msgstr "Otvorite prozor za sastavljanje poruke"
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:2217
 msgid "_Open in New Window"
 msgstr "_Otvori u novom prozoru"
 
-#: ../mail/e-mail-reader.c:2060
+#: ../mail/e-mail-reader.c:2219
 msgid "Open the selected messages in a new window"
 msgstr "Otvorite izabrane poruke u novom prozoru"
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:2224
 msgid "_Move to Folder..."
 msgstr "_Premesti u fasciklu..."
 
-#: ../mail/e-mail-reader.c:2067
+#: ../mail/e-mail-reader.c:2226
 msgid "Move selected messages to another folder"
 msgstr "Premestite izabranu(e) poruku(e) u drugu fasciklu"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:2231
 msgid "_Next Message"
 msgstr "_Sledeća poruka"
 
-#: ../mail/e-mail-reader.c:2074
+#: ../mail/e-mail-reader.c:2233
 msgid "Display the next message"
 msgstr "Prikažite sledeću poruku"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:2238
 msgid "Next _Important Message"
 msgstr "Sledeća _važna poruka"
 
-#: ../mail/e-mail-reader.c:2081
+#: ../mail/e-mail-reader.c:2240
 msgid "Display the next important message"
 msgstr "Prikažite sledeću važnu poruku"
 
-#: ../mail/e-mail-reader.c:2086
+#: ../mail/e-mail-reader.c:2245
 msgid "Next _Thread"
 msgstr "_Sledeća rasprava"
 
-#: ../mail/e-mail-reader.c:2088
+#: ../mail/e-mail-reader.c:2247
 msgid "Display the next thread"
 msgstr "Prikažite sledeću raspravu"
 
-#: ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:2252
 msgid "Next _Unread Message"
 msgstr "Sledeća _nepročitana poruka"
 
-#: ../mail/e-mail-reader.c:2095
+#: ../mail/e-mail-reader.c:2254
 msgid "Display the next unread message"
 msgstr "Prikažite sledeću nepročitanu poruku"
 
-#: ../mail/e-mail-reader.c:2100
+#: ../mail/e-mail-reader.c:2259
 msgid "_Previous Message"
 msgstr "_Prethodna poruka"
 
-#: ../mail/e-mail-reader.c:2102
+#: ../mail/e-mail-reader.c:2261
 msgid "Display the previous message"
 msgstr "Prikažite prethodnu poruku"
 
-#: ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:2266
 msgid "Pr_evious Important Message"
 msgstr "Pr_ethodna važna poruka"
 
-#: ../mail/e-mail-reader.c:2109
+#: ../mail/e-mail-reader.c:2268
 msgid "Display the previous important message"
 msgstr "Prikažite prethodnu važnu poruku"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2273
 msgid "Previous T_hread"
 msgstr "_Prethodna tema"
 
-#: ../mail/e-mail-reader.c:2116
+#: ../mail/e-mail-reader.c:2275
 msgid "Display the previous thread"
 msgstr "Prikažite prethodnu temu"
 
-#: ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2280
 msgid "P_revious Unread Message"
 msgstr "P_rethodna nepročitana poruka"
 
-#: ../mail/e-mail-reader.c:2123
+#: ../mail/e-mail-reader.c:2282
 msgid "Display the previous unread message"
 msgstr "Prikažite prethodnu nepročitanu poruku"
 
-#: ../mail/e-mail-reader.c:2130
+#: ../mail/e-mail-reader.c:2289
 msgid "Print this message"
 msgstr "Štampajte ovu poruku"
 
-#: ../mail/e-mail-reader.c:2137
+#: ../mail/e-mail-reader.c:2296
 msgid "Preview the message to be printed"
 msgstr "Pregledajte poruku pred štampu"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2301
 msgid "Re_direct"
 msgstr "Preu_smeri"
 
-#: ../mail/e-mail-reader.c:2144
+#: ../mail/e-mail-reader.c:2303
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Preusmerite (bez čitanja) izabranu poruku nekome"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2308
 msgid "Remo_ve Attachments"
 msgstr "_Ukloni priloge"
 
-#: ../mail/e-mail-reader.c:2151
+#: ../mail/e-mail-reader.c:2310
 msgid "Remove attachments"
 msgstr "Uklonite priloge"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2315
 msgid "Remove Du_plicate Messages"
 msgstr "Ukloni _duplirane poruke"
 
-#: ../mail/e-mail-reader.c:2158
+#: ../mail/e-mail-reader.c:2317
 msgid "Checks selected messages for duplicates"
 msgstr "Proverite izabrane poruke za duplikate"
 
-#: ../mail/e-mail-reader.c:2163 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1546
+#: ../mail/e-mail-reader.c:2322 ../mail/mail.error.xml.h:28
+#: ../modules/calendar/e-cal-shell-view-actions.c:1432
 #: ../modules/mail/e-mail-attachment-handler.c:213
 msgid "Reply to _All"
 msgstr "Odgovori _svima"
 
-#: ../mail/e-mail-reader.c:2165
+#: ../mail/e-mail-reader.c:2324
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Sastavite odgovor svim primaocima izabrane poruke"
 
-#: ../mail/e-mail-reader.c:2170 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2329 ../mail/mail.error.xml.h:26
 msgid "Reply to _List"
 msgstr "Odgovori na _listu"
 
-#: ../mail/e-mail-reader.c:2172
+#: ../mail/e-mail-reader.c:2331
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Sastavite odgovor dopisnoj listi izabrane poruke"
 
-#: ../mail/e-mail-reader.c:2177
-#: ../modules/mail/e-mail-attachment-handler.c:220
+#: ../mail/e-mail-reader.c:2336 ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljaocu"
 
-#: ../mail/e-mail-reader.c:2179
+#: ../mail/e-mail-reader.c:2338
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Sastavite odgovor pošiljaocu izabrane poruke"
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2343
 msgid "_Save as mbox..."
 msgstr "_Sačuvaj kao mboks..."
 
-#: ../mail/e-mail-reader.c:2186
+#: ../mail/e-mail-reader.c:2345
 msgid "Save selected messages as an mbox file"
 msgstr "Sačuvajte izabrane poruke kao „mbox“ datoteku"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2350
 msgid "_Message Source"
 msgstr "Izvo_rni kod poruke"
 
-#: ../mail/e-mail-reader.c:2193
+#: ../mail/e-mail-reader.c:2352
 msgid "Show the raw email source of the message"
 msgstr "Prikažite izvorni kod elektronske poruke"
 
-#: ../mail/e-mail-reader.c:2205
+#: ../mail/e-mail-reader.c:2364
 msgid "_Undelete Message"
 msgstr "P_ovrati poruku"
 
-#: ../mail/e-mail-reader.c:2207
+#: ../mail/e-mail-reader.c:2366
 msgid "Undelete the selected messages"
 msgstr "Povratite izabrane poruke"
 
-#: ../mail/e-mail-reader.c:2212
+#: ../mail/e-mail-reader.c:2371
 msgid "_Normal Size"
 msgstr "_Uobičajena veličina"
 
-#: ../mail/e-mail-reader.c:2214
+#: ../mail/e-mail-reader.c:2373
 msgid "Reset the text to its original size"
 msgstr "Vratite tekst na originalnu veličinu"
 
-#: ../mail/e-mail-reader.c:2219
+#: ../mail/e-mail-reader.c:2378
 msgid "_Zoom In"
 msgstr "U_većaj"
 
-#: ../mail/e-mail-reader.c:2221
+#: ../mail/e-mail-reader.c:2380
 msgid "Increase the text size"
 msgstr "Uvećajte veličinu teksta"
 
-#: ../mail/e-mail-reader.c:2228
+#: ../mail/e-mail-reader.c:2387
 msgid "Decrease the text size"
 msgstr "Umanjite veličinu teksta"
 
-#: ../mail/e-mail-reader.c:2235
+#: ../mail/e-mail-reader.c:2394
 msgid "Cre_ate"
 msgstr "_Napravi"
 
-#: ../mail/e-mail-reader.c:2242
+#: ../mail/e-mail-reader.c:2401
 msgid "Ch_aracter Encoding"
 msgstr "Kodna st_rana"
 
-#: ../mail/e-mail-reader.c:2249
+#: ../mail/e-mail-reader.c:2408
 msgid "F_orward As"
 msgstr "_Prosledi kao"
 
-#: ../mail/e-mail-reader.c:2256
+#: ../mail/e-mail-reader.c:2415
 msgid "_Group Reply"
 msgstr "O_dgovori grupi"
 
-#: ../mail/e-mail-reader.c:2263
+#: ../mail/e-mail-reader.c:2422
 msgid "_Go To"
 msgstr "_Idi na"
 
-#: ../mail/e-mail-reader.c:2270
+#: ../mail/e-mail-reader.c:2429
 msgid "Mar_k As"
 msgstr "O_znači kao"
 
-#: ../mail/e-mail-reader.c:2277
+#: ../mail/e-mail-reader.c:2436
 msgid "_Message"
 msgstr "_Poruka"
 
-#: ../mail/e-mail-reader.c:2284
+#: ../mail/e-mail-reader.c:2443
 msgid "_Zoom"
 msgstr "Uv_ećaj"
 
-#: ../mail/e-mail-reader.c:2294
+#: ../mail/e-mail-reader.c:2453
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Napravi fasciklu pretrage sa dopisne _liste..."
 
-#: ../mail/e-mail-reader.c:2296
+#: ../mail/e-mail-reader.c:2455
 msgid "Create a search folder for this mailing list"
 msgstr "Napravite fasciklu pretrage za ovu dopisnu listu"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2460
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Napravi fasciklu pretrage od pri_malaca..."
 
-#: ../mail/e-mail-reader.c:2303
+#: ../mail/e-mail-reader.c:2462
 msgid "Create a search folder for these recipients"
 msgstr "Napravite fasciklu pretrage za ove primaoce"
 
-#: ../mail/e-mail-reader.c:2308
+#: ../mail/e-mail-reader.c:2467
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Napravi fasciklu pretrage od po_šiljaoca..."
 
-#: ../mail/e-mail-reader.c:2310
+#: ../mail/e-mail-reader.c:2469
 msgid "Create a search folder for this sender"
 msgstr "Napravite fasciklu pretrage za ovog pošiljaoca"
 
-#: ../mail/e-mail-reader.c:2315
+#: ../mail/e-mail-reader.c:2474
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Napravi fasciklu pretrage iz _naslova..."
 
-#: ../mail/e-mail-reader.c:2317
+#: ../mail/e-mail-reader.c:2476
 msgid "Create a search folder for this subject"
 msgstr "Napravite fasciklu pretrage za ovaj naslov"
 
-#: ../mail/e-mail-reader.c:2340
+#: ../mail/e-mail-reader.c:2515
 msgid "Mark for Follo_w Up..."
 msgstr "Obeleži za _praćenje..."
 
-#: ../mail/e-mail-reader.c:2348
+#: ../mail/e-mail-reader.c:2531
 msgid "Mark as _Important"
 msgstr "Onači kao _važno"
 
-#: ../mail/e-mail-reader.c:2352
+#: ../mail/e-mail-reader.c:2535
 msgid "Mark as _Junk"
 msgstr "Označi kao _đubre"
 
-#: ../mail/e-mail-reader.c:2356
+#: ../mail/e-mail-reader.c:2539
 msgid "Mark as _Not Junk"
 msgstr "Označi da _nije đubre"
 
-#: ../mail/e-mail-reader.c:2360
+#: ../mail/e-mail-reader.c:2543
 msgid "Mar_k as Read"
 msgstr "O_znači kao pročitano"
 
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2555
 msgid "Mark as Uni_mportant"
 msgstr "Označi kao _nevažno"
 
-#: ../mail/e-mail-reader.c:2368
+#: ../mail/e-mail-reader.c:2559
 msgid "Mark as _Unread"
 msgstr "Označi kao _nepročitano"
 
-#: ../mail/e-mail-reader.c:2412
+#: ../mail/e-mail-reader.c:2603
 msgid "_Caret Mode"
 msgstr "Metod u_metanja"
 
-#: ../mail/e-mail-reader.c:2414
+#: ../mail/e-mail-reader.c:2605
 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:2420
+#: ../mail/e-mail-reader.c:2611
 msgid "All Message _Headers"
 msgstr "Sva _zaglavlja poruke"
 
-#: ../mail/e-mail-reader.c:2422
+#: ../mail/e-mail-reader.c:2613
 msgid "Show messages with all email headers"
 msgstr "Prikažite poruku sa svim zaglavljima el. pošte"
 
-#: ../mail/e-mail-reader.c:2849
+#: ../mail/e-mail-reader.c:3164
 msgid "Retrieving message"
-msgstr "Dovlačim poruku"
+msgstr "Preuzimam poruku"
 
-#: ../mail/e-mail-reader.c:3772
-#: ../modules/mail/e-mail-attachment-handler.c:206
+#: ../mail/e-mail-reader.c:4216 ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "Prosl_edi"
 
-#: ../mail/e-mail-reader.c:3773
+#: ../mail/e-mail-reader.c:4217
 msgid "Forward the selected message to someone"
 msgstr "Prosleđuje izabranu poruku nekome"
 
-#: ../mail/e-mail-reader.c:3792
+#: ../mail/e-mail-reader.c:4236
 msgid "Group Reply"
 msgstr "Odgovor grupi"
 
-#: ../mail/e-mail-reader.c:3793
+#: ../mail/e-mail-reader.c:4237
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Odgovorite dopisnoj listi ili svim primaocima"
 
-#: ../mail/e-mail-reader.c:3859 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:4303 ../mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Obriši"
 
-#: ../mail/e-mail-reader.c:3871
-#: ../modules/calendar/e-cal-shell-view-actions.c:1371
+#: ../mail/e-mail-reader.c:4315
+#: ../modules/calendar/e-cal-shell-view-actions.c:1243
 msgid "Next"
 msgstr "Sledeće"
 
-#: ../mail/e-mail-reader.c:3875
-#: ../modules/calendar/e-cal-shell-view-actions.c:1364
+#: ../mail/e-mail-reader.c:4319
+#: ../modules/calendar/e-cal-shell-view-actions.c:1236
 msgid "Previous"
 msgstr "Prethodno"
 
-#: ../mail/e-mail-reader.c:3884 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:4328 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Odgovori"
 
-#: ../mail/e-mail-reader-utils.c:147
+#: ../mail/e-mail-reader.c:5406
+#, c-format
+msgid "Allow remote content for anyone from %s"
+msgstr "Dozvoli udaljeni sadržaj svima sa %s"
+
+#: ../mail/e-mail-reader.c:5408
+#, c-format
+msgid "Allow remote content for %s"
+msgstr "Dozvoli udaljeni sadržaj za %s"
+
+#: ../mail/e-mail-reader.c:5425
+#, c-format
+msgid "Allow remote content from %s"
+msgstr "Dozvoli udaljeni sadržaj svima od %s"
+
+#: ../mail/e-mail-reader.c:5442
+#| msgid "_Do not show this message again"
+msgid "Do not show this message again"
+msgstr "Ne prikazuj više ovu poruku"
+
+#: ../mail/e-mail-reader.c:5490
+msgid "Load remote content"
+msgstr "Učitaj udaljeni sadržaj"
+
+#: ../mail/e-mail-reader-utils.c:146
 msgid "Do not warn me again"
 msgstr "Ne upozoravaj me ponovo"
 
-#: ../mail/e-mail-reader-utils.c:557 ../plugins/face/face.c:170
-#: ../smime/gui/certificate-manager.c:329
-msgid "Unknown error"
-msgstr "Nepoznata greška"
+#: ../mail/e-mail-reader-utils.c:572
+#, c-format
+msgid "Refreshing folder '%s'"
+msgstr "Osvežavam fasciklu „%s“"
+
+#: ../mail/e-mail-reader-utils.c:1165
+msgid "Marking thread to be ignored"
+msgstr "Označavam raspravu kao zanemarenu"
+
+#: ../mail/e-mail-reader-utils.c:1169
+msgid "Unmarking thread from being ignored"
+msgstr "Označavam raspravi kao da nije zanemarena"
 
-#: ../mail/e-mail-reader-utils.c:976
+#: ../mail/e-mail-reader-utils.c:1173
+msgid "Marking subthread to be ignored"
+msgstr "Označavam podraspravu kao zanemarenu"
+
+#: ../mail/e-mail-reader-utils.c:1177
+msgid "Unmarking subthread from being ignored"
+msgstr "Označavam podraspravu kao da nije zanemarena"
+
+#: ../mail/e-mail-reader-utils.c:1421
 msgid "Printing"
 msgstr "Štampam"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1211
+#: ../mail/e-mail-reader-utils.c:1658
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -13843,7 +16807,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:2026
+#: ../mail/e-mail-reader-utils.c:2489
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Sačuvaj poruku"
@@ -13856,7 +16820,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:2047
+#: ../mail/e-mail-reader-utils.c:2510
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Poruka"
@@ -13864,11 +16828,11 @@ msgstr[1] "Poruke"
 msgstr[2] "Poruke"
 msgstr[3] "Poruka"
 
-#: ../mail/e-mail-reader-utils.c:2416
+#: ../mail/e-mail-reader-utils.c:2883
 msgid "Parsing message"
 msgstr "Obrađujem poruku"
 
-#: ../mail/e-mail-request.c:199
+#: ../mail/e-mail-request.c:207
 msgid "The message has no text content."
 msgstr "Poruka ne sadrži tekst."
 
@@ -13876,13 +16840,89 @@ msgstr "Poruka ne sadrži tekst."
 msgid "Flag to Follow Up"
 msgstr "Označi za praćenje"
 
+#: ../mail/e-mail-ui-session.c:801
+#, c-format
+msgid "%s authentication failed"
+msgstr "Nije uspelo %s potvrđivanje identiteta"
+
+#: ../mail/e-mail-ui-session.c:851
+#, c-format
+msgid "No data source found for UID '%s'"
+msgstr "Nije pronađen izvor podataka za JIB „%s“"
+
+# mail:ask-send-only-bcc primary
+#. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
+#: ../mail/em-composer-utils.c:390
+#, fuzzy, c-format
+#| msgid ""
+#| "Are you sure you want to send a message with {0} To and CC recipients?"
+msgid "Are you sure you want to send a message with %d To and CC recipients?"
+msgid_plural ""
+"Are you sure you want to send a message with %d To and CC recipients?"
+msgstr[0] "Sigurno želite da pošaljete poruku sa {0} Za i CC primaoca?"
+msgstr[1] "Sigurno želite da pošaljete poruku sa {0} Za i CC primaoca?"
+msgstr[2] "Sigurno želite da pošaljete poruku sa {0} Za i CC primaoca?"
+msgstr[3] "Sigurno želite da pošaljete poruku sa {0} Za i CC primaoca?"
+
+#. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
+#: ../mail/em-composer-utils.c:396
+#, fuzzy, c-format
+#| msgid ""
+#| "You are trying to send a message to {0} recipients in To and CC fields. "
+#| "This would result in all recipients seeing the email addresses of each "
+#| "other. In some cases this behaviour is undesired, especially if they do "
+#| "not know each other or if privacy is a concern. Consider adding "
+#| "recipients to the BCC field instead."
+msgid ""
+"You are trying to send a message to %d recipients in To and CC fields. This "
+"would result in all recipients seeing the email addresses of each other. In "
+"some cases this behaviour is undesired, especially if they do not know each "
+"other or if privacy is a concern. Consider adding recipients to the BCC "
+"field instead."
+msgid_plural ""
+"You are trying to send a message to %d recipients in To and CC fields. This "
+"would result in all recipients seeing the email addresses of each other. In "
+"some cases this behaviour is undesired, especially if they do not know each "
+"other or if privacy is a concern. Consider adding recipients to the BCC "
+"field instead."
+msgstr[0] ""
+"Pokušavate da pošaljete poruku na {0} primaoca koji su navedenu unutar polja "
+"Za i CC. Ovo će omogućiti svim primaocima da vide adrese e-pošte ostalih. "
+"Ponekad primaoci neće biti zadovoljni time, pogotovu ukoliko se međusobno ne "
+"poznaju ili ukoliko im na taj način ugrožavate privatnost. Da bi ovo izbegli "
+"možete da dodate primaoce u polje BCC."
+msgstr[1] ""
+"Pokušavate da pošaljete poruku na {0} primaoca koji su navedenu unutar polja "
+"Za i CC. Ovo će omogućiti svim primaocima da vide adrese e-pošte ostalih. "
+"Ponekad primaoci neće biti zadovoljni time, pogotovu ukoliko se međusobno ne "
+"poznaju ili ukoliko im na taj način ugrožavate privatnost. Da bi ovo izbegli "
+"možete da dodate primaoce u polje BCC."
+msgstr[2] ""
+"Pokušavate da pošaljete poruku na {0} primaoca koji su navedenu unutar polja "
+"Za i CC. Ovo će omogućiti svim primaocima da vide adrese e-pošte ostalih. "
+"Ponekad primaoci neće biti zadovoljni time, pogotovu ukoliko se međusobno ne "
+"poznaju ili ukoliko im na taj način ugrožavate privatnost. Da bi ovo izbegli "
+"možete da dodate primaoce u polje BCC."
+msgstr[3] ""
+"Pokušavate da pošaljete poruku na {0} primaoca koji su navedenu unutar polja "
+"Za i CC. Ovo će omogućiti svim primaocima da vide adrese e-pošte ostalih. "
+"Ponekad primaoci neće biti zadovoljni time, pogotovu ukoliko se međusobno ne "
+"poznaju ili ukoliko im na taj način ugrožavate privatnost. Da bi ovo izbegli "
+"možete da dodate primaoce u polje BCC."
+
+#. 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
+msgid "Waiting for attachments to load..."
+msgstr "Čekam da se učitaju prilozi..."
+
 # * each ${Variable} gets replaced with a value. To see a full list of available
 # * variables, see em-composer-utils.c:1514
 #. Note to translators: this is the attribution string used
 #. * 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:1454
+#: ../mail/em-composer-utils.c:1686
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -13890,23 +16930,24 @@ msgstr ""
 "U ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. u ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} piše:"
 
-#: ../mail/em-composer-utils.c:1460
+#: ../mail/em-composer-utils.c:1692
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Prosleđena poruka --------"
 
-#: ../mail/em-composer-utils.c:1465
+#: ../mail/em-composer-utils.c:1697
 msgid "-----Original Message-----"
 msgstr "-----Originalna poruka-----"
 
-#: ../mail/em-composer-utils.c:2615
+#: ../mail/em-composer-utils.c:2984
 msgid "an unknown sender"
 msgstr "nepoznati pošiljalac"
 
-#: ../mail/em-composer-utils.c:3040
+#. FIXME GTK_WINDOW (composer)
+#: ../mail/em-composer-utils.c:3471
 msgid "Posting destination"
 msgstr "Odredišna pošta"
 
-#: ../mail/em-composer-utils.c:3041
+#: ../mail/em-composer-utils.c:3476
 msgid "Choose folders to post the message to."
 msgstr "Izaberite fascikle za slanje poruke."
 
@@ -13914,265 +16955,6 @@ msgstr "Izaberite fascikle za slanje poruke."
 msgid "Select Folder"
 msgstr "Izaberi fasciklu"
 
-#. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Preračunaj"
-
-#: ../mail/em-filter-i18n.h:3
-msgid "Any header"
-msgstr "Bilo koje zaglavlje"
-
-#: ../mail/em-filter-i18n.h:4
-msgid "Assign Color"
-msgstr "Dodeli boju"
-
-#: ../mail/em-filter-i18n.h:5
-msgid "Assign Score"
-msgstr "Dodeli rezultat"
-
-#: ../mail/em-filter-i18n.h:7
-msgid "BCC"
-msgstr "BCC"
-
-#: ../mail/em-filter-i18n.h:8
-msgid "Beep"
-msgstr "Zvono"
-
-#: ../mail/em-filter-i18n.h:9
-msgid "CC"
-msgstr "CC"
-
-#: ../mail/em-filter-i18n.h:10
-msgid "Completed On"
-msgstr "Završeno za"
-
-#: ../mail/em-filter-i18n.h:12
-msgid "Date received"
-msgstr "Datum primanja"
-
-#: ../mail/em-filter-i18n.h:13
-msgid "Date sent"
-msgstr "Datum slanja"
-
-#: ../mail/em-filter-i18n.h:15
-msgid "Deleted"
-msgstr "Obrisano"
-
-#: ../mail/em-filter-i18n.h:17
-msgid "Draft"
-msgstr "Nacrt"
-
-#: ../mail/em-filter-i18n.h:19
-msgid "Expression"
-msgstr "Izraz"
-
-#: ../mail/em-filter-i18n.h:20
-msgid "Follow Up"
-msgstr "Sledi"
-
-#: ../mail/em-filter-i18n.h:21
-msgid "Forward to"
-msgstr "Prosledi"
-
-#: ../mail/em-filter-i18n.h:22
-msgid "Important"
-msgstr "Važno"
-
-#: ../mail/em-filter-i18n.h:23
-msgid "Junk Test"
-msgstr "Provera đubreta"
-
-#: ../mail/em-filter-i18n.h:24 ../mail/mail-config.ui.h:113
-msgid "Junk"
-msgstr "Đubre"
-
-#: ../mail/em-filter-i18n.h:25
-msgid "Label"
-msgstr "Natpis"
-
-#: ../mail/em-filter-i18n.h:26
-msgid "Mailing list"
-msgstr "Dopisna lista"
-
-#: ../mail/em-filter-i18n.h:27
-msgid "Match All"
-msgstr "Odgovara sve"
-
-#: ../mail/em-filter-i18n.h:28
-msgid "Message Body"
-msgstr "Telo poruke"
-
-#: ../mail/em-filter-i18n.h:29
-msgid "Message Header"
-msgstr "Zaglavlje poruke"
-
-#: ../mail/em-filter-i18n.h:30
-msgid "Message Location"
-msgstr "Lokacija poruke"
-
-#: ../mail/em-filter-i18n.h:31
-msgid "Message is Junk"
-msgstr "Poruka je đubre"
-
-#: ../mail/em-filter-i18n.h:32
-msgid "Message is not Junk"
-msgstr "Poruka nije đubre"
-
-#: ../mail/em-filter-i18n.h:34
-msgid "Pipe to Program"
-msgstr "Poveži na program"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "Play Sound"
-msgstr "Pusti zvuk"
-
-#. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:36 ../mail/mail-dialogs.ui.h:15
-msgid "Read"
-msgstr "Čitaj"
-
-#: ../mail/em-filter-i18n.h:37 ../mail/message-list.etspec.h:16
-msgid "Recipients"
-msgstr "Primaoci"
-
-#: ../mail/em-filter-i18n.h:38
-msgid "Regex Match"
-msgstr "Regizr odgovara"
-
-#: ../mail/em-filter-i18n.h:39
-msgid "Replied to"
-msgstr "Odgovoreno"
-
-#: ../mail/em-filter-i18n.h:40
-msgid "Run Program"
-msgstr "Pokreni program"
-
-#: ../mail/em-filter-i18n.h:41 ../mail/message-list.etspec.h:3
-msgid "Score"
-msgstr "Rezultat"
-
-# bug(slobo): verovatno izveštaj o dostavi
-#: ../mail/em-filter-i18n.h:42
-msgid "Sender or Recipients"
-msgstr "Pošiljalac ili primaoci"
-
-#: ../mail/em-filter-i18n.h:43 ../mail/message-list.etspec.h:15
-msgid "Sender"
-msgstr "Pošiljalac"
-
-#: ../mail/em-filter-i18n.h:44
-msgid "Set Label"
-msgstr "Postavi oznaku"
-
-#: ../mail/em-filter-i18n.h:45
-msgid "Set Status"
-msgstr "Postavi status"
-
-#: ../mail/em-filter-i18n.h:46
-msgid "Size (kB)"
-msgstr "Veličina (kB)"
-
-#: ../mail/em-filter-i18n.h:47
-msgid "Source Account"
-msgstr "Izvorni nalog"
-
-#: ../mail/em-filter-i18n.h:48
-msgid "Specific header"
-msgstr "Određeno zaglavlje"
-
-#: ../mail/em-filter-i18n.h:50
-msgid "Stop Processing"
-msgstr "Prekini obradu"
-
-#: ../mail/em-filter-i18n.h:53
-msgid "Unset Color"
-msgstr "Nepostavljena boja"
-
-#: ../mail/em-filter-i18n.h:54
-msgid "Unset Status"
-msgstr "Nepostavljen status"
-
-#: ../mail/em-filter-i18n.h:57
-msgid "does not end with"
-msgstr "ne završava se sa"
-
-#: ../mail/em-filter-i18n.h:58
-msgid "does not exist"
-msgstr "ne postoji"
-
-#: ../mail/em-filter-i18n.h:59
-msgid "does not have words"
-msgstr "ne sadrži reči"
-
-#: ../mail/em-filter-i18n.h:60
-msgid "does not return"
-msgstr "ne vraća"
-
-#: ../mail/em-filter-i18n.h:61
-msgid "does not sound like"
-msgstr "ne zvuči kao"
-
-#: ../mail/em-filter-i18n.h:62
-msgid "does not start with"
-msgstr "ne počinje sa"
-
-#: ../mail/em-filter-i18n.h:63
-msgid "ends with"
-msgstr "završava se sa"
-
-#: ../mail/em-filter-i18n.h:64
-msgid "exists"
-msgstr "postoji"
-
-#: ../mail/em-filter-i18n.h:65
-msgid "has words"
-msgstr "sadrži reči"
-
-#: ../mail/em-filter-i18n.h:66
-msgid "is Flagged"
-msgstr "je označeno"
-
-#: ../mail/em-filter-i18n.h:67
-msgid "is after"
-msgstr "je posle"
-
-#: ../mail/em-filter-i18n.h:68
-msgid "is before"
-msgstr "je pre"
-
-#: ../mail/em-filter-i18n.h:71
-msgid "is not Flagged"
-msgstr "nije označeno"
-
-#: ../mail/em-filter-i18n.h:72
-msgid "is not set"
-msgstr "nije podešeno"
-
-#: ../mail/em-filter-i18n.h:74
-msgid "is set"
-msgstr "podešeno"
-
-#: ../mail/em-filter-i18n.h:76
-msgid "returns greater than"
-msgstr "povratno veće od"
-
-#: ../mail/em-filter-i18n.h:77
-msgid "returns less than"
-msgstr "povratno manje od"
-
-#: ../mail/em-filter-i18n.h:78
-msgid "returns"
-msgstr "povratno"
-
-#: ../mail/em-filter-i18n.h:79
-msgid "sounds like"
-msgstr "zvuči kao"
-
-#: ../mail/em-filter-i18n.h:80
-msgid "starts with"
-msgstr "počinje sa"
-
 #. and now for the action area
 #: ../mail/em-filter-rule.c:587
 msgid "Then"
@@ -14183,7 +16965,7 @@ msgid "Add Ac_tion"
 msgstr "Dodaj ra_dnju"
 
 # bug: no need for plural-forms
-#: ../mail/em-folder-properties.c:177
+#: ../mail/em-folder-properties.c:178
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Nepročitanih poruka:"
@@ -14192,7 +16974,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:188
+#: ../mail/em-folder-properties.c:189
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Ukupno poruka:"
@@ -14201,24 +16983,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:209
+#: ../mail/em-folder-properties.c:210
 #, 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:211
+#: ../mail/em-folder-properties.c:212
 #, 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:286
+#: ../mail/em-folder-properties.c:287
 msgid "_Send Account Override:"
 msgstr "_Prepiši nalog slanja"
 
-#: ../mail/em-folder-properties.c:415
+#: ../mail/em-folder-properties.c:491
+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
+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
+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
+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
+msgctxt "autoarchive"
+msgid "months"
+msgstr "meseci"
+
+#: ../mail/em-folder-properties.c:526
+msgid "Move old messages to the default archive _folder"
+msgstr "Premesti stare poruke među _arhivirane"
+
+#: ../mail/em-folder-properties.c:537
+msgid "_Move old messages to:"
+msgstr "_Premesti stare poruke u:"
+
+#: ../mail/em-folder-properties.c:541
+msgid "AutoArchive folder"
+msgstr "Fascikla AutoArhive"
+
+#: ../mail/em-folder-properties.c:541
+msgid "Select folder to use for AutoArchive"
+msgstr "Izaberite fasciklu za AutoArhivu"
+
+#: ../mail/em-folder-properties.c:547
+msgid "_Delete old messages"
+msgstr "_Obriši stare poruke"
+
+#: ../mail/em-folder-properties.c:606
+msgid "AutoArchive"
+msgstr "AutoArhiva"
+
+#: ../mail/em-folder-properties.c:685
 msgid "Folder Properties"
 msgstr "Osobine fascikle"
 
@@ -14226,78 +17060,66 @@ msgstr "Osobine fascikle"
 msgid "<click here to select a folder>"
 msgstr "<kliknite ovde da izaberete fasciklu>"
 
-#: ../mail/em-folder-selector.c:387
-msgid "C_reate"
-msgstr "_Napravi"
-
-#: ../mail/em-folder-selector.c:393
-msgid "Folder _name:"
-msgstr "Naziv _fascikle:"
+#: ../mail/em-folder-selector.c:398
+msgid "Create a new folder"
+msgstr "Napravite novu fasciklu"
 
 #: ../mail/em-folder-tree.c:682
 msgid "Folder names cannot contain '/'"
 msgstr "Nazivi fascikli ne mogu da sadrže „/“"
 
-#: ../mail/em-folder-tree.c:819
+#: ../mail/em-folder-tree.c:845
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1661
+#: ../mail/em-folder-tree.c:1703
 msgid "Mail Folder Tree"
 msgstr "Stablo fascikle za poštu"
 
-#: ../mail/em-folder-tree.c:2209 ../mail/em-folder-utils.c:100
+#: ../mail/em-folder-tree.c:2251 ../mail/em-folder-utils.c:82
 #, c-format
 msgid "Moving folder %s"
 msgstr "Premeštam fasciklu „%s“"
 
-#: ../mail/em-folder-tree.c:2212 ../mail/em-folder-utils.c:102
+#: ../mail/em-folder-tree.c:2254 ../mail/em-folder-utils.c:84
 #, c-format
 msgid "Copying folder %s"
 msgstr "Umnožavam fasciklu „%s“"
 
-#: ../mail/em-folder-tree.c:2219 ../mail/message-list.c:2284
+#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2494
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Premeštam poruke u fasciklu „%s“"
 
-#: ../mail/em-folder-tree.c:2223 ../mail/message-list.c:2286
+#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2496
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Umnožavam poruke u fasciklu „%s“"
 
-#: ../mail/em-folder-tree.c:2242
+#: ../mail/em-folder-tree.c:2284
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ne mogu da ubacim poruku(e) u ostavu na najvišem nivou"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:430 ../mail/em-folder-tree-model.c:432
+#: ../mail/em-folder-tree-model.c:444 ../mail/em-folder-tree-model.c:446
 msgid "UNMATCHED"
 msgstr "NEODGOVARA"
 
-#: ../mail/em-folder-tree-model.c:1244 ../mail/em-folder-tree-model.c:1621
+#: ../mail/em-folder-tree-model.c:1313 ../mail/em-folder-tree-model.c:1689
 msgid "Loading..."
 msgstr "Učitavam..."
 
-#: ../mail/em-folder-utils.c:506
+#: ../mail/em-folder-utils.c:488
 msgid "Move Folder To"
 msgstr "Premesti fasciklu u"
 
-#: ../mail/em-folder-utils.c:506
+#: ../mail/em-folder-utils.c:488
 msgid "Copy Folder To"
 msgstr "Umnoži fasciklu u"
 
-#: ../mail/em-folder-utils.c:604
-msgid "Create Folder"
-msgstr "Napravi fasciklu"
-
-#: ../mail/em-folder-utils.c:605
-msgid "Specify where to create the folder:"
-msgstr "Navedite gde napraviti fasciklu:"
-
 #: ../mail/em-subscription-editor.c:855
 msgid "_Subscribe"
 msgstr "Prijavi _se"
@@ -14310,80 +17132,100 @@ msgstr "Prijavi se na _prikazane"
 msgid "Subscribe To _All"
 msgstr "Prijavi se _na sve"
 
-#: ../mail/em-subscription-editor.c:969 ../mail/em-subscription-editor.c:1867
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../mail/em-subscription-editor.c:970 ../mail/em-subscription-editor.c:1912
+#: ../modules/mail/e-mail-shell-view-actions.c:1751
 msgid "_Unsubscribe"
 msgstr "_Odjavi se"
 
-#: ../mail/em-subscription-editor.c:978
+#: ../mail/em-subscription-editor.c:979
 msgid "Unsu_bscribe From Hidden"
 msgstr "O_djavi se sa skrivenih"
 
-#: ../mail/em-subscription-editor.c:986
+#: ../mail/em-subscription-editor.c:987
 msgid "Unsubscribe From _All"
 msgstr "Odja_vi se sa svih"
 
-#: ../mail/em-subscription-editor.c:1704
+#: ../mail/em-subscription-editor.c:1339
+#: ../modules/mail/e-mail-shell-view-private.c:1029
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%d nepročitana, "
+msgstr[1] "%d nepročitane, "
+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
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d ukupno"
+msgstr[1] "%d ukupno"
+msgstr[2] "%d ukupno"
+msgstr[3] "%d ukupno"
+
+#: ../mail/em-subscription-editor.c:1749
 msgid "Folder Subscriptions"
 msgstr "Prijave na fascikle"
 
-#: ../mail/em-subscription-editor.c:1743
+#: ../mail/em-subscription-editor.c:1788
 msgid "_Account:"
 msgstr "_Nalog:"
 
-#: ../mail/em-subscription-editor.c:1756
+#: ../mail/em-subscription-editor.c:1801
 msgid "Clear Search"
 msgstr "Očisti pretragu"
 
-#: ../mail/em-subscription-editor.c:1773
+#: ../mail/em-subscription-editor.c:1818
 msgid "Sho_w items that contain:"
 msgstr "_Prikaži stavke koje sadrže:"
 
-#: ../mail/em-subscription-editor.c:1820
+#: ../mail/em-subscription-editor.c:1865
 msgid "Subscribe to the selected folder"
 msgstr "Prijavite se na izabranu fasciklu"
 
-#: ../mail/em-subscription-editor.c:1821
+#: ../mail/em-subscription-editor.c:1866
 msgid "Su_bscribe"
 msgstr "P_rijavi se"
 
-#: ../mail/em-subscription-editor.c:1866
-#: ../modules/mail/e-mail-shell-view-actions.c:1633
+#: ../mail/em-subscription-editor.c:1911
+#: ../modules/mail/e-mail-shell-view-actions.c:1753
 msgid "Unsubscribe from the selected folder"
 msgstr "Odjavite se sa izabrane fascikle"
 
-#: ../mail/em-subscription-editor.c:1906
+#: ../mail/em-subscription-editor.c:1951
 msgid "Collapse all folders"
 msgstr "Skupite sve fascikle"
 
-#: ../mail/em-subscription-editor.c:1907
+#: ../mail/em-subscription-editor.c:1952
 msgid "C_ollapse All"
 msgstr "_Skupi sve"
 
-#: ../mail/em-subscription-editor.c:1917
+#: ../mail/em-subscription-editor.c:1962
 msgid "Expand all folders"
 msgstr "Razgranajte sve fascikle"
 
-#: ../mail/em-subscription-editor.c:1918
+#: ../mail/em-subscription-editor.c:1963
 msgid "E_xpand All"
 msgstr "_Razgranaj sve"
 
-#: ../mail/em-subscription-editor.c:1928
+#: ../mail/em-subscription-editor.c:1973
 msgid "Refresh the folder list"
 msgstr "Osvežite spisak fascikli"
 
-#: ../mail/em-subscription-editor.c:1929
-#: ../modules/mail/e-mail-shell-view-actions.c:1533
-#: ../modules/mail/e-mail-shell-view-actions.c:1603
+#: ../mail/em-subscription-editor.c:1974
+#: ../modules/mail/e-mail-shell-view-actions.c:1652
+#: ../modules/mail/e-mail-shell-view-actions.c:1723
 msgid "_Refresh"
 msgstr "_Osveži"
 
-#: ../mail/em-subscription-editor.c:1940
+#: ../mail/em-subscription-editor.c:1985
 msgid "Stop the current operation"
 msgstr "Zaustavite trenutnu operaciju"
 
-#: ../mail/em-subscription-editor.c:1941
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../mail/em-subscription-editor.c:1986
+#: ../modules/addressbook/e-book-shell-view-actions.c:1001
 msgid "_Stop"
 msgstr "_Zaustavi"
 
@@ -14391,7 +17233,7 @@ msgstr "_Zaustavi"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:75
+#: ../mail/em-utils.c:76
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
@@ -14400,20 +17242,19 @@ msgstr[1] "Sigurno želite da otvorite %d poruke odjednom?"
 msgstr[2] "Sigurno želite da otvorite %d poruka odjednom?"
 msgstr[3] "Sigurno želite da otvorite ovu jednu poruku?"
 
-#: ../mail/em-utils.c:131
-#: ../modules/mailto-handler/evolution-mailto-handler.c:148
-msgid "_Do not show this message again"
-msgstr "_Ne prikazuj više ovu poruku"
-
-#: ../mail/em-utils.c:241
+#: ../mail/em-utils.c:177
 msgid "Message Filters"
 msgstr "Propusnici poruka"
 
-#: ../mail/em-utils.c:970
+#: ../mail/em-utils.c:923
 #, c-format
 msgid "Messages from %s"
 msgstr "Poruke koje je poslao %s"
 
+#: ../mail/em-utils.c:1680
+msgid "Deleting old messages"
+msgstr "Brišem stare poruke"
+
 #: ../mail/em-vfolder-editor.c:104
 msgid "Search _Folders"
 msgstr "Fas_cikle pretrage"
@@ -14422,95 +17263,425 @@ msgstr "Fas_cikle pretrage"
 msgid "Add Folder"
 msgstr "Dodaj fasciklu"
 
-#: ../mail/em-vfolder-editor-rule.c:518
+#: ../mail/em-vfolder-editor-rule.c:521
 msgid "Search Folder Sources"
 msgstr "Izvor fascikle pretrage"
 
-#: ../mail/em-vfolder-editor-rule.c:550
+#: ../mail/em-vfolder-editor-rule.c:553
 msgid "Automatically update on any _source folder change"
 msgstr "Sam osveži pri _svakoj izmeni izvorne fascikle"
 
-#: ../mail/em-vfolder-editor-rule.c:562
+#: ../mail/em-vfolder-editor-rule.c:565
 msgid "All local folders"
 msgstr "Sve lokalne fascikle"
 
-#: ../mail/em-vfolder-editor-rule.c:563
+#: ../mail/em-vfolder-editor-rule.c:566
 msgid "All active remote folders"
 msgstr "Sve aktivne mrežne fascikle"
 
-#: ../mail/em-vfolder-editor-rule.c:564
+#: ../mail/em-vfolder-editor-rule.c:567
 msgid "All local and active remote folders"
 msgstr "Sve lokalne i aktivne mrežne fascikle"
 
-#: ../mail/em-vfolder-editor-rule.c:565
+#: ../mail/em-vfolder-editor-rule.c:568
 msgid "Specific folders"
 msgstr "Određene fascikle"
 
-#: ../mail/em-vfolder-editor-rule.c:603
+#: ../mail/em-vfolder-editor-rule.c:606
 msgid "include subfolders"
 msgstr "uključi podfascikle"
 
+#: ../mail/filtertypes.xml.in.h:1 ../mail/message-list.etspec.h:15
+#: ../mail/searchtypes.xml.in.h:1 ../mail/vfoldertypes.xml.in.h:1
+msgid "Sender"
+msgstr "Pošiljalac"
+
+#: ../mail/filtertypes.xml.in.h:6 ../mail/searchtypes.xml.in.h:6
+#: ../mail/vfoldertypes.xml.in.h:6
+msgid "starts with"
+msgstr "počinje sa"
+
+#: ../mail/filtertypes.xml.in.h:7 ../mail/searchtypes.xml.in.h:7
+#: ../mail/vfoldertypes.xml.in.h:7
+msgid "does not start with"
+msgstr "ne počinje sa"
+
+#: ../mail/filtertypes.xml.in.h:8 ../mail/searchtypes.xml.in.h:8
+#: ../mail/vfoldertypes.xml.in.h:8
+msgid "ends with"
+msgstr "završava se sa"
+
+#: ../mail/filtertypes.xml.in.h:9 ../mail/searchtypes.xml.in.h:9
+#: ../mail/vfoldertypes.xml.in.h:9
+msgid "does not end with"
+msgstr "ne završava se sa"
+
+#: ../mail/filtertypes.xml.in.h:10 ../mail/searchtypes.xml.in.h:12
+#: ../mail/vfoldertypes.xml.in.h:12
+msgid "sounds like"
+msgstr "zvuči kao"
+
+#: ../mail/filtertypes.xml.in.h:11 ../mail/searchtypes.xml.in.h:13
+#: ../mail/vfoldertypes.xml.in.h:13
+msgid "does not sound like"
+msgstr "ne zvuči kao"
+
+#: ../mail/filtertypes.xml.in.h:12 ../mail/message-list.etspec.h:16
+#: ../mail/searchtypes.xml.in.h:10 ../mail/vfoldertypes.xml.in.h:10
+msgid "Recipients"
+msgstr "Primaoci"
+
+#: ../mail/filtertypes.xml.in.h:13 ../mail/searchtypes.xml.in.h:14
+#: ../mail/vfoldertypes.xml.in.h:14
+msgid "CC"
+msgstr "CC"
+
+#: ../mail/filtertypes.xml.in.h:14 ../mail/searchtypes.xml.in.h:15
+#: ../mail/vfoldertypes.xml.in.h:15
+msgid "BCC"
+msgstr "BCC"
+
+# bug(slobo): verovatno izveštaj o dostavi
+#: ../mail/filtertypes.xml.in.h:15 ../mail/searchtypes.xml.in.h:16
+#: ../mail/vfoldertypes.xml.in.h:16
+msgid "Sender or Recipients"
+msgstr "Pošiljalac ili primaoci"
+
+#: ../mail/filtertypes.xml.in.h:17 ../mail/searchtypes.xml.in.h:18
+#: ../mail/vfoldertypes.xml.in.h:18
+msgid "has words"
+msgstr "sadrži reči"
+
+#: ../mail/filtertypes.xml.in.h:18 ../mail/searchtypes.xml.in.h:19
+#: ../mail/vfoldertypes.xml.in.h:19
+msgid "does not have words"
+msgstr "ne sadrži reči"
+
+#: ../mail/filtertypes.xml.in.h:19 ../mail/searchtypes.xml.in.h:20
+#: ../mail/vfoldertypes.xml.in.h:20
+msgid "Specific header"
+msgstr "Određeno zaglavlje"
+
+#: ../mail/filtertypes.xml.in.h:20 ../mail/searchtypes.xml.in.h:21
+#: ../mail/vfoldertypes.xml.in.h:21
+msgid "exists"
+msgstr "postoji"
+
+#: ../mail/filtertypes.xml.in.h:21 ../mail/searchtypes.xml.in.h:22
+#: ../mail/vfoldertypes.xml.in.h:22
+msgid "does not exist"
+msgstr "ne postoji"
+
+#: ../mail/filtertypes.xml.in.h:22 ../mail/searchtypes.xml.in.h:24
+#: ../mail/vfoldertypes.xml.in.h:24
+msgid "Message Body"
+msgstr "Telo poruke"
+
+#: ../mail/filtertypes.xml.in.h:23 ../mail/searchtypes.xml.in.h:25
+#: ../mail/vfoldertypes.xml.in.h:25
+msgid "Expression"
+msgstr "Izraz"
+
+#: ../mail/filtertypes.xml.in.h:24 ../mail/searchtypes.xml.in.h:26
+#: ../mail/vfoldertypes.xml.in.h:26
+msgid "Free Form Expression"
+msgstr "Izraz u slobodnoj formi"
+
+#: ../mail/filtertypes.xml.in.h:25 ../mail/searchtypes.xml.in.h:27
+#: ../mail/vfoldertypes.xml.in.h:27
+msgid "Date sent"
+msgstr "Datum slanja"
+
+#: ../mail/filtertypes.xml.in.h:26 ../mail/searchtypes.xml.in.h:28
+#: ../mail/vfoldertypes.xml.in.h:28
+msgid "is before"
+msgstr "je pre"
+
+#: ../mail/filtertypes.xml.in.h:27 ../mail/searchtypes.xml.in.h:29
+#: ../mail/vfoldertypes.xml.in.h:29
+msgid "is after"
+msgstr "je posle"
+
+#: ../mail/filtertypes.xml.in.h:28 ../mail/searchtypes.xml.in.h:30
+#: ../mail/vfoldertypes.xml.in.h:30
+msgid "Date received"
+msgstr "Datum primanja"
+
+#: ../mail/filtertypes.xml.in.h:29 ../mail/searchtypes.xml.in.h:31
+#: ../mail/vfoldertypes.xml.in.h:31
+msgid "Label"
+msgstr "Natpis"
+
+#: ../mail/filtertypes.xml.in.h:30 ../mail/message-list.etspec.h:3
+#: ../mail/searchtypes.xml.in.h:32 ../mail/vfoldertypes.xml.in.h:32
+msgid "Score"
+msgstr "Rezultat"
+
+#: ../mail/filtertypes.xml.in.h:33 ../mail/searchtypes.xml.in.h:35
+#: ../mail/vfoldertypes.xml.in.h:35
+msgid "Size (kB)"
+msgstr "Veličina (kB)"
+
+#: ../mail/filtertypes.xml.in.h:34 ../mail/searchtypes.xml.in.h:36
+#: ../mail/vfoldertypes.xml.in.h:36
+#| msgid "is greater than"
+msgid "is greater than or equal to"
+msgstr "je veće od ili je jednako sa"
+
+#: ../mail/filtertypes.xml.in.h:35 ../mail/searchtypes.xml.in.h:37
+#: ../mail/vfoldertypes.xml.in.h:37
+#| msgid "is less than"
+msgid "is less than or equal to"
+msgstr "je manje od ili je jednako sa"
+
+#: ../mail/filtertypes.xml.in.h:37 ../mail/searchtypes.xml.in.h:39
+#: ../mail/vfoldertypes.xml.in.h:39
+msgid "Replied to"
+msgstr "Odgovoreno"
+
+#: ../mail/filtertypes.xml.in.h:39 ../mail/searchtypes.xml.in.h:42
+#: ../mail/vfoldertypes.xml.in.h:42
+msgid "Important"
+msgstr "Važno"
+
+#. Past tense, as in "has been read".
+#: ../mail/filtertypes.xml.in.h:40 ../mail/mail-dialogs.ui.h:15
+#: ../mail/searchtypes.xml.in.h:43 ../mail/vfoldertypes.xml.in.h:43
+msgid "Read"
+msgstr "Čitaj"
+
+#: ../mail/filtertypes.xml.in.h:41 ../mail/mail-config.ui.h:130
+#: ../mail/vfoldertypes.xml.in.h:44
+msgid "Junk"
+msgstr "Đubre"
+
+#: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44
+#: ../mail/vfoldertypes.xml.in.h:45
+msgid "Follow Up"
+msgstr "Sledi"
+
+#: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
+#: ../mail/vfoldertypes.xml.in.h:46
+msgid "is Flagged"
+msgstr "je označeno"
+
+#: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
+#: ../mail/vfoldertypes.xml.in.h:47
+msgid "is not Flagged"
+msgstr "nije označeno"
+
+#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
+#: ../mail/vfoldertypes.xml.in.h:48
+msgid "is Completed"
+msgstr "je završeno"
+
+#: ../mail/filtertypes.xml.in.h:46 ../mail/searchtypes.xml.in.h:48
+#: ../mail/vfoldertypes.xml.in.h:49
+msgid "is not Completed"
+msgstr "nije završeno"
+
+#: ../mail/filtertypes.xml.in.h:51 ../mail/searchtypes.xml.in.h:53
+#: ../mail/vfoldertypes.xml.in.h:54
+msgid "Mailing list"
+msgstr "Dopisna lista"
+
+#: ../mail/filtertypes.xml.in.h:52 ../mail/searchtypes.xml.in.h:54
+#: ../mail/vfoldertypes.xml.in.h:55
+msgid "Regex Match"
+msgstr "Regizr odgovara"
+
+#: ../mail/filtertypes.xml.in.h:53 ../mail/searchtypes.xml.in.h:55
+#: ../mail/vfoldertypes.xml.in.h:56
+msgid "Message Header"
+msgstr "Zaglavlje poruke"
+
+#: ../mail/filtertypes.xml.in.h:54
+msgid "Source Account"
+msgstr "Izvorni nalog"
+
+#: ../mail/filtertypes.xml.in.h:55
+msgid "Pipe to Program"
+msgstr "Poveži na program"
+
+#: ../mail/filtertypes.xml.in.h:56
+msgid "returns"
+msgstr "povratno"
+
+#: ../mail/filtertypes.xml.in.h:57
+msgid "does not return"
+msgstr "ne vraća"
+
+#: ../mail/filtertypes.xml.in.h:58
+msgid "returns greater than"
+msgstr "povratno veće od"
+
+#: ../mail/filtertypes.xml.in.h:59
+msgid "returns less than"
+msgstr "povratno manje od"
+
+#: ../mail/filtertypes.xml.in.h:60
+msgid "Junk Test"
+msgstr "Provera đubreta"
+
+#: ../mail/filtertypes.xml.in.h:61
+msgid "Message is Junk"
+msgstr "Poruka je đubre"
+
+#: ../mail/filtertypes.xml.in.h:62
+msgid "Message is not Junk"
+msgstr "Poruka nije đubre"
+
+#: ../mail/filtertypes.xml.in.h:63 ../mail/vfoldertypes.xml.in.h:57
+msgid "Message Location"
+msgstr "Lokacija poruke"
+
+#: ../mail/filtertypes.xml.in.h:64 ../mail/searchtypes.xml.in.h:56
+#: ../mail/vfoldertypes.xml.in.h:58
+msgid "Match All"
+msgstr "Odgovara sve"
+
+#: ../mail/filtertypes.xml.in.h:68
+msgid "Stop Processing"
+msgstr "Prekini obradu"
+
+#: ../mail/filtertypes.xml.in.h:69
+msgid "Set Label"
+msgstr "Postavi oznaku"
+
+#: ../mail/filtertypes.xml.in.h:70
+msgid "Assign Color"
+msgstr "Dodeli boju"
+
+#: ../mail/filtertypes.xml.in.h:71
+msgid "Unset Color"
+msgstr "Nepostavljena boja"
+
+#: ../mail/filtertypes.xml.in.h:72
+msgid "Assign Score"
+msgstr "Dodeli rezultat"
+
+#: ../mail/filtertypes.xml.in.h:73
+msgid "Adjust Score"
+msgstr "Preračunaj"
+
+#: ../mail/filtertypes.xml.in.h:74
+msgid "Set Status"
+msgstr "Postavi status"
+
+#: ../mail/filtertypes.xml.in.h:75 ../mail/searchtypes.xml.in.h:40
+#: ../mail/vfoldertypes.xml.in.h:40
+msgid "Deleted"
+msgstr "Obrisano"
+
+#: ../mail/filtertypes.xml.in.h:76
+msgid "Unset Status"
+msgstr "Nepostavljen status"
+
+#: ../mail/filtertypes.xml.in.h:77
+msgid "Beep"
+msgstr "Zvono"
+
+#: ../mail/filtertypes.xml.in.h:78
+msgid "Play Sound"
+msgstr "Pusti zvuk"
+
+#: ../mail/filtertypes.xml.in.h:79
+msgid "Run Program"
+msgstr "Pokreni program"
+
+#: ../mail/filtertypes.xml.in.h:80
+msgid "Forward to"
+msgstr "Prosledi"
+
 #: ../mail/importers/elm-importer.c:173
 msgid "Importing Elm data"
 msgstr "Uvoženje Elm podataka"
 
-#: ../mail/importers/elm-importer.c:374
+#: ../mail/importers/elm-importer.c:376
 msgid "Evolution Elm importer"
 msgstr "Elm uvoznik Evolucije"
 
-#: ../mail/importers/elm-importer.c:375
+#: ../mail/importers/elm-importer.c:377
 msgid "Import mail from Elm."
 msgstr "Uvozi poštu iz Elma."
 
 #: ../mail/importers/evolution-mbox-importer.c:134
+#: ../mail/importers/kmail-importer.c:210
 #: ../plugins/dbx-import/dbx-importer.c:246
 msgid "_Destination folder:"
 msgstr "_Odredišna fascikla:"
 
 #: ../mail/importers/evolution-mbox-importer.c:140
+#: ../mail/importers/kmail-importer.c:216
 #: ../plugins/dbx-import/dbx-importer.c:252
 #: ../plugins/pst-import/pst-importer.c:541
 msgid "Select folder"
 msgstr "Izaberite fasciklu"
 
 #: ../mail/importers/evolution-mbox-importer.c:141
+#: ../mail/importers/kmail-importer.c:217
 #: ../plugins/dbx-import/dbx-importer.c:253
 #: ../plugins/pst-import/pst-importer.c:542
 msgid "Select folder to import into"
 msgstr "Izaberite fasciklu za uvoz"
 
-#: ../mail/importers/evolution-mbox-importer.c:435
+#: ../mail/importers/evolution-mbox-importer.c:509
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Naslov"
 
-#: ../mail/importers/evolution-mbox-importer.c:440
+#: ../mail/importers/evolution-mbox-importer.c:514
 msgctxt "mboxImp"
 msgid "From"
 msgstr "Šalje"
 
-#: ../mail/importers/evolution-mbox-importer.c:493
-#: ../shell/e-shell-utils.c:171
+#: ../mail/importers/evolution-mbox-importer.c:568 ../shell/e-shell-utils.c:173
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkli poštansko sanduče (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:494
+#: ../mail/importers/evolution-mbox-importer.c:569
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Uvoznik za fascikle oblika Berkli poštanskog sandučeta"
 
+#: ../mail/importers/kmail-importer.c:263
+#, c-format
+msgid "%d Address"
+msgid_plural "%d Addresses"
+msgstr[0] "%d adresa"
+msgstr[1] "%d adrese"
+msgstr[2] "%d adresa"
+msgstr[3] "Adresa"
+
+#: ../mail/importers/kmail-importer.c:354
+msgid "Evolution KMail importer"
+msgstr "Evolucijin uvoz KMejlova"
+
+#: ../mail/importers/kmail-importer.c:355
+msgid "Import mail and contacts from KMail."
+msgstr "Uvozi poštu i kontakte iz KMejla."
+
+#: ../mail/importers/kmail-libs.c:152
+#: ../modules/mail/e-mail-shell-view-private.c:1060
+msgid "Trash"
+msgstr "Smeće"
+
 #: ../mail/importers/mail-importer.c:54
 msgid "Importing mailbox"
 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."
+
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:144
+#: ../mail/importers/mail-importer.c:186 ../mail/importers/mail-importer.c:311
 #: ../plugins/dbx-import/dbx-importer.c:609
 #: ../plugins/pst-import/pst-importer.c:760
 #, c-format
 msgid "Importing '%s'"
 msgstr "Uvozim „%s“"
 
-#: ../mail/importers/mail-importer.c:309
+#: ../mail/importers/mail-importer.c:555
 #, c-format
 msgid "Scanning %s"
 msgstr "Pretražujem „%s“"
@@ -14519,11 +17690,11 @@ msgstr "Pretražujem „%s“"
 msgid "Importing Pine data"
 msgstr "Uvoženje Pine podataka"
 
-#: ../mail/importers/pine-importer.c:475
+#: ../mail/importers/pine-importer.c:477
 msgid "Evolution Pine importer"
 msgstr "Evolucijin Pine uvoznik"
 
-#: ../mail/importers/pine-importer.c:476
+#: ../mail/importers/pine-importer.c:478
 msgid "Import mail from Pine."
 msgstr "Uvozi poštu iz programa Pine."
 
@@ -14606,122 +17777,106 @@ msgstr "Podrazumevano ponašanje"
 msgid "For_mat messages in HTML"
 msgstr "Oblikuj poruke u HTM_L"
 
-#: ../mail/mail-config.ui.h:9
-msgid "Automatically insert _emoticon images"
-msgstr "Uvek umetni slike _smajlića"
-
 #: ../mail/mail-config.ui.h:10
+msgid "Automatically insert _emoticons"
+msgstr "Sam umetni _smajliće"
+
+#: ../mail/mail-config.ui.h:11
+#| msgid "Use Unicode characters for smileys."
+msgid "Use Un_icode characters for emoticons"
+msgstr "Koristi _unikod znakove za smajliće"
+
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "Uvek traži _povratnicu"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:13
 msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "Kodiraj nazive datoteka na način _Autluka/Gpošte"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:14
+msgid "Send messages through Outbo_x folder"
+msgstr "Šalji poruke kroz fasciklu _Za slanje."
+
+#: ../mail/mail-config.ui.h:15
+msgid "Number of characters for word w_rapping:"
+msgstr "Bro_j znakova za prelamanje reči"
+
+#: ../mail/mail-config.ui.h:16
 msgid "Ch_aracter encoding:"
 msgstr "Kodna st_rana:"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:17
 msgid "Replies and Forwards"
 msgstr "Odgovori i prosleđivanja"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:18
 msgid "_Reply style:"
 msgstr "_Stil odgovora:"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:19
 msgid "_Forward style:"
 msgstr "Stil _prosleđivanja:"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:20
 msgid "Start _typing at the bottom on replying"
 msgstr "U odgovoru započni _kucanje pri dnu"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:21
 msgid "_Keep signature above the original message on replying"
 msgstr "Zadrži potpis _iznad originalne poruke pri odgovoru"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:22
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "_Zanemari „Odgovor-za:“ za dopisne liste"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:23
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "Odgovor _grupi ide samo na dopisnu listu, ako je moguće"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:24
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr ""
 "Digitalno _potpiši poruke kada je originalna poruka potpisana (PGP ili S/"
 "MIME)"
 
-#: ../mail/mail-config.ui.h:21
-msgctxt "ReplyForward"
-msgid "Attachment"
-msgstr "Priloži"
-
-#: ../mail/mail-config.ui.h:22
-msgctxt "ReplyForward"
-msgid "Inline (Outlook style)"
-msgstr "Unutar (Autluk stil)"
-
-#: ../mail/mail-config.ui.h:23
-msgctxt "ReplyForward"
-msgid "Quoted"
-msgstr "Citirano"
-
-#: ../mail/mail-config.ui.h:24
-msgctxt "ReplyForward"
-msgid "Do Not Quote"
-msgstr "Ne citiraj"
-
 #: ../mail/mail-config.ui.h:25
+msgid "_Wrap quoted text in replies"
+msgstr "_Prelomi citirani tekst u odgovorima"
+
+#: ../mail/mail-config.ui.h:30
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "Unutar"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:32
 msgid "Sig_natures"
 msgstr "Pot_pisi"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:33
 msgid "Signatures"
 msgstr "Potpisi"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:34
 msgid "_Languages"
 msgstr "_Jezici"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:35
 msgid "Languages Table"
 msgstr "Tabela jezika"
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:36
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "Spisak jezika ovde oslikava samo one jezike za koje imate instaliran rečnik."
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:38
 msgid "Check spelling while I _type"
 msgstr "Proveri pravopis dok _kucam"
 
-#: ../mail/mail-config.ui.h:34
-msgid "Color for _misspelled words:"
-msgstr "Boja za _pogrešno napisane reči:"
-
-#: ../mail/mail-config.ui.h:35
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
-msgid "Pick a color"
-msgstr "Izaberite boju"
-
-#: ../mail/mail-config.ui.h:36
-msgid "Spell Checking"
-msgstr "Provera pravopisa"
-
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:40
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -14730,73 +17885,71 @@ msgstr ""
 "pre izvršavanja sledećih označenih radnji:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:42
 msgid "Sending a message with an _empty subject line"
 msgstr "Slanja poruke sa praznom linijom _naslova"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:44
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Slanja poruke koja sadrži određene samo _Bcc primaoce"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:46
+msgid "Sending a message to many _To and CC recipients"
+msgstr "Slanja poruke za mnogo _Za i CC primaoca"
+
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:48
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Slanja privatnog _odgovora na poruku dopisne liste"
 
 # bug(slobo): verovatno izveštaj o dostavi
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:50
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Slanja odgovora _većem broju primalaca"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:52
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "Dozvoljavanja _dopisnoj listi da preusmeri privatnu poruku na listu"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:54
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "Slanja poruke sa _primaocima koji nisu unešeni kao adrese pošte"
 
-#: ../mail/mail-config.ui.h:50
+#. 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)"
+
+#: ../mail/mail-config.ui.h:57
 msgid "Confirmations"
 msgstr "Potvrđivanja"
 
 #. Translators: Label of a frame with a list of folders for which to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:54
-#| msgid "Search Folders"
+#: ../mail/mail-config.ui.h:61
 msgid "Use for Folders"
 msgstr "Koristi za fascikle"
 
-#: ../mail/mail-config.ui.h:55
-msgid "A_dd"
-msgstr "_Dodaj"
-
-#: ../mail/mail-config.ui.h:57
-#| msgid "_Remove"
-msgid "Re_move"
-msgstr "_Ukloni"
-
 # bug(slobo): verovatno izveštaj o dostavi
 #. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account 
overrides
-#: ../mail/mail-config.ui.h:59
-#| msgid "Sender or Recipients"
+#: ../mail/mail-config.ui.h:66
 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:61 ../modules/mail/em-composer-prefs.c:870
-#| msgid "_Account:"
+#: ../mail/mail-config.ui.h:68 ../modules/mail/em-composer-prefs.c:864
 msgid "Account"
 msgstr "Nalog"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:69
 msgid "Send account overrides"
 msgstr "Prepisivanja naloga slanja"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:70
 msgid ""
 "Assign which account should be used as a send account for respective folders "
 "or recipients, an override for usual send account detection. List of "
@@ -14808,187 +17961,228 @@ msgstr ""
 "Spisak primaoca može da sadrži delimične adrese ili nazive. Delovi adrese i "
 "naziva se upoređuju zasebno."
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:71
 msgid "_Folder override has precedence over Recipient override"
 msgstr "Prepisivanje _fascikle ima prednost nad prepisivanjem primaoca"
 
-#: ../mail/mail-config.ui.h:65
-#| msgid "Source Account"
+#: ../mail/mail-config.ui.h:72
 msgid "Send Account"
 msgstr "Nalog slanja"
 
-#: ../mail/mail-config.ui.h:71 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:78 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:72 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:79 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:80
 msgid "Start up"
 msgstr "Pokretanje"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:81
 msgid "Check for new _messages on start"
 msgstr "Proveri nove _poruke prilikom pokretanja"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:82
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Proveri nove _poruke u svim aktivnim nalozima"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:83
 msgid "Message Display"
 msgstr "Prikaz poruke"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:84
 msgid "_Use the same fonts as other applications"
 msgstr "_Koristi iste fontove kao drugi programi"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:85
 msgid "S_tandard Font:"
 msgstr "_Standardni font:"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:86
 msgid "Select HTML fixed width font"
 msgstr "Izaberite HTML font stalne veličine"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:87
 msgid "Select HTML variable width font"
 msgstr "Izaberite HTML font promenljive veličine"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:88
 msgid "Fix_ed Width Font:"
 msgstr "Font _stalne širine:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:89
 msgid "_Mark messages as read after"
 msgstr "_Označi poruke kao pročitane posle"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:91
 msgid "Highlight _quotations with"
 msgstr "Naglasi _citate sa"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:92
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
+msgid "Pick a color"
+msgstr "Izaberite boju"
+
+#: ../mail/mail-config.ui.h:93
 msgid "color"
 msgstr "boja"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:94
 msgid "Default character e_ncoding:"
 msgstr "Podrazumevana _kodna strana:"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:95
 msgid "Apply the same _view settings to all folders"
 msgstr "Primeni ista podešavanja _pregleda na svim fasciklama"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:96
 msgid "F_all back to threading messages by subject"
 msgstr "Vra_ti se na nizanje poruka po naslovu"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:97
 msgid "Delete Mail"
 msgstr "Obriši poštu"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:98
 msgid "Empty _trash folders"
 msgstr "Isprazni fascikle _smeća"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:99
 msgid "Confirm _when expunging a folder"
 msgstr "_Potvrdi kada prazniš fasciklu"
 
+#: ../mail/mail-config.ui.h:100
+msgid "Archive Mail"
+msgstr "Arhiviraj poruku"
+
+#: ../mail/mail-config.ui.h:101
+msgid "On This Computer A_rchive folder:"
+msgstr "Arhiva na ovom računaru:"
+
+#: ../mail/mail-config.ui.h:102
+msgid "Archive folder to use for On This Computer messages"
+msgstr ""
+"Fascikla za arhivu koja se koristi za poruke unutar fascikle „Na ovom "
+"računaru“"
+
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:104
 msgid "_Show animated images"
 msgstr "Prikaži _animirane slike"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:105
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Upozori pri slanju HTML pošte kontaktima koji ih ne žele"
 
-#: ../mail/mail-config.ui.h:95
-msgid "Loading Images"
-msgstr "Učitavanje slika"
+#: ../mail/mail-config.ui.h:106
+msgid "Loading Remote Content"
+msgstr "Učitavam udaljeni sadržaj"
 
-#: ../mail/mail-config.ui.h:96
-msgid "_Never load images from the Internet"
-msgstr "_Nikada ne učitavaj slike sa Interneta"
+#: ../mail/mail-config.ui.h:107
+msgid "_Never load remote content from the Internet"
+msgstr "_Nikada ne učitavaj udaljeni sadržaj sa Interneta"
 
-#: ../mail/mail-config.ui.h:97
-msgid "_Load images only in messages from contacts"
-msgstr "_Učitaj slike samo u porukama od kontakta"
+#: ../mail/mail-config.ui.h:108
+msgid "_Load remote content only in messages from contacts"
+msgstr "_Učitaj udaljeni sadržaj samo u porukama od kontakta"
 
-#: ../mail/mail-config.ui.h:98
-msgid "_Always load images from the Internet"
-msgstr "_Uvek učitaj slike sa Interneta"
+#: ../mail/mail-config.ui.h:109
+msgid "_Always load remote content from the Internet"
+msgstr "_Uvek učitaj udaljeni sadržaj sa Interneta"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:110
+#| msgid "_Show the photograph of sender in the message preview"
+msgid "Notify about _missing remote content in the message preview"
+msgstr "Obavesti o _nedostajućem udaljenom sadržaju u pregledu poruke"
+
+#: ../mail/mail-config.ui.h:111
+msgid "Add"
+msgstr "Dodaj"
+
+#: ../mail/mail-config.ui.h:112
+msgid "Remove"
+msgstr "Ukloni"
+
+#: ../mail/mail-config.ui.h:113
+msgid "Allow for sites:"
+msgstr "Dozvoli za sajtove:"
+
+#: ../mail/mail-config.ui.h:114
+msgid "Allow for senders:"
+msgstr "Dozvoli za pošiljaoce:"
+
+#: ../mail/mail-config.ui.h:115
 msgid "HTML Messages"
 msgstr "HTML poruke"
 
-#: ../mail/mail-config.ui.h:100 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:116 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Oznake"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:117
 msgid "Sender Photograph"
 msgstr "Fotografija pošiljaoca"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:118
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Prikaži fotografiju pošiljaoca u pregledu pošte"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:119
+msgid "Search gra_vatar.com for the photograph of sender"
+msgstr "Po_traži sliku pošiljaoca na gravatar.com"
+
+#: ../mail/mail-config.ui.h:120
 msgid "Displayed Message Headers"
 msgstr "Prikazana zaglavlja poruka"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:121
 msgid "Mail Headers Table"
 msgstr "Tabela zaglavlja pošte"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:122
 #: ../modules/addressbook/autocompletion-config.c:116
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "Format datum/vreme"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:124
 msgid "Check incoming _messages for junk"
 msgstr "Proveri ima li đubreta u _pristigloj pošti"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:125
 msgid "_Delete junk messages"
 msgstr "_Obriši poruke đubra"
 
-#: ../mail/mail-config.ui.h:109
-msgid "Check cu_stom headers for junk"
-msgstr "Proveri ima li đubreta u _prilagođenim zaglavljima"
+#: ../mail/mail-config.ui.h:126
+msgid "Junk Test Options"
+msgstr "Opcije za testiranje đubreta"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:127
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Ne označava_j poruke kao đubre ako je pošiljalac u mom adresaru"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:128
 msgid "_Lookup in local address book only"
 msgstr "_Potraži samo u lokalnom adresaru"
 
-#: ../mail/mail-config.ui.h:112
-msgid "Option is ignored if a match for custom junk headers is found."
-msgstr ""
-"Opcija se zanemaruje ukoliko je pronađeno poklapanje sa proizvoljnim zaglavljem "
-"đubreta."
+#: ../mail/mail-config.ui.h:129
+msgid "Check cu_stom headers for junk"
+msgstr "Proveri ima li đubreta u _prilagođenim zaglavljima"
 
-#: ../mail/mail-config.ui.h:114
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:224
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:158
+#: ../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
 msgid "No encryption"
 msgstr "Bez šifrovanja"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:132
 msgid "TLS encryption"
 msgstr "TLS šifrovanje"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:133
 msgid "SSL encryption"
 msgstr "SSL šifrovanje"
 
@@ -15152,11 +18346,11 @@ msgstr ""
 "„Prima:“ ili „CC:“ primaoca."
 
 # mail:ask-send-only-bcc primary
-#: ../mail/mail.error.xml.h:16
+#: ../mail/mail.error.xml.h:17
 msgid "Are you sure you want to send a message with invalid address?"
 msgstr "Sigurno želite da pošaljete poruku sa neispravnom adresom?"
 
-#: ../mail/mail.error.xml.h:17
+#: ../mail/mail.error.xml.h:18
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -15165,11 +18359,11 @@ msgstr ""
 "{0}"
 
 # mail:ask-send-only-bcc primary
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:20
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "Sigurno želite da pošaljete poruku sa neispravnim adresama?"
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:21
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -15177,11 +18371,11 @@ msgstr ""
 "Sledeći primaoci nisu prepoznati kao ispravne adrese el. pošte:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:23
 msgid "Send private reply?"
 msgstr "Da pošaljem privatan odgovor?"
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:24
 msgid ""
 "You are replying privately to a message which arrived via a mailing list, "
 "but the list is trying to redirect your reply to go back to the list. Are "
@@ -15191,11 +18385,11 @@ msgstr ""
 "pokušava da preusmeri vaš odgovor nazad na listu. Da li ste sigurni da "
 "želite da nastavite?"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:25
 msgid "Reply _Privately"
 msgstr "Odgovori _privatno"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:27
 msgid ""
 "You are replying to a message which arrived via a mailing list, but you are "
 "replying privately to the sender; not to the list. Are you sure you want to "
@@ -15206,11 +18400,11 @@ msgstr ""
 "nastavite?"
 
 # bug(slobo): verovatno izveštaj o dostavi
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:29
 msgid "Send reply to all recipients?"
 msgstr "Da pošaljem odgovore svim primaocima?"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:30
 msgid ""
 "You are replying to a message which was sent to many recipients. Are you "
 "sure you want to reply to ALL of them?"
@@ -15218,12 +18412,12 @@ msgstr ""
 "Odgovarate na poruku koja je poslata većem broju primalaca. Da li ste "
 "sigurni da želite SVIMA da odgovorite?"
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:31
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "Ova poruka se ne može poslati pošto niste naveli nijednog primaoca"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:32
 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."
@@ -15231,11 +18425,11 @@ 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."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:33
 msgid "Use default drafts folder?"
 msgstr "Da koristim podrazumevanu fasciklu nacrta?"
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:34
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -15243,11 +18437,11 @@ msgstr ""
 "Ne mogu da otvorim fasciklu nacrta za ovaj nalog. Da koristim sistemsku "
 "fasciklu nacrta umesto toga?"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:35
 msgid "Use _Default"
 msgstr "Koristi _osnovno"
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:36
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
@@ -15255,39 +18449,38 @@ msgstr ""
 "Sigurno želite trajno da uklonite sve obrisane poruke iz fascikle „{0}“?"
 
 # mail:ask-empty-trash secondary
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:37
 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:37
+#: ../mail/mail.error.xml.h:38
 msgid "_Expunge"
 msgstr "Iz_baci"
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:39
 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:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../mail/mail.error.xml.h:40 ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "_Empty Trash"
 msgstr "_Izbaci smeće"
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:41
 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:41
+#: ../mail/mail.error.xml.h:42
 msgid "_Open Messages"
 msgstr "_Otvori poruke"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:43
 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:43
+#: ../mail/mail.error.xml.h:44
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -15298,59 +18491,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:47
+#: ../mail/mail.error.xml.h:48
 msgid "Error while {0}."
 msgstr "Greška prilikom {0}."
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:49
 msgid "Error while performing operation."
 msgstr "Greška tokom izvršavanja operacije."
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:50
 msgid "Enter password."
 msgstr "Unesite lozinku."
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:51
 msgid "Error loading filter definitions."
 msgstr "Greška pri učitavanju definicija filtera."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:52
 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:52
+#: ../mail/mail.error.xml.h:53
 msgid "Cannot save to file \"{0}\"."
 msgstr "Ne mogu da sačuvam u datoteku „{0}“."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:54
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Ne mogu da napravim direktorijum za čuvanje, zbog „{1}“"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:55
 msgid "Cannot create temporary save directory."
 msgstr "Ne mogu da napravim privremeni direktorijum za čuvanje."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:56
 msgid "File exists but cannot overwrite it."
 msgstr "Datoteka postoji ali ne mogu da je prepišem."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:57
 msgid "File exists but is not a regular file."
 msgstr "Datoteka postoji ali nije regularna."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:58
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Ne mogu da obrišem fasciklu „{0}“."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:59
 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:59
+#: ../mail/mail.error.xml.h:60
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -15358,23 +18551,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:60
+#: ../mail/mail.error.xml.h:61
 msgid "Failed to expunge folder &quot;{0}&quot;."
-msgstr "Nisam uspeo da izbacim fasciklu „{0}“."
+msgstr "Ne mogu da izbacim fasciklu „{0}“."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:63
 msgid "Failed to refresh folder &quot;{0}&quot;."
-msgstr "Nisam uspeo da osvežim fasciklu „{0}“."
+msgstr "Ne mogu da osvežim fasciklu „{0}“."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:64
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Ne mogu da preimenujem ili da premestim sistemsku fasciklu„{0}“."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:65
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Da obrišem fasciklu „{0}“ i sve podfascikle?"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:66
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -15382,20 +18575,20 @@ msgstr ""
 "Ukoliko obrišete fasciklu, sav njen sadržaj i sadržaj podfascikli biće trajno "
 "obrisani."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:68
 msgid "Really delete folder \"{0}\"?"
 msgstr "Da obrišem fasciklu „{0}“?"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:69
 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:69
+#: ../mail/mail.error.xml.h:70
 msgid "These messages are not copies."
 msgstr "Ove poruke nisu umnošci."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:71
 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 "
@@ -15406,70 +18599,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:71
+#: ../mail/mail.error.xml.h:72
 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:72
+#: ../mail/mail.error.xml.h:73
 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:73
+#: ../mail/mail.error.xml.h:74
 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:74
+#: ../mail/mail.error.xml.h:75
 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:75
+#: ../mail/mail.error.xml.h:76
 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:76
+#: ../mail/mail.error.xml.h:77
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Ne mogu da umnožim fasciklu „{0}“ u „{1}“."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:78
 msgid "Cannot create folder \"{0}\"."
 msgstr "Ne mogu da napravim fasciklu „{0}“."
 
 # mail:no-move-folder-to-nostore primary
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:79
 msgid "Cannot open folder. Error: {1}"
 msgstr "Ne mogu da otvorim fasciklu. Greška: {1}"
 
 # mail:account-notunique primary
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:80
 msgid "Cannot save changes to account."
 msgstr "Ne mogu da sačuvam izmene na nalogu."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:81
 msgid "You have not filled in all of the required information."
 msgstr "Niste uneli sve potrebne podatke."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:82
 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:82
+#: ../mail/mail.error.xml.h:83
 msgid "Are you sure you want to delete this account?"
 msgstr "Sigurno želite da obrišete ovaj nalog?"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:84
 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:84
+#: ../mail/mail.error.xml.h:85
 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:85
+#: ../mail/mail.error.xml.h:86
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -15477,29 +18670,28 @@ msgstr ""
 "Ukoliko nastavite, podaci o nalogu i svi\n"
 "podaci posrednika biće trajno obrisani."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:88
 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:88
+#: ../mail/mail.error.xml.h:89
 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:89
+#: ../mail/mail.error.xml.h:90
 msgid "Do _Not Disable"
 msgstr "Nemoj _isključiti"
 
-#: ../mail/mail.error.xml.h:90
-#: ../plugins/publish-calendar/publish-calendar.c:655
+#: ../mail/mail.error.xml.h:91
 msgid "_Disable"
 msgstr "_Isključi"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:92
 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:92
+#: ../mail/mail.error.xml.h:93
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -15507,39 +18699,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:94
+#: ../mail/mail.error.xml.h:95
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Ne mogu da dodam fasciklu pretrage „{0}“."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:96
 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:96
+#: ../mail/mail.error.xml.h:97
 msgid "Search Folders automatically updated."
 msgstr "Fascikle pretrage su automatski ažurirane."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:98
 msgid "Mail filters automatically updated."
 msgstr "Propusnici pošte su automatski ažurirani."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:99
 msgid "Missing folder."
 msgstr "Nedostajuća fascikla."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:100
 msgid "You must specify a folder."
 msgstr "Morate da navedete fasciklu."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:102
 msgid "You must name this Search Folder."
 msgstr "Morate da date naziv ovoj fascikli pretrage."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:103
 msgid "No folder selected."
 msgstr "Nije izabrana nijedna fascikla."
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:104
 msgid ""
 "You must specify at least one folder as a source.\n"
 "Either by selecting the folders individually, and/or by selecting all local "
@@ -15549,11 +18741,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:105
+#: ../mail/mail.error.xml.h:106
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Problem pri prenosu stare fascikle pošte „{0}“."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:107
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15565,23 +18757,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:109
-msgid "Ignore"
-msgstr "Zanemari"
-
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:111
 msgid "_Overwrite"
 msgstr "_Prepiši"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:112
 msgid "_Append"
 msgstr "_Prikači"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:113
 msgid "Evolution's local mail format has changed."
 msgstr "Evolucijin lokalni format pošte je promenjen."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:114
 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 "
@@ -15599,19 +18787,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:116
+#: ../mail/mail.error.xml.h:117
 msgid "_Exit Evolution"
 msgstr "_Izađi iz Evolucije"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:118
 msgid "_Migrate Now"
 msgstr "P_reseli sada"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:119
 msgid "Unable to read license file."
 msgstr "Ne mogu da pročitam datoteku licence."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:120
 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."
@@ -15619,27 +18807,32 @@ 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:120
+#: ../mail/mail.error.xml.h:121
 msgid "Please wait."
 msgstr "Sačekajte."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:122
 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:122
+#: ../mail/mail.error.xml.h:123
 msgid ""
 "Failed to query server for a list of supported authentication mechanisms."
 msgstr ""
-"Nisam uspeo da propitam server za spisak podržanih mehanizama potvrđivanja "
+"Ne mogu da propitam server za spisak podržanih mehanizama potvrđivanja "
 "identiteta."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:124
+#| msgid "Failed to retrieve messages."
+msgid "Failed to get server setup."
+msgstr "Nisam uspeo da dobavim podešavanje servera."
+
+#: ../mail/mail.error.xml.h:125
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Uskladiti fascikle lokalno za rad van mreže?"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:126
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -15647,27 +18840,27 @@ msgstr ""
 "Želite li lokalno da uskladite fascikle koje su označene za korišćenje van "
 "mreže?"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:127
 msgid "Do _Not Synchronize"
 msgstr "_Ne usklađuj"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:128
 msgid "_Synchronize"
 msgstr "_Uskladi"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:129
 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:128
+#: ../mail/mail.error.xml.h:130
 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:129
+#: ../mail/mail.error.xml.h:131
 msgid "Also mark messages in subfolders?"
 msgstr "Da označim takođe i poruke u podfasciklama?"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:132
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -15675,149 +18868,187 @@ msgstr ""
 "Želite li da označite poruke kao pročitane samo u trenutnoj fascikli, ili i "
 "one u podfasciklama?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:133
 msgid "In Current Folder and _Subfolders"
 msgstr "U trenutnoj fascikli i _podfasciklama"
 
 # bug: requires a comment on usage
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:134
 msgid "In Current _Folder Only"
 msgstr "Samo u trenutnoj _fascikli"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:135
 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:134
+#: ../mail/mail.error.xml.h:136
 msgid "_Yes, Always"
 msgstr "_Da, uvek"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:137
 msgid "_No, Never"
 msgstr "_Ne, nikada"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:138
 msgid "Copy folder in folder tree."
 msgstr "Umnožite fasciklu u stablo fascikli."
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:139
 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:140
-msgid "_Always"
-msgstr "_Uvek"
-
 #: ../mail/mail.error.xml.h:141
-msgid "N_ever"
-msgstr "_Nikada"
+msgid "Do _not copy"
+msgstr "N_e umnožavaj"
 
 #: ../mail/mail.error.xml.h:142
+msgid "_Always copy"
+msgstr "_Uvek umnoži"
+
+#: ../mail/mail.error.xml.h:143
+msgid "N_ever copy"
+msgstr "_Nikad ne umnožavaj"
+
+#: ../mail/mail.error.xml.h:144
 msgid "Move folder in folder tree."
 msgstr "Premestite fasciklu u stablo fascikli."
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:145
 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:144
+#: ../mail/mail.error.xml.h:147
+msgid "Do _not move"
+msgstr "N_e premeštaj"
+
+#: ../mail/mail.error.xml.h:148
+msgid "_Always move"
+msgstr "_Uvek premesti"
+
+#: ../mail/mail.error.xml.h:149
+msgid "N_ever move"
+msgstr "_Nikad ne premeštaj"
+
+#: ../mail/mail.error.xml.h:150
 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:145
+#: ../mail/mail.error.xml.h:151
 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:146
+#: ../mail/mail.error.xml.h:152
 msgid "Mail Deletion Failed"
 msgstr "Neuspešno brisanje pošte"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:153
 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:148
+#: ../mail/mail.error.xml.h:154
 msgid "\"Check Junk\" Failed"
 msgstr "Provera đubreta nije uspela"
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:155
 msgid "\"Report Junk\" Failed"
 msgstr "Izveštaj za đubre nije uspeo"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:156
 msgid "\"Report Not Junk\" Failed"
 msgstr "Izveštavanje da nije đubre nije uspelo"
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:157
 msgid "Remove duplicate messages?"
 msgstr "Da uklonim duplirane poruke?"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:158
 msgid "No duplicate messages found."
 msgstr "Nisu pronađene duple poruke."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:160
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "Fascikla „{0}“ ne sadrži nikakve duple poruke."
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:161
+msgid "Failed to connect account &quot;{0}&quot;."
+msgstr "Ne mogu da se povežem na nalog „{0}“."
+
+#: ../mail/mail.error.xml.h:162
 msgid "Failed to disconnect account &quot;{0}&quot;."
-msgstr "Nisam uspeo da prekinem vezu sa nalogom „{0}“."
+msgstr "Ne mogu da prekinem vezu sa nalogom „{0}“."
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:163
 msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
-msgstr "Nisam uspeo da se odjavim sa fascikle „{0}“."
+msgstr "Ne mogu da se odjavim sa fascikle „{0}“."
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:164
 msgid "Unable to retrieve message."
 msgstr "Ne mogu da dovučem poruku."
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:165
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:166
+msgid "Message is not available in offline mode."
+msgstr "Poruka nije dostupna u režimu van mreže."
+
+#: ../mail/mail.error.xml.h:167
+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 "
+"is online again, use File-&gt;Download Messages for Offline Usage, when this "
+"folder is selected, to make sure that all the messages in the folder will be "
+"available in offline mode."
+msgstr ""
+"Ovo verovatno znači da poruka nije preuzeta u potpunosti. Možda je fascikla "
+"ili nalog u režimu za rad van mreže. Ukoliko je to slučaj, nakon što se "
+"povežete na mrežu, izaberite ovu fasciklu i idite na Datoteka-&gt;Preuzmi "
+"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
 msgid "Failed to open folder."
-msgstr "Nisam uspeo da otvorim fasciklu."
+msgstr "Ne mogu da otvorim fasciklu."
 
 # bug: plural-forms
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:170
 msgid "Failed to find duplicate messages."
-msgstr "Nisam uspeo da pronađem duplirane poruke."
+msgstr "Ne mogu da pronađem duplirane poruke."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:171
 msgid "Failed to retrieve messages."
-msgstr "Nisam uspeo da dovučem poruke."
+msgstr "Ne mogu da dovučem poruke."
 
 # bug: plural-forms
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:172
 msgid "Failed to mark messages as read."
-msgstr "Nisam uspeo da označim poruke pročitanim."
+msgstr "Ne mogu da označim poruke pročitanim."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:173
 msgid "Failed to remove attachments from messages."
-msgstr "Nisam uspeo da uklonim priloge iz poruka."
+msgstr "Ne mogu da uklonim priloge iz poruka."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:174
 msgid "Failed to download messages for offline viewing."
-msgstr "Nisam uspeo da preuzmem poruke za pregledanje van mreže."
+msgstr "Ne mogu da preuzmem poruke za pregledanje van mreže."
 
 # bug: plural-forms
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:175
 msgid "Failed to save messages to disk."
-msgstr "Nisam uspeo da sačuvam poruke na disk."
+msgstr "Ne mogu da sačuvam poruke na disk."
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:176
 msgid "Hidden file is attached."
 msgstr "Skrivena datoteka je priložena."
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:177
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -15825,51 +19056,126 @@ 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:169
+#: ../mail/mail.error.xml.h:178
 msgid "Printing failed."
 msgstr "Štampanje nije uspelo."
 
-#: ../mail/mail.error.xml.h:170
+#: ../mail/mail.error.xml.h:179
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "Štampač je odgovorio „{0}“."
 
-#: ../mail/mail.error.xml.h:171
+#: ../mail/mail.error.xml.h:180
 msgid "Could not perform this operation on {0}."
 msgstr "Ne mogu da izvršim ovu radnju nad „{0}“."
 
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:181
 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:173
+#: ../mail/mail.error.xml.h:182
 msgid "Message from &quot;{0}&quot; account:"
 msgstr "Poruka sa „{0}“ naloga:"
 
-#: ../mail/mail-send-recv.c:188
+#: ../mail/mail.error.xml.h:183
+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
+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
+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
+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
+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
+msgid ""
+"You can download remote content manually, or set to remember to download "
+"remote content for this sender or used sites."
+msgstr ""
+"Možete preuzeti udaljeni sadržaj runo ili podesiti da se sadržaj automatski "
+"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
+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
+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
+msgid "Overdue: {0} by {1}"
+msgstr "Završen: {0} do {1}"
+
+#: ../mail/mail.error.xml.h:196
+#| msgid "This signature has been changed, but has not been saved."
+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
+#| msgid "Failed to delete an event in the calendar '{0}'"
+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
+#| msgid "Failed to mark thread to be ignored in folder '{0}'"
+msgid "Failed to store message note in folder '{0}'"
+msgstr "Nisam uspeo da smestim belešku poruke u fasciklu „{0}“"
+
+#: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
 msgstr "Otkazujem..."
 
-#: ../mail/mail-send-recv.c:526
+#: ../mail/mail-send-recv.c:636
 msgid "Send & Receive Mail"
 msgstr "Slanje i primanje pošte"
 
-#: ../mail/mail-send-recv.c:542
+#: ../mail/mail-send-recv.c:650
 msgid "Cancel _All"
 msgstr "Otkaži _sve"
 
-#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:1024
+#: ../mail/mail-send-recv.c:740 ../mail/mail-send-recv.c:1259
 msgid "Updating..."
 msgstr "Osvežavam..."
 
-#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:714
+#: ../mail/mail-send-recv.c:740 ../mail/mail-send-recv.c:822
 msgid "Waiting..."
 msgstr "Čekam..."
 
-#: ../mail/mail-send-recv.c:997
+#: ../mail/mail-send-recv.c:1225
 #, 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
+#, 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
+#, c-format
+msgid "Deleting junk at '%s'"
+msgstr "Brišem đubre iz „%s“"
+
+#: ../mail/mail-send-recv.c:1456
+#, c-format
+msgid "Expunging trash at '%s'"
+msgstr "Izbacujem smeće iz „%s“"
+
 #: ../mail/mail-vfolder-ui.c:66
 msgid "Search Folders"
 msgstr "Fascikle pretrage"
@@ -15882,86 +19188,86 @@ msgstr "Uredi fasciklu pretrage"
 msgid "New Search Folder"
 msgstr "Nova fascikla pretrage"
 
-#: ../mail/message-list.c:287
+#: ../mail/message-list.c:294
 msgid "Unseen"
 msgstr "Neviđeno"
 
-#: ../mail/message-list.c:288
+#: ../mail/message-list.c:295
 msgid "Seen"
 msgstr "Viđeno"
 
-#: ../mail/message-list.c:289
+#: ../mail/message-list.c:296
 msgid "Answered"
 msgstr "Odgovoreno"
 
-#: ../mail/message-list.c:290
+#: ../mail/message-list.c:297
 msgid "Forwarded"
 msgstr "Prosleđeno"
 
-#: ../mail/message-list.c:291
+#: ../mail/message-list.c:298
 msgid "Multiple Unseen Messages"
 msgstr "Višestruke neviđene poruke"
 
-#: ../mail/message-list.c:292
+#: ../mail/message-list.c:299
 msgid "Multiple Messages"
 msgstr "Višestruke poruke"
 
-#: ../mail/message-list.c:305
+#: ../mail/message-list.c:312
 msgid "Lowest"
 msgstr "Najniže"
 
-#: ../mail/message-list.c:306
+#: ../mail/message-list.c:313
 msgid "Lower"
 msgstr "Niže"
 
-#: ../mail/message-list.c:310
+#: ../mail/message-list.c:317
 msgid "Higher"
 msgstr "Više"
 
-#: ../mail/message-list.c:311
+#: ../mail/message-list.c:318
 msgid "Highest"
 msgstr "Najviše"
 
-#: ../mail/message-list.c:455 ../mail/message-list.c:5749
+#: ../mail/message-list.c:464 ../mail/message-list.c:6168
 msgid "Generating message list"
 msgstr "Pravljenje liste poruka"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1860 ../modules/itip-formatter/itip-view.c:237
+#: ../mail/message-list.c:2060 ../modules/itip-formatter/itip-view.c:235
 msgid "Today %l:%M %p"
 msgstr "Danas u %l:%M %p"
 
-#: ../mail/message-list.c:1869
+#: ../mail/message-list.c:2069
 msgid "Yesterday %l:%M %p"
 msgstr "Juče u %l:%M %p"
 
-#: ../mail/message-list.c:1881
+#: ../mail/message-list.c:2081
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1889
+#: ../mail/message-list.c:2089
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1891
+#: ../mail/message-list.c:2091
 msgid "%b %d %Y"
 msgstr "%d. %b %Y."
 
-#: ../mail/message-list.c:2771
+#: ../mail/message-list.c:2997
 msgid "Select all visible messages"
 msgstr "Izaberi sve vidljive poruke"
 
-#: ../mail/message-list.c:3399 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3699 ../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:4706
+#: ../mail/message-list.c:5105
 msgid "Follow-up"
 msgstr "Sledi"
 
-#: ../mail/message-list.c:5687
+#: ../mail/message-list.c:6107
 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 "
@@ -15973,7 +19279,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:5695
+#: ../mail/message-list.c:6115
 msgid "There are no messages in this folder."
 msgstr "Nema poruka u ovoj fascikli."
 
@@ -16005,38 +19311,51 @@ msgstr "Poruke"
 msgid "Subject - Trimmed"
 msgstr "Naslov — skraćeno"
 
-#: ../mail/searchtypes.xml.h:1
+#: ../mail/message-list.etspec.h:21 ../plugins/save-calendar/csv-format.c:374
+msgid "UID"
+msgstr "JIB"
+
+#: ../mail/searchtypes.xml.in.h:23 ../mail/vfoldertypes.xml.in.h:23
+msgid "Any header"
+msgstr "Bilo koje zaglavlje"
+
+#: ../mail/searchtypes.xml.in.h:57
 msgid "Subject or Addresses contains"
 msgstr "Naslov ili adrese sadrže"
 
-#: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:2002
+#: ../mail/searchtypes.xml.in.h:58
+#: ../modules/mail/e-mail-shell-view-actions.c:2159
 msgid "Recipients contain"
 msgstr "Primaoci sadrže"
 
-#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1995
+#: ../mail/searchtypes.xml.in.h:59
+#: ../modules/mail/e-mail-shell-view-actions.c:2152
 msgid "Message contains"
 msgstr "Poruka sadrži"
 
-#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:2016
+#: ../mail/searchtypes.xml.in.h:60
+#: ../modules/mail/e-mail-shell-view-actions.c:2173
 msgid "Subject contains"
 msgstr "Naslov sadrži"
 
-#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:2009
+#: ../mail/searchtypes.xml.in.h:61
+#: ../modules/mail/e-mail-shell-view-actions.c:2166
 msgid "Sender contains"
 msgstr "Pošiljalac sadrži"
 
-#: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1988
+#: ../mail/searchtypes.xml.in.h:62
+#: ../modules/mail/e-mail-shell-view-actions.c:2138
 msgid "Body contains"
 msgstr "Telo sadrži"
 
+#: ../mail/searchtypes.xml.in.h:63
+#: ../modules/mail/e-mail-shell-view-actions.c:2145
+msgid "Free form expression"
+msgstr "Izraz u slobodnoj formi"
+
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
 #: ../modules/addressbook/autocompletion-config.c:122
-#: ../modules/mail/em-mailer-prefs.c:1212
+#: ../modules/mail/em-mailer-prefs.c:1558
 msgid "_Table column:"
 msgstr "Kolona _tabele:"
 
@@ -16077,7 +19396,7 @@ msgid "Contact information for %s"
 msgstr "Podaci o kontaktu za %s"
 
 #: ../modules/addressbook/e-book-shell-backend.c:258
-#: ../modules/addressbook/e-book-shell-view-actions.c:124
+#: ../modules/addressbook/e-book-shell-view-actions.c:139
 msgid "New Address Book"
 msgstr "Novi adresar"
 
@@ -16087,7 +19406,7 @@ msgid "_Contact"
 msgstr "_Kontakt"
 
 #: ../modules/addressbook/e-book-shell-backend.c:269
-#: ../modules/addressbook/e-book-shell-view-actions.c:978
+#: ../modules/addressbook/e-book-shell-view-actions.c:1045
 msgid "Create a new contact"
 msgstr "Napravite novi kontakt"
 
@@ -16097,7 +19416,7 @@ msgid "Contact _List"
 msgstr "Li_sta kontakta"
 
 #: ../modules/addressbook/e-book-shell-backend.c:276
-#: ../modules/addressbook/e-book-shell-view-actions.c:985
+#: ../modules/addressbook/e-book-shell-view-actions.c:1052
 msgid "Create a new contact list"
 msgstr "Napravite novi spisak kontakta"
 
@@ -16107,277 +19426,291 @@ msgid "Address _Book"
 msgstr "_Adresar"
 
 #: ../modules/addressbook/e-book-shell-backend.c:286
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
+#: ../modules/addressbook/e-book-shell-view-actions.c:968
 msgid "Create a new address book"
 msgstr "Napravite novi adresar"
 
-#: ../modules/addressbook/e-book-shell-backend.c:314
-msgid "Certificates"
-msgstr "Uverenja"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:197
+#: ../modules/addressbook/e-book-shell-view-actions.c:212
 msgid "Address Book Properties"
 msgstr "Postavke adresara"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:475
-#: ../modules/addressbook/e-book-shell-view-actions.c:771
+#: ../modules/addressbook/e-book-shell-view-actions.c:535
+#: ../modules/addressbook/e-book-shell-view-actions.c:831
 msgid "Save as vCard"
 msgstr "Sačuvajte kao vKartu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:878
+#: ../modules/addressbook/e-book-shell-view-actions.c:938
 msgid "Co_py All Contacts To..."
 msgstr "Umnoži _sve kontakte u..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/addressbook/e-book-shell-view-actions.c:940
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Umnožite kontakte izabranog adresara u drugi"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:885
+#: ../modules/addressbook/e-book-shell-view-actions.c:945
 msgid "D_elete Address Book"
 msgstr "O_briši adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/addressbook/e-book-shell-view-actions.c:947
 msgid "Delete the selected address book"
 msgstr "Obrišite izabrani adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:892
+#: ../modules/addressbook/e-book-shell-view-actions.c:952
+#| msgid "_Add to Address Book..."
+msgid "_Manage Address Book groups..."
+msgstr "_Upravljaj grupama adresara..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:954
+#: ../modules/calendar/e-task-shell-view-actions.c:721
+msgid "Manage task list groups order and visibility"
+msgstr "Upravljajte redosledom i vidljivošću grupa spiskova zadataka"
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:959
 msgid "Mo_ve All Contacts To..."
 msgstr "Premesti _sve kontakte u..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
+#: ../modules/addressbook/e-book-shell-view-actions.c:961
 msgid "Move the contacts of the selected address book to another"
 msgstr "Premestite kontakte izabranog adresara u drugi"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:899
+#: ../modules/addressbook/e-book-shell-view-actions.c:966
 msgid "_New Address Book"
 msgstr "_Novi adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:906
+#: ../modules/addressbook/e-book-shell-view-actions.c:973
 msgid "Address _Book Properties"
 msgstr "Podešavanja adresa_ra"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:975
 msgid "Show properties of the selected address book"
 msgstr "Prikažite svojstva izabranog adresara"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:913
-#: ../modules/calendar/e-cal-shell-view-actions.c:1413
-#: ../modules/calendar/e-memo-shell-view-actions.c:635
-#: ../modules/calendar/e-task-shell-view-actions.c:759
+#: ../modules/addressbook/e-book-shell-view-actions.c:980
+#: ../modules/calendar/e-cal-shell-view-actions.c:1292
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 msgid "Re_fresh"
 msgstr "O_sveži"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:982
 msgid "Refresh the selected address book"
 msgstr "Osvežite izabrani adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:920
+#: ../modules/addressbook/e-book-shell-view-actions.c:987
 msgid "Address Book _Map"
 msgstr "_Mapa adresara"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:922
+#: ../modules/addressbook/e-book-shell-view-actions.c:989
 msgid "Show map with all contacts from selected address book"
 msgstr "Prikažite mapu sa svim kontaktima iz izabranih adresara"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
-#: ../modules/calendar/e-cal-shell-view-actions.c:1420
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
-#: ../modules/calendar/e-task-shell-view-actions.c:766
-#: ../modules/mail/e-mail-shell-view-actions.c:1610
+#: ../modules/addressbook/e-book-shell-view-actions.c:994
+#: ../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
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:929
+#: ../modules/addressbook/e-book-shell-view-actions.c:996
 msgid "Rename the selected address book"
 msgstr "Preimenujte izabrani adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:936
+#: ../modules/addressbook/e-book-shell-view-actions.c:1003
 msgid "Stop loading"
 msgstr "Prekini učitavanje"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:1008
 msgid "_Copy Contact To..."
 msgstr "_Umnoži kontakt u..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:943
+#: ../modules/addressbook/e-book-shell-view-actions.c:1010
 msgid "Copy selected contacts to another address book"
 msgstr "Umnožite izabrane kontakte u drugi adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:948
+#: ../modules/addressbook/e-book-shell-view-actions.c:1015
 msgid "_Delete Contact"
 msgstr "_Ukloni Kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:955
+#: ../modules/addressbook/e-book-shell-view-actions.c:1022
 msgid "_Find in Contact..."
 msgstr "_Pronađi u kontaktu..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:1024
 msgid "Search for text in the displayed contact"
 msgstr "Pretražite tekst u prikazanom kontaktu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:962
+#: ../modules/addressbook/e-book-shell-view-actions.c:1029
 msgid "_Forward Contact..."
 msgstr "_Prosledi kontakt..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:964
+#: ../modules/addressbook/e-book-shell-view-actions.c:1031
 msgid "Send selected contacts to another person"
 msgstr "Pošaljite izabrane kontakte drugoj osobi"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:969
+#: ../modules/addressbook/e-book-shell-view-actions.c:1036
 msgid "_Move Contact To..."
 msgstr "_Premesti kontakt u..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:971
+#: ../modules/addressbook/e-book-shell-view-actions.c:1038
 msgid "Move selected contacts to another address book"
 msgstr "Premestite izabrane kontakte u drugi adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:976
+#: ../modules/addressbook/e-book-shell-view-actions.c:1043
 msgid "_New Contact..."
 msgstr "Novi kon_takt..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:983
+#: ../modules/addressbook/e-book-shell-view-actions.c:1050
 msgid "New Contact _List..."
 msgstr "Nova _lista kontakta..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:990
+#: ../modules/addressbook/e-book-shell-view-actions.c:1057
 msgid "_Open Contact"
 msgstr "_Otvori kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:992
+#: ../modules/addressbook/e-book-shell-view-actions.c:1059
 msgid "View the current contact"
 msgstr "Pregledajte tekući kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:997
+#: ../modules/addressbook/e-book-shell-view-actions.c:1064
 msgid "_Send Message to Contact..."
 msgstr "_Pošalji poruku kontaktu..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:999
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
 msgid "Send a message to the selected contacts"
 msgstr "Pošaljite poruku izabranim kontaktima"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1006
-#: ../modules/calendar/e-cal-shell-view-actions.c:1576
-#: ../modules/calendar/e-task-shell-view-actions.c:824
+#: ../modules/addressbook/e-book-shell-view-actions.c:1073
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-task-shell-view-actions.c:812
 msgid "_Actions"
 msgstr "_Radnje"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1013
-#: ../modules/calendar/e-memo-shell-view-actions.c:679
-#: ../modules/calendar/e-task-shell-view-actions.c:831
-#: ../modules/mail/e-mail-shell-view-actions.c:1775
+#: ../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
 msgid "_Preview"
 msgstr "_Pregled"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1034
+#: ../modules/addressbook/e-book-shell-view-actions.c:1093
+#: ../modules/calendar/e-cal-shell-view-actions.c:1491
+#: ../modules/calendar/e-memo-shell-view-actions.c:682
+#: ../modules/calendar/e-task-shell-view-actions.c:836
+#| msgid "_Manager:"
+msgid "_Manage groups..."
+msgstr "_Upravljaj grupama..."
+
+#: ../modules/addressbook/e-book-shell-view-actions.c:1105
 msgid "Address Book Map"
 msgstr "Mapa adresara"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1066
+#: ../modules/addressbook/e-book-shell-view-actions.c:1137
 msgid "Contact _Preview"
 msgstr "Pre_gled kontakta"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1068
+#: ../modules/addressbook/e-book-shell-view-actions.c:1139
 msgid "Show contact preview window"
 msgstr "Prikažite prozor za pregled kontakta"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1074
+#: ../modules/addressbook/e-book-shell-view-actions.c:1145
 msgid "Show _Maps"
 msgstr "Prikaži _mape"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1076
+#: ../modules/addressbook/e-book-shell-view-actions.c:1147
 msgid "Show maps in contact preview window"
 msgstr "Prikažite mape u prozoru za pregled kontakata"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1095
-#: ../modules/calendar/e-memo-shell-view-actions.c:749
-#: ../modules/calendar/e-task-shell-view-actions.c:913
-#: ../modules/mail/e-mail-shell-view-actions.c:1905
+#: ../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
 msgid "_Classic View"
 msgstr "_Klasični prikaz"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1097
+#: ../modules/addressbook/e-book-shell-view-actions.c:1168
 msgid "Show contact preview below the contact list"
 msgstr "Prikažite pregled kontakta ispod kontakt liste"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1102
-#: ../modules/calendar/e-memo-shell-view-actions.c:756
-#: ../modules/calendar/e-task-shell-view-actions.c:920
-#: ../modules/mail/e-mail-shell-view-actions.c:1912
+#: ../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
 msgid "_Vertical View"
 msgstr "_Uspravni pregled"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1104
+#: ../modules/addressbook/e-book-shell-view-actions.c:1175
 msgid "Show contact preview alongside the contact list"
 msgstr "Prikažite pregled kontakta pored kontakt liste"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1119
-#: ../modules/calendar/e-cal-shell-view-actions.c:1753
-#: ../modules/calendar/e-memo-shell-view-actions.c:773
-#: ../modules/calendar/e-task-shell-view-actions.c:972
+#: ../modules/addressbook/e-book-shell-view-actions.c:1190
+#: ../modules/calendar/e-cal-shell-view-actions.c:1647
+#: ../modules/calendar/e-memo-shell-view-actions.c:767
+#: ../modules/calendar/e-task-shell-view-actions.c:968
 msgid "Unmatched"
 msgstr "Ne odgovara"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1129
-#: ../modules/calendar/e-cal-shell-view-actions.c:1763
-#: ../modules/calendar/e-memo-shell-view-actions.c:783
-#: ../modules/calendar/e-task-shell-view-actions.c:982
-#: ../modules/mail/e-mail-shell-view-actions.c:1981
+#: ../modules/addressbook/e-book-shell-view-actions.c:1200
+#: ../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
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Napredna pretraga"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1162
+#: ../modules/addressbook/e-book-shell-view-actions.c:1233
 msgid "Print all shown contacts"
 msgstr "Štampaj sve prikazane kontakte"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1169
+#: ../modules/addressbook/e-book-shell-view-actions.c:1240
 msgid "Preview the contacts to be printed"
 msgstr "Pregled kontakata pred štampu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1176
+#: ../modules/addressbook/e-book-shell-view-actions.c:1247
 msgid "Print selected contacts"
 msgstr "Štampa izabrane kontakte"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1191
+#: ../modules/addressbook/e-book-shell-view-actions.c:1262
 msgid "S_ave Address Book as vCard"
 msgstr "_Sačuvaj adresar kao vKartu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1193
+#: ../modules/addressbook/e-book-shell-view-actions.c:1264
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Sačuvajte kontakte izabranog adresara kao vKartu"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1199
-#: ../modules/addressbook/e-book-shell-view-actions.c:1209
+#: ../modules/addressbook/e-book-shell-view-actions.c:1270
+#: ../modules/addressbook/e-book-shell-view-actions.c:1280
 msgid "_Save as vCard..."
 msgstr "_Sačuvaj kao vKartu..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1201
+#: ../modules/addressbook/e-book-shell-view-actions.c:1272
 msgid "Save selected contacts as a vCard"
 msgstr "Sačuvaj izabrane kontakte kao VKartu"
 
-#: ../modules/addressbook/e-book-shell-view.c:311
+#: ../modules/addressbook/e-book-shell-view.c:313
 msgid "_Forward Contacts"
 msgstr "Prosledi kont_akte"
 
-#: ../modules/addressbook/e-book-shell-view.c:313
+#: ../modules/addressbook/e-book-shell-view.c:315
 msgid "_Forward Contact"
 msgstr "Prosle_di kontakt"
 
-#: ../modules/addressbook/e-book-shell-view.c:344
+#: ../modules/addressbook/e-book-shell-view.c:346
 msgid "_Send Message to Contacts"
 msgstr "_Pošalji poruku kontaktima"
 
-#: ../modules/addressbook/e-book-shell-view.c:346
+#: ../modules/addressbook/e-book-shell-view.c:348
 msgid "_Send Message to List"
 msgstr "_Pošalji poruku na listu"
 
-#: ../modules/addressbook/e-book-shell-view.c:348
+#: ../modules/addressbook/e-book-shell-view.c:350
 msgid "_Send Message to Contact"
 msgstr "_Pošalji poruku kontaktu"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:164
+#: ../modules/backup-restore/e-mail-config-restore-page.c:163
 msgid ""
 "You can restore Evolution from a backup file.\n"
 "\n"
@@ -16387,156 +19720,161 @@ msgstr ""
 "\n"
 "To će povratiti sve vaše lične podatke, podešavanja propusnika pošte, itd."
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:179
+#: ../modules/backup-restore/e-mail-config-restore-page.c:178
 msgid "_Restore from a backup file:"
 msgstr "_Vrati iz datoteke rezerve:"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:190
+#: ../modules/backup-restore/e-mail-config-restore-page.c:189
 msgid "Choose a backup file to restore"
 msgstr "Izaberite datoteku rezerve za povraćaj"
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/backup-restore/e-mail-config-restore-page.c:310
+#: ../modules/backup-restore/e-mail-config-restore-page.c:309
 #: ../modules/backup-restore/e-mail-config-restore-ready-page.c:56
 msgid "Restore from Backup"
 msgstr "Vrati iz rezerve"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:216
+#: ../modules/backup-restore/evolution-backup-restore.c:217
 msgid "Select name of the Evolution backup file"
 msgstr "Izaberite naziv za datoteku rezerve Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:249
+#: ../modules/backup-restore/evolution-backup-restore.c:250
 msgid "_Restart Evolution after backup"
 msgstr "_Ponovo pokreni Evoluciju nakon pravljenja rezerve"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:276
+#: ../modules/backup-restore/evolution-backup-restore.c:285
+msgid "Re_start Evolution after restore"
+msgstr "_Ponovo pokreni Evoluciju nakon povraćaja"
+
+#: ../modules/backup-restore/evolution-backup-restore.c:327
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Izaberite naziv datoteke rezerve Evolucije za povraćaj"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:289
-msgid "_Restart Evolution after restore"
-msgstr "_Ponovo pokreni Evoluciju nakon povraćaja"
+#: ../modules/backup-restore/evolution-backup-restore.c:336
+#, c-format
+msgid "Checking content of backup file '%s', please wait..."
+msgstr "Proveravam sadržaj rezervne datoteke „%s“..."
 
-#: ../modules/backup-restore/evolution-backup-restore.c:307
+#: ../modules/backup-restore/evolution-backup-restore.c:357
 msgid "_Back up Evolution Data..."
 msgstr "Napravi _rezervu podataka Evolucije..."
 
-#: ../modules/backup-restore/evolution-backup-restore.c:309
+#: ../modules/backup-restore/evolution-backup-restore.c:359
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "Napravite rezervu podataka i postavki Evolucije u arhivu"
 
 # shell:noshell-reason title
-#: ../modules/backup-restore/evolution-backup-restore.c:314
+#: ../modules/backup-restore/evolution-backup-restore.c:364
 msgid "R_estore Evolution Data..."
 msgstr "_Vrati podatke Evolucije..."
 
-#: ../modules/backup-restore/evolution-backup-restore.c:316
+#: ../modules/backup-restore/evolution-backup-restore.c:366
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Vratite podatke i postavke Evolucije iz arhive"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:83
+#: ../modules/backup-restore/evolution-backup-tool.c:75
 msgid "Back up Evolution directory"
 msgstr "Direktorijum za rezervu Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:85
+#: ../modules/backup-restore/evolution-backup-tool.c:77
 msgid "Restore Evolution directory"
 msgstr "Direktorijum za povraćaj Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:87
+#: ../modules/backup-restore/evolution-backup-tool.c:79
 msgid "Check Evolution Back up"
 msgstr "Proveri rezervu Evolucije"
 
 # shell:noshell-reason title
-#: ../modules/backup-restore/evolution-backup-tool.c:89
+#: ../modules/backup-restore/evolution-backup-tool.c:81
 msgid "Restart Evolution"
 msgstr "Ponovo pokreće Evoluciju"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:91
+#: ../modules/backup-restore/evolution-backup-tool.c:83
 msgid "With Graphical User Interface"
 msgstr "Sa grafičkim okruženjem"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:321
-#: ../modules/backup-restore/evolution-backup-tool.c:515
+#: ../modules/backup-restore/evolution-backup-tool.c:281
+#: ../modules/backup-restore/evolution-backup-tool.c:485
 msgid "Shutting down Evolution"
 msgstr "Gašenje Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:330
+#: ../modules/backup-restore/evolution-backup-tool.c:290
 msgid "Backing Evolution accounts and settings"
 msgstr "Izradite rezervnu kopiju naloga i postavke Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:347
+#: ../modules/backup-restore/evolution-backup-tool.c:307
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Izrada rezervne kopije podataka Evolucije (pošta, kalendari, zadaci, beleške)"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:363
+#: ../modules/backup-restore/evolution-backup-tool.c:323
 msgid "Back up complete"
 msgstr "Izrada rezervne kopije je završena"
 
 # shell:noshell-reason title
-#: ../modules/backup-restore/evolution-backup-tool.c:370
-#: ../modules/backup-restore/evolution-backup-tool.c:702
+#: ../modules/backup-restore/evolution-backup-tool.c:330
+#: ../modules/backup-restore/evolution-backup-tool.c:679
 msgid "Restarting Evolution"
 msgstr "Ponovno pokretanje Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:521
+#: ../modules/backup-restore/evolution-backup-tool.c:491
 msgid "Back up current Evolution data"
 msgstr "Napravite rezervu trenutnih podataka Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:528
+#: ../modules/backup-restore/evolution-backup-tool.c:498
 msgid "Extracting files from back up"
 msgstr "Izvlačim datoteke iz rezervne kopije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:610
+#: ../modules/backup-restore/evolution-backup-tool.c:580
 msgid "Loading Evolution settings"
 msgstr "Učitavam podešavanja Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:676
+#: ../modules/backup-restore/evolution-backup-tool.c:650
 msgid "Removing temporary back up files"
 msgstr "Uklanjanje privremenih rezervnih datoteka"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:687
+#: ../modules/backup-restore/evolution-backup-tool.c:664
 msgid "Reloading registry service"
 msgstr "Ponovo učitavam uslugu zavođenja"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:916
+#: ../modules/backup-restore/evolution-backup-tool.c:866
 msgid "Evolution Back Up"
 msgstr "Rezervni primerak Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:917
+#: ../modules/backup-restore/evolution-backup-tool.c:867
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Smeštam rezervni primerak u fasciklu „%s“"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:921
+#: ../modules/backup-restore/evolution-backup-tool.c:871
 msgid "Evolution Restore"
 msgstr "Povraćaj Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:922
+#: ../modules/backup-restore/evolution-backup-tool.c:872
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Vraćam iz fascikle „%s“"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:991
+#: ../modules/backup-restore/evolution-backup-tool.c:941
 msgid "Backing up Evolution Data"
 msgstr "Izrađuje rezervni primerak podataka Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:992
+#: ../modules/backup-restore/evolution-backup-tool.c:942
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Sačekajte dok Evolucija ne napravi rezervni primerak podataka."
 
 # shell:noshell-reason title
-#: ../modules/backup-restore/evolution-backup-tool.c:994
+#: ../modules/backup-restore/evolution-backup-tool.c:944
 msgid "Restoring Evolution Data"
 msgstr "Povraćaj podataka Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:995
+#: ../modules/backup-restore/evolution-backup-tool.c:945
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Sačekajte dok Evolucija ne vrati podatke u prvobitno stanje."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:1017
+#: ../modules/backup-restore/evolution-backup-tool.c:967
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Ovo može potrajati, u zavisnosti od količine podataka na nalogu."
 
@@ -16545,8 +19883,8 @@ msgid "Invalid Evolution backup file"
 msgstr "Neispravna datoteka rezervnog primerka Evolucije"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Please select a valid backup file to restore."
-msgstr "Izaberite ispravnu datoteku rezerve za povraćaj."
+msgid "File '{0}' is not a valid Evolution backup file."
+msgstr "„{0}“ nije ispravna rezervna kopija Evolucije."
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid "Are you sure you want to close Evolution?"
@@ -16562,8 +19900,8 @@ msgstr ""
 "nego što nastavite."
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Close and Back up Evolution"
-msgstr "Zatvorite i napravite rezervu Evojucije"
+msgid "Close and _Back up Evolution"
+msgstr "Zatvori i _napravi rezervu Evojucije"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid ""
@@ -16584,8 +19922,8 @@ msgstr ""
 
 # shell:noshell-reason title
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid "Close and Restore Evolution"
-msgstr "Zatvorite i vratite Evoluciju"
+msgid "Close and _Restore Evolution"
+msgstr "Zatvori i _vrati rezervu Evolucije"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
 msgid "Insufficient Permissions"
@@ -16595,92 +19933,115 @@ msgstr "Nedovoljna ovlašćenja"
 msgid "The selected folder is not writable."
 msgstr "U izabranu fasciklu se ne može pisati."
 
-#: ../modules/bogofilter/evolution-bogofilter.c:144
+#: ../modules/bogofilter/evolution-bogofilter.c:160
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
-msgstr "Nisam uspeo da izrodim Bogofilter (%s): "
+msgstr "Ne mogu da izrodim Bogofilter (%s): "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:162
+#: ../modules/bogofilter/evolution-bogofilter.c:178
 msgid "Failed to stream mail message content to Bogofilter: "
-msgstr "Nisam uspeo da uputim sadržaj poruke pošte Bogofilteru: "
+msgstr "Ne mogu da uputim sadržaj poruke pošte Bogofilteru: "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:211
+#: ../modules/bogofilter/evolution-bogofilter.c:227
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr "Ili se Bogofilter urušio ili nije uspeo da analizira poruku pošte"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:307
+#: ../modules/bogofilter/evolution-bogofilter.c:372
 msgid "Bogofilter Options"
 msgstr "Opcije Bogofiltera"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:316
+#: ../modules/bogofilter/evolution-bogofilter.c:381
 msgid "Convert message text to _Unicode"
 msgstr "Prebaci tekst poruke u _Unikod"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:473
+#: ../modules/bogofilter/evolution-bogofilter.c:539
+#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
+#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:2
+msgid "Junk filter using Bogofilter"
+msgstr "Bogo-filter nepoželjnih poruka"
+
+#: ../modules/book-config-google/evolution-book-config-google.c:92
+#: ../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
+#| msgid "One or more values cannot be empty."
+msgid "User name cannot be empty"
+msgstr "Korisničko ime ne može biti prazno"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:442
 msgid "Standard LDAP Port"
 msgstr "Standardni LDAP port"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
-msgid "LDAP over SSL (deprecated)"
-msgstr "LDAP ili SSL (prevaziđeno)"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:448
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:631
+#| msgid "LDAP over SSL (deprecated)"
+msgid "LDAP over SSL/TLS (deprecated)"
+msgstr "LDAP ili SSL/TLS (prevaziđeno)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:454
 msgid "Microsoft Global Catalog"
 msgstr "Majkrosoftov opšti katalog"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:464
-msgid "Microsoft Global Catalog over SSL"
-msgstr "Majkrosoftov opšti katalog preko SSL"
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:460
+#| msgid "Microsoft Global Catalog over SSL"
+msgid "Microsoft Global Catalog over SSL/TLS"
+msgstr "Majkrosoftov opšti katalog preko SSL/TLS-a"
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:569
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:567
 msgid "Connecting to LDAP"
 msgstr "Povezujem se na LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:586
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:584
 msgid "Server Information"
 msgstr "Podaci servera"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:613
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:611
 msgid "Port:"
 msgstr "Port:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:627
+#: ../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
+msgid "Port number is not valid"
+msgstr "Broj priključnika nije ispravan"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:634
 msgid "StartTLS (recommended)"
 msgstr "PočetniTLS (preporučeno)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:629
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:636
 msgid "Encryption:"
 msgstr "Šifrovanje:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:653
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:179
+#: ../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
 msgid "Authentication"
 msgstr "Potvrđivanje identiteta"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
 msgid "Anonymous"
 msgstr "Anonimno"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:686
 msgid "Using email address"
 msgstr "Koristi adresu el. pošte"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:682
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:689
 msgid "Using distinguished name (DN)"
 msgstr "Koristi poseban naziv (DN)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
 msgid "Method:"
 msgstr "Način:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:689
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:696
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Using email address\" requires anonymous access to your "
@@ -16691,36 +20052,36 @@ msgstr ""
 "pristup na vaš LDAP server."
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:704
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:711
 msgid "Using LDAP"
 msgstr "Koristi LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:721
-#: ../modules/mail/e-mail-shell-view.c:115
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:728
+#: ../modules/mail/e-mail-shell-view.c:120
 msgid "Searching"
 msgstr "Pretražujem"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:743
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:750
 msgid "Search Base:"
 msgstr "Osnova pretrage:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:747
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:754
 msgid "Find Possible Search Bases"
 msgstr "Nađi moguće baze za pretragu"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:769
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:776
 msgid "One Level"
 msgstr "Jedan nivo"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:771
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
 msgid "Subtree"
 msgstr "Podstablo"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:780
 msgid "Search Scope:"
 msgstr "Obim pretrage:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:785
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the directory tree.  A search scope of \"Subtree\" will include all entries "
@@ -16732,28 +20093,35 @@ msgstr ""
 "za pretragu.  Obim pretrage „Jedan nivo“ će uključiti samo unose jedan nivo "
 "ispod vaše baze pretrage."
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:787
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
 msgid "Search Filter:"
 msgstr "Filter pretrage:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:799
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:806
 msgid "Downloading"
 msgstr "Preuzimam"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:820
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:827
 msgid "Limit:"
 msgstr "Ograničenje:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:838
 msgid "contacts"
 msgstr "kontakti"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:843
 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
+#| msgid "One or more values cannot be empty."
+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:204
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:299
 #: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
 msgid "URL:"
 msgstr "Adresa:"
@@ -16762,61 +20130,44 @@ msgstr "Adresa:"
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Izbegavaj ako-poklapa (potrebno na Apaču < 2.2.8)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:441
-#, c-format
-msgid "HTTP Error: %s"
-msgstr "HTTP greška: %s"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:469
-msgid "Could not parse response"
-msgstr "Ne mogu da obradim odgovor"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:478
-msgid "Empty response"
-msgstr "Prazan odgovor"
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:194
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:415
+#: ../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/e-caldav-chooser.c:486
-msgid "Unexpected reply from server"
-msgstr "Neočekivan odgovor sa servera"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1118
-msgid "Could not locate user's calendars"
-msgstr "Ne mogu da pronađem korisnikov kalendar."
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1342
-msgid "Path"
-msgstr "Putanja"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:263
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:199
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:112
+#: ../modules/cal-config-google/e-google-chooser-button.c:224
 msgid "Choose a Calendar"
 msgstr "Izaberite kalendar"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:266
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:116
+#: ../modules/cal-config-google/e-google-chooser-button.c:228
 msgid "Choose a Memo List"
 msgstr "Izaberite spisak beleški"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:269
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:120
+#: ../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:218
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:313
 msgid "Find Calendars"
 msgstr "Pronađite kalendare"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:221
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:316
 msgid "Find Memo Lists"
 msgstr "Pronađite spiskove beleški"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:224
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:319
 msgid "Find Task Lists"
 msgstr "Pronađite spiskove zadataka"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:242
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:337
 msgid "Email:"
 msgstr "El. pošta:"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:247
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:342
 msgid "Server handles meeting invitations"
 msgstr "Server upravlja pozivima na sastanak"
 
@@ -16824,40 +20175,31 @@ msgstr "Server upravlja pozivima na sastanak"
 msgid "Choose which address books to use."
 msgstr "Izaberite adresare koji ćete koristiti."
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:200
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:203
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "Koristi u kalendaru za rođendane i godišnjice"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:126
+#: ../modules/cal-config-google/e-google-chooser-button.c:143
 msgid "Default User Calendar"
 msgstr "Osnovni korisnički kalendar"
 
-#: ../modules/cal-config-google/e-google-chooser.c:514
-#, c-format
-msgid "Enter Google password for user '%s'."
-msgstr "Unesite Guglovu lozinku za „%s“."
-
-#: ../modules/cal-config-google/e-google-chooser.c:531
-msgid "User declined to provide a password"
-msgstr "Korisnik je odbio da dostavi lozinku"
-
-#: ../modules/cal-config-local/evolution-cal-config-local.c:159
+#: ../modules/cal-config-local/evolution-cal-config-local.c:158
 msgid "Use an existing iCalendar (ics) file"
 msgstr "Koristite postojeću datoteku iKalendara (ics)"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:184
+#: ../modules/cal-config-local/evolution-cal-config-local.c:183
 msgid "iCalendar File"
 msgstr "Datoteka iKalendara"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:196
+#: ../modules/cal-config-local/evolution-cal-config-local.c:195
 msgid "Choose an iCalendar file"
 msgstr "Izaberite datoteku iKalendara"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:199
+#: ../modules/cal-config-local/evolution-cal-config-local.c:198
 msgid "File:"
 msgstr "Datoteka:"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:214
+#: ../modules/cal-config-local/evolution-cal-config-local.c:213
 msgid "Allow Evolution to update the file"
 msgstr "Dopušta Evoluciji da osveži datoteku"
 
@@ -16867,64 +20209,152 @@ msgstr "Dopušta Evoluciji da osveži datoteku"
 #. *
 #. * This string is just a fallback mechanism for systems on
 #. * which _NL_MEASUREMENT_MEASUREMENT is not available.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:187
-#| msgid "Default"
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:186
 msgctxt "locale-metric"
 msgid "default:mm"
 msgstr "default:mm"
 
 #. Translators: This is the temperature in degrees
 #. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:259
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:258
 msgid "Fahrenheit (°F)"
 msgstr "Farenhajt (°F)"
 
 #. Translators: This is the temperature in degrees
 #. * Celsius. (\302\260 is U+00B0 DEGREE SIGN)
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:264
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:263
 msgid "Centigrade (°C)"
 msgstr "Celzijus (°C)"
 
 #. Translators: This is the temperature in kelvin.
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:268
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:267
 msgid "Kelvin (K)"
 msgstr "Kelvin (K)"
 
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:270
-#| msgid "Unit"
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:269
 msgid "Units:"
 msgstr "Jedinice:"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:319
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:321
+#| msgid "One or more values cannot be empty."
+msgid "Location cannot be empty"
+msgstr "Mesto ne može biti prazno"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:287
 #: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
 msgstr "U_vezi"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:405
+#: ../modules/calendar/e-cal-attachment-handler.c:337
+msgid "Importing an event"
+msgstr "Uvozim događaj"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:341
+msgid "Importing a memo"
+msgstr "Uvozim belešku"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:345
+msgid "Importing a task"
+msgstr "Uvozim zadatak"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:403
 msgid "Select a Calendar"
 msgstr "Izaberite kalendar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:432
+#: ../modules/calendar/e-cal-attachment-handler.c:410
+msgid "Select a Memo List"
+msgstr "Izaberite spisak beleški"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:417
 msgid "Select a Task List"
 msgstr "Izaberite spisak zadataka"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:442
+#: ../modules/calendar/e-cal-attachment-handler.c:424
 msgid "I_mport to Calendar"
 msgstr "U_vezi u kalendar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:449
-msgid "I_mport to Tasks"
-msgstr "U_vezi u zadatke"
+#: ../modules/calendar/e-cal-attachment-handler.c:431
+msgid "I_mport to Memo List"
+msgstr "U_vezi u spisak beleški"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:438
+msgid "I_mport to Task List"
+msgstr "U_vezi u spisak zadataka"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:187
+#: ../modules/calendar/e-memo-shell-view-actions.c:180
+msgid "New Memo List"
+msgstr "Novi spisak beleške"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:556
+#, c-format
+msgid "Copying an event into the calendar '%s'"
+msgstr "Umnožavam događaj u kalendar „%s“"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:557
+#, c-format
+msgid "Moving an event into the calendar '%s'"
+msgstr "Premeštam događaj u kalendar „%s“"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:562
+#, c-format
+msgid "Copying a memo into the memo list '%s'"
+msgstr "Umnožavam belešku u spisak beleški „%s“"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:563
+#, c-format
+msgid "Moving a memo into the memo list '%s'"
+msgstr "Premeštam belešku u spisak beleški „%s“"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:568
+#, c-format
+msgid "Copying a task into the task list '%s'"
+msgstr "Umnožavam zadatak u spisak zadataka „%s“"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:569
+#, c-format
+msgid "Moving a task into the task list '%s'"
+msgstr "Premeštam zadatak u spisak zadataka „%s“"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:686
+msgid "Calendar Selector"
+msgstr "Izbornik kalendara"
 
-#: ../modules/calendar/e-calendar-preferences.c:516
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:692
+msgid "Memo List Selector"
+msgstr "Izbornik spiskova beleški"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:697
+msgid "Task List Selector"
+msgstr "Izbornik spiska zadataka"
+
+#: ../modules/calendar/e-calendar-preferences.c:515
 msgid "Selected Calendars for Alarms"
 msgstr "Izabrani kalendari za alarme"
 
-#: ../modules/calendar/e-calendar-preferences.c:924
+#: ../modules/calendar/e-calendar-preferences.c:611
+msgid "Meeting Invitations"
+msgstr "Pozivnice za sastanak"
+
+#: ../modules/calendar/e-calendar-preferences.c:637
+msgid "_Delete message after acting"
+msgstr "_Obriši poruku nakon radnje"
+
+#: ../modules/calendar/e-calendar-preferences.c:651
+#: ../modules/calendar/e-calendar-preferences.c:682
+msgid "Conflict Search"
+msgstr "Pretraga preklapanja"
+
+#. Source selector
+#: ../modules/calendar/e-calendar-preferences.c:666
+msgid "Select the calendars to search for meeting conflicts"
+msgstr "Bira kalendare za pretragu preklapanja u sastancima"
+
+#: ../modules/calendar/e-calendar-preferences.c:1058
 msgid "Ti_me and date:"
 msgstr "_Vreme i datum:"
 
-#: ../modules/calendar/e-calendar-preferences.c:925
+#: ../modules/calendar/e-calendar-preferences.c:1059
 msgid "_Date only:"
 msgstr "Samo _datum:"
 
@@ -16968,6 +20398,10 @@ msgstr "Dru_ga zona:"
 msgid "(Shown in a Day View)"
 msgstr "(Prikazano u Dnevnom pregledu)"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:13
+msgid "Time _zone:"
+msgstr "Vremenska _zona:"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:14
 msgid "Use s_ystem time zone"
 msgstr "Koristi vremensku zonu _sistema"
@@ -16985,7 +20419,7 @@ msgid "_24 hour"
 msgstr "_24 - časovni"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
-#: ../modules/calendar/e-cal-shell-view-actions.c:1715
+#: ../modules/calendar/e-cal-shell-view-actions.c:1609
 msgid "Work Week"
 msgstr "Radna nedelja"
 
@@ -17007,47 +20441,71 @@ msgstr "Početak _dana:"
 msgid "_Mon"
 msgstr "_Pon"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:25
+msgid "Monday"
+msgstr "Ponedeljak"
+
 #. Tuesday
 #: ../modules/calendar/e-calendar-preferences.ui.h:27
 msgid "_Tue"
 msgstr "_Uto"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:28
+msgid "Tuesday"
+msgstr "Utorak"
+
 #. Wednesday
 #: ../modules/calendar/e-calendar-preferences.ui.h:30
 msgid "_Wed"
 msgstr "_Sre"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:31
+msgid "Wednesday"
+msgstr "Sreda"
+
 #. Thursday
 #: ../modules/calendar/e-calendar-preferences.ui.h:33
 msgid "T_hu"
 msgstr "U_to"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:34
+msgid "Thursday"
+msgstr "Četvrtak"
+
 #. Friday
 #: ../modules/calendar/e-calendar-preferences.ui.h:36
 msgid "_Fri"
 msgstr "_Pet"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:37
+msgid "Friday"
+msgstr "Petak"
+
 #. Saturday
 #: ../modules/calendar/e-calendar-preferences.ui.h:39
 msgid "_Sat"
 msgstr "_Sub"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:40
+msgid "Saturday"
+msgstr "Subota"
+
 #. Sunday
 #: ../modules/calendar/e-calendar-preferences.ui.h:42
 msgid "S_un"
 msgstr "N_ed"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:43
+msgid "Sunday"
+msgstr "Nedelja"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:44
 msgid "Day _ends:"
 msgstr "Kraj _dana:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
-msgid "Alerts"
-msgstr "Upozorenja"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
-msgid "_Ask for confirmation when deleting items"
-msgstr "_Traži potvrdu za brisanje stavki"
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+msgid "View Options"
+msgstr "Opcije pregleda"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "_Time divisions:"
@@ -17058,153 +20516,155 @@ msgid "_Show appointment end times in week and month view"
 msgstr "_Prikaži zakazana vremena završetka u nedeljnim i mesečnim pregledima"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:50
+#| msgid "Show appointment end times in week and month views"
+msgid "Show appointment _icons in the month view"
+msgstr "Prikaži _ikonicu sastanka u mesečnom pregledu"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:51
 msgid "_Compress weekends in month view"
 msgstr "_Sažmi nedelje u mesečni pregled"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:51
+#: ../modules/calendar/e-calendar-preferences.ui.h:52
 msgid "Show week _numbers"
 msgstr "Prikaži _brojeve nedelja"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:52
+#: ../modules/calendar/e-calendar-preferences.ui.h:53
 msgid "Show r_ecurring events in italic in bottom left calendar"
 msgstr ""
 "Prikaži događaje koji se _ponavljaju iskošenim slovima u donjem levom kalendaru"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:53
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Sc_roll Month View by a week"
 msgstr "Pri_kazuje Mesečni pregled po nedeljama"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:55
+msgid "Alerts"
+msgstr "Upozorenja"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
+msgid "_Ask for confirmation when deleting items"
+msgstr "_Traži potvrdu za brisanje stavki"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "Display"
 msgstr "Prikaz"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Task List"
 msgstr "Spisak zadataka"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
 msgid "Highlight t_asks due today"
 msgstr "Istakni _zadatke u toku dana"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "Highlight _overdue tasks"
 msgstr "Istakni _neispunjene zadatke"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
 msgid "_Hide completed tasks after"
 msgstr "_Sakrij završene zadatke posle"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-calendar-preferences.ui.h:65
 msgid "Display reminders in _notification area only"
 msgstr "Prikaži podsetnike samo u _obaveštajnoj zoni"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
+msgid "Display reminders for completed _tasks"
+msgstr "Prikaži podsetnike za za_vršene zadatke"
+
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 msgid "Sh_ow a reminder"
 msgstr "Pri_kaži podsetnik"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "before every appointment"
 msgstr "pre svakog zakazivanja"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "Show a _reminder"
 msgstr "Prikaži _podsetnik"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "before every anniversary/birthday"
 msgstr "pre svake godišnjice/rođendana"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:72
+#: ../modules/calendar/e-calendar-preferences.ui.h:75
+msgid "Default _snooze time (in minutes)"
+msgstr "Podrazumevano vreme odla_ganja podsetnika (u minutima)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "Select the calendars for reminder notification"
 msgstr "Izaberite kalendare za obaveštenje podsetnika"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
 msgid "Default Free/Busy Server"
 msgstr "Podrazumevani server slobodnog/zauzetog vremena"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
-msgid "Template:"
-msgstr "Model:"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:80
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr "%u i %d će biti zamenjeni korisnikom i domenom iz elektronske adrese."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.ui.h:81
 msgid "Publishing Information"
 msgstr "Podaci o objavljivanju"
 
-#: ../modules/calendar/e-cal-shell-backend.c:312
-#: ../modules/calendar/e-cal-shell-view-actions.c:190
-msgid "New Calendar"
-msgstr "Novi kalendar"
-
-#: ../modules/calendar/e-cal-shell-backend.c:321
+#: ../modules/calendar/e-cal-shell-backend.c:114
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:323
-#: ../modules/calendar/e-cal-shell-view-actions.c:1520
+#: ../modules/calendar/e-cal-shell-backend.c:116
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
 msgid "Create a new appointment"
 msgstr "Pravi novo zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:328
+#: ../modules/calendar/e-cal-shell-backend.c:121
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Celodnevno za_kazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:330
+#: ../modules/calendar/e-cal-shell-backend.c:123
 msgid "Create a new all-day appointment"
 msgstr "Pravi novo celodnevno zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:335
+#: ../modules/calendar/e-cal-shell-backend.c:128
 msgctxt "New"
 msgid "M_eeting"
 msgstr "S_astanak"
 
-#: ../modules/calendar/e-cal-shell-backend.c:337
+#: ../modules/calendar/e-cal-shell-backend.c:130
 msgid "Create a new meeting request"
 msgstr "Pravi novi zahtev za sastankom"
 
-#: ../modules/calendar/e-cal-shell-backend.c:345
+#: ../modules/calendar/e-cal-shell-backend.c:138
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_ndar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:347
-#: ../modules/calendar/e-cal-shell-view-actions.c:1394
+#: ../modules/calendar/e-cal-shell-backend.c:140
+#: ../modules/calendar/e-cal-shell-view-actions.c:1273
 msgid "Create a new calendar"
 msgstr "Pravi novi kalendar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:702
+#: ../modules/calendar/e-cal-shell-backend.c:257
 msgid "Calendar and Tasks"
 msgstr "Kalendar i zadaci"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:118
-#, c-format
-msgid "Opening calendar '%s'"
-msgstr "Otvaram kalendar „%s“"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:589
-msgid "Calendar Selector"
-msgstr "Izbornik kalendara"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:215
-#: ../modules/calendar/e-cal-shell-view-actions.c:244
+#: ../modules/calendar/e-cal-shell-view-actions.c:199
 msgid "Print"
 msgstr "Štampaj"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:290
+#: ../modules/calendar/e-cal-shell-view-actions.c:285
 msgid "Calendar Properties"
 msgstr "Osobine kalendara"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:321
+#: ../modules/calendar/e-cal-shell-view-actions.c:314
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -17215,359 +20675,365 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:338
+#: ../modules/calendar/e-cal-shell-view-actions.c:331
 msgid "Purge events older than"
 msgstr "Izbaci događaje starije od"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:584
-msgid "Copying Items"
-msgstr "Umnožavanje stavki"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:877
-msgid "Moving Items"
-msgstr "Premeštanje stavki"
+#: ../modules/calendar/e-cal-shell-view-actions.c:926
+msgid "Making an occurrence movable"
+msgstr "Neka ova pojava bude _pokretna"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1210
+#: ../modules/calendar/e-cal-shell-view-actions.c:1086
 msgid "event"
 msgstr "događaj"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1212
-#: ../modules/calendar/e-cal-shell-view-memopad.c:230
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:297
-#: ../modules/calendar/e-memo-shell-view-actions.c:526
-#: ../modules/calendar/e-task-shell-view-actions.c:643
+#: ../modules/calendar/e-cal-shell-view-actions.c:1088
+#: ../modules/calendar/e-cal-shell-view-memopad.c:209
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:277
+#: ../modules/calendar/e-memo-shell-view-actions.c:498
+#: ../modules/calendar/e-task-shell-view-actions.c:617
 msgid "Save as iCalendar"
 msgstr "Sačuvaj kao iKalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1350
-#: ../modules/calendar/e-memo-shell-view-actions.c:607
-#: ../modules/calendar/e-task-shell-view-actions.c:731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1222
+#: ../modules/calendar/e-memo-shell-view-actions.c:579
+#: ../modules/calendar/e-task-shell-view-actions.c:705
 msgid "_Copy..."
 msgstr "_Umnoži..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1357
+#: ../modules/calendar/e-cal-shell-view-actions.c:1229
 msgid "D_elete Calendar"
 msgstr "Ob_riši kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1359
+#: ../modules/calendar/e-cal-shell-view-actions.c:1231
 msgid "Delete the selected calendar"
 msgstr "Obrišite izabrani kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1366
+#: ../modules/calendar/e-cal-shell-view-actions.c:1238
 msgid "Go Back"
 msgstr "Idi nazad"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1373
+#: ../modules/calendar/e-cal-shell-view-actions.c:1245
 msgid "Go Forward"
 msgstr "Idi napred"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1380
+#: ../modules/calendar/e-cal-shell-view-actions.c:1252
 msgid "Select today"
 msgstr "Izaberi današnji dan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1385
+#: ../modules/calendar/e-cal-shell-view-actions.c:1257
 msgid "Select _Date"
 msgstr "Izaberi _datum"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1387
+#: ../modules/calendar/e-cal-shell-view-actions.c:1259
 msgid "Select a specific date"
 msgstr "Izaberite određeni datum"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+#: ../modules/calendar/e-cal-shell-view-actions.c:1264
+#| msgid "_Save as iCalendar..."
+msgid "_Manage Calendar groups..."
+msgstr "_Upravljaj grupama kalendara..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1266
+msgid "Manage Calendar groups order and visibility"
+msgstr "Upravljajte redosledom i vidljivošću grupa kalendara"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1271
 msgid "_New Calendar"
 msgstr "Novi _kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1406
-#: ../modules/calendar/e-task-shell-view-actions.c:815
+#: ../modules/calendar/e-cal-shell-view-actions.c:1285
+#: ../modules/calendar/e-task-shell-view-actions.c:803
 msgid "Purg_e"
 msgstr "Izba_ci"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1287
 msgid "Purge old appointments and meetings"
 msgstr "Izbacite stara zakazivanja i sastanke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1415
+#: ../modules/calendar/e-cal-shell-view-actions.c:1294
 msgid "Refresh the selected calendar"
 msgstr "Osvežite izabrani kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1422
+#: ../modules/calendar/e-cal-shell-view-actions.c:1301
 msgid "Rename the selected calendar"
 msgstr "Preimenujte izabrani kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1427
-#| msgid "Find _next"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1306
 msgid "Find _Next"
 msgstr "Nađi _sledeće"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1429
+#: ../modules/calendar/e-cal-shell-view-actions.c:1308
 msgid "Find next occurrence of the current search string"
 msgstr "Pronađite sledeće pojavljivanje tekuće niske pretrage"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
-#| msgid "Find _previous"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1313
 msgid "Find _Previous"
 msgstr "Nađi _prethodno"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1436
+#: ../modules/calendar/e-cal-shell-view-actions.c:1315
 msgid "Find previous occurrence of the current search string"
 msgstr "Pronađite prethodno pojavljivanje tekuće niske pretrage"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1441
-#| msgid "Stop _running search"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1320
 msgid "Stop _Running Search"
 msgstr "Zaustavi _tekuću pretragu"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1443
+#: ../modules/calendar/e-cal-shell-view-actions.c:1322
 msgid "Stop currently running search"
 msgstr "Zaustavite trenutno pokrenutu pretragu"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1327
+#| msgid "Show _Only This Calendar"
+msgid "Sho_w All Calendars"
+msgstr "Prikaži _sve kalendare"
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1334
 msgid "Show _Only This Calendar"
 msgstr "Prikaži _samo ovaj kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1455
+#: ../modules/calendar/e-cal-shell-view-actions.c:1341
 msgid "Cop_y to Calendar..."
 msgstr "_Umnoži u kalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-cal-shell-view-actions.c:1348
 msgid "_Delegate Meeting..."
 msgstr "_Delegiraj sastanak..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1469
+#: ../modules/calendar/e-cal-shell-view-actions.c:1355
 msgid "_Delete Appointment"
 msgstr "_Obriši zakazano"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1471
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "Delete selected appointments"
 msgstr "Obrišite izabrana zakazivanja"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1476
+#: ../modules/calendar/e-cal-shell-view-actions.c:1362
 msgid "Delete This _Occurrence"
 msgstr "Obriši ovu _pojavu"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1478
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Delete this occurrence"
 msgstr "Obrišite ovu pojavu"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1483
+#: ../modules/calendar/e-cal-shell-view-actions.c:1369
 msgid "Delete All Occ_urrences"
 msgstr "Obriši sve po_jave"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1485
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Delete all occurrences"
 msgstr "Obrišite sve pojave"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1490
+#: ../modules/calendar/e-cal-shell-view-actions.c:1376
 msgid "New All Day _Event..."
 msgstr "Novi celodnevni _događaj..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1492
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
 msgid "Create a new all day event"
 msgstr "Napravite novi celodnevni događaj"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1497
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:600
-#: ../modules/calendar/e-task-shell-view-actions.c:724
+#: ../modules/calendar/e-cal-shell-view-actions.c:1383
+#: ../modules/calendar/e-cal-shell-view-memopad.c:243
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:317
+#: ../modules/calendar/e-memo-shell-view-actions.c:572
+#: ../modules/calendar/e-task-shell-view-actions.c:698
 msgid "_Forward as iCalendar..."
 msgstr "_Prosledi kao iKalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1504
+#: ../modules/calendar/e-cal-shell-view-actions.c:1390
 msgid "New _Meeting..."
 msgstr "Novi _sastanak..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1506
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "Create a new meeting"
 msgstr "Napravite novi sastanak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../modules/calendar/e-cal-shell-view-actions.c:1397
 msgid "Mo_ve to Calendar..."
 msgstr "Pren_esi u kalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1518
+#: ../modules/calendar/e-cal-shell-view-actions.c:1404
 msgid "New _Appointment..."
 msgstr "Novo _zakazivanje..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1525
+#: ../modules/calendar/e-cal-shell-view-actions.c:1411
 msgid "Make this Occurrence _Movable"
 msgstr "Neka ova pojava bude _pokretna"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1532
+#: ../modules/calendar/e-cal-shell-view-actions.c:1418
 msgid "_Open Appointment"
 msgstr "_Otvori sastanak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1534
+#: ../modules/calendar/e-cal-shell-view-actions.c:1420
 msgid "View the current appointment"
 msgstr "Pregledajte tekuće zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1539
+#: ../modules/calendar/e-cal-shell-view-actions.c:1425
 msgid "_Reply"
 msgstr "_Odgovori"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1553
+#: ../modules/calendar/e-cal-shell-view-actions.c:1439
 msgid "_Schedule Meeting..."
 msgstr "_Zakaži sastanak..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1555
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
 msgid "Converts an appointment to a meeting"
 msgstr "Pretvorite zakazano u sastanak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1560
+#: ../modules/calendar/e-cal-shell-view-actions.c:1446
 msgid "Conv_ert to Appointment..."
 msgstr "Pre_tvori u zakazano..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1562
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Converts a meeting to an appointment"
 msgstr "Pretvorite sastanak u zakazano"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1567
+#: ../modules/calendar/e-cal-shell-view-actions.c:1453
 msgid "Quit"
 msgstr "Izađi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../modules/calendar/e-cal-shell-view-actions.c:1581
 msgid "Day"
 msgstr "Dan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1689
+#: ../modules/calendar/e-cal-shell-view-actions.c:1583
 msgid "Show one day"
 msgstr "Prikaži jedan dan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1694
+#: ../modules/calendar/e-cal-shell-view-actions.c:1588
 msgid "List"
 msgstr "Spisak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1696
+#: ../modules/calendar/e-cal-shell-view-actions.c:1590
 msgid "Show as list"
 msgstr "Prikaži kao spisak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1701
+#: ../modules/calendar/e-cal-shell-view-actions.c:1595
 msgid "Month"
 msgstr "Mesec"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1703
+#: ../modules/calendar/e-cal-shell-view-actions.c:1597
 msgid "Show one month"
 msgstr "Prikaži jedan mesec"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1708
+#: ../modules/calendar/e-cal-shell-view-actions.c:1602
 msgid "Week"
 msgstr "Nedelja"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-cal-shell-view-actions.c:1604
 msgid "Show one week"
 msgstr "Prikaži jednu nedelju"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1717
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Show one work week"
 msgstr "Prikaži jednu radnu nedelju"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1725
+#: ../modules/calendar/e-cal-shell-view-actions.c:1619
 msgid "Active Appointments"
 msgstr "Aktivna zakazivanja"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1739
+#: ../modules/calendar/e-cal-shell-view-actions.c:1633
 msgid "Next 7 Days' Appointments"
 msgstr "Zakazano za sledeću nedelju"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1746
+#: ../modules/calendar/e-cal-shell-view-actions.c:1640
 msgid "Occurs Less Than 5 Times"
 msgstr "Dešava se manje od 5 puta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1777
-#: ../modules/calendar/e-memo-shell-view-actions.c:797
-#: ../modules/calendar/e-task-shell-view-actions.c:996
+#: ../modules/calendar/e-cal-shell-view-actions.c:1671
+#: ../modules/calendar/e-memo-shell-view-actions.c:791
+#: ../modules/calendar/e-task-shell-view-actions.c:992
 msgid "Description contains"
 msgstr "Opis sadrži"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1784
-#: ../modules/calendar/e-memo-shell-view-actions.c:804
-#: ../modules/calendar/e-task-shell-view-actions.c:1003
+#: ../modules/calendar/e-cal-shell-view-actions.c:1678
+#: ../modules/calendar/e-memo-shell-view-actions.c:798
+#: ../modules/calendar/e-task-shell-view-actions.c:999
 msgid "Summary contains"
 msgstr "Sažetak sadrži"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1794
-#: ../modules/calendar/e-cal-shell-view-actions.c:1808
-#: ../modules/calendar/e-cal-shell-view-memopad.c:295
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
-#: ../modules/calendar/e-memo-shell-view-actions.c:814
-#: ../modules/calendar/e-memo-shell-view-actions.c:828
-#: ../modules/calendar/e-task-shell-view-actions.c:1013
-#: ../modules/calendar/e-task-shell-view-actions.c:1027
-#| msgid "_Print..."
+#: ../modules/calendar/e-cal-shell-view-actions.c:1688
+#: ../modules/calendar/e-cal-shell-view-actions.c:1702
+#: ../modules/calendar/e-cal-shell-view-memopad.c:274
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:362
+#: ../modules/calendar/e-memo-shell-view-actions.c:808
+#: ../modules/calendar/e-memo-shell-view-actions.c:822
+#: ../modules/calendar/e-task-shell-view-actions.c:1009
+#: ../modules/calendar/e-task-shell-view-actions.c:1023
 msgid "Print..."
 msgstr "Štampaj..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1796
+#: ../modules/calendar/e-cal-shell-view-actions.c:1690
 msgid "Print this calendar"
 msgstr "Štampa ovaj kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1803
+#: ../modules/calendar/e-cal-shell-view-actions.c:1697
 msgid "Preview the calendar to be printed"
 msgstr "Pregled kalendara pred štampu"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1825
-#: ../modules/calendar/e-cal-shell-view-memopad.c:305
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:392
-#: ../modules/calendar/e-memo-shell-view-actions.c:845
-#: ../modules/calendar/e-task-shell-view-actions.c:1044
+#: ../modules/calendar/e-cal-shell-view-actions.c:1719
+#: ../modules/calendar/e-cal-shell-view-memopad.c:284
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:372
+#: ../modules/calendar/e-memo-shell-view-actions.c:839
+#: ../modules/calendar/e-task-shell-view-actions.c:1040
 msgid "_Save as iCalendar..."
 msgstr "_Sačuvaj kao iKalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1902
+#: ../modules/calendar/e-cal-shell-view-actions.c:1796
 msgid "Go To"
 msgstr "Idi na"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-memopad.c:228
-#: ../modules/calendar/e-memo-shell-view-actions.c:524
+#: ../modules/calendar/e-cal-shell-view-memopad.c:207
+#: ../modules/calendar/e-memo-shell-view-actions.c:496
 msgid "memo"
 msgstr "beleška"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
-#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
 msgid "New _Memo"
 msgstr "Nova _beleška"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:273
-#: ../modules/calendar/e-memo-shell-backend.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:658
+#: ../modules/calendar/e-cal-shell-view-memopad.c:252
+#: ../modules/calendar/e-memo-shell-backend.c:65
+#: ../modules/calendar/e-memo-shell-view-actions.c:644
 msgid "Create a new memo"
 msgstr "Napravite jednu novu belešku"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:278
-#: ../modules/calendar/e-memo-shell-view-actions.c:663
+#: ../modules/calendar/e-cal-shell-view-memopad.c:257
+#: ../modules/calendar/e-memo-shell-view-actions.c:649
 msgid "_Open Memo"
 msgstr "_Otvori belešku"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:280
-#: ../modules/calendar/e-memo-shell-view-actions.c:665
+#: ../modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../modules/calendar/e-memo-shell-view-actions.c:651
 msgid "View the selected memo"
 msgstr "Pogledajte izabranu belešku"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:285
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:372
-#: ../modules/calendar/e-memo-shell-view-actions.c:670
-#: ../modules/calendar/e-task-shell-view-actions.c:808
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
+#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../modules/calendar/e-task-shell-view-actions.c:796
 msgid "Open _Web Page"
 msgstr "Otvori _Veb stranicu"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:297
-#: ../modules/calendar/e-memo-shell-view-actions.c:830
+#: ../modules/calendar/e-cal-shell-view-memopad.c:276
+#: ../modules/calendar/e-memo-shell-view-actions.c:824
 msgid "Print the selected memo"
 msgstr "Štampajte izabranu belešku"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1561
+#: ../modules/calendar/e-cal-shell-view-private.c:810
 msgid "Searching next matching event"
 msgstr "Tražim sledeći odgovarajući događaj"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1562
+#: ../modules/calendar/e-cal-shell-view-private.c:811
 msgid "Searching previous matching event"
 msgstr "Tražim prethodni odgovarajući događaj"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1583
+#: ../modules/calendar/e-cal-shell-view-private.c:832
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
@@ -17576,7 +21042,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:1587
+#: ../modules/calendar/e-cal-shell-view-private.c:836
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
@@ -17585,7 +21051,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:1612
+#: ../modules/calendar/e-cal-shell-view-private.c:859
 msgid "Cannot search with no active calendar"
 msgstr "Ne mogu da tražim ako nema aktivnog kalendara"
 
@@ -17593,177 +21059,176 @@ msgstr "Ne mogu da tražim ako nema aktivnog kalendara"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:295
-#: ../modules/calendar/e-task-shell-view-actions.c:641
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:275
+#: ../modules/calendar/e-task-shell-view-actions.c:615
 msgid "task"
 msgstr "zadatak"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
-#: ../modules/calendar/e-task-shell-view-actions.c:703
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:310
+#: ../modules/calendar/e-task-shell-view-actions.c:677
 msgid "_Assign Task"
 msgstr "_Dodeli zadatak"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:324
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "_Mark as Complete"
 msgstr "_Označi kao završeno"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-view-actions.c:782
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:326
+#: ../modules/calendar/e-task-shell-view-actions.c:770
 msgid "Mark selected tasks as complete"
 msgstr "Obeležite izabrane zadatke kao završene"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
 msgid "_Mark as Incomplete"
 msgstr "_Označi kao nezavršeno"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
-#: ../modules/calendar/e-task-shell-view-actions.c:789
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:333
+#: ../modules/calendar/e-task-shell-view-actions.c:777
 msgid "Mark selected tasks as incomplete"
 msgstr "Obeležite izabrane zadatke kao nezavršene"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
-#: ../modules/calendar/e-task-shell-view-actions.c:794
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../modules/calendar/e-task-shell-view-actions.c:782
 msgid "New _Task"
 msgstr "Novi zad_atak"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:360
-#: ../modules/calendar/e-task-shell-backend.c:215
-#: ../modules/calendar/e-task-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:340
+#: ../modules/calendar/e-task-shell-backend.c:63
+#: ../modules/calendar/e-task-shell-view-actions.c:784
 msgid "Create a new task"
 msgstr "Napravite novi zadatak"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
+#: ../modules/calendar/e-task-shell-view-actions.c:789
 msgid "_Open Task"
 msgstr "_Otvori zadatak"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:367
-#: ../modules/calendar/e-task-shell-view-actions.c:803
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
+#: ../modules/calendar/e-task-shell-view-actions.c:791
 msgid "View the selected task"
 msgstr "Pregledajte izabrani zadatak"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:384
-#: ../modules/calendar/e-task-shell-view-actions.c:1029
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:364
+#: ../modules/calendar/e-task-shell-view-actions.c:1025
 msgid "Print the selected task"
 msgstr "Štampa izabrani zadatak"
 
-#: ../modules/calendar/e-memo-shell-backend.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:195
-msgid "New Memo List"
-msgstr "Novi spisak beleške"
-
-#: ../modules/calendar/e-memo-shell-backend.c:216
+#: ../modules/calendar/e-memo-shell-backend.c:63
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Belešk_a"
 
-#: ../modules/calendar/e-memo-shell-backend.c:223
+#: ../modules/calendar/e-memo-shell-backend.c:70
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Deljena beleška"
 
-#: ../modules/calendar/e-memo-shell-backend.c:225
+#: ../modules/calendar/e-memo-shell-backend.c:72
 msgid "Create a new shared memo"
 msgstr "Napravite novu deljenu belešku"
 
-#: ../modules/calendar/e-memo-shell-backend.c:233
+#: ../modules/calendar/e-memo-shell-backend.c:80
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Spi_sak beleški"
 
-#: ../modules/calendar/e-memo-shell-backend.c:235
-#: ../modules/calendar/e-memo-shell-view-actions.c:623
+#: ../modules/calendar/e-memo-shell-backend.c:82
+#: ../modules/calendar/e-memo-shell-view-actions.c:602
 msgid "Create a new memo list"
 msgstr "Sastavite novi spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:116
-#, c-format
-msgid "Opening memo list '%s'"
-msgstr "Otvaram spisak beleški „%s“"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:545
-msgid "Memo List Selector"
-msgstr "Izbornik spiskova beleški"
-
+#: ../modules/calendar/e-memo-shell-view-actions.c:196
 #: ../modules/calendar/e-memo-shell-view-actions.c:211
-#: ../modules/calendar/e-memo-shell-view-actions.c:226
 msgid "Print Memos"
 msgstr "Štampaj beleške"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:267
+#: ../modules/calendar/e-memo-shell-view-actions.c:252
 msgid "Memo List Properties"
 msgstr "Osobine spiska zadataka"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:586
+#: ../modules/calendar/e-memo-shell-view-actions.c:558
 msgid "_Delete Memo"
 msgstr "_Obriši belešku"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:593
+#: ../modules/calendar/e-memo-shell-view-actions.c:565
 msgid "_Find in Memo..."
 msgstr "P_ronađi u belešci..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:595
+#: ../modules/calendar/e-memo-shell-view-actions.c:567
 msgid "Search for text in the displayed memo"
 msgstr "Pretražite tekst u prikazanoj belešci"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:614
+#: ../modules/calendar/e-memo-shell-view-actions.c:586
 msgid "D_elete Memo List"
 msgstr "Ob_riši spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:616
+#: ../modules/calendar/e-memo-shell-view-actions.c:588
 msgid "Delete the selected memo list"
 msgstr "Obrišite izabrani spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
+msgid "_Manage Memo List groups..."
+msgstr "_Upravljaj grupama spiskova beleški..."
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:595
+msgid "Manage Memo List groups order and visibility"
+msgstr "Upravljajte redosledom i vidljivošću grupa spiskova beleški"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:600
 msgid "_New Memo List"
 msgstr "_Novi spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:637
+#: ../modules/calendar/e-memo-shell-view-actions.c:616
 msgid "Refresh the selected memo list"
 msgstr "Osvežite izabrani spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:644
+#: ../modules/calendar/e-memo-shell-view-actions.c:623
 msgid "Rename the selected memo list"
 msgstr "Preimenujte izabrani spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:649
+#: ../modules/calendar/e-memo-shell-view-actions.c:628
 msgid "Show _Only This Memo List"
 msgstr "Prikaži _samo ovaj spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:728
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
+#| msgid "Show _Only This Memo List"
+msgid "Sho_w All Memo Lists"
+msgstr "Prikaži _sve spiskove beleški"
+
+#: ../modules/calendar/e-memo-shell-view-actions.c:722
 msgid "Memo _Preview"
 msgstr "_Pregled beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:730
+#: ../modules/calendar/e-memo-shell-view-actions.c:724
 msgid "Show memo preview pane"
 msgstr "Prikažite pregled beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-memo-shell-view-actions.c:745
 msgid "Show memo preview below the memo list"
 msgstr "Prikažite pregled beleški ispod spiska beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
+#: ../modules/calendar/e-memo-shell-view-actions.c:752
 msgid "Show memo preview alongside the memo list"
 msgstr "Prikažite pregled beleški pored spiska beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:816
+#: ../modules/calendar/e-memo-shell-view-actions.c:810
 msgid "Print the list of memos"
 msgstr "Štampajte spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:823
+#: ../modules/calendar/e-memo-shell-view-actions.c:817
 msgid "Preview the list of memos to be printed"
 msgstr "Pregledajte spisak beleški za štampu"
 
-#: ../modules/calendar/e-memo-shell-view.c:238
+#: ../modules/calendar/e-memo-shell-view.c:219
 msgid "Delete Memos"
 msgstr "Obriši beleške"
 
-#: ../modules/calendar/e-memo-shell-view.c:240
+#: ../modules/calendar/e-memo-shell-view.c:221
 msgid "Delete Memo"
 msgstr "Obriši belešku"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:537
+#: ../modules/calendar/e-memo-shell-view-private.c:369
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -17772,60 +21237,46 @@ msgstr[1] "%d beleške"
 msgstr[2] "%d beleški"
 msgstr[3] "%d beleška"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:541
-#: ../modules/calendar/e-task-shell-view-private.c:747
+#: ../modules/calendar/e-memo-shell-view-private.c:373
+#: ../modules/calendar/e-task-shell-view-private.c:550
 #, c-format
 msgid "%d selected"
 msgstr "izabranih — %d"
 
-#: ../modules/calendar/e-task-shell-backend.c:204
-#: ../modules/calendar/e-task-shell-view-actions.c:218
-msgid "New Task List"
-msgstr "Novi spisak zadataka"
-
-#: ../modules/calendar/e-task-shell-backend.c:213
+#: ../modules/calendar/e-task-shell-backend.c:61
 msgctxt "New"
 msgid "_Task"
 msgstr "_Zadatak"
 
-#: ../modules/calendar/e-task-shell-backend.c:220
+#: ../modules/calendar/e-task-shell-backend.c:68
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Dodeljen_i zadatak"
 
-#: ../modules/calendar/e-task-shell-backend.c:222
+#: ../modules/calendar/e-task-shell-backend.c:70
 msgid "Create a new assigned task"
 msgstr "Napravite novi dodeljeni zadatak"
 
-#: ../modules/calendar/e-task-shell-backend.c:230
+#: ../modules/calendar/e-task-shell-backend.c:78
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Spisak za_dataka"
 
-#: ../modules/calendar/e-task-shell-backend.c:232
-#: ../modules/calendar/e-task-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-backend.c:80
+#: ../modules/calendar/e-task-shell-view-actions.c:728
 msgid "Create a new task list"
 msgstr "Napravite novi spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:116
-#, c-format
-msgid "Opening task list '%s'"
-msgstr "Otvaram spisak zadataka „%s“"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:545
-msgid "Task List Selector"
-msgstr "Izbornik spiska zadataka"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:234
-#: ../modules/calendar/e-task-shell-view-actions.c:249
+#: ../modules/calendar/e-task-shell-view-actions.c:220
+#: ../modules/calendar/e-task-shell-view-actions.c:235
 msgid "Print Tasks"
 msgstr "Štampaj zadatke"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:290
+#: ../modules/calendar/e-task-shell-view-actions.c:276
 msgid "Task List Properties"
 msgstr "Osobine spiska zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:585
+#: ../modules/calendar/e-task-shell-view-actions.c:559
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -17837,111 +21288,116 @@ msgstr ""
 "\n"
 "Da obrišem ove zadatke?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:592
+#: ../modules/calendar/e-task-shell-view-actions.c:566
 msgid "Do not ask me again"
 msgstr "Ne pitaj me ponovo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:710
+#: ../modules/calendar/e-task-shell-view-actions.c:684
 msgid "_Delete Task"
 msgstr "_Obriši zadatak"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:691
 msgid "_Find in Task..."
 msgstr "_Pronađi u zadatku..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:719
+#: ../modules/calendar/e-task-shell-view-actions.c:693
 msgid "Search for text in the displayed task"
 msgstr "Pretraži tekst u prikazanom zadatku"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:738
+#: ../modules/calendar/e-task-shell-view-actions.c:712
 msgid "D_elete Task List"
 msgstr "O_briši spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:714
 msgid "Delete the selected task list"
 msgstr "Obrišite izabrani spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-view-actions.c:719
+msgid "_Manage Task List groups..."
+msgstr "_Upravljaj grupama spiskova zadataka..."
+
+#: ../modules/calendar/e-task-shell-view-actions.c:726
 msgid "_New Task List"
 msgstr "No_vi spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:742
 msgid "Refresh the selected task list"
 msgstr "Osvežite izabrani spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:749
 msgid "Rename the selected task list"
 msgstr "Preimenujte izabrani spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:773
+#: ../modules/calendar/e-task-shell-view-actions.c:754
+#| msgid "Show _Only This Task List"
+msgid "Sho_w All Task Lists"
+msgstr "Prikaži _sve spiskove zadataka"
+
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "Show _Only This Task List"
 msgstr "Prikaži _samo ovaj spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:787
+#: ../modules/calendar/e-task-shell-view-actions.c:775
 msgid "Mar_k as Incomplete"
 msgstr "O_znači kao nezavršeno"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:817
+#: ../modules/calendar/e-task-shell-view-actions.c:805
 msgid "Delete completed tasks"
 msgstr "Obrišite završene zadatke"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:892
+#: ../modules/calendar/e-task-shell-view-actions.c:888
 msgid "Task _Preview"
 msgstr "Pregled za_dataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:894
+#: ../modules/calendar/e-task-shell-view-actions.c:890
 msgid "Show task preview pane"
 msgstr "Prikažite pregled zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:915
+#: ../modules/calendar/e-task-shell-view-actions.c:911
 msgid "Show task preview below the task list"
 msgstr "Prikažite pregled ispod spiska zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:922
+#: ../modules/calendar/e-task-shell-view-actions.c:918
 msgid "Show task preview alongside the task list"
 msgstr "Prikažite pregled pored spiska zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:930
+#: ../modules/calendar/e-task-shell-view-actions.c:926
 msgid "Active Tasks"
 msgstr "Aktivni zadaci"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:944
+#: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Completed Tasks"
 msgstr "Završeni zadaci"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:951
+#: ../modules/calendar/e-task-shell-view-actions.c:947
 msgid "Next 7 Days' Tasks"
 msgstr "Zadaci za sledeću nedelju"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:958
+#: ../modules/calendar/e-task-shell-view-actions.c:954
 msgid "Overdue Tasks"
 msgstr "Prekoračeni zadaci"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:965
+#: ../modules/calendar/e-task-shell-view-actions.c:961
 msgid "Tasks with Attachments"
 msgstr "Zadaci sa prilozima"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1015
+#: ../modules/calendar/e-task-shell-view-actions.c:1011
 msgid "Print the list of tasks"
 msgstr "Štampajte spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1022
+#: ../modules/calendar/e-task-shell-view-actions.c:1018
 msgid "Preview the list of tasks to be printed"
 msgstr "Pregledajte spisak zadataka pred štampu"
 
-#: ../modules/calendar/e-task-shell-view.c:373
+#: ../modules/calendar/e-task-shell-view.c:323
 msgid "Delete Tasks"
 msgstr "Obriši zadatke"
 
-#: ../modules/calendar/e-task-shell-view.c:375
+#: ../modules/calendar/e-task-shell-view.c:325
 msgid "Delete Task"
 msgstr "Obriši zadatak"
 
-#: ../modules/calendar/e-task-shell-view-private.c:632
-msgid "Expunging"
-msgstr "Izbacivanje"
-
-#: ../modules/calendar/e-task-shell-view-private.c:743
+#: ../modules/calendar/e-task-shell-view-private.c:546
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -17960,49 +21416,49 @@ msgstr "Prikazuje delove kao pozivnicu"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:228
+#: ../modules/itip-formatter/itip-view.c:226
 msgid "Today %H:%M"
 msgstr "Danas u %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:232
+#: ../modules/itip-formatter/itip-view.c:230
 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:241
+#: ../modules/itip-formatter/itip-view.c:239
 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:256
+#: ../modules/itip-formatter/itip-view.c:254
 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:260
+#: ../modules/itip-formatter/itip-view.c:258
 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:265
+#: ../modules/itip-formatter/itip-view.c:263
 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:269
+#: ../modules/itip-formatter/itip-view.c:267
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Sutra u %l:%M %S %p"
 
 #. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:288
+#: ../modules/itip-formatter/itip-view.c:286
 #, c-format
 msgid "%A"
 msgstr "%A"
@@ -18012,69 +21468,69 @@ 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:293
+#: ../modules/itip-formatter/itip-view.c:291
 msgid "%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:297
+#: ../modules/itip-formatter/itip-view.c:295
 msgid "%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:302
+#: ../modules/itip-formatter/itip-view.c:300
 msgid "%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:306
+#: ../modules/itip-formatter/itip-view.c:304
 msgid "%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:315
+#: ../modules/itip-formatter/itip-view.c:313
 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:321
+#: ../modules/itip-formatter/itip-view.c:319
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %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:325
+#: ../modules/itip-formatter/itip-view.c:323
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %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:330
+#: ../modules/itip-formatter/itip-view.c:328
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %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:334
+#: ../modules/itip-formatter/itip-view.c:332
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../modules/itip-formatter/itip-view.c:340
+#: ../modules/itip-formatter/itip-view.c:338
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y."
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:345
+#: ../modules/itip-formatter/itip-view.c:343
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y. %H:%M"
 
@@ -18084,167 +21540,167 @@ 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:349
+#: ../modules/itip-formatter/itip-view.c:347
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %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:354
+#: ../modules/itip-formatter/itip-view.c:352
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y. %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:358
+#: ../modules/itip-formatter/itip-view.c:356
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y. %l:%M:%S %p"
 
-#: ../modules/itip-formatter/itip-view.c:396
-#: ../modules/itip-formatter/itip-view.c:397
-#: ../modules/itip-formatter/itip-view.c:486
-#: ../modules/itip-formatter/itip-view.c:487
-#: ../modules/itip-formatter/itip-view.c:576
+#: ../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
 msgid "An unknown person"
 msgstr "Nepoznata osoba"
 
-#: ../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:399
+#: ../modules/itip-formatter/itip-view.c:489
+#: ../modules/itip-formatter/itip-view.c:578
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Odgovorite u ime %s"
 
-#: ../modules/itip-formatter/itip-view.c:403
-#: ../modules/itip-formatter/itip-view.c:493
-#: ../modules/itip-formatter/itip-view.c:582
+#: ../modules/itip-formatter/itip-view.c:401
+#: ../modules/itip-formatter/itip-view.c:491
+#: ../modules/itip-formatter/itip-view.c:580
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Primljeno u ime %s"
 
-#: ../modules/itip-formatter/itip-view.c:408
+#: ../modules/itip-formatter/itip-view.c:406
 #, 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:410
+#: ../modules/itip-formatter/itip-view.c:408
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s objavljuje sledeći podatak o sastanku:"
 
-#: ../modules/itip-formatter/itip-view.c:415
+#: ../modules/itip-formatter/itip-view.c:413
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s vam delegira sledeći sastanak:"
 
-#: ../modules/itip-formatter/itip-view.c:418
+#: ../modules/itip-formatter/itip-view.c:416
 #, 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:420
+#: ../modules/itip-formatter/itip-view.c:418
 #, 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:426
+#: ../modules/itip-formatter/itip-view.c:424
 #, 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:428
+#: ../modules/itip-formatter/itip-view.c:426
 #, 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:432
+#: ../modules/itip-formatter/itip-view.c:430
 #, 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:434
+#: ../modules/itip-formatter/itip-view.c:432
 #, 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:438
+#: ../modules/itip-formatter/itip-view.c:436
 #, 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:440
+#: ../modules/itip-formatter/itip-view.c:438
 #, 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:444
+#: ../modules/itip-formatter/itip-view.c:442
 #, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "%s preko %s otkazuje sledeći sastanak:"
 
-#: ../modules/itip-formatter/itip-view.c:446
+#: ../modules/itip-formatter/itip-view.c:444
 #, c-format
 msgid "%s has canceled the following meeting:"
 msgstr "%s otkazuje sledeći sastanak:"
 
-#: ../modules/itip-formatter/itip-view.c:450
+#: ../modules/itip-formatter/itip-view.c:448
 #, 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:452
+#: ../modules/itip-formatter/itip-view.c:450
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s predlaže sledeće izmene sastanka:"
 
-#: ../modules/itip-formatter/itip-view.c:456
+#: ../modules/itip-formatter/itip-view.c:454
 #, 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:458
+#: ../modules/itip-formatter/itip-view.c:456
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s odbija sledeće izmene sastanka:"
 
-#: ../modules/itip-formatter/itip-view.c:498
+#: ../modules/itip-formatter/itip-view.c:496
 #, 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:500
+#: ../modules/itip-formatter/itip-view.c:498
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s objavi sledeće zaduženje:"
 
-#: ../modules/itip-formatter/itip-view.c:505
+#: ../modules/itip-formatter/itip-view.c:503
 #, 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:508
+#: ../modules/itip-formatter/itip-view.c:506
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s preko %s vam dodeljuje zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:510
+#: ../modules/itip-formatter/itip-view.c:508
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s vam dodeljuje zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:516
+#: ../modules/itip-formatter/itip-view.c:514
 #, 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:518
+#: ../modules/itip-formatter/itip-view.c:516
 #, 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:522
+#: ../modules/itip-formatter/itip-view.c:520
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -18252,334 +21708,335 @@ msgid ""
 msgstr ""
 "%s preko %s želi da dobije najnovije informacije za sledeći dodeljeni zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:524
+#: ../modules/itip-formatter/itip-view.c:522
 #, 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:528
+#: ../modules/itip-formatter/itip-view.c:526
 #, 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:530
+#: ../modules/itip-formatter/itip-view.c:528
 #, 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:534
+#: ../modules/itip-formatter/itip-view.c:532
 #, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "%s preko %s otkazuje sledeći dodeljeni zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:536
+#: ../modules/itip-formatter/itip-view.c:534
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "%s otkazuje sledeći dodeljeni zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:540
+#: ../modules/itip-formatter/itip-view.c:538
 #, 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:542
+#: ../modules/itip-formatter/itip-view.c:540
 #, 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:546
+#: ../modules/itip-formatter/itip-view.c:544
 #, 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:548
+#: ../modules/itip-formatter/itip-view.c:546
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s odbija sledeći dodeljeni zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:587
+#: ../modules/itip-formatter/itip-view.c:585
 #, 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:589
+#: ../modules/itip-formatter/itip-view.c:587
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s objavljuje sledeću belešku:"
 
-#: ../modules/itip-formatter/itip-view.c:594
+#: ../modules/itip-formatter/itip-view.c:592
 #, 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:596
+#: ../modules/itip-formatter/itip-view.c:594
 #, 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:600
+#: ../modules/itip-formatter/itip-view.c:598
 #, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "%s preko %s otkazuje sledeću deljenu belešku:"
 
-#: ../modules/itip-formatter/itip-view.c:602
+#: ../modules/itip-formatter/itip-view.c:600
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "%s otkazuje sledeće deljenu belešku:"
 
-#: ../modules/itip-formatter/itip-view.c:675
+#: ../modules/itip-formatter/itip-view.c:674
 msgid "All day:"
 msgstr "Celodnevno:"
 
-#: ../modules/itip-formatter/itip-view.c:681
+#: ../modules/itip-formatter/itip-view.c:680
 msgid "Start day:"
 msgstr "Početak dana:"
 
-#: ../modules/itip-formatter/itip-view.c:681
-#: ../modules/itip-formatter/itip-view.c:1504
+#: ../modules/itip-formatter/itip-view.c:680
+#: ../modules/itip-formatter/itip-view.c:1515
 msgid "Start time:"
 msgstr "Vreme početka:"
 
-#: ../modules/itip-formatter/itip-view.c:690
+#: ../modules/itip-formatter/itip-view.c:689
 msgid "End day:"
 msgstr "Kraj dana:"
 
-#: ../modules/itip-formatter/itip-view.c:690
-#: ../modules/itip-formatter/itip-view.c:1505
+#: ../modules/itip-formatter/itip-view.c:689
+#: ../modules/itip-formatter/itip-view.c:1516
 msgid "End time:"
 msgstr "Vreme završetka:"
 
-#: ../modules/itip-formatter/itip-view.c:1030
+#: ../modules/itip-formatter/itip-view.c:1039
 msgid "Ope_n Calendar"
 msgstr "O_tvori kalendar"
 
-#: ../modules/itip-formatter/itip-view.c:1033
+#: ../modules/itip-formatter/itip-view.c:1042
 msgid "_Decline all"
 msgstr "Od_bij sve"
 
-#: ../modules/itip-formatter/itip-view.c:1036
+#: ../modules/itip-formatter/itip-view.c:1045
 msgid "_Decline"
 msgstr "_Odbij"
 
-#: ../modules/itip-formatter/itip-view.c:1039
+#: ../modules/itip-formatter/itip-view.c:1048
 msgid "_Tentative all"
 msgstr "Sve sa re_zervom"
 
-#: ../modules/itip-formatter/itip-view.c:1042
+#: ../modules/itip-formatter/itip-view.c:1051
 msgid "_Tentative"
 msgstr "Sa _rezervom"
 
-#: ../modules/itip-formatter/itip-view.c:1045
+#: ../modules/itip-formatter/itip-view.c:1054
 msgid "Acce_pt all"
 msgstr "P_rihvati sve"
 
-#: ../modules/itip-formatter/itip-view.c:1048
+#: ../modules/itip-formatter/itip-view.c:1057
 msgid "Acce_pt"
 msgstr "Prih_vaćeno"
 
-#: ../modules/itip-formatter/itip-view.c:1051
+#: ../modules/itip-formatter/itip-view.c:1060
 msgid "Send _Information"
 msgstr "Pošalji _podatke"
 
-#: ../modules/itip-formatter/itip-view.c:1054
+#: ../modules/itip-formatter/itip-view.c:1063
 msgid "_Update Attendee Status"
 msgstr "Ažuriraj stanje učesni_ka"
 
-#: ../modules/itip-formatter/itip-view.c:1057
+#: ../modules/itip-formatter/itip-view.c:1066
+#: ../smime/gui/certificate-manager.c:1666
 msgid "_Update"
 msgstr "_Osveži"
 
-#: ../modules/itip-formatter/itip-view.c:1507
-#: ../modules/itip-formatter/itip-view.c:1555
-#: ../modules/itip-formatter/itip-view.c:1626
+#: ../modules/itip-formatter/itip-view.c:1518
+#: ../modules/itip-formatter/itip-view.c:1566
+#: ../modules/itip-formatter/itip-view.c:1637
 msgid "Comment:"
 msgstr "Napomena:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1543
+#: ../modules/itip-formatter/itip-view.c:1554
 msgid "Send reply to sender"
 msgstr "Odgovori pošiljaocu"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1558
+#: ../modules/itip-formatter/itip-view.c:1569
 msgid "Send _updates to attendees"
 msgstr "Pošalji _ažurirane podatke učesnicima"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1561
+#: ../modules/itip-formatter/itip-view.c:1572
 msgid "_Apply to all instances"
 msgstr "Pri_meni na sve nivoe"
 
-#: ../modules/itip-formatter/itip-view.c:1562
+#: ../modules/itip-formatter/itip-view.c:1573
 msgid "Show time as _free"
 msgstr "Prikaži vreme kao _slobodno"
 
-#: ../modules/itip-formatter/itip-view.c:1563
+#: ../modules/itip-formatter/itip-view.c:1574
 msgid "_Preserve my reminder"
 msgstr "_Očuvaj moj podsetnik"
 
-#: ../modules/itip-formatter/itip-view.c:1564
+#: ../modules/itip-formatter/itip-view.c:1575
 msgid "_Inherit reminder"
 msgstr "_Nasledi podsetnik"
 
-#: ../modules/itip-formatter/itip-view.c:1894
+#: ../modules/itip-formatter/itip-view.c:1908
 msgid "_Tasks:"
 msgstr "_Zadaci:"
 
-#: ../modules/itip-formatter/itip-view.c:1897
+#: ../modules/itip-formatter/itip-view.c:1911
 msgid "_Memos:"
 msgstr "_Beleške:"
 
-#: ../modules/itip-formatter/itip-view.c:3125
+#: ../modules/itip-formatter/itip-view.c:3217
 msgid "Sa_ve"
 msgstr "Sa_čuvaj"
 
-#: ../modules/itip-formatter/itip-view.c:3585
-#: ../modules/itip-formatter/itip-view.c:5032
+#: ../modules/itip-formatter/itip-view.c:3679
+#: ../modules/itip-formatter/itip-view.c:5151
 msgid "Attendee status updated"
 msgstr "Status učesnika je ažuriran"
 
-#: ../modules/itip-formatter/itip-view.c:3764
+#: ../modules/itip-formatter/itip-view.c:3859
 #, 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:3793
+#: ../modules/itip-formatter/itip-view.c:3889
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Pronašao sam zakazivanje u kalendaru „%s“"
 
-#: ../modules/itip-formatter/itip-view.c:3906
+#: ../modules/itip-formatter/itip-view.c:4024
 msgid "Unable to find any calendars"
 msgstr "Ne mogu da pronađem nijedan kalendar"
 
-#: ../modules/itip-formatter/itip-view.c:3914
+#: ../modules/itip-formatter/itip-view.c:4032
 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:3919
+#: ../modules/itip-formatter/itip-view.c:4037
 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:3924
+#: ../modules/itip-formatter/itip-view.c:4042
 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:4268
+#: ../modules/itip-formatter/itip-view.c:4387
 msgid "Opening the calendar. Please wait..."
 msgstr "Otvaram kalendar. Molim sačekajte..."
 
-#: ../modules/itip-formatter/itip-view.c:4273
+#: ../modules/itip-formatter/itip-view.c:4392
 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:4668
+#: ../modules/itip-formatter/itip-view.c:4787
 #, 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:4683
+#: ../modules/itip-formatter/itip-view.c:4802
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Poslato kalendaru „%s“ kao prihvaćeno"
 
-#: ../modules/itip-formatter/itip-view.c:4688
+#: ../modules/itip-formatter/itip-view.c:4807
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Poslato kalendaru „%s“ kao pokušaj"
 
-#: ../modules/itip-formatter/itip-view.c:4694
+#: ../modules/itip-formatter/itip-view.c:4813
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Poslato kalendaru „%s“ kao odbijeno"
 
-#: ../modules/itip-formatter/itip-view.c:4700
+#: ../modules/itip-formatter/itip-view.c:4819
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Poslato kalendaru „%s“ kao otkazano"
 
-#: ../modules/itip-formatter/itip-view.c:4721
-#: ../modules/itip-formatter/itip-view.c:5178
-#: ../modules/itip-formatter/itip-view.c:5284
+#: ../modules/itip-formatter/itip-view.c:4840
+#: ../modules/itip-formatter/itip-view.c:5298
+#: ../modules/itip-formatter/itip-view.c:5404
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Čuvam izmene u kalendar. Molim sačekajte..."
 
-#: ../modules/itip-formatter/itip-view.c:4762
+#: ../modules/itip-formatter/itip-view.c:4881
 msgid "Unable to parse item"
 msgstr "Ne mogu da obradim stavku"
 
-#: ../modules/itip-formatter/itip-view.c:4955
+#: ../modules/itip-formatter/itip-view.c:5074
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizator je uklonio delegata „%s“ "
 
-#: ../modules/itip-formatter/itip-view.c:4972
+#: ../modules/itip-formatter/itip-view.c:5091
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Delegatu je poslato obaveštenje o otkazivanju"
 
-#: ../modules/itip-formatter/itip-view.c:4976
+#: ../modules/itip-formatter/itip-view.c:5095
 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:5024
+#: ../modules/itip-formatter/itip-view.c:5143
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Ne mogu da ažuriram učesnika. %s"
 
-#: ../modules/itip-formatter/itip-view.c:5067
+#: ../modules/itip-formatter/itip-view.c:5187
 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:5143
+#: ../modules/itip-formatter/itip-view.c:5263
 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:5215
-#: ../modules/itip-formatter/itip-view.c:5254
+#: ../modules/itip-formatter/itip-view.c:5335
+#: ../modules/itip-formatter/itip-view.c:5374
 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:5317
+#: ../modules/itip-formatter/itip-view.c:5437
 msgid "Meeting information sent"
 msgstr "Podatak o sastanku je poslat"
 
-#: ../modules/itip-formatter/itip-view.c:5322
+#: ../modules/itip-formatter/itip-view.c:5442
 msgid "Task information sent"
 msgstr "Podatak o zadatku je poslat"
 
-#: ../modules/itip-formatter/itip-view.c:5327
+#: ../modules/itip-formatter/itip-view.c:5447
 msgid "Memo information sent"
 msgstr "Podatak o belešci je poslat"
 
-#: ../modules/itip-formatter/itip-view.c:5338
+#: ../modules/itip-formatter/itip-view.c:5458
 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:5343
+#: ../modules/itip-formatter/itip-view.c:5463
 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:5348
+#: ../modules/itip-formatter/itip-view.c:5468
 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:5413
+#: ../modules/itip-formatter/itip-view.c:5533
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5418
+#: ../modules/itip-formatter/itip-view.c:5538
 msgid "Save Calendar"
 msgstr "Sačuvaj kalendar"
 
-#: ../modules/itip-formatter/itip-view.c:5467
-#: ../modules/itip-formatter/itip-view.c:5480
+#: ../modules/itip-formatter/itip-view.c:5587
+#: ../modules/itip-formatter/itip-view.c:5600
 msgid "The calendar attached is not valid"
 msgstr "Priložen kalendar nije ispravan"
 
-#: ../modules/itip-formatter/itip-view.c:5468
-#: ../modules/itip-formatter/itip-view.c:5481
+#: ../modules/itip-formatter/itip-view.c:5588
+#: ../modules/itip-formatter/itip-view.c:5601
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18587,15 +22044,15 @@ msgstr ""
 "Poruka prijavljuje da sadrži kalendar, ali taj kalendar nije ispravan "
 "iKalendar."
 
-#: ../modules/itip-formatter/itip-view.c:5523
-#: ../modules/itip-formatter/itip-view.c:5553
-#: ../modules/itip-formatter/itip-view.c:5654
+#: ../modules/itip-formatter/itip-view.c:5643
+#: ../modules/itip-formatter/itip-view.c:5673
+#: ../modules/itip-formatter/itip-view.c:5774
 msgid "The item in the calendar is not valid"
 msgstr "Stavka u kalendaru nije ispravna"
 
-#: ../modules/itip-formatter/itip-view.c:5524
-#: ../modules/itip-formatter/itip-view.c:5554
-#: ../modules/itip-formatter/itip-view.c:5655
+#: ../modules/itip-formatter/itip-view.c:5644
+#: ../modules/itip-formatter/itip-view.c:5674
+#: ../modules/itip-formatter/itip-view.c:5775
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18603,11 +22060,11 @@ msgstr ""
 "Poruka sadrži kalendar, ali on ne sadrži događaje, zadatke ili podatke "
 "slobodno/zauzeto."
 
-#: ../modules/itip-formatter/itip-view.c:5569
+#: ../modules/itip-formatter/itip-view.c:5689
 msgid "The calendar attached contains multiple items"
 msgstr "Kalendar u prilogu sadrži više stavki"
 
-#: ../modules/itip-formatter/itip-view.c:5570
+#: ../modules/itip-formatter/itip-view.c:5690
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18619,24 +22076,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:6072
+#: ../modules/itip-formatter/itip-view.c:6193
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ništa"
 
-#: ../modules/itip-formatter/itip-view.c:6088
+#: ../modules/itip-formatter/itip-view.c:6209
 msgid "Tentatively Accepted"
 msgstr "Prihvaćeno s rezervom"
 
-#: ../modules/itip-formatter/itip-view.c:6248
+#: ../modules/itip-formatter/itip-view.c:6369
 msgid "This meeting recurs"
 msgstr "Ovaj sastanak se ponavlja"
 
-#: ../modules/itip-formatter/itip-view.c:6251
+#: ../modules/itip-formatter/itip-view.c:6372
 msgid "This task recurs"
 msgstr "Ovaj zadatak se ponavlja"
 
-#: ../modules/itip-formatter/itip-view.c:6254
+#: ../modules/itip-formatter/itip-view.c:6375
 msgid "This memo recurs"
 msgstr "Ova beleška se ponavlja"
 
@@ -18653,140 +22110,140 @@ 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/itip-formatter/plugin/config-ui.c:81
-msgid "Meeting Invitations"
-msgstr "Pozivnice za sastanak"
-
-#: ../modules/itip-formatter/plugin/config-ui.c:107
-msgid "_Delete message after acting"
-msgstr "_Obriši poruku nakon radnje"
-
-#: ../modules/itip-formatter/plugin/config-ui.c:121
-#: ../modules/itip-formatter/plugin/config-ui.c:152
-msgid "Conflict Search"
-msgstr "Pretraga preklapanja"
-
-#. Source selector
-#: ../modules/itip-formatter/plugin/config-ui.c:136
-msgid "Select the calendars to search for meeting conflicts"
-msgstr "Bira kalendare za pretragu preklapanja u sastancima"
-
-#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Itip Formatter"
-msgstr "Itip formatiranje"
-
-#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:2
-msgid "Display \"text/calendar\" MIME parts in mail messages."
-msgstr "Prikazuje MIME delove „text/calendar“ u porukama."
-
-#: ../modules/mail-config/e-mail-config-google-summary.c:251
+#: ../modules/mail-config/e-mail-config-google-summary.c:261
 msgid "Google Features"
 msgstr "Gugl mogućnosti"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:260
+#: ../modules/mail-config/e-mail-config-google-summary.c:270
 msgid "Add Google Ca_lendar to this account"
 msgstr "Dodaj ka_lendar Gugla ovom nalogu"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:268
+#: ../modules/mail-config/e-mail-config-google-summary.c:279
 msgid "Add Google Con_tacts to this account"
 msgstr "Dodaj ko_ntakte Gugla ovom nalogu"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:276
+#: ../modules/mail-config/e-mail-config-google-summary.c:288
 msgid "You may need to enable IMAP access"
 msgstr "Možda ćete morati da omogućite IMAP pristup"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:245
-#: ../modules/mail-config/e-mail-config-local-accounts.c:291
+#: ../modules/mail-config/e-mail-config-local-accounts.c:267
+#: ../modules/mail-config/e-mail-config-local-accounts.c:315
 msgid "Mail _Directory:"
 msgstr "Direktorijum _pošte:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:246
+#: ../modules/mail-config/e-mail-config-local-accounts.c:268
 msgid "Choose a MH mail directory"
 msgstr "Izaberite MH direktorijum pošte"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:268
+#: ../modules/mail-config/e-mail-config-local-accounts.c:270
+#| msgid "One or more values cannot be empty."
+msgid "MH mail directory cannot be empty"
+msgstr "MH direktorijum pošte ne može biti prazan"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:291
 msgid "Local Delivery _File:"
 msgstr "Mesna datoteka _dostave:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:269
+#: ../modules/mail-config/e-mail-config-local-accounts.c:292
 msgid "Choose a local delivery file"
 msgstr "Izaberite mesnu datoteku dostave"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:292
+#: ../modules/mail-config/e-mail-config-local-accounts.c:294
+#| msgid "One or more values cannot be empty."
+msgid "Local delivery file cannot be empty"
+msgstr "Mesna datoteka isporuke ne može biti prazna"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:316
 msgid "Choose a Maildir mail directory"
 msgstr "Izaberite Mejldir direktorijum pošte"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:314
+#: ../modules/mail-config/e-mail-config-local-accounts.c:318
+#| msgid "Choose a Maildir mail directory"
+msgid "Maildir mail directory cannot be empty"
+msgstr "Mejldir direktorijum pošte ne može biti prazan"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:339
 msgid "Spool _File:"
 msgstr "Datoteka _pripreme:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:315
+#: ../modules/mail-config/e-mail-config-local-accounts.c:340
 msgid "Choose a mbox spool file"
 msgstr "Izaberite datoteku mboks pripreme"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:337
+#: ../modules/mail-config/e-mail-config-local-accounts.c:342
+#| msgid "One or more values cannot be empty."
+msgid "Mbox spool file cannot be empty"
+msgstr "Datoteka pripreme Msandučeta ne može biti prazna"
+
+#: ../modules/mail-config/e-mail-config-local-accounts.c:363
 msgid "Spool _Directory:"
 msgstr "Direktorijum _pripreme:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:338
+#: ../modules/mail-config/e-mail-config-local-accounts.c:364
 msgid "Choose a mbox spool directory"
 msgstr "Izaberite direktorijum mboks pripreme"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:136
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:53
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:79
+#: ../modules/mail-config/e-mail-config-local-accounts.c:366
+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-sendmail-backend.c:61
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:93
 #: ../modules/plugin-manager/evolution-plugin-manager.c:158
 msgid "Configuration"
 msgstr "Podešavanje"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:154
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:97
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:155
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:111
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:168
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:169
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:124
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:180
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:226
+#. do not reference
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:190
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:252
 msgid "User_name:"
 msgstr "Korisničko_ime:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:213
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:147
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:223
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:173
 msgid "Encryption _method:"
 msgstr "Način _šifrovanja:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:228
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:162
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:238
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:188
 msgid "STARTTLS after connecting"
 msgstr "STARTTLS nakon povezivanja"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:232
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:166
-msgid "SSL on a dedicated port"
-msgstr "SSL na odeđenom portu"
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:242
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:192
+#| msgid "SSL on a dedicated port"
+msgid "TLS on a dedicated port"
+msgstr "TLS na dodeljenom priključniku"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:69
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:77
 msgid "_Use custom binary, instead of 'sendmail'"
 msgstr "_Koristi proizvoljni izvršni, umesto „sendmail“"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:73
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:81
 msgid "_Custom binary:"
 msgstr "_Proizvoljni izvršni:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:90
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:100
 msgid "U_se custom arguments"
 msgstr "Koristi _proizvoljne argumente"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:94
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:104
 msgid "Cus_tom arguments:"
 msgstr "Proizvoljni _argumenti:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:112
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:122
 msgid ""
 "Default arguments are '-i -f %F -- %R', where\n"
 "   %F - stands for the From address\n"
@@ -18796,27 +22253,33 @@ msgstr ""
 "   %F — označava adresu pošiljaoca\n"
 "   %R — označava adrese primalaca"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:127
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:137
 msgid "Send mail also when in offline _mode"
 msgstr "Pošalji poštu takođe u režimu _van mreže"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:122
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:210
+#| msgid "One or more values cannot be empty."
+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
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver traži potvrđivanje identiteta"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:208
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:234
 msgid "T_ype:"
 msgstr "_Vrsta:"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:246
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:245
 msgid "Yahoo! Features"
 msgstr "Jahu! mogućnosti"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:255
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:254
 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:424
+#: ../modules/mail/e-mail-attachment-handler.c:440
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
@@ -18825,46 +22288,46 @@ 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:314
+#: ../modules/mail/e-mail-shell-backend.c:353
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Poruka"
 
-#: ../modules/mail/e-mail-shell-backend.c:316
+#: ../modules/mail/e-mail-shell-backend.c:355
 msgid "Compose a new mail message"
 msgstr "Sastavite novu poruku"
 
-#: ../modules/mail/e-mail-shell-backend.c:324
+#: ../modules/mail/e-mail-shell-backend.c:363
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "Poštanski _nalog"
 
-#: ../modules/mail/e-mail-shell-backend.c:326
+#: ../modules/mail/e-mail-shell-backend.c:365
 msgid "Create a new mail account"
 msgstr "Napravite novi nalog za poštu"
 
-#: ../modules/mail/e-mail-shell-backend.c:331
+#: ../modules/mail/e-mail-shell-backend.c:370
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Fascikla za poštu"
 
-#: ../modules/mail/e-mail-shell-backend.c:333
+#: ../modules/mail/e-mail-shell-backend.c:372
 msgid "Create a new mail folder"
 msgstr "Napravite novu fasciklu za poštu"
 
-#: ../modules/mail/e-mail-shell-backend.c:644
+#: ../modules/mail/e-mail-shell-backend.c:687
 msgid "Mail Accounts"
 msgstr "Poštanski nalozi"
 
-#: ../modules/mail/e-mail-shell-backend.c:653
+#: ../modules/mail/e-mail-shell-backend.c:696
 msgid "Mail Preferences"
 msgstr "Postavke pošte"
 
-#: ../modules/mail/e-mail-shell-backend.c:662
+#: ../modules/mail/e-mail-shell-backend.c:705
 msgid "Composer Preferences"
 msgstr "Postavke sastavljača"
 
-#: ../modules/mail/e-mail-shell-backend.c:672
+#: ../modules/mail/e-mail-shell-backend.c:715
 msgid "Network Preferences"
 msgstr "Postavke mreže"
 
@@ -18875,131 +22338,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:964
+#: ../modules/mail/e-mail-shell-backend.c:1007
 msgctxt "label"
 msgid "None"
 msgstr "Ništa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:670
+#: ../modules/mail/e-mail-shell-view-actions.c:713
 msgid "Marking messages as read..."
 msgstr "Označavam poruke pročitanim..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1512
+#: ../modules/mail/e-mail-shell-view-actions.c:1038
+msgid "Go to Folder"
+msgstr "Idi u fasciklu"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1042
+msgid "_Select"
+msgstr "_Izaberi"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
 msgid "_Disable Account"
 msgstr "_Onemogući nalog"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1514
+#: ../modules/mail/e-mail-shell-view-actions.c:1633
 msgid "Disable this account"
 msgstr "Isključite ovaj nalog"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1521
+#: ../modules/mail/e-mail-shell-view-actions.c:1640
 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:1528
+#: ../modules/mail/e-mail-shell-view-actions.c:1647
 msgid "Edit properties of this account"
 msgstr "Izmenite osobine ovog naloga"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1535
+#: ../modules/mail/e-mail-shell-view-actions.c:1654
 msgid "Refresh list of folders of this account"
 msgstr "Osvežite spisak fascikli za ovaj nalog"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1540
+#: ../modules/mail/e-mail-shell-view-actions.c:1659
 msgid "_Download Messages for Offline Usage"
 msgstr "_Preuzmi poruke za rad van mreže"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1542
+#: ../modules/mail/e-mail-shell-view-actions.c:1661
 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:1547
+#: ../modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Fl_ush Outbox"
 msgstr "Is_prazni „Za slanje“"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1554
+#: ../modules/mail/e-mail-shell-view-actions.c:1673
 msgid "_Copy Folder To..."
 msgstr "_Umnoži fasciklu u..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1556
+#: ../modules/mail/e-mail-shell-view-actions.c:1675
 msgid "Copy the selected folder into another folder"
 msgstr "Umnožite izabranu fasciklu u drugu fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1563
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
 msgid "Permanently remove this folder"
 msgstr "Trajno uklonite ovu fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1568
+#: ../modules/mail/e-mail-shell-view-actions.c:1687
 msgid "E_xpunge"
 msgstr "Izba_ci"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1570
+#: ../modules/mail/e-mail-shell-view-actions.c:1689
 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:1575
-#: ../modules/mail/e-mail-shell-view-actions.c:1675
+#: ../modules/mail/e-mail-shell-view-actions.c:1694
+#: ../modules/mail/e-mail-shell-view-actions.c:1802
 msgid "Mar_k All Messages as Read"
 msgstr "Označi sve po_ruke kao pročitane"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1577
-#: ../modules/mail/e-mail-shell-view-actions.c:1677
+#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1804
 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:1582
+#: ../modules/mail/e-mail-shell-view-actions.c:1701
 msgid "_Move Folder To..."
 msgstr "_Premesti fasciklu u..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1584
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
 msgid "Move the selected folder into another folder"
 msgstr "Premestite izabranu fasciklu u drugu fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1589
+#. Translators: An action caption to create a new mail folder
+#: ../modules/mail/e-mail-shell-view-actions.c:1709
 msgid "_New..."
 msgstr "_Novo..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1591
+#: ../modules/mail/e-mail-shell-view-actions.c:1711
 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:1598
+#: ../modules/mail/e-mail-shell-view-actions.c:1718
 msgid "Change the properties of this folder"
 msgstr "Izmenite osobine ove fascikle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1605
+#: ../modules/mail/e-mail-shell-view-actions.c:1725
 msgid "Refresh the folder"
 msgstr "Osvežite fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1612
+#: ../modules/mail/e-mail-shell-view-actions.c:1732
 msgid "Change the name of this folder"
 msgstr "Promenite naziv ove fascikle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1617
+#: ../modules/mail/e-mail-shell-view-actions.c:1737
 msgid "Select Message _Thread"
 msgstr "Izaberi _raspravu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1619
+#: ../modules/mail/e-mail-shell-view-actions.c:1739
 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:1624
+#: ../modules/mail/e-mail-shell-view-actions.c:1744
 msgid "Select Message S_ubthread"
 msgstr "Izaberi p_odniz poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1626
+#: ../modules/mail/e-mail-shell-view-actions.c:1746
 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:1638
+#: ../modules/mail/e-mail-shell-view-actions.c:1758
 msgid "Empty _Trash"
 msgstr "Izbaci _smeće"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1640
+#: ../modules/mail/e-mail-shell-view-actions.c:1760
 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:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:1765
+msgid "Go to _Folder"
+msgstr "Idi u _fasciklu"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1767
+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
 msgid "_New Label"
 msgstr "_Nova oznaka"
 
@@ -19008,201 +22488,221 @@ 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:1654
+#: ../modules/mail/e-mail-shell-view-actions.c:1781
 msgid "N_one"
 msgstr "N_išta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1668
+#: ../modules/mail/e-mail-shell-view-actions.c:1795
 msgid "_Manage Subscriptions"
 msgstr "_Upravljaj prijavama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1670
-#: ../modules/mail/e-mail-shell-view-actions.c:1754
+#: ../modules/mail/e-mail-shell-view-actions.c:1797
+#: ../modules/mail/e-mail-shell-view-actions.c:1881
 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:1682
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../modules/mail/e-mail-shell-view-actions.c:1809
+#: ../modules/mail/e-mail-shell-view-actions.c:1830
 msgid "Send / _Receive"
 msgstr "Slanje / p_rimanje"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1684
+#: ../modules/mail/e-mail-shell-view-actions.c:1811
 msgid "Send queued items and retrieve new items"
 msgstr "Pošaljite pripremljene i dovucite nove stavke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1689
+#: ../modules/mail/e-mail-shell-view-actions.c:1816
 msgid "R_eceive All"
 msgstr "P_rimi sve"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1691
+#: ../modules/mail/e-mail-shell-view-actions.c:1818
 msgid "Receive new items from all accounts"
 msgstr "Primite nove stavke sa svih naloga"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1823
 msgid "_Send All"
 msgstr "P_ošalji sve"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1698
+#: ../modules/mail/e-mail-shell-view-actions.c:1825
 msgid "Send queued items in all accounts"
 msgstr "Pošaljite stavke na čekanju u svim nalozima"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1726
+#: ../modules/mail/e-mail-shell-view-actions.c:1853
 msgid "Cancel the current mail operation"
 msgstr "Otkažite trenutnu operaciju sa poštom"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1731
+#: ../modules/mail/e-mail-shell-view-actions.c:1858
 msgid "Collapse All _Threads"
 msgstr "Skupi sve _rasprave"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1733
+#: ../modules/mail/e-mail-shell-view-actions.c:1860
 msgid "Collapse all message threads"
 msgstr "Skupite celokupno grananje rasprava"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1738
+#: ../modules/mail/e-mail-shell-view-actions.c:1865
 msgid "E_xpand All Threads"
 msgstr "Razgranaj sve ra_sprave"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1740
+#: ../modules/mail/e-mail-shell-view-actions.c:1867
 msgid "Expand all message threads"
 msgstr "Razgranajte sve poruke u raspravama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1745
+#: ../modules/mail/e-mail-shell-view-actions.c:1872
 msgid "_Message Filters"
 msgstr "_Propusnici poruka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1747
+#: ../modules/mail/e-mail-shell-view-actions.c:1874
 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:1752
+#: ../modules/mail/e-mail-shell-view-actions.c:1879
 msgid "_Subscriptions..."
 msgstr "_Prijave..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1761
+#: ../modules/mail/e-mail-shell-view-actions.c:1888
 msgid "F_older"
 msgstr "_Fascikla"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1768
+#: ../modules/mail/e-mail-shell-view-actions.c:1895
 msgid "_Label"
 msgstr "_Natpis"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1785
+#: ../modules/mail/e-mail-shell-view-actions.c:1912
 msgid "C_reate Search Folder From Search..."
 msgstr "Napravi _fasciklu pretrage iz pretrage..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1792
+#: ../modules/mail/e-mail-shell-view-actions.c:1919
 msgid "Search F_olders"
 msgstr "Fas_cikle pretrage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1794
+#: ../modules/mail/e-mail-shell-view-actions.c:1921
 msgid "Create or edit search folder definitions"
 msgstr "Napravite ili uredite definicije fascikle pretrage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1833
+#: ../modules/mail/e-mail-shell-view-actions.c:1960
 msgid "_New Folder..."
 msgstr "_Nova fascikla..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1861
+#: ../modules/mail/e-mail-shell-view-actions.c:1988
 msgid "Show Message _Preview"
 msgstr "Prika_ži pregled poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1863
+#: ../modules/mail/e-mail-shell-view-actions.c:1990
 msgid "Show message preview pane"
 msgstr "Prikažite pregled poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1869
+#: ../modules/mail/e-mail-shell-view-actions.c:1996
 msgid "Show _Deleted Messages"
 msgstr "Prikaži o_brisane poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1871
+#: ../modules/mail/e-mail-shell-view-actions.c:1998
 msgid "Show deleted messages with a line through them"
 msgstr "Prikažite obrisane poruke (kao precrtane)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1877
+#: ../modules/mail/e-mail-shell-view-actions.c:2004
+#| msgid "Show _Deleted Messages"
+msgid "Show _Junk Messages"
+msgstr "Prikaži _nepoželjne poruke"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2006
+#| msgid "Show deleted messages with a line through them"
+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
 msgid "_Group By Threads"
 msgstr "Grupiši po _raspravama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1879
+#: ../modules/mail/e-mail-shell-view-actions.c:2014
 msgid "Threaded message list"
 msgstr "Spisak poruka po temama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1885
+#: ../modules/mail/e-mail-shell-view-actions.c:2020
 msgid "_Unmatched Folder Enabled"
 msgstr "Uključena _nepoklopljena fascikla"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1887
+#: ../modules/mail/e-mail-shell-view-actions.c:2022
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Okida prilikom uključivanja nepoklopljene fascikle pretrage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1907
+#: ../modules/mail/e-mail-shell-view-actions.c:2042
 msgid "Show message preview below the message list"
 msgstr "Prikažite pregled poruke ispod liste poruka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1914
+#: ../modules/mail/e-mail-shell-view-actions.c:2049
 msgid "Show message preview alongside the message list"
 msgstr "Prikažite pregled poruke pored spiska poruka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1922
+#: ../modules/mail/e-mail-shell-view-actions.c:2057
 msgid "All Messages"
 msgstr "Sve poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1929
+#: ../modules/mail/e-mail-shell-view-actions.c:2064
 msgid "Important Messages"
 msgstr "Važne poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1936
+#: ../modules/mail/e-mail-shell-view-actions.c:2071
 msgid "Last 5 Days' Messages"
 msgstr "Poruke u zadnjih 5 dana"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1943
+#: ../modules/mail/e-mail-shell-view-actions.c:2078
 msgid "Messages Not Junk"
 msgstr "Poruke nisu đubre"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1950
+#: ../modules/mail/e-mail-shell-view-actions.c:2085
 msgid "Messages with Attachments"
 msgstr "Poruke sa prilozima"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1957
+#: ../modules/mail/e-mail-shell-view-actions.c:2092
+#| msgid "Messages with Attachments"
+msgid "Messages with Notes"
+msgstr "Poruke sa beleškama"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2099
 msgid "No Label"
 msgstr "Bez oznake"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1964
+#: ../modules/mail/e-mail-shell-view-actions.c:2106
 msgid "Read Messages"
 msgstr "Pročitane poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1971
+#: ../modules/mail/e-mail-shell-view-actions.c:2113
 msgid "Unread Messages"
 msgstr "Nepročitane poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2023
+#: ../modules/mail/e-mail-shell-view-actions.c:2120
+#| msgid "Message Header"
+msgid "Message Thread"
+msgstr "Tema poruke"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:2180
 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:2033
+#: ../modules/mail/e-mail-shell-view-actions.c:2190
 msgid "All Accounts"
 msgstr "svim nalozima"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:2040
+#: ../modules/mail/e-mail-shell-view-actions.c:2197
 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:2047
+#: ../modules/mail/e-mail-shell-view-actions.c:2204
 msgid "Current Folder"
 msgstr "tekućoj fascikli"
 
-#: ../modules/mail/e-mail-shell-view.c:636
+#: ../modules/mail/e-mail-shell-view.c:779
 msgid "All Account Search"
 msgstr "Pretraga svih naloga"
 
-#: ../modules/mail/e-mail-shell-view.c:744
+#: ../modules/mail/e-mail-shell-view.c:887
 msgid "Account Search"
 msgstr "Pretraga naloga"
 
-#: ../modules/mail/e-mail-shell-view-private.c:972
+#: ../modules/mail/e-mail-shell-view-private.c:957
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -19211,8 +22711,8 @@ msgstr[1] "%d izabrane, "
 msgstr[2] "%d izabranih, "
 msgstr[3] "%d izabrana, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:981
-#: ../modules/mail/e-mail-shell-view-private.c:998
+#: ../modules/mail/e-mail-shell-view-private.c:966
+#: ../modules/mail/e-mail-shell-view-private.c:983
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -19221,8 +22721,8 @@ msgstr[1] "%d obrisane"
 msgstr[2] "%d obrisanih"
 msgstr[3] "%d obrisana"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1007
-#: ../modules/mail/e-mail-shell-view-private.c:1013
+#: ../modules/mail/e-mail-shell-view-private.c:992
+#: ../modules/mail/e-mail-shell-view-private.c:998
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -19231,7 +22731,7 @@ msgstr[1] "%d nepoželjne"
 msgstr[2] "%d nepoželjnih"
 msgstr[3] "%d nepoželjna"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1020
+#: ../modules/mail/e-mail-shell-view-private.c:1005
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -19240,7 +22740,7 @@ msgstr[1] "%d nacrta"
 msgstr[2] "%d nacrta"
 msgstr[3] "%d nacrt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1011
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -19249,7 +22749,7 @@ msgstr[1] "%d neposlate"
 msgstr[2] "%d neposlatih"
 msgstr[3] "%d neposlata"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1032
+#: ../modules/mail/e-mail-shell-view-private.c:1017
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -19258,90 +22758,86 @@ msgstr[1] "%d poslate"
 msgstr[2] "%d poslatih"
 msgstr[3] "%d poslata"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1044
+#: ../modules/mail/e-mail-shell-view-private.c:1034
 #, c-format
-msgid "%d unread, "
-msgid_plural "%d unread, "
-msgstr[0] "%d nepročitana, "
-msgstr[1] "%d nepročitane, "
-msgstr[2] "%d nepročitanih, "
-msgstr[3] "%d nepročitana, "
-
-#: ../modules/mail/e-mail-shell-view-private.c:1047
-#, c-format
-msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] "%d ukupno"
-msgstr[1] "%d ukupno"
-msgstr[2] "%d ukupno"
-msgstr[3] "%d ukupno"
-
-#: ../modules/mail/e-mail-shell-view-private.c:1068
-msgid "Trash"
-msgstr "Smeće"
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d nepročitana"
+msgstr[1] "%d nepročitane"
+msgstr[2] "%d nepročitanih"
+msgstr[3] "%d nepročitana"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1505
+#: ../modules/mail/e-mail-shell-view-private.c:1552
 msgid "Send / Receive"
 msgstr "Pošalji / Primi"
 
-#: ../modules/mail/em-composer-prefs.c:443
-#| msgid "Select Folder"
+#: ../modules/mail/em-composer-prefs.c:414
 msgid "Select Folder to Add"
 msgstr "Izaberite fasciklu za dodavanje"
 
-#: ../modules/mail/em-composer-prefs.c:888
-#| msgid "F_older"
+#: ../modules/mail/em-composer-prefs.c:884
 msgid "Folder"
 msgstr "Fascikla"
 
-#: ../modules/mail/em-composer-prefs.c:924
-#| msgid "Recipients"
+#: ../modules/mail/em-composer-prefs.c:920
 msgid "Recipient"
 msgstr "Primalac"
 
-#: ../modules/mail/em-composer-prefs.c:1195
+#: ../modules/mail/em-composer-prefs.c:1205
+msgid "Keep in Outbox"
+msgstr "Zadrži u „Za slanje“"
+
+#: ../modules/mail/em-composer-prefs.c:1206
+msgid "Send immediately"
+msgstr "Odmah pošalji"
+
+#: ../modules/mail/em-composer-prefs.c:1207
+msgid "Send after 5 minutes"
+msgstr "Pošalji nakon 5 minuta"
+
+#: ../modules/mail/em-composer-prefs.c:1286
 msgid "Language(s)"
 msgstr "Jezik(ci)"
 
 # bug: requires a comment on usage
 # slično kao za mesece i nedelje
-#: ../modules/mail/em-mailer-prefs.c:80
+#: ../modules/mail/em-mailer-prefs.c:79
 msgid "On exit, every time"
 msgstr "Pri izlasku, svaki put"
 
 # bug: requires a comment on usage
+#: ../modules/mail/em-mailer-prefs.c:80
+msgid "Once per day"
+msgstr "Jednom tokom dana"
+
+# bug: requires a comment on usage
 #: ../modules/mail/em-mailer-prefs.c:81
-msgid "On exit, once per day"
-msgstr "Pri izlasku, jednom dnevno"
+msgid "Once per week"
+msgstr "Jednom tokom nedelje"
 
 # bug: requires a comment on usage
 #: ../modules/mail/em-mailer-prefs.c:82
-msgid "On exit, once per week"
-msgstr "Pri izlasku, jednom nedeljeno"
+msgid "Once per month"
+msgstr "Jednom tokom meseca"
 
-# bug: requires a comment on usage
 #: ../modules/mail/em-mailer-prefs.c:83
-msgid "On exit, once per month"
-msgstr "Pri izlasku, jednom mesečno"
-
-#: ../modules/mail/em-mailer-prefs.c:84
 msgid "Immediately, on folder leave"
 msgstr "Odmah, pri napuštanju fascikle"
 
-#: ../modules/mail/em-mailer-prefs.c:355
+#: ../modules/mail/em-mailer-prefs.c:420
 msgid "Header"
 msgstr "Zaglavlje"
 
-#: ../modules/mail/em-mailer-prefs.c:359
+#: ../modules/mail/em-mailer-prefs.c:424
 msgid "Contains Value"
 msgstr "Sadrži vrednost"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1214
+#: ../modules/mail/em-mailer-prefs.c:1560
 msgid "_Date header:"
 msgstr "Zaglavlje _datuma:"
 
-#: ../modules/mail/em-mailer-prefs.c:1215
+#: ../modules/mail/em-mailer-prefs.c:1561
 msgid "Show _original header value"
 msgstr "Prikaži _originalnu vrednost zaglavlja"
 
@@ -19351,24 +22847,24 @@ msgstr "Da li želite da Evoluciju učinite podrazumevanim klijentom el. pošte?
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:307
+#: ../modules/mdn/evolution-mdn.c:304
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "Vaša poruka za %s na temu „%s“ na %s je pročitana."
 
 #. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:374
+#: ../modules/mdn/evolution-mdn.c:370
 #, c-format
 msgid "Delivery Notification for \"%s\""
 msgstr "Obaveštenje o prijemu za „%s“"
 
-#: ../modules/mdn/evolution-mdn.c:539
+#: ../modules/mdn/evolution-mdn.c:531
 #, 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:544
+#: ../modules/mdn/evolution-mdn.c:536
 msgid "_Notify Sender"
 msgstr "Obavesti _pošiljaoca"
 
@@ -19412,20 +22908,20 @@ msgstr "Upravnik priključaka"
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Napomena: neke izmene neće biti uključene pre ponovnog pokretanja"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:297
+#: ../modules/plugin-manager/evolution-plugin-manager.c:296
 msgid "Overview"
 msgstr "Pregled"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:366
-#: ../modules/plugin-manager/evolution-plugin-manager.c:449
+#: ../modules/plugin-manager/evolution-plugin-manager.c:365
+#: ../modules/plugin-manager/evolution-plugin-manager.c:448
 msgid "Plugin"
 msgstr "Priključak"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:487
+#: ../modules/plugin-manager/evolution-plugin-manager.c:486
 msgid "_Plugins"
 msgstr "_Priključci"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:488
+#: ../modules/plugin-manager/evolution-plugin-manager.c:487
 msgid "Enable and disable plugins"
 msgstr "Uključuje i isključuje dodatke"
 
@@ -19445,23 +22941,23 @@ msgstr "Prikaži HTML izdanje"
 msgid "Display HTML version of multipart/alternative message"
 msgstr "Prikazuje izdanje HTML-a poruke iz više delova ili neke druge"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:77
-#: ../modules/prefer-plain/plugin/config-ui.c:43
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
+#: ../modules/prefer-plain/plugin/config-ui.c:37
 msgid "Show HTML if present"
 msgstr "Prikaži HTML ako postoji"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
-#: ../modules/prefer-plain/plugin/config-ui.c:44
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:80
+#: ../modules/prefer-plain/plugin/config-ui.c:38
 msgid "Let Evolution choose the best part to show."
 msgstr "Pušta da Evolucija izabere najbolji deo za prikaz."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:81
-#: ../modules/prefer-plain/plugin/config-ui.c:47
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
+#: ../modules/prefer-plain/plugin/config-ui.c:41
 msgid "Show plain text if present"
 msgstr "Prikaži običan tekst ako postoji"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
-#: ../modules/prefer-plain/plugin/config-ui.c:48
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:84
+#: ../modules/prefer-plain/plugin/config-ui.c:42
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -19469,13 +22965,28 @@ msgstr ""
 "Prikazuje deo sa običnim tekstom, ako postoji, inače pušta da Evolucija "
 "izabere najbolji deo za prikaz."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:86
-#: ../modules/prefer-plain/plugin/config-ui.c:52
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
+#: ../modules/prefer-plain/plugin/config-ui.c:46
+#| msgid "Show plain text if present"
+msgid "Show plain text if present, or HTML source"
+msgstr "Prikaži običan tekst ako postoji, ili HTML izvor"
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:89
+#: ../modules/prefer-plain/plugin/config-ui.c:47
+#| msgid ""
+#| "Show plain text part, if present, otherwise let Evolution choose the best "
+#| "part to show."
+msgid "Show plain text part, if present, otherwise the HTML part source."
+msgstr ""
+"Prikazuje deo sa običnim tekstom, ako postoji, u suprotnom izvor HTML dela."
+
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:93
+#: ../modules/prefer-plain/plugin/config-ui.c:51
 msgid "Only ever show plain text"
 msgstr "Isključivo prikazuj običan tekst"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
-#: ../modules/prefer-plain/plugin/config-ui.c:53
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:94
+#: ../modules/prefer-plain/plugin/config-ui.c:52
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -19483,11 +22994,11 @@ msgstr ""
 "Uvek prikazuje deo sa običnim tekstom, prilažući ostale delove u poruku, po "
 "izboru."
 
-#: ../modules/prefer-plain/plugin/config-ui.c:104
+#: ../modules/prefer-plain/plugin/config-ui.c:103
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Prikaži po_tisnute HTML delove kao priloge"
 
-#: ../modules/prefer-plain/plugin/config-ui.c:126
+#: ../modules/prefer-plain/plugin/config-ui.c:125
 msgid "HTML _Mode"
 msgstr "HTML _režim"
 
@@ -19504,57 +23015,62 @@ msgstr "Model teksta"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "Pregleda poruke kao običan tekst, čak i ako sadrže HTML."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:150
+#: ../modules/spamassassin/evolution-spamassassin.c:187
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
-msgstr "Nisam uspeo da izrodim Ubicu spama (%s): "
+msgstr "Ne mogu da izrodim Ubicu spama (%s): "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:173
+#: ../modules/spamassassin/evolution-spamassassin.c:210
 msgid "Failed to stream mail message content to SpamAssassin: "
-msgstr "Nisam uspeo da pošaljem sadržaj poruke pošte do Ubice spama: "
+msgstr "Ne mogu da pošaljem sadržaj poruke pošte do Ubice spama: "
 
 # bug: plural-forms
-#: ../modules/spamassassin/evolution-spamassassin.c:192
+#: ../modules/spamassassin/evolution-spamassassin.c:229
 #, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
-msgstr "Nisam uspeo da zapišem „%s“ u Ubici spama: "
+msgstr "Ne mogu da zapišem „%s“ u Ubici spama: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:220
+#: ../modules/spamassassin/evolution-spamassassin.c:257
 msgid "Failed to read output from SpamAssassin: "
-msgstr "Nisam uspeo da pročitam izlaz iz Ubice spama: "
+msgstr "Ne mogu da pročitam izlaz iz Ubice spama: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:275
+#: ../modules/spamassassin/evolution-spamassassin.c:312
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr "Ili se Ubica spama urušio ili nije uspeo da analizira poruku pošte"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:355
+#: ../modules/spamassassin/evolution-spamassassin.c:535
 msgid "SpamAssassin Options"
 msgstr "Opcije Ubice spama"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:370
+#: ../modules/spamassassin/evolution-spamassassin.c:550
 msgid "I_nclude remote tests"
 msgstr "U_ključi mrežne provere"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:384
+#: ../modules/spamassassin/evolution-spamassassin.c:564
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "Ovo će Ubicu spama učiniti pouzdanijim , ali sporijim."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:558
+#: ../modules/spamassassin/evolution-spamassassin.c:739
+#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
 msgid "SpamAssassin"
 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"
+
 #. 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:261
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:340
+#: ../modules/startup-wizard/e-mail-config-import-page.c:260
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:339
 msgid "Importing Files"
 msgstr "Uvozim datoteke"
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:259
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:258
 msgid "Import cancelled."
 msgstr "Uvoženje je otkazano."
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:276
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:275
 msgid "Import complete."
 msgstr "Uvoženje je završeno."
 
@@ -19582,11 +23098,11 @@ msgstr "Oblikuj _kao..."
 msgid "_Other languages"
 msgstr "_Drugi jezici"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:481
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:438
 msgid "Text Highlight"
 msgstr "Isticanje teksta"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:482
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:439
 msgid "Syntax highlighting of mail parts"
 msgstr "Isticanje sadržaja delova pošte"
 
@@ -19615,10 +23131,6 @@ msgstr "_C#"
 msgid "_Cascade Style Sheet"
 msgstr "_Kaskadni stil lista"
 
-#: ../modules/text-highlight/languages.c:72
-msgid "_HTML"
-msgstr "_HTML"
-
 #: ../modules/text-highlight/languages.c:80
 msgid "_Java"
 msgstr "_Java"
@@ -19781,30 +23293,26 @@ msgid "_Prolog"
 msgstr "_Prolog"
 
 #: ../modules/text-highlight/languages.c:323
-msgid "_PostScript"
-msgstr "_Postskript"
-
-#: ../modules/text-highlight/languages.c:328
 msgid "_R"
 msgstr "_R"
 
-#: ../modules/text-highlight/languages.c:333
+#: ../modules/text-highlight/languages.c:328
 msgid "_RPM Spec"
 msgstr "_RPM navod"
 
-#: ../modules/text-highlight/languages.c:338
+#: ../modules/text-highlight/languages.c:333
 msgid "_Scala"
 msgstr "_Razmera"
 
-#: ../modules/text-highlight/languages.c:343
+#: ../modules/text-highlight/languages.c:338
 msgid "_Smalltalk"
 msgstr "_Smoltok"
 
-#: ../modules/text-highlight/languages.c:349
+#: ../modules/text-highlight/languages.c:344
 msgid "_TCSH"
 msgstr "_TCSH"
 
-#: ../modules/text-highlight/languages.c:354
+#: ../modules/text-highlight/languages.c:349
 msgid "_VHDL"
 msgstr "_VHDL"
 
@@ -19847,11 +23355,11 @@ msgstr "Prikažite delove kao kontakt adresara"
 msgid "Evolution Web Inspector"
 msgstr "Nadzornik veba Evolucije"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:122
+#: ../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:584
+#: ../plugins/attachment-reminder/attachment-reminder.c:484
 #: ../plugins/templates/templates.c:478
 msgid "Keywords"
 msgstr "Ključne reči"
@@ -19884,35 +23392,35 @@ msgstr "Podsetnik priloga"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "Podseća kada zaboravite da dodate prilog u poruku."
 
-#: ../plugins/bbdb/bbdb.c:636 ../plugins/bbdb/bbdb.c:645
+#: ../plugins/bbdb/bbdb.c:724 ../plugins/bbdb/bbdb.c:835
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatski kontakti"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:660
+#: ../plugins/bbdb/bbdb.c:739
 msgid "Create _address book entries when sending mails"
 msgstr "Napravi unose u _adresar pri slanju pošte"
 
-#: ../plugins/bbdb/bbdb.c:667
+#: ../plugins/bbdb/bbdb.c:749
 msgid "Select Address book for Automatic Contacts"
 msgstr "Izaberi adresar za Automatske kontakte"
 
-#: ../plugins/bbdb/bbdb.c:684
+#: ../plugins/bbdb/bbdb.c:769
 msgid "Instant Messaging Contacts"
 msgstr "Kontakti trenutnih poruka"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:784
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "_Usklađuje slike i podatke kontakta sa listom drugara iz Pidžina"
 
-#: ../plugins/bbdb/bbdb.c:706
+#: ../plugins/bbdb/bbdb.c:794
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Bira adresar za listu prijatelja Pidžina"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:719
+#: ../plugins/bbdb/bbdb.c:810
 msgid "Synchronize with _buddy list now"
 msgstr "Uskladi sa _listom drugara sada"
 
@@ -19998,12 +23506,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "Ništa"
 
-#: ../plugins/email-custom-header/email-custom-header.c:538
+#: ../plugins/email-custom-header/email-custom-header.c:539
 msgid "_Custom Header"
 msgstr "_Prilagođeno zaglavlje"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the 
format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:808
+#: ../plugins/email-custom-header/email-custom-header.c:809
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -20011,11 +23519,11 @@ msgstr ""
 "Format za navođenje ključa prilagođenog zaglavlja je:\n"
 "Vrednosti naziv ključa prilagođenog zaglavlja su razdvojeni sa „;“."
 
-#: ../plugins/email-custom-header/email-custom-header.c:861
+#: ../plugins/email-custom-header/email-custom-header.c:862
 msgid "Key"
 msgstr "Ključ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:878
+#: ../plugins/email-custom-header/email-custom-header.c:879
 #: ../plugins/templates/templates.c:487
 msgid "Values"
 msgstr "Vrednosti"
@@ -20049,8 +23557,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:417
-#: ../plugins/external-editor/external-editor.c:419
+#: ../plugins/external-editor/external-editor.c:530
+#: ../plugins/external-editor/external-editor.c:532
 msgid "Compose in External Editor"
 msgstr "Sastavlja u spoljnom uređivaču"
 
@@ -20098,23 +23606,27 @@ msgstr ""
 "Pokrenut je spoljni uređivač. Prozor sastavljača poruke nije moguće zatvoriti "
 "dok je aktivan uređivač."
 
-#: ../plugins/face/face.c:288
+#: ../plugins/face/face.c:294
 msgid "Select a Face Picture"
 msgstr "Izaberite sliku lica"
 
-#: ../plugins/face/face.c:298
+#: ../plugins/face/face.c:304
 msgid "Image files"
 msgstr "Datoteke slika"
 
-#: ../plugins/face/face.c:357
+#: ../plugins/face/face.c:392
 msgid "_Insert Face picture by default"
 msgstr "_Unapred umetni sliku kontakta"
 
-#: ../plugins/face/face.c:370
+#: ../plugins/face/face.c:405
 msgid "Load new _Face picture"
 msgstr "Učitaj novu _sliku kontakta"
 
-#: ../plugins/face/face.c:431
+#: ../plugins/face/face.c:449
+msgid "Change Face Image"
+msgstr "Menja postojeću sliku kontakta"
+
+#: ../plugins/face/face.c:537
 msgid "Include _Face"
 msgstr "Uključi _sliku"
 
@@ -20135,75 +23647,93 @@ msgid "Invalid Image Size"
 msgstr "Neispravna veličina slike"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:4
-msgid "Please select an image of size 48 * 48"
-msgstr "Izaberite sliku veličine 48 * 48"
+msgid ""
+"Please select a PNG image of size 48 * 48 pixels, whose file size doesn't "
+"exceed 723 bytes."
+msgstr ""
+"Izaberite PNG sliku od 48x48 piksela, čija veličina ne prelazi 723 bajta."
 
 #: ../plugins/face/org-gnome-face.error.xml.h:5
-msgid "Not an image"
-msgstr "Nije slika"
+msgid "Incorrect Face Image Byte Size"
+msgstr "Neispravna veličina slike u bajtima"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:6
-msgid "The file you selected does not look like a valid .png image. Error: {0}"
+msgid ""
+"The Face image size is {0} bytes, while it should not be more than 723 "
+"bytes. Please select a PNG image of size 48 * 48 pixels, whose file size "
+"doesn't exceed 723 bytes."
 msgstr ""
-"Izabrana datoteka izgleda da nije slika ispravnog „.png“ formata. Greška: {0}"
+"Veličina slike za kontakt je {0} bajta, iako ona ne sme biti veća od 723 "
+"bajta. Izaberite PNG sliku od 48x48 piksela, čina veličina ne prelazi 723 "
+"bajta."
 
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
-msgid "Inline Image"
-msgstr "Unutrašnja slika"
+#: ../plugins/face/org-gnome-face.error.xml.h:7
+msgid "Not an image"
+msgstr "Nije slika"
 
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
-msgid "View image attachments directly in mail messages."
-msgstr "Pregledajte priloge sa slikama direktno u porukama."
+#: ../plugins/face/org-gnome-face.error.xml.h:8
+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:364
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
 msgid "Get List _Archive"
 msgstr "Pribavi _arhivu liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
 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:371
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
+#| msgid "_Message Source"
+msgid "Copy _Message Archive URL"
+msgstr "Umnoži adresu arhive _poruke"
+
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
+#| msgid "Redirect (bounce) the selected message to someone"
+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
 msgid "Get List _Usage Information"
 msgstr "Pribavi podatke o _korišćenju liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:396
 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:378
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:401
 msgid "Contact List _Owner"
 msgstr "_Vlasnik kontakt liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:403
 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:385
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:408
 msgid "_Post Message to List"
 msgstr "_Pošalji poruku na listu"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:410
 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:392
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:415
 msgid "_Subscribe to List"
 msgstr "Pri_javi se na listu"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:417
 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:399
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:422
 msgid "_Unsubscribe from List"
 msgstr "O_djavi se sa liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:401
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:424
 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:408
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:431
 msgid "Mailing _List"
 msgstr "Dopisna _lista"
 
@@ -20292,8 +23822,8 @@ msgstr ""
 "\n"
 "Zaglavlje: {0}"
 
-#: ../plugins/mail-notification/mail-notification.c:382
-#: ../plugins/mail-notification/mail-notification.c:418
+#: ../plugins/mail-notification/mail-notification.c:400
+#: ../plugins/mail-notification/mail-notification.c:436
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -20304,55 +23834,55 @@ msgstr[3] "Primili ste novu poruku."
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../plugins/mail-notification/mail-notification.c:393
+#: ../plugins/mail-notification/mail-notification.c:411
 #, c-format
 msgid "From: %s"
 msgstr "Šalje: %s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:407
+#: ../plugins/mail-notification/mail-notification.c:425
 #, c-format
 msgid "Subject: %s"
 msgstr "Naslov: %s"
 
 # shell:noshell-reason title
-#: ../plugins/mail-notification/mail-notification.c:424
+#: ../plugins/mail-notification/mail-notification.c:442
 msgid "New email in Evolution"
 msgstr "Nova pošta u Evoluciji"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:459
+#: ../plugins/mail-notification/mail-notification.c:483
 #, c-format
 msgid "Show %s"
 msgstr "Prikaži %s"
 
-#: ../plugins/mail-notification/mail-notification.c:661
+#: ../plugins/mail-notification/mail-notification.c:687
 msgid "_Play sound when a new message arrives"
 msgstr "Zvučno _obavesti kada stigne nova poruka"
 
-#: ../plugins/mail-notification/mail-notification.c:693
+#: ../plugins/mail-notification/mail-notification.c:719
 msgid "_Beep"
 msgstr "_Zapišti"
 
-#: ../plugins/mail-notification/mail-notification.c:706
+#: ../plugins/mail-notification/mail-notification.c:732
 msgid "Use sound _theme"
 msgstr "Koristi zvuk _teme"
 
-#: ../plugins/mail-notification/mail-notification.c:725
+#: ../plugins/mail-notification/mail-notification.c:751
 msgid "Play _file:"
 msgstr "Pusti zvučnu _datoteku:"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:760
 msgid "Select sound file"
 msgstr "Izaberite zvučnu datoteku"
 
-#: ../plugins/mail-notification/mail-notification.c:790
+#: ../plugins/mail-notification/mail-notification.c:837
 msgid "Notify new messages for _Inbox only"
 msgstr "Obavesti o novim porukama samo za _Sanduče"
 
-#: ../plugins/mail-notification/mail-notification.c:800
+#: ../plugins/mail-notification/mail-notification.c:853
 msgid "Show _notification when a new message arrives"
 msgstr "Prikaži _obaveštenje kada pristigne nova poruka"
 
@@ -20365,12 +23895,30 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Obaveštava vas kada stigne nova poruka."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john doe myco example>"
-#: ../plugins/mail-to-task/mail-to-task.c:229
+#: ../plugins/mail-to-task/mail-to-task.c:196
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Sačinjeno iz poruke koju šalje %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:613
+#. Translators: Dialog button to Cancel edit of an existing event/memo/task
+#: ../plugins/mail-to-task/mail-to-task.c:561
+msgctxt "mail-to-task"
+msgid "_Cancel"
+msgstr "_Otkaži"
+
+#. Translators: Dialog button to Edit an existing event/memo/task
+#: ../plugins/mail-to-task/mail-to-task.c:563
+msgctxt "mail-to-task"
+msgid "_Edit"
+msgstr "_Uređivanje"
+
+#. Translators: Dialog button to create a New event/memo/task
+#: ../plugins/mail-to-task/mail-to-task.c:565
+msgctxt "mail-to-task"
+msgid "_New"
+msgstr "_Novi"
+
+#: ../plugins/mail-to-task/mail-to-task.c:583
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -20379,7 +23927,7 @@ msgstr ""
 "Izabrani kalendar već sadrži događaj „%s“. Želite li da uredite stari "
 "događaj?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:616
+#: ../plugins/mail-to-task/mail-to-task.c:586
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -20387,7 +23935,7 @@ msgid ""
 msgstr ""
 "Izabrani spisak već sadrži zadatak „%s“. Želite li da uredite stari zadatak?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:619
+#: ../plugins/mail-to-task/mail-to-task.c:589
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -20395,7 +23943,7 @@ msgid ""
 msgstr ""
 "Izabrani spisak već sadrži belešku „%s“. Želite li da uredite staru belešku?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:639
+#: ../plugins/mail-to-task/mail-to-task.c:609
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -20416,7 +23964,7 @@ msgstr[3] ""
 "Izabrali ste %d pošta da prevedete u događaje. Da li zaista želite sve da ih "
 "dodate?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:646
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -20437,7 +23985,7 @@ msgstr[3] ""
 "Izabrali ste %d pošta da prevedete u zadatke. Da li zaista želite sve da ih "
 "dodate?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:653
+#: ../plugins/mail-to-task/mail-to-task.c:623
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -20458,29 +24006,29 @@ msgstr[3] ""
 "Izabrali ste %d pošta da prevedete u beleške. Da li zaista želite sve da ih "
 "dodate?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:674
+#: ../plugins/mail-to-task/mail-to-task.c:644
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Da li želite da nastavite sa prevođenjem preostalih pošta?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:750
+#: ../plugins/mail-to-task/mail-to-task.c:720
 msgid "[No Summary]"
 msgstr "[Bez sažetka]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:763
+#: ../plugins/mail-to-task/mail-to-task.c:733
 msgid "Invalid object returned from a server"
 msgstr "Neispravan objekat vraćen sa servera"
 
-#: ../plugins/mail-to-task/mail-to-task.c:818
+#: ../plugins/mail-to-task/mail-to-task.c:787
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Došlo je do greške u obradi: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:852
+#: ../plugins/mail-to-task/mail-to-task.c:823
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Ne mogu da otvorim kalendar. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:856
+#: ../plugins/mail-to-task/mail-to-task.c:827
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -20488,7 +24036,7 @@ msgstr ""
 "Izabrani kalendar je samo za čitanje, stoga ne možete napraviti događaj. "
 "Izaberite drugi kalendar."
 
-#: ../plugins/mail-to-task/mail-to-task.c:859
+#: ../plugins/mail-to-task/mail-to-task.c:830
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
@@ -20496,7 +24044,7 @@ msgstr ""
 "Izabrani spisak zadataka je samo za čitanje, stoga ne možete napraviti "
 "zadatak. Izaberite drugi spisak zadataka."
 
-#: ../plugins/mail-to-task/mail-to-task.c:862
+#: ../plugins/mail-to-task/mail-to-task.c:833
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
@@ -20504,35 +24052,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:1261
+#: ../plugins/mail-to-task/mail-to-task.c:1235
 msgid "Create an _Appointment"
 msgstr "Napravi _zakazivanje"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1263
+#: ../plugins/mail-to-task/mail-to-task.c:1237
 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:1268
+#: ../plugins/mail-to-task/mail-to-task.c:1242
 msgid "Create a Mem_o"
 msgstr "Napravi belešk_u"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1270
+#: ../plugins/mail-to-task/mail-to-task.c:1244
 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:1275
+#: ../plugins/mail-to-task/mail-to-task.c:1249
 msgid "Create a _Task"
 msgstr "Napravi _zadatak"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1277
+#: ../plugins/mail-to-task/mail-to-task.c:1251
 msgid "Create a new task from the selected message"
 msgstr "Pravi novi zadatak od izabrane poruke"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1285
+#: ../plugins/mail-to-task/mail-to-task.c:1259
 msgid "Create a _Meeting"
 msgstr "Napravi _sastanak"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1287
+#: ../plugins/mail-to-task/mail-to-task.c:1261
 msgid "Create a new meeting from the selected message"
 msgstr "Pravi novi sastanak od izabrane poruke"
 
@@ -20540,18 +24088,20 @@ msgstr "Pravi novi sastanak od izabrane poruke"
 msgid "Convert a mail message to a task."
 msgstr "Pretvara poruku u zadatak."
 
+#: ../plugins/pst-import/evolution-pst.metainfo.xml.in.h:1
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:1
 msgid "Outlook PST import"
 msgstr "Autluk PST uvoz"
 
-#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
-msgid "Outlook personal folders (.pst)"
-msgstr "Lične fascikle Autluka (.pst)"
-
+#: ../plugins/pst-import/evolution-pst.metainfo.xml.in.h:2
 #: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:3
 msgid "Import Outlook messages from PST file"
 msgstr "Uvozi Autluk poruke iz PST datoteke"
 
+#: ../plugins/pst-import/org-gnome-pst-import.eplug.xml.h:2
+msgid "Outlook personal folders (.pst)"
+msgstr "Lične fascikle Autluka (.pst)"
+
 #: ../plugins/pst-import/pst-importer.c:526
 msgid "_Mail"
 msgstr "_Pošta"
@@ -20613,25 +24163,20 @@ msgstr "Objavljivanje na %s je uspešno završeno"
 #: ../plugins/publish-calendar/publish-calendar.c:290
 #, c-format
 msgid "Mount of %s failed:"
-msgstr "Nisam uspeo da montiram %s:"
+msgstr "Ne mogu da montiram %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:655
-#: ../plugins/publish-calendar/publish-calendar.ui.h:35
-msgid "E_nable"
-msgstr "O_mogući"
-
-#: ../plugins/publish-calendar/publish-calendar.c:805
+#: ../plugins/publish-calendar/publish-calendar.c:789
 msgid "Are you sure you want to remove this location?"
 msgstr "Sigurno želite da uklonite ovu lokaciju?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1142
+#: ../plugins/publish-calendar/publish-calendar.c:1097
 msgid "Could not create publish thread."
 msgstr "Ne mogu da objavim raspravu."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1152
+#: ../plugins/publish-calendar/publish-calendar.c:1107
 msgid "_Publish Calendar Information"
 msgstr "Objavi raspored iz _kalendara"
 
@@ -20712,6 +24257,7 @@ msgid "_Username:"
 msgstr "_Korisničko ime:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:29
+#: ../smime/gui/certificate-manager.c:774
 msgid "_Password:"
 msgstr "_Lozinka:"
 
@@ -20723,8 +24269,8 @@ msgstr "_Zapamti lozinku"
 msgid "Publishing Location"
 msgstr "Mesto objavljivanja"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:99
-#: ../plugins/publish-calendar/publish-format-ical.c:102
+#: ../plugins/publish-calendar/publish-format-fb.c:84
+#: ../plugins/publish-calendar/publish-format-ical.c:104
 #, c-format
 msgid "Invalid source UID '%s'"
 msgstr "Neispravan JIB izvora „%s“"
@@ -20744,10 +24290,6 @@ msgstr "Izmenite mesto"
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:374
-msgid "UID"
-msgstr "JIB"
-
 #: ../plugins/save-calendar/csv-format.c:376
 msgid "Description List"
 msgstr "Spisak opisa"
@@ -20816,7 +24358,7 @@ msgstr "_Obavij vrednosti sa:"
 msgid "Comma separated values (.csv)"
 msgstr "Vrednosti razdvojene zarezom (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:183 ../shell/e-shell-utils.c:177
+#: ../plugins/save-calendar/ical-format.c:183 ../shell/e-shell-utils.c:179
 msgid "iCalendar (.ics)"
 msgstr "iKalendar (.ics)"
 
@@ -20841,16 +24383,15 @@ msgstr "%FT%T"
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:120
+#: ../plugins/save-calendar/save-calendar.c:119
 msgid "_Format:"
 msgstr "_Format:"
 
-#: ../plugins/save-calendar/save-calendar.c:186
+#: ../plugins/save-calendar/save-calendar.c:184
 msgid "Select destination file"
 msgstr "Izaberite odredišnu datoteku"
 
-#: ../plugins/save-calendar/save-calendar.c:190
-#| msgid "_Save"
+#: ../plugins/save-calendar/save-calendar.c:188
 msgid "_Save As"
 msgstr "_Sačuvaj kao"
 
@@ -20876,34 +24417,54 @@ msgstr ""
 "$ORIG[tema], $ORIG[šalje], $ORIG[prima] or $ORIG[poruka], koje će biti "
 "zamenjene vrednostima iz el. pošte na koju odgovarate."
 
-#: ../plugins/templates/templates.c:1146
+#: ../plugins/templates/templates.c:1245
 msgid "No Title"
 msgstr "Bez zvanja"
 
-#: ../plugins/templates/templates.c:1255
+#: ../plugins/templates/templates.c:1354
 msgid "Save as _Template"
 msgstr "Sačuvaj kao _šablon"
 
-#: ../plugins/templates/templates.c:1257
+#: ../plugins/templates/templates.c:1356
 msgid "Save as Template"
 msgstr "Čuva kao šablon"
 
-#: ../shell/e-shell.c:302
+#: ../shell/e-shell.c:380
 msgid "Preparing to go offline..."
 msgstr "Pripremam se za rad van mreže..."
 
-#: ../shell/e-shell.c:355
+#: ../shell/e-shell.c:409
 msgid "Preparing to go online..."
 msgstr "Pripremam se za rad na mreži..."
 
-#: ../shell/e-shell.c:436
+#: ../shell/e-shell.c:520
 msgid "Preparing to quit"
 msgstr "Pripremam se da izađem"
 
-#: ../shell/e-shell.c:442
+#: ../shell/e-shell.c:526
 msgid "Preparing to quit..."
 msgstr "Pripremam se da izađem..."
 
+#: ../shell/e-shell.c:1043
+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
+msgid "New _Window"
+msgstr "Novi _prozor"
+
+#: ../shell/e-shell.c:1222
+msgid "Quick _Reference"
+msgstr "Kratak _podsetnik"
+
+#: ../shell/e-shell.c:1224 ../shell/e-shell-window-actions.c:764
+msgid "_About"
+msgstr "_O programu"
+
+#: ../shell/e-shell.c:1225 ../shell/e-shell-window-actions.c:862
+msgid "_Quit"
+msgstr "_Izađi"
+
 #: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
 msgid "Searches"
 msgstr "Pretrage"
@@ -20916,38 +24477,34 @@ msgstr "Sačuvaj pretragu"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:937
+#: ../shell/e-shell-searchbar.c:926
 msgid "Sho_w:"
 msgstr "Prika_ži:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:962
+#: ../shell/e-shell-searchbar.c:951
 msgid "Sear_ch:"
 msgstr "P_retraži:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1030
+#: ../shell/e-shell-searchbar.c:1019
 msgid "i_n"
 msgstr " _u "
 
-#: ../shell/e-shell-utils.c:174
+#: ../shell/e-shell-utils.c:176
 msgid "vCard (.vcf)"
 msgstr "vKarta (.vcf)"
 
-#: ../shell/e-shell-utils.c:198
+#: ../shell/e-shell-utils.c:200
 msgid "All Files (*)"
 msgstr "Sve datoteke (*)"
 
-#: ../shell/e-shell-view.c:291
-msgid "Saving user interface state"
-msgstr "Čuvam stanje korisničkog sučelja"
-
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:73
+#: ../shell/e-shell-utils.c:409
 msgid "translator-credits"
 msgstr ""
 "Igor Nestorović <igor prevod org>\n"
@@ -20956,290 +24513,289 @@ msgstr ""
 "\n"
 "http://prevod.org — prevod na srpski jezik."
 
-#: ../shell/e-shell-window-actions.c:84
+#: ../shell/e-shell-utils.c:420
 msgid "Evolution Website"
 msgstr "Veb stranica Evolucije"
 
-#: ../shell/e-shell-window-actions.c:340
+#: ../shell/e-shell-view.c:292
+msgid "Saving user interface state"
+msgstr "Čuvam stanje korisničkog sučelja"
+
+#: ../shell/e-shell-window-actions.c:277
 msgid "Categories Editor"
 msgstr "Uređivač kategorija"
 
-#: ../shell/e-shell-window-actions.c:716
+#: ../shell/e-shell-window-actions.c:585
 msgid "Bug Buddy is not installed."
 msgstr "Bubaždajin pomoćnik nije instaliran."
 
-#: ../shell/e-shell-window-actions.c:717
+#: ../shell/e-shell-window-actions.c:586
 msgid "Bug Buddy could not be run."
 msgstr "Bubaždajin pomoćnik ne može biti pokrenut."
 
-#: ../shell/e-shell-window-actions.c:895
-msgid "_About"
-msgstr "_O programu"
-
-#: ../shell/e-shell-window-actions.c:897
+#: ../shell/e-shell-window-actions.c:766
 msgid "Show information about Evolution"
 msgstr "Prikazuje podatke o Evoluciji"
 
-#: ../shell/e-shell-window-actions.c:902 ../shell/e-shell-window-actions.c:916
+#: ../shell/e-shell-window-actions.c:771 ../shell/e-shell-window-actions.c:785
 msgid "_Close Window"
 msgstr "_Zatvori prozor"
 
-#: ../shell/e-shell-window-actions.c:923
+#: ../shell/e-shell-window-actions.c:792
 msgid "_Contents"
 msgstr "_Sadržaj"
 
-#: ../shell/e-shell-window-actions.c:925
+#: ../shell/e-shell-window-actions.c:794
 msgid "Open the Evolution User Guide"
 msgstr "Otvorite korisničko uputstvo Evolucije"
 
-#: ../shell/e-shell-window-actions.c:951
+#: ../shell/e-shell-window-actions.c:820
 msgid "I_mport..."
 msgstr "_Uvezi..."
 
-#: ../shell/e-shell-window-actions.c:953
+#: ../shell/e-shell-window-actions.c:822
 msgid "Import data from other programs"
 msgstr "Uvezite podatke iz drugih programa"
 
-#: ../shell/e-shell-window-actions.c:958
-msgid "New _Window"
-msgstr "Novi _prozor"
-
-#: ../shell/e-shell-window-actions.c:960
+#: ../shell/e-shell-window-actions.c:829
 msgid "Create a new window displaying this view"
 msgstr "Otvorite nov prozor za prikaz ovog pregleda"
 
-#: ../shell/e-shell-window-actions.c:972
+#: ../shell/e-shell-window-actions.c:841
 msgid "Available Cate_gories"
 msgstr "Dostupne _kategorije"
 
-#: ../shell/e-shell-window-actions.c:974
+#: ../shell/e-shell-window-actions.c:843
 msgid "Manage available categories"
 msgstr "Upravljajte dostupnim kategorijama"
 
-#: ../shell/e-shell-window-actions.c:986
+#: ../shell/e-shell-window-actions.c:855
 msgid "_Quick Reference"
 msgstr "_Kratak podsetnik"
 
-#: ../shell/e-shell-window-actions.c:988
+#: ../shell/e-shell-window-actions.c:857
 msgid "Show Evolution's shortcut keys"
 msgstr "Prikažite prečice tastature Evolucije"
 
-#: ../shell/e-shell-window-actions.c:993
-#| msgid "Quit"
-msgid "_Quit"
-msgstr "_Izađi"
-
-#: ../shell/e-shell-window-actions.c:995
+#: ../shell/e-shell-window-actions.c:864
 msgid "Exit the program"
 msgstr "Izađite iz programa"
 
-#: ../shell/e-shell-window-actions.c:1000
+#: ../shell/e-shell-window-actions.c:869
 msgid "_Advanced Search..."
 msgstr "_Napredna pretraga..."
 
-#: ../shell/e-shell-window-actions.c:1002
+#: ../shell/e-shell-window-actions.c:871
 msgid "Construct a more advanced search"
 msgstr "Obrazujte napredniju pretragu"
 
-#: ../shell/e-shell-window-actions.c:1009
+#: ../shell/e-shell-window-actions.c:878
 msgid "Clear the current search parameters"
 msgstr "Očistite parametre trenutne pretrage"
 
-#: ../shell/e-shell-window-actions.c:1014
+#: ../shell/e-shell-window-actions.c:883
 msgid "_Edit Saved Searches..."
 msgstr "_Uredi sačuvane pretrage..."
 
-#: ../shell/e-shell-window-actions.c:1016
+#: ../shell/e-shell-window-actions.c:885
 msgid "Manage your saved searches"
 msgstr "Upravljajte vašim sačuvanim pretragama"
 
-#: ../shell/e-shell-window-actions.c:1023
+#: ../shell/e-shell-window-actions.c:892
 msgid "Click here to change the search type"
 msgstr "Kliknite ovde da promenite vrstu pretrage"
 
-#: ../shell/e-shell-window-actions.c:1028
+#: ../shell/e-shell-window-actions.c:897
 msgid "_Find Now"
 msgstr "Pro_nađi sada"
 
-#: ../shell/e-shell-window-actions.c:1030
+#: ../shell/e-shell-window-actions.c:899
 msgid "Execute the current search parameters"
 msgstr "Izvršite parametre trenutne pretrage"
 
-#: ../shell/e-shell-window-actions.c:1035
+#: ../shell/e-shell-window-actions.c:904
 msgid "_Save Search..."
 msgstr "_Sačuvaj pretragu..."
 
-#: ../shell/e-shell-window-actions.c:1037
+#: ../shell/e-shell-window-actions.c:906
 msgid "Save the current search parameters"
 msgstr "Sačuvajte parametre trenutne pretrage"
 
-#: ../shell/e-shell-window-actions.c:1049
+#: ../shell/e-shell-window-actions.c:918
 msgid "Submit _Bug Report..."
 msgstr "Pošalji izveštaj o _grešci..."
 
-#: ../shell/e-shell-window-actions.c:1051
+#: ../shell/e-shell-window-actions.c:920
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Pošaljite izveštaj o grešci Bubaždajinim pomoćnikom"
 
-#: ../shell/e-shell-window-actions.c:1056
+#: ../shell/e-shell-window-actions.c:925
 msgid "_Work Offline"
 msgstr "Rad _van mreže"
 
-#: ../shell/e-shell-window-actions.c:1058
+#: ../shell/e-shell-window-actions.c:927
 msgid "Put Evolution into offline mode"
 msgstr "Postavite Evoluciju u rad van mreže"
 
-#: ../shell/e-shell-window-actions.c:1063
+#: ../shell/e-shell-window-actions.c:932
 msgid "_Work Online"
 msgstr "_Rad na mreži"
 
-#: ../shell/e-shell-window-actions.c:1065
+#: ../shell/e-shell-window-actions.c:934
 msgid "Put Evolution into online mode"
 msgstr "Postavite Evoluciju u rad na mreži"
 
-#: ../shell/e-shell-window-actions.c:1093
+#: ../shell/e-shell-window-actions.c:962
 msgid "Lay_out"
 msgstr "_Raspored"
 
-#: ../shell/e-shell-window-actions.c:1107
+#. Translators: This is a New menu item caption, under File->New
+#: ../shell/e-shell-window-actions.c:970
+msgid "_New"
+msgstr "_Novo"
+
+#: ../shell/e-shell-window-actions.c:977
 msgid "_Search"
 msgstr "Pre_traži"
 
-#: ../shell/e-shell-window-actions.c:1114
+#: ../shell/e-shell-window-actions.c:984
 msgid "_Switcher Appearance"
 msgstr "_Izgled prebacivača"
 
-#: ../shell/e-shell-window-actions.c:1128
+#: ../shell/e-shell-window-actions.c:998
 msgid "_Window"
 msgstr "Pro_zor"
 
-#: ../shell/e-shell-window-actions.c:1157
+#: ../shell/e-shell-window-actions.c:1027
 msgid "Show Side _Bar"
 msgstr "Prikaži _bočnu površ"
 
-#: ../shell/e-shell-window-actions.c:1159
+#: ../shell/e-shell-window-actions.c:1029
 msgid "Show the side bar"
 msgstr "Prikažite bočnu površ"
 
-#: ../shell/e-shell-window-actions.c:1165
+#: ../shell/e-shell-window-actions.c:1035
 msgid "Show _Buttons"
 msgstr "Prikaži _dugmad"
 
-#: ../shell/e-shell-window-actions.c:1167
+#: ../shell/e-shell-window-actions.c:1037
 msgid "Show the switcher buttons"
 msgstr "Prikažite dugmad prebacivača"
 
-#: ../shell/e-shell-window-actions.c:1173
+#: ../shell/e-shell-window-actions.c:1043
 msgid "Show _Status Bar"
 msgstr "Prikaži traku _stanja"
 
-#: ../shell/e-shell-window-actions.c:1175
+#: ../shell/e-shell-window-actions.c:1045
 msgid "Show the status bar"
 msgstr "Prikažite traku stanja"
 
-#: ../shell/e-shell-window-actions.c:1181
+#: ../shell/e-shell-window-actions.c:1051
 msgid "Show _Tool Bar"
 msgstr "Prikaži traku _alata"
 
-#: ../shell/e-shell-window-actions.c:1183
+#: ../shell/e-shell-window-actions.c:1053
 msgid "Show the tool bar"
 msgstr "Prikažite traku alata"
 
-#: ../shell/e-shell-window-actions.c:1205
+#: ../shell/e-shell-window-actions.c:1075
 msgid "_Icons Only"
 msgstr "Samo _ikonice"
 
-#: ../shell/e-shell-window-actions.c:1207
+#: ../shell/e-shell-window-actions.c:1077
 msgid "Display window buttons with icons only"
 msgstr "Prikažite dugmad prozora samo sa ikonicama"
 
-#: ../shell/e-shell-window-actions.c:1212
+#: ../shell/e-shell-window-actions.c:1082
 msgid "_Text Only"
 msgstr "Samo _tekst"
 
-#: ../shell/e-shell-window-actions.c:1214
+#: ../shell/e-shell-window-actions.c:1084
 msgid "Display window buttons with text only"
 msgstr "Prikažite dugmad prozora samo sa tekstom"
 
-#: ../shell/e-shell-window-actions.c:1219
+#: ../shell/e-shell-window-actions.c:1089
 msgid "Icons _and Text"
 msgstr "Ikonice _i tekst"
 
-#: ../shell/e-shell-window-actions.c:1221
+#: ../shell/e-shell-window-actions.c:1091
 msgid "Display window buttons with icons and text"
 msgstr "Prikažite dugmad prozora sa ikonicama i tekstom"
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1096
 msgid "Tool_bar Style"
 msgstr "Stil tra_ke alata"
 
-#: ../shell/e-shell-window-actions.c:1228
+#: ../shell/e-shell-window-actions.c:1098
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Prikažite dugmad prozora koristeći podešavanja trake alata radne površi"
 
-#: ../shell/e-shell-window-actions.c:1236
+#: ../shell/e-shell-window-actions.c:1106
 msgid "Delete Current View"
 msgstr "Obriši trenutni pregled"
 
-#: ../shell/e-shell-window-actions.c:1243
+#: ../shell/e-shell-window-actions.c:1113
 msgid "Save Custom View..."
 msgstr "Sačuvaj prilagođen pregled..."
 
-#: ../shell/e-shell-window-actions.c:1245
+#: ../shell/e-shell-window-actions.c:1115
 msgid "Save current custom view"
 msgstr "Sačuvajte trenutni korisnički pregled"
 
-#: ../shell/e-shell-window-actions.c:1252
+#: ../shell/e-shell-window-actions.c:1122
 msgid "C_urrent View"
 msgstr "T_renutni pregled"
 
-#: ../shell/e-shell-window-actions.c:1262
+#: ../shell/e-shell-window-actions.c:1132
 msgid "Custom View"
 msgstr "Prilagođen pregled"
 
-#: ../shell/e-shell-window-actions.c:1264
+#: ../shell/e-shell-window-actions.c:1134
 msgid "Current view is a customized view"
 msgstr "Trenutan pregled je podesio korisnik"
 
-#: ../shell/e-shell-window-actions.c:1272
+#: ../shell/e-shell-window-actions.c:1142
 msgid "Page Set_up..."
 msgstr "Podešavanje _stranice..."
 
-#: ../shell/e-shell-window-actions.c:1274
+#: ../shell/e-shell-window-actions.c:1144
 msgid "Change the page settings for your current printer"
 msgstr "Izmenite postavke stranice za trenutni štampač"
 
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1507
 #, c-format
 msgid "Switch to %s"
 msgstr "Pređi na %s"
 
-#: ../shell/e-shell-window-actions.c:1758
+#: ../shell/e-shell-window-actions.c:1630
 #, c-format
 msgid "Select view: %s"
 msgstr "Izaberi pregled: %s"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1647
 #, c-format
 msgid "Delete view: %s"
 msgstr "Obriši pregled: %s"
 
-#: ../shell/e-shell-window-actions.c:1869
+#: ../shell/e-shell-window-actions.c:1748
 msgid "Execute these search parameters"
 msgstr "Izvršite ove parametre pretrage"
 
-#: ../shell/e-shell-window.c:503
+#. Translators: a 'New' toolbar button caption which is context sensitive and
+#. runs one of the actions under File->New menu
+#: ../shell/e-shell-window.c:567
+msgctxt "toolbar-button"
 msgid "New"
-msgstr "Novo"
+msgstr "Nova"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:579
+#: ../shell/e-shell-window-private.c:632
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s — Evolucija"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:182
+#: ../shell/main.c:195
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -21274,7 +24830,7 @@ msgstr ""
 "Nadamo se da ćete uživati u plodovima našeg napornog rada, i \n"
 "željno iščekujemo vaš doprinos!\n"
 
-#: ../shell/main.c:206
+#: ../shell/main.c:219
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -21282,13 +24838,13 @@ msgstr ""
 "Hvala\n"
 "Tim Evolucije\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:225
 msgid "Do not tell me again"
 msgstr "Nemoj mi ponovo reći"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:301
+#: ../shell/main.c:314
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -21296,40 +24852,40 @@ msgstr ""
 "Pokreće Evoluciju prikazujući određene komponente. Dostupne opcije su: "
 "„mail“, „calendar“, „contacts“, „tasks“ i „memos“"
 
-#: ../shell/main.c:305
+#: ../shell/main.c:318
 msgid "Apply the given geometry to the main window"
 msgstr "Primeni datu geometriju na glavni prozor"
 
-#: ../shell/main.c:309
+#: ../shell/main.c:322
 msgid "Start in online mode"
 msgstr "Počni rad na mreži"
 
-#: ../shell/main.c:311
+#: ../shell/main.c:324
 msgid "Ignore network availability"
 msgstr "Zanemari dostupnost mreže"
 
-#: ../shell/main.c:314
+#: ../shell/main.c:327
 msgid "Forcibly shut down Evolution"
 msgstr "Silom ugasi Evoluciju"
 
-#: ../shell/main.c:317
+#: ../shell/main.c:330
 msgid "Disable loading of any plugins."
 msgstr "Isključi učitavanje svih dodataka."
 
-#: ../shell/main.c:319
+#: ../shell/main.c:332
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Isključi okno za pregled pošte, kontakta i zadataka."
 
-#: ../shell/main.c:323
+#: ../shell/main.c:336
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Uvozi adrese datoteka datih kao ostatak argumenata."
 
 # shell:noshell-reason title
-#: ../shell/main.c:325
+#: ../shell/main.c:338
 msgid "Request a running Evolution process to quit"
 msgstr "Zahteva kraj pokrenutog procesa Evolucije"
 
-#: ../shell/main.c:402
+#: ../shell/main.c:415
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
@@ -21338,11 +24894,11 @@ msgstr ""
 "Ne mogu da pokrenem Evoluciju.  Drugi primerak Evolucije možda ne odgovara. "
 "Greška sistema: %s"
 
-#: ../shell/main.c:496 ../shell/main.c:501
+#: ../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"
 
-#: ../shell/main.c:568
+#: ../shell/main.c:536
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -21351,7 +24907,7 @@ msgstr ""
 "%s: „--online“ i „--offline“ se ne mogu koristiti zajedno.\n"
 "  Pokrenite „%s --help“ za više podataka.\n"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:542
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -21399,7 +24955,101 @@ msgstr ""
 "rešenje možete prvo da pokušate da nadogradite na Evoluciju 2, a zatim na "
 "Evoluciju 3."
 
-#: ../smime/gui/ca-trust-dialog.c:108
+#: ../shell/shell.error.xml.h:11
+msgid "Close Evolution with pending background operations?"
+msgstr "Da li da zatvorim Evoluciju i otkažem trenutne radnje?"
+
+#: ../shell/shell.error.xml.h:12
+msgid ""
+"Evolution is taking a long time to shut down, possibly due to network "
+"connectivity issues. Would you like to cancel all pending operations and "
+"close immediately, or keep waiting?"
+msgstr ""
+"Evoluciji treba mnogo vremena da se isključi, što ukazuje na moguće probleme "
+"u mrežnoj vezi. Da li želite da prekinem sve trenutne radne i da odmah "
+"izađem iz programa?"
+
+#: ../shell/shell.error.xml.h:13
+msgid "_Close Immediately"
+msgstr "Odmah _izađi"
+
+#: ../shell/shell.error.xml.h:14
+msgid "Keep _Waiting"
+msgstr "_Sačekaj"
+
+#: ../shell/shell.error.xml.h:15
+msgid "Failed to get values from '{0}'"
+msgstr "Ne mogu da dobijem ispravne vrednosti od „{0}“"
+
+#: ../shell/shell.error.xml.h:16
+msgid "Failed to invoke authenticate for '{0}'"
+msgstr "Ne mogu da se prijavim na „{0}“"
+
+#: ../shell/shell.error.xml.h:17
+msgid "Failed to connect '{0}'"
+msgstr "Ne mogu da se povežem na „{0}“"
+
+#: ../shell/shell.error.xml.h:18
+msgid "_Reconnect"
+msgstr "_Ponovo se poveži"
+
+#: ../shell/shell.error.xml.h:19
+msgid "Failed to connect address book '{0}'"
+msgstr "Ne mogu da se povežem na adresar „{0}“"
+
+#: ../shell/shell.error.xml.h:20
+msgid "Failed to connect calendar '{0}'"
+msgstr "Ne mogu da se povežem na kalendar „{0}“"
+
+#: ../shell/shell.error.xml.h:21
+msgid "Failed to connect mail account '{0}'"
+msgstr "Ne mogu da se povežem na nalog elektronske pošte „{0}“"
+
+#: ../shell/shell.error.xml.h:22
+msgid "Failed to connect memo list '{0}'"
+msgstr "Ne mogu da se povežem na spisa beleški „{0}“"
+
+#: ../shell/shell.error.xml.h:23
+msgid "Failed to connect task list '{0}'"
+msgstr "Ne mogu da se povežem na spisak zadataka „{0}“"
+
+#: ../shell/shell.error.xml.h:24
+msgid "Failed to prompt for credentials for '{0}'"
+msgstr "Ne mogu da zatražim punomoćje za „{0}“"
+
+#: ../shell/shell.error.xml.h:25
+msgid "Failed to finish trust prompt for '{0}'"
+msgstr "Ne mogu da završim upit poverenja za „{0}“"
+
+#: ../shell/shell.error.xml.h:26
+msgid "SSL certificate for '{0}' is not trusted."
+msgstr "SSL uverenje za „{0}“ nije od poverenja."
+
+#: ../shell/shell.error.xml.h:27
+msgid "Reason: {1}"
+msgstr "Razlog: {1}"
+
+#: ../shell/shell.error.xml.h:29
+msgid "SSL certificate for address book '{0}' is not trusted."
+msgstr "SSL uverenje za adresar „{0}“ nije od poverenja."
+
+#: ../shell/shell.error.xml.h:30
+msgid "SSL certificate for calendar '{0}' is not trusted."
+msgstr "SSL uverenje za kalendar „{0}“ nije od poverenja."
+
+#: ../shell/shell.error.xml.h:31
+msgid "SSL certificate for mail account '{0}' is not trusted."
+msgstr "SSL uverenje za nalog e-pošte „{0}“ nije od poverenja."
+
+#: ../shell/shell.error.xml.h:32
+msgid "SSL certificate for memo list '{0}' is not trusted."
+msgstr "SSL uverenje za spisak beleški „{0}“ nije od poverenja."
+
+#: ../shell/shell.error.xml.h:33
+msgid "SSL certificate for task list '{0}' is not trusted."
+msgstr "SSL uverenje za spisak zadataka „{0}“ nije od poverenja."
+
+#: ../smime/gui/ca-trust-dialog.c:106
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -21410,101 +25060,262 @@ msgstr ""
 "\n"
 "Uredite postavke poverenja:"
 
-#: ../smime/gui/certificate-manager.c:80 ../smime/gui/certificate-manager.c:99
-#: ../smime/gui/certificate-manager.c:119
+#: ../smime/gui/certificate-manager.c:84 ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:123
 msgid "Certificate Name"
 msgstr "Naziv uverenja"
 
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:85 ../smime/gui/certificate-manager.c:105
 msgid "Issued To Organization"
 msgstr "Izdato je organizaciji"
 
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:86 ../smime/gui/certificate-manager.c:106
 msgid "Issued To Organizational Unit"
 msgstr "Izdato je organizacionoj jedinici"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121
+#: ../smime/gui/certificate-manager.c:87 ../smime/gui/certificate-manager.c:107
+#: ../smime/gui/certificate-manager.c:125
 msgid "Serial Number"
 msgstr "Serijski broj"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122
+#: ../smime/gui/certificate-manager.c:88 ../smime/gui/certificate-manager.c:108
+#: ../smime/gui/certificate-manager.c:126
 msgid "Purposes"
 msgstr "Namene"
 
-#: ../smime/gui/certificate-manager.c:85
-#: ../smime/gui/certificate-manager.c:105
-#: ../smime/gui/certificate-manager.c:123
+#: ../smime/gui/certificate-manager.c:89 ../smime/gui/certificate-manager.c:109
+#: ../smime/gui/certificate-manager.c:127
 msgid "Issued By"
 msgstr "Izdavač"
 
-#: ../smime/gui/certificate-manager.c:86
-#: ../smime/gui/certificate-manager.c:106
-#: ../smime/gui/certificate-manager.c:124
+#: ../smime/gui/certificate-manager.c:90 ../smime/gui/certificate-manager.c:110
+#: ../smime/gui/certificate-manager.c:128
 msgid "Issued By Organization"
 msgstr "Izdala je organizacija"
 
-#: ../smime/gui/certificate-manager.c:87
-#: ../smime/gui/certificate-manager.c:107
-#: ../smime/gui/certificate-manager.c:125
+#: ../smime/gui/certificate-manager.c:91 ../smime/gui/certificate-manager.c:111
+#: ../smime/gui/certificate-manager.c:129
 msgid "Issued By Organizational Unit"
 msgstr "Izdala je organizaciona jedinica"
 
-#: ../smime/gui/certificate-manager.c:88
-#: ../smime/gui/certificate-manager.c:108
-#: ../smime/gui/certificate-manager.c:126
+#: ../smime/gui/certificate-manager.c:92 ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:130
 msgid "Issued"
 msgstr "Izdato"
 
-#: ../smime/gui/certificate-manager.c:89
-#: ../smime/gui/certificate-manager.c:109
-#: ../smime/gui/certificate-manager.c:127
+#: ../smime/gui/certificate-manager.c:93 ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:131
 msgid "Expires"
 msgstr "Ističe"
 
-#: ../smime/gui/certificate-manager.c:90
-#: ../smime/gui/certificate-manager.c:110
-#: ../smime/gui/certificate-manager.c:128
+#: ../smime/gui/certificate-manager.c:94 ../smime/gui/certificate-manager.c:114
+#: ../smime/gui/certificate-manager.c:132
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 otisak"
 
-#: ../smime/gui/certificate-manager.c:91
-#: ../smime/gui/certificate-manager.c:111
-#: ../smime/gui/certificate-manager.c:129
+#: ../smime/gui/certificate-manager.c:95 ../smime/gui/certificate-manager.c:115
+#: ../smime/gui/certificate-manager.c:133
 msgid "MD5 Fingerprint"
 msgstr "MD5 Otisak"
 
-#: ../smime/gui/certificate-manager.c:100
-#: ../smime/gui/certificate-manager.c:120
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:124
 msgid "Email Address"
 msgstr "Adresa el. pošte"
 
-#: ../smime/gui/certificate-manager.c:621
+#: ../smime/gui/certificate-manager.c:652
+msgid "Select a file to backup your key and certificate..."
+msgstr "Izaberite datoteku za rezervnu kopiju ključeva i uverenja..."
+
+#. To Translators:
+#. * %s-backup.p12 is the default file name suggested by the file selection dialog,
+#. * when a user wants to backup one of her/his private keys/certificates.
+#. * For example: gnomedev-backup.p12
+#.
+#: ../smime/gui/certificate-manager.c:664
+#, c-format
+msgid "%s-backup.p12"
+msgstr "%s-rezervna-kopija.p12"
+
+#: ../smime/gui/certificate-manager.c:730
+msgid "Backup Certificate"
+msgstr "Rezervna kopija uverenja"
+
+#. filename selection
+#: ../smime/gui/certificate-manager.c:744
+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
+msgid "Please select a file..."
+msgstr "Izaberite datoteku..."
+
+#: ../smime/gui/certificate-manager.c:763
+msgid "_Include certificate chain in the backup"
+msgstr "_Uključi lanac uverenja u rezervnu kopiju"
+
+#. To Translators: this text was copied from Firefox
+#: ../smime/gui/certificate-manager.c:769
+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."
+
+#: ../smime/gui/certificate-manager.c:788
+msgid "_Repeat Password:"
+msgstr "Ponovite _lozinku:"
+
+#: ../smime/gui/certificate-manager.c:807
+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
+msgid ""
+"Important:\n"
+"If you forget your certificate backup password, you will not be able to "
+"restore this backup later.\n"
+"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"
+"Zapišite je negde na sigurno mesto."
+
+#: ../smime/gui/certificate-manager.c:860
+msgid "No file name provided"
+msgstr "Nije dat naziv datoteke"
+
+#: ../smime/gui/certificate-manager.c:864
+msgid "Failed to backup key and certificate"
+msgstr "Ne mogu da napravim rezervnu kopiju ključa i uverenja"
+
+#: ../smime/gui/certificate-manager.c:953
 msgid "Select a certificate to import..."
 msgstr "Izaberite uverenje za uvoz..."
 
-#: ../smime/gui/certificate-manager.c:635
-msgid "All files"
-msgstr "Sve datoteke"
-
-#: ../smime/gui/certificate-manager.c:671
+#: ../smime/gui/certificate-manager.c:1003
 msgid "Failed to import certificate"
-msgstr "Nisam uspeo da uvezem uverenje"
+msgstr "Ne mogu da uvezem uverenje"
+
+#: ../smime/gui/certificate-manager.c:1119
+msgctxt "CamelTrust"
+msgid "Ask when used"
+msgstr "Pitaj prilikom upotrebe"
+
+#: ../smime/gui/certificate-manager.c:1121
+msgctxt "CamelTrust"
+msgid "Never"
+msgstr "Nikada"
+
+#: ../smime/gui/certificate-manager.c:1123
+msgctxt "CamelTrust"
+msgid "Marginally"
+msgstr "Ponekad"
+
+#: ../smime/gui/certificate-manager.c:1125
+msgctxt "CamelTrust"
+msgid "Fully"
+msgstr "Uvek"
+
+#: ../smime/gui/certificate-manager.c:1127
+msgctxt "CamelTrust"
+msgid "Ultimately"
+msgstr "Ultimativno"
+
+#: ../smime/gui/certificate-manager.c:1129
+msgctxt "CamelTrust"
+msgid "Temporarily"
+msgstr "Privremeno"
+
+#: ../smime/gui/certificate-manager.c:1335
+msgid "Change certificate trust"
+msgstr "Izmena poverenja za uverenje"
+
+#: ../smime/gui/certificate-manager.c:1347
+#, c-format
+msgid "Change trust for the host '%s':"
+msgstr "Izmena poverenja za udaljeni računar „%s“:"
+
+#: ../smime/gui/certificate-manager.c:1371
+msgctxt "CamelTrust"
+msgid "_Ask when used"
+msgstr "P_itaj prilikom korišćenja"
+
+#: ../smime/gui/certificate-manager.c:1372
+msgctxt "CamelTrust"
+msgid "_Never trust this certificate"
+msgstr "_Nikada ne veruj ovom uverenju"
+
+#: ../smime/gui/certificate-manager.c:1373
+msgctxt "CamelTrust"
+msgid "_Temporarily trusted (this session only)"
+msgstr "P_rivremeno poverenje (samo tokom sesije)"
+
+#: ../smime/gui/certificate-manager.c:1374
+msgctxt "CamelTrust"
+msgid "_Marginally trusted"
+msgstr "_Delimično poverenje"
+
+#: ../smime/gui/certificate-manager.c:1375
+msgctxt "CamelTrust"
+msgid "_Fully trusted"
+msgstr "_Potpuno poverenje"
+
+#: ../smime/gui/certificate-manager.c:1376
+msgctxt "CamelTrust"
+msgid "_Ultimately trusted"
+msgstr "_Neograničeno poverenje"
+
+#: ../smime/gui/certificate-manager.c:1380
+msgid ""
+"Before trusting this site, you should examine its certificate and its policy "
+"and procedures (if available)."
+msgstr ""
+"Pre verovanja ovom sajtu pregledajte njegovo uverenje, politiku i procedure "
+"(ako su dostupni)."
+
+#: ../smime/gui/certificate-manager.c:1395
+msgid "_Display certificate"
+msgstr "Prikaži _uverenje"
+
+#: ../smime/gui/certificate-manager.c:1600
+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:1053
+#: ../smime/gui/certificate-manager.c:1631
+msgid "Host name"
+msgstr "Ime udaljenog računara"
+
+#: ../smime/gui/certificate-manager.c:1633
+msgid "Issuer"
+msgstr "Izdavač"
+
+#: ../smime/gui/certificate-manager.c:1634
+msgid "Fingerprint"
+msgstr "Otisak prsta"
+
+#: ../smime/gui/certificate-manager.c:1635
+msgid "Trust"
+msgstr "Poverenje"
+
+#: ../smime/gui/certificate-manager.c:1656
+msgid "_Edit Trust"
+msgstr "_Uredi poverenje"
+
+#: ../smime/gui/certificate-manager.c:1977
 msgid "All PKCS12 files"
 msgstr "Sve PKCS12 datoteke"
 
-#: ../smime/gui/certificate-manager.c:1070
+#: ../smime/gui/certificate-manager.c:1994
 msgid "All email certificate files"
 msgstr "Sve datoteke uverenja pošte"
 
-#: ../smime/gui/certificate-manager.c:1087
+#: ../smime/gui/certificate-manager.c:2011
 msgid "All CA certificate files"
 msgstr "Sve datoteke CA uverenja"
 
@@ -21545,26 +25356,7 @@ msgstr "Unesite novu lozinku za bazu uverenja"
 msgid "Enter new password"
 msgstr "Unesite novu lozinku"
 
-#. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
-#, c-format
-msgid ""
-"Issued to:\n"
-"  Subject: %s\n"
-msgstr ""
-"Kome je izdato:\n"
-"  Naslov: %s\n"
-
-#: ../smime/gui/e-cert-selector.c:122
-#, c-format
-msgid ""
-"Issued by:\n"
-"  Subject: %s\n"
-msgstr ""
-"Izdao je:\n"
-"  Naslov: %s\n"
-
-#: ../smime/gui/e-cert-selector.c:175
+#: ../smime/gui/e-cert-selector.c:180
 msgid "Select certificate"
 msgstr "Izaberite uverenje"
 
@@ -21631,26 +25423,22 @@ msgstr ""
 "politiku i procedure (ako su dostupni)."
 
 #: ../smime/gui/smime-ui.ui.h:25
-msgid "Certificate"
-msgstr "Uverenje"
+msgid "C_ertificate:"
+msgstr "U_verenje:"
 
 #: ../smime/gui/smime-ui.ui.h:26
-msgid "Certificate details"
-msgstr "Detalji uverenja"
-
-#: ../smime/gui/smime-ui.ui.h:27
 msgid "Email Certificate Trust Settings"
 msgstr "Podešavanja poverenja u uverenja el. pošte"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Trust the authenticity of this certificate"
 msgstr "Veruj u verodostojnost ovog uverenja"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Ne veruj u verodostojnost ovog uverenja"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "_Edit CA Trust"
 msgstr "_Uredi CA poverenje"
 
@@ -21667,19 +25455,44 @@ msgstr "Potpiši"
 msgid "Encrypt"
 msgstr "Šifruj"
 
-#: ../smime/lib/e-cert-db.c:718
+#: ../smime/lib/e-cert-db.c:787
 msgid "Certificate already exists"
 msgstr "Uverenje već postoji"
 
-#: ../smime/lib/e-pkcs12.c:199
+#: ../smime/lib/e-pkcs12.c:201
 msgid "PKCS12 File Password"
 msgstr "PKCS12 lozinka datoteke"
 
-#: ../smime/lib/e-pkcs12.c:200
+#: ../smime/lib/e-pkcs12.c:202
 msgid "Enter password for PKCS12 file:"
 msgstr "Unesite lozinku za PKCS12 datoteku:"
 
-#: ../smime/lib/e-pkcs12.c:307
+#: ../smime/lib/e-pkcs12.c:328
+#, c-format
+msgid "Unable to create export context, err_code: %i"
+msgstr "Ne mogu da napravim sadržaj za izvoz, kod greške: %i"
+
+#: ../smime/lib/e-pkcs12.c:335
+#, c-format
+msgid "Unable to setup password integrity, err_code: %i"
+msgstr "Ne mogu da podesim integritet lozinke, kod greške: %i"
+
+#: ../smime/lib/e-pkcs12.c:345
+#, c-format
+msgid "Unable to create safe bag, err_code: %i"
+msgstr "Ne mogu da napravim bezbednu vreću, kod greške: %i"
+
+#: ../smime/lib/e-pkcs12.c:363
+#, c-format
+msgid "Unable to add key/cert to the store, err_code: %i"
+msgstr "Ne mogu da dodam ključ/uverenje u ostavu, kod greške: %i"
+
+#: ../smime/lib/e-pkcs12.c:381
+#, c-format
+msgid "Unable to write store to disk, err_code: %i"
+msgstr "Ne mogu upišem i sačuvam na disk, kod greške: %i"
+
+#: ../smime/lib/e-pkcs12.c:408
 msgid "Imported Certificate"
 msgstr "Uveženo uverenje"
 
@@ -21755,6 +25568,398 @@ msgstr "Sa _rokom"
 msgid "With _Status"
 msgstr "Sa _stanjem"
 
+#~ msgid "Edit Reminder"
+#~ msgstr "Uredi podsetnik"
+
+#~ msgid "start of appointment"
+#~ msgstr "zakazani početak"
+
+#~ msgid "end of appointment"
+#~ msgstr "kraj sastanka"
+
+#~ msgid "Add Reminder"
+#~ msgstr "Dodaj podsetnik"
+
+#~ msgid "Reminder"
+#~ msgstr "Podsetnik"
+
+#~ msgid "Repeat"
+#~ msgstr "Ponovi"
+
+#~ msgid "Mes_sage:"
+#~ msgstr "Po_ruka:"
+
+#~ msgid "_Sound:"
+#~ msgstr "_Zvuk:"
+
+#~ msgid "Select A File"
+#~ msgstr "Izaberite datoteku"
+
+#~ msgid "Action/Trigger"
+#~ msgstr "Radnja/pokretač"
+
+#~ msgid "This event has been deleted."
+#~ msgstr "Ovaj događaj je obrisan."
+
+#~ msgid "This task has been deleted."
+#~ msgstr "Ovaj zadatak je obrisan."
+
+#~ msgid "This memo has been deleted."
+#~ msgstr "Ova beleška je obrisana."
+
+#~ msgid ""
+#~ "%s  You have made changes. Forget those changes and close the editor?"
+#~ msgstr ""
+#~ "%s  Načinili ste izmene. Da zanemarim te izmene i da zatvorim uređivač?"
+
+#~ msgid "%s  You have made no changes, close the editor?"
+#~ msgstr "%s  Niste načinili izmene, da zatvorim uređivač?"
+
+#~ msgid "This event has been changed."
+#~ msgstr "Ovaj događaj je izmenjen."
+
+#~ msgid "This task has been changed."
+#~ msgstr "Ovaj zadatak je izmenjen."
+
+#~ msgid "This memo has been changed."
+#~ msgstr "Ova beleška je izmenjena."
+
+#~ msgid ""
+#~ "%s  You have made changes. Forget those changes and update the editor?"
+#~ msgstr ""
+#~ "%s  Načinili ste izmene. Da zanemarim te izmene i da osvežim uređivač?"
+
+#~ msgid "%s  You have made no changes, update the editor?"
+#~ msgstr "%s  Niste načinili izmene, da osvežim uređivač?"
+
+#~ msgid "Could not update object"
+#~ msgstr "Ne mogu da osvežim objekat"
+
+#~ msgid "Edit Appointment"
+#~ msgstr "Uredi zakazivanje"
+
+#~ msgid "Keep original item?"
+#~ msgstr "Zadržati originalnu stavku?"
+
+#~ msgid "Unable to synchronize with the server"
+#~ msgstr "Ne mogu da se usaglasim sa serverom"
+
+#~ msgid "Changes made to this item may be discarded if an update arrives"
+#~ msgstr ""
+#~ "Promene načinjene na ovoj stavki mogu biti zanemarene ako bude ažurirano"
+
+#~ msgid "Unable to use current version!"
+#~ msgstr "Ne mogu da koristim trenutno izdanje!"
+
+#~ msgid "Validation error: %s"
+#~ msgstr "Greška provere: %s"
+
+#~ msgid "Enter Delegate"
+#~ msgstr "Unesi delegata"
+
+#~ msgid "Delegate To:"
+#~ msgstr "Delegiraj na:"
+
+#~ msgid "Contacts..."
+#~ msgstr "Kontakti..."
+
+#~ msgid "_Recurrence"
+#~ msgstr "_Ponavljanje"
+
+#~ msgid "Make this a recurring event"
+#~ msgstr "Neka se ovaj događaj ponavlja"
+
+#~ msgid "Insert advanced send options"
+#~ msgstr "Umetnite napredne opcije slanja"
+
+#~ msgid "_Free/Busy"
+#~ msgstr "S_lobodno/zauzeto"
+
+#~ msgid "Print this event"
+#~ msgstr "Štampajte ovu poruku"
+
+#~ msgid "This event has reminders"
+#~ msgstr "Ovaj događaj ima podsetnike"
+
+#~ msgid "Event with no start date"
+#~ msgstr "Događaj bez datuma početka"
+
+#~ msgid "Event with no end date"
+#~ msgstr "Događaj bez datuma završetka"
+
+#~ msgid "End date is wrong"
+#~ msgstr "Datum završetka je pogrešan"
+
+#~ msgid "End time is wrong"
+#~ msgstr "Vreme završetka je pogrešno"
+
+#~ msgid "_Delegatees"
+#~ msgstr "Delegat_i"
+
+#~ msgid "Atte_ndees"
+#~ msgstr "Uč_esnici"
+
+#~ msgctxt "eventpage"
+#~ msgid "15 minutes before appointment"
+#~ msgstr "15 minuta pre zakazanog sastanka"
+
+#~ msgctxt "eventpage"
+#~ msgid "1 hour before appointment"
+#~ msgstr "1 sat pre zakazanog sastanka"
+
+#~ msgctxt "eventpage"
+#~ msgid "1 day before appointment"
+#~ msgstr "1 dan pre zakazanog sastanka"
+
+# note(slobo): možda treba rok
+#~ msgid "_Time:"
+#~ msgstr "_Vreme:"
+
+#~ msgid "Event Description"
+#~ msgstr "Opis događaja"
+
+#~ msgid "Print this memo"
+#~ msgstr "Štampajte ovu belešku"
+
+#~ msgid "Memo's start date is in the past"
+#~ msgstr "Početak beleške je u prošlosti"
+
+#~ msgid "Organi_zer:"
+#~ msgstr "Organi_zator:"
+
+#~ msgid "T_o:"
+#~ msgstr "_Prima:"
+
+#~ msgid "Su_mmary:"
+#~ msgstr "Saže_tak:"
+
+#~ msgid "Could not get a selection to modify."
+#~ msgstr "Ne mogu da nađem izbor radi menjanja."
+
+#~ msgid "Could not get a selection to delete."
+#~ msgstr "Ne mogu da nađem izbor radi brisanja."
+
+#~ msgid "Date/Time"
+#~ msgstr "Datum/vreme"
+
+#~ msgctxt "recurrpage"
+#~ msgid "day(s)"
+#~ msgstr "dan(i)"
+
+#~ msgctxt "recurrpage"
+#~ msgid "for"
+#~ msgstr "za"
+
+#~ msgctxt "recurrpage"
+#~ msgid "until"
+#~ msgstr "do"
+
+#~ msgid "_Send Options"
+#~ msgstr "Mogućnosti _slanja"
+
+#~ msgid "Print this task"
+#~ msgstr "Odštampajte ovaj zadatak"
+
+#~ msgid ""
+#~ "Task cannot be edited, because the selected task list does not support "
+#~ "assigned tasks"
+#~ msgstr ""
+#~ "Zadatak nije moguće uređivati, zato što izabrani spisak zadataka ne "
+#~ "podržava dodeljene zadatke"
+
+#~ msgid "Due date is wrong"
+#~ msgstr "Krajnji rok je pogrešan"
+
+#~ msgid "Time zone:"
+#~ msgstr "Vremenska zona:"
+
+#~ msgid "%s at the start of the appointment"
+#~ msgstr "%s na početku sastanka"
+
+#~ msgid "%s at the end of the appointment"
+#~ msgstr "%s na kraju sastanka"
+
+#~ msgid "Gnome Calendar"
+#~ msgstr "Gnomov kalendar"
+
+#~ msgid "Download in progress. Do you want to send the mail?"
+#~ msgstr "Preuzimanje je u toku. Da li želite da pošaljete poruku?"
+
+#~ msgid ""
+#~ " There are few attachments getting downloaded. Sending the mail will "
+#~ "cause the mail to be sent without those pending attachments "
+#~ msgstr ""
+#~ " Preuzima se nekoliko priloga. Ukoliko sada pošaljete poruku ovi prilozi "
+#~ "neće biti poslati sa njom "
+
+#~ msgid "SSL"
+#~ msgstr "SSL"
+
+#~ msgid "Use Unicode characters for smile_ys"
+#~ msgstr "Unikod znak za _smajlije"
+
+#~ msgid "Web addresses"
+#~ msgstr "Veb adrese"
+
+#~ msgid "Could not open destination"
+#~ msgstr "Ne mogu da otvorim odredište"
+
+#~ msgid "Cannot create object"
+#~ msgstr "Ne mogu da napravim objekat"
+
+#~ msgid "Could not open source"
+#~ msgstr "Ne mogu da otvorim izvor"
+
+#~ msgid "The event could not be deleted due to a dbus error: %s"
+#~ msgstr "Događaj ne može biti obrisan zbog dbas greške: %s"
+
+#~ msgid "The task could not be deleted due to a dbus error: %s"
+#~ msgstr "Zadatak ne može biti obrisan zbog dbas greške: %s"
+
+#~ msgid "The memo could not be deleted due to a dbus error: %s"
+#~ msgstr "Beleška ne može biti obrisana zbog dbas greške: %s"
+
+#~ msgid "The item could not be deleted due to a dbus error: %s"
+#~ msgstr "Stavka ne može biti obrisana zbog dbas greške: %s"
+
+#~ msgid "The event could not be deleted because permission was denied"
+#~ msgstr "Događaj ne može biti obrisan jer je odbijena dozvola"
+
+#~ msgid "The task could not be deleted because permission was denied"
+#~ msgstr "Zadatak ne može biti obrisan jer je odbijena dozvola"
+
+#~ msgid "The memo could not be deleted because permission was denied"
+#~ msgstr "Beleška ne može biti obrisana jer je odbijena dozvola"
+
+#~ msgid "The item could not be deleted because permission was denied"
+#~ msgstr "Stavka ne može biti obrisana jer je odbijena dozvola"
+
+#~ msgid "The event could not be deleted due to an error: %s"
+#~ msgstr "Događaj ne može biti obrisan zbog greške: %s"
+
+#~ msgid "The task could not be deleted due to an error: %s"
+#~ msgstr "Zadatak ne može biti obrisan zbog greške: %s"
+
+#~ msgid "The memo could not be deleted due to an error: %s"
+#~ msgstr "Beleška ne može biti obrisana zbog greške: %s"
+
+#~ msgid "The item could not be deleted due to an error: %s"
+#~ msgstr "Stavka ne može biti obrisana zbog greške: %s"
+
+#~ msgid "Customize"
+#~ msgstr "Prilagodi"
+
+#~ msgid "Custom Reminder:"
+#~ msgstr "Proizvoljan podsetnik:"
+
+#~ msgid "Deleting selected objects"
+#~ msgstr "Brišem izabrane objekte"
+
+#~ msgid "Untitled Message"
+#~ msgstr "Neimenovana poruka"
+
+#~ msgid "Spell checking color"
+#~ msgstr "Boja za proveru pravopisa"
+
+#~ msgid "Underline color for misspelled words when using inline spelling."
+#~ msgstr "Boja za podvlačenje pravopisnih greški prilikom provere pravopisa."
+
+#~ msgid ""
+#~ "Determines whether to use the same fonts for both \"From\" and \"Subject"
+#~ "\" lines in the \"Messages\" column in vertical view"
+#~ msgstr ""
+#~ "Utvrđuje da li da koristi isti font u poljima „Šalje“ and „Naslov“ u "
+#~ "uspravnom pregledu kolone „Poruke“"
+
+#~ msgid ""
+#~ "Determines whether to use the same fonts for both \"From\" and \"Subject"
+#~ "\" lines in the \"Messages\" column in vertical view."
+#~ msgstr ""
+#~ "Utvrđuje da li da koristi isti font u poljima „Šalje“ and „Naslov“ u "
+#~ "uspravnom pregledu kolone „Poruke“."
+
+#~ msgid "Invalid authentication result code (%d)"
+#~ msgstr "Neispravan kod rezultata potvrđivanja identiteta (%d)"
+
+#~ msgid "Completed On"
+#~ msgstr "Završeno za"
+
+#~ msgid "is not set"
+#~ msgstr "nije podešeno"
+
+#~ msgid "is set"
+#~ msgstr "podešeno"
+
+#~ msgid "Loading Images"
+#~ msgstr "Učitavanje slika"
+
+#~ msgid "Option is ignored if a match for custom junk headers is found."
+#~ msgstr ""
+#~ "Opcija se zanemaruje ukoliko je pronađeno poklapanje sa proizvoljnim "
+#~ "zaglavljem đubreta."
+
+#~ msgid "Please select a valid backup file to restore."
+#~ msgstr "Izaberite ispravnu datoteku rezerve za povraćaj."
+
+#~ msgid "HTTP Error: %s"
+#~ msgstr "HTTP greška: %s"
+
+#~ msgid "Could not parse response"
+#~ msgstr "Ne mogu da obradim odgovor"
+
+#~ msgid "Empty response"
+#~ msgstr "Prazan odgovor"
+
+#~ msgid "Unexpected reply from server"
+#~ msgstr "Neočekivan odgovor sa servera"
+
+#~ msgid "Could not locate user's calendars"
+#~ msgstr "Ne mogu da pronađem korisnikov kalendar."
+
+#~ msgid "Path"
+#~ msgstr "Putanja"
+
+#~ msgid "Enter Google password for user '%s'."
+#~ msgstr "Unesite Guglovu lozinku za „%s“."
+
+#~ msgid "User declined to provide a password"
+#~ msgstr "Korisnik je odbio da dostavi lozinku"
+
+#~ msgid "Expunging"
+#~ msgstr "Izbacivanje"
+
+#~ msgid "Itip Formatter"
+#~ msgstr "Itip formatiranje"
+
+#~ msgid "Display \"text/calendar\" MIME parts in mail messages."
+#~ msgstr "Prikazuje MIME delove „text/calendar“ u porukama."
+
+#~ msgid "_PostScript"
+#~ msgstr "_Postskript"
+
+#~ msgid "Please select an image of size 48 * 48"
+#~ msgstr "Izaberite sliku veličine 48 * 48"
+
+#~ msgid "View image attachments directly in mail messages."
+#~ msgstr "Pregledajte priloge sa slikama direktno u porukama."
+
+#~ msgid ""
+#~ "Issued to:\n"
+#~ "  Subject: %s\n"
+#~ msgstr ""
+#~ "Kome je izdato:\n"
+#~ "  Naslov: %s\n"
+
+#~ msgid ""
+#~ "Issued by:\n"
+#~ "  Subject: %s\n"
+#~ msgstr ""
+#~ "Izdao je:\n"
+#~ "  Naslov: %s\n"
+
+#~ msgid "Certificate details"
+#~ msgstr "Detalji uverenja"
+
 #~ msgid "Original Contact:"
 #~ msgstr "Originalan kontakt:"
 
@@ -21782,9 +25987,6 @@ msgstr "Sa _stanjem"
 #~ msgid "_Secure HTTP Proxy:"
 #~ msgstr "_Bezbedan HTTP posrednik:"
 
-#~ msgid "No _Proxy for:"
-#~ msgstr "Bez _posrednika za:"
-
 #~ msgid "Use Authe_ntication"
 #~ msgstr "Koristi _potvrđivanje identiteta"
 
@@ -21839,9 +26041,6 @@ msgstr "Sa _stanjem"
 #~ msgid "Expires On"
 #~ msgstr "Ističe"
 
-#~ msgid "Fingerprints"
-#~ msgstr "Otisci"
-
 #~ msgid "Certificate Hierarchy"
 #~ msgstr "Hijerarhija uverenja"
 
@@ -21962,9 +26161,6 @@ msgstr "Sa _stanjem"
 #~ msgid "Certificate Signature Algorithm"
 #~ msgstr "Algoritam potpisa uverenja"
 
-#~ msgid "Issuer"
-#~ msgstr "Izdavač"
-
 #~ msgid "Issuer Unique ID"
 #~ msgstr "Jedinstveni IB izdavača"
 


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