[evolution/gnome-3-18] Updated Serbian translation

[Damned-Lies <translations src gnome org>]

commit ca36269a139bf4774a7a7c499a9d65d70e498a29
Author: Милош Поповић <gpopac gmail com>
Date:   Mon Sep 21 21:03:27 2015 +0000

    Updated Serbian translation

 po/sr.po |13443 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 8565 insertions(+), 4878 deletions(-)
---
diff --git a/po/sr.po b/po/sr.po
index bc09b8c..490539c 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -3,30 +3,32 @@
 # 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>
-# Милош Поповић <gpopac gmail com>, 2010.
 # Мирослав Николић <miroslavnikolic rocketmail com>, 2011—2014.
-#: ../shell/main.c:554
+# Милош Поповић <gpopac gmail com>, 2010, 2015.
+#
+#: ../shell/main.c:522
 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"
-"Last-Translator: Мирослав Николић <miroslavnikolic rocketmail com>\n"
-"Language-Team: Serbian <gnom prevod org>\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"
 "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
 msgid "This address book could not be opened."
-msgstr "Овај адресар није могао бити отворен."
+msgstr "Не могу да отворим овај адресар."
 
 #: ../addressbook/addressbook.error.xml.h:2
 msgid ""
@@ -38,7 +40,7 @@ msgstr ""
 
 #: ../addressbook/addressbook.error.xml.h:3
 msgid "Failed to authenticate with LDAP server."
-msgstr "Нисам успео да потврдим идентитет на ЛДАП серверу."
+msgstr "Не могу да потврдим идентитет на ЛДАП серверу."
 
 #: ../addressbook/addressbook.error.xml.h:4
 msgid ""
@@ -90,7 +92,7 @@ msgid "This address book will be removed permanently."
 msgstr "Овај адресар ће бити трајно уклоњен."
 
 #: ../addressbook/addressbook.error.xml.h:13
-#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:66
+#: ../calendar/calendar.error.xml.h:7 ../mail/mail.error.xml.h:69
 msgid "Do _Not Delete"
 msgstr "Не _бриши"
 
@@ -116,7 +118,6 @@ msgid "Category editor not available."
 msgstr "Уређивач категорија није доступан."
 
 #: ../addressbook/addressbook.error.xml.h:18
-#| msgid "Unable to open address book"
 msgid "Unable to open address book '{0}'"
 msgstr "Не могу да отворим адресар „{0}“"
 
@@ -125,24 +126,29 @@ 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}“"
+
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "Would you like to save your changes?"
 msgstr "Да ли желите ли да сачувате измене?"
 
-#: ../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 "Изменили сте овај контакт. Да ли желите да сачувате ове измене?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "_Discard"
 msgstr "_Одбаци"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Cannot move contact."
-msgstr "Контакт није могуће преместити."
+msgstr "Не могу да преместим контакт."
 
-#: ../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 +156,38 @@ msgstr ""
 "Покушавате да преместите контакт из једног адресара у други али се он не "
 "може уклонити из извора. Желите ли да сачувате умножак уместо тога?"
 
-#: ../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 ""
 "Слика коју сте изабрали је превелика. Да ли желите ли да јој промените "
 "величину и да је сачувате?"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "_Resize"
 msgstr "_Промени величину"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "_Use as it is"
 msgstr "_Користи тако како је"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "_Do not save"
 msgstr "_Не чувај"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to save {0}."
 msgstr "Не могу да сачувам {0}."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Грешка при чувању {0} у {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Address '{0}' already exists."
 msgstr "Адреса „{0}“ већ постоји."
 
-#: ../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 +195,30 @@ msgstr ""
 "Контакт са овом адресом већ постоји. Желите ли ипак да додате нову карту са "
 "истом адресом?"
 
-#: ../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
+#: ../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 ../e-util/filter.ui.h:16
+#: ../calendar/gui/dialogs/task-page.ui.h:30
 #: ../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:57 ../modules/mail/em-composer-prefs.c:417
+#: ../plugins/attachment-reminder/attachment-reminder.c:438
+#: ../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 "_Додај"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:35
 msgid "Some addresses already exist in this contact list."
 msgstr "Неке адресе већ постоје на овом списку контаката."
 
-#: ../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 +226,19 @@ msgstr ""
 "Покушавате да додате адресе које су већ део ове листе. Да ли ипак желите да "
 "их додате?"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "Skip duplicates"
 msgstr "Прескочи дупликате"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "Add with duplicates"
 msgstr "Додај са дупликатима"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "List '{0}' is already in this contact list."
 msgstr "Списак „{0}“ је већ на овом списку контаката."
 
-#: ../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 +246,21 @@ msgstr ""
 "Списак контаката под називом „{0}“ се већ налази на овом списку. Да ли ипак "
 "желите да га додате?"
 
-#: ../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:1252
 msgid "Failed to delete contact"
-msgstr "Нисам успео да обришем контакт"
+msgstr "Не могу да обришем контакт"
 
-#: ../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 "Немате довољна овлашћења да бришете контакте из овог адресара."
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:43
 msgid "Cannot add new contact"
 msgstr "Није могуће додати нови контакт"
 
 #. 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 +268,12 @@ msgstr ""
 "Адресар „{0}“ је само за читање и није подложан изменама. Изаберите други "
 "адресар са бочне траке у прегледу Контакти."
 
-#: ../addressbook/addressbook.error.xml.h:45
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "Cannot save a contact, address book is still opening"
 msgstr "Не могу да сачувам контакт, адресар се још увек отвара"
 
 #. 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 +282,9 @@ msgstr ""
 "сачекајте док се не отвори, или изаберите неки други адресар."
 
 #: ../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 "Уређивач за контакте"
 
@@ -311,81 +317,81 @@ msgid "Full _Name..."
 msgstr "Пуно _име..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-msgid "_Wants to receive HTML mail"
-msgstr "_Жели да прима ХТМЛ пошту"
-
-#: ../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 "Ел. пошта"
 
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+msgid "_Wants to receive HTML mail"
+msgstr "_Жели да прима ХТМЛ пошту"
+
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Telephone"
 msgstr "Телефон"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#| msgid "Address"
+msgid "SIP Address"
+msgstr "СИП адреса"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 msgid "Instant Messaging"
 msgstr "Тренутне поруке"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 #: ../addressbook/importers/evolution-vcard-importer.c:971
 msgid "Contact"
 msgstr "Контакт"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "_Home Page:"
 msgstr "_Лична страна:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 #: ../calendar/gui/dialogs/event-page.c:709
 #: ../calendar/gui/dialogs/event-page.ui.h:25
-#: ../modules/itip-formatter/itip-view.c:1891
+#: ../modules/itip-formatter/itip-view.c:1905
 msgid "_Calendar:"
 msgstr "_Календар:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "_Free/Busy:"
 msgstr "С_лободно/заузето:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "_Video Chat:"
 msgstr "_Видео разговор:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 msgid "Home Page:"
 msgstr "Матична страна:"
 
-#: ../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:92
 msgid "Calendar:"
 msgstr "Календар:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 msgid "Free/Busy:"
 msgstr "Слободно/заузето:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 msgid "Video Chat:"
 msgstr "Видео разговор:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "_Blog:"
 msgstr "_Блог:"
 
 #. 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 "Блог:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Addresses"
-msgstr "Веб адресе"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
-msgid "Web addresses"
+msgid "Web Addresses"
 msgstr "Веб адресе"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
@@ -434,19 +440,16 @@ msgid "_Anniversary:"
 msgstr "_Годишњица:"
 
 #: ../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:2049
 msgid "Anniversary"
 msgstr "Годишњица"
 
-#. 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:2048
 msgid "Birthday"
 msgstr "Рођендан"
 
@@ -479,32 +482,30 @@ msgid "_PO Box:"
 msgstr "_Поштански број:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../composer/e-composer-from-header.c:123
 msgid "_Address:"
 msgstr "_Адреса:"
 
 #: ../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 "Кућа"
 
 #: ../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 "Посао"
 
 #: ../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:3791
 msgid "Other"
 msgstr "Друго"
 
@@ -517,169 +518,308 @@ msgid "Notes"
 msgstr "Напомене"
 
 #: ../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 "Додај П_ГП"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
+msgid "Add _X.509"
+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
+#: ../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 "_Уклони"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:55
+msgid "Load P_GP"
+msgstr "Учитај _ПГП"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:56
+msgid "_Load X.509"
+msgstr "Учитај 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/dialogs/comp-editor.c:1305
+#: ../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/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 "_Сачувај"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:58
+#: ../modules/addressbook/e-book-shell-backend.c:314
+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
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../shell/e-shell-window-actions.c:1086
+#: ../shell/e-shell.c:1215 ../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
+msgid "Options"
+msgstr "Могућности"
+
 #. 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
+#: ../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: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
+#: ../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
+#: ../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-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/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:18
+#: ../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 "_Откажи"
 
-#: ../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 "_Сачувај"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:599
-msgid "AIM"
-msgstr "АИМ"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:602
-msgid "Jabber"
-msgstr "Џабер"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:604
-msgid "Yahoo"
-msgstr "Јаху"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:605
-msgid "Gadu-Gadu"
-msgstr "Гаду-Гаду"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:603
-msgid "MSN"
-msgstr "МСН"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:601
-msgid "ICQ"
-msgstr "ИЦКу"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
-msgid "GroupWise"
-msgstr "ГроупВајз"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:606
-msgid "Skype"
-msgstr "Скајп"
-
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:607
-msgid "Twitter"
-msgstr "Твитер"
-
-#: ../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: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"
+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
 msgid "Undo"
 msgstr "Опозови"
 
-#: ../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/dialogs/comp-editor.c:1333
+#: ../e-util/e-html-editor-actions.c:1097
+#| msgid "Redo"
+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
 msgid "Redo"
-msgstr "Врати"
+msgstr "Понови"
 
-#: ../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 "Грешка при додавању контакта"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:323
 msgid "Error modifying contact"
 msgstr "Грешка при измени контакта"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:343
 msgid "Error removing contact"
 msgstr "Грешка при уклањању контакта"
 
-#: ../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 "Уређивач за контакте — %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3572
-msgid "Please select an image for this contact"
-msgstr "Изаберите слику за овај контакт"
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3240
+#| msgid "Certificates"
+msgid "X.509 certificates"
+msgstr "X.509 уверења"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3245
+msgid "PGP keys"
+msgstr "ПГП кључеви"
 
-#: ../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:3251
+#: ../smime/gui/certificate-manager.c:678
+#: ../smime/gui/certificate-manager.c:967
+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-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 "_Отвори"
 
-#: ../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 "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"
+
+#: ../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 "ПГП"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3504
+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"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4318
+msgid "Please select an image for this contact"
+msgstr "Изаберите слику за овај контакт"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4323
 msgid "_No image"
 msgstr "_Без слике"
 
-#: ../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 +827,57 @@ msgstr ""
 "Подаци о контакту нису исправни:\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“ има неисправан формат"
 
-#: ../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“ не може бити будући датум"
 
-#: ../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“ има неисправан формат"
 
-#: ../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“ је празан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3990
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4736
 msgid "Invalid contact."
 msgstr "Неисправан контакт."
 
-#: ../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/dialogs/recurrence-page.c:2327
+#: ../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-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:184 ../smime/gui/certificate-manager.c:1338
+#: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
 msgid "_OK"
 msgstr "У _реду"
 
@@ -749,15 +889,15 @@ msgstr "Брзо додавање контакта"
 msgid "_Edit Full"
 msgstr "_Уреди потпуно"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:507
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:505
 msgid "_Full name"
 msgstr "_Име и презиме"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:520
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:518
 msgid "E_mail"
 msgstr "Е-_пошта"
 
-#: ../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 "_Изабери адресар"
 
@@ -860,24 +1000,6 @@ msgstr "Додајте ел. пошту на списак"
 msgid "Remove an email address from the List"
 msgstr "Уклоните адресу ел. поште са списка"
 
-#: ../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 "_Уклони"
-
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
 msgid "Insert email addresses from Address Book"
 msgstr "Уметните адресе ел. поште из адресара"
@@ -893,7 +1015,6 @@ msgstr "_Врх"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:14
 #: ../e-util/filter.ui.h:20
-#| msgid "_Update"
 msgid "_Up"
 msgstr "_Горе"
 
@@ -911,44 +1032,265 @@ msgstr "Д_но"
 msgid "Contact List Members"
 msgstr "Чланови контакт листе"
 
-#: ../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 "_Чланови"
 
-#: ../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 "Грешка при додавању листе"
 
-#: ../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 "Грешка при измени листе"
 
-#: ../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 "Грешка при уклањању листе"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:243
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../modules/addressbook/e-book-shell-view-actions.c:1195
+msgid "Name contains"
+msgstr "Назив садржи"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../modules/addressbook/e-book-shell-view-actions.c:1188
+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
+msgid "Any field contains"
+msgstr "Поље које садржи"
+
+# note(slobo): message thread, низ --> бољи превод је расправа
+# note(slobo): понегде сам за summary користио --> „у кратким цртама“
+# note(slobo): за memo сам користио --> белешке
+# note(slobo): upgrading memo: допуна белешке је боље од надоградња белешке
+# note(slobo): set alarm, постави аларм ... проба на пар места --> „навиј сат“
+# note(slobo): filter, филтер -->  пропусник, проба на пар места
+# note(slobo): address book, адресар --> именик на пар места проба
+# note(slobo): spam , Ђубре --> Нежељена пошта
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:94
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:103
+#: ../addressbook/gui/widgets/ea-minicard-view.c:193
+msgid "evolution address book"
+msgstr "Адресар Еволуције"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:149
+msgid "Copy _Email Address"
+msgstr "Умножи електронску _адресу"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:151
+#: ../e-util/e-web-view.c:338
+msgid "Copy the email address to the clipboard"
+msgstr "Умножава адресе у списак исечака"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:156
+#: ../e-util/e-web-view.c:350
+msgid "_Send New Message To..."
+msgstr "_Пошаљи поруку за..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:158
+#: ../e-util/e-web-view.c:352
+msgid "Send a mail message to this address"
+msgstr "Шаље поруку на ову адресу"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:290
+#: ../e-util/e-web-view.c:1064
+#, c-format
+msgid "Click to mail %s"
+msgstr "Кликните да пошаљете %s"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:141
+msgid "Open map"
+msgstr "Отворите мапу"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:437
+msgid "SIP"
+msgstr "СИП"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
+msgid "List Members:"
+msgstr "Чланови листе:"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:753
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Nickname"
+msgstr "Надимак"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:754
+msgid "AIM"
+msgstr "АИМ"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:755
+msgid "GroupWise"
+msgstr "ГроупВајз"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:756
+msgid "ICQ"
+msgstr "ИЦКу"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:757
+msgid "Jabber"
+msgstr "Џабер"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:758
+msgid "MSN"
+msgstr "МСН"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:759
+msgid "Yahoo"
+msgstr "Јаху"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:760
+msgid "Gadu-Gadu"
+msgstr "Гаду-Гаду"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:761
+msgid "Skype"
+msgstr "Скајп"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:762
+msgid "Twitter"
+msgstr "Твитер"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:819
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Company"
+msgstr "Предузеће"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:820
+msgid "Department"
+msgstr "Одељење"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:821
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Office"
+msgstr "Канцеларија"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:822
+msgid "Profession"
+msgstr "Занимање"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:823
+msgid "Position"
+msgstr "Положај"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:824
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Manager"
+msgstr "Руководилац"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:825
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+msgid "Assistant"
+msgstr "Помоћник"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:826
+msgid "Video Chat"
+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
+#: ../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 "Слободно/заузето"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:829
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:870
+msgid "Phone"
+msgstr "Телефон"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:830
+msgid "Fax"
+msgstr "Факс"
+
+#: ../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 "Адреса"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:868
+msgid "Home Page"
+msgstr "Матична страница"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:869
+msgid "Web Log"
+msgstr "Веб лог"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:871
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Mobile Phone"
+msgstr "Мобилни телефон"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:876
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+msgid "Spouse"
+msgstr "Супружник"
+
+# Create the default Person calendar
+# Create the default Person task list
+# orange
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:886
+msgid "Personal"
+msgstr "Лично"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:931
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+msgid "Note"
+msgstr "Напомена"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1127
+msgid "List Members"
+msgstr "Чланови листе"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1148
+msgid "Job Title"
+msgstr "Звање на послу"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1189
+msgid "Home page"
+msgstr "Матична страница"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1199
+msgid "Blog"
+msgstr "Блог"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:261
 #: ../calendar/gui/tasktypes.xml.h:14
 msgid "Cancelled"
 msgstr "Отказано"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:345
+#: ../addressbook/gui/widgets/eab-contact-merging.c:457
 msgid "Merge Contact"
 msgstr "Припоји контакт"
 
-#: ../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 "_Стопи"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:616
+#: ../addressbook/gui/widgets/eab-contact-merging.c:713
 msgid "Duplicate Contact Detected"
 msgstr "Откривен дупли контакт"
 
-#: ../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 +1298,7 @@ msgstr ""
 "Назив или адреса ел. поште овог контакта већ постоји у\n"
 "овој фасцикли. Да ли ипак желите да сачувате измене?"
 
-#: ../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 +1306,133 @@ msgstr ""
 "Назив или адреса ел. поште овог контакта већ постоји\n"
 "у овој фасцикли. Да ли ипак желите да га додате?"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:692
+#: ../addressbook/gui/widgets/eab-contact-merging.c:789
 msgid "Changed Contact:"
 msgstr "Измењен контакт:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:694
+#: ../addressbook/gui/widgets/eab-contact-merging.c:791
 msgid "New Contact:"
 msgstr "Нови контакт:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:733
+#: ../addressbook/gui/widgets/eab-contact-merging.c:830
 msgid "Conflicting Contact:"
 msgstr "Споран контакт:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:735
-#| msgid "Contact: "
+#: ../addressbook/gui/widgets/eab-contact-merging.c:832
 msgid "Old Contact:"
 msgstr "Стари контакт: "
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1150
-msgid "Name contains"
-msgstr "Назив садржи"
+#: ../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 ""
+"Не могу да отворим овај адресар. То значи да он или није означен за "
+"коришћење ван мреже или да још није преузет за рад ван мреже. Учитајте "
+"адресар када се повежете ради преузимања његовог садржаја."
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1143
-msgid "Email begins with"
-msgstr "Е-пошта почиње са"
+#: ../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 ""
+"Не могу да отворим овај адресар.  Проверите да ли постоји путања %s и да ли "
+"имате права приступа."
 
-#: ../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 "Поље које садржи"
+#: ../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 ""
+"Ово издање Еволуције нема у себи подршку за ЛДАП.  Уколико желите да "
+"користите ЛДАП у Еволуцији, морате да инсталирате пакет Еволуције са "
+"подршком за ЛДАП."
+
+#: ../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 ""
+"Не могу да отворим овај адресар.  То значи да сте или унели погрешну адресу, "
+"или је сервер недоступан."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
+msgid "Detailed error message:"
+msgstr "Детаљи грешке:"
+
+#: ../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 ""
+"Број карти које одговарају упиту је већи од броја на који је сервер \n"
+"подешен да одговори или који је Еволуција подешена да прикаже.\n"
+"Прецизније обликујте упит или повећајте ограничење\n"
+"броја резултата у поставкама адресара за сервер директоријума."
+
+#: ../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 ""
+"Време за извршавање овог упита је преко ограничења сервера или\n"
+"ограничења које сте подесили за овај адресар. Прецизније обликујте\n"
+"упит или повећајте временско ограничење у поставкама сервера\n"
+"директоријума за овај адресар."
+
+#. 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 "Основни процес овог адресара није могао да обради упит. %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 "Основни процес овог адресара је одбио да обави овај упит. %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 "Овај упит није успешно завршен. %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 "Изабери адресар"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:398
+msgid "list"
+msgstr "списак"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:587
+msgid "Move contact to"
+msgstr "Премести контакт у"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:589
+msgid "Copy contact to"
+msgstr "Умножи контакт у"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:592
+msgid "Move contacts to"
+msgstr "Премести контакте у"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
+msgid "Copy contacts to"
+msgstr "Умножи контакте у"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
@@ -1025,73 +1455,73 @@ msgstr "Грешка при учитавању прегледа књиге"
 msgid "Search Interrupted"
 msgstr "Претрага је прекинута"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:203
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:221
 msgid "Error modifying card"
 msgstr "Грешка при измени карте"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:648
+#: ../addressbook/gui/widgets/e-addressbook-view.c:649
 msgid "Cut selected contacts to the clipboard"
 msgstr "Сече означене контакте у списак исечака"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:654
+#: ../addressbook/gui/widgets/e-addressbook-view.c:655
 msgid "Copy selected contacts to the clipboard"
 msgstr "Умножава означене контакте у списак исечака"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:660
+#: ../addressbook/gui/widgets/e-addressbook-view.c:661
 msgid "Paste contacts from the clipboard"
 msgstr "Убацује контакте из списка исечака"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:666
-#: ../modules/addressbook/e-book-shell-view-actions.c:950
+#: ../addressbook/gui/widgets/e-addressbook-view.c:667
+#: ../modules/addressbook/e-book-shell-view-actions.c:995
 msgid "Delete selected contacts"
 msgstr "Брише изабране контакте"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:672
+#: ../addressbook/gui/widgets/e-addressbook-view.c:673
 msgid "Select all visible contacts"
 msgstr "Означава све видљиве контакте"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1300
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Сигурно желите да обришете ове листе контакта?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1304
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Сигурно желите да обришете овај списак контакта?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1308
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Сигурно желите да обришете овај списак контакта (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1314
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Сигурно желите да обришете ове контакте?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1318
 msgid "Are you sure you want to delete this contact?"
 msgstr "Сигурно желите да обришете овај контакт?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1322
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Сигурно желите да обришете овај контакт (%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: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
+#: ../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 "_Обриши"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1476
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1480
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1112,11 +1542,11 @@ msgstr[3] ""
 "Отварање једног контакта ће такође отворити један нови прозор.\n"
 "Да ли заиста желите да прикажете све ове контакте?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1488
 msgid "_Don't Display"
 msgstr "_Не приказуј"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1489
 msgid "Display _All Contacts"
 msgstr "Прикажи _све контакте"
 
@@ -1132,11 +1562,6 @@ msgstr "Дато име"
 msgid "Family Name"
 msgstr "Презиме"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
-msgid "Nickname"
-msgstr "Надимак"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Email 2"
 msgstr "2. електронска адреса"
@@ -1189,11 +1614,6 @@ msgstr "Кућни факс"
 msgid "ISDN Phone"
 msgstr "ИСДН телефон"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:689
-msgid "Mobile Phone"
-msgstr "Мобилни телефон"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Other Phone"
 msgstr "Други телефон"
@@ -1228,40 +1648,20 @@ msgstr "Телекс"
 msgid "TTYTDD"
 msgstr "ТТУТДД"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
-msgid "Company"
-msgstr "Предузеће"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Unit"
 msgstr "Јединица"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
-msgid "Office"
-msgstr "Канцеларија"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Титула"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:666
+#: ../calendar/gui/e-meeting-list-view.c:684
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Улога"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
-msgid "Manager"
-msgstr "Руководилац"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:657
-msgid "Assistant"
-msgstr "Помоћник"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
 msgstr "Веб страница"
@@ -1278,40 +1678,63 @@ msgstr "Дневник"
 msgid "Categories"
 msgstr "Категорије"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:693
-msgid "Spouse"
-msgstr "Супружник"
+#: ../addressbook/gui/widgets/ea-minicard.c:33
+msgid "Open"
+msgstr "Отвори"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:748
-msgid "Note"
-msgstr "Напомена"
+#: ../addressbook/gui/widgets/ea-minicard.c:159
+msgid "Contact List: "
+msgstr "Списак контакта: "
 
-#: ../addressbook/gui/widgets/e-contact-map-window.c:375
+#: ../addressbook/gui/widgets/ea-minicard.c:160
+msgid "Contact: "
+msgstr "Контакт: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:187
+msgid "evolution minicard"
+msgstr "миникарта еволуције"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:35
+msgid "New Contact"
+msgstr "Нови контакт"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+msgid "New Contact List"
+msgstr "Нова контакт листа"
+
+#: ../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] "тренутна фасцикла адресара %s има %d карту"
+msgstr[1] "тренутна фасцикла адресара %s има %d карте"
+msgstr[2] "тренутна фасцикла адресара %s има %d карти"
+msgstr[3] "тренутна фасцикла адресара %s има једну карту"
+
+#: ../addressbook/gui/widgets/e-contact-map-window.c:377
 msgid "Contacts Map"
 msgstr "Карта контаката"
 
 #. 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 "У_већај"
 
 #. 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:2293
 msgid "Zoom _Out"
 msgstr "У_мањи"
 
 #. 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:2090
+#: ../e-util/e-html-editor-find-dialog.c:195
+#: ../shell/e-shell-window-actions.c:890
 msgid "_Find"
 msgstr "_Нађи"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:190
+#: ../addressbook/gui/widgets/e-minicard-view.c:188
 msgid ""
 "\n"
 "\n"
@@ -1321,7 +1744,7 @@ msgstr ""
 "\n"
 "Тражим контакте..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:193
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -1335,7 +1758,7 @@ msgstr ""
 "\n"
 "или кликните двапут овде да направите нови контакт."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:196
+#: ../addressbook/gui/widgets/e-minicard-view.c:194
 msgid ""
 "\n"
 "\n"
@@ -1349,7 +1772,7 @@ msgstr ""
 "\n"
 "Кликните двапут да направите нов контакт."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:200
+#: ../addressbook/gui/widgets/e-minicard-view.c:198
 msgid ""
 "\n"
 "\n"
@@ -1359,7 +1782,7 @@ msgstr ""
 "\n"
 "Претрага за контактима."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:202
+#: ../addressbook/gui/widgets/e-minicard-view.c:200
 msgid ""
 "\n"
 "\n"
@@ -1369,295 +1792,12 @@ msgstr ""
 "\n"
 "Нема ставки за приказивање."
 
-#: ../addressbook/gui/widgets/e-minicard.c:92
-msgid "Work Email"
-msgstr "Пословна ел. пошта"
-
-#: ../addressbook/gui/widgets/e-minicard.c:93
-msgid "Home Email"
-msgstr "Кућна ел. пошта"
-
-#: ../addressbook/gui/widgets/e-minicard.c:94
-#: ../addressbook/gui/widgets/e-minicard.c:827
-msgid "Other Email"
-msgstr "Друга ел. пошта"
-
-# note(slobo): message thread, низ --> бољи превод је расправа
-# note(slobo): понегде сам за summary користио --> „у кратким цртама“
-# note(slobo): за memo сам користио --> белешке
-# note(slobo): upgrading memo: допуна белешке је боље од надоградња белешке
-# note(slobo): set alarm, постави аларм ... проба на пар места --> „навиј сат“
-# note(slobo): filter, филтер -->  пропусник, проба на пар места
-# note(slobo): address book, адресар --> именик на пар места проба
-# note(slobo): spam , Ђубре --> Нежељена пошта
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:94
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:103
-#: ../addressbook/gui/widgets/ea-minicard-view.c:193
-msgid "evolution address book"
-msgstr "Адресар Еволуције"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:35
-msgid "New Contact"
-msgstr "Нови контакт"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
-msgid "New Contact List"
-msgstr "Нова контакт листа"
-
-#: ../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] "тренутна фасцикла адресара %s има %d карту"
-msgstr[1] "тренутна фасцикла адресара %s има %d карте"
-msgstr[2] "тренутна фасцикла адресара %s има %d карти"
-msgstr[3] "тренутна фасцикла адресара %s има једну карту"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:33
-msgid "Open"
-msgstr "Отвори"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:159
-msgid "Contact List: "
-msgstr "Списак контакта: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:160
-msgid "Contact: "
-msgstr "Контакт: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:187
-msgid "evolution minicard"
-msgstr "миникарта еволуције"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:149
-msgid "Copy _Email Address"
-msgstr "Умножи електронску _адресу"
-
-#: ../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 "Умножава адресе у списак исечака"
-
-#: ../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 "_Пошаљи поруку за..."
-
-#: ../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 "Шаље поруку на ову адресу"
-
-#: ../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 "Кликните да пошаљете %s"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:136
-msgid "Open map"
-msgstr "Отворите мапу"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:535
-msgid "List Members:"
-msgstr "Чланови листе:"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
-msgid "Department"
-msgstr "Одељење"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
-msgid "Profession"
-msgstr "Занимање"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
-msgid "Position"
-msgstr "Положај"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:658
-msgid "Video Chat"
-msgstr "Видео разговор"
-
-#: ../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 "Календар"
-
-#: ../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 "Слободно/заузето"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:661
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:688
-msgid "Phone"
-msgstr "Телефон"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:662
-msgid "Fax"
-msgstr "Факс"
-
-#: ../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 "Адреса"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
-msgid "Home Page"
-msgstr "Матична страница"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:687
-msgid "Web Log"
-msgstr "Веб лог"
-
-# Create the default Person calendar
-# Create the default Person task list
-# orange
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
-msgid "Personal"
-msgstr "Лично"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:944
-msgid "List Members"
-msgstr "Чланови листе"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:965
-msgid "Job Title"
-msgstr "Звање на послу"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1006
-msgid "Home page"
-msgstr "Матична страница"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1016
-msgid "Blog"
-msgstr "Блог"
-
-#: ../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 ""
-"Не могу да отворим овај адресар. То значи да он или није означен за "
-"коришћење ван мреже или да још није преузет за рад ван мреже. Учитајте "
-"адресар када се повежете ради преузимања његовог садржаја."
-
-#: ../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 ""
-"Не могу да отворим овај адресар.  Проверите да ли постоји путања %s и да ли "
-"имате права приступа."
-
-#: ../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 ""
-"Ово издање Еволуције нема у себи подршку за ЛДАП.  Уколико желите да "
-"користите ЛДАП у Еволуцији, морате да инсталирате пакет Еволуције са "
-"подршком за ЛДАП."
-
-#: ../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 ""
-"Не могу да отворим овај адресар.  То значи да сте или унели погрешну адресу, "
-"или је сервер недоступан."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
-msgid "Detailed error message:"
-msgstr "Детаљи грешке:"
-
-#: ../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 ""
-"Број карти које одговарају упиту је већи од броја на који је сервер \n"
-"подешен да одговори или који је Еволуција подешена да прикаже.\n"
-"Прецизније обликујте упит или повећајте ограничење\n"
-"броја резултата у поставкама адресара за сервер директоријума."
-
-#: ../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 ""
-"Време за извршавање овог упита је преко ограничења сервера или\n"
-"ограничења које сте подесили за овај адресар. Прецизније обликујте\n"
-"упит или повећајте временско ограничење у поставкама сервера\n"
-"директоријума за овај адресар."
-
-#. 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 "Основни процес овог адресара није могао да обради упит. %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 "Основни процес овог адресара је одбио да обави овај упит. %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 "Овај упит није успешно завршен. %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 "Изабери адресар"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:398
-msgid "list"
-msgstr "списак"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:587
-msgid "Move contact to"
-msgstr "Премести контакт у"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:589
-msgid "Copy contact to"
-msgstr "Умножи контакт у"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:592
-msgid "Move contacts to"
-msgstr "Премести контакте у"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
-msgid "Copy contacts to"
-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:439
-#: ../calendar/importers/icalendar-importer.c:934
-#: ../calendar/importers/icalendar-importer.c:973 ../shell/shell.error.xml.h:1
+#: ../calendar/importers/icalendar-importer.c:430
+#: ../calendar/importers/icalendar-importer.c:925
+#: ../calendar/importers/icalendar-importer.c:964 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Увозим..."
 
@@ -1703,47 +1843,47 @@ msgstr "Еволуцијин вКарт увозник"
 
 #. 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. страница"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:58
+#: ../addressbook/tools/evolution-addressbook-export.c:54
 msgid "Specify the output file instead of standard output"
 msgstr "Наведите излазну датотеку уместо стандардног излаза"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "OUTPUTFILE"
 msgstr "ИЗЛАЗНА-ДАТОТЕКА"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
+#: ../addressbook/tools/evolution-addressbook-export.c:58
 msgid "List local address book folders"
 msgstr "Наводи фасцикле локалног адресара"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "Show cards as vcard or csv file"
 msgstr "Приказује карте као вкарту или цсв датотеку"
 
-#: ../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 ""
 "Грешка у аргументима наредбе, користите опцију „--help“ да видите како се "
 "користи."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:147
+#: ../addressbook/tools/evolution-addressbook-export.c:125
 msgid "Only support csv or vcard format."
 msgstr "Подржава само цсв или вкард облик."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:178
+#: ../addressbook/tools/evolution-addressbook-export.c:156
 msgid "Unhandled error"
 msgstr "Непозната грешка"
 
-#: ../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 "Не могу да отворим датотеку"
@@ -1751,7 +1891,144 @@ msgstr "Не могу да отворим датотеку"
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:75
 #, c-format
 msgid "Failed to open client '%s': %s"
-msgstr "Нисам успео да отворим „%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 "Гугл ћаскање"
+
+#. 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
+#| msgid "Email"
+msgctxt "addressbook-label"
+msgid "Email"
+msgstr "Електронска пошта"
+
+#. 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 "СИП"
+
+#. 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
+#| msgid "AIM"
+msgctxt "addressbook-label"
+msgid "IM"
+msgstr "ИМ"
+
+#. 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
+#| msgid "Phone"
+msgctxt "addressbook-label"
+msgid "Phone"
+msgstr "Телефон"
 
 #: ../calendar/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
@@ -1773,7 +2050,7 @@ msgstr[3] "сат"
 #. * (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
+#: ../calendar/gui/dialogs/recurrence-page.c:1253
 msgid "day"
 msgid_plural "days"
 msgstr[0] "дан"
@@ -1781,11 +2058,12 @@ msgstr[1] "дана"
 msgstr[2] "дана"
 msgstr[3] "дан"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:343
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:358
 msgid "Start time"
 msgstr "Време почетка"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:1
+#: ../calendar/alarm-notify/alarm-queue.c:1924
 msgid "Appointments"
 msgstr "Заказивања"
 
@@ -1799,38 +2077,36 @@ msgstr "_Дремање"
 
 #: ../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/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/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/dialogs/task-page.ui.h:32
+#: ../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
+#: ../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 "_Уређивање"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#| msgid "Print"
 msgid "_Print"
 msgstr "_Штампај"
 
-#: ../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 "_Занемари"
 
 #: ../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:1888
+#: ../calendar/alarm-notify/alarm-queue.c:1898
+#: ../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 "Место:"
 
@@ -1845,50 +2121,50 @@ 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/filter.ui.h:8
-#: ../e-util/e-interval-chooser.c:142
-#: ../modules/calendar/e-cal-shell-view-actions.c:351
+#: ../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
 #: ../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/filter.ui.h:7
-#: ../e-util/e-interval-chooser.c:140
+#: ../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/filter.ui.h:6
-#: ../e-util/e-interval-chooser.c:138
+#: ../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:1678
-#: ../calendar/alarm-notify/alarm-queue.c:1815
+#: ../calendar/alarm-notify/alarm-queue.c:1714
+#: ../calendar/alarm-notify/alarm-queue.c:1868
 msgid "No summary available."
 msgstr "Нема доступног сажетка."
 
-#: ../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 "Нема доступног описа."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1697
+#: ../calendar/alarm-notify/alarm-queue.c:1733
 msgid "No location information available."
 msgstr "Нема доступног податка о локацији."
 
-#: ../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:1859
+#: ../calendar/alarm-notify/alarm-queue.c:2214
 msgid "Evolution Reminders"
 msgstr "Подсетници Еволуције"
 
 # 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 +2173,21 @@ msgstr[1] "Имате %d потсетника"
 msgstr[2] "Имате %d потсетника"
 msgstr[3] "Имате један потсетник"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1965
+#: ../calendar/alarm-notify/alarm-queue.c:2032
 msgid "Warning"
 msgstr "Упозорење"
 
-#: ../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:2033 ../mail/mail-dialogs.ui.h:21
 #: ../modules/mailto-handler/evolution-mailto-handler.c:114
 msgid "_No"
 msgstr "_Не"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1967 ../mail/mail.error.xml.h:138
+#: ../calendar/alarm-notify/alarm-queue.c:2034
 #: ../modules/mailto-handler/evolution-mailto-handler.c:115
 msgid "_Yes"
 msgstr "_Да"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1971
+#: ../calendar/alarm-notify/alarm-queue.c:2038
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1929,7 +2204,7 @@ msgstr ""
 "\n"
 "Да ли сте сигурни да желите да покренете овај програм?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1986
+#: ../calendar/alarm-notify/alarm-queue.c:2053
 msgid "Do not ask me about this program again."
 msgstr "Не питај ме поново за овај програм."
 
@@ -1938,7 +2213,7 @@ msgid "invalid time"
 msgstr "неисправно време"
 
 #. 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
+#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:382
 #: ../calendar/gui/misc.c:103
 #, c-format
 msgid "%d hour"
@@ -1949,7 +2224,7 @@ msgstr[2] "%d сати"
 msgstr[3] "Један сат"
 
 #. 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
+#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:388
 #: ../calendar/gui/misc.c:109
 #, c-format
 msgid "%d minute"
@@ -1962,7 +2237,7 @@ msgstr[3] "Један минут"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. 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"
@@ -2378,64 +2653,213 @@ 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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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}'"
+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
 msgid "Failed to copy an event into the calendar '{0}'"
-msgstr "Нисам успео да умножим догађај у календар „{0}“"
+msgstr "Не могу да умножим догађај у календар „{0}“"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:131
 msgid "Failed to copy a task into the task list '{0}'"
-msgstr "Нисам успео да умножим задатак у списак задатака „{0}“"
+msgstr "Не могу да умножим задатак у списак задатака „{0}“"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:91
+#: ../calendar/calendar.error.xml.h:133
 msgid "Failed to copy a memo into the memo list '{0}'"
-msgstr "Нисам успео да умножим белешку у списак белешки „{0}“"
+msgstr "Не могу да умножим белешку у списак белешки „{0}“"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:93
+#: ../calendar/calendar.error.xml.h:135
 msgid "Failed to move an event into the calendar '{0}'"
-msgstr "Нисам успео да преместим догађај у календар „{0}“"
+msgstr "Не могу да преместим догађај у календар „{0}“"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:95
+#: ../calendar/calendar.error.xml.h:137
 msgid "Failed to move a task into the task list '{0}'"
-msgstr "Нисам успео да преместим задатак у списак задатака „{0}“"
+msgstr "Не могу да преместим задатак у списак задатака „{0}“"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:97
+#: ../calendar/calendar.error.xml.h:139
 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:99
+#: ../calendar/calendar.error.xml.h:141
 msgid "Copying an event into the calendar '{0}'"
 msgstr "Умножавам догађај у календар „{0}“"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:101
+#: ../calendar/calendar.error.xml.h:143
 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:103
+#: ../calendar/calendar.error.xml.h:145
 msgid "Copying a memo into the memo list '{0}'"
 msgstr "Умножавам белешку у списак белешки „{0}“"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:105
+#: ../calendar/calendar.error.xml.h:147
 msgid "Moving an event into the calendar '{0}'"
 msgstr "Премештам догађај у календар „{0}“"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:107
+#: ../calendar/calendar.error.xml.h:149
 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:109
+#: ../calendar/calendar.error.xml.h:151
 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}'?"
+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}'"
+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}'"
+msgid "Failed to refresh memo list '{0}'"
+msgstr "Не могу да освежим списак белешки „{0}“"
+
+#: ../calendar/calendar.error.xml.h:158
+#| msgid "Make this Occurrence _Movable"
+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
@@ -2445,18 +2869,20 @@ msgid "Summary"
 msgstr "Сажетак"
 
 #: ../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 "садржи"
 
 #: ../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 "не садржи"
 
 #: ../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:527 ../e-util/e-table-config.ui.h:7
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Description"
 msgstr "Опис"
@@ -2471,35 +2897,37 @@ msgid "Classification"
 msgstr "Разврставање"
 
 #: ../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 "је"
 
 #: ../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 "није"
 
 #. 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/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
 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:250 ../calendar/gui/e-cal-model.c:462
-#: ../calendar/gui/e-task-table.c:547 ../calendar/gui/memotypes.xml.h:11
+#: ../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
 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:251 ../calendar/gui/e-cal-model.c:464
-#: ../calendar/gui/e-task-table.c:548 ../calendar/gui/memotypes.xml.h:12
-#: ../e-util/e-send-options.ui.h:7
+#: ../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
 msgid "Confidential"
 msgstr "Поверљиво"
 
@@ -2516,31 +2944,34 @@ msgstr "Учесник"
 
 #: ../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
+#: ../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 "Место"
 
 #: ../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 "Категорија"
 
 #: ../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
+#: ../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
 msgid "Attachments"
 msgstr "Прилози"
 
 #: ../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:46
+#: ../mail/searchtypes.xml.in.h:48 ../mail/vfoldertypes.xml.in.h:49
 msgid "Exist"
 msgstr "Постоји"
 
 #: ../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:47
+#: ../mail/searchtypes.xml.in.h:49 ../mail/vfoldertypes.xml.in.h:50
 msgid "Do Not Exist"
 msgstr "Не постоји"
 
@@ -2582,22 +3013,22 @@ msgid "Edit Reminder"
 msgstr "Уреди подсетник"
 
 #: ../calendar/gui/dialogs/alarm-dialog.c:896
-#: ../calendar/gui/e-alarm-list.c:411
+#: ../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:407
+#: ../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:419
+#: ../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:415
+#: ../calendar/gui/e-alarm-list.c:428
 msgid "Send an email"
 msgstr "Шаље електронску поруку"
 
@@ -2647,15 +3078,11 @@ msgstr "Понови"
 msgid "_Repeat the reminder"
 msgstr "По_нови подсетник"
 
-#. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
+#. 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:15 ../mail/mail-config.ui.h:32
-msgid "Options"
-msgstr "Могућности"
-
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
 msgid "Custom _message"
 msgstr "Произвољна _порука"
@@ -2694,7 +3121,7 @@ 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:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Reminders"
 msgstr "Подсетници"
 
@@ -2743,297 +3170,298 @@ msgstr "%s  Начинили сте измене. Да занемарим те 
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Нисте начинили измене, да освежим уређивач?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:271
+#: ../calendar/gui/dialogs/comp-editor.c:299
 msgid "Could not save attachments"
 msgstr "Не могу да сачувам прилоге"
 
-#: ../calendar/gui/dialogs/comp-editor.c:626
+#: ../calendar/gui/dialogs/comp-editor.c:653
 msgid "Could not update object"
 msgstr "Не могу да освежим објекат"
 
-#: ../calendar/gui/dialogs/comp-editor.c:760
+#: ../calendar/gui/dialogs/comp-editor.c:787
 msgid "Edit Appointment"
 msgstr "Уреди заказивање"
 
-#: ../calendar/gui/dialogs/comp-editor.c:767
+#: ../calendar/gui/dialogs/comp-editor.c:794
 #, c-format
 msgid "Meeting - %s"
 msgstr "Састанак — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:769
+#: ../calendar/gui/dialogs/comp-editor.c:796
 #, c-format
 msgid "Appointment - %s"
 msgstr "Заказивање — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:775
+#: ../calendar/gui/dialogs/comp-editor.c:802
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Додељен задатак — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:777
+#: ../calendar/gui/dialogs/comp-editor.c:804
 #, c-format
 msgid "Task - %s"
 msgstr "Задатак — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:782
+#: ../calendar/gui/dialogs/comp-editor.c:809
 #, c-format
 msgid "Memo - %s"
 msgstr "Белешка — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:798
+#: ../calendar/gui/dialogs/comp-editor.c:825
 msgid "No Summary"
 msgstr "Без сажетка"
 
-#: ../calendar/gui/dialogs/comp-editor.c:919
+#: ../calendar/gui/dialogs/comp-editor.c:946
 msgid "Keep original item?"
 msgstr "Задржати оригиналну ставку?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1082
-#: ../calendar/gui/dialogs/comp-editor.c:1110
+#: ../calendar/gui/dialogs/comp-editor.c:1109
+#: ../calendar/gui/dialogs/comp-editor.c:1137
 msgid "Unable to synchronize with the server"
 msgstr "Не могу да се усагласим са сервером"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1222
+#. == 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:275
-#: ../e-util/e-mail-signature-editor.c:307
+#: ../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:126
-#: ../mail/em-folder-properties.c:418 ../mail/em-subscription-editor.c:1714
+#: ../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:343 ../shell/e-shell-window-actions.c:909
-#: ../smime/gui/certificate-manager.c:1182
+#: ../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:1224
+#: ../calendar/gui/dialogs/comp-editor.c:1251
 msgid "Close the current window"
 msgstr "Затворите тренутни прозор"
 
 #. 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..."
+#: ../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: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
+#: ../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: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
+#: ../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: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
+#: ../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: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
+#: ../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:1252
+#: ../calendar/gui/dialogs/comp-editor.c:1279
 msgid "View help"
 msgstr "Погледај помоћ"
 
 #. 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"
+#: ../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: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
+#: ../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: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
+#: ../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: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"
+#: ../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:1280
+#: ../calendar/gui/dialogs/comp-editor.c:1307
 msgid "Save current changes"
 msgstr "Сачувајте текуће измене"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1285
-#: ../e-util/e-mail-signature-editor.c:316
+#: ../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:1287
+#: ../calendar/gui/dialogs/comp-editor.c:1314
 msgid "Save current changes and close editor"
 msgstr "Сачувајте текуће измене и затворите уређивач"
 
-#: ../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"
+#: ../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: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
+#: ../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:1315
+#: ../calendar/gui/dialogs/comp-editor.c:1342
 msgid "_Classification"
 msgstr "_Разврставање"
 
-#: ../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
+#: ../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:1343
+#: ../calendar/gui/dialogs/comp-editor.c:1370
+#: ../e-util/e-html-editor-actions.c:1148
 msgid "_Insert"
 msgstr "_Уметни"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1350
-#: ../composer/e-composer-actions.c:319
+#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../composer/e-composer-actions.c:378
 msgid "_Options"
 msgstr "_Могућности"
 
-#: ../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
+#: ../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:1367
-#: ../composer/e-composer-actions.c:268
+#: ../calendar/gui/dialogs/comp-editor.c:1394
+#: ../composer/e-composer-actions.c:327
 msgid "_Attachment..."
 msgstr "_Прилог..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1369
-#: ../composer/e-composer-actions.c:270 ../e-util/e-attachment-view.c:412
+#: ../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:1377
+#: ../calendar/gui/dialogs/comp-editor.c:1404
 msgid "_Categories"
 msgstr "_Категорије"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1379
+#: ../calendar/gui/dialogs/comp-editor.c:1406
 msgid "Toggles whether to display categories"
 msgstr "Пребацује приказивање категорија"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1385
+#: ../calendar/gui/dialogs/comp-editor.c:1412
 msgid "Time _Zone"
 msgstr "Временска _зона"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1414
 msgid "Toggles whether the time zone is displayed"
 msgstr "Пребацује приказивање временске зоне"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1423
 msgid "Pu_blic"
 msgstr "_Јавно"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1398
+#: ../calendar/gui/dialogs/comp-editor.c:1425
 msgid "Classify as public"
 msgstr "Означите као јавно"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "_Private"
 msgstr "Л_ично"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1405
+#: ../calendar/gui/dialogs/comp-editor.c:1432
 msgid "Classify as private"
 msgstr "Означите као лично"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "_Confidential"
 msgstr "Пове_рљиво"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1412
+#: ../calendar/gui/dialogs/comp-editor.c:1439
 msgid "Classify as confidential"
 msgstr "Означите као поверљиво"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1447
 msgid "R_ole Field"
 msgstr "Поље _улоге"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1449
 msgid "Toggles whether the Role field is displayed"
 msgstr "Пребацује приказивање поља Улога"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1428
+#: ../calendar/gui/dialogs/comp-editor.c:1455
 msgid "_RSVP"
 msgstr "_Молим одговорите"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1457
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Пребацује приказивање поља Молим одговорите"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1436
+#: ../calendar/gui/dialogs/comp-editor.c:1463
 msgid "_Status Field"
 msgstr "Поље _стања"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1465
 msgid "Toggles whether the Status field is displayed"
 msgstr "Пребацује приказивање поља Стања"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1444
+#: ../calendar/gui/dialogs/comp-editor.c:1471
 msgid "_Type Field"
 msgstr "Поље _типа"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1473
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Пребацује приказивање поља Типа"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../composer/e-composer-actions.c:487
+#: ../calendar/gui/dialogs/comp-editor.c:2596
+#: ../composer/e-composer-actions.c:612
 msgid "Attach"
 msgstr "Приложи"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2563
-#: ../calendar/gui/dialogs/comp-editor.c:2773
-#: ../calendar/gui/dialogs/comp-editor.c:3786
+#: ../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:3748
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:120
+#: ../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:3818
+#: ../calendar/gui/dialogs/comp-editor.c:4557
 msgid "Unable to use current version!"
 msgstr "Не могу да користим тренутно издање!"
 
@@ -3042,21 +3470,28 @@ msgstr "Не могу да користим тренутно издање!"
 msgid "Validation error: %s"
 msgstr "Грешка провере: %s"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:120
-msgid "Could not open destination"
-msgstr "Не могу да отворим одредиште"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:130
+#: ../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:172
-msgid "Cannot create object"
-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:203
-msgid "Could not open source"
-msgstr "Не могу да отворим извор"
+#: ../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?"
@@ -3067,70 +3502,6 @@ msgstr ""
 msgid "_Retract comment"
 msgstr "_Увуци коментар"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:54
-#, c-format
-msgid "The event could not be deleted due to a dbus error: %s"
-msgstr "Догађај не може бити обрисан због дбас грешке: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:58
-#, c-format
-msgid "The task could not be deleted due to a dbus error: %s"
-msgstr "Задатак не може бити обрисан због дбас грешке: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:62
-#, c-format
-msgid "The memo could not be deleted due to a dbus error: %s"
-msgstr "Белешка не може бити обрисана због дбас грешке: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:66
-#, c-format
-msgid "The item could not be deleted due to a dbus error: %s"
-msgstr "Ставка не може бити обрисана због дбас грешке: %s"
-
-#: ../calendar/gui/dialogs/delete-error.c:73
-msgid "The event could not be deleted because permission was denied"
-msgstr "Догађај не може бити обрисан јер је одбијена дозвола"
-
-#: ../calendar/gui/dialogs/delete-error.c:76
-msgid "The task could not be deleted because permission was denied"
-msgstr "Задатак не може бити обрисан јер је одбијена дозвола"
-
-#: ../calendar/gui/dialogs/delete-error.c:79
-msgid "The memo could not be deleted because permission was denied"
-msgstr "Белешка не може бити обрисана јер је одбијена дозвола"
-
-#: ../calendar/gui/dialogs/delete-error.c:82
-msgid "The item could not be deleted because permission was denied"
-msgstr "Ставка не може бити обрисана јер је одбијена дозвола"
-
-#. 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 "Догађај не може бити обрисан због грешке: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:94
-#, c-format
-msgid "The task could not be deleted due to an error: %s"
-msgstr "Задатак не може бити обрисан због грешке: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:98
-#, c-format
-msgid "The memo could not be deleted due to an error: %s"
-msgstr "Белешка не може бити обрисана због грешке: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:102
-#, c-format
-msgid "The item could not be deleted due to an error: %s"
-msgstr "Ставка не може бити обрисана због грешке: %s"
-
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Enter Delegate"
 msgstr "Унеси делегата"
@@ -3192,7 +3563,7 @@ msgstr "С_лободно/заузето"
 msgid "Query free / busy information for the attendees"
 msgstr "Затражи податак за слободно/заузето време за ове учеснике"
 
-#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3496
+#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3486
 msgid "Appointment"
 msgstr "Заказивање"
 
@@ -3220,7 +3591,7 @@ 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:3171
+#: ../calendar/gui/dialogs/event-page.c:3198
 msgid "This event has reminders"
 msgstr "Овај догађај има подсетнике"
 
@@ -3229,52 +3600,52 @@ msgstr "Овај догађај има подсетнике"
 msgid "Or_ganizer:"
 msgstr "Ор_ганизатор:"
 
-#: ../calendar/gui/dialogs/event-page.c:1302
+#: ../calendar/gui/dialogs/event-page.c:1309
 msgid "Event with no start date"
 msgstr "Догађај без датума почетка"
 
-#: ../calendar/gui/dialogs/event-page.c:1305
+#: ../calendar/gui/dialogs/event-page.c:1312
 msgid "Event with no end date"
 msgstr "Догађај без датума завршетка"
 
-#: ../calendar/gui/dialogs/event-page.c:1483
+#: ../calendar/gui/dialogs/event-page.c:1490
 #: ../calendar/gui/dialogs/memo-page.c:732
-#: ../calendar/gui/dialogs/task-page.c:1030
+#: ../calendar/gui/dialogs/task-page.c:1032
 msgid "Start date is wrong"
 msgstr "Датум почетка је погрешан"
 
-#: ../calendar/gui/dialogs/event-page.c:1494
+#: ../calendar/gui/dialogs/event-page.c:1501
 msgid "End date is wrong"
 msgstr "Датум завршетка је погрешан"
 
-#: ../calendar/gui/dialogs/event-page.c:1518
+#: ../calendar/gui/dialogs/event-page.c:1543
 msgid "Start time is wrong"
 msgstr "Време почетка је погрешно"
 
-#: ../calendar/gui/dialogs/event-page.c:1526
+#: ../calendar/gui/dialogs/event-page.c:1551
 msgid "End time is wrong"
 msgstr "Време завршетка је погрешно"
 
-#: ../calendar/gui/dialogs/event-page.c:1690
+#: ../calendar/gui/dialogs/event-page.c:1715
 #: ../calendar/gui/dialogs/memo-page.c:771
-#: ../calendar/gui/dialogs/task-page.c:1084
+#: ../calendar/gui/dialogs/task-page.c:1086
 msgid "An organizer is required."
 msgstr "Потребан је организатор."
 
-#: ../calendar/gui/dialogs/event-page.c:1725
-#: ../calendar/gui/dialogs/task-page.c:1119
+#: ../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:1931
+#: ../calendar/gui/dialogs/event-page.c:1956
 msgid "_Delegatees"
 msgstr "Делегат_и"
 
-#: ../calendar/gui/dialogs/event-page.c:1933
+#: ../calendar/gui/dialogs/event-page.c:1958
 msgid "Atte_ndees"
 msgstr "Уч_есници"
 
-#: ../calendar/gui/dialogs/event-page.c:3451
+#: ../calendar/gui/dialogs/event-page.c:3478
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -3283,7 +3654,7 @@ msgstr[1] "%d дана пре заказаног"
 msgstr[2] "%d дана пре заказаног"
 msgstr[3] "%d дан пре заказаног"
 
-#: ../calendar/gui/dialogs/event-page.c:3457
+#: ../calendar/gui/dialogs/event-page.c:3484
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -3292,7 +3663,7 @@ msgstr[1] "%d сата пре заказаног"
 msgstr[2] "%d сати пре заказаног"
 msgstr[3] "%d сат пре заказаног"
 
-#: ../calendar/gui/dialogs/event-page.c:3463
+#: ../calendar/gui/dialogs/event-page.c:3490
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -3301,9 +3672,10 @@ msgstr[1] "%d минута пре заказаног"
 msgstr[2] "%d минута пре заказаног"
 msgstr[3] "%d минут пре заказаног"
 
-#: ../calendar/gui/dialogs/event-page.c:3484
-msgid "Customize"
-msgstr "Прилагоди"
+#: ../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.
@@ -3311,36 +3683,36 @@ msgstr "Прилагоди"
 # 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
+#: ../calendar/gui/dialogs/event-page.c:3518
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ништа"
 
-#. TRANSLATORS: 'for' in a sense of 'duration'; example string: Time: [date] [time] for [ H ] hours [ M ] 
minutes
+#. TRANSLATORS:
 #: ../calendar/gui/dialogs/event-page.ui.h:2
 msgctxt "eventpage"
 msgid "for"
 msgstr "за"
 
-#. TRANSLATORS: 'until' in a sense of 'duration'; example string: Time: [date] [time] until [ date ] [ time ]
+#. TRANSLATORS:
 #: ../calendar/gui/dialogs/event-page.ui.h:4
 msgctxt "eventpage"
 msgid "until"
 msgstr "до"
 
-#. TRANSLATORS: Predefined reminder's description
+#. TRANSLATORS: Predefined reminder
 #: ../calendar/gui/dialogs/event-page.ui.h:6
 msgctxt "eventpage"
 msgid "15 minutes before appointment"
 msgstr "15 минута пре заказаног састанка"
 
-#. TRANSLATORS: Predefined reminder's description
+#. TRANSLATORS: Predefined reminder
 #: ../calendar/gui/dialogs/event-page.ui.h:8
 msgctxt "eventpage"
 msgid "1 hour before appointment"
 msgstr "1 сат пре заказаног састанка"
 
-#. TRANSLATORS: Predefined reminder's description
+#. TRANSLATORS: Predefined reminder
 #: ../calendar/gui/dialogs/event-page.ui.h:10
 msgctxt "eventpage"
 msgid "1 day before appointment"
@@ -3354,6 +3726,8 @@ msgstr "_Место:"
 #: ../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 "_Опис:"
 
@@ -3377,7 +3751,7 @@ msgstr "Опис догађаја"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:26
 #: ../calendar/gui/dialogs/task-page.ui.h:33
-#: ../calendar/gui/e-meeting-time-sel.c:547
+#: ../calendar/gui/e-meeting-time-sel.c:555
 msgid "Atte_ndees..."
 msgstr "Уч_есници..."
 
@@ -3385,10 +3759,6 @@ msgstr "Уч_есници..."
 msgid "_Reminder"
 msgstr "_Подсетник"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:31
-msgid "Custom Reminder:"
-msgstr "Произвољан подсетник:"
-
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:1
 msgid "January"
 msgstr "Јануар"
@@ -3442,11 +3812,11 @@ msgid "Select Date"
 msgstr "Изаберите датум"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1378
+#: ../modules/calendar/e-cal-shell-view-actions.c:1219
 msgid "Select _Today"
 msgstr "Изабери _данашњи дан"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3500
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3490
 msgid "Memo"
 msgstr "Белешка"
 
@@ -3466,11 +3836,12 @@ msgstr "Белешку није могуће уређивати, пошто је
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Белешку није могуће потпуно уредити, пошто нисте организатор"
 
-#: ../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
+#: ../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 "Прима"
 
@@ -3540,17 +3911,17 @@ msgstr "Све уносе"
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ово заказивање садржи понављања која Еволуција не може да уреди."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1001
+#: ../calendar/gui/dialogs/recurrence-page.c:1005
 msgid "Recurrence date is invalid"
 msgstr "Датум понављања није исправан"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1045
+#: ../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:1074
+#: ../calendar/gui/dialogs/recurrence-page.c:1078
 msgid "on"
 msgstr "у"
 
@@ -3558,7 +3929,7 @@ msgstr "у"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1155
+#: ../calendar/gui/dialogs/recurrence-page.c:1159
 msgid "first"
 msgstr "првом"
 
@@ -3567,7 +3938,7 @@ msgstr "првом"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1161
+#: ../calendar/gui/dialogs/recurrence-page.c:1165
 msgid "second"
 msgstr "другом"
 
@@ -3575,7 +3946,7 @@ msgstr "другом"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1166
+#: ../calendar/gui/dialogs/recurrence-page.c:1170
 msgid "third"
 msgstr "трећем"
 
@@ -3583,7 +3954,7 @@ msgstr "трећем"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1171
+#: ../calendar/gui/dialogs/recurrence-page.c:1175
 msgid "fourth"
 msgstr "четвртом"
 
@@ -3591,7 +3962,7 @@ msgstr "четвртом"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1176
+#: ../calendar/gui/dialogs/recurrence-page.c:1180
 msgid "fifth"
 msgstr "петом"
 
@@ -3599,13 +3970,13 @@ msgstr "петом"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1181
+#: ../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:1205
+#: ../calendar/gui/dialogs/recurrence-page.c:1209
 msgid "Other Date"
 msgstr "Други датум"
 
@@ -3613,7 +3984,7 @@ msgstr "Други датум"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1211
+#: ../calendar/gui/dialogs/recurrence-page.c:1215
 msgid "1st to 10th"
 msgstr "од првог до десетог"
 
@@ -3621,7 +3992,7 @@ msgstr "од првог до десетог"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1217
+#: ../calendar/gui/dialogs/recurrence-page.c:1221
 msgid "11th to 20th"
 msgstr "од једанаестог до двадесетог"
 
@@ -3629,41 +4000,41 @@ msgstr "од једанаестог до двадесетог"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1223
+#: ../calendar/gui/dialogs/recurrence-page.c:1227
 msgid "21st to 31st"
 msgstr "од двадесет првог до тридесет првог"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1250
+#: ../calendar/gui/dialogs/recurrence-page.c:1254
 #: ../modules/calendar/e-calendar-preferences.ui.h:25
 msgid "Monday"
 msgstr "Понедељак"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1251
+#: ../calendar/gui/dialogs/recurrence-page.c:1255
 #: ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Tuesday"
 msgstr "Уторак"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1252
+#: ../calendar/gui/dialogs/recurrence-page.c:1256
 #: ../modules/calendar/e-calendar-preferences.ui.h:31
 msgid "Wednesday"
 msgstr "Среда"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1253
+#: ../calendar/gui/dialogs/recurrence-page.c:1257
 #: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Thursday"
 msgstr "Четвртак"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1254
+#: ../calendar/gui/dialogs/recurrence-page.c:1258
 #: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Friday"
 msgstr "Петак"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1255
+#: ../calendar/gui/dialogs/recurrence-page.c:1259
 #: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Saturday"
 msgstr "Субота"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1256
+#: ../calendar/gui/dialogs/recurrence-page.c:1260
 #: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Sunday"
 msgstr "Недеља"
@@ -3671,71 +4042,71 @@ 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:1387
+#: ../calendar/gui/dialogs/recurrence-page.c:1391
 msgid "on the"
 msgstr "на"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1572
+#: ../calendar/gui/dialogs/recurrence-page.c:1576
 msgid "occurrences"
 msgstr "појаве"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2342
+#: ../calendar/gui/dialogs/recurrence-page.c:2346
 msgid "Add exception"
 msgstr "Додај изузетак"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2384
+#: ../calendar/gui/dialogs/recurrence-page.c:2388
 msgid "Could not get a selection to modify."
 msgstr "Не могу да нађем избор ради мењања."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2390
+#: ../calendar/gui/dialogs/recurrence-page.c:2394
 msgid "Modify exception"
 msgstr "Измените изузетак"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2436
+#: ../calendar/gui/dialogs/recurrence-page.c:2440
 msgid "Could not get a selection to delete."
 msgstr "Не могу да нађем избор ради брисања."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2577
+#: ../calendar/gui/dialogs/recurrence-page.c:2581
 msgid "Date/Time"
 msgstr "Датум/време"
 
-#. TRANSLATORS: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. 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:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. 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:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. 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:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. 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:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. 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:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. 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:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
+#. TRANSLATORS: Entire string is for example:
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:14
 msgctxt "recurrpage"
 msgid "forever"
@@ -3771,8 +4142,8 @@ msgstr "Обавести _само нове учеснике"
 msgid "_Send Options"
 msgstr "Могућности _слања"
 
-#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3498
-#: ../e-util/e-send-options.c:552
+#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3488
+#: ../e-util/e-send-options.c:553
 msgid "Task"
 msgstr "Задатак"
 
@@ -3804,77 +4175,77 @@ msgstr ""
 "Задатак није могуће уређивати, зато што изабрани списак задатака не подржава "
 "додељене задатке"
 
-#: ../calendar/gui/dialogs/task-page.c:1011
+#: ../calendar/gui/dialogs/task-page.c:1013
 msgid "Due date is wrong"
 msgstr "Крајњи рок је погрешан"
 
-#: ../calendar/gui/dialogs/task-page.c:1179
-#: ../calendar/gui/dialogs/task-page.c:1204
+#: ../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: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
+#: ../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:338
-#: ../calendar/gui/e-cal-model.c:1665 ../calendar/gui/e-task-table.c:573
+#: ../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:308
+#: ../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: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
+#: ../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:575 ../calendar/gui/tasktypes.xml.h:22
+#: ../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:321
+#: ../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: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
+#: ../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:311
+#: ../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:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:656
-#: ../calendar/gui/print.c:3585
+#: ../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:314
+#: ../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:217 ../calendar/gui/e-task-table.c:232
-#: ../calendar/gui/e-task-table.c:657 ../calendar/gui/print.c:3588
+#: ../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"
@@ -3882,11 +4253,11 @@ msgstr "Завршено"
 
 #. 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-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: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
+#: ../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 "Отказано"
 
@@ -3922,56 +4293,56 @@ msgstr "_Разврставање:"
 msgid "_Web Page:"
 msgstr "_Веб страница:"
 
-#: ../calendar/gui/ea-cal-view.c:281
+#: ../calendar/gui/ea-cal-view.c:284
 msgid "New Appointment"
 msgstr "Ново заказивање"
 
-#: ../calendar/gui/ea-cal-view.c:282
+#: ../calendar/gui/ea-cal-view.c:285
 msgid "New All Day Event"
 msgstr "Нови целодневни догађај"
 
-#: ../calendar/gui/ea-cal-view.c:283
+#: ../calendar/gui/ea-cal-view.c:286
 msgid "New Meeting"
 msgstr "Нови састанак"
 
-#: ../calendar/gui/ea-cal-view.c:284
+#: ../calendar/gui/ea-cal-view.c:287
 msgid "Go to Today"
 msgstr "Иди на данашњи дан"
 
-#: ../calendar/gui/ea-cal-view.c:285
+#: ../calendar/gui/ea-cal-view.c:288
 msgid "Go to Date"
 msgstr "Иди на датум"
 
-#: ../calendar/gui/ea-cal-view-event.c:297
+#: ../calendar/gui/ea-cal-view-event.c:234
 msgid "It has reminders."
 msgstr "Има подсетнике."
 
-#: ../calendar/gui/ea-cal-view-event.c:300
+#: ../calendar/gui/ea-cal-view-event.c:237
 msgid "It has recurrences."
 msgstr "Има понављања."
 
-#: ../calendar/gui/ea-cal-view-event.c:303
+#: ../calendar/gui/ea-cal-view-event.c:240
 msgid "It is a meeting."
 msgstr "То је састанак."
 
-#: ../calendar/gui/ea-cal-view-event.c:310
+#: ../calendar/gui/ea-cal-view-event.c:247
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Календарски догађај: сажетак је %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:313
+#: ../calendar/gui/ea-cal-view-event.c:250
 msgid "Calendar Event: It has no summary."
 msgstr "Календарски догађај: нема сажетка."
 
-#: ../calendar/gui/ea-cal-view-event.c:336
+#: ../calendar/gui/ea-cal-view-event.c:273
 msgid "calendar view event"
 msgstr "догађај прегледа календара"
 
-#: ../calendar/gui/ea-cal-view-event.c:568
+#: ../calendar/gui/ea-cal-view-event.c:505
 msgid "Grab Focus"
 msgstr "Фокусирај"
 
-#: ../calendar/gui/ea-day-view.c:111 ../calendar/gui/ea-week-view.c:110
+#: ../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."
@@ -3982,98 +4353,33 @@ msgstr[3] "Има %d догађај."
 
 #. 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
+#: ../calendar/gui/ea-day-view.c:114 ../calendar/gui/ea-week-view.c:110
 msgid "It has no events."
 msgstr "Нема догађаја."
 
-#: ../calendar/gui/ea-day-view.c:126
+#: ../calendar/gui/ea-day-view.c:121
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Преглед радне недеље: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:133
+#: ../calendar/gui/ea-day-view.c:128
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Дневни преглед: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:167
+#: ../calendar/gui/ea-day-view.c:157
 msgid "calendar view for a work week"
 msgstr "преглед календара за радну недељу"
 
-#: ../calendar/gui/ea-day-view.c:169
+#: ../calendar/gui/ea-day-view.c:159
 msgid "calendar view for one or more days"
 msgstr "преглед календара за један или више дана"
 
 #: ../calendar/gui/ea-day-view-main-item.c:266
-#: ../calendar/gui/ea-week-view-main-item.c:293
+#: ../calendar/gui/ea-week-view-main-item.c:295
 msgid "a table to view and select the current time range"
 msgstr "табела за приказ и избор текућег временског распона"
 
-#: ../calendar/gui/ea-gnome-calendar.c:47
-#: ../calendar/gui/ea-gnome-calendar.c:55
-#: ../calendar/importers/icalendar-importer.c:1107
-msgid "Gnome Calendar"
-msgstr "Гномов календар"
-
-#: ../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."
-
-# %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/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/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."
-
-# 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/ea-jump-button.c:150
 msgid "Jump button"
 msgstr "Дугме за прескакање"
@@ -4083,7 +4389,7 @@ msgid "Click here, you can find more events."
 msgstr "Кликните овде, можете наћи још догађаја."
 
 #. 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
+#: ../calendar/gui/e-alarm-list.c:370 ../calendar/gui/misc.c:97
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -4093,7 +4399,7 @@ msgstr[2] "%d дана"
 msgstr[3] "%d дан"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:363
+#: ../calendar/gui/e-alarm-list.c:376
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -4102,77 +4408,77 @@ msgstr[1] "%d недеље"
 msgstr[2] "%d недеља"
 msgstr[3] "%d недеља"
 
-#: ../calendar/gui/e-alarm-list.c:425
+#: ../calendar/gui/e-alarm-list.c:438
 msgid "Unknown action to be performed"
 msgstr "Извршиће се непозната радња"
 
-#: ../calendar/gui/e-alarm-list.c:440
+#: ../calendar/gui/e-alarm-list.c:453
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s пре почетка састанка"
 
-#: ../calendar/gui/e-alarm-list.c:446
+#: ../calendar/gui/e-alarm-list.c:459
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s након почетка састанка"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:453
+#: ../calendar/gui/e-alarm-list.c:466
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s на почетку састанка"
 
-#: ../calendar/gui/e-alarm-list.c:465
+#: ../calendar/gui/e-alarm-list.c:478
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s пре краја састанка"
 
-#: ../calendar/gui/e-alarm-list.c:471
+#: ../calendar/gui/e-alarm-list.c:484
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s након завршетка састанка"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:478
+#: ../calendar/gui/e-alarm-list.c:491
 #, c-format
 msgid "%s at the end of the appointment"
 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:502
+#: ../calendar/gui/e-alarm-list.c:515
 #, c-format
 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:510
+#: ../calendar/gui/e-alarm-list.c:523
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s за непознат тип покретача"
 
-#: ../calendar/gui/ea-week-view.c:119
+#: ../calendar/gui/ea-week-view.c:114
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Месечни преглед: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:124
+#: ../calendar/gui/ea-week-view.c:119
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Недељни преглед: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:158
+#: ../calendar/gui/ea-week-view.c:148
 msgid "calendar view for a month"
 msgstr "преглед календара за месец"
 
-#: ../calendar/gui/ea-week-view.c:160
+#: ../calendar/gui/ea-week-view.c:150
 msgid "calendar view for one or more weeks"
 msgstr "преглед календара за једну или више недеља"
 
-#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:757
+#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:768
 #: ../mail/e-mail-config-page.c:125
 msgid "Untitled"
 msgstr "Неименовано"
@@ -4181,52 +4487,58 @@ msgstr "Неименовано"
 msgid "Categories:"
 msgstr "Категорије:"
 
-#: ../calendar/gui/e-cal-component-preview.c:262
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Summary:"
 msgstr "Сажетак:"
 
-#: ../calendar/gui/e-cal-component-preview.c:271
+#: ../calendar/gui/e-cal-component-preview.c:273
 msgid "Start Date:"
 msgstr "Датум почетка:"
 
-#: ../calendar/gui/e-cal-component-preview.c:283
+#: ../calendar/gui/e-cal-component-preview.c:285
 msgid "End Date:"
 msgstr "Датум завршетка:"
 
-#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-component-preview.c:297
 msgid "Due Date:"
 msgstr "Крајњи рок:"
 
-#: ../calendar/gui/e-cal-component-preview.c:307
-#: ../modules/itip-formatter/itip-view.c:1506
-#: ../modules/itip-formatter/itip-view.c:1623
+#: ../calendar/gui/e-cal-component-preview.c:309
+#: ../modules/itip-formatter/itip-view.c:1517
+#: ../modules/itip-formatter/itip-view.c:1634
 msgid "Status:"
 msgstr "Стање:"
 
-#: ../calendar/gui/e-cal-component-preview.c:334
+#: ../calendar/gui/e-cal-component-preview.c:336
 msgid "Priority:"
 msgstr "Важност:"
 
-#: ../calendar/gui/e-cal-component-preview.c:359
-#: ../mail/e-mail-config-service-page.c:671
+#: ../calendar/gui/e-cal-component-preview.c:361
+#: ../mail/e-mail-config-service-page.c:670
 msgid "Description:"
 msgstr "Опис:"
 
-#: ../calendar/gui/e-cal-component-preview.c:390
+#: ../calendar/gui/e-cal-component-preview.c:392
 msgid "Web Page:"
 msgstr "Веб страница:"
 
-#: ../calendar/gui/e-calendar-selector.c:356
-#: ../modules/calendar/e-cal-shell-view-private.c:1096
+#: ../calendar/gui/e-cal-data-model.c:1633
 #, c-format
-msgid "Copying an event into the calendar %s"
-msgstr "Умножавам догађај у календар „%s“"
+#| msgid "Opening calendar '%s'"
+msgid "Creating view for calendar '%s'"
+msgstr "Приказујем календар „%s“"
 
-#: ../calendar/gui/e-calendar-selector.c:357
-#: ../modules/calendar/e-cal-shell-view-private.c:1095
+#: ../calendar/gui/e-cal-data-model.c:1637
 #, c-format
-msgid "Moving an event into the calendar %s"
-msgstr "Премештам догађај у календар „%s“"
+#| 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"
@@ -4237,11 +4549,11 @@ msgid "Start date"
 msgstr "Датум почетка"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:652
+#: ../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:158
+#: ../mail/e-mail-account-tree-view.c:157
 msgid "Type"
 msgstr "Врста"
 
@@ -4249,7 +4561,7 @@ msgstr "Врста"
 msgid "Completion date"
 msgstr "Датум завршетка"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:857
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:965
 msgid "Complete"
 msgstr "Завршено"
 
@@ -4271,11 +4583,12 @@ 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:4011
-#: ../calendar/gui/e-meeting-list-view.c:695
+#: ../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/em-filter-i18n.h:49
-#: ../mail/message-list.etspec.h:1
+#: ../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 "Стање"
 
@@ -4292,37 +4605,55 @@ msgstr "Направљено"
 msgid "Last modified"
 msgstr "Последње измене"
 
-#: ../calendar/gui/e-calendar-view.c:448
+#: ../calendar/gui/e-calendar-view.c:459
 msgid "Cut selected events to the clipboard"
 msgstr "Сече изабране догађаје у списак исечака"
 
-#: ../calendar/gui/e-calendar-view.c:454
+#: ../calendar/gui/e-calendar-view.c:465
 msgid "Copy selected events to the clipboard"
 msgstr "Умножава изабране догађаје у списак исечака"
 
-#: ../calendar/gui/e-calendar-view.c:460
+#: ../calendar/gui/e-calendar-view.c:471
 msgid "Paste events from the clipboard"
 msgstr "Убацује догађаје из списка исечака"
 
-#: ../calendar/gui/e-calendar-view.c:466
+#: ../calendar/gui/e-calendar-view.c:477
 msgid "Delete selected events"
 msgstr "Брише изабране догађаје"
 
-#: ../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 "Бришем изабране објекте"
+#: ../calendar/gui/e-calendar-view.c:859
+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"
+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"
+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"
+msgid "Default task list not found"
+msgstr "Није пронађен подразумевани списак задатака"
+
+#: ../calendar/gui/e-calendar-view.c:969
+msgid "No suitable component found"
+msgstr "Није пронађена одоварајућа компонента"
 
-#: ../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 "Ажурирам објекат"
+#: ../calendar/gui/e-calendar-view.c:1039
+#| msgid "Save as iCalendar"
+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:2094 ../calendar/gui/e-memo-table.c:552
-#: ../calendar/gui/e-task-table.c:839
+#: ../calendar/gui/e-calendar-view.c:1842 ../calendar/gui/e-memo-table.c:493
+#: ../calendar/gui/e-task-table.c:794
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Организатор: %s <%s>"
@@ -4330,25 +4661,74 @@ 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:2098 ../calendar/gui/e-memo-table.c:557
-#: ../calendar/gui/e-task-table.c:843
+#: ../calendar/gui/e-calendar-view.c:1846 ../calendar/gui/e-memo-table.c:498
+#: ../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:2114
-#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3536
+#: ../calendar/gui/e-calendar-view.c:1862
+#: ../calendar/gui/e-meeting-time-sel.c:2725 ../calendar/gui/print.c:3527
 #, c-format
 msgid "Location: %s"
 msgstr "Место: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2145
+#: ../calendar/gui/e-calendar-view.c:1902
 #, 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
+msgid "%d %b %Y"
+msgstr "%d. %b %Y."
+
+# 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:2286 ../calendar/gui/e-day-view.c:3052
+#: ../calendar/gui/e-day-view-top-item.c:859
+#: ../calendar/gui/e-week-view-main-item.c:230
+msgid "%d %b"
+msgstr "%d. %b"
+
+#: ../calendar/gui/e-calendar-view.c:2308
+msgid "%A %d %b %Y"
+msgstr "%A, %d. %b %Y."
+
+# %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:2312 ../calendar/gui/e-day-view.c:3036
+#: ../calendar/gui/e-day-view-top-item.c:855
+#: ../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
+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"
@@ -4358,77 +4738,102 @@ msgstr "Датум почетка"
 msgid "End Date"
 msgstr "Датум завршетка"
 
-#: ../calendar/gui/e-cal-model.c:466 ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-cal-model.c:319 ../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/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:1667
+#: ../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
+#, 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"
+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"
+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"
+msgid "Creating a task"
+msgstr "Правим нови задатак"
+
+#: ../calendar/gui/e-cal-model.c:1858
 msgid "Recurring"
 msgstr "Периодичност"
 
-#: ../calendar/gui/e-cal-model.c:1669
+#: ../calendar/gui/e-cal-model.c:1860
 msgid "Assigned"
 msgstr "Додељено"
 
-#: ../calendar/gui/e-cal-model.c:1671 ../calendar/gui/e-cal-model-tasks.c:1165
+#: ../calendar/gui/e-cal-model.c:1862 ../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:1671 ../calendar/gui/e-cal-model-tasks.c:1165
+#: ../calendar/gui/e-cal-model.c:1862 ../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:3952
+#: ../calendar/gui/e-cal-model.c:3786
 #: ../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
+#: ../modules/itip-formatter/itip-view.c:6206
 msgid "Accepted"
 msgstr "Прихваћено"
 
-#: ../calendar/gui/e-cal-model.c:3953
+#: ../calendar/gui/e-cal-model.c:3787
 #: ../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
+#: ../modules/itip-formatter/itip-view.c:6212
 msgid "Declined"
 msgstr "Одбијено"
 
-#: ../calendar/gui/e-cal-model.c:3954
+#: ../calendar/gui/e-cal-model.c:3788
 #: ../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
+#: ../calendar/gui/e-meeting-time-sel.c:535
 msgid "Tentative"
 msgstr "Са резервом"
 
-#: ../calendar/gui/e-cal-model.c:3955
+#: ../calendar/gui/e-cal-model.c:3789
 #: ../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
+#: ../modules/itip-formatter/itip-view.c:6215
 msgid "Delegated"
 msgstr "Делегирано"
 
-#: ../calendar/gui/e-cal-model.c:3956
+#: ../calendar/gui/e-cal-model.c:3790
 msgid "Needs action"
 msgstr "Захтева радњу"
 
-#: ../calendar/gui/e-cal-model-calendar.c:124
-#: ../calendar/gui/e-task-table.c:630
+#: ../calendar/gui/e-cal-model-calendar.c:151
+#: ../calendar/gui/e-task-table.c:582
 msgid "Free"
 msgstr "Слободно"
 
-#: ../calendar/gui/e-cal-model-calendar.c:127
-#: ../calendar/gui/e-meeting-time-sel.c:528 ../calendar/gui/e-task-table.c:631
+#: ../calendar/gui/e-cal-model-calendar.c:154
+#: ../calendar/gui/e-meeting-time-sel.c:536 ../calendar/gui/e-task-table.c:583
 msgid "Busy"
 msgstr "Заузето"
 
@@ -4453,12 +4858,231 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ништа"
 
+#: ../calendar/gui/e-cal-ops.c:287
+msgid "Modifying an event"
+msgstr "Исправљам догађај"
+
+# mail:no-name-vfolder primary
+#: ../calendar/gui/e-cal-ops.c:291
+#| msgid "Missing name."
+msgid "Modifying a memo"
+msgstr "Исправљам белешку"
+
+#: ../calendar/gui/e-cal-ops.c:295
+msgid "Modifying a task"
+msgstr "Изправљам задатак"
+
+#: ../calendar/gui/e-cal-ops.c:394
+#| msgid "Removing attachments"
+msgid "Removing an event"
+msgstr "Уклањам догађај"
+
+#: ../calendar/gui/e-cal-ops.c:398
+#| msgid "Removing attachments"
+msgid "Removing a memo"
+msgstr "Уклањам белешку"
+
+#: ../calendar/gui/e-cal-ops.c:402
+#| msgid "Removing attachments"
+msgid "Removing a task"
+msgstr "Уклањам задатак"
+
+#: ../calendar/gui/e-cal-ops.c:493
+#, c-format
+#| msgid "Meeting information sent"
+msgid "Deleting an event"
+msgid_plural "Deleting %d events"
+msgstr[0] "Уклањам %d догађај"
+msgstr[1] "Уклањам %d догађаја"
+msgstr[2] "Уклањам %d догађаја"
+msgstr[3] "Уклањам догађај"
+
+#: ../calendar/gui/e-cal-ops.c:497
+#, c-format
+#| msgid "Delete Memo"
+msgid "Deleting a memo"
+msgid_plural "Deleting %d memos"
+msgstr[0] "Уклањам %d белешку"
+msgstr[1] "Уклањам %d белешке"
+msgstr[2] "Уклањам %d белешки"
+msgstr[3] "Уклањам белешку"
+
+#: ../calendar/gui/e-cal-ops.c:501
+#, c-format
+#| msgid "Delete Task"
+msgid "Deleting a task"
+msgid_plural "Deleting %d tasks"
+msgstr[0] "Уклањам %d задатак"
+msgstr[1] "Уклањам %d задатка"
+msgstr[2] "Уклањам %d задатака"
+msgstr[3] "Уклањам белешку"
+
+#: ../calendar/gui/e-cal-ops.c:704
+#, c-format
+#| msgid "Print this event"
+msgid "Pasting an event"
+msgid_plural "Pasting %d events"
+msgstr[0] "Убацујем %d догађај"
+msgstr[1] "Убацујем %d догађаја"
+msgstr[2] "Убацујем %d догађаја"
+msgstr[3] "Убацујем догађај"
+
+#: ../calendar/gui/e-cal-ops.c:719
+#, c-format
+#| msgid "Print this memo"
+msgid "Pasting a memo"
+msgid_plural "Pasting %d memos"
+msgstr[0] "Убацујем %d белешку"
+msgstr[1] "Убацујем %d белешке"
+msgstr[2] "Убацујем %d белешки"
+msgstr[3] "Убацујем белешку"
+
+#: ../calendar/gui/e-cal-ops.c:734
+#, c-format
+#| msgid "Print this task"
+msgid "Pasting a task"
+msgid_plural "Pasting %d tasks"
+msgstr[0] "Убацујем %d задатак"
+msgstr[1] "Убацујем %d задатка"
+msgstr[2] "Убацујем %d задатака"
+msgstr[3] "Убацујем задатак"
+
+#: ../calendar/gui/e-cal-ops.c:833
+#| msgid "Updating objects"
+msgid "Updating an event"
+msgstr "Ажурирам догађај"
+
+#: ../calendar/gui/e-cal-ops.c:837
+#| msgid "Updating objects"
+msgid "Updating a memo"
+msgstr "Ажурирам белешку"
+
+#: ../calendar/gui/e-cal-ops.c:841
+#| msgid "Updating objects"
+msgid "Updating a task"
+msgstr "Ажурирам задатак"
+
+#: ../calendar/gui/e-cal-ops.c:949
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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"
+msgid "Purging events"
+msgstr "Чистим догађаје"
+
+#: ../calendar/gui/e-cal-ops.c:1095
+#| msgid "Print Memos"
+msgid "Purging memos"
+msgstr "Чистим белешке"
+
+#: ../calendar/gui/e-cal-ops.c:1099
+#| msgid "Print Tasks"
+msgid "Purging tasks"
+msgstr "Чистим задатке"
+
+#: ../calendar/gui/e-cal-ops.c:1201
+#| msgid "Hide completed tasks"
+msgid "Expunging completed tasks"
+msgstr "Уклањам завршене задатке"
+
+#: ../calendar/gui/e-cal-ops.c:2062
+#, c-format
+msgid "Moving an event"
+msgid_plural "Moving %d events"
+msgstr[0] "Премештам %d догађај"
+msgstr[1] "Премештам %d догађаја"
+msgstr[2] "Премештам %d догађаја"
+msgstr[3] "Премештам догађај"
+
+#: ../calendar/gui/e-cal-ops.c:2063
+#, c-format
+#| msgid "Copying Items"
+msgid "Copying an event"
+msgid_plural "Copying %d events"
+msgstr[0] "Умножавам %d догађај"
+msgstr[1] "Умножавам %d догађаја"
+msgstr[2] "Умножавам %d догађаја"
+msgstr[3] "Умножавам догађај"
+
+#: ../calendar/gui/e-cal-ops.c:2069
+#, c-format
+#| msgid "Moving Items"
+msgid "Moving a memo"
+msgid_plural "Moving %d memos"
+msgstr[0] "Премештам %d белешку"
+msgstr[1] "Премештам %d белешке"
+msgstr[2] "Премештам %d белешки"
+msgstr[3] "Премештам белешку"
+
+#: ../calendar/gui/e-cal-ops.c:2070
+#, c-format
+#| msgid "Copying Items"
+msgid "Copying a memo"
+msgid_plural "Copying %d memos"
+msgstr[0] "Умножавам %d белешку"
+msgstr[1] "Умножавам %d белешке"
+msgstr[2] "Умножавам %d белешки"
+msgstr[3] "Умножавам белешку"
+
+#: ../calendar/gui/e-cal-ops.c:2076
+#, c-format
+#| msgid "Moving Items"
+msgid "Moving a task"
+msgid_plural "Moving %d tasks"
+msgstr[0] "Премештам %d задатак"
+msgstr[1] "Премештам %d задатка"
+msgstr[2] "Премештам %d задатака"
+msgstr[3] "Премештам задатак"
+
+#: ../calendar/gui/e-cal-ops.c:2077
+#, c-format
+#| msgid "Copying Items"
+msgid "Copying a task"
+msgid_plural "Copying %d tasks"
+msgstr[0] "Умножавам %d задатак"
+msgstr[1] "Умножавам %d задатка"
+msgstr[2] "Умножавам %d задатака"
+msgstr[3] "Умножавам задатак"
+
 # 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
+#: ../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"
 
@@ -4467,11 +5091,11 @@ msgstr "%a %d. %m. %Y. %H:%M:%S"
 # 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
+#: ../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/e-cell-date-edit-text.c:169
+#: ../calendar/gui/e-cell-date-edit-text.c:176
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4481,16 +5105,16 @@ msgstr ""
 "%s"
 
 #. 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/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:2633 ../calendar/gui/print.c:2653
+#: ../calendar/gui/print.c:2622 ../calendar/gui/print.c:2642
 msgid "am"
 msgstr "прп"
 
 #. 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/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:2638 ../calendar/gui/print.c:2655
+#: ../calendar/gui/print.c:2627 ../calendar/gui/print.c:2644
 msgid "pm"
 msgstr "поп"
 
@@ -4505,13 +5129,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: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:3019 ../calendar/gui/e-day-view-top-item.c:851
+#: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2089
 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:3744
 #, c-format
 msgid "Week %d"
 msgstr "%d. недеља"
@@ -4522,12 +5146,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:800
+#: ../calendar/gui/e-day-view-time-item.c:804
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i минутни размаци"
 
-#: ../calendar/gui/e-day-view-time-item.c:825
+#: ../calendar/gui/e-day-view-time-item.c:829
 msgid "Show the second time zone"
 msgstr "Прикажи другу временску зону"
 
@@ -4537,17 +5161,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:842
-#: ../modules/calendar/e-calendar-preferences.c:305
-#: ../modules/calendar/e-calendar-preferences.c:357
+#: ../calendar/gui/e-day-view-time-item.c:846
+#: ../modules/calendar/e-calendar-preferences.c:308
+#: ../modules/calendar/e-calendar-preferences.c:360
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ништа"
 
-#: ../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:880
+#: ../calendar/gui/e-timezone-entry.c:324
+#: ../modules/calendar/e-calendar-preferences.c:391
 msgid "Select..."
 msgstr "Изабери..."
 
@@ -4621,11 +5245,11 @@ msgstr "Не-учесник"
 msgid "Needs Action"
 msgstr "Потребна радња"
 
-#: ../calendar/gui/e-meeting-list-view.c:626
+#: ../calendar/gui/e-meeting-list-view.c:644
 msgid "Attendee                          "
 msgstr "Учесник                          "
 
-#: ../calendar/gui/e-meeting-list-view.c:681
+#: ../calendar/gui/e-meeting-list-view.c:699
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "МВОМ"
@@ -4634,85 +5258,85 @@ msgstr "МВОМ"
 msgid "In Process"
 msgstr "У току"
 
-#: ../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 ""
 "Унесите лозинку да приступите подацима „слободан/заузет“ на серверу „%s“ као "
 "корисник „%s“"
 
-#: ../calendar/gui/e-meeting-store.c:1919
+#: ../calendar/gui/e-meeting-store.c:1891
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Разлог неуспеха: %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 "Упишите лозинку"
 
-#: ../calendar/gui/e-meeting-time-sel.c:529
+#: ../calendar/gui/e-meeting-time-sel.c:537
 msgid "Out of Office"
 msgstr "Ван канцеларије"
 
-#: ../calendar/gui/e-meeting-time-sel.c:531
+#: ../calendar/gui/e-meeting-time-sel.c:539
 msgid "No Information"
 msgstr "Нема податка"
 
-#: ../calendar/gui/e-meeting-time-sel.c:566
+#: ../calendar/gui/e-meeting-time-sel.c:574
 msgid "O_ptions"
 msgstr "_Могућности"
 
-#: ../calendar/gui/e-meeting-time-sel.c:586
+#: ../calendar/gui/e-meeting-time-sel.c:594
 msgid "Show _only working hours"
 msgstr "Прикажи _само радне сате"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:607
 msgid "Show _zoomed out"
 msgstr "Прикажи _умањено"
 
-#: ../calendar/gui/e-meeting-time-sel.c:617
+#: ../calendar/gui/e-meeting-time-sel.c:625
 msgid "_Update free/busy"
 msgstr "_Ажурирај слободно/заузето"
 
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../calendar/gui/e-meeting-time-sel.c:642
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:654
+#: ../calendar/gui/e-meeting-time-sel.c:662
 msgid "_Autopick"
 msgstr "_Самоизбор"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:679
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:692
+#: ../calendar/gui/e-meeting-time-sel.c:700
 msgid "_All people and resources"
 msgstr "_Све људе и изворе"
 
-#: ../calendar/gui/e-meeting-time-sel.c:703
+#: ../calendar/gui/e-meeting-time-sel.c:711
 msgid "All _people and one resource"
 msgstr "Све _људе и један извор"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:722
 msgid "_Required people"
 msgstr "_Обавезне људе"
 
-#: ../calendar/gui/e-meeting-time-sel.c:724
+#: ../calendar/gui/e-meeting-time-sel.c:732
 msgid "Required people and _one resource"
 msgstr "Обавезне људе и _један извор"
 
-#: ../calendar/gui/e-meeting-time-sel.c:763
+#: ../calendar/gui/e-meeting-time-sel.c:771
 msgid "_Start time:"
 msgstr "_Време почетка:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:792
+#: ../calendar/gui/e-meeting-time-sel.c:800
 msgid "_End time:"
 msgstr "Време _завршетка:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2660
+#: ../calendar/gui/e-meeting-time-sel.c:2721
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -4721,7 +5345,7 @@ msgstr ""
 "Сажетак: %s\n"
 "Место: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3525
+#: ../calendar/gui/e-meeting-time-sel.c:2723 ../calendar/gui/print.c:3516
 #, c-format
 msgid "Summary: %s"
 msgstr "Сажетак: %s"
@@ -4750,46 +5374,46 @@ msgstr "Заједничко име"
 msgid "Language"
 msgstr "Језик"
 
-#: ../calendar/gui/e-memo-table.c:433
-#: ../modules/calendar/e-cal-shell-content.c:481
-#: ../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
+#: ../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
 msgid "Memos"
 msgstr "Белешке"
 
-#: ../calendar/gui/e-memo-table.c:514 ../calendar/gui/e-task-table.c:802
+#: ../calendar/gui/e-memo-table.c:455 ../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:601 ../calendar/gui/e-task-table.c:886
+#: ../calendar/gui/e-memo-table.c:540 ../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:620 ../calendar/gui/e-task-table.c:904
+#: ../calendar/gui/e-memo-table.c:560 ../calendar/gui/e-task-table.c:858
 msgid "Due: "
 msgstr "Рок: "
 
-#: ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-memo-table.c:683
 msgid "Cut selected memos to the clipboard"
 msgstr "Сече изабране белешке у списак исечака"
 
-#: ../calendar/gui/e-memo-table.c:747
+#: ../calendar/gui/e-memo-table.c:689
 msgid "Copy selected memos to the clipboard"
 msgstr "Умножава изабране белешке у списак исечака"
 
-#: ../calendar/gui/e-memo-table.c:753
+#: ../calendar/gui/e-memo-table.c:695
 msgid "Paste memos from the clipboard"
 msgstr "Убацује белешке из списка исечака"
 
-#: ../calendar/gui/e-memo-table.c:759
-#: ../modules/calendar/e-memo-shell-view-actions.c:588
+#: ../calendar/gui/e-memo-table.c:701
+#: ../modules/calendar/e-memo-shell-view-actions.c:531
 msgid "Delete selected memos"
 msgstr "Брише изабране белешке"
 
-#: ../calendar/gui/e-memo-table.c:765
+#: ../calendar/gui/e-memo-table.c:707
 msgid "Select all visible memos"
 msgstr "Бира све видљиве белешке"
 
@@ -4805,44 +5429,44 @@ msgstr "Кликните да додате белешку"
 #. * %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/gui/e-task-table.c:672 ../calendar/gui/print.c:2404
 #: ../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/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
 msgid "Tasks"
 msgstr "Задаци"
 
-#: ../calendar/gui/e-task-table.c:1039
+#: ../calendar/gui/e-task-table.c:998
 msgid "Cut selected tasks to the clipboard"
 msgstr "Сече изабране задатке у списак исечака"
 
-#: ../calendar/gui/e-task-table.c:1045
+#: ../calendar/gui/e-task-table.c:1004
 msgid "Copy selected tasks to the clipboard"
 msgstr "Умножава изабране задатке у списак исечака"
 
-#: ../calendar/gui/e-task-table.c:1051
+#: ../calendar/gui/e-task-table.c:1010
 msgid "Paste tasks from the clipboard"
 msgstr "Убацује задатке из списка исечака"
 
-#: ../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:656
 msgid "Delete selected tasks"
 msgstr "Брише изабране задатке"
 
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-task-table.c:1022
 msgid "Select all visible tasks"
 msgstr "Бира све видљиве задатке"
 
-#: ../calendar/gui/e-timezone-entry.c:334
+#: ../calendar/gui/e-timezone-entry.c:335
 msgid "Select Timezone"
 msgstr "Изабери временску зону"
 
@@ -4851,14 +5475,10 @@ 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:226 ../calendar/gui/print.c:2068
+#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2068
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2371
-msgid "Purging"
-msgstr "Брисање"
-
 #: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
 #: ../calendar/gui/itip-utils.c:841
 msgid "An organizer must be set."
@@ -4968,140 +5588,156 @@ msgstr "Подаци слободно/заузето (%s до %s)"
 msgid "iCalendar information"
 msgstr "Подаци иКалендара"
 
-#: ../calendar/gui/itip-utils.c:1147
+#: ../calendar/gui/itip-utils.c:1148
+#, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "Не могу да сачувам унос, нови догађај се сукобљава са неким другим."
 
-#: ../calendar/gui/itip-utils.c:1155
-#, c-format
-msgid "Unable to book a resource, error: %s"
-msgstr "Не могу да сачувам унос, грешка: %s"
+#: ../calendar/gui/itip-utils.c:1153
+#| msgid "Unable to book a resource, error: %s"
+msgid "Unable to book a resource, error: "
+msgstr "Не могу да сачувам унос, грешка: "
 
-#: ../calendar/gui/itip-utils.c:1327
+#: ../calendar/gui/itip-utils.c:1324
 msgid "You must be an attendee of the event."
 msgstr "Морате бити учесник догађаја."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/itip-utils.c:1918
+#| msgid "Sending message"
+msgid "Sending an event"
+msgstr "Шаљем догађај"
+
+#: ../calendar/gui/itip-utils.c:1922
+#| msgid "Sending message"
+msgid "Sending a memo"
+msgstr "Шаљем белешку"
+
+#: ../calendar/gui/itip-utils.c:1926
+#| msgid "Sending Email"
+msgid "Sending a task"
+msgstr "Шаљем задатак"
+
+#: ../calendar/gui/print.c:664
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:670
 msgid "31st"
 msgstr "31."
 
@@ -5109,102 +5745,102 @@ 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:730
 msgid "Mo"
 msgstr "По"
 
 #. G_DATE_TUESDAY
-#: ../calendar/gui/print.c:727
+#: ../calendar/gui/print.c:731
 msgid "Tu"
 msgstr "Ут"
 
 #. G_DATE_WEDNESDAY
-#: ../calendar/gui/print.c:728
+#: ../calendar/gui/print.c:732
 msgid "We"
 msgstr "Ср"
 
 #. G_DATE_THURSDAY
-#: ../calendar/gui/print.c:729
+#: ../calendar/gui/print.c:733
 msgid "Th"
 msgstr "Че"
 
 #. G_DATE_FRIDAY
-#: ../calendar/gui/print.c:730
+#: ../calendar/gui/print.c:734
 msgid "Fr"
 msgstr "Пе"
 
 #. G_DATE_SATURDAY
-#: ../calendar/gui/print.c:731
+#: ../calendar/gui/print.c:735
 msgid "Sa"
 msgstr "Су"
 
 #. G_DATE_SUNDAY
-#: ../calendar/gui/print.c:732
+#: ../calendar/gui/print.c:736
 msgid "Su"
 msgstr "Не"
 
 #. 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:3309
 msgid " to "
 msgstr " до "
 
 #. 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:3319
 msgid " (Completed "
 msgstr " (Завршено је "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3335
+#: ../calendar/gui/print.c:3325
 msgid "Completed "
 msgstr "Завршено је "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3345
+#: ../calendar/gui/print.c:3335
 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:3352
+#: ../calendar/gui/print.c:3342
 msgid "Due "
 msgstr "Рок "
 
-#: ../calendar/gui/print.c:3555
+#: ../calendar/gui/print.c:3546
 msgid "Attendees: "
 msgstr "Присутни: "
 
-#: ../calendar/gui/print.c:3599
+#: ../calendar/gui/print.c:3590
 #, c-format
 msgid "Status: %s"
 msgstr "Стање: %s"
 
-#: ../calendar/gui/print.c:3615
+#: ../calendar/gui/print.c:3606
 #, c-format
 msgid "Priority: %s"
 msgstr "Важност: %s"
 
-#: ../calendar/gui/print.c:3633
+#: ../calendar/gui/print.c:3624
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Постотак завршеног: %i"
 
-#: ../calendar/gui/print.c:3647
+#: ../calendar/gui/print.c:3638
 #, c-format
 msgid "URL: %s"
 msgstr "Адреса: %s"
 
-#: ../calendar/gui/print.c:3661
+#: ../calendar/gui/print.c:3652
 #, c-format
 msgid "Categories: %s"
 msgstr "Категорије: %s"
 
-#: ../calendar/gui/print.c:3672
+#: ../calendar/gui/print.c:3663
 msgid "Contacts: "
 msgstr "Контакти: "
 
@@ -5217,11 +5853,13 @@ msgstr "У току"
 msgid "% Completed"
 msgstr "% је завршено"
 
-#: ../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 "је веће од"
 
-#: ../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 "је мање од"
 
@@ -5229,178 +5867,182 @@ msgstr "је мање од"
 msgid "Appointments and Meetings"
 msgstr "Заказивање и састанци"
 
-#: ../calendar/importers/icalendar-importer.c:461
-#: ../calendar/importers/icalendar-importer.c:900
+#: ../calendar/importers/icalendar-importer.c:452
+#: ../calendar/importers/icalendar-importer.c:891
 msgid "Opening calendar"
 msgstr "Отварање календара"
 
-#: ../calendar/importers/icalendar-importer.c:609
+#: ../calendar/importers/icalendar-importer.c:600
 msgid "iCalendar files (.ics)"
 msgstr "Датотеке иКалендара (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:610
+#: ../calendar/importers/icalendar-importer.c:601
 msgid "Evolution iCalendar importer"
 msgstr "Увозник иКалендара Еволуције"
 
-#: ../calendar/importers/icalendar-importer.c:702
+#: ../calendar/importers/icalendar-importer.c:693
 msgid "Reminder!"
 msgstr "Подсетник!"
 
-#: ../calendar/importers/icalendar-importer.c:786
+#: ../calendar/importers/icalendar-importer.c:777
 msgid "vCalendar files (.vcs)"
 msgstr "Датотеке вКалендара (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:787
+#: ../calendar/importers/icalendar-importer.c:778
 msgid "Evolution vCalendar importer"
 msgstr "Увозник вКалендара Еволуције"
 
-#: ../calendar/importers/icalendar-importer.c:1064
+#: ../calendar/importers/icalendar-importer.c:1055
 msgid "Calendar Events"
 msgstr "Догађаји календара"
 
-#: ../calendar/importers/icalendar-importer.c:1108
+#: ../calendar/importers/icalendar-importer.c:1098
+msgid "Gnome Calendar"
+msgstr "Гномов календар"
+
+#: ../calendar/importers/icalendar-importer.c:1099
 msgid "Evolution Calendar intelligent importer"
 msgstr "Интелигентни увозник календара Еволуције"
 
-#: ../calendar/importers/icalendar-importer.c:1179
-#: ../calendar/importers/icalendar-importer.c:1493
+#: ../calendar/importers/icalendar-importer.c:1170
+#: ../calendar/importers/icalendar-importer.c:1484
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Састанак"
 
-#: ../calendar/importers/icalendar-importer.c:1179
-#: ../calendar/importers/icalendar-importer.c:1493
+#: ../calendar/importers/icalendar-importer.c:1170
+#: ../calendar/importers/icalendar-importer.c:1484
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Догађај"
 
-#: ../calendar/importers/icalendar-importer.c:1182
-#: ../calendar/importers/icalendar-importer.c:1494
+#: ../calendar/importers/icalendar-importer.c:1173
+#: ../calendar/importers/icalendar-importer.c:1485
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Задатак"
 
-#: ../calendar/importers/icalendar-importer.c:1185
-#: ../calendar/importers/icalendar-importer.c:1495
+#: ../calendar/importers/icalendar-importer.c:1176
+#: ../calendar/importers/icalendar-importer.c:1486
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Белешка"
 
-#: ../calendar/importers/icalendar-importer.c:1194
+#: ../calendar/importers/icalendar-importer.c:1185
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "има понављања"
 
-#: ../calendar/importers/icalendar-importer.c:1199
+#: ../calendar/importers/icalendar-importer.c:1190
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "је примерак"
 
-#: ../calendar/importers/icalendar-importer.c:1204
+#: ../calendar/importers/icalendar-importer.c:1195
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "има подсетнике"
 
-#: ../calendar/importers/icalendar-importer.c:1209
+#: ../calendar/importers/icalendar-importer.c:1200
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "има прилоге"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1222
+#: ../calendar/importers/icalendar-importer.c:1213
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Јавно"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1225
+#: ../calendar/importers/icalendar-importer.c:1216
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Лично"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1228
+#: ../calendar/importers/icalendar-importer.c:1219
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Поверљиво"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1232
+#: ../calendar/importers/icalendar-importer.c:1223
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Разврставање"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1237
-#: ../calendar/importers/icalendar-importer.c:1537
+#: ../calendar/importers/icalendar-importer.c:1228
+#: ../calendar/importers/icalendar-importer.c:1528
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Сажетак"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1243
+#: ../calendar/importers/icalendar-importer.c:1234
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Место"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1251
-#: ../calendar/importers/icalendar-importer.c:1532
+#: ../calendar/importers/icalendar-importer.c:1242
+#: ../calendar/importers/icalendar-importer.c:1523
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Почетак"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1262
+#: ../calendar/importers/icalendar-importer.c:1253
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Рок"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1274
+#: ../calendar/importers/icalendar-importer.c:1265
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Крај"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1284
+#: ../calendar/importers/icalendar-importer.c:1275
 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:1308
+#: ../calendar/importers/icalendar-importer.c:1299
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Завршено"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1316
+#: ../calendar/importers/icalendar-importer.c:1307
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "Адреса"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1327
-#: ../calendar/importers/icalendar-importer.c:1330
+#: ../calendar/importers/icalendar-importer.c:1318
+#: ../calendar/importers/icalendar-importer.c:1321
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Организатор"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1350
-#: ../calendar/importers/icalendar-importer.c:1353
+#: ../calendar/importers/icalendar-importer.c:1341
+#: ../calendar/importers/icalendar-importer.c:1344
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Учесници"
 
-#: ../calendar/importers/icalendar-importer.c:1367
+#: ../calendar/importers/icalendar-importer.c:1358
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Опис"
 
-#: ../calendar/importers/icalendar-importer.c:1527
+#: ../calendar/importers/icalendar-importer.c:1518
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Врста"
@@ -6299,7 +6941,8 @@ msgid "Asia/Kashgar"
 msgstr "Азија/Кашгар"
 
 #: ../calendar/zones.h:242
-msgid "Asia/Katmandu"
+#| msgid "Asia/Katmandu"
+msgid "Asia/Kathmandu"
 msgstr "Азија/Катманду"
 
 #: ../calendar/zones.h:243
@@ -6954,158 +7597,190 @@ msgstr "Пацифик/Волис"
 msgid "Pacific/Yap"
 msgstr "Пацифик/Јап"
 
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:212
 msgid "Save as..."
 msgstr "Сачувај као..."
 
-#: ../composer/e-composer-actions.c:277
+#: ../composer/e-composer-actions.c:336
 msgid "Close the current file"
 msgstr "Затворите тренутну датотеку"
 
-#: ../composer/e-composer-actions.c:282
+#: ../composer/e-composer-actions.c:341
 msgid "New _Message"
 msgstr "Нова _порука"
 
-#: ../composer/e-composer-actions.c:284
+#: ../composer/e-composer-actions.c:343
 msgid "Open New Message window"
 msgstr "Отвара прозор за нову поруку"
 
-#: ../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:1208
+#: ../shell/e-shell-window-actions.c:848
 msgid "_Preferences"
 msgstr "_Поставке"
 
-#: ../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 "Подеси Еволуцију"
 
-#: ../composer/e-composer-actions.c:298
+#: ../composer/e-composer-actions.c:357
 msgid "Save the current file"
 msgstr "Сачувајте тренутну датотеку"
 
-#: ../composer/e-composer-actions.c:303
+#: ../composer/e-composer-actions.c:362
 msgid "Save _As..."
 msgstr "Сачувај _као..."
 
-#: ../composer/e-composer-actions.c:305
+#: ../composer/e-composer-actions.c:364
 msgid "Save the current file with a different name"
 msgstr "Сачувајте тренутну датотеку под другим именом"
 
-#: ../composer/e-composer-actions.c:312
+#: ../composer/e-composer-actions.c:371
 msgid "Character _Encoding"
 msgstr "Ко_дна страна"
 
-#: ../composer/e-composer-actions.c:336
+#: ../composer/e-composer-actions.c:395
 msgid "Print Pre_view"
 msgstr "Преглед пред _штампу"
 
-#: ../composer/e-composer-actions.c:343
+#: ../composer/e-composer-actions.c:402
 msgid "Save as _Draft"
 msgstr "Сачувај као _нацрт"
 
-#: ../composer/e-composer-actions.c:345
+#: ../composer/e-composer-actions.c:404
 msgid "Save as draft"
 msgstr "Сачувајте као нацрт"
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:409
 msgid "S_end"
 msgstr "Пош_аљи"
 
-#: ../composer/e-composer-actions.c:352
+#: ../composer/e-composer-actions.c:411
 msgid "Send this message"
 msgstr "Пошаљите ову поруку"
 
-#: ../composer/e-composer-actions.c:360
+#: ../composer/e-composer-actions.c:419
 msgid "PGP _Encrypt"
 msgstr "ПГП _шифруј"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:421
 msgid "Encrypt this message with PGP"
 msgstr "Шифрујте ову поруку помоћу ПГП-а"
 
-#: ../composer/e-composer-actions.c:368
+#: ../composer/e-composer-actions.c:427
 msgid "PGP _Sign"
 msgstr "ПГП _потпиши"
 
-#: ../composer/e-composer-actions.c:370
+#: ../composer/e-composer-actions.c:429
 msgid "Sign this message with your PGP key"
 msgstr "Потпишите ову поруку помоћу ПГП кључа"
 
-#: ../composer/e-composer-actions.c:376
+#: ../composer/e-composer-actions.c:435
 msgid "_Picture Gallery"
 msgstr "Галерија _слика"
 
-#: ../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 "Приказује збирку слика које можете да превучете у вашу поруку"
 
-#: ../composer/e-composer-actions.c:384
+#: ../composer/e-composer-actions.c:443
 msgid "_Prioritize Message"
 msgstr "В_ажност поруке"
 
-#: ../composer/e-composer-actions.c:386
+#: ../composer/e-composer-actions.c:445
 msgid "Set the message priority to high"
 msgstr "Поставља важност поруке на високо"
 
-#: ../composer/e-composer-actions.c:392
+#: ../composer/e-composer-actions.c:451
 msgid "Re_quest Read Receipt"
 msgstr "Т_ражи повратницу"
 
-#: ../composer/e-composer-actions.c:394
+#: ../composer/e-composer-actions.c:453
 msgid "Get delivery notification when your message is read"
 msgstr "Прима извештај о достави када је порука прочитана"
 
-#: ../composer/e-composer-actions.c:400
+#: ../composer/e-composer-actions.c:459
 msgid "S/MIME En_crypt"
 msgstr "С/МИМЕ _шифруј"
 
-#: ../composer/e-composer-actions.c:402
+#: ../composer/e-composer-actions.c:461
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Шифрује ову поруку помоћу С/МИМЕ уверења за шифровање"
 
-#: ../composer/e-composer-actions.c:408
+#: ../composer/e-composer-actions.c:467
 msgid "S/MIME Sig_n"
 msgstr "С/МИМЕ _потпиши"
 
-#: ../composer/e-composer-actions.c:410
+#: ../composer/e-composer-actions.c:469
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Потписује ову поруку С/МИМЕ уверењем"
 
-#: ../composer/e-composer-actions.c:416
+#: ../composer/e-composer-actions.c:523
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
+#| msgid "Unicode"
+msgid "Unicode smileys"
+msgstr "Уникод смајли"
+
+#: ../composer/e-composer-actions.c:525
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
+msgid "Use Unicode characters for smileys."
+msgstr "Користи уникод знакове за смајлије."
+
+#: ../composer/e-composer-actions.c:531
 msgid "_Bcc Field"
 msgstr "_Бцц поље"
 
-#: ../composer/e-composer-actions.c:418
+#: ../composer/e-composer-actions.c:533
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Бира да ли је поље Бцц приказано"
 
-#: ../composer/e-composer-actions.c:424
+#: ../composer/e-composer-actions.c:539
 msgid "_Cc Field"
 msgstr "_Цц поље"
 
-#: ../composer/e-composer-actions.c:426
+#: ../composer/e-composer-actions.c:541
 msgid "Toggles whether the CC field is displayed"
 msgstr "Бира да ли је поље ЦЦ приказано"
 
-#: ../composer/e-composer-actions.c:432
+#: ../composer/e-composer-actions.c:547
+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"
+msgstr ""
+"Одређује да ли се приказује име особе или адресе електронске поште у пољу "
+"„Шаље“"
+
+#: ../composer/e-composer-actions.c:555
 msgid "_Reply-To Field"
 msgstr "Поље Одго_вор-за"
 
-#: ../composer/e-composer-actions.c:434
+#: ../composer/e-composer-actions.c:557
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Бира да ли је поље Одговор-за приказано"
 
-#: ../composer/e-composer-actions.c:493
+#: ../composer/e-composer-actions.c:618
 msgid "Save Draft"
 msgstr "Сачувај нацрт"
 
+#: ../composer/e-composer-from-header.c:109
+#: ../e-util/e-mail-signature-script-dialog.c:415
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
+#: ../mail/e-mail-config-identity-page.c:319
+#: ../mail/e-mail-config-summary-page.c:331
+msgid "_Name:"
+msgstr "_Име:"
+
 #: ../composer/e-composer-header-table.c:38
 msgid "Enter the recipients of the message"
 msgstr "Унесите примаоце поруке"
 
 #: ../composer/e-composer-header-table.c:40
 msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Унесите адресе које ће примити графитну копију (cc) поруке"
+msgstr "Унесите адресе које ће примити графитну копију (ЦЦ) поруке"
 
 #: ../composer/e-composer-header-table.c:43
 msgid ""
@@ -7115,7 +7790,7 @@ msgstr ""
 "Унесите адресе које ће примити графитну копију поруке без појављивања у "
 "листи прималаца поруке"
 
-#: ../composer/e-composer-header-table.c:771
+#: ../composer/e-composer-header-table.c:829
 msgid "Fr_om:"
 msgstr "Ш_аље:"
 
@@ -7123,44 +7798,44 @@ msgstr "Ш_аље:"
 # * 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 "_Одговор-за:"
 
-#: ../composer/e-composer-header-table.c:783
+#: ../composer/e-composer-header-table.c:841
 msgid "_To:"
 msgstr "_Прима:"
 
-#: ../composer/e-composer-header-table.c:789
+#: ../composer/e-composer-header-table.c:847
 msgid "_Cc:"
 msgstr "_Цц:"
 
-#: ../composer/e-composer-header-table.c:795
+#: ../composer/e-composer-header-table.c:853
 msgid "_Bcc:"
 msgstr "_Бцц:"
 
-#: ../composer/e-composer-header-table.c:800
+#: ../composer/e-composer-header-table.c:858
 msgid "_Post To:"
 msgstr "Објави _на:"
 
-#: ../composer/e-composer-header-table.c:804
+#: ../composer/e-composer-header-table.c:862
 msgid "S_ubject:"
 msgstr "На_слов:"
 
-#: ../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:504
 msgid "Si_gnature:"
 msgstr "Потп_ис:"
 
-#: ../composer/e-composer-name-header.c:234
+#: ../composer/e-composer-name-header.c:233
 msgid "Click here for the address book"
 msgstr "Кликните овде за адресар."
 
-#: ../composer/e-composer-post-header.c:183
+#: ../composer/e-composer-post-header.c:182
 msgid "Click here to select folders to post to"
 msgstr "Кликните овде да изаберете фасцикле за слање"
 
-#: ../composer/e-msg-composer.c:879
+#: ../composer/e-msg-composer.c:872
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -7168,7 +7843,7 @@ msgstr ""
 "Није могуће потписивање одлазеће поруке: није постављено уверење за "
 "потписивање за овај налог"
 
-#: ../composer/e-msg-composer.c:888
+#: ../composer/e-msg-composer.c:881
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7177,18 +7852,14 @@ msgstr ""
 "Није могуће шифровање одлазеће поруке: није постављено уверење за шифровање "
 "за овај налог"
 
-#: ../composer/e-msg-composer.c:1569 ../composer/e-msg-composer.c:1981
+#: ../composer/e-msg-composer.c:1595 ../composer/e-msg-composer.c:2367
 msgid "Compose Message"
 msgstr "Састави поруку"
 
-#: ../composer/e-msg-composer.c:4243
+#: ../composer/e-msg-composer.c:4710
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "Састављач у телу поруке не садржи текст, што не може бити измењено."
 
-#: ../composer/e-msg-composer.c:4943
-msgid "Untitled Message"
-msgstr "Неименована порука"
-
 #: ../composer/mail-composer.error.xml.h:1
 msgid "You cannot attach the file &quot;{0}&quot; to this message."
 msgstr "Не можете приложити датотеку „{0}“ овој поруци."
@@ -7254,7 +7925,7 @@ msgstr ""
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
-msgstr "Сигурно желите да одбаците поруку, насловљену „{0}“, коју састављате?"
+msgstr "Да ли желите да одбаците поруку коју састављате, под називом „{0}“?"
 
 #: ../composer/mail-composer.error.xml.h:15
 msgid ""
@@ -7276,68 +7947,75 @@ 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?"
+msgid "Are you sure you want to discard the message you are composing?"
+msgstr "Да ли желите да одбаците поруку коју састављате?"
+
+#: ../composer/mail-composer.error.xml.h:21
 msgid "Could not create message."
 msgstr "Не могу да направим поруку."
 
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:22
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr "Због „{0}“, можда буде потребно другачије подесити пошту."
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../composer/mail-composer.error.xml.h:23
 msgid "Could not read signature file &quot;{0}&quot;."
 msgstr "Не могу да прочитам датотеку потписа „{0}“."
 
-#: ../composer/mail-composer.error.xml.h:23
+#: ../composer/mail-composer.error.xml.h:24
 msgid "All accounts have been removed."
 msgstr "Сви налози су уклоњени."
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:25
 msgid "You need to configure an account before you can compose mail."
 msgstr "Морате да подесите налог пре састављања поруке."
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:26
 msgid "An error occurred while saving to your Outbox folder."
 msgstr "Дошло је до грешке током чувања у вашој фасцикли За слање."
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:27
 msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
 msgstr "Пријављена грешка бејаше „{0}“. Порука није послата."
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:28
 msgid "An error occurred while saving to your Drafts folder."
 msgstr "Дошло је до грешке током чувања у вашој фасцикли Нацрти."
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:29
 msgid ""
 "The reported error was &quot;{0}&quot;. The message has most likely not been "
 "saved."
 msgstr "Пријављена грешка бејаше „{0}“. Порука највероватније није сачувана."
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "Дошло је до грешке током слања. Како желите да наставите?"
 
-#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:156
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:170
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "Пријављена грешка бејаше „{0}“."
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Save to Outbox"
 msgstr "Сачувај _у „За слање“"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:33
 msgid "_Try Again"
 msgstr "_Покушај опет"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:34
 msgid "Your message was sent, but an error occurred during post-processing."
 msgstr "Ваша порука је послата, али је дошло до грешке током пост-обраде."
 
-#: ../composer/mail-composer.error.xml.h:34
+#: ../composer/mail-composer.error.xml.h:35
 msgid "Saving message to Outbox."
 msgstr "Чувам поруку у фасцикли За слање."
 
-#: ../composer/mail-composer.error.xml.h:35
+#: ../composer/mail-composer.error.xml.h:36
 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 +8025,43 @@ 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?"
+msgid "Are you sure you want to send the message?"
+msgstr "Да ли желите да пошаљете ову поруку?"
+
+#: ../composer/mail-composer.error.xml.h:38
+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 ""
+"Пречица на тастатури за слање порука. Када се притисне овај тастер слање "
+"поруке се зауставља уколико је то урађено случајно или се порука шаље."
+
+#: ../composer/mail-composer.error.xml.h:39
+#| msgid "Are you sure you want to delete this memo?"
+msgid "Are you sure you want to change the composer mode?"
+msgstr "Да ли желите да измените режим састављања поруке?"
+
+#: ../composer/mail-composer.error.xml.h:40
+msgid ""
+"Turning HTML mode off will cause the text to lose all formatting. Do you "
+"want to continue?"
+msgstr ""
+"Уколико искључиите ХТМЛ режим форматирање текста ће бити изгубљено. Да ли "
+"желите да наставите?"
+
+#: ../composer/mail-composer.error.xml.h:41
+#| msgid "Address formatting"
+msgid "_Don't lose formatting"
+msgstr "_Задржи формат"
+
+#: ../composer/mail-composer.error.xml.h:42
+#| msgid "Address formatting"
+msgid "Lose _formatting"
+msgstr "З_анемари формат"
+
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
 msgstr "Обавештење аларма Еволуције"
@@ -7355,27 +8070,7 @@ msgstr "Обавештење аларма Еволуције"
 msgid "Calendar event notifications"
 msgstr "Обавештења о догађајима календара"
 
-#: ../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 ""
-"Еволуција је програм за управљање личним подацима који обезбеђује обједињену "
-"функционалност поште, календара и адресара."
-
-#: ../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 ""
-"Еволуција подржава широк опсег записа индустријских стандардних података и "
-"мрежних протокола за размену информација, са нагласком на сагласност "
-"стандарда и безебдност. Еволуција може такође глатко да се обједини са "
-"Мајкрософтовом разменом посредством проширења „Услуге веб размене“ "
-
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1032
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1092
 #: ../modules/mailto-handler/evolution-mailto-handler.c:210
 #: ../shell/e-shell-window-private.c:242
 msgid "Evolution"
@@ -7384,7 +8079,7 @@ msgstr "Еволуција"
 # bug(slobo): tooltip би могао да буде и „Пошаљите е-поруку пријатељима и поред
 # овако уштогљених оригинала
 # msgstr "Пакет пословних програма"
-#: ../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 "Пакет групе"
 
@@ -7397,7 +8092,6 @@ msgid "Manage your email, contacts and schedule"
 msgstr "Управљајте вашом поштом, контактима и обавезама"
 
 #: ../data/evolution.desktop.in.in.h:5
-#| msgid "mail;calendar;contact;addressbook;task;"
 msgid "email;calendar;contact;addressbook;task;"
 msgstr "ел.пошта;пошта;календар;контакт;адресар;задатак;"
 
@@ -7511,6 +8205,65 @@ msgstr "Прикажи површ за преглед"
 msgid "Whether to show the preview pane."
 msgstr "Да ли ће бити приказана површ за преглед."
 
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:21
+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 "Одређује да ли да прикаже картицу са уверењима у уређивачу"
+
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
 msgid "Convert mail messages to Unicode"
 msgstr "Пребацује поруке поште у Уникод"
@@ -7523,6 +8276,21 @@ msgstr ""
 "Пребацује текст поруке у Уникод UTF-8 ради обједињавања spam/ham предмета "
 "чији су узрок различити кодни распореди."
 
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:3
+msgid "Full path command to run Bogofilter"
+msgstr "Пуна путања до наредбе за Бого-филтер"
+
+#: ../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 ""
+"Пуна путања до наредбе за покретање Бого-филтера (Bogofilter). Уколико није "
+"је постављена користи се подразумевана путања задата током компајлирања "
+"програма, обично /usr/bin/bogofilter. Наредба не треба да садржи додатне "
+"опције."
+
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
 msgid "Save directory for reminder audio"
 msgstr "Директоријум чувања за звук подсетника"
@@ -7626,10 +8394,110 @@ 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"
+msgstr ""
+"Време у које почиње радни дан. Даје се у двадесетчетворочасовном облику "
+"HHMM, од 0000 до 2359, или -1 уколико желите да користите day-start-hour и "
+"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"
+msgstr ""
+"Време у које се завршава радни дан. Даје се у двадесетчетворочасовном "
+"облику, од 0000 до 2359, или -1 уколико желите да користите day-end-hour и "
+"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"
+msgstr ""
+"Време у које се завршава радни дан. Даје се у двадесетчетворочасовном "
+"облику, од 0000 до 2359, или -1 уколико желите да користите day-start-hour и "
+"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 "Час којим се завршава радни дан у недељу"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:40
 msgid "The second timezone for a Day View"
 msgstr "Друга временска зона у Дневном прегледу"
 
-#: ../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 +8505,19 @@ msgstr ""
 "Приказује другу временску зону у Дневном прегледу, уколико је подешена. "
 "Вредност је слична оној која је коришћена у кључу „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 "Недавно коришћене друге временске зоне у Дневном прегледу"
 
-#: ../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 "Списак недавно коришћених других временских зона у Дневном прегледу"
 
-#: ../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 "Највећи број недавно коришћених временских зона за памћење"
 
-#: ../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 +8525,117 @@ msgstr ""
 "Највећи број недавно коришћених временских зона за памћење у списку "
 "„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 "Подразумевана вредност подсетника"
 
-#: ../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 "Број јединица за одређивање подразумеваног подсетника"
 
-#: ../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 "Подразумеване јединице подсетника"
 
-#: ../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 "Јединице за подразумевани подсетник, „минути“, „сати“ или „дани“"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:33
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
+#| msgid "Default reminder value"
+msgid "Default reminder snooze interval, in minutes"
+msgstr "Подразумевано време за одлагање подсетника у минутима"
+
+#: ../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 ""
+"Подразумевано време за одлагање подсетника у минутима, које се уноси у "
+"прозорче са обевештењима подсетника"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Прикажи поље категорије у уређивачу догађаја/састанака/задатака"
 
-#: ../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 "Да ли да прикаже поље категорије у уређивачу догађаја/састанака"
 
-#: ../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 "Прикажи поље улоге у уређивачу догађаја/задатака/састанака"
 
-#: ../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 ""
 "Да ли да прикаже поље са улогом у уређивачу догађаја/задатака/састанака"
 
-#: ../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 "Прикажи поље Молим одговорите у уређивачу догађаја/задатака/састанака"
 
-#: ../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 ""
 "Да ли да прикаже поље Молим одговорите у уређивачу догађаја/задатака/"
 "састанака"
 
-#: ../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 "Прикажи поље стања у уређивачу догађаја/задатака/састанака"
 
-#: ../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 "Да ли да прикаже поље статуса у уређивачу догађаја/задатака/састанака"
 
-#: ../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 "Прикажи поље временске зоне у уређивачу догађаја/састанака"
 
-#: ../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 "Да ли да прикаже поље временске зоне у уређивачу догађаја/састанака"
 
-#: ../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 "Прикажи поље типа у уређивачу догађаја/задатака/састанака"
 
-#: ../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 "Да ли да прикаже поље типа у уређивачу догађаја/задатака/састанака"
 
-#: ../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 "Сакриј завршене задатке"
 
-#: ../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 "Да ли да сакрије завршене задатке у прегледу задатака"
 
-#: ../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 "Сакриј јединице задатака"
 
-#: ../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 ""
 "Јединице за одређивање када сакрити задужења, „минути“, „сати“ или „дани“"
 
-#: ../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 "Сакриј вредност задатака"
 
-#: ../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 "Број јединица за одређивање када сакрити задатке"
 
-#: ../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 "Позиција положене површи"
 
-#: ../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 +8643,54 @@ msgstr ""
 "Позиција положене површи, између дела календара за датум и списка задатака "
 "када није постављен месечни преглед, у пикселима"
 
-#: ../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 "Последње време подсетника"
 
-#: ../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 "Време последњег покретања подсетника, у „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 "Боја Маркус Бејнс линије - Дневни преглед"
 
-#: ../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 "Боја за исцртавање Маркус Бејнс линије у Дневном прегледу"
 
-#: ../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 "Боја Маркус Бејнс линије - трака времена"
 
-#: ../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 ""
 "Боја за исцртавање Маркус Бејнс линије у траци времена (подразумевано је "
 "празно)"
 
-#: ../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 "Маркус Бејнс линија"
 
-#: ../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 "Да ли да у календару исцрта Маркус Бејнс линију (на тренутно време)"
 
-#: ../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 "Позиција прегледа белешки (вертикално)"
 
-#: ../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 "Позиција прегледа задатака када је постављено хоризонтално"
 
-#: ../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 "Стил размештаја белешке"
 
-#: ../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 +8700,19 @@ msgstr ""
 "„0“ (класичан преглед) поставља преглед испод списка белешки. "
 "„1“ (вертикалан преглед) поставља преглед поред списка белешки"
 
-#: ../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 "Позиција прегледа белешке (вертикално)"
 
-#: ../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 "Позиција прегледа бечешки када је постављено вертикално"
 
-#: ../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 "Позиција положене површи Месечног прегледа"
 
-#: ../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 +8720,43 @@ msgstr ""
 "Позиција положене површи, између прегледа и дела календара за датум и списка "
 "задатака у месечном прегледу, у пикселима"
 
-#: ../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 "Да ли да прикаже Месечни преглед по недељама, уместо месецима"
 
-#: ../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 "Да ли да прикаже Месечни преглед по недељама, уместо месецима"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:90
 msgid "Reminder programs"
 msgstr "Програми подсетника"
 
-#: ../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 "Програми који могу бити покренути подсетницима"
 
-#: ../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 "Приказује подсетнике у обавештајној зони"
 
-#: ../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 "Да ли да користи обавештајну зону за приказивање подсетника"
 
-#: ../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 "Жељена ставка новог дугмета"
 
-#: ../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 "Назив жељене ставке новог дугмета траке алата"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 msgid "Primary calendar"
 msgstr "Примарни календар"
 
-#: ../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 +8764,33 @@ msgstr ""
 "ЈИБ изабраног (или „примарног“) календара у бочној површи у прегледу "
 "„Календар“"
 
-#: ../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 "Примарни списак белешки"
 
-#: ../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 ""
 "ЈИБ изабране (или „примарне“) белешке у бочној површи у прегледу „Белешке“"
 
-#: ../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 "Примарни списак задатака"
 
-#: ../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 ""
 "ЈИБ изабраног (или „примарног“) задатка у бочној површи у прегледу „Задаци“"
 
-#: ../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 "Модел адреса за слободно/заузето време"
 
-#: ../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 +8799,21 @@ msgstr ""
 "Модел адресе за коришћење у повраћају времена слободно/заузето, %u се "
 "замењује корисничким делом електронске адресе, а %d доменом"
 
-#: ../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 "Догађаји понављања искошеним словима"
 
-#: ../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 ""
 "Приказује дане са догађајима који се понављају искошеним словним ликом у "
 "доњем левом календару"
 
-#: ../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 "Опсег претраге за претраживање на основу времена у годинама"
 
-#: ../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 +8823,61 @@ msgstr ""
 "тренутно изабраног дана приликом претраге за још једним дешавањем; основно "
 "је десет година"
 
-#: ../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 "Приказује времена заказаног завршетка у недељним и месечним прегледима"
 
-#: ../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 ""
 "Да ли да прикаже времена завршетка догађаја у недељним и месечним прегледима"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
 msgid "Show the memo preview pane"
 msgstr "Приказује преглед белешки"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 msgid "If \"true\", show the memo preview pane in the main window"
 msgstr "Уколико је изабрано, у главном прозору приказује преглед белешки"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Show the task preview pane"
 msgstr "Приказује преглед задатака"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 msgid "If \"true\", show the task preview pane in the main window"
 msgstr "Уколико је изабрано, у главном прозору приказује преглед задатака"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr ""
 "Приказује број недеље у дневном прегледу, у прегледу радне недеље и "
 "претраживачу датума"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr "Да ли да покаже бројеве недеља на разним местима у календару"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid "Vertical position for the tag pane"
 msgstr "Усправан положај за површ ознаке"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 msgid "Highlight tasks due today"
 msgstr "Истицање задатака у току дана"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 msgid ""
 "Whether highlight tasks due today with a special color (task-due-today-color)"
 msgstr ""
 "Да ли ће задаци у току дана бити истакнути посебном бојом (боја-задатка-у-"
 "току-дана)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 msgid "Tasks due today color"
 msgstr "Боја задатка за данас"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 msgid ""
 "Background color of tasks that are due today, in \"#rrggbb\" format. Used "
 "together with task-due-today-highlight"
@@ -8004,15 +8885,15 @@ msgstr ""
 "Боја позадине задужења за данас, у облику „#rrggbb“. Користи се заједно са "
 "истицањем-задатка-у-току-дана"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 msgid "Task preview pane position (horizontal)"
 msgstr "Позиција прегледа задатака (хоризонтално)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid "Task layout style"
 msgstr "Стил размештаја"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 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 +8903,43 @@ msgstr ""
 "„0“ (класичан преглед) поставља преглед испод списка задатака. "
 "„1“ (вертикалан преглед) поставља преглед поред списка задатака"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 msgid "Task preview pane position (vertical)"
 msgstr "Позиција прегледа задатака (вертикално)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 msgid "Position of the task preview pane when oriented vertically"
 msgstr "Позиција прегледа задатака када је постављено вертикално"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#| msgid "Hide completed tasks"
+msgid "Show reminders for completed tasks"
+msgstr "Прикажи подсетнике за завршене задатке"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+msgid ""
+"Whether to show reminders for completed tasks. When set to false, reminders "
+"for completed tasks are suppressed."
+msgstr ""
+"Да лида прикаже подсетнике за завршене задатке. Када је стављено на нетачно "
+"(false), неће се приказивати подсетници за завршене задатке."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
 msgid "Highlight overdue tasks"
 msgstr "Истицање неиспуњених задатака"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
 msgid ""
 "Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr ""
 "Да ли ће неиспуњени задаци бити истакнути посебном бојом (боја-неиспуњеног-"
 "задатка)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 msgid "Overdue tasks color"
 msgstr "Боја неиспуњених задатака"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
 msgid ""
 "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
 "together with task-overdue-highlight."
@@ -8053,19 +8947,19 @@ msgstr ""
 "Боја позадине неиспуњених задатака, у облику „#rrggbb“. Користи се заједно "
 "са истицањем-неиспуњених-задатка."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
 msgid "Time divisions"
 msgstr "Подела времена"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
 msgid "Intervals shown in Day and Work Week views, in minutes"
 msgstr "Интервали приказани у дневним и недељним прегледима, у минутима"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
 msgid "Timezone"
 msgstr "Временска зона"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
 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 +8967,75 @@ msgstr ""
 "Подразумевана временска зона коју календар користи за датум и време, као "
 "непреведено место базе временске зоне Олсен, као „Америка/Њујорк“"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
 msgid "Twenty four hour time format"
 msgstr "24-часовни облик времена"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
 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:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
 msgid "Birthday and anniversary reminder"
 msgstr "Подсетник на рођендане и годишњице"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "Да ли да постави подсетник на рођендане и годишњице"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
 msgid "Default appointment reminder"
 msgstr "Подразумевани подсетник за заказивање"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
 msgid "Whether to set a default reminder for appointments"
 msgstr "Да ли да постави подразумевани подсетник за заказивања"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
 msgid "Use system timezone"
 msgstr "Користи временску зону система"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
 msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr "Користи временску зону система уместо оне која је изабрана у Еволуцији"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
 msgid "First day of the week"
 msgstr "Први дан седмице"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
 msgid "Monday is a work day"
 msgstr "Понедељак је радни дан"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
 msgid "Tuesday is a work day"
 msgstr "Уторак је радни дан"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
 msgid "Wednesday is a work day"
 msgstr "Среда је радни дан"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
 msgid "Thursday is a work day"
 msgstr "Четвртак је радни дан"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
 msgid "Friday is a work day"
 msgstr "Петак је радни дан"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
 msgid "Saturday is a work day"
 msgstr "Субота је радни дан"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
 msgid "Sunday is a work day"
 msgstr "Недеља је радни дан"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
 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:133
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"week-start-day-name\" instead."
@@ -8149,11 +9043,11 @@ msgstr ""
 "Овај кључ је застарео у издању 3.10 и не треба више да се користи. Уместо "
 "њега користите „week-start-day-name“."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
 msgid "(Deprecated) Work days"
 msgstr "(Застарело) Радни дани"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
 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-"
@@ -8275,14 +9169,18 @@ 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."
-msgstr "Препознаје смајлиће у тексту и замењује их сликама."
+#| msgid "Recognize emoticons in text and replace them with images."
+msgid ""
+"Recognize emoticons in text and replace them with images or Unicode "
+"characters."
+msgstr ""
+"Препознаје смајлиће у тексту и замењује их сликама или Уникод знаковима."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
 msgid "Attribute message"
 msgstr "Приложена порука"
 
-#: ../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 +9188,11 @@ msgstr ""
 "Текст који се убацује када одговарате на поруку, приписујући поруку "
 "оригиналном аутору"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
 msgid "Forward message"
 msgstr "Прослеђује поруку"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows"
@@ -8302,11 +9200,11 @@ msgstr ""
 "Текст који се убацује приликом прослеђивања поруке, који је рекао да "
 "прослеђена порука следи"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
 msgid "Original message"
 msgstr "Оригинална порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows"
@@ -8314,11 +9212,11 @@ msgstr ""
 "Текст који се убацује приликом прослеђивања поруке (објава при врху), који "
 "је рекао да прослеђена порука следи"
 
-#: ../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 "Груписање одговора Одговори на списку"
 
-#: ../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 +9227,11 @@ msgstr ""
 "„Одговор групи“ на траци алата које ће покушати да одговори само на дописну "
 "листи преко које сте навикли да примате примерак поруке на коју одговарате."
 
-#: ../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 "Поставља курсор на дно одговора"
 
-#: ../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 +9241,22 @@ msgstr ""
 "одговара на поруку. Ово утврђује да ли ће бити постављен на врх или на дно "
 "поруке."
 
-#: ../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 "Увек тражи повратницу"
 
-#: ../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 "Да ли се повратница подразумевано додаје свакој поруци."
 
-#: ../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 "Подразумевано слање ХТМЛ поште"
 
-#: ../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 "Шаље ХТМЛ пошту по подразумеваној вредности."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
-msgid "Spell checking color"
-msgstr "Боја за проверу правописа"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
-msgid "Underline color for misspelled words when using inline spelling."
-msgstr "Боја за подвлачење правописних грешки приликом провере правописа."
-
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
 msgid "Spell checking languages"
 msgstr "Језици за проверу правописа"
@@ -8377,33 +9267,49 @@ msgstr "Списак ознака језика речника који се ко
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:31
 msgid "Show \"Bcc\" field when sending a mail message"
-msgstr "Приказивање поља „Bcc“ при слању поруке"
+msgstr "Приказивање поља „Бцц“ при слању поруке"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:32
 msgid ""
 "Show the \"Bcc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
-"Приказује поље „Bcc“ при слању поруке. Ово се поставља из изборника "
+"Приказује поље „Бцц“ при слању поруке. Ово се поставља из изборника "
 "„Преглед“ након избора налога поште."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
 msgid "Show \"Cc\" field when sending a mail message"
-msgstr "Приказивање поља „Cc“ при слању поруке"
+msgstr "Приказивање поља „Цц“ при слању поруке"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
 msgid ""
 "Show the \"Cc\" field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
-"Приказује поље „Bcc“ при слању поруке. Ово се поставља из изборника "
+"Приказује поље „Бцц“ при слању поруке. Ово се поставља из изборника "
 "„Преглед“ након избора налога поште."
 
 #: ../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."
+msgstr ""
+"Приказује поље „Шаље“ са именом контакта при слању поруке. Ово се поставља "
+"из менија „Преглед“ након избора налога поште."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Приказивање поља „Одговор за“ када шаље поруку"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -8411,11 +9317,11 @@ msgstr ""
 "Приказује поље „Одговор за“ при слању на поруке. Ово се поставља из "
 "изборника „Преглед“ након избора налога поште."
 
-#: ../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 "Приказивање поља „Шаље“ при слању на дописну листу"
 
-#: ../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 +9329,11 @@ msgstr ""
 "Приказује поље „Шаље“ при слању на дописну листу. Ово се поставља из "
 "изборника „Преглед“ након избора налога дописне листе."
 
-#: ../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 "Приказивање поља „Одговор за“ при слању на дописнна списку"
 
-#: ../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 +9341,11 @@ msgstr ""
 "Приказује поље „Одговор за“ при слању на дописну листу. Ово се поставља из "
 "изборника „Преглед“ након избора налога дописне листе."
 
-#: ../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 "Дигитално потписује одговоре када је потписана оригинална порука"
 
-#: ../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 +9353,11 @@ msgstr ""
 "Сам укључује ПГП или С/МИМЕ потписе када одговара на поруке које су такође "
 "ПГП или С/МИМЕ потписане."
 
-#: ../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 "Кодирање назива датотека на начин Аутлука/Гпоште"
 
-#: ../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 +9368,24 @@ msgstr ""
 "како би исправно приказали називе са УТФ-8 словима које шаље Еволуција, "
 "пошто се не придржавају РФЦ 2231, него користе неисправан стандард РФЦ 2047."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+#| msgid "Saving message to Outbox."
+msgid "Send messages through Outbox folder"
+msgstr "Шаљи поруку кроз фасциклу За слање"
+
+#: ../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 ""
+"Увек чува поруку у фасциклу „За слање“ приликом слања, што омогућава "
+"кориснику да пошаље поруку по потреби."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
 msgid "Put personalized signatures at the top of replies"
 msgstr "Поставља персонализоване потписе изнад одговора"
 
-#: ../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 +9395,11 @@ msgstr ""
 "се одговара на поруку. Ово утврђује да ли ће бити постављен на врх или на "
 "дно поруке."
 
-#: ../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 "Не додаје раздвојник потписа"
 
-#: ../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 +9407,11 @@ msgstr ""
 "Изаберите ову опцију у случају да не желите додавање раздвојника испред "
 "потписа приликом писања поруке."
 
-#: ../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 "Занемарује листу „Одговор-за:“"
 
-#: ../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 +9429,11 @@ msgstr ""
 "користите радњу „Одговори на листу“ онда ће то да уради. Врши се упоређивање "
 "заглавље „Одговор-за“ са заглављем „Списак објава“, ако постоји."
 
-#: ../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 "Списак локализованих „Одг“"
 
-#: ../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 +9443,66 @@ msgstr ""
 "прескочене у тексту приликом одговарања на поруку, као додатак стандардном "
 "„Одг“ префиксу. Један пример је „SV,AV“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+#| msgid "Enable express mode"
+msgid "Enable developer mode"
+msgstr "Укључи режим за програмере"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+msgid ""
+"Enables some hidden actions and tools aimed for development and debugging."
+msgstr ""
+"Укључује неке скривене радње и алате који су намењени програмерима и "
+"исправљању грешака у програму."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+msgid "Number of characters for wrapping"
+msgstr "Број знакова за прелом"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+msgid "Will autowrap lines after given number of characters."
+msgstr "Аутоматски прелама линије текста након задатог броја знакова."
+
+#: ../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 ""
+"Број За и ЦЦ примаоца након кога се појављује „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 ""
+"Када се поставља питање. Када брон За и ЦЦ примаоца достигне ову вредност."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+msgid "Whether to always show Sign and Encrypt buttons on the toolbar"
+msgstr ""
+"Да ли се приказују дугмићи за потпис и шифровање унутар палете са алата"
+
+#: ../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 ""
+"Уколико је постављено на тачно (true), дугмићи за потпис и шифровање помоћу "
+"ПГП или С/МИМЕ ће увек бити приказани унутар траке са алатима састављача "
+"порука. У супротном ће бити приказани само када се користе."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Save file format for drag-and-drop operation"
 msgstr "Формат датотеке чувања за радњу превлачења и убацивања"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid "Can be either 'mbox' or 'pdf'."
 msgstr "Може бити „mbox“ или „pdf“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Show image animations"
 msgstr "Приказивање анимираних слика"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -8544,11 +9510,11 @@ msgstr ""
 "Омогућава анимиране слике у ХТМЛ пошти. Многим корисницима сметају анимиране "
 "слике и уместо њих желе непокретне слике."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Enable or disable type ahead search feature"
 msgstr "Укључује или искључује могућност тражења куцања унапред"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -8556,11 +9522,11 @@ msgstr ""
 "Омогућава претраживање из бочне површи, што доноси интерактивност у претрази "
 "назива фасцикли."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Enable or disable magic space bar"
 msgstr "Укључује или искључује магичну размакницу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -8568,73 +9534,73 @@ msgstr ""
 "Укључите ово да би размакницом померали текст поруке при прегледању, као и "
 "списак порука и фасцикли."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 "Омогућити да користе слична подешавања приказа листе поруке за све фасцикле"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "Омогућити да користе слична подешавања приказа листе поруке за све фасцикле."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Mark citations in the message \"Preview\""
 msgstr "Означава цитате у прегледу поруке"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Означава цитате у прегледу поруке."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Citation highlight color"
 msgstr "Боја истицања цитата"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Citation highlight color."
 msgstr "Боја за истицања цитата."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Enable/disable caret mode"
 msgstr "Укључује/искључује приказ курсора"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Омогућава приказ курсора, тако да видите курсор док читате поруку."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Default charset in which to display messages"
 msgstr "Подразумевани скуп знакова за приказ порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Default charset in which to display messages."
 msgstr "Подразумевани скуп знакова за приказ порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "Самостално учитава слике за ХТМЛ поруке преко ХТТП-а"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Show Animations"
 msgstr "Приказивање анимација"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Show animated images as animations."
 msgstr "Приказује анимиране слике као анимације."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "Show all message headers"
 msgstr "Приказивање свих заглавља порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "Show all the headers when viewing a messages."
 msgstr "Приказује сва заглавља при прегледу порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "List of headers to show when viewing a message."
 msgstr "Списак заглавља за приказивање при прегледу поруке."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 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 +9610,76 @@ msgstr ""
 "која указује да ли је заглавље укључено. Искључена заглавља нису приказана "
 "уприликом прегледа пруке, али су још увек на списку у поставкама."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Show photo of the sender"
 msgstr "Приказивање слике пошиљаоца"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Приказује слику пошиљаоца у окну за читање поруке."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#| msgid "Show photo of the sender"
+msgid "Search gravatar.com for photo of the sender"
+msgstr "Претражује gravatar.com како би нашао слику пошиљаоца"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+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
 msgid "Mark as Seen after specified timeout"
 msgstr "Означава поруку виђеном после наведеног рока"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Mark as Seen after specified timeout."
 msgstr "Означава поруку виђеном после наведеног рока."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#| msgid "Mark as Seen after specified timeout"
+msgid "Mark as Seen always after specified timeout"
+msgstr "Увек означава поруку виђеном после наведеног рока"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+msgid ""
+"If set to true, the selected message will be set as unread after the timeout "
+"also after the folder change."
+msgstr ""
+"Уколико је постављено на тачно (true), изабрана порука ће бити означена као "
+"непрочитана након одређено времена и након измене фасцикле."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Timeout for marking messages as seen"
 msgstr "Време за означавање порука као виђеним"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "Време у милисекундама за које ће поруке бити означене као виђеним."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Sender email-address column in the message list"
 msgstr "Приказ колоне е-адреса пошиљаоца у списку порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 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:86
-msgid ""
-"Determines whether to use the same fonts for both \"From\" and \"Subject\" "
-"lines in the \"Messages\" column in vertical view"
-msgstr ""
-"Утврђује да ли да користи исти фонт у пољима „Шаље“ and „Наслов“ у усправном "
-"прегледу колоне „Поруке“"
-
-#: ../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 ""
-"Утврђује да ли да користи исти фонт у пољима „Шаље“ and „Наслов“ у усправном "
-"прегледу колоне „Поруке“."
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Show deleted messages in the message-list"
 msgstr "Приказивање обрисаних порука у листи порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Приказује обрисане поруке (као прецртане) у листи порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Enable Unmatched search folder"
 msgstr "Укључи непоклопљене фасцикле претраге"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
@@ -8714,11 +9687,11 @@ msgstr ""
 "Укључује непоклопљене фасцикле претраге унутар фасцикли претраге. Не ради "
 "ништа ако је су искључене фасцикле претраге."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Скрива преглед по фасциклама и уклања избор"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 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 +9699,31 @@ msgstr ""
 "Овак кључ је прочитан једном и потом враћен на „false“ (нетачно). Ово уклања "
 "пошту са списка и преглед за ту фасциклу."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Height of the message-list pane"
 msgstr "Висина површи листе порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Height of the message-list pane."
 msgstr "Висина површи за листе порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Whether message headers are collapsed in the user interface"
 msgstr "Да ли су заглавља поруке скупљена у корисничком сучељу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Width of the message-list pane"
 msgstr "Ширина површи списка порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Width of the message-list pane."
 msgstr "Ширина површи списка порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Layout style"
 msgstr "Стил размештаја"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 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 +9734,47 @@ msgstr ""
 "порука. 0 — (класичан преглед) смешта ову површ испода списка порука. 1 — "
 "(вертикалан преглед) смешта површ поред списка порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Variable width font"
 msgstr "Фонт променљиве величине"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "The variable width font for mail display."
 msgstr "Фонт променљиве величине за приказ поште."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Terminal font"
 msgstr "Фонт терминала"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "The terminal font for mail display."
 msgstr "Фонт терминала за приказ поште."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Use custom fonts"
 msgstr "Коришћење сопствених фонтова"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Use custom fonts for displaying mail."
 msgstr "Користи прилагођене фонтове за приказ поште."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Сажима приказ адреса у TO/CC/BCC"
+msgstr "Сажима приказ адреса у За/ЦЦ/БЦЦ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr ""
-"Врши сажимање приказа адреса у TO/CC/BCC на број одређен у address_count "
+"Врши сажимање приказа адреса у За/ЦЦ/БЦЦ на број одређен у address_count "
 "(број адреса)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Број адреса за приказ у КО/ЦЦ/БЦЦ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -8809,11 +9782,11 @@ msgstr ""
 "Ово подешава број адреса за приказ у подразумеваном прегледу списка порука, "
 "после чега је приказано „...“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Thread the message-list based on Subject"
 msgstr "Приказ поруке према наслову расправе"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 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 +9794,11 @@ msgstr ""
 "Да ли покушати приказ расправе по наслову када поруке не садрже заглавља „In-"
 "Reply-To“ или „References“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Default value for thread expand state"
 msgstr "Подразумевана вредност за раширену расправу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -8833,11 +9806,11 @@ msgstr ""
 "Ово подешавање одређује да ли ће нити подразумевано бити раширене или "
 "скупљене. Еволуција захтева поновно покретање."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Да ли се поруке нижу на основу последње поруке у расправи"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 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 +9819,27 @@ msgstr ""
 "Ово подешавање одређује да ли ће нити бити разврстани по последњој поруци "
 "једне нити, уместо по датуму. Еволуција захтева поновно покретање."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+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."
+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 ""
+"Ово подешавање одређује да ли ће расправе нижег нивоа бити разврстани "
+"растући, уместо на истом начин као унутар родитељских нити."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Ређа налоге азбучним редом у стаблу фасцикле"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 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 +9851,27 @@ msgstr ""
 "изузетком фасцикли „На овом рачунару“ и „Потражи“, у супротном налози бивају "
 "поређани на основу поретка који је задао корисник"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Log filter actions"
 msgstr "Дневник радњи филтера"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Log filter actions to the specified log file."
 msgstr "Бележи радње филтера у наведену датотеку дневника."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Logfile to log filter actions"
 msgstr "Дневник датотека за бележење радњи филтера"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Logfile to log filter actions."
 msgstr "Дневник датотека за бележење радњи филтера."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Flush Outbox after filtering"
 msgstr "Празни слање након филтрирања"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 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 +9881,57 @@ msgstr ""
 "ове фасцикле ће се догодити само ако се користи нека радња филтера "
 "„Проследи“ и отприлике један минут после призивања последње радње."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Default forward style"
 msgstr "Подразумевани стил прослеђивања"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Default reply style"
 msgstr "Подразумевани стил одговора"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+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."
+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
 msgid "Prompt on empty subject"
 msgstr "Поставља упит када је наслов празан"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 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:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Prompt when emptying the trash"
 msgstr "Поставља упит приликом пражњења смећа"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "Поставља упит кориснику када покуша да испразни смеће."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Prompt when user expunges"
 msgstr "Поставља упит при пражњењу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Поставља упит кориснику када покуша да испразни фасциклу."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "Упитаће пре слања примаоцима који нису унешени као адресе поште"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 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 +9939,19 @@ msgstr ""
 "Омогућава/онемогућава понављање упозорења када покушавате да пошаљете поруку "
 "примаоцима који нису унешени као адресе поште."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Prompt when user only fills Bcc"
-msgstr "Поставља упит када корисник унесе само невидљиву графитну копију (Bcc)"
+msgstr "Поставља упит када корисник унесе само невидљиву графитну копију (Бцц)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 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:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Поставља упит када корисник покуша да пошаље нежељени ХТМЛ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -8957,12 +9959,12 @@ msgstr ""
 "Поставља упит када корисник покуша да пошаље ХТМЛ поруку примаоцима који "
 "можда не желе да примају ХТМЛ пошту."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Поставља упит кориснику када покуша да отвори 10 или више порука одједном"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 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 +9972,19 @@ msgstr ""
 "Уколико корисник покуша да отвори 10 или више порука одједном, питаће га да "
 "ли заиста жели то да уради."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Prompt while marking multiple messages"
 msgstr "Поставља упит при означавању више порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Укључује или искључује упозорење при означавању више порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Prompt when deleting messages in search folder"
 msgstr "Поставља упит код брисања порука из фасцикле претраге"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 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 +9993,12 @@ msgstr ""
 "Омогућава/онемогућава понављање упозорења да је брисање поруке из фасцикле "
 "претраге трајно, а не само уклањање из резултата претраге."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 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:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 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 +10010,12 @@ msgstr ""
 "фасцикли превлачењем и убацивањем у стабло фасцикли без питања, или „ask“ — "
 "(или свака друга вредност) питаће корисника."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 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:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 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 +10027,11 @@ msgstr ""
 "фасцикли превлачењем и убацивањем у стабло фасцикли без питања, или „ask“ — "
 "(или свака друга вредност) питаће корисника."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Prompt when replying privately to list messages"
 msgstr "Поставља упит када одговарате приватно на листу порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 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 +10039,11 @@ msgstr ""
 "Омогућава/онемогућава понављање упозорења да шаљете приватан одговор на "
 "поруку која је стигла са дописне листе."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Поставља упит када дописна листа одузме приватне одговоре"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 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 +10053,50 @@ msgstr ""
 "одговор на поруку која је стигла са дописне листе, али у листи заглавље "
 "„Одговор-за“ је подешено да вас преусмери да одговорите на листу."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Prompt when replying to many recipients"
 msgstr "Поставља упит када одговарате већем броју прималаца"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 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:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+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"
+msgid ""
+"It disables/enables the repeated prompts to warn that you are switching "
+"composer mode and the content needs to lose its formatting."
+msgstr ""
+"Омогућава/онемогућава понављање упозорења када покушавате да се пребаците у "
+"режим састављача и при томе изгубите форматирање садржаја."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#| msgid "Prompt when replying to many recipients"
+msgid "Prompt when sending to many To and CC recipients"
+msgstr "Упозорава када шаљете е-поруку великом броју прималаца"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+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 ""
+"Омогућава или онемогућава упозорење када се порука шаље на велики број "
+"пошиљаоца наведених у пољима „За“ или „ЦЦ“. Вредност „composer-many-to-cc-"
+"recips-num“ одређује праг за упозорење."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid ""
 "Policy for automatically closing the message browser window when forwarding "
 "or replying to the displayed message."
@@ -9070,42 +10104,42 @@ msgstr ""
 "Политика за самостално затварање прозора прегледника порука приликом "
 "прослеђивања или одговарања на приказану поруку."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid "Empty Trash folders on exit"
 msgstr "Празни фасцикле са смећем на излазу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Празни све фасцикле са смећем при затварању Еволуције."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Најмање дана између пражњења смећа на излазу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Најмање време између пражњења смећа на излазу, у данима."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid "Last time Empty Trash was run"
 msgstr "Последње време пражњења смећа"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 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:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 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:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Level beyond which the message should be logged."
 msgstr "Ниво након којег се порука заводи у дневник."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -9113,11 +10147,11 @@ msgstr ""
 "Може имати три могуће вредности: 0 — за грешке, 1 — за упозорења и 2 — за "
 "поруке о дијагнози квара."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "Show original \"Date\" header value."
 msgstr "Приказује оригиналну вредност заглавља датума."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 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 +10161,11 @@ msgstr ""
 "се временске зоне разликују). Иначе увек приказује вредност заглавља „Датум“ "
 "према поставкама и временској зони корисника."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "List of Labels and their associated colors"
 msgstr "Списак ознака и њима додељених боја"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 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 +10173,46 @@ msgstr ""
 "Списак ознака које познаје поштански део Еволуције. Списак садржи низове "
 "облика име:боја где боја користи ХТМЛ хекса кодирање."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Check incoming mail being junk"
 msgstr "Врши проверу да ли је пристигла пошта ђубре"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid "Run junk test on incoming mail."
 msgstr "Проверава да ли има ђубрета у долазној пошти."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid "Empty Junk folders on exit"
 msgstr "Празни фасцикле са ђубретом при излазу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Празни све фасцикле са ђубретом при затварању Еволуције."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Најмање дана између пражњења ђубрета на излазу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Најмање време између пражњења ђубрета на излазу, у данима."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Last time Empty Junk was run"
 msgstr "Време последњег пражњења ђубрета"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 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:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "The default plugin for Junk hook"
 msgstr "Подразумевани додатак куке за ђубре"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 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 +10222,11 @@ msgstr ""
 "прикључци. Уколико је поменути подразумевани прикључак искључен, преостали "
 "доступни прикључци неће бити активирани."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Утврђује да ли у адресару да прегледа адресе пошиљаоца"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 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 +10238,7 @@ msgstr ""
 "самодопуњавање. Може бити споро ако су адресари (рецимо ЛДАП) означени за "
 "самодопуњавање."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -9212,7 +10246,7 @@ msgstr ""
 "Утврђује да ли само у адресару да прегледа адресе у потрази за нежељеном "
 "поштом"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 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 +10256,13 @@ msgstr ""
 "да ли да се адреса тражи само у локалном адресару како би се издвојила пошта "
 "примљена од познатих пошиљалаца од оне нежељене."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Утврђује да ли да користи прилагођена заглавља приликом провере нежељене "
 "поште"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 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 +10271,11 @@ msgstr ""
 "Утврђује да ли да користи прилагођена заглавља приликом провере нежељене "
 "поште. Уколико је опција укључена а заглавља наведена, провера ће бити бржа."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid "Custom headers to use while checking for junk."
 msgstr "Прилагођена заглавља за употребу приликом провере нежељене поште."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -9249,31 +10283,31 @@ msgstr ""
 "Прилагођена заглавља за употребу приликом провере нежељене поште. Елементи "
 "списка су низ формата „headername=value“ (име заглавља=вредност)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid "UID string of the default account."
 msgstr "ЈИБ низ подразумеваног налога."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 msgid "Save directory"
 msgstr "Директоријум чувања"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 msgid "Directory for saving mail component files."
 msgstr "Директоријум за чување датотека модула за пошту."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 msgid "Composer load/attach directory"
 msgstr "Директоријум састављача за учитавање/прилагање"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid "Directory for loading/attaching files to composer."
 msgstr "Директоријум за учитавање/прилагање датотека у састављач."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid "Check for new messages on start"
 msgstr "Врши проверу за новим порукама приликом покретања"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -9281,11 +10315,11 @@ msgstr ""
 "Да ли ће вршити проверу за новим порукама приликом покретања Еволуције. Ово "
 "укључује и слање порука из фасцикле Послато."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "Check for new messages in all active accounts"
 msgstr "Врши проверу за новим порукама у свим активним налозима"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 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 +10330,11 @@ msgstr ""
 "покретања Еволуције. Ова опција се користи само заједно са "
 "„send_recv_on_start“ (пошаљи_прими_при_покретању) опцијом."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid "Server synchronization interval"
 msgstr "Интервал усаглашавања са сервером"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -9308,11 +10342,53 @@ msgstr ""
 "Контролише учесталост усклађивања локалних измена са мрежним сервером поште. "
 "Интервал мора бити најмање 30 секунди."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
+#| msgid "Confirm _when expunging a folder"
+msgid "Allow expunge in virtual folders"
+msgstr "Дозволи пражњење виртуелних фасцикли"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+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 ""
+"Дозвољава пражњење виртуелних фасцикли, што значи да можете позвати наредбу "
+"Фасцикла -> Избаци и над виртуелним фасциклама. При томе ће наредба бити "
+"покренута над свим фасциклама и за све избрисане поруке у виртуелној "
+"фасцикли, не само за обрисане поруке које припадају виртуелној фасцикли."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../mail/mail-config.ui.h:9
+msgid "Inherit theme colors in HTML mode"
+msgstr "Наследи боју теме из ХТМЛ режима"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+msgid ""
+"When enabled the theme colors for background, text and links are sent in "
+"resulting HTML formatted message."
+msgstr ""
+"Када је омогућено боја позадине, текста и везе ће бити послата у крајњој "
+"ХТМЛ поруци."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+msgid "An Archive folder for On This Computer folders."
+msgstr "Фасцикла Архива унутар фасцикле На овом рачунару."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+msgid ""
+"An Archive folder to use for Messages|Archive... feature when in an On This "
+"Computer folder."
+msgstr ""
+"Фасцикла Архива која се користи за поруке|архиве... могућност се јавља "
+"унутар фасцикле На овом рачунару."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 msgid "(Deprecated) Default forward style"
 msgstr "(Застарело) Подразумевани стил прослеђивања"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"forward-style-name\" instead."
@@ -9320,11 +10396,11 @@ msgstr ""
 "Овај кључ је застарео у издању 3.10 и не треба више да се користи. Уместо "
 "њега користите „forward-style-name“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 msgid "(Deprecated) Default reply style"
 msgstr "(Застарело) Подразумевани стил одговора"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"reply-style-name\" instead."
@@ -9332,11 +10408,11 @@ msgstr ""
 "Овај кључ је застарео у издању 3.10 и не треба више да се користи. Уместо "
 "њега користите „reply-style-name“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "(Застарело) Списак произвољних заглавља и да ли су укључена."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"show-headers\" instead."
@@ -9344,11 +10420,11 @@ msgstr ""
 "Овај кључ је застарео у издању 3.10 и не треба више да се користи. Уместо "
 "њега користите „show-headers“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "(Застарело) Учитава слике за ХТМЛ поруке преко ХТТП-а"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../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 "
 "\"image-loading-policy\" instead."
@@ -9356,7 +10432,7 @@ msgstr ""
 "Овај кључ је застарео у издању 3.10 и не треба више да се користи. Уместо "
 "њега користите „image-loading-policy“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
@@ -9364,7 +10440,7 @@ msgstr ""
 "(Застарело) Пита да ли да затвори прозор са поруком када корисник прослеђује "
 "или одговара на поруку приказану у прозору."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../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 "
 "\"browser-close-on-reply-policy\" instead."
@@ -9666,7 +10742,7 @@ msgstr "Полазна фасцикла избирача датотека"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Полазна фасцикла за прозорчиће избирача датотека."
 
-#: ../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:324
 msgid "Start in offline mode"
 msgstr "Започиње рад ван мреже"
 
@@ -9757,9 +10833,38 @@ msgstr "Користи само локалне провере спама."
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Користи само локалне провере спама (без DNS-а)."
 
-#: ../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
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
+msgid "Full path command to run spamassassin"
+msgstr "Пуна путања до наредбе за убицу непожељних порука (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 ""
+"Пуна путања до наредбе за убицу непожељних порука (spamassassin). Уколико "
+"није одређено, користи се путања која је одређена током компајлирања "
+"програма, обично /usr/bin/spamassassin. Наредба не треба да садржи додатне "
+"опције."
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
+msgid "Full path command to run sa-learn"
+msgstr "Пуна путања до наредбе 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 ""
+"Пуна путања до наредбе sa-learn. Уколико није одређено, користи се путања "
+"која је одређена током компајлирања програма, обично /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"
@@ -9768,7 +10873,7 @@ msgstr[1] "Прилози"
 msgstr[2] "Прилози"
 msgstr[3] "Прилог"
 
-#: ../em-format/e-mail-formatter-attachment.c:406
+#: ../em-format/e-mail-formatter-attachment.c:425
 msgid "Display as attachment"
 msgstr "Прикажи као прилог"
 
@@ -9781,8 +10886,8 @@ msgid "Play the attachment in embedded audio player"
 msgstr "Пусти прилог у уграђеном програму"
 
 #: ../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 "Шаље"
 
@@ -9790,7 +10895,7 @@ msgstr "Шаље"
 msgid "(no subject)"
 msgstr "(без наслова)"
 
-#: ../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 "Поруку шаље „%s“ на име „%s“"
@@ -9814,8 +10919,6 @@ msgstr "Обликује део као РФЦ822 поруку"
 #: ../em-format/e-mail-formatter-print.c:53
 #: ../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 "Назив"
@@ -9825,70 +10928,50 @@ msgstr "Назив"
 msgid "Size"
 msgstr "Величина"
 
-#: ../em-format/e-mail-formatter-print-headers.c:143
-msgid "GPG signed"
-msgstr "ГПГ потписано"
-
-#: ../em-format/e-mail-formatter-print-headers.c:149
-msgid "GPG encrpyted"
-msgstr "ГПГ шифровано"
-
-#: ../em-format/e-mail-formatter-print-headers.c:155
-msgid "S/MIME signed"
-msgstr "С/МИМЕ потписано"
-
-#: ../em-format/e-mail-formatter-print-headers.c:161
-msgid "S/MIME encrpyted"
-msgstr "С/МИМЕ шифровано"
-
-#: ../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 "Безбедност"
-
-#: ../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 "Наслов"
 
 #. 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:1484
 msgid "Mailer"
 msgstr "Пошиљалац"
 
 #: ../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 "Богати текст"
 
 #: ../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 "Приказује део као обогаћени текст"
 
 #: ../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 "ХТМЛ"
 
 #: ../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 "Обликује део као ХТМЛ"
 
-#: ../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 "Обичан текст"
 
-#: ../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 "Обликује део као обичан текст"
 
@@ -9997,7 +11080,7 @@ msgstr ""
 "у догледно време види садржај ове поруке."
 
 #: ../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 "Прегледај _уверење"
 
@@ -10013,18 +11096,43 @@ msgstr "Извор"
 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:49 ../modules/mail/em-mailer-prefs.c:66
+#: ../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
 msgid "Cc"
 msgstr "Цц"
 
-#: ../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-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 "Бцц"
 
+#: ../em-format/e-mail-formatter-utils.c:564
+msgid "GPG signed"
+msgstr "ГПГ потписано"
+
+#: ../em-format/e-mail-formatter-utils.c:570
+#| msgid "GPG encrpyted"
+msgid "GPG encrypted"
+msgstr "ГПГ шифровано"
+
+#: ../em-format/e-mail-formatter-utils.c:576
+msgid "S/MIME signed"
+msgstr "С/МИМЕ потписано"
+
+#: ../em-format/e-mail-formatter-utils.c:582
+#| msgid "S/MIME encrpyted"
+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
+msgid "Security"
+msgstr "Безбедност"
+
 #: ../em-format/e-mail-parser-application-mbox.c:87
 #, c-format
 msgid "Error parsing MBOX part: %s"
@@ -10035,12 +11143,12 @@ msgstr "Грешка обраде МБОКС дела: %s"
 msgid "Could not parse S/MIME message: %s"
 msgstr "Не могу да обрадим С/МИМЕ поруку: %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 "Не могу да обрадим ПГП поруку: %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 +11201,42 @@ msgstr "Не могу да обрадим ПГП/МИМЕ поруку: %s"
 msgid "Unsupported signature format"
 msgstr "Неподржан облик потписа"
 
-#: ../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 "Одговор"
 
-#: ../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 "Датум"
 
-#: ../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 "Групе вести"
 
-#: ../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 "Лице"
 
-#: ../em-format/e-mail-part-utils.c:508
+#: ../em-format/e-mail-part-utils.c:544
 #, c-format
 msgid "%s attachment"
 msgstr "%s прилог"
 
-#: ../e-util/e-send-options.ui.h:3
-msgid "Standard"
-msgstr "Обично"
-
-#: ../e-util/e-send-options.ui.h:6
-msgid "Proprietary"
-msgstr "Власничко"
-
-#: ../e-util/e-send-options.ui.h:8
-msgid "Secret"
-msgstr "Тајно"
-
-#: ../e-util/e-send-options.ui.h:9
-msgid "Top Secret"
-msgstr "Строго поверљиво"
-
-#: ../e-util/e-send-options.ui.h:10
-msgid "For Your Eyes Only"
-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: Used in send options dialog
-#: ../e-util/e-send-options.ui.h:12
-msgctxt "send-options"
-msgid "None"
-msgstr "Ништа"
-
-#: ../e-util/e-send-options.ui.h:13
-msgid "Mail Receipt"
-msgstr "Признаница поште"
-
-#: ../e-util/e-send-options.ui.h:15
-msgid "R_eply requested"
-msgstr "Захтеван је о_дговор"
-
-#: ../e-util/e-send-options.ui.h:16
-msgctxt "ESendOptionsWithin"
-msgid "Wi_thin"
-msgstr "Ун_утар"
-
-#: ../e-util/e-send-options.ui.h:17
-msgctxt "ESendOptionsWithin"
-msgid "days"
-msgstr "дана"
-
-#: ../e-util/e-send-options.ui.h:18
-msgid "_When convenient"
-msgstr "Када је з_годно"
-
-#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:847
-msgid "Replies"
-msgstr "Одговори"
-
-#: ../e-util/e-send-options.ui.h:20
-msgid "_Delay message delivery"
-msgstr "_Одложи испоруку поруке"
-
-#: ../e-util/e-send-options.ui.h:21
-msgctxt "ESendOptionsAfter"
-msgid "_After"
-msgstr "_После"
-
-#: ../e-util/e-send-options.ui.h:22
-msgctxt "ESendOptionsAfter"
-msgid "days"
-msgstr "дана"
-
-#: ../e-util/e-send-options.ui.h:23
-msgid "_Set expiration date"
-msgstr "Постави _рок"
-
-#: ../e-util/e-send-options.ui.h:24
-msgctxt "ESendOptions"
-msgid "_Until"
-msgstr "_До"
-
-#: ../e-util/e-send-options.ui.h:25
-msgid "Delivery Options"
-msgstr "Опције испоруке"
-
-#: ../e-util/e-send-options.ui.h:26
-msgid "_Priority:"
-msgstr "_Важност:"
-
-#: ../e-util/e-send-options.ui.h:27
-msgid "_Classification:"
-msgstr "_Класификација:"
-
-#: ../e-util/e-send-options.ui.h:28
-msgid "Gene_ral Options"
-msgstr "Опш_те опције"
-
-#: ../e-util/e-send-options.ui.h:29
-msgid "Creat_e a sent item to track information"
-msgstr "На_прави послату ставку за праћење податка"
-
-#: ../e-util/e-send-options.ui.h:30
-msgid "_Delivered"
-msgstr "_Испоручено"
-
-#: ../e-util/e-send-options.ui.h:31
-msgid "Deli_vered and opened"
-msgstr "Испо_ручено и отворено"
-
-#: ../e-util/e-send-options.ui.h:32
-msgid "_All information"
-msgstr "_Сви подаци"
-
-#: ../e-util/e-send-options.ui.h:33
-msgid "A_uto-delete sent item"
-msgstr "А_утоматски обриши послату ставку"
-
-#: ../e-util/e-send-options.ui.h:34
-msgid "Status Tracking"
-msgstr "Праћење статуса"
-
-#: ../e-util/e-send-options.ui.h:35
-msgid "_When opened:"
-msgstr "Када је о_творено:"
-
-#: ../e-util/e-send-options.ui.h:36
-msgid "When decli_ned:"
-msgstr "Када је _одбијено:"
-
-#: ../e-util/e-send-options.ui.h:37
-msgid "When co_mpleted:"
-msgstr "Кад је _завршено:"
-
-#: ../e-util/e-send-options.ui.h:38
-msgid "When acce_pted:"
-msgstr "Када је _прихваћено:"
-
-#: ../e-util/e-send-options.ui.h:39
-msgid "Return Notification"
-msgstr "Повратно обавештење"
-
-#: ../e-util/e-send-options.ui.h:40
-msgid "Sta_tus Tracking"
-msgstr "Праћење ста_туса"
-
-#: ../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 "_Примени"
-
-#: ../e-util/e-table-config.ui.h:4
-msgid "_Sort..."
-msgstr "_Разврстај..."
-
-#: ../e-util/e-table-config.ui.h:5
-msgid "_Group By..."
-msgstr "_Групиши по..."
-
-#: ../e-util/e-table-config.ui.h:6
-msgid "_Fields Shown..."
-msgstr "Приказана _поља..."
-
-#: ../e-util/e-table-config.ui.h:9
-msgid "Clear _All"
-msgstr "Очисти _све"
-
-#: ../e-util/e-table-config.ui.h:10
-msgid "_Show field in View"
-msgstr "_Прикажи поље у прегледу"
-
-#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1753
-msgid "Ascending"
-msgstr "Растуће"
-
-#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1753
-msgid "Descending"
-msgstr "Опадајуће"
-
-#: ../e-util/e-table-config.ui.h:13
-msgid "Group Items By"
-msgstr "Групиши ставке по"
-
-#: ../e-util/e-table-config.ui.h:14
-msgid "Show _field in View"
-msgstr "Прикажи _поље у прегледу"
-
-#: ../e-util/e-table-config.ui.h:15
-msgid "Then By"
-msgstr "Онда по"
-
-#: ../e-util/e-table-config.ui.h:16
-msgid "Show field i_n View"
-msgstr "Прикажи поље _у прегледу"
-
-#: ../e-util/e-table-config.ui.h:17
-msgid "Show field in _View"
-msgstr "Прикажи поље у п_регледу"
-
-#: ../e-util/e-table-config.ui.h:18
-msgid "Sort"
-msgstr "Разврстај"
-
-#: ../e-util/e-table-config.ui.h:19
-msgid "Clear All"
-msgstr "Очисти све"
-
-#: ../e-util/e-table-config.ui.h:20
-msgid "Sort Items By"
-msgstr "Разврстај ставке по"
-
-#: ../e-util/e-timezone-dialog.ui.h:1
-msgid "Select a Time Zone"
-msgstr "Изаберите временску зону"
-
-#: ../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 ""
-"Користите леви тастер миша да увећате мапу и изаберете временску зону.\n"
-"Користите десни тастер миша за умањивање."
-
-#: ../e-util/e-timezone-dialog.ui.h:6
-msgid "Time Zones"
-msgstr "Временске зоне"
-
-#: ../e-util/e-timezone-dialog.ui.h:7
-msgid "_Selection"
-msgstr "_Избор"
-
-#: ../e-util/e-timezone-dialog.ui.h:8
-msgid "Timezone drop-down combination box"
-msgstr "Прозорче за подешавање временске зоне"
-
-#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1243
-#: ../mail/em-utils.c:229
-msgid "Incoming"
-msgstr "Долазно"
-
-#: ../e-util/filter.ui.h:2
-msgid "the current time"
-msgstr "тренутно време"
-
-#: ../e-util/filter.ui.h:3
-msgid "the time you specify"
-msgstr "време које одредите"
-
-#: ../e-util/filter.ui.h:4
-msgid "a time relative to the current time"
-msgstr "време у односу на тренутно време"
-
-# bug: plural-forms
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:83
-msgid "seconds"
-msgstr "секунде"
-
-#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
-msgid "weeks"
-msgstr "недеље"
-
-#: ../e-util/filter.ui.h:10
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
-msgid "months"
-msgstr "месеци"
-
-#: ../e-util/filter.ui.h:11
-msgid "years"
-msgstr "године"
-
-#: ../e-util/filter.ui.h:12
-msgid "ago"
-msgstr "пре"
-
-#: ../e-util/filter.ui.h:13
-msgid "in the future"
-msgstr "у будућности"
-
-#: ../e-util/filter.ui.h:14
-msgid "Show filters for mail:"
-msgstr "Прикажи пропуснике поште:"
-
-#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
-msgid "_Filter Rules"
-msgstr "Пр_авила филтера"
-
-#: ../e-util/filter.ui.h:23
-msgid "Compare against"
-msgstr "Упореди са"
-
-#: ../e-util/filter.ui.h:24
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Датум поруке ће бити упоређен са\n"
-"тренутним временом када се филтрирање десило."
-
-#: ../e-util/filter.ui.h:26
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Датум поруке ће бити упоређен са\n"
-"00:00 наведеног датума."
-
-#: ../e-util/filter.ui.h:28
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Датум поруке ће бити упоређен са\n"
-"временом када се филтрирање десило."
-
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
-msgid "_Create new view"
-msgstr "_Направи нови преглед"
-
-#: ../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 "_Име:"
+#: ../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 "_Замени постојећи преглед"
+#: ../e-util/ea-calendar-item.c:326
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Календар: од %s до %s"
 
-#: ../e-util/e-activity-proxy.c:308
-#: ../modules/mail/e-mail-shell-view-actions.c:1724
-msgid "Cancel"
-msgstr "Откажи"
+#: ../e-util/ea-calendar-item.c:363
+msgid "evolution calendar item"
+msgstr "ставка календара еволуције"
 
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:258
@@ -10482,24 +11268,99 @@ msgstr "%s (отказујем)"
 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%% завршено)"
 
+#: ../e-util/e-activity-proxy.c:352
+#: ../modules/mail/e-mail-shell-view-actions.c:1851
+msgid "Cancel"
+msgstr "Откажи"
+
 #. 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 "Затворите ову поруку (Напусти)"
 
-#: ../e-util/e-attachment-bar.c:659 ../e-util/e-attachment-paned.c:702
+# 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:661 ../e-util/e-attachment-paned.c:704
+#: ../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
+msgid "Attached message"
+msgstr "Приложена порука"
+
+#: ../e-util/e-attachment.c:2152 ../e-util/e-attachment.c:3149
+#| msgid "Import cancelled."
+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
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../e-util/e-attachment.c:2393 ../e-util/e-attachment.c:3442
+msgid "A load operation is already in progress"
+msgstr "Операција учитавања је већ у току"
+
+#: ../e-util/e-attachment.c:2401 ../e-util/e-attachment.c:3450
+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
+#, c-format
+msgid "Could not open '%s'"
+msgstr "Не могу да отворим „%s“"
+
+#: ../e-util/e-attachment.c:2812
+#, c-format
+msgid "Could not open the attachment"
+msgstr "Не могу да отворим прилог"
+
+#: ../e-util/e-attachment.c:3459
+msgid "Attachment contents not loaded"
+msgstr "Садржај прилога није учитан"
+
+# * found, so just bail completely.
+#: ../e-util/e-attachment.c:3550
+#, c-format
+msgid "Could not save '%s'"
+msgstr "Не могу да сачувам „%s“"
+
+#: ../e-util/e-attachment.c:3553
+#, c-format
+msgid "Could not save the attachment"
+msgstr "Не могу да сачувам прилог"
+
 #: ../e-util/e-attachment-dialog.c:317
 msgid "Attachment Properties"
 msgstr "Особине прилога"
@@ -10512,45 +11373,49 @@ msgstr "_Назив датотеке:"
 msgid "MIME Type:"
 msgstr "МИМЕ врста:"
 
-#: ../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:521
 msgid "_Suggest automatic display of attachment"
 msgstr "_Предложи аутоматски приказ прилога"
 
-#: ../e-util/e-attachment-handler-image.c:96
+#: ../e-util/e-attachment-handler-image.c:98
 msgid "Could not set as background"
 msgstr "Не могу да поставим као позадину"
 
-#: ../e-util/e-attachment-handler-image.c:146
+#: ../e-util/e-attachment-handler-image.c:148
 msgid "Set as _Background"
 msgstr "Постави као _позадину"
 
-#: ../e-util/e-attachment-icon-view.c:165
+#: ../e-util/e-attachment-icon-view.c:168
 #: ../e-util/e-attachment-tree-view.c:548
 msgid "Loading"
 msgstr "Учитавам"
 
-#: ../e-util/e-attachment-icon-view.c:177
+#: ../e-util/e-attachment-icon-view.c:180
 #: ../e-util/e-attachment-tree-view.c:560
 msgid "Saving"
 msgstr "Чувам"
 
-#: ../e-util/e-attachment-paned.c:103
+#: ../e-util/e-attachment-paned.c:107
 msgid "Hide Attachment _Bar"
 msgstr "Сакриј линију при_лога"
 
-#: ../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 "Прикажи линију п_рилога"
 
-#: ../e-util/e-attachment-store.c:462
+#: ../e-util/e-attachment-store.c:486
 msgid "Add Attachment"
 msgstr "Додај прилог"
 
-#: ../e-util/e-attachment-store.c:465
+#: ../e-util/e-attachment-store.c:493 ../e-util/e-attachment-store.c:495
 msgid "A_ttach"
 msgstr "При_ложи"
 
-#: ../e-util/e-attachment-store.c:536
+#: ../e-util/e-attachment-store.c:533
+msgid "Archive selected directories using this format:"
+msgstr "Аривирај изабране директоријуме у овом формату:"
+
+#: ../e-util/e-attachment-store.c:626
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Сачувај прилог"
@@ -10558,123 +11423,95 @@ msgstr[1] "Сачувај прилоге"
 msgstr[2] "Сачувај прилоге"
 msgstr[3] "Сачувај прилог"
 
-#. 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:653
+#| msgid "Could not load the attachment"
+msgid "Do _not extract files from the attachment"
+msgstr "Не _распакуј датотеке из прилога"
+
+#: ../e-util/e-attachment-store.c:658
+msgid "Save extracted files _only"
+msgstr "Сачувај _само извучене датотеке"
 
-#: ../e-util/e-attachment-view.c:377
+#: ../e-util/e-attachment-store.c:663
+msgid "Save extracted files and the original _archive"
+msgstr "Сачувај извучене датотеке и оригиналне _архиве"
+
+#: ../e-util/e-attachment-view.c:428
 msgid "Open With Other Application..."
 msgstr "Отвори другим програмом..."
 
-#: ../e-util/e-attachment-view.c:384
+#: ../e-util/e-attachment-view.c:435
 msgid "S_ave All"
 msgstr "Сач_увај све"
 
-#: ../e-util/e-attachment-view.c:391
-#| msgid "Sa_ve"
+#: ../e-util/e-attachment-view.c:442
 msgid "Sa_ve As"
 msgstr "Сачувај _као"
 
-#: ../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 "Сачувај _као"
 
-#: ../e-util/e-attachment-view.c:410
+#: ../e-util/e-attachment-view.c:461
 msgid "A_dd Attachment..."
 msgstr "До_дај прилог..."
 
-#: ../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: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/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:434
+#: ../e-util/e-attachment-view.c:485
 msgid "_Hide"
 msgstr "_Сакриј"
 
-#: ../e-util/e-attachment-view.c:441
+#: ../e-util/e-attachment-view.c:492
 msgid "Hid_e All"
 msgstr "Сак_риј све"
 
-#: ../e-util/e-attachment-view.c:448
+#: ../e-util/e-attachment-view.c:499
 msgid "_View Inline"
 msgstr "Пре_гледај унутар"
 
-#: ../e-util/e-attachment-view.c:455
+#: ../e-util/e-attachment-view.c:506
 msgid "Vie_w All Inline"
 msgstr "Пре_гледај све унутар"
 
-#: ../e-util/e-attachment-view.c:785
-#, c-format
-msgid "Open With \"%s\""
-msgstr "Отвори програмом „%s“"
-
-#: ../e-util/e-attachment-view.c:788
-#, c-format
-msgid "Open this attachment in %s"
-msgstr "Отвори овај прилог у „%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 "Приложена порука"
-
-#: ../e-util/e-attachment.c:2139 ../e-util/e-attachment.c:3027
-msgid "A load operation is already in progress"
-msgstr "Операција учитавања је већ у току"
+#: ../e-util/e-attachment-view.c:513
+msgid "_Zoom to 100%"
+msgstr "Увећај на _100%"
 
-#: ../e-util/e-attachment.c:2147 ../e-util/e-attachment.c:3035
-msgid "A save operation is already in progress"
-msgstr "Операција чувања је већ у току"
+#: ../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.c:2267
-#, c-format
-msgid "Could not load '%s'"
-msgstr "Не могу да учитам „%s“"
+#: ../e-util/e-attachment-view.c:520
+#| msgid "Close this window"
+msgid "_Zoom to window"
+msgstr "У_клопи у прозор"
 
-#: ../e-util/e-attachment.c:2270
-#, c-format
-msgid "Could not load the attachment"
-msgstr "Не могу да учитам прилог"
+#: ../e-util/e-attachment-view.c:522
+msgid "Zoom large images to not be wider than the window width"
+msgstr "Умањује велике слике тако да се уклопе у ширину прозора"
 
-#: ../e-util/e-attachment.c:2574
+#: ../e-util/e-attachment-view.c:880
 #, c-format
-msgid "Could not open '%s'"
-msgstr "Не могу да отворим „%s“"
-
-#: ../e-util/e-attachment.c:2577
-#, c-format
-msgid "Could not open the attachment"
-msgstr "Не могу да отворим прилог"
-
-#: ../e-util/e-attachment.c:3044
-msgid "Attachment contents not loaded"
-msgstr "Садржај прилога није учитан"
-
-# * found, so just bail completely.
-#: ../e-util/e-attachment.c:3124
-#, c-format
-msgid "Could not save '%s'"
-msgstr "Не могу да сачувам „%s“"
+msgid "Open With \"%s\""
+msgstr "Отвори програмом „%s“"
 
-#: ../e-util/e-attachment.c:3127
+#: ../e-util/e-attachment-view.c:883
 #, c-format
-msgid "Could not save the attachment"
-msgstr "Не могу да сачувам прилог"
+msgid "Open this attachment in %s"
+msgstr "Отвори овај прилог у „%s“"
 
 #: ../e-util/e-book-source-config.c:97
 msgid "Mark as default address book"
@@ -10689,75 +11526,75 @@ msgid "Copy book content locally for offline operation"
 msgstr "Умножава садржај књиге локално за рад ван мреже"
 
 #. 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 "Притисните тастер Ктрл и кликните да отворите везу"
 
-#: ../e-util/e-cal-source-config.c:169
-msgid "Mark as default calendar"
-msgstr "Означава као основни календар"
-
-#: ../e-util/e-cal-source-config.c:172
-msgid "Mark as default task list"
-msgstr "Означава као основни списак задатака"
-
-#: ../e-util/e-cal-source-config.c:175
-msgid "Mark as default memo list"
-msgstr "Означава као основни списак белешки"
+#: ../e-util/e-calendar.c:195
+msgid "Previous month"
+msgstr "Претходни месец"
 
-#: ../e-util/e-cal-source-config.c:200
-msgid "Color:"
-msgstr "Боја:"
+#: ../e-util/e-calendar.c:220
+msgid "Next month"
+msgstr "Следећи месец"
 
-#: ../e-util/e-cal-source-config.c:405
-msgid "Copy calendar contents locally for offline operation"
-msgstr "Умножава садржај календара локално за рад ван мреже"
+#: ../e-util/e-calendar.c:246
+msgid "Previous year"
+msgstr "Претходна година"
 
-#: ../e-util/e-cal-source-config.c:409
-msgid "Copy task list contents locally for offline operation"
-msgstr "Умножава садржај списка задатака локално за рад ван мреже"
+#: ../e-util/e-calendar.c:271
+msgid "Next year"
+msgstr "Следећа година"
 
-#: ../e-util/e-cal-source-config.c:413
-msgid "Copy memo list contents locally for offline operation"
-msgstr "Умножава садржај списка белешки локално за рад ван мреже"
+#: ../e-util/e-calendar.c:295
+msgid "Month Calendar"
+msgstr "Месечни календар"
 
 #. 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:1322 ../e-util/e-calendar-item.c:2200
 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:1324
 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:1361
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y."
 
-#: ../e-util/e-calendar.c:189
-msgid "Previous month"
-msgstr "Претходни месец"
+#: ../e-util/e-cal-source-config.c:169
+msgid "Mark as default calendar"
+msgstr "Означава као основни календар"
 
-#: ../e-util/e-calendar.c:214
-msgid "Next month"
-msgstr "Следећи месец"
+#: ../e-util/e-cal-source-config.c:172
+msgid "Mark as default task list"
+msgstr "Означава као основни списак задатака"
 
-#: ../e-util/e-calendar.c:240
-msgid "Previous year"
-msgstr "Претходна година"
+#: ../e-util/e-cal-source-config.c:175
+msgid "Mark as default memo list"
+msgstr "Означава као основни списак белешки"
 
-#: ../e-util/e-calendar.c:265
-msgid "Next year"
-msgstr "Следећа година"
+#: ../e-util/e-cal-source-config.c:200
+msgid "Color:"
+msgstr "Боја:"
 
-#: ../e-util/e-calendar.c:289
-msgid "Month Calendar"
-msgstr "Месечни календар"
+#: ../e-util/e-cal-source-config.c:428
+msgid "Copy calendar contents locally for offline operation"
+msgstr "Умножава садржај календара локално за рад ван мреже"
+
+#: ../e-util/e-cal-source-config.c:432
+msgid "Copy task list contents locally for offline operation"
+msgstr "Умножава садржај списка задатака локално за рад ван мреже"
+
+#: ../e-util/e-cal-source-config.c:436
+msgid "Copy memo list contents locally for offline operation"
+msgstr "Умножава садржај списка белешки локално за рад ван мреже"
 
 #: ../e-util/e-categories-editor.c:223
 msgid "Currently _used categories:"
@@ -10767,17 +11604,29 @@ msgstr "Тренутно _коришћене категорије:"
 msgid "_Available Categories:"
 msgstr "_Доступне категорије:"
 
-#: ../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
+#| msgid "_New"
+msgctxt "category"
 msgid "_New"
-msgstr "_Ново"
+msgstr "_Нова"
+
+#: ../e-util/e-categories-editor.c:278
+#| msgid "_Edit"
+msgctxt "category"
+msgid "_Edit"
+msgstr "_Уређивање"
 
-#: ../e-util/e-categories-selector.c:321
+#: ../e-util/e-categories-editor.c:282
+#| msgid "_Delete"
+msgctxt "category"
+msgid "_Delete"
+msgstr "_Обриши"
+
+#: ../e-util/e-categories-selector.c:322
 msgid "Icon"
 msgstr "Иконица"
 
-#: ../e-util/e-category-completion.c:299
+#: ../e-util/e-category-completion.c:307
 #, c-format
 msgid "Create category \"%s\""
 msgstr "Израда категорије „%s“"
@@ -10814,14 +11663,19 @@ msgstr ""
 msgid "popup list"
 msgstr "искачућа листа"
 
-#: ../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:2033
+msgid "?"
+msgstr "?"
+
+#: ../e-util/e-cell-date-edit.c:303
 msgid "Now"
 msgstr "Сада"
 
 #. 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:1740
+#: ../modules/itip-formatter/itip-view.c:221
 msgid "Today"
 msgstr "Данас"
 
@@ -10832,40 +11686,24 @@ msgstr "Данас"
 # 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 "Ништа"
 
-#: ../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 "У реду"
 
-#: ../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 "Време мора бити у формату: %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 "Вредност процента мора бити између 0 и 100"
 
-#: ../e-util/e-charset-combo-box.c:99
-msgid "Character Encoding"
-msgstr "Кодна страна"
-
-#: ../e-util/e-charset-combo-box.c:122
-msgid "Enter the character set to use"
-msgstr "Изаберите кодну страну за коришћење"
-
-#: ../e-util/e-charset-combo-box.c:368
-msgid "Other..."
-msgstr "Друго..."
-
 #: ../e-util/e-charset.c:52
 msgid "Arabic"
 msgstr "Арапски"
@@ -10943,38 +11781,226 @@ msgstr "Украјински"
 msgid "Visual"
 msgstr "Визуелни"
 
-#: ../e-util/e-client-cache.c:1189
+#: ../e-util/e-charset-combo-box.c:99
+msgid "Character Encoding"
+msgstr "Кодна страна"
+
+#: ../e-util/e-charset-combo-box.c:119
+msgid "Enter the character set to use"
+msgstr "Изаберите кодну страну за коришћење"
+
+#: ../e-util/e-charset-combo-box.c:365
+msgid "Other..."
+msgstr "Друго..."
+
+#: ../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 "Не могу да направим предмет програма из назива проширења „%s“"
 
-#: ../e-util/e-dateedit.c:523
+#: ../e-util/e-color-chooser-widget.c:124
+#| msgid "Use custom fonts"
+msgid "Choose custom color"
+msgstr "Избор произвољне боје"
+
+#: ../e-util/e-color-combo.c:81
+msgid "black"
+msgstr "црна"
+
+#: ../e-util/e-color-combo.c:82
+msgid "light brown"
+msgstr "светлобраон"
+
+#: ../e-util/e-color-combo.c:83
+msgid "brown gold"
+msgstr "златно-браон"
+
+#: ../e-util/e-color-combo.c:84
+msgid "dark green #2"
+msgstr "тамнозелена #2"
+
+#: ../e-util/e-color-combo.c:85
+msgid "navy"
+msgstr "морнарска"
+
+#: ../e-util/e-color-combo.c:86
+msgid "dark blue"
+msgstr "тамноплава"
+
+#: ../e-util/e-color-combo.c:87
+msgid "purple #2"
+msgstr "љубичаста #2"
+
+#: ../e-util/e-color-combo.c:88
+msgid "very dark gray"
+msgstr "веома тамнобраон"
+
+#: ../e-util/e-color-combo.c:90
+#| msgid "Mark as _Unread"
+msgid "dark red"
+msgstr "тамноцрвена"
+
+#: ../e-util/e-color-combo.c:91
+msgid "red-orange"
+msgstr "црвено-наранџаста"
+
+#: ../e-util/e-color-combo.c:92
+msgid "gold"
+msgstr "златна"
+
+#: ../e-util/e-color-combo.c:93
+msgid "dark green"
+msgstr "тамнозелена"
+
+#: ../e-util/e-color-combo.c:94
+msgid "dull blue"
+msgstr "бледоплава"
+
+#: ../e-util/e-color-combo.c:95
+msgid "blue"
+msgstr "плава"
+
+#: ../e-util/e-color-combo.c:96
+msgid "dull purple"
+msgstr "бледољубичаста"
+
+#: ../e-util/e-color-combo.c:97
+msgid "dark grey"
+msgstr "тамносива"
+
+#: ../e-util/e-color-combo.c:99
+#| msgid "3rd"
+msgid "red"
+msgstr "црвена"
+
+#: ../e-util/e-color-combo.c:100
+msgid "orange"
+msgstr "наранџаста"
+
+#: ../e-util/e-color-combo.c:101
+msgid "lime"
+msgstr "жуто-зелена"
+
+#: ../e-util/e-color-combo.c:102
+msgid "dull green"
+msgstr "бледо-зелена"
+
+#: ../e-util/e-color-combo.c:103
+msgid "dull blue #2"
+msgstr "бледоплава #2"
+
+#: ../e-util/e-color-combo.c:104
+msgid "sky blue #2"
+msgstr "небоплава #2"
+
+#: ../e-util/e-color-combo.c:105
+msgid "purple"
+msgstr "љубичаста"
+
+#: ../e-util/e-color-combo.c:106
+msgid "gray"
+msgstr "сива"
+
+#: ../e-util/e-color-combo.c:108
+#| msgid "Image"
+msgid "magenta"
+msgstr "магнета"
+
+#: ../e-util/e-color-combo.c:109
+msgid "bright orange"
+msgstr "светлонаранџаста"
+
+#: ../e-util/e-color-combo.c:110
+msgid "yellow"
+msgstr "жута"
+
+#: ../e-util/e-color-combo.c:111
+msgid "green"
+msgstr "зелена"
+
+#: ../e-util/e-color-combo.c:112
+msgid "cyan"
+msgstr "цијан"
+
+#: ../e-util/e-color-combo.c:113
+msgid "bright blue"
+msgstr "светлоплава"
+
+#: ../e-util/e-color-combo.c:114
+#| msgid "_Required people"
+msgid "red purple"
+msgstr "црвено-љубичаста"
+
+#: ../e-util/e-color-combo.c:115
+msgid "light grey"
+msgstr "светлосива"
+
+#: ../e-util/e-color-combo.c:117
+msgid "pink"
+msgstr "розе"
+
+#: ../e-util/e-color-combo.c:118
+msgid "light orange"
+msgstr "светлонаранџаста"
+
+#: ../e-util/e-color-combo.c:119
+msgid "light yellow"
+msgstr "светложута"
+
+#: ../e-util/e-color-combo.c:120
+msgid "light green"
+msgstr "светлозелена"
+
+#: ../e-util/e-color-combo.c:121
+msgid "light cyan"
+msgstr "светлоцијан"
+
+#: ../e-util/e-color-combo.c:122
+msgid "light blue"
+msgstr "светлоплава"
+
+#: ../e-util/e-color-combo.c:123
+msgid "light purple"
+msgstr "светлољубичаста"
+
+#: ../e-util/e-color-combo.c:124
+msgid "white"
+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
+msgid "Default"
+msgstr "Основно"
+
+#: ../e-util/e-dateedit.c:526
 msgid "Date and Time"
 msgstr "Датум и време"
 
-#: ../e-util/e-dateedit.c:548
+#: ../e-util/e-dateedit.c:551
 msgid "Text entry to input date"
 msgstr "Део текста за унос датума"
 
-#: ../e-util/e-dateedit.c:571
+#: ../e-util/e-dateedit.c:574
 msgid "Click this button to show a calendar"
 msgstr "Притисните на ово дугме да прикажете календар"
 
-#: ../e-util/e-dateedit.c:625
+#: ../e-util/e-dateedit.c:628
 msgid "Drop-down combination box to select time"
 msgstr "Прозорче за избор времена"
 
 # note(slobo): можда треба рок
-#: ../e-util/e-dateedit.c:626
+#: ../e-util/e-dateedit.c:629
 #: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "Време"
 
-#: ../e-util/e-dateedit.c:700
+#: ../e-util/e-dateedit.c:703
 msgid "No_w"
 msgstr "_Сада"
 
-#: ../e-util/e-dateedit.c:707
+#: ../e-util/e-dateedit.c:710
 msgid "_Today"
 msgstr "_Данас"
 
@@ -10985,7 +12011,7 @@ msgstr "_Данас"
 # 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 "_Ништа"
 
@@ -10996,21 +12022,21 @@ msgstr "_Ништа"
 # 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 "Ништа"
 
-#: ../e-util/e-dateedit.c:1978
+#: ../e-util/e-dateedit.c:1981
 msgid "Invalid Date Value"
 msgstr "Неисправан датум"
 
-#: ../e-util/e-dateedit.c:2023
+#: ../e-util/e-dateedit.c:2026
 msgid "Invalid Time Value"
 msgstr "Неисправно време"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:251
+#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:249
 msgid "Tomorrow"
 msgstr "Сутра"
 
@@ -11074,15 +12100,123 @@ msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Следеће %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 "Користи подразумевани локалитет"
 
-#: ../e-util/e-datetime-format.c:576
+#: ../e-util/e-datetime-format.c:575
 msgid "Format:"
 msgstr "Облик:"
 
+#. Translators: :-)
+#: ../e-util/e-emoticon-chooser.c:40
+msgid "_Smile"
+msgstr "_Смајли"
+
+#. Translators: :-(
+#: ../e-util/e-emoticon-chooser.c:42
+msgid "S_ad"
+msgstr "_Тужан"
+
+#. Translators: ;-)
+#: ../e-util/e-emoticon-chooser.c:44
+#| msgid "_Window"
+msgid "_Wink"
+msgstr "_Намиг"
+
+#. Translators: :-P
+#: ../e-util/e-emoticon-chooser.c:46
+msgid "Ton_gue"
+msgstr "_Језик"
+
+#. Translators: :-))
+#: ../e-util/e-emoticon-chooser.c:48
+msgid "Laug_h"
+msgstr "_Осмех"
+
+#. Translators: :-|
+#: ../e-util/e-emoticon-chooser.c:50
+#| msgid "_Plain text"
+msgid "_Plain"
+msgstr "_Равни"
+
+#. Translators: :-!
+#: ../e-util/e-emoticon-chooser.c:52
+msgid "Smi_rk"
+msgstr "_Злобни"
+
+#. Translators: :"-)
+#: ../e-util/e-emoticon-chooser.c:54
+msgid "_Embarrassed"
+msgstr "_Постиђени"
+
+#. Translators: :-D
+#: ../e-util/e-emoticon-chooser.c:56
+msgid "_Big Smile"
+msgstr "_Велики осмех"
+
+#. Translators: :-/
+#: ../e-util/e-emoticon-chooser.c:58
+msgid "Uncer_tain"
+msgstr "Нес_игурни"
+
+#. Translators: :-O
+#: ../e-util/e-emoticon-chooser.c:60
+msgid "S_urprise"
+msgstr "За_чуђени"
+
+#. Translators: :-S
+#: ../e-util/e-emoticon-chooser.c:62
+msgid "W_orried"
+msgstr "За_ринути"
+
+#. Translators: :-*
+#: ../e-util/e-emoticon-chooser.c:64
+msgid "_Kiss"
+msgstr "Пољ_убац"
+
+#. Translators: X-(
+#: ../e-util/e-emoticon-chooser.c:66
+msgid "A_ngry"
+msgstr "_Љути"
+
+#. Translators: B-)
+#: ../e-util/e-emoticon-chooser.c:68
+msgid "_Cool"
+msgstr "_Кул"
+
+#. Translators: O:-)
+#: ../e-util/e-emoticon-chooser.c:70
+msgid "Ange_l"
+msgstr "_Анђео"
+
+#. Translators: :'(
+#: ../e-util/e-emoticon-chooser.c:72
+msgid "Cr_ying"
+msgstr "Уп_лакани"
+
+#. Translators: :-Q
+#: ../e-util/e-emoticon-chooser.c:74
+msgid "S_ick"
+msgstr "Бол_есни"
+
+#. Translators: |-)
+#: ../e-util/e-emoticon-chooser.c:76
+msgid "Tire_d"
+msgstr "У_моран"
+
+#. Translators: >:-)
+#: ../e-util/e-emoticon-chooser.c:78
+msgid "De_vilish"
+msgstr "_Ђаволак"
+
+#. Translators: :-(|)
+#: ../e-util/e-emoticon-chooser.c:80
+#| msgid "_Mon"
+msgid "_Monkey"
+msgstr "_Мајмун"
+
 #: ../e-util/e-file-utils.c:120
 msgid "(Unknown Filename)"
 msgstr "(Непознато име датотеке)"
@@ -11250,23 +12384,23 @@ msgstr "Изаберите време за поређење"
 msgid "Choose a File"
 msgstr "Изаберите датотеку"
 
-#: ../e-util/e-filter-rule.c:750
+#: ../e-util/e-filter-rule.c:761
 msgid "R_ule name:"
 msgstr "Назив _правила:"
 
-#: ../e-util/e-filter-rule.c:800
+#: ../e-util/e-filter-rule.c:811
 msgid "all the following conditions"
 msgstr "свим следећим условима"
 
-#: ../e-util/e-filter-rule.c:801
+#: ../e-util/e-filter-rule.c:812
 msgid "any of the following conditions"
 msgstr "било ком од следећих услова"
 
-#: ../e-util/e-filter-rule.c:807
+#: ../e-util/e-filter-rule.c:818
 msgid "_Find items which match:"
 msgstr "_Пронађи ставке које одговарају:"
 
-#: ../e-util/e-filter-rule.c:830
+#: ../e-util/e-filter-rule.c:841
 msgid "Find items that meet the following conditions"
 msgstr "Пронађите ставке које задовољавају следеће услове"
 
@@ -11279,38 +12413,1157 @@ msgstr "Пронађите ставке које задовољавају сле
 #. * 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
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:615
 msgid "None"
 msgstr "Ништа"
 
-#: ../e-util/e-filter-rule.c:846
+#: ../e-util/e-filter-rule.c:857
 msgid "All related"
 msgstr "Све повезано"
 
-#: ../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 "Одговори"
+
+#: ../e-util/e-filter-rule.c:859
 msgid "Replies and parents"
 msgstr "Одговори и надређено"
 
-#: ../e-util/e-filter-rule.c:849
+#: ../e-util/e-filter-rule.c:860
 msgid "No reply or parent"
 msgstr "Нема одговора или родитеља"
 
-#: ../e-util/e-filter-rule.c:852
+#: ../e-util/e-filter-rule.c:863
 msgid "I_nclude threads:"
 msgstr "Укључи _нити:"
 
-#: ../e-util/e-filter-rule.c:929
+#: ../e-util/e-filter-rule.c:942
 msgid "A_dd Condition"
 msgstr "Додај _услов"
 
-#: ../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 "Долазно"
+
+#: ../e-util/e-filter-rule.c:1256 ../mail/em-utils.c:166
 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 "Не могу да уметнем текстуалну датотеку."
+
+#: ../e-util/e-html-editor-actions.c:591
+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 "Убацује текст из списка исечака"
+
+#: ../e-util/e-html-editor-actions.c:1099
+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 "Враћа последњу радњу"
+
+#: ../e-util/e-html-editor-actions.c:1134
+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 "Тренутни _језици"
+
+#: ../e-util/e-html-editor-actions.c:1179
+msgid "_Increase Indent"
+msgstr "_Веће увлачење"
+
+#: ../e-util/e-html-editor-actions.c:1181
+msgid "Increase Indent"
+msgstr "Веће увлачење"
+
+#: ../e-util/e-html-editor-actions.c:1186
+msgid "_HTML File..."
+msgstr "_ХТМЛ датотека..."
+
+#: ../e-util/e-html-editor-actions.c:1193
+msgid "Te_xt File..."
+msgstr "_Текстуална датотека"
+
+#: ../e-util/e-html-editor-actions.c:1200
+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 "Текст за претрагу"
+
+#: ../e-util/e-html-editor-actions.c:1214
+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 "_Провери писање..."
+
+#: ../e-util/e-html-editor-actions.c:1235
+msgid "_Decrease Indent"
+msgstr "_Мање увлачење"
+
+#: ../e-util/e-html-editor-actions.c:1237
+msgid "Decrease Indent"
+msgstr "Мање увлачење"
+
+#: ../e-util/e-html-editor-actions.c:1242
+msgid "_Wrap Lines"
+msgstr "П_релом линија"
+
+#: ../e-util/e-html-editor-actions.c:1249
+msgid "Open Inspector"
+msgstr "Отворени инспектор"
+
+#. Center
+#: ../e-util/e-html-editor-actions.c:1259
+#: ../e-util/e-html-editor-paragraph-dialog.c:110
+msgid "_Center"
+msgstr "_Средина"
+
+#: ../e-util/e-html-editor-actions.c:1261
+#| msgid "A_lignment"
+msgid "Center Alignment"
+msgstr "Средишње поравнање"
+
+#. Left
+#: ../e-util/e-html-editor-actions.c:1266
+#: ../e-util/e-html-editor-paragraph-dialog.c:101
+msgid "_Left"
+msgstr "_Лево"
+
+#: ../e-util/e-html-editor-actions.c:1268
+#| msgid "A_lignment"
+msgid "Left Alignment"
+msgstr "Поравнање по левој страни"
+
+#. Right
+#: ../e-util/e-html-editor-actions.c:1273
+#: ../e-util/e-html-editor-paragraph-dialog.c:119
+msgid "_Right"
+msgstr "_Десно"
+
+#: ../e-util/e-html-editor-actions.c:1275
+#| msgid "A_lignment"
+msgid "Right Alignment"
+msgstr "Поравнање по десној страни"
+
+#: ../e-util/e-html-editor-actions.c:1283
+#: ../modules/text-highlight/languages.c:72
+msgid "_HTML"
+msgstr "_ХТМЛ"
+
+#: ../e-util/e-html-editor-actions.c:1285
+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"
+
+#: ../e-util/e-html-editor-actions.c:1349
+msgid "_Preformatted"
+msgstr "Пр_едодређено"
+
+#: ../e-util/e-html-editor-actions.c:1356
+#| msgid "Address"
+msgid "A_ddress"
+msgstr "А_дреса"
+
+#: ../e-util/e-html-editor-actions.c:1363
+msgid "_Blockquote"
+msgstr "_Цитирање одељка"
+
+#: ../e-util/e-html-editor-actions.c:1370
+#| msgid "D_elete Memo List"
+msgid "_Bulleted List"
+msgstr "Набрајање _симболима"
+
+#: ../e-util/e-html-editor-actions.c:1377
+msgid "_Roman Numeral List"
+msgstr "Набрајање _римским бројевима"
+
+#: ../e-util/e-html-editor-actions.c:1384
+msgid "Numbered _List"
+msgstr "Набрајање _бројевима"
+
+#: ../e-util/e-html-editor-actions.c:1391
+msgid "_Alphabetical List"
+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 "Умеће слику"
+
+#: ../e-util/e-html-editor-actions.c:1415
+#: ../e-util/e-html-editor-actions.c:1452
+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 "Умеће табелу"
+
+#: ../e-util/e-html-editor-actions.c:1438
+msgid "_Cell..."
+msgstr "_Ћелија"
+
+#: ../e-util/e-html-editor-actions.c:1459
+#| msgid "Save _Image..."
+msgid "Pa_ge..."
+msgstr "Ст_раница..."
+
+#: ../e-util/e-html-editor-actions.c:1483
+msgid "Font _Size"
+msgstr "Величина _фонта"
+
+#: ../e-util/e-html-editor-actions.c:1490
+#| msgid "_Forward style:"
+msgid "_Font Style"
+msgstr "Врста фо_нта"
+
+#: ../e-util/e-html-editor-actions.c:1497
+msgid "Paste As _Text"
+msgstr "Уметни _као текст"
+
+#: ../e-util/e-html-editor-actions.c:1508
+#: ../e-util/e-html-editor-text-dialog.c:214
+msgid "_Bold"
+msgstr "_Подебљано"
+
+#: ../e-util/e-html-editor-actions.c:1510
+msgid "Bold"
+msgstr "Подебљано"
+
+#: ../e-util/e-html-editor-actions.c:1516
+#: ../e-util/e-html-editor-text-dialog.c:225
+msgid "_Italic"
+msgstr "_Искошено"
+
+#: ../e-util/e-html-editor-actions.c:1518
+msgid "Italic"
+msgstr "Искошено"
+
+#: ../e-util/e-html-editor-actions.c:1524
+#| msgid "Plain Text"
+msgid "_Plain Text"
+msgstr "О_бичан текст"
+
+#: ../e-util/e-html-editor-actions.c:1532
+#: ../e-util/e-html-editor-text-dialog.c:246
+msgid "_Strikethrough"
+msgstr "Пре_цртано"
+
+#: ../e-util/e-html-editor-actions.c:1534
+msgid "Strikethrough"
+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 "Подвучени текст"
+
+#. 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 "_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 "Брисање табеле"
+
+#: ../e-util/e-html-editor-actions.c:1657 ../e-util/e-text.c:2147
+msgid "Input Methods"
+msgstr "Начини уноса"
+
+#. Translators: Popup menu item caption, containing all the Insert options for a table
+#: ../e-util/e-html-editor-actions.c:1665
+#| msgid "Table Cell"
+msgid "Table Insert"
+msgstr "Уметање табеле"
+
+#: ../e-util/e-html-editor-actions.c:1672
+#| msgid "_Properties"
+msgid "Properties"
+msgstr "Особине"
+
+#: ../e-util/e-html-editor-actions.c:1690
+msgid "Column After"
+msgstr "Колона након"
+
+#: ../e-util/e-html-editor-actions.c:1697
+msgid "Column Before"
+msgstr "Колона пре"
+
+#: ../e-util/e-html-editor-actions.c:1704
+#| msgid "_Insert"
+msgid "Insert _Link"
+msgstr "Уметни _везу"
+
+#: ../e-util/e-html-editor-actions.c:1711
+msgid "Row Above"
+msgstr "Ред изнад"
+
+#: ../e-util/e-html-editor-actions.c:1718
+msgid "Row Below"
+msgstr "Ред испод"
+
+#: ../e-util/e-html-editor-actions.c:1732
+msgid "Cell..."
+msgstr "Ћелија..."
+
+#: ../e-util/e-html-editor-actions.c:1739
+#| msgid "Image"
+msgid "Image..."
+msgstr "Слика..."
+
+#: ../e-util/e-html-editor-actions.c:1746
+msgid "Link..."
+msgstr "Веза..."
+
+#: ../e-util/e-html-editor-actions.c:1753
+#| msgid "Pager"
+msgid "Page..."
+msgstr "Страница..."
+
+#: ../e-util/e-html-editor-actions.c:1760
+msgid "Paragraph..."
+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 "Правило..."
+
+#: ../e-util/e-html-editor-actions.c:1775
+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 "Занемари погрешно написане речи"
+
+#: ../e-util/e-html-editor-actions.c:1820
+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
+#, c-format
+#| msgid "Add \"%s\" to Dictionary"
+msgid "%s Dictionary"
+msgstr "%s речник"
+
+#: ../e-util/e-html-editor-actions.c:2024
+msgid "_Emoticon"
+msgstr "_Смајлић"
+
+# shell:noshell-reason title
+#: ../e-util/e-html-editor-actions.c:2025
+#| msgid "Restart Evolution"
+msgid "Insert Emoticon"
+msgstr "Уметни смајлић"
+
+#: ../e-util/e-html-editor-actions.c:2093
+#| msgid "_Replace"
+msgid "Re_place"
+msgstr "_Замени"
+
+#: ../e-util/e-html-editor-actions.c:2096
+#| msgid "Image"
+msgid "_Image"
+msgstr "_Слика"
+
+#: ../e-util/e-html-editor-actions.c:2099
+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"
+msgid "_Rule"
+msgstr "_Правило"
+
+#: ../e-util/e-html-editor-actions.c:2106
+#: ../e-util/e-html-editor-cell-dialog.c:738
+#| msgid "E_nable"
+msgid "_Table"
+msgstr "_Табела"
+
+#: ../e-util/e-html-editor.c:704
+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 "Величина фонта"
+
+#: ../e-util/e-html-editor-cell-dialog.c:698
+msgid "<b>Scope</b>"
+msgstr "<b>Опсег</b>"
+
+#: ../e-util/e-html-editor-cell-dialog.c:712
+msgid "C_ell"
+msgstr "_Ћелија"
+
+#: ../e-util/e-html-editor-cell-dialog.c:725
+msgid "_Row"
+msgstr "_Ред"
+
+#: ../e-util/e-html-editor-cell-dialog.c:751
+msgid "Col_umn"
+msgstr "_Колона"
+
+#: ../e-util/e-html-editor-cell-dialog.c:761
+msgid "<b>Alignment &amp; Behavior</b>"
+msgstr "<b>Поравнање и понашање</b>"
+
+#: ../e-util/e-html-editor-cell-dialog.c:774
+#: ../e-util/e-html-editor-hrule-dialog.c:413
+#: ../e-util/e-html-editor-table-dialog.c:900
+msgid "Left"
+msgstr "Лево"
+
+#: ../e-util/e-html-editor-cell-dialog.c:775
+#: ../e-util/e-html-editor-hrule-dialog.c:415
+#: ../e-util/e-html-editor-table-dialog.c:901
+msgid "Center"
+msgstr "Средина"
+
+#: ../e-util/e-html-editor-cell-dialog.c:776
+#: ../e-util/e-html-editor-hrule-dialog.c:417
+#: ../e-util/e-html-editor-table-dialog.c:902
+msgid "Right"
+msgstr "Десно"
+
+# Белешке:
+# Додај белешку
+#: ../e-util/e-html-editor-cell-dialog.c:784
+msgid "_Horizontal:"
+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 "Врста заглавља"
+
+#: ../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>Распоред</b>"
+
+#. Width
+#: ../e-util/e-html-editor-cell-dialog.c:841
+msgid "_Width"
+msgstr "_Ширина"
+
+#: ../e-util/e-html-editor-cell-dialog.c:880
+msgid "Row S_pan:"
+msgstr "_Распон реда:"
+
+#: ../e-util/e-html-editor-cell-dialog.c:894
+msgid "Co_lumn Span:"
+msgstr "Р_аспон колоне:"
+
+#: ../e-util/e-html-editor-cell-dialog.c:901
+#: ../e-util/e-html-editor-table-dialog.c:916
+msgid "<b>Background</b>"
+msgstr "<b>Позадина</b>"
+
+#: ../e-util/e-html-editor-cell-dialog.c:914
+#: ../e-util/e-html-editor-table-dialog.c:929
+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 "Особине ћелије"
+
+#: ../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 "Није нађено поклапање"
+
+#: ../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 "Тражи у_назад"
+
+#: ../e-util/e-html-editor-find-dialog.c:167
+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 "Нађи"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:348
+msgid "<b>Size</b>"
+msgstr "<b>Величина</b>"
+
+#. Width
+#: ../e-util/e-html-editor-hrule-dialog.c:368
+#: ../e-util/e-html-editor-image-dialog.c:583
+#: ../e-util/e-html-editor-table-dialog.c:823
+msgid "_Width:"
+msgstr "_Ширина:"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:393
+#| msgid "Size"
+msgid "_Size:"
+msgstr "_Величина:"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:400
+msgid "<b>Style</b>"
+msgstr "<b>Стил</b>"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:425
+#: ../e-util/e-html-editor-table-dialog.c:909
+#| msgid "A_lignment"
+msgid "_Alignment:"
+msgstr "По_равнање:"
+
+#. Shaded
+#: ../e-util/e-html-editor-hrule-dialog.c:431
+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 "И_звор:"
+
+#: ../e-util/e-html-editor-image-dialog.c:607
+msgid "_Height:"
+msgstr "_Висина:"
+
+#: ../e-util/e-html-editor-image-dialog.c:648
+msgid "_X-Padding:"
+msgstr "X-_попуна:"
+
+#: ../e-util/e-html-editor-image-dialog.c:664
+msgid "_Y-Padding:"
+msgstr "Y-п_опуна:"
+
+#: ../e-util/e-html-editor-image-dialog.c:680
+#: ../e-util/e-html-editor-table-dialog.c:890
+msgid "_Border:"
+msgstr "_Ивица"
+
+#: ../e-util/e-html-editor-image-dialog.c:690
+msgid "<b>Link</b>"
+msgstr "<b>Веза</b>"
+
+#: ../e-util/e-html-editor-image-dialog.c:708
+#: ../e-util/e-html-editor-link-dialog.c:400
+#| msgid "URL:"
+msgid "_URL:"
+msgstr "_УРЛ:"
+
+#: ../e-util/e-html-editor-image-dialog.c:713
+#: ../e-util/e-html-editor-link-dialog.c:405
+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 "Особине везе"
+
+#: ../e-util/e-html-editor-page-dialog.c:72
+msgid "Perforated Paper"
+msgstr "Перфориран папир"
+
+#: ../e-util/e-html-editor-page-dialog.c:81
+msgid "Blue Ink"
+msgstr "Плаво мастило"
+
+#: ../e-util/e-html-editor-page-dialog.c:90
+msgid "Paper"
+msgstr "Папир"
+
+#: ../e-util/e-html-editor-page-dialog.c:99
+msgid "Ribbon"
+msgstr "Трака"
+
+#: ../e-util/e-html-editor-page-dialog.c:108
+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
+msgid "Draft"
+msgstr "Нацрт"
+
+#: ../e-util/e-html-editor-page-dialog.c:135
+msgid "Graph Paper"
+msgstr "Милиметарски папир"
+
+#: ../e-util/e-html-editor-page-dialog.c:544
+msgid "<b>Colors</b>"
+msgstr "<b>Боје</b>"
+
+#: ../e-util/e-html-editor-page-dialog.c:563
+#| msgid "_Text Only"
+msgid "_Text:"
+msgstr "_Текст:"
+
+#: ../e-util/e-html-editor-page-dialog.c:578
+msgid "_Link:"
+msgstr "_Веза:"
+
+#: ../e-util/e-html-editor-page-dialog.c:593
+msgid "_Visited Link:"
+msgstr "_Посећена веза:"
+
+#: ../e-util/e-html-editor-page-dialog.c:608
+#| msgid "Set as _Background"
+msgid "_Background:"
+msgstr "По_задина:"
+
+#: ../e-util/e-html-editor-page-dialog.c:616
+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:"
+msgid "_Template:"
+msgstr "_Шаблон:"
+
+#: ../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 појава је замењена"
+msgstr[1] "%d појаве су замењене"
+msgstr[2] "%d појава је замењено"
+msgstr[3] "Појава је замењена"
+
+#: ../e-util/e-html-editor-replace-dialog.c:227
+#| msgid "_Replace"
+msgid "R_eplace:"
+msgstr "_Замени:"
+
+#: ../e-util/e-html-editor-replace-dialog.c:239
+msgid "_With:"
+msgstr "_Ширина:"
+
+#: ../e-util/e-html-editor-replace-dialog.c:251
+msgid "_Case sensitive"
+msgstr "_Разликуј велика и мала слова"
+
+#: ../e-util/e-html-editor-replace-dialog.c:255
+#| msgid "_Search"
+msgid "Wra_p search"
+msgstr "Пре_ламај"
+
+#: ../e-util/e-html-editor-replace-dialog.c:265
+msgid "_Skip"
+msgstr "Прес_кочи"
+
+#: ../e-util/e-html-editor-replace-dialog.c:273
+#: ../e-util/e-system.error.xml.h:3
+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 "Замени"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:88
+#, c-format
+msgid "<b>Suggestions for '%s'</b>"
+msgstr "<b>Предлог за „%s“</b>"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:520
+msgid "<b>Suggestions</b>"
+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
+msgid "Ignore"
+msgstr "Занемари"
+
+#. Skip
+#: ../e-util/e-html-editor-spell-check-dialog.c:582
+msgid "Skip"
+msgstr "Прескочи"
+
+#. Back
+#: ../e-util/e-html-editor-spell-check-dialog.c:591
+#| msgid "Go Back"
+msgid "Back"
+msgstr "Назад"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:600
+msgid "<b>Dictionary</b>"
+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
+msgid "Spell Checking"
+msgstr "Провера правописа"
+
+#: ../e-util/e-html-editor-table-dialog.c:788
+msgid "_Rows:"
+msgstr "_Редови:"
+
+#: ../e-util/e-html-editor-table-dialog.c:805
+#| msgid "_Table column:"
+msgid "C_olumns:"
+msgstr "_Колоне:"
+
+#: ../e-util/e-html-editor-table-dialog.c:856
+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 "Особине табеле"
+
+#: ../e-util/e-html-editor-text-dialog.c:281
+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"
+msgid "Changed property"
+msgstr "Измењена особина"
+
+#: ../e-util/e-html-editor-view.c:5475
+#| msgid "Whether to emit a beep."
+msgid "Whether editor changed"
+msgstr "Да ли је уређивач променио"
+
 #: ../e-util/e-import-assistant.c:256
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
@@ -11319,10 +13572,6 @@ msgstr ""
 "Изаберите датотеку коју желите да увезете у Еволуцију и из листе изаберите "
 "којег је типа та датотека."
 
-#: ../e-util/e-import-assistant.c:283
-msgid "Select a file"
-msgstr "Изаберите датотеку"
-
 #: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
 msgid "File _type:"
 msgstr "_Врста датотеке:"
@@ -11344,7 +13593,7 @@ msgid "Import a _single file"
 msgstr "Увези _једну датотеку"
 
 #: ../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 "Изаберите податке које желите да увезете:"
 
@@ -11359,7 +13608,7 @@ msgstr ""
 "поново, кликните на дугме „Назад“."
 
 #: ../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 "Од %s:"
@@ -11417,27 +13666,27 @@ msgstr "Изаберите датотеку"
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Кликните на „Примени“ да започнете увоз датотеке у Еволуцију."
 
-#: ../e-util/e-mail-signature-combo-box.c:377
+#: ../e-util/e-mail-signature-combo-box.c:376
 msgid "Autogenerated"
 msgstr "Аутоматски састављено"
 
-#: ../e-util/e-mail-signature-editor.c:309
+#: ../e-util/e-mail-signature-editor.c:297
 msgid "Close"
 msgstr "Затвори"
 
-#: ../e-util/e-mail-signature-editor.c:314
+#: ../e-util/e-mail-signature-editor.c:302
 msgid "_Save and Close"
 msgstr "_Сачувај и затвори"
 
-#: ../e-util/e-mail-signature-editor.c:528
+#: ../e-util/e-mail-signature-editor.c:529
 msgid "Edit Signature"
 msgstr "Уреди потпис"
 
-#: ../e-util/e-mail-signature-editor.c:548
+#: ../e-util/e-mail-signature-editor.c:562
 msgid "_Signature Name:"
 msgstr "Назив _потписа:"
 
-#: ../e-util/e-mail-signature-editor.c:594
+#: ../e-util/e-mail-signature-editor.c:598
 msgid "Unnamed"
 msgstr "Без имена"
 
@@ -11445,15 +13694,15 @@ msgstr "Без имена"
 msgid "Add _Script"
 msgstr "Додај ск_рипту"
 
-#: ../e-util/e-mail-signature-manager.c:419
+#: ../e-util/e-mail-signature-manager.c:426
 msgid "Add Signature Script"
 msgstr "Додај скрипту за потпис"
 
-#: ../e-util/e-mail-signature-manager.c:489
+#: ../e-util/e-mail-signature-manager.c:497
 msgid "Edit Signature Script"
 msgstr "Уреди скрипту потписа"
 
-#: ../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 +13712,11 @@ msgstr ""
 "потпис. Назив који сте дали ће бити коришћен\n"
 "само за приказ."
 
-#: ../e-util/e-mail-signature-script-dialog.c:445
+#: ../e-util/e-mail-signature-script-dialog.c:444
 msgid "S_cript:"
 msgstr "С_крипта:"
 
-#: ../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 "Датотека скрипте мора бити извршна."
 
@@ -11483,14 +13732,40 @@ msgstr ""
 "Алат за избор временске зоне помоћу миша. Тастатуром се избор временске зоне "
 "врши из доњег оквира."
 
-#: ../e-util/e-misc-utils.c:246
+#: ../e-util/e-misc-utils.c:251
 msgid "Could not open the link."
 msgstr "Не могу да отворим везу."
 
-#: ../e-util/e-misc-utils.c:293
+#: ../e-util/e-misc-utils.c:334
 msgid "Could not display help for Evolution."
 msgstr "Не могу да прикажем помоћ за Еволуцију."
 
+#: ../e-util/e-misc-utils.c:2387
+#, c-format
+msgid "Opening calendar '%s'"
+msgstr "Отварам календар „%s“"
+
+#: ../e-util/e-misc-utils.c:2390
+#, c-format
+msgid "Opening memo list '%s'"
+msgstr "Отварам списак белешки „%s“"
+
+#: ../e-util/e-misc-utils.c:2393
+#, c-format
+msgid "Opening task list '%s'"
+msgstr "Отварам списак задатака „%s“"
+
+#: ../e-util/e-misc-utils.c:2396
+#, c-format
+#| msgid "Opening calendar '%s'"
+msgid "Opening address book '%s'"
+msgstr "Отварам адресар „%s“"
+
+#: ../e-util/e-misc-utils.c:3138
+#: ../modules/mailto-handler/evolution-mailto-handler.c:148
+msgid "_Do not show this message again"
+msgstr "_Не приказуј више ову поруку"
+
 #: ../e-util/e-name-selector-dialog.c:277
 msgid "Show Contacts"
 msgstr "Прикажи контакте"
@@ -11509,10 +13784,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: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: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
 msgid "Any Category"
 msgstr "Било која категорија"
 
@@ -11525,13 +13800,13 @@ msgid "Search"
 msgstr "Потражи"
 
 #: ../e-util/e-name-selector-dialog.c:448
-#: ../mail/importers/pine-importer.c:427
+#: ../mail/importers/pine-importer.c:429
 msgid "Address Book"
 msgstr "Адресар"
 
 #: ../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 "Контакти"
 
@@ -11540,69 +13815,69 @@ msgid "Select Contacts from Address Book"
 msgstr "Изаберите контакте из адресара"
 
 #. 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 "_Рашири %s унутар"
 
 #. 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 "_Умножи %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 "_Исеци %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 "_Уреди %s"
 
-#: ../e-util/e-name-selector-list.c:583
+#: ../e-util/e-name-selector-list.c:584
 #, c-format
 msgid "_Delete %s"
 msgstr "_Обриши %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 ""
 "Еволуција је тренутно на мрежи.  Кликните на ово дугме за рад ван мреже."
 
-#: ../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 ""
 "Еволуција тренутно није на мрежи.  Кликните на ово дугме да се повежете."
 
-#: ../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 "Еволуција тренутно није на мрежи јер мрежа није доступна."
 
-#: ../e-util/e-passwords.c:125
+#: ../e-util/e-passwords.c:127
 msgid "Keyring key is unusable: no user or host name"
 msgstr "Кључ привеска није употребљив: нема корисника нити домаћина"
 
-#: ../e-util/e-passwords.c:445
+#: ../e-util/e-passwords.c:447
 msgid "You have the Caps Lock key on."
 msgstr "Укључили сте велика слова."
 
-#: ../e-util/e-passwords.c:576
+#: ../e-util/e-passwords.c:578
 msgid "_Remember this passphrase"
 msgstr "_Запамти ову лозинку"
 
-#: ../e-util/e-passwords.c:577
+#: ../e-util/e-passwords.c:579
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_Запамти ову лозинку до краја ове сесије"
 
-#: ../e-util/e-passwords.c:582
+#: ../e-util/e-passwords.c:584
 msgid "_Remember this password"
 msgstr "_Запамти ову лозинку"
 
-#: ../e-util/e-passwords.c:583
+#: ../e-util/e-passwords.c:585
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Запамти ову лозинку до краја ове сесије"
 
@@ -11623,71 +13898,68 @@ msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "Систем за штампање није понудио никакве додатне детаље о грешци."
 
-#: ../e-util/e-proxy-editor.c:314
-#| msgid "Method:"
+#: ../e-util/e-proxy-editor.c:325
 msgid "_Method:"
 msgstr "_Начин:"
 
-#: ../e-util/e-proxy-editor.c:336
+#: ../e-util/e-proxy-editor.c:347
 msgid "Defer to Desktop Settings"
 msgstr "Тежи подешавањима радне површи"
 
-#: ../e-util/e-proxy-editor.c:340
+#: ../e-util/e-proxy-editor.c:351
 msgid "_Open Desktop Settings"
 msgstr "_Отвори подешавања радне површи"
 
-#: ../e-util/e-proxy-editor.c:366
-#| msgid "January"
+#: ../e-util/e-proxy-editor.c:377
 msgid "Manual"
 msgstr "Ручно"
 
-#: ../e-util/e-proxy-editor.c:385
-#| msgid "H_TTP Proxy:"
+#: ../e-util/e-proxy-editor.c:396
 msgid "_HTTP Proxy:"
 msgstr "_ХТТП посредник:"
 
-#: ../e-util/e-proxy-editor.c:416
-#| msgid "H_TTP Proxy:"
+#: ../e-util/e-proxy-editor.c:427
 msgid "H_TTPS Proxy:"
 msgstr "Х_ТТПС посредник:"
 
-#: ../e-util/e-proxy-editor.c:447
-#| msgid "SOC_KS Proxy:"
+#: ../e-util/e-proxy-editor.c:458
 msgid "_Socks Proxy:"
 msgstr "_Сокс посредник:"
 
-#: ../e-util/e-proxy-editor.c:478
-#| msgid "Ignore"
+#: ../e-util/e-proxy-editor.c:489
 msgid "_Ignore Hosts:"
 msgstr "_Занемари домаћине:"
 
-#: ../e-util/e-proxy-editor.c:504
-#| msgid "Automatic Contacts"
+#: ../e-util/e-proxy-editor.c:515
 msgid "Automatic"
 msgstr "Самостално"
 
-#: ../e-util/e-proxy-editor.c:523
-#| msgid "Configuration"
+#: ../e-util/e-proxy-editor.c:534
 msgid "Configuration _URL:"
 msgstr "_Адреса подешавања:"
 
-#: ../e-util/e-proxy-editor.c:552
+#: ../e-util/e-proxy-editor.c:560
+#| msgid "No _Proxy for:"
+msgid "No proxy"
+msgstr "Без посредника"
+
+#: ../e-util/e-proxy-editor.c:563
 msgid "Use a direct connection, no proxying required."
 msgstr "Користи непосредну везу, није потребно посредовање."
 
-#: ../e-util/e-proxy-preferences.c:177
+#: ../e-util/e-proxy-preferences.c:213
 msgid "Switch to Basic Proxy Preferences"
 msgstr "Пребаци се на основне поставке посредника"
 
-#: ../e-util/e-proxy-preferences.c:179
+#: ../e-util/e-proxy-preferences.c:215
 msgid "Switch to Advanced Proxy Preferences"
 msgstr "Пребаци се на напредне поставке посредника"
 
-#: ../e-util/e-proxy-preferences.c:463
+#: ../e-util/e-proxy-preferences.c:526
 msgid "Apply custom proxy settings to these accounts:"
 msgstr "Примени произвољна подешавања посредника на ове налоге:"
 
-#: ../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 +13968,14 @@ msgstr ""
 "мрежне посреднике и да их примените на посебне налоге"
 
 #: ../e-util/e-proxy-selector.c:85
-#| msgid "_Custom binary:"
 msgid "Custom Proxy"
 msgstr "Произвољни посредник"
 
 #: ../e-util/e-proxy-selector.c:487
-#| msgid "Create a new appointment"
 msgid "Create a new proxy profile"
 msgstr "Направите нови профил посредника"
 
 #: ../e-util/e-proxy-selector.c:492
-#| msgid "Delete the selected memo list"
 msgid "Delete the selected proxy profile"
 msgstr "Обришите изабрани профил посредника"
 
@@ -11719,117 +13988,277 @@ msgid "Edit Rule"
 msgstr "Уреди правило"
 
 # 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 "Поклапања: %u"
 
-#: ../e-util/e-search-bar.c:566
+#: ../e-util/e-search-bar.c:569
 msgid "Close the find bar"
 msgstr "Затвори траку претраге"
 
-#: ../e-util/e-search-bar.c:574
+#: ../e-util/e-search-bar.c:577
 msgid "Fin_d:"
 msgstr "Про_нађи:"
 
-#: ../e-util/e-search-bar.c:586
+#: ../e-util/e-search-bar.c:589
 msgid "Clear the search"
 msgstr "Очисти претрагу"
 
-#: ../e-util/e-search-bar.c:610
+#: ../e-util/e-search-bar.c:613
 msgid "_Previous"
 msgstr "_Претходно"
 
-#: ../e-util/e-search-bar.c:613
+#: ../e-util/e-search-bar.c:616
 msgid "Find the previous occurrence of the phrase"
 msgstr "Нађи претходно појављивање израза"
 
-#: ../e-util/e-search-bar.c:622
+#: ../e-util/e-search-bar.c:625
 msgid "_Next"
 msgstr "_Следеће"
 
-#: ../e-util/e-search-bar.c:625
+#: ../e-util/e-search-bar.c:628
 msgid "Find the next occurrence of the phrase"
 msgstr "Нађи следеће појављивање израза"
 
-#: ../e-util/e-search-bar.c:634
+#: ../e-util/e-search-bar.c:637
 msgid "Mat_ch case"
 msgstr "_Упореди величину слова"
 
-#: ../e-util/e-search-bar.c:662
+#: ../e-util/e-search-bar.c:665
 msgid "Reached bottom of page, continued from top"
 msgstr "Стигао сам до дна странице, настављам са врха"
 
-#: ../e-util/e-search-bar.c:684
+#: ../e-util/e-search-bar.c:687
 msgid "Reached top of page, continued from bottom"
 msgstr "Стигао сам до врха странице, настављам са дна"
 
 # 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:1172
+#: ../smime/gui/certificate-manager.c:1671
 msgid "Mail"
 msgstr "Пошта"
 
-#: ../e-util/e-send-options.c:569
+#: ../e-util/e-send-options.c:570
 msgid "When de_leted:"
 msgstr "Када је обри_сано:"
 
-#: ../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 "Обично"
+
+#: ../e-util/e-send-options.ui.h:6
+msgid "Proprietary"
+msgstr "Власничко"
+
+#: ../e-util/e-send-options.ui.h:8
+msgid "Secret"
+msgstr "Тајно"
+
+#: ../e-util/e-send-options.ui.h:9
+msgid "Top Secret"
+msgstr "Строго поверљиво"
+
+#: ../e-util/e-send-options.ui.h:10
+msgid "For Your Eyes Only"
+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: Used in send options dialog
+#: ../e-util/e-send-options.ui.h:12
+msgctxt "send-options"
+msgid "None"
+msgstr "Ништа"
+
+#: ../e-util/e-send-options.ui.h:13
+msgid "Mail Receipt"
+msgstr "Признаница поште"
+
+#: ../e-util/e-send-options.ui.h:15
+msgid "R_eply requested"
+msgstr "Захтеван је о_дговор"
+
+#: ../e-util/e-send-options.ui.h:16
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "Ун_утар"
+
+#: ../e-util/e-send-options.ui.h:17
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "дана"
+
+#: ../e-util/e-send-options.ui.h:18
+msgid "_When convenient"
+msgstr "Када је з_годно"
+
+#: ../e-util/e-send-options.ui.h:20
+msgid "_Delay message delivery"
+msgstr "_Одложи испоруку поруке"
+
+#: ../e-util/e-send-options.ui.h:21
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_После"
+
+#: ../e-util/e-send-options.ui.h:22
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "дана"
+
+#: ../e-util/e-send-options.ui.h:23
+msgid "_Set expiration date"
+msgstr "Постави _рок"
+
+#: ../e-util/e-send-options.ui.h:24
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_До"
+
+#: ../e-util/e-send-options.ui.h:25
+msgid "Delivery Options"
+msgstr "Опције испоруке"
+
+#: ../e-util/e-send-options.ui.h:26
+msgid "_Priority:"
+msgstr "_Важност:"
+
+#: ../e-util/e-send-options.ui.h:27
+msgid "_Classification:"
+msgstr "_Класификација:"
+
+#: ../e-util/e-send-options.ui.h:28
+msgid "Gene_ral Options"
+msgstr "Опш_те опције"
+
+#: ../e-util/e-send-options.ui.h:29
+msgid "Creat_e a sent item to track information"
+msgstr "На_прави послату ставку за праћење податка"
+
+#: ../e-util/e-send-options.ui.h:30
+msgid "_Delivered"
+msgstr "_Испоручено"
+
+#: ../e-util/e-send-options.ui.h:31
+msgid "Deli_vered and opened"
+msgstr "Испо_ручено и отворено"
+
+#: ../e-util/e-send-options.ui.h:32
+msgid "_All information"
+msgstr "_Сви подаци"
+
+#: ../e-util/e-send-options.ui.h:33
+msgid "A_uto-delete sent item"
+msgstr "А_утоматски обриши послату ставку"
+
+#: ../e-util/e-send-options.ui.h:34
+msgid "Status Tracking"
+msgstr "Праћење статуса"
+
+#: ../e-util/e-send-options.ui.h:35
+msgid "_When opened:"
+msgstr "Када је о_творено:"
+
+#: ../e-util/e-send-options.ui.h:36
+msgid "When decli_ned:"
+msgstr "Када је _одбијено:"
+
+#: ../e-util/e-send-options.ui.h:37
+msgid "When co_mpleted:"
+msgstr "Кад је _завршено:"
+
+#: ../e-util/e-send-options.ui.h:38
+msgid "When acce_pted:"
+msgstr "Када је _прихваћено:"
+
+#: ../e-util/e-send-options.ui.h:39
+msgid "Return Notification"
+msgstr "Повратно обавештење"
+
+#: ../e-util/e-send-options.ui.h:40
+msgid "Sta_tus Tracking"
+msgstr "Праћење ста_туса"
+
+#: ../e-util/e-source-config.c:690 ../e-util/e-source-config.c:694
 msgid "Type:"
 msgstr "Врста:"
 
-#: ../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 "Име:"
 
 #. 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:1311
 msgid "Refresh every"
 msgstr "Освежи на сваких"
 
-#: ../e-util/e-source-config.c:1331 ../e-util/e-source-config.c:1401
+#: ../e-util/e-source-config.c:1341 ../e-util/e-source-config.c:1411
 msgid "Use a secure connection"
 msgstr "Користи безбедну везу"
 
-#: ../e-util/e-source-config.c:1427
+#: ../e-util/e-source-config.c:1437
 msgid "Unset _trust for SSL certificate"
 msgstr "Одзначи _поверење за ССЛ уверење"
 
-#: ../e-util/e-source-config.c:1463
+#: ../e-util/e-source-config.c:1473
 msgid "User"
 msgstr "Корисник"
 
-#: ../e-util/e-source-selector-dialog.c:226
+#: ../e-util/e-source-selector-dialog.c:236
 msgid "_Destination"
 msgstr "_Одредиште"
 
-#: ../e-util/e-source-selector-dialog.c:339
+#: ../e-util/e-source-selector-dialog.c:364
 msgid "Select destination"
 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)"
+
+#. 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 "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:383
+#: ../e-util/e-spell-entry.c:457
 msgid "(no suggestions)"
 msgstr "(нема предлога)"
 
-#: ../e-util/e-spell-entry.c:407
+#: ../e-util/e-spell-entry.c:481
 msgid "More..."
 msgstr "Даље..."
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:478
+#: ../e-util/e-spell-entry.c:566
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "Додај „%s“ у речник"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:529
+#: ../e-util/e-spell-entry.c:615
 msgid "Ignore All"
 msgstr "Занемари све"
 
-#: ../e-util/e-spell-entry.c:557
+#: ../e-util/e-spell-entry.c:647
 msgid "Spelling Suggestions"
 msgstr "Предлози правописа"
 
@@ -11843,10 +14272,6 @@ msgid ""
 msgstr ""
 "Већ постоји датотека у „{0}“. Уколико је замените преписаћете њен садржај."
 
-#: ../e-util/e-system.error.xml.h:3
-msgid "_Replace"
-msgstr "_Замени"
-
 #: ../e-util/e-system.error.xml.h:4
 msgid "Cannot save file \"{0}\"."
 msgstr "Не могу да сачувам датотеку „{0}“."
@@ -11866,19 +14291,19 @@ msgstr "Не могу да отворим датотеку „{0}“."
 
 #: ../e-util/e-system.error.xml.h:7
 msgid "Failed to remove data source &quot;{0}&quot;."
-msgstr "Нисам успео да уклоним извор података „{0}“."
+msgstr "Не могу да уклоним извор података „{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:64
 msgid "The reported error was &quot;{1}&quot;."
 msgstr "Пријављена грешка бејаше „{1}“."
 
 #: ../e-util/e-system.error.xml.h:9
 msgid "Failed to update data source &quot;{0}&quot;."
-msgstr "Нисам успео да освежим извор података „{0}“."
+msgstr "Не могу да освежим извор података „{0}“."
 
 #: ../e-util/e-system.error.xml.h:10
 msgid "Failed to delete resource &quot;{0}&quot;."
-msgstr "Нисам успео да обришем ресурс „{0}“."
+msgstr "Не могу да обришем ресурс „{0}“."
 
 #: ../e-util/e-system.error.xml.h:11
 msgid ""
@@ -11941,29 +14366,29 @@ msgstr "Позадинац списка белешки који услужује
 msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
 msgstr "Позадинац списка задатака који услужује „{0}“ је наишао на грешку."
 
-#: ../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 "кликните да додате"
 
-#: ../e-util/e-table-column-selector.c:265
+#: ../e-util/e-table-column-selector.c:264
 msgid "Move selected column names to top"
 msgstr "Преместите изабране називе ступца на врх"
 
-#: ../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 "Преместите изабране називе ступца један ред на горе"
 
-#: ../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 "Преместите изабране називе ступца један ред на доле"
 
-#: ../e-util/e-table-column-selector.c:280
+#: ../e-util/e-table-column-selector.c:279
 msgid "Move selected column names to bottom"
 msgstr "Преместите изабране називе ступца на дно"
 
-#: ../e-util/e-table-column-selector.c:285
+#: ../e-util/e-table-column-selector.c:284
 msgid "Select all column names"
 msgstr "Изаберите све називе ступца"
 
@@ -11991,9 +14416,69 @@ msgstr "Прикажи поља"
 msgid "Choose the order of information to appear in the message list."
 msgstr "Изаберите редослед података за приказивање на списку порука."
 
-#: ../e-util/e-table-field-chooser-dialog.c:226
-msgid "Add a Column"
-msgstr "Додај колону"
+#: ../e-util/e-table-config.ui.h:2
+msgid "_Apply"
+msgstr "_Примени"
+
+#: ../e-util/e-table-config.ui.h:4
+msgid "_Sort..."
+msgstr "_Разврстај..."
+
+#: ../e-util/e-table-config.ui.h:5
+msgid "_Group By..."
+msgstr "_Групиши по..."
+
+#: ../e-util/e-table-config.ui.h:6
+msgid "_Fields Shown..."
+msgstr "Приказана _поља..."
+
+#: ../e-util/e-table-config.ui.h:9
+msgid "Clear _All"
+msgstr "Очисти _све"
+
+#: ../e-util/e-table-config.ui.h:10
+msgid "_Show field in View"
+msgstr "_Прикажи поље у прегледу"
+
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1755
+msgid "Ascending"
+msgstr "Растуће"
+
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1755
+msgid "Descending"
+msgstr "Опадајуће"
+
+#: ../e-util/e-table-config.ui.h:13
+msgid "Group Items By"
+msgstr "Групиши ставке по"
+
+#: ../e-util/e-table-config.ui.h:14
+msgid "Show _field in View"
+msgstr "Прикажи _поље у прегледу"
+
+#: ../e-util/e-table-config.ui.h:15
+msgid "Then By"
+msgstr "Онда по"
+
+#: ../e-util/e-table-config.ui.h:16
+msgid "Show field i_n View"
+msgstr "Прикажи поље _у прегледу"
+
+#: ../e-util/e-table-config.ui.h:17
+msgid "Show field in _View"
+msgstr "Прикажи поље у п_регледу"
+
+#: ../e-util/e-table-config.ui.h:18
+msgid "Sort"
+msgstr "Разврстај"
+
+#: ../e-util/e-table-config.ui.h:19
+msgid "Clear All"
+msgstr "Очисти све"
+
+#: ../e-util/e-table-config.ui.h:20
+msgid "Sort Items By"
+msgstr "Разврстај ставке по"
 
 #: ../e-util/e-table-field-chooser.c:166
 msgid ""
@@ -12003,6 +14488,10 @@ msgstr ""
 "За додавање колоне у табелу, превуците\n"
 "је на место где желите да се појави."
 
+#: ../e-util/e-table-field-chooser-dialog.c:226
+msgid "Add a Column"
+msgstr "Додај колону"
+
 #: ../e-util/e-table-group-container.c:368
 #, c-format
 msgid "%s: %s (%d item)"
@@ -12021,71 +14510,67 @@ msgstr[1] "%s (%d ставке)"
 msgstr[2] "%s (%d ставки)"
 msgstr[3] "%s (једна ставка)"
 
-#: ../e-util/e-table-header-item.c:1576
+#: ../e-util/e-table-header-item.c:1578
 msgid "Customize Current View"
 msgstr "Прилагодите тренутни преглед"
 
-#: ../e-util/e-table-header-item.c:1599
+#: ../e-util/e-table-header-item.c:1601
 msgid "Sort _Ascending"
 msgstr "Разврстај _растуће"
 
-#: ../e-util/e-table-header-item.c:1602
+#: ../e-util/e-table-header-item.c:1604
 msgid "Sort _Descending"
 msgstr "Разврстај _опадајуће"
 
-#: ../e-util/e-table-header-item.c:1605
+#: ../e-util/e-table-header-item.c:1607
 msgid "_Unsort"
 msgstr "_Не разврставај"
 
-#: ../e-util/e-table-header-item.c:1608
+#: ../e-util/e-table-header-item.c:1610
 msgid "Group By This _Field"
 msgstr "Групиши по овоме _пољу"
 
-#: ../e-util/e-table-header-item.c:1611
+#: ../e-util/e-table-header-item.c:1613
 msgid "Group By _Box"
 msgstr "Групиши по _оквиру"
 
-#: ../e-util/e-table-header-item.c:1615
+#: ../e-util/e-table-header-item.c:1617
 msgid "Remove This _Column"
 msgstr "Уклони ову _колону"
 
-#: ../e-util/e-table-header-item.c:1618
+#: ../e-util/e-table-header-item.c:1620
 msgid "Add a C_olumn..."
 msgstr "Додај ко_лону..."
 
-#: ../e-util/e-table-header-item.c:1622
+#: ../e-util/e-table-header-item.c:1624
 msgid "A_lignment"
 msgstr "По_равнање"
 
-#: ../e-util/e-table-header-item.c:1625
+#: ../e-util/e-table-header-item.c:1627
 msgid "B_est Fit"
 msgstr "На_јбоље уклапање"
 
-#: ../e-util/e-table-header-item.c:1628
+#: ../e-util/e-table-header-item.c:1630
 msgid "Format Column_s..."
 msgstr "Обликуј коло_не..."
 
-#: ../e-util/e-table-header-item.c:1632
+#: ../e-util/e-table-header-item.c:1634
 msgid "Custo_mize Current View..."
 msgstr "Прила_годи тренутни преглед..."
 
-#: ../e-util/e-table-header-item.c:1703
+#: ../e-util/e-table-header-item.c:1705
 msgid "_Sort By"
 msgstr "_Поређај по"
 
 #. Custom
-#: ../e-util/e-table-header-item.c:1726
+#: ../e-util/e-table-header-item.c:1728
 msgid "_Custom"
 msgstr "_Произвољно"
 
-#: ../e-util/e-text.c:2110
+#: ../e-util/e-text.c:2134
 msgid "Select All"
 msgstr "Изабери све"
 
-#: ../e-util/e-text.c:2123
-msgid "Input Methods"
-msgstr "Начини уноса"
-
 # Универзално време, или УТ
 # Ваљда УВ?
 #. Put the "UTC" entry at the top of the combo's list.
@@ -12095,6 +14580,31 @@ msgstr "Начини уноса"
 msgid "UTC"
 msgstr "КУВ"
 
+#: ../e-util/e-timezone-dialog.ui.h:1
+msgid "Select a Time Zone"
+msgstr "Изаберите временску зону"
+
+#: ../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 ""
+"Користите леви тастер миша да увећате мапу и изаберете временску зону.\n"
+"Користите десни тастер миша за умањивање."
+
+#: ../e-util/e-timezone-dialog.ui.h:6
+msgid "Time Zones"
+msgstr "Временске зоне"
+
+#: ../e-util/e-timezone-dialog.ui.h:7
+msgid "_Selection"
+msgstr "_Избор"
+
+#: ../e-util/e-timezone-dialog.ui.h:8
+msgid "Timezone drop-down combination box"
+msgstr "Прозорче за подешавање временске зоне"
+
 #: ../e-util/e-url-entry.c:108
 msgid "Click here to open the URL"
 msgstr "Кликните овде да отворите адресу"
@@ -12103,123 +14613,128 @@ msgstr "Кликните овде да отворите адресу"
 msgid "Enter a URL here"
 msgstr "Овде унесите адресу"
 
-#: ../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 "Приказивач извора Еволуције"
+
+#. Translators: The name that is displayed in the user interface
+#: ../e-util/evolution-source-viewer.c:667
+msgid "Display Name"
+msgstr "Назив приказа"
+
+#: ../e-util/evolution-source-viewer.c:676
+msgid "Flags"
+msgstr "Опције"
+
+#: ../e-util/evolution-source-viewer.c:728
+#: ../mail/e-mail-config-identity-page.c:721
+msgid "Identity"
+msgstr "Идентитет"
+
+#: ../e-util/e-web-view.c:316
 msgid "_Copy Link Location"
 msgstr "_Умножи место везе"
 
-#: ../e-util/e-web-view-gtkhtml.c:407 ../e-util/e-web-view.c:284
+#: ../e-util/e-web-view.c:318
 msgid "Copy the link to the clipboard"
 msgstr "Умножава везу у списак исечака"
 
-#: ../e-util/e-web-view-gtkhtml.c:415 ../e-util/e-web-view.c:292
+#: ../e-util/e-web-view.c:326
 msgid "_Open Link in Browser"
 msgstr "_Отвори везу у прегледнику"
 
-#: ../e-util/e-web-view-gtkhtml.c:417 ../e-util/e-web-view.c:294
+#: ../e-util/e-web-view.c:328
 msgid "Open the link in a web browser"
 msgstr "Отвори везу у веб претраживачу"
 
-#: ../e-util/e-web-view-gtkhtml.c:425 ../e-util/e-web-view.c:302
+#: ../e-util/e-web-view.c:336
 msgid "_Copy Email Address"
-msgstr "_Умножи адресу ел. поште"
+msgstr "_Умножи е-адресу"
+
+#: ../e-util/e-web-view.c:343
+#| msgid "Copy _Email Address"
+msgid "Copy _Raw Email Address"
+msgstr "Умножи са_мо е-адресу"
 
-#: ../e-util/e-web-view-gtkhtml.c:442 ../e-util/e-web-view.c:319
+#: ../e-util/e-web-view.c:345
+#| msgid "Copy the email address to the clipboard"
+msgid "Copy the raw email address to the clipboard"
+msgstr "Умножава само чисту адресу електронске поште у списак исечака"
+
+#: ../e-util/e-web-view.c:360
 msgid "_Copy Image"
 msgstr "_Умножи слику"
 
-#: ../e-util/e-web-view-gtkhtml.c:444 ../e-util/e-web-view.c:321
+#: ../e-util/e-web-view.c:362
 msgid "Copy the image to the clipboard"
 msgstr "Умножите слику у оставу"
 
-#: ../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:367
+msgid "Save _Image..."
+msgstr "Сачувај _слику..."
+
+#: ../e-util/e-web-view.c:369
+msgid "Save the image to a file"
+msgstr "Сачувајте слику у датотеку"
+
+#: ../e-util/e-web-view.c:389 ../e-util/e-web-view.c:1427
 msgid "Select all text and images"
 msgstr "Изабери сав текст и слике"
 
-#: ../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:1069
 #, c-format
 msgid "Click to call %s"
 msgstr "Кликните да позовете %s"
 
-#: ../e-util/e-web-view-gtkhtml.c:977 ../e-util/e-web-view.c:1000
+#: ../e-util/e-web-view.c:1071
 msgid "Click to hide/unhide addresses"
 msgstr "Кликните да сакријете/откријете адресе"
 
-#: ../e-util/e-web-view-gtkhtml.c:979 ../e-util/e-web-view.c:1002
+#: ../e-util/e-web-view.c:1082
 #, c-format
-msgid "Click to open %s"
-msgstr "Кликните да отворите %s"
+#| msgid "Enter the recipients of the message"
+msgid "Go to the section %s of the message"
+msgstr "Иди на одељак %s ове поруке"
 
-#: ../e-util/e-web-view.c:326
-msgid "Save _Image..."
-msgstr "Сачувај _слику..."
+#: ../e-util/e-web-view.c:1084
+#| msgid "Enter the recipients of the message"
+msgid "Go to the beginning of the message"
+msgstr "Иди на почетак поруке"
 
-#: ../e-util/e-web-view.c:328
-msgid "Save the image to a file"
-msgstr "Сачувајте слику у датотеку"
+#: ../e-util/e-web-view.c:1088
+#, c-format
+msgid "Click to open %s"
+msgstr "Кликните да отворите %s"
 
-#: ../e-util/e-web-view.c:2902
+#: ../e-util/e-web-view.c:3039
 msgid "Copying image to clipboard"
 msgstr "Умножавам слику у оставу"
 
-#: ../e-util/e-web-view.c:3090
+#: ../e-util/e-web-view.c:3227
 msgid "Save Image"
 msgstr "Сачувај слику"
 
-#: ../e-util/e-web-view.c:3126
+#: ../e-util/e-web-view.c:3263
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "Чувам слику у „%s“"
 
-#: ../e-util/e-widget-undo.c:429
+#: ../e-util/e-widget-undo.c:430
 msgid "Undo 'Insert text'"
 msgstr "Поништи „Уметни текст“"
 
-#: ../e-util/e-widget-undo.c:431
+#: ../e-util/e-widget-undo.c:432
 msgid "Redo 'Insert text'"
 msgstr "Поврати „Уметни текст“"
 
-#: ../e-util/e-widget-undo.c:445
+#: ../e-util/e-widget-undo.c:446
 msgid "Undo 'Delete text'"
 msgstr "Поништи „Обриши текст“"
 
-#: ../e-util/e-widget-undo.c:447
+#: ../e-util/e-widget-undo.c:448
 msgid "Redo 'Delete text'"
 msgstr "Поврати „Обриши текст“"
 
-#: ../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 "Календар: од %s до %s"
-
-#: ../e-util/ea-calendar-item.c:363
-msgid "evolution calendar item"
-msgstr "ставка календара еволуције"
-
-#: ../e-util/evolution-source-viewer.c:636
-msgid "Evolution Source Viewer"
-msgstr "Приказивач извора Еволуције"
-
-#. Translators: The name that is displayed in the user interface
-#: ../e-util/evolution-source-viewer.c:666
-msgid "Display Name"
-msgstr "Назив приказа"
-
-#: ../e-util/evolution-source-viewer.c:675
-msgid "Flags"
-msgstr "Опције"
-
-#: ../e-util/evolution-source-viewer.c:727
-#: ../mail/e-mail-config-identity-page.c:677
-msgid "Identity"
-msgstr "Идентитет"
-
 #: ../e-util/filter.error.xml.h:1
 msgid "Missing date."
 msgstr "Недостаје датум."
@@ -12250,7 +14765,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:100
+#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:103
 msgid "Missing name."
 msgstr "Недостаје име."
 
@@ -12267,7 +14782,6 @@ msgid "Please choose another name."
 msgstr "Изаберите друго име."
 
 #: ../e-util/filter.error.xml.h:12
-#| msgid "Missing date."
 msgid "Missing condition."
 msgstr "Недостаје услов."
 
@@ -12276,7 +14790,6 @@ msgid "Filter should have at least one condition."
 msgstr "Пропусник треба да има барем један услов."
 
 #: ../e-util/filter.error.xml.h:14
-#| msgid "Missing date."
 msgid "Missing value."
 msgstr "Недостаје вредност."
 
@@ -12284,13 +14797,96 @@ msgstr "Недостаје вредност."
 msgid "One or more values cannot be empty."
 msgstr "Једна или више вредности не могу бити празне."
 
+#: ../e-util/filter.ui.h:2
+msgid "the current time"
+msgstr "тренутно време"
+
+#: ../e-util/filter.ui.h:3
+msgid "the time you specify"
+msgstr "време које одредите"
+
+#: ../e-util/filter.ui.h:4
+msgid "a time relative to the current time"
+msgstr "време у односу на тренутно време"
+
+# bug: plural-forms
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:89
+msgid "seconds"
+msgstr "секунде"
+
+#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
+msgid "weeks"
+msgstr "недеље"
+
+#: ../e-util/filter.ui.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+msgid "months"
+msgstr "месеци"
+
+#: ../e-util/filter.ui.h:11
+msgid "years"
+msgstr "године"
+
+#: ../e-util/filter.ui.h:12
+msgid "ago"
+msgstr "пре"
+
+#: ../e-util/filter.ui.h:13
+msgid "in the future"
+msgstr "у будућности"
+
+#: ../e-util/filter.ui.h:14
+msgid "Show filters for mail:"
+msgstr "Прикажи пропуснике поште:"
+
+#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
+msgid "_Filter Rules"
+msgstr "Пр_авила филтера"
+
+#: ../e-util/filter.ui.h:23
+msgid "Compare against"
+msgstr "Упореди са"
+
+#: ../e-util/filter.ui.h:24
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Датум поруке ће бити упоређен са\n"
+"тренутним временом када се филтрирање десило."
+
+#: ../e-util/filter.ui.h:26
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Датум поруке ће бити упоређен са\n"
+"00:00 наведеног датума."
+
+#: ../e-util/filter.ui.h:28
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Датум поруке ће бити упоређен са\n"
+"временом када се филтрирање десило."
+
+#: ../e-util/gal-a11y-e-cell.c:130
+msgid "Table Cell"
+msgstr "Ћелија табеле"
+
 #. Translators: description of a "popup" action
 #: ../e-util/gal-a11y-e-cell-popup.c:127
 msgid "popup a child"
 msgstr "искачуће изведено"
 
+#. Translators: description of an "edit" action
+#: ../e-util/gal-a11y-e-cell-text.c:631
+msgid "begin editing this cell"
+msgstr "почиње уређивање ове ћелије"
+
 #. 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 "бирање ћелије"
 
@@ -12304,10 +14900,6 @@ msgstr "разгранава ред у Естабло које сдржи ову
 msgid "collapses the row in the ETree containing this cell"
 msgstr "скупља ред у Естабло које садржи ову ћелију"
 
-#: ../e-util/gal-a11y-e-cell.c:122
-msgid "Table Cell"
-msgstr "Ћелија табеле"
-
 #: ../e-util/gal-a11y-e-table-click-to-add.c:71
 msgid "click"
 msgstr "клик"
@@ -12320,6 +14912,14 @@ msgstr "разврставање"
 msgid "Save Current View"
 msgstr "Сачувај тренутни преглед"
 
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
+msgid "_Create new view"
+msgstr "_Направи нови преглед"
+
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
+msgid "_Replace existing view"
+msgstr "_Замени постојећи преглед"
+
 #: ../e-util/widgets.error.xml.h:1
 msgid "Do you wish to save your changes?"
 msgstr "Да ли желите да сачувате измене?"
@@ -12356,6 +14956,26 @@ msgstr "Не могу да учитам потпис."
 msgid "Could not save signature."
 msgstr "Не могу да сачувам потпис."
 
+#: ../evolution.appdata.xml.in.h:1
+msgid ""
+"Evolution is a personal information management application that provides "
+"integrated mail, calendaring and address book functionality."
+msgstr ""
+"Еволуција је програм за управљање личним подацима који обезбеђује обједињену "
+"функционалност поште, календара и адресара."
+
+#: ../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 ""
+"Еволуција подржава широк опсег записа индустријских стандардних података и "
+"мрежних протокола за размену информација, са нагласком на сагласност "
+"стандарда и безебдност. Еволуција може такође глатко да се обједини са "
+"Мајкрософтовом разменом посредством проширења „Услуге веб размене“ "
+
 #: ../libemail-engine/camel-sasl-xoauth2.c:26
 msgid "OAuth2"
 msgstr "ОАут2"
@@ -12365,53 +14985,48 @@ msgid "This option will use an OAuth 2.0 access token to connect to the server"
 msgstr ""
 "Ова опција ће користити ОАут 2.0 симбол приступа да се повеже на сервер"
 
-#: ../libemail-engine/e-mail-authenticator.c:181
-#, c-format
-msgid "Invalid authentication result code (%d)"
-msgstr "Неисправан код резултата потврђивања идентитета (%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 "Чувам поруку у фасциклу „%s“"
 
-#: ../libemail-engine/e-mail-folder-utils.c:571
+#: ../libemail-engine/e-mail-folder-utils.c:574
 msgid "Forwarded messages"
 msgstr "Прослеђене поруке"
 
-#: ../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] "Довлачим %d поруку"
-msgstr[1] "Довлачим %d поруке"
-msgstr[2] "Довлачим %d порука"
-msgstr[3] "Довлачим једну поруку"
+msgstr[0] "Преузимам %d поруку"
+msgstr[1] "Преузимам %d поруке"
+msgstr[2] "Преузимам %d порука"
+msgstr[3] "Преузимам поруку"
 
-#: ../libemail-engine/e-mail-folder-utils.c:775
+#: ../libemail-engine/e-mail-folder-utils.c:778
 msgid "Scanning messages for duplicates"
 msgstr "Тражим дупликате у порукама"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1145
+#: ../libemail-engine/e-mail-folder-utils.c:1148
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Уклањам фасциклу „%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 "Датотека „%s“ је уклоњена."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1329
+#: ../libemail-engine/e-mail-folder-utils.c:1332
 msgid "File has been removed."
 msgstr "Датотека је уклоњена."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1388
+#: ../libemail-engine/e-mail-folder-utils.c:1391
 msgid "Removing attachments"
 msgstr "Уклањам прилоге"
 
-#: ../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,103 +15035,119 @@ msgstr[1] "Чувам %d поруке"
 msgstr[2] "Чувам %d порука"
 msgstr[3] "Чувам једну поруку"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1930
+#: ../libemail-engine/e-mail-folder-utils.c:1933
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Неисправна путања фасцикле „%s“"
 
-#: ../libemail-engine/e-mail-session-utils.c:539
-msgid "No mail transport service available"
-msgstr "Нема доступне услуге преноса поште"
-
-#: ../libemail-engine/e-mail-session-utils.c:639
-#: ../libemail-engine/mail-ops.c:707
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Неуспела примена одлазних пропусника: %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 ""
-"Нисам успео да прикачим у %s: %s\n"
-"Уместо тога прикачићу у локалну фасциклу „Послато“."
-
-#: ../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 "Нисам успео да прикачим у локалну фасциклу „Послато“: %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 "Слање поруке"
-
-#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:410
-#: ../mail/em-folder-tree-model.c:1160
+#. Some local folders
+#: ../libemail-engine/e-mail-session.c:124 ../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:1071
 msgid "Inbox"
 msgstr "Сандуче"
 
 #. 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:125 ../mail/em-folder-tree-model.c:1222
+#: ../mail/importers/kmail-libs.c:147
+#: ../modules/mail/e-mail-shell-view-private.c:1047
 msgid "Drafts"
 msgstr "Нацрти"
 
 #. 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:126 ../mail/em-folder-tree-model.c:1233
+#: ../mail/importers/kmail-libs.c:143
+#: ../modules/mail/e-mail-shell-view-private.c:1051
 msgid "Outbox"
 msgstr "За слање"
 
 #. 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:127 ../mail/em-folder-tree-model.c:1237
+#: ../mail/importers/kmail-libs.c:145
+#: ../modules/mail/e-mail-shell-view-private.c:1053
 msgid "Sent"
 msgstr "Послато"
 
 #. 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:128 ../mail/em-folder-tree-model.c:1225
+#: ../mail/importers/kmail-libs.c:149
+#: ../modules/mail/e-mail-shell-view-private.c:1055
 #: ../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 "Шаблони"
 
-#: ../libemail-engine/e-mail-session.c:1245
+#: ../libemail-engine/e-mail-session.c:1261
 #, c-format
 msgid "User cancelled operation"
 msgstr "Корисник је отказао радњу"
 
-#: ../libemail-engine/e-mail-session.c:1373
-#, c-format
-msgid "%s authentication failed"
-msgstr "Није успело %s потврђивање идентитета"
-
-#: ../libemail-engine/e-mail-session.c:1423
-#, c-format
-msgid "No data source found for UID '%s'"
-msgstr "Није пронађен извор података за ЈИБ „%s“"
-
-#: ../libemail-engine/e-mail-session.c:1486
+#: ../libemail-engine/e-mail-session.c:1318
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "Није достављена одредишна адреса, прослеђивање поруке је отказано."
 
-#: ../libemail-engine/e-mail-session.c:1499
+#: ../libemail-engine/e-mail-session.c:1331
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "Није пронађен идентитет за коришћење, прослеђивање поруке је отказано."
 
+#: ../libemail-engine/e-mail-session.c:2360
+#, c-format
+#| msgid "Storing folder '%s'"
+msgid "Waiting for '%s'"
+msgstr "Чекам на „%s“"
+
+#: ../libemail-engine/e-mail-session-utils.c:540
+msgid "No mail transport service available"
+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“"
+
+#: ../libemail-engine/e-mail-session-utils.c:667
+#: ../libemail-engine/mail-ops.c:755
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Неуспела примена одлазних пропусника: %s"
+
+#: ../libemail-engine/e-mail-session-utils.c:697
+#: ../libemail-engine/e-mail-session-utils.c:732
+#: ../libemail-engine/mail-ops.c:779 ../libemail-engine/mail-ops.c:814
+#, c-format
+#| msgid "Moving messages to '%s'"
+msgid "Storing sent message to '%s'"
+msgstr "Чувам послату поруку у „%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 ""
+"Не могу да прикачим у %s: %s\n"
+"Уместо тога прикачићу у локалну фасциклу „Послато“."
+
+#: ../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 "Не могу да прикачим у локалну фасциклу „Послато“: %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 "Слање поруке"
+
 #: ../libemail-engine/e-mail-store-utils.c:189
 #, c-format
 msgid "Disconnecting from '%s'"
@@ -12544,17 +15175,17 @@ msgid ""
 ">Message Filters.\n"
 "Original error was: %s"
 msgstr ""
-"Нисам успео да издвојим изабране поруке. Један од разлога може бити и тај да "
-"је неисправно место фасцикле подешено у једном или више пропусника. Молим "
+"Не могу да издвојим изабране поруке. Један од разлога може бити и тај да је "
+"неисправно место фасцикле подешено у једном или више пропусника. Молим "
 "проверите ваше пропуснике у изборнику „Уређивање—>Пропусници порука“.\n"
 "Изворна грешка беше: %s"
 
 #: ../libemail-engine/mail-ops.c:229
 #, c-format
 msgid "Fetching mail from '%s'"
-msgstr "Довлачим пошту са „%s“"
+msgstr "Преузимам пошту са „%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 +15193,70 @@ msgid ""
 ">Message Filters.\n"
 "Original error was: %s"
 msgstr ""
-"Нисам успео да применим одлазне пропуснике. Један од разлога може бити и тај "
-"да је неисправно место фасцикле подешено у једном или више пропусника. Молим "
+"Не могу да применим одлазне пропуснике. Један од разлога може бити и тај да "
+"је неисправно место фасцикле подешено у једном или више пропусника. Молим "
 "проверите ваше пропуснике у изборнику „Уређивање—>Пропусници порука“.\n"
 "Изворна грешка беше: %s"
 
-#: ../libemail-engine/mail-ops.c:917
+#: ../libemail-engine/mail-ops.c:990
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Шаљем поруку %d од %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] "Нисам успео да пошаљем %d од %d порукe"
-msgstr[1] "Нисам успео да пошаљем %d од %d порука"
-msgstr[2] "Нисам успео да пошаљем %d од %d порука"
-msgstr[3] "Нисам успео да пошаљем %d од %d порукe"
+msgstr[0] "Не могу да пошаљем %d од %d порукe"
+msgstr[1] "Не могу да пошаљем %d од %d порука"
+msgstr[2] "Не могу да пошаљем %d од %d порука"
+msgstr[3] "Не могу да пошаљем %d од %d порукe"
 
-#: ../libemail-engine/mail-ops.c:975
+#: ../libemail-engine/mail-ops.c:1048
 msgid "Canceled."
 msgstr "Отказано."
 
-#: ../libemail-engine/mail-ops.c:977
+#: ../libemail-engine/mail-ops.c:1050
 msgid "Complete."
 msgstr "Завршено."
 
-#: ../libemail-engine/mail-ops.c:1089
+#: ../libemail-engine/mail-ops.c:1164
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Премештам поруке у „%s“"
 
-#: ../libemail-engine/mail-ops.c:1090
+#: ../libemail-engine/mail-ops.c:1165
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Умножавам поруке у „%s“"
 
-#: ../libemail-engine/mail-ops.c:1209
+#: ../libemail-engine/mail-ops.c:1284
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Смештам фасциклу „%s“"
 
-#: ../libemail-engine/mail-ops.c:1337
+#: ../libemail-engine/mail-ops.c:1412
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Празним и смештам налог „%s“"
 
-#: ../libemail-engine/mail-ops.c:1338
+#: ../libemail-engine/mail-ops.c:1413
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Смештам налог „%s“"
 
-#: ../libemail-engine/mail-ops.c:1413
+#: ../libemail-engine/mail-ops.c:1488
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Избацујем смеће у „%s“"
 
+#: ../libemail-engine/mail-ops.c:1580
+#, c-format
+#| msgid "Storing folder '%s'"
+msgid "Processing folder changes in '%s'"
+msgstr "Обрађујем измене фасцикле у „%s“"
+
 #: ../libemail-engine/mail-tools.c:70
 #, c-format
 msgid "Could not create spool directory '%s': %s"
@@ -12686,83 +15323,70 @@ msgstr "Отвори налоге на _мрежи"
 msgid "This account was created through the Online Accounts service."
 msgstr "Овај налог је направљен путем услуге налога на мрежи."
 
-#: ../mail/e-mail-account-manager.c:690
+#: ../mail/e-mail-account-manager.c:689
 msgid "_Reset Order"
 msgstr "_Поново постави редослед"
 
-#: ../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 "Можете да превучете и убаците називе налога да их поново поређате."
 
-#: ../mail/e-mail-account-manager.c:746
+#: ../mail/e-mail-account-manager.c:745
 msgid "De_fault"
 msgstr "Под_разумевано"
 
 # 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:1276
+#: ../modules/plugin-manager/evolution-plugin-manager.c:357
+#: ../plugins/publish-calendar/publish-calendar.c:855
 msgid "Enabled"
 msgstr "Укључен"
 
-#: ../mail/e-mail-account-tree-view.c:108
+#: ../mail/e-mail-account-tree-view.c:107
 msgid "Account Name"
 msgstr "Назив налога"
 
-#: ../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 "Основно"
-
-#: ../mail/e-mail-autoconfig.c:611
+#: ../mail/e-mail-autoconfig.c:619
 msgid "No email address provided"
 msgstr "Није достављена адреса ел. поште"
 
-#: ../mail/e-mail-autoconfig.c:620
+#: ../mail/e-mail-autoconfig.c:628
 msgid "Missing domain in email address"
 msgstr "Недостаје домен у адреси ел. поште"
 
-#: ../mail/e-mail-backend.c:841
-msgid "Unknown background operation"
-msgstr "Непозната позадинска радња"
-
-#: ../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:129 ../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:285
+#: ../mail/e-mail-browser.c:286
 msgid "(No Subject)"
 msgstr "(Без субјекта)"
 
 #. GtkAssistant's back button label.
 #: ../mail/e-mail-config-assistant.c:46
-#| msgid "Go Back"
 msgid "Go _Back"
 msgstr "Иди _назад"
 
 #. GtkAssistant sinks the floating button reference.
-#: ../mail/e-mail-config-assistant.c:114
+#: ../mail/e-mail-config-assistant.c:115
 msgid "_Skip Lookup"
 msgstr "_Прескочи претрагу"
 
-#: ../mail/e-mail-config-assistant.c:654
+#: ../mail/e-mail-config-assistant.c:660
 msgid "Evolution Account Assistant"
 msgstr "Помоћник налога Еволуције"
 
-#: ../mail/e-mail-config-assistant.c:936
-#| msgid "_Restore Defaults"
+#: ../mail/e-mail-config-assistant.c:952
 msgid "_Revise Details"
 msgstr "_Обнови појединости"
 
-#: ../mail/e-mail-config-auth-check.c:350
+#: ../mail/e-mail-config-auth-check.c:339
 msgid "Check for Supported Types"
 msgstr "Проверите за подржаним врстама"
 
-#: ../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,7 +15400,7 @@ msgstr ""
 "\n"
 "Кликните „Примени“ да сачувате поставке."
 
-#: ../mail/e-mail-config-confirm-page.c:168
+#: ../mail/e-mail-config-confirm-page.c:167
 msgid "Done"
 msgstr "Урађено"
 
@@ -12805,62 +15429,73 @@ 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"
+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."
+msgid "Choose a folder to archive messages to."
+msgstr "Изаберите фасцикле за архивирање поруке."
+
+#: ../mail/e-mail-config-defaults-page.c:652
 msgid "_Restore Defaults"
 msgstr "_Поврати основно"
 
-#: ../mail/e-mail-config-defaults-page.c:642
+#: ../mail/e-mail-config-defaults-page.c:666
 msgid "Use a Real Folder for _Trash:"
 msgstr "Користи стварну фасциклу за _смеће:"
 
-#: ../mail/e-mail-config-defaults-page.c:643
+#: ../mail/e-mail-config-defaults-page.c:667
 msgid "Choose a folder for deleted messages."
 msgstr "Изаберите фасциклу за обрисане поруке."
 
-#: ../mail/e-mail-config-defaults-page.c:652
+#: ../mail/e-mail-config-defaults-page.c:676
 msgid "Use a Real Folder for _Junk:"
 msgstr "Користи стварну фасциклу за _ђубре:"
 
-#: ../mail/e-mail-config-defaults-page.c:653
+#: ../mail/e-mail-config-defaults-page.c:677
 msgid "Choose a folder for junk messages."
 msgstr "Изаберите фасциклу за непожељне поруке."
 
-#: ../mail/e-mail-config-defaults-page.c:670
+#: ../mail/e-mail-config-defaults-page.c:694
 msgid "Composing Messages"
 msgstr "Састављање порука"
 
-#: ../mail/e-mail-config-defaults-page.c:679
+#: ../mail/e-mail-config-defaults-page.c:703
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr "Увек пошаљи _графитну копију (cc):"
+msgstr "Увек пошаљи _графитну копију (Цц):"
 
-#: ../mail/e-mail-config-defaults-page.c:704
+#: ../mail/e-mail-config-defaults-page.c:728
 msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "Увек пошаљи _невидљиву графитну копију (Bcc):"
+msgstr "Увек пошаљи _невидљиву графитну копију (Бцц):"
 
-#: ../mail/e-mail-config-defaults-page.c:739
+#: ../mail/e-mail-config-defaults-page.c:763
 msgid "Message Receipts"
 msgstr "Признанице поруке"
 
-#: ../mail/e-mail-config-defaults-page.c:748
+#: ../mail/e-mail-config-defaults-page.c:772
 msgid "S_end message receipts:"
 msgstr "_Пошаљи повратнице:"
 
-#: ../mail/e-mail-config-defaults-page.c:773
+#: ../mail/e-mail-config-defaults-page.c:797
 msgid "Never"
 msgstr "Никада"
 
-#: ../mail/e-mail-config-defaults-page.c:779
+#: ../mail/e-mail-config-defaults-page.c:803
 msgid "Always"
 msgstr "Увек"
 
-#: ../mail/e-mail-config-defaults-page.c:785
+#: ../mail/e-mail-config-defaults-page.c:809
 msgid "Ask for each message"
 msgstr "Питај за сваку поруку"
 
-#: ../mail/e-mail-config-defaults-page.c:856
+#: ../mail/e-mail-config-defaults-page.c:880
 msgid "Defaults"
 msgstr "Основно"
 
-#: ../mail/e-mail-config-identity-page.c:265
+#: ../mail/e-mail-config-identity-page.c:282
 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 +15504,57 @@ msgstr ""
 "Унесите име и електронску адресу. „Необавезна“ поља не морају бити попуњена, "
 "осим ако не желите да ове податке укључите у поруке које шаљете."
 
-#: ../mail/e-mail-config-identity-page.c:293
-#: ../mail/e-mail-config-summary-page.c:323
+#: ../mail/e-mail-config-identity-page.c:310
+#: ../mail/e-mail-config-summary-page.c:322
 msgid "Account Information"
 msgstr "Подаци о налогу"
 
-#: ../mail/e-mail-config-identity-page.c:302
-#: ../mail/e-mail-config-summary-page.c:332
+#: ../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\"."
 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 ""
-"Упишите име по коме желите да назовете овај налог.\n"
+"Ово име ће бити корисно за препознавање налога.\n"
 "На пример, „Пословни“ или „Лични“."
 
-#: ../mail/e-mail-config-identity-page.c:347
+#: ../mail/e-mail-config-identity-page.c:363
 msgid "Required Information"
 msgstr "Обавезни подаци"
 
-#: ../mail/e-mail-config-identity-page.c:356
+#: ../mail/e-mail-config-identity-page.c:372
 msgid "Full Nam_e:"
 msgstr "_Име и презиме:"
 
-#: ../mail/e-mail-config-identity-page.c:383
+#: ../mail/e-mail-config-identity-page.c:399
 msgid "Email _Address:"
 msgstr "Адреса _ел. поште:"
 
-#: ../mail/e-mail-config-identity-page.c:430
+#: ../mail/e-mail-config-identity-page.c:446
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Додатни подаци"
 
-#: ../mail/e-mail-config-identity-page.c:439
+#: ../mail/e-mail-config-identity-page.c:455
 msgid "Re_ply-To:"
 msgstr "Од_говор:"
 
-#: ../mail/e-mail-config-identity-page.c:466
+#: ../mail/e-mail-config-identity-page.c:482
 msgid "Or_ganization:"
 msgstr "Ор_ганизација:"
 
-#: ../mail/e-mail-config-identity-page.c:521
+#: ../mail/e-mail-config-identity-page.c:537
 msgid "Add Ne_w Signature..."
 msgstr "Додај но_ви потпис..."
 
-#: ../mail/e-mail-config-lookup-page.c:67
+#: ../mail/e-mail-config-identity-page.c:555
+msgid "_Look up mail server details based on the entered e-mail address"
+msgstr "Подаци за тражење сервера е-поште на основу унетих мејл адреса"
+
+#: ../mail/e-mail-config-lookup-page.c:70
 msgid "Looking up account details..."
 msgstr "Тражим појединости налога..."
 
@@ -12924,7 +15566,7 @@ msgstr "Вршим проверу за новом поштом"
 msgid "Check for _new messages every"
 msgstr "Провери за _нову пошту сваких"
 
-#: ../mail/e-mail-config-provider-page.c:699
+#: ../mail/e-mail-config-provider-page.c:698
 msgid "Receiving Options"
 msgstr "Опције за примање"
 
@@ -12932,100 +15574,113 @@ msgstr "Опције за примање"
 msgid "Receiving Email"
 msgstr "Примање поште"
 
-#: ../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
+#| 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
 #: ../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:625
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "Опште"
 
-#: ../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 "Не потписуј захтеве за с_астанке (Аутлук компатибилност)"
 
-#: ../mail/e-mail-config-security-page.c:291
+#: ../mail/e-mail-config-security-page.c:371
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "Прилично добра приватност (OpenPGP)"
 
-#: ../mail/e-mail-config-security-page.c:300
+#: ../mail/e-mail-config-security-page.c:380
 msgid "OpenPGP _Key ID:"
 msgstr "ИБ ОпенПГП _кључа:"
 
-#: ../mail/e-mail-config-security-page.c:322
+#: ../mail/e-mail-config-security-page.c:413
 msgid "Si_gning algorithm:"
 msgstr "Алгоритам _потписивања:"
 
-#: ../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:581 ../mail/mail-config.ui.h:73
 msgid "SHA1"
 msgstr "СХА1"
 
-#: ../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:584 ../mail/mail-config.ui.h:74
 msgid "SHA256"
 msgstr "СХА256"
 
-#: ../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:587 ../mail/mail-config.ui.h:75
 msgid "SHA384"
 msgstr "СХА384"
 
-#: ../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:590 ../mail/mail-config.ui.h:76
 msgid "SHA512"
 msgstr "СХА512"
 
-#: ../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 "_Увек потпиши одлазеће поруке са овог налога"
 
-#: ../mail/e-mail-config-security-page.c:375
+#: ../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 "Увек _шифруј одлазеће поруке са овог налога"
+
+#: ../mail/e-mail-config-security-page.c:478
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Ув_ек и мени шифруј при слању шифроване поште"
 
-#: ../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 "Увек _веруј кључевима мог привеска при шифровању"
 
-#: ../mail/e-mail-config-security-page.c:411
+#: ../mail/e-mail-config-security-page.c:514
 msgid "Secure MIME (S/MIME)"
 msgstr "Сигурни МИМЕ (С/МИМЕ)"
 
-#: ../mail/e-mail-config-security-page.c:420
+#: ../mail/e-mail-config-security-page.c:523
 msgid "Sig_ning certificate:"
 msgstr "Уверење _потписивања:"
 
-#: ../mail/e-mail-config-security-page.c:444
-#: ../mail/e-mail-config-security-page.c:550
+#: ../mail/e-mail-config-security-page.c:547
+#: ../mail/e-mail-config-security-page.c:653
 msgid "Select"
 msgstr "Изабери"
 
-#: ../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:556
+#: ../mail/e-mail-config-security-page.c:662 ../mail/mail-dialogs.ui.h:5
+#: ../shell/e-shell-window-actions.c:876
 msgid "_Clear"
 msgstr "_Очисти"
 
-#: ../mail/e-mail-config-security-page.c:462
+#: ../mail/e-mail-config-security-page.c:565
 msgid "Signing _algorithm:"
 msgstr "Алгоритам п_отписа:"
 
-#: ../mail/e-mail-config-security-page.c:503
+#: ../mail/e-mail-config-security-page.c:606
 msgid "Always sign outgoing messages when using this account"
 msgstr "Увек потпиши одлазеће поруке са овог налога"
 
-#: ../mail/e-mail-config-security-page.c:526
+#: ../mail/e-mail-config-security-page.c:629
 msgid "Encryption certificate:"
 msgstr "Уверење за шифровање:"
 
-#: ../mail/e-mail-config-security-page.c:568
+#: ../mail/e-mail-config-security-page.c:671
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "Увек шифруј одлазеће поруке са овог налога"
 
-#: ../mail/e-mail-config-security-page.c:588
+#: ../mail/e-mail-config-security-page.c:691
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "Увек мени самом шифруј при слању шифроване поште"
 
@@ -13033,7 +15688,7 @@ msgstr "Увек мени самом шифруј при слању шифров
 msgid "Sending Email"
 msgstr "Слање поште"
 
-#: ../mail/e-mail-config-service-page.c:639
+#: ../mail/e-mail-config-service-page.c:638
 msgid "Server _Type:"
 msgstr "_Врста сервера:"
 
@@ -13045,61 +15700,65 @@ msgstr "ССЛ"
 msgid "TLS"
 msgstr "ТЛС"
 
-#: ../mail/e-mail-config-summary-page.c:306
+#: ../mail/e-mail-config-summary-page.c:305
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr ""
 "Ово је сажетак подешавања која ће бити коришћена за приступ вашој пошти."
 
-#: ../mail/e-mail-config-summary-page.c:371
+#: ../mail/e-mail-config-summary-page.c:369
 msgid "Personal Details"
 msgstr "Лични подаци"
 
-#: ../mail/e-mail-config-summary-page.c:380
+#: ../mail/e-mail-config-summary-page.c:378
 msgid "Full Name:"
 msgstr "Име и презиме:"
 
-#: ../mail/e-mail-config-summary-page.c:394
+#: ../mail/e-mail-config-summary-page.c:392
 msgid "Email Address:"
 msgstr "Адреса ел. поште:"
 
-#: ../mail/e-mail-config-summary-page.c:408
+#: ../mail/e-mail-config-summary-page.c:406
 msgid "Receiving"
 msgstr "Примање"
 
-#: ../mail/e-mail-config-summary-page.c:420
+#: ../mail/e-mail-config-summary-page.c:418
 msgid "Sending"
 msgstr "Слање"
 
-#: ../mail/e-mail-config-summary-page.c:432
+#: ../mail/e-mail-config-summary-page.c:430
 msgid "Server Type:"
 msgstr "Врста сервера:"
 
-#: ../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:451
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:601
 msgid "Server:"
 msgstr "Сервер:"
 
-#: ../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:472
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:690
 msgid "Username:"
 msgstr "Корисничко име:"
 
-#: ../mail/e-mail-config-summary-page.c:495
+#: ../mail/e-mail-config-summary-page.c:493
 msgid "Security:"
 msgstr "Безбедност:"
 
-#: ../mail/e-mail-config-summary-page.c:786
+#: ../mail/e-mail-config-summary-page.c:784
 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"
-"Click \"Continue\" to begin."
+"Click \"Next\" to begin."
 msgstr ""
-"Добродошли у Помоћника подешавања поште Еволуције.\n"
+"Добродошли у Помоћника подешавања поште унутар Еволуције.\n"
 "\n"
 "Кликните „Настави“ да започнете."
 
@@ -13108,37 +15767,101 @@ msgstr ""
 msgid "Welcome"
 msgstr "Добродошли"
 
-#: ../mail/e-mail-config-window.c:326
+#: ../mail/e-mail-config-window.c:325
 msgid "Account Editor"
 msgstr "Уређивач налога"
 
-#: ../mail/e-mail-display.c:95
+#: ../mail/e-mail-display.c:103
 msgid "_Add to Address Book..."
 msgstr "_Додај у адресар..."
 
-#: ../mail/e-mail-display.c:102
+#: ../mail/e-mail-display.c:110
 msgid "_To This Address"
 msgstr "_На ову адресу"
 
-#: ../mail/e-mail-display.c:109
+#: ../mail/e-mail-display.c:117
 msgid "_From This Address"
 msgstr "_Са ове адресе"
 
-#: ../mail/e-mail-display.c:116
+#: ../mail/e-mail-display.c:124
 msgid "Send _Reply To..."
 msgstr "_Пошаљи одговор..."
 
-#: ../mail/e-mail-display.c:118
+#: ../mail/e-mail-display.c:126
 msgid "Send a reply message to this address"
 msgstr "Пошаљите поруку одговора на ову адресу"
 
-#: ../mail/e-mail-display.c:125
+#: ../mail/e-mail-display.c:133
 msgid "Create Search _Folder"
 msgstr "Направи фасциклу _претраге"
 
-#. 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 "Направи фасциклу"
+
+#: ../mail/e-mail-folder-create-dialog.c:331
+msgid "Specify where to create the folder:"
+msgstr "Наведите где направити фасциклу:"
+
+#: ../mail/e-mail-folder-create-dialog.c:334
+msgid "C_reate"
+msgstr "_Направи"
+
+#: ../mail/e-mail-folder-create-dialog.c:351
+msgid "Folder _name:"
+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 "не"
+
+#: ../mail/e-mail-free-form-exp.c:490
+msgctxt "ffe"
+msgid "false"
+msgstr "нетачно"
+
+#: ../mail/e-mail-junk-options.c:295
 msgid "Junk filtering software:"
 msgstr "Софтвер за филтрирање непожељне:"
 
@@ -13146,12 +15869,12 @@ msgstr "Софтвер за филтрирање непожељне:"
 msgid "_Label name:"
 msgstr "Назив _ознаке:"
 
-#: ../mail/e-mail-label-list-store.c:56
+#: ../mail/e-mail-label-list-store.c:57
 msgid "I_mportant"
 msgstr "_Важно"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:57
+#: ../mail/e-mail-label-list-store.c:58
 msgid "_Work"
 msgstr "По_сао"
 
@@ -13159,22 +15882,22 @@ msgstr "По_сао"
 # 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 "Л_ично"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:59
+#: ../mail/e-mail-label-list-store.c:60
 msgid "_To Do"
 msgstr "За уради_ти"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:60
+#: ../mail/e-mail-label-list-store.c:61
 msgid "_Later"
 msgstr "Касни_је"
 
 #: ../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 "Додајте натпис"
 
@@ -13194,635 +15917,724 @@ msgstr ""
 msgid "Color"
 msgstr "Боја"
 
-#: ../mail/e-mail-print-config-headers.c:166
+#: ../mail/e-mail-print-config-headers.c:165
 msgid "Move selected headers to top"
 msgstr "Преместите изабрана заглавља на врх"
 
-#: ../mail/e-mail-print-config-headers.c:171
+#: ../mail/e-mail-print-config-headers.c:170
 msgid "Move selected headers up one row"
 msgstr "Преместите изабрана заглавља један ред на горе"
 
-#: ../mail/e-mail-print-config-headers.c:176
+#: ../mail/e-mail-print-config-headers.c:175
 msgid "Move selected headers down one row"
 msgstr "Преместите изабрана заглавља један ред на доле"
 
-#: ../mail/e-mail-print-config-headers.c:181
+#: ../mail/e-mail-print-config-headers.c:180
 msgid "Move selected headers to bottom"
 msgstr "Преместите изабрана заглавља на дно"
 
-#: ../mail/e-mail-print-config-headers.c:186
+#: ../mail/e-mail-print-config-headers.c:185
 msgid "Select all headers"
 msgstr "Изаберите сва заглавља"
 
-#: ../mail/e-mail-print-config-headers.c:205
+#: ../mail/e-mail-print-config-headers.c:204
 msgid "Header Name"
 msgstr "Назив заглавља"
 
-#: ../mail/e-mail-print-config-headers.c:214
+#: ../mail/e-mail-print-config-headers.c:213
 msgid "Header Value"
 msgstr "Вредност заглавља"
 
-#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:106
+#: ../mail/e-mail-printer.c:126 ../mail/mail-config.ui.h:121
 msgid "Headers"
 msgstr "Заглавља"
 
-#: ../mail/e-mail-printer.c:166
+#: ../mail/e-mail-printer.c:168
 #, c-format
 msgid "Page %d of %d"
 msgstr "Страница %d од %d"
 
-#: ../mail/e-mail-reader.c:348 ../mail/em-filter-i18n.h:11
-msgid "Copy to Folder"
-msgstr "Умножи у фасциклу"
-
-#: ../mail/e-mail-reader.c:348 ../mail/em-folder-utils.c:505
-msgid "C_opy"
-msgstr "_Умножи"
-
-#: ../mail/e-mail-reader.c:848 ../mail/em-filter-i18n.h:33
+#: ../mail/e-mail-reader.c:351 ../mail/filtertypes.xml.in.h:62
 msgid "Move to Folder"
 msgstr "Премести у фасциклу"
 
-#: ../mail/e-mail-reader.c:848 ../mail/em-folder-utils.c:505
+#: ../mail/e-mail-reader.c:351 ../mail/filtertypes.xml.in.h:63
+msgid "Copy to Folder"
+msgstr "Умножи у фасциклу"
+
+#: ../mail/e-mail-reader.c:355 ../mail/em-folder-utils.c:487
+#: ../mail/mail.error.xml.h:147
 msgid "_Move"
 msgstr "Пре_мести"
 
-#: ../mail/e-mail-reader.c:1174 ../mail/e-mail-reader.c:1386
-#: ../mail/e-mail-reader.c:1426
+#: ../mail/e-mail-reader.c:355 ../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
 msgid "_Do not ask me again."
 msgstr "_Не питај ме поново."
 
-#: ../mail/e-mail-reader.c:1432
+#: ../mail/e-mail-reader.c:1458
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Увек занемари „Одговор-за:“ за дописне листе."
 
-#: ../mail/e-mail-reader.c:1634
+#: ../mail/e-mail-reader.c:1661
 msgid "Failed to retrieve message:"
-msgstr "Нисам успео да довучем поруку:"
+msgstr "Не могу да довучем поруку:"
 
-#: ../mail/e-mail-reader.c:1674 ../mail/e-mail-reader.c:2843
+#: ../mail/e-mail-reader.c:1706 ../mail/e-mail-reader.c:3041
 #, c-format
 msgid "Retrieving message '%s'"
-msgstr "Довлачим поруку „%s“"
+msgstr "Преузимам поруку „%s“"
 
-#: ../mail/e-mail-reader.c:1862
+#: ../mail/e-mail-reader.c:1894
 msgid "A_dd Sender to Address Book"
 msgstr "До_дај пошиљаоца у адресар"
 
-#: ../mail/e-mail-reader.c:1864
+#: ../mail/e-mail-reader.c:1896
 msgid "Add sender to address book"
 msgstr "Додај пошиљаоца у адресар"
 
-#: ../mail/e-mail-reader.c:1869
+#: ../mail/e-mail-reader.c:1901
+msgid "_Archive..."
+msgstr "_Архива..."
+
+#: ../mail/e-mail-reader.c:1903
+#| msgid "Move selected messages to another folder"
+msgid "Move selected messages to the Archive folder for the account"
+msgstr "Премешта изабране поруке у фасциклу за архивирање поруке у овом налогу"
+
+#: ../mail/e-mail-reader.c:1908
 msgid "Check for _Junk"
 msgstr "Провери да ли има _ђубрета"
 
-#: ../mail/e-mail-reader.c:1871
+#: ../mail/e-mail-reader.c:1910
 msgid "Filter the selected messages for junk status"
 msgstr "Филтрира да ли међу изабраним порукама има ђубрета"
 
-#: ../mail/e-mail-reader.c:1876
+#: ../mail/e-mail-reader.c:1915
 msgid "_Copy to Folder..."
 msgstr "_Умножи у фасциклу..."
 
-#: ../mail/e-mail-reader.c:1878
+#: ../mail/e-mail-reader.c:1917
 msgid "Copy selected messages to another folder"
 msgstr "Умножава изабране поруке у другу фасциклу"
 
-#: ../mail/e-mail-reader.c:1883
+#: ../mail/e-mail-reader.c:1922
 msgid "_Delete Message"
 msgstr "_Обриши поруку"
 
-#: ../mail/e-mail-reader.c:1885
+#: ../mail/e-mail-reader.c:1924
 msgid "Mark the selected messages for deletion"
 msgstr "Означите изабрану(е) поруку(е) за брисање"
 
-#: ../mail/e-mail-reader.c:1890
+#: ../mail/e-mail-reader.c:1929
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Направи правило пропусника за дописну _листу..."
 
-#: ../mail/e-mail-reader.c:1892
+#: ../mail/e-mail-reader.c:1931
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Наравите правило за пропуштање порука на ову дописну листу"
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1936
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Направи правило пропусника за _примаоце..."
 
-#: ../mail/e-mail-reader.c:1899
+#: ../mail/e-mail-reader.c:1938
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Направите правило за пропуштање порука овим примаоцима"
 
-#: ../mail/e-mail-reader.c:1904
+#: ../mail/e-mail-reader.c:1943
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Направи правило пропусника за _пошиљаоца..."
 
-#: ../mail/e-mail-reader.c:1906
+#: ../mail/e-mail-reader.c:1945
 msgid "Create a rule to filter messages from this sender"
 msgstr "Направите правило за пропуштање порука са овог пошиљаоца"
 
-#: ../mail/e-mail-reader.c:1911
+#: ../mail/e-mail-reader.c:1950
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Направи правило пропусника за _наслов..."
 
-#: ../mail/e-mail-reader.c:1913
+#: ../mail/e-mail-reader.c:1952
 msgid "Create a rule to filter messages with this subject"
 msgstr "Направите правило за прпуштање порука са овим насловом"
 
-#: ../mail/e-mail-reader.c:1918
+#: ../mail/e-mail-reader.c:1957
 msgid "A_pply Filters"
 msgstr "При_мени пропуснике"
 
-#: ../mail/e-mail-reader.c:1920
+#: ../mail/e-mail-reader.c:1959
 msgid "Apply filter rules to the selected messages"
 msgstr "Примените правила пропуштања на изабране поруке"
 
-#: ../mail/e-mail-reader.c:1925
+#: ../mail/e-mail-reader.c:1964
 msgid "_Find in Message..."
 msgstr "П_ронађи у поруци..."
 
-#: ../mail/e-mail-reader.c:1927
+#: ../mail/e-mail-reader.c:1966
 msgid "Search for text in the body of the displayed message"
 msgstr "Потражите текст у телу приказане поруке"
 
-#: ../mail/e-mail-reader.c:1932
+#: ../mail/e-mail-reader.c:1971
 msgid "_Clear Flag"
 msgstr "Скло_ни ознаку"
 
-#: ../mail/e-mail-reader.c:1934
+#: ../mail/e-mail-reader.c:1973
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Уклоните ознаку за праћење са изабраних порука"
 
-#: ../mail/e-mail-reader.c:1939
+#: ../mail/e-mail-reader.c:1978
 msgid "_Flag Completed"
 msgstr "Означ_и као завршено"
 
-#: ../mail/e-mail-reader.c:1941
+#: ../mail/e-mail-reader.c:1980
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Поставите ознаку за праћење као завршену на изабраним порукама"
 
-#: ../mail/e-mail-reader.c:1946
+#: ../mail/e-mail-reader.c:1985
 msgid "Follow _Up..."
 msgstr "Сле_ди..."
 
-#: ../mail/e-mail-reader.c:1948
+#: ../mail/e-mail-reader.c:1987
 msgid "Flag the selected messages for follow-up"
 msgstr "Означите изабране поруке за праћење"
 
-#: ../mail/e-mail-reader.c:1953
+#: ../mail/e-mail-reader.c:1992
 msgid "_Attached"
 msgstr "При_ложено"
 
-#: ../mail/e-mail-reader.c:1955 ../mail/e-mail-reader.c:1962
+#: ../mail/e-mail-reader.c:1994 ../mail/e-mail-reader.c:2001
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Проследите изабрану поруку некоме као прилог"
 
-#: ../mail/e-mail-reader.c:1960
+#: ../mail/e-mail-reader.c:1999
 msgid "Forward As _Attached"
 msgstr "Проследи као _прилог"
 
-#: ../mail/e-mail-reader.c:1967
+#: ../mail/e-mail-reader.c:2006
 msgid "_Inline"
 msgstr "Унут_ар"
 
-#: ../mail/e-mail-reader.c:1969 ../mail/e-mail-reader.c:1976
+#: ../mail/e-mail-reader.c:2008 ../mail/e-mail-reader.c:2015
 msgid "Forward the selected message in the body of a new message"
 msgstr "Проследите изабрану поруку у телу нове поруке"
 
-#: ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:2013
 msgid "Forward As _Inline"
 msgstr "Проследи као _унутар поруке"
 
-#: ../mail/e-mail-reader.c:1981
+#: ../mail/e-mail-reader.c:2020
 msgid "_Quoted"
 msgstr "_Цитирано"
 
-#: ../mail/e-mail-reader.c:1983 ../mail/e-mail-reader.c:1990
+#: ../mail/e-mail-reader.c:2022 ../mail/e-mail-reader.c:2029
 msgid "Forward the selected message quoted like a reply"
 msgstr "Проследите изабрану поруку цитирану као одговор"
 
-#: ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:2027
 msgid "Forward As _Quoted"
 msgstr "Проследи као _цитат"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:2034
 msgid "_Load Images"
 msgstr "_Учитај слике"
 
-#: ../mail/e-mail-reader.c:1997
+#: ../mail/e-mail-reader.c:2036
 msgid "Force images in HTML mail to be loaded"
 msgstr "Присилите учитавање слика у ХТМЛ порукама"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2041 ../mail/e-mail-reader.c:2419
+msgid "_Ignore Subthread"
+msgstr "За_немари подрасправу"
+
+#: ../mail/e-mail-reader.c:2043
+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"
+msgid "_Ignore Thread"
+msgstr "_Занемари расправу"
+
+#: ../mail/e-mail-reader.c:2050
+msgid "Mark new mails in this thread as read automatically"
+msgstr "Аутоматски означава нове е-поруке у овој расправи као прочитане"
+
+#: ../mail/e-mail-reader.c:2055
 msgid "_Important"
 msgstr "_Важно"
 
-#: ../mail/e-mail-reader.c:2004
+#: ../mail/e-mail-reader.c:2057
 msgid "Mark the selected messages as important"
-msgstr "Означите изабрану(е) поруку(е) као важно"
+msgstr "Означава изабрану поруку као важну"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:2062
 msgid "_Junk"
 msgstr "_Ђубре"
 
-#: ../mail/e-mail-reader.c:2011
+#: ../mail/e-mail-reader.c:2064
 msgid "Mark the selected messages as junk"
-msgstr "Означите изабрану(е) поруку(е) као нежељену пошту"
+msgstr "Означава изабрану поруку као нежељену пошту"
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:2069
 msgid "_Not Junk"
 msgstr "Ни_је ђубре"
 
-#: ../mail/e-mail-reader.c:2018
+#: ../mail/e-mail-reader.c:2071
 msgid "Mark the selected messages as not being junk"
-msgstr "Означите изабрану(е) поруку(е) да није нежељена пошта"
+msgstr "Означава изабрану поруку као пожељну пошту"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:2076
 msgid "_Read"
-msgstr "Про_читај"
+msgstr "Про_читано"
 
-#: ../mail/e-mail-reader.c:2025
+#: ../mail/e-mail-reader.c:2078
 msgid "Mark the selected messages as having been read"
-msgstr "Означите изабрану(е) поруку(е) као прочитано"
+msgstr "Означава изабрану поруку као прочитану"
+
+#: ../mail/e-mail-reader.c:2083 ../mail/e-mail-reader.c:2443
+#| msgid "Could not create publish thread."
+msgid "Do not _Ignore Subthread"
+msgstr "Не занема_руј подрасправе"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:2085
+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
+msgid "Do not _Ignore Thread"
+msgstr "Не занемар_уј расправе"
+
+#: ../mail/e-mail-reader.c:2092
+msgid "Do not mark new mails in this thread as read automatically"
+msgstr "Не означава нове поруке у овој расправи као прочитане"
+
+#: ../mail/e-mail-reader.c:2097
 msgid "Uni_mportant"
 msgstr "Не_важно"
 
-#: ../mail/e-mail-reader.c:2032
+#: ../mail/e-mail-reader.c:2099
 msgid "Mark the selected messages as unimportant"
 msgstr "Означите изабрану(е) поруку(е) као неважно"
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:2104
 msgid "_Unread"
 msgstr "_Непрочитано"
 
-#: ../mail/e-mail-reader.c:2039
+#: ../mail/e-mail-reader.c:2106
 msgid "Mark the selected messages as not having been read"
 msgstr "Означите изабрану(е) поруку(е) као непрочитано"
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:2111
 msgid "_Edit as New Message..."
 msgstr "_Уреди као нову поруку..."
 
-#: ../mail/e-mail-reader.c:2046
+#: ../mail/e-mail-reader.c:2113
 msgid "Open the selected messages in the composer for editing"
 msgstr "Отворите изабрану поруку у састављачу ради уређивања"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:2118
 msgid "Compose _New Message"
 msgstr "Састави _нову поруку"
 
-#: ../mail/e-mail-reader.c:2053
+#: ../mail/e-mail-reader.c:2120
 msgid "Open a window for composing a mail message"
 msgstr "Отворите прозор за састављање поруке"
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:2125
 msgid "_Open in New Window"
 msgstr "_Отвори у новом прозору"
 
-#: ../mail/e-mail-reader.c:2060
+#: ../mail/e-mail-reader.c:2127
 msgid "Open the selected messages in a new window"
 msgstr "Отворите изабране поруке у новом прозору"
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:2132
 msgid "_Move to Folder..."
 msgstr "_Премести у фасциклу..."
 
-#: ../mail/e-mail-reader.c:2067
+#: ../mail/e-mail-reader.c:2134
 msgid "Move selected messages to another folder"
 msgstr "Преместите изабрану(е) поруку(е) у другу фасциклу"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:2139
 msgid "_Next Message"
 msgstr "_Следећа порука"
 
-#: ../mail/e-mail-reader.c:2074
+#: ../mail/e-mail-reader.c:2141
 msgid "Display the next message"
 msgstr "Прикажите следећу поруку"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:2146
 msgid "Next _Important Message"
 msgstr "Следећа _важна порука"
 
-#: ../mail/e-mail-reader.c:2081
+#: ../mail/e-mail-reader.c:2148
 msgid "Display the next important message"
 msgstr "Прикажите следећу важну поруку"
 
-#: ../mail/e-mail-reader.c:2086
+#: ../mail/e-mail-reader.c:2153
 msgid "Next _Thread"
 msgstr "_Следећа расправа"
 
-#: ../mail/e-mail-reader.c:2088
+#: ../mail/e-mail-reader.c:2155
 msgid "Display the next thread"
 msgstr "Прикажите следећу расправу"
 
-#: ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:2160
 msgid "Next _Unread Message"
 msgstr "Следећа _непрочитана порука"
 
-#: ../mail/e-mail-reader.c:2095
+#: ../mail/e-mail-reader.c:2162
 msgid "Display the next unread message"
 msgstr "Прикажите следећу непрочитану поруку"
 
-#: ../mail/e-mail-reader.c:2100
+#: ../mail/e-mail-reader.c:2167
 msgid "_Previous Message"
 msgstr "_Претходна порука"
 
-#: ../mail/e-mail-reader.c:2102
+#: ../mail/e-mail-reader.c:2169
 msgid "Display the previous message"
 msgstr "Прикажите претходну поруку"
 
-#: ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:2174
 msgid "Pr_evious Important Message"
 msgstr "Пр_етходна важна порука"
 
-#: ../mail/e-mail-reader.c:2109
+#: ../mail/e-mail-reader.c:2176
 msgid "Display the previous important message"
 msgstr "Прикажите претходну важну поруку"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2181
 msgid "Previous T_hread"
 msgstr "_Претходна тема"
 
-#: ../mail/e-mail-reader.c:2116
+#: ../mail/e-mail-reader.c:2183
 msgid "Display the previous thread"
 msgstr "Прикажите претходну тему"
 
-#: ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2188
 msgid "P_revious Unread Message"
 msgstr "П_ретходна непрочитана порука"
 
-#: ../mail/e-mail-reader.c:2123
+#: ../mail/e-mail-reader.c:2190
 msgid "Display the previous unread message"
 msgstr "Прикажите претходну непрочитану поруку"
 
-#: ../mail/e-mail-reader.c:2130
+#: ../mail/e-mail-reader.c:2197
 msgid "Print this message"
 msgstr "Штампајте ову поруку"
 
-#: ../mail/e-mail-reader.c:2137
+#: ../mail/e-mail-reader.c:2204
 msgid "Preview the message to be printed"
 msgstr "Прегледајте поруку пред штампу"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2209
 msgid "Re_direct"
 msgstr "Преу_смери"
 
-#: ../mail/e-mail-reader.c:2144
+#: ../mail/e-mail-reader.c:2211
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Преусмерите (без читања) изабрану поруку некоме"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2216
 msgid "Remo_ve Attachments"
 msgstr "_Уклони прилоге"
 
-#: ../mail/e-mail-reader.c:2151
+#: ../mail/e-mail-reader.c:2218
 msgid "Remove attachments"
 msgstr "Уклоните прилоге"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2223
 msgid "Remove Du_plicate Messages"
 msgstr "Уклони _дуплиране поруке"
 
-#: ../mail/e-mail-reader.c:2158
+#: ../mail/e-mail-reader.c:2225
 msgid "Checks selected messages for duplicates"
 msgstr "Проверите изабране поруке за дупликате"
 
-#: ../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:2230 ../mail/mail.error.xml.h:30
+#: ../modules/calendar/e-cal-shell-view-actions.c:1387
 #: ../modules/mail/e-mail-attachment-handler.c:213
 msgid "Reply to _All"
 msgstr "Одговори _свима"
 
-#: ../mail/e-mail-reader.c:2165
+#: ../mail/e-mail-reader.c:2232
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Саставите одговор свим примаоцима изабране поруке"
 
-#: ../mail/e-mail-reader.c:2170 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2237 ../mail/mail.error.xml.h:28
 msgid "Reply to _List"
 msgstr "Одговори на _листу"
 
-#: ../mail/e-mail-reader.c:2172
+#: ../mail/e-mail-reader.c:2239
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Саставите одговор дописној листи изабране поруке"
 
-#: ../mail/e-mail-reader.c:2177
+#: ../mail/e-mail-reader.c:2244
 #: ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr "_Одговори пошиљаоцу"
 
-#: ../mail/e-mail-reader.c:2179
+#: ../mail/e-mail-reader.c:2246
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Саставите одговор пошиљаоцу изабране поруке"
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2251
 msgid "_Save as mbox..."
 msgstr "_Сачувај као мбокс..."
 
-#: ../mail/e-mail-reader.c:2186
+#: ../mail/e-mail-reader.c:2253
 msgid "Save selected messages as an mbox file"
 msgstr "Сачувајте изабране поруке као „mbox“ датотеку"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2258
 msgid "_Message Source"
 msgstr "Изво_рни код поруке"
 
-#: ../mail/e-mail-reader.c:2193
+#: ../mail/e-mail-reader.c:2260
 msgid "Show the raw email source of the message"
 msgstr "Прикажите изворни код електронске поруке"
 
-#: ../mail/e-mail-reader.c:2205
+#: ../mail/e-mail-reader.c:2272
 msgid "_Undelete Message"
 msgstr "П_оврати поруку"
 
-#: ../mail/e-mail-reader.c:2207
+#: ../mail/e-mail-reader.c:2274
 msgid "Undelete the selected messages"
 msgstr "Повратите изабране поруке"
 
-#: ../mail/e-mail-reader.c:2212
+#: ../mail/e-mail-reader.c:2279
 msgid "_Normal Size"
 msgstr "_Уобичајена величина"
 
-#: ../mail/e-mail-reader.c:2214
+#: ../mail/e-mail-reader.c:2281
 msgid "Reset the text to its original size"
 msgstr "Вратите текст на оригиналну величину"
 
-#: ../mail/e-mail-reader.c:2219
+#: ../mail/e-mail-reader.c:2286
 msgid "_Zoom In"
 msgstr "У_већај"
 
-#: ../mail/e-mail-reader.c:2221
+#: ../mail/e-mail-reader.c:2288
 msgid "Increase the text size"
 msgstr "Увећајте величину текста"
 
-#: ../mail/e-mail-reader.c:2228
+#: ../mail/e-mail-reader.c:2295
 msgid "Decrease the text size"
 msgstr "Умањите величину текста"
 
-#: ../mail/e-mail-reader.c:2235
+#: ../mail/e-mail-reader.c:2302
 msgid "Cre_ate"
 msgstr "_Направи"
 
-#: ../mail/e-mail-reader.c:2242
+#: ../mail/e-mail-reader.c:2309
 msgid "Ch_aracter Encoding"
 msgstr "Кодна ст_рана"
 
-#: ../mail/e-mail-reader.c:2249
+#: ../mail/e-mail-reader.c:2316
 msgid "F_orward As"
 msgstr "_Проследи као"
 
-#: ../mail/e-mail-reader.c:2256
+#: ../mail/e-mail-reader.c:2323
 msgid "_Group Reply"
 msgstr "О_дговори групи"
 
-#: ../mail/e-mail-reader.c:2263
+#: ../mail/e-mail-reader.c:2330
 msgid "_Go To"
 msgstr "_Иди на"
 
-#: ../mail/e-mail-reader.c:2270
+#: ../mail/e-mail-reader.c:2337
 msgid "Mar_k As"
 msgstr "О_значи као"
 
-#: ../mail/e-mail-reader.c:2277
+#: ../mail/e-mail-reader.c:2344
 msgid "_Message"
 msgstr "_Порука"
 
-#: ../mail/e-mail-reader.c:2284
+#: ../mail/e-mail-reader.c:2351
 msgid "_Zoom"
 msgstr "Ув_ећај"
 
-#: ../mail/e-mail-reader.c:2294
+#: ../mail/e-mail-reader.c:2361
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Направи фасциклу претраге са дописне _листе..."
 
-#: ../mail/e-mail-reader.c:2296
+#: ../mail/e-mail-reader.c:2363
 msgid "Create a search folder for this mailing list"
 msgstr "Направите фасциклу претраге за ову дописну листу"
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2368
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Направи фасциклу претраге од при_малаца..."
 
-#: ../mail/e-mail-reader.c:2303
+#: ../mail/e-mail-reader.c:2370
 msgid "Create a search folder for these recipients"
 msgstr "Направите фасциклу претраге за ове примаоце"
 
-#: ../mail/e-mail-reader.c:2308
+#: ../mail/e-mail-reader.c:2375
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Направи фасциклу претраге од по_шиљаоца..."
 
-#: ../mail/e-mail-reader.c:2310
+#: ../mail/e-mail-reader.c:2377
 msgid "Create a search folder for this sender"
 msgstr "Направите фасциклу претраге за овог пошиљаоца"
 
-#: ../mail/e-mail-reader.c:2315
+#: ../mail/e-mail-reader.c:2382
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Направи фасциклу претраге из _наслова..."
 
-#: ../mail/e-mail-reader.c:2317
+#: ../mail/e-mail-reader.c:2384
 msgid "Create a search folder for this subject"
 msgstr "Направите фасциклу претраге за овај наслов"
 
-#: ../mail/e-mail-reader.c:2340
+#: ../mail/e-mail-reader.c:2411
 msgid "Mark for Follo_w Up..."
 msgstr "Обележи за _праћење..."
 
-#: ../mail/e-mail-reader.c:2348
+#: ../mail/e-mail-reader.c:2427
 msgid "Mark as _Important"
 msgstr "Оначи као _важно"
 
-#: ../mail/e-mail-reader.c:2352
+#: ../mail/e-mail-reader.c:2431
 msgid "Mark as _Junk"
 msgstr "Означи као _ђубре"
 
-#: ../mail/e-mail-reader.c:2356
+#: ../mail/e-mail-reader.c:2435
 msgid "Mark as _Not Junk"
 msgstr "Означи да _није ђубре"
 
-#: ../mail/e-mail-reader.c:2360
+#: ../mail/e-mail-reader.c:2439
 msgid "Mar_k as Read"
 msgstr "О_значи као прочитано"
 
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2451
 msgid "Mark as Uni_mportant"
 msgstr "Означи као _неважно"
 
-#: ../mail/e-mail-reader.c:2368
+#: ../mail/e-mail-reader.c:2455
 msgid "Mark as _Unread"
 msgstr "Означи као _непрочитано"
 
-#: ../mail/e-mail-reader.c:2412
+#: ../mail/e-mail-reader.c:2499
 msgid "_Caret Mode"
 msgstr "Метод у_метања"
 
-#: ../mail/e-mail-reader.c:2414
+#: ../mail/e-mail-reader.c:2501
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Прикажите трепћући курсор у телу приказаних порука"
 
-#: ../mail/e-mail-reader.c:2420
+#: ../mail/e-mail-reader.c:2507
 msgid "All Message _Headers"
 msgstr "Сва _заглавља поруке"
 
-#: ../mail/e-mail-reader.c:2422
+#: ../mail/e-mail-reader.c:2509
 msgid "Show messages with all email headers"
 msgstr "Прикажите поруку са свим заглављима ел. поште"
 
-#: ../mail/e-mail-reader.c:2849
+#: ../mail/e-mail-reader.c:3047
 msgid "Retrieving message"
-msgstr "Довлачим поруку"
+msgstr "Преузимам поруку"
 
-#: ../mail/e-mail-reader.c:3772
+#: ../mail/e-mail-reader.c:4078
 #: ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "Просл_еди"
 
-#: ../mail/e-mail-reader.c:3773
+#: ../mail/e-mail-reader.c:4079
 msgid "Forward the selected message to someone"
 msgstr "Прослеђује изабрану поруку некоме"
 
-#: ../mail/e-mail-reader.c:3792
+#: ../mail/e-mail-reader.c:4098
 msgid "Group Reply"
 msgstr "Одговор групи"
 
-#: ../mail/e-mail-reader.c:3793
+#: ../mail/e-mail-reader.c:4099
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Одговорите дописној листи или свим примаоцима"
 
-#: ../mail/e-mail-reader.c:3859 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:4165 ../mail/filtertypes.xml.in.h:64
 msgid "Delete"
 msgstr "Обриши"
 
-#: ../mail/e-mail-reader.c:3871
-#: ../modules/calendar/e-cal-shell-view-actions.c:1371
+#: ../mail/e-mail-reader.c:4177
+#: ../modules/calendar/e-cal-shell-view-actions.c:1212
 msgid "Next"
 msgstr "Следеће"
 
-#: ../mail/e-mail-reader.c:3875
-#: ../modules/calendar/e-cal-shell-view-actions.c:1364
+#: ../mail/e-mail-reader.c:4181
+#: ../modules/calendar/e-cal-shell-view-actions.c:1205
 msgid "Previous"
 msgstr "Претходно"
 
-#: ../mail/e-mail-reader.c:3884 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:4190 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Одговори"
 
-#: ../mail/e-mail-reader-utils.c:147
+#: ../mail/e-mail-reader.c:5240
+#, c-format
+msgid "Allow remote content for anyone from %s"
+msgstr "Дозволи удаљени садржај свима са %s"
+
+#: ../mail/e-mail-reader.c:5242
+#, c-format
+msgid "Allow remote content for %s"
+msgstr "Дозволи удаљени садржај за %s"
+
+#: ../mail/e-mail-reader.c:5259
+#, c-format
+msgid "Allow remote content from %s"
+msgstr "Дозволи удаљени садржај свима од %s"
+
+#: ../mail/e-mail-reader.c:5316
+#| msgid "Header content"
+msgid "Load remote content"
+msgstr "Учитај удаљени садржај"
+
+#: ../mail/e-mail-reader-utils.c:146
 msgid "Do not warn me again"
 msgstr "Не упозоравај ме поново"
 
-#: ../mail/e-mail-reader-utils.c:557 ../plugins/face/face.c:170
-#: ../smime/gui/certificate-manager.c:329
+#: ../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:976
+#: ../mail/e-mail-reader-utils.c:1165
+#| msgid "Preview data to be imported"
+msgid "Marking thread to be ignored"
+msgstr "Означавам расправу као занемарену"
+
+#: ../mail/e-mail-reader-utils.c:1169
+msgid "Unmarking thread from being ignored"
+msgstr "Означавам расправи као да није занемарена"
+
+#: ../mail/e-mail-reader-utils.c:1173
+msgid "Marking subthread to be ignored"
+msgstr "Означавам подрасправу као занемарену"
+
+#: ../mail/e-mail-reader-utils.c:1177
+msgid "Unmarking subthread from being ignored"
+msgstr "Означавам подрасправу као да није занемарена"
+
+#: ../mail/e-mail-reader-utils.c:1417
 msgid "Printing"
 msgstr "Штампам"
 
 #. 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:1654
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -13843,7 +16655,7 @@ msgstr[3] ""
 "Фасцикла „%s“ садржи %u дуплирану поруку. Да ли сте сигурни да желите да је "
 "избришете?"
 
-#: ../mail/e-mail-reader-utils.c:2026
+#: ../mail/e-mail-reader-utils.c:2485
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Сачувај поруку"
@@ -13856,7 +16668,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:2047
+#: ../mail/e-mail-reader-utils.c:2506
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Порука"
@@ -13864,11 +16676,11 @@ msgstr[1] "Поруке"
 msgstr[2] "Поруке"
 msgstr[3] "Порука"
 
-#: ../mail/e-mail-reader-utils.c:2416
+#: ../mail/e-mail-reader-utils.c:2879
 msgid "Parsing message"
 msgstr "Обрађујем поруку"
 
-#: ../mail/e-mail-request.c:199
+#: ../mail/e-mail-request.c:204
 msgid "The message has no text content."
 msgstr "Порука не садржи текст."
 
@@ -13876,13 +16688,23 @@ msgstr "Порука не садржи текст."
 msgid "Flag to Follow Up"
 msgstr "Означи за праћење"
 
+#: ../mail/e-mail-ui-session.c:801
+#, c-format
+msgid "%s authentication failed"
+msgstr "Није успело %s потврђивање идентитета"
+
+#: ../mail/e-mail-ui-session.c:851
+#, c-format
+msgid "No data source found for UID '%s'"
+msgstr "Није пронађен извор података за ЈИБ „%s“"
+
 # * 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:1603
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -13890,23 +16712,24 @@ msgstr ""
 "У ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. у ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} пише:"
 
-#: ../mail/em-composer-utils.c:1460
+#: ../mail/em-composer-utils.c:1609
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Прослеђена порука --------"
 
-#: ../mail/em-composer-utils.c:1465
+#: ../mail/em-composer-utils.c:1614
 msgid "-----Original Message-----"
 msgstr "-----Оригинална порука-----"
 
-#: ../mail/em-composer-utils.c:2615
+#: ../mail/em-composer-utils.c:2827
 msgid "an unknown sender"
 msgstr "непознати пошиљалац"
 
-#: ../mail/em-composer-utils.c:3040
+#. FIXME GTK_WINDOW (composer)
+#: ../mail/em-composer-utils.c:3265
 msgid "Posting destination"
 msgstr "Одредишна пошта"
 
-#: ../mail/em-composer-utils.c:3041
+#: ../mail/em-composer-utils.c:3270
 msgid "Choose folders to post the message to."
 msgstr "Изаберите фасцикле за слање поруке."
 
@@ -13914,265 +16737,6 @@ msgstr "Изаберите фасцикле за слање поруке."
 msgid "Select Folder"
 msgstr "Изабери фасциклу"
 
-#. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Прерачунај"
-
-#: ../mail/em-filter-i18n.h:3
-msgid "Any header"
-msgstr "Било које заглавље"
-
-#: ../mail/em-filter-i18n.h:4
-msgid "Assign Color"
-msgstr "Додели боју"
-
-#: ../mail/em-filter-i18n.h:5
-msgid "Assign Score"
-msgstr "Додели резултат"
-
-#: ../mail/em-filter-i18n.h:7
-msgid "BCC"
-msgstr "БЦЦ"
-
-#: ../mail/em-filter-i18n.h:8
-msgid "Beep"
-msgstr "Звоно"
-
-#: ../mail/em-filter-i18n.h:9
-msgid "CC"
-msgstr "ЦЦ"
-
-#: ../mail/em-filter-i18n.h:10
-msgid "Completed On"
-msgstr "Завршено за"
-
-#: ../mail/em-filter-i18n.h:12
-msgid "Date received"
-msgstr "Датум примања"
-
-#: ../mail/em-filter-i18n.h:13
-msgid "Date sent"
-msgstr "Датум слања"
-
-#: ../mail/em-filter-i18n.h:15
-msgid "Deleted"
-msgstr "Обрисано"
-
-#: ../mail/em-filter-i18n.h:17
-msgid "Draft"
-msgstr "Нацрт"
-
-#: ../mail/em-filter-i18n.h:19
-msgid "Expression"
-msgstr "Израз"
-
-#: ../mail/em-filter-i18n.h:20
-msgid "Follow Up"
-msgstr "Следи"
-
-#: ../mail/em-filter-i18n.h:21
-msgid "Forward to"
-msgstr "Проследи"
-
-#: ../mail/em-filter-i18n.h:22
-msgid "Important"
-msgstr "Важно"
-
-#: ../mail/em-filter-i18n.h:23
-msgid "Junk Test"
-msgstr "Провера ђубрета"
-
-#: ../mail/em-filter-i18n.h:24 ../mail/mail-config.ui.h:113
-msgid "Junk"
-msgstr "Ђубре"
-
-#: ../mail/em-filter-i18n.h:25
-msgid "Label"
-msgstr "Натпис"
-
-#: ../mail/em-filter-i18n.h:26
-msgid "Mailing list"
-msgstr "Дописна листа"
-
-#: ../mail/em-filter-i18n.h:27
-msgid "Match All"
-msgstr "Одговара све"
-
-#: ../mail/em-filter-i18n.h:28
-msgid "Message Body"
-msgstr "Тело поруке"
-
-#: ../mail/em-filter-i18n.h:29
-msgid "Message Header"
-msgstr "Заглавље поруке"
-
-#: ../mail/em-filter-i18n.h:30
-msgid "Message Location"
-msgstr "Локација поруке"
-
-#: ../mail/em-filter-i18n.h:31
-msgid "Message is Junk"
-msgstr "Порука је ђубре"
-
-#: ../mail/em-filter-i18n.h:32
-msgid "Message is not Junk"
-msgstr "Порука није ђубре"
-
-#: ../mail/em-filter-i18n.h:34
-msgid "Pipe to Program"
-msgstr "Повежи на програм"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "Play Sound"
-msgstr "Пусти звук"
-
-#. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:36 ../mail/mail-dialogs.ui.h:15
-msgid "Read"
-msgstr "Читај"
-
-#: ../mail/em-filter-i18n.h:37 ../mail/message-list.etspec.h:16
-msgid "Recipients"
-msgstr "Примаоци"
-
-#: ../mail/em-filter-i18n.h:38
-msgid "Regex Match"
-msgstr "Регизр одговара"
-
-#: ../mail/em-filter-i18n.h:39
-msgid "Replied to"
-msgstr "Одговорено"
-
-#: ../mail/em-filter-i18n.h:40
-msgid "Run Program"
-msgstr "Покрени програм"
-
-#: ../mail/em-filter-i18n.h:41 ../mail/message-list.etspec.h:3
-msgid "Score"
-msgstr "Резултат"
-
-# bug(slobo): вероватно извештај о достави
-#: ../mail/em-filter-i18n.h:42
-msgid "Sender or Recipients"
-msgstr "Пошиљалац или примаоци"
-
-#: ../mail/em-filter-i18n.h:43 ../mail/message-list.etspec.h:15
-msgid "Sender"
-msgstr "Пошиљалац"
-
-#: ../mail/em-filter-i18n.h:44
-msgid "Set Label"
-msgstr "Постави ознаку"
-
-#: ../mail/em-filter-i18n.h:45
-msgid "Set Status"
-msgstr "Постави статус"
-
-#: ../mail/em-filter-i18n.h:46
-msgid "Size (kB)"
-msgstr "Величина (kB)"
-
-#: ../mail/em-filter-i18n.h:47
-msgid "Source Account"
-msgstr "Изворни налог"
-
-#: ../mail/em-filter-i18n.h:48
-msgid "Specific header"
-msgstr "Одређено заглавље"
-
-#: ../mail/em-filter-i18n.h:50
-msgid "Stop Processing"
-msgstr "Прекини обраду"
-
-#: ../mail/em-filter-i18n.h:53
-msgid "Unset Color"
-msgstr "Непостављена боја"
-
-#: ../mail/em-filter-i18n.h:54
-msgid "Unset Status"
-msgstr "Непостављен статус"
-
-#: ../mail/em-filter-i18n.h:57
-msgid "does not end with"
-msgstr "не завршава се са"
-
-#: ../mail/em-filter-i18n.h:58
-msgid "does not exist"
-msgstr "не постоји"
-
-#: ../mail/em-filter-i18n.h:59
-msgid "does not have words"
-msgstr "не садржи речи"
-
-#: ../mail/em-filter-i18n.h:60
-msgid "does not return"
-msgstr "не враћа"
-
-#: ../mail/em-filter-i18n.h:61
-msgid "does not sound like"
-msgstr "не звучи као"
-
-#: ../mail/em-filter-i18n.h:62
-msgid "does not start with"
-msgstr "не почиње са"
-
-#: ../mail/em-filter-i18n.h:63
-msgid "ends with"
-msgstr "завршава се са"
-
-#: ../mail/em-filter-i18n.h:64
-msgid "exists"
-msgstr "постоји"
-
-#: ../mail/em-filter-i18n.h:65
-msgid "has words"
-msgstr "садржи речи"
-
-#: ../mail/em-filter-i18n.h:66
-msgid "is Flagged"
-msgstr "је означено"
-
-#: ../mail/em-filter-i18n.h:67
-msgid "is after"
-msgstr "је после"
-
-#: ../mail/em-filter-i18n.h:68
-msgid "is before"
-msgstr "је пре"
-
-#: ../mail/em-filter-i18n.h:71
-msgid "is not Flagged"
-msgstr "није означено"
-
-#: ../mail/em-filter-i18n.h:72
-msgid "is not set"
-msgstr "није подешено"
-
-#: ../mail/em-filter-i18n.h:74
-msgid "is set"
-msgstr "подешено"
-
-#: ../mail/em-filter-i18n.h:76
-msgid "returns greater than"
-msgstr "повратно веће од"
-
-#: ../mail/em-filter-i18n.h:77
-msgid "returns less than"
-msgstr "повратно мање од"
-
-#: ../mail/em-filter-i18n.h:78
-msgid "returns"
-msgstr "повратно"
-
-#: ../mail/em-filter-i18n.h:79
-msgid "sounds like"
-msgstr "звучи као"
-
-#: ../mail/em-filter-i18n.h:80
-msgid "starts with"
-msgstr "почиње са"
-
 #. and now for the action area
 #: ../mail/em-filter-rule.c:587
 msgid "Then"
@@ -14183,7 +16747,7 @@ msgid "Add Ac_tion"
 msgstr "Додај ра_дњу"
 
 # 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] "Непрочитаних порука:"
@@ -14192,7 +16756,7 @@ msgstr[2] "Непрочитаних порука:"
 msgstr[3] "Непрочитаних порука:"
 
 # 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] "Укупно порука:"
@@ -14201,24 +16765,84 @@ msgstr[2] "Укупно порука:"
 msgstr[3] "Укупно порука:"
 
 # 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 "Искоришћеност квоте (%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 "Искоришћеност квоте"
 
 #. 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 "_Препиши налог слања"
 
-#: ../mail/em-folder-properties.c:415
+#: ../mail/em-folder-properties.c:491
+msgid "_Archive this folder using these settings:"
+msgstr "_Архивирај ову фасциклу користећи следећа подешавања:"
+
+#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
+#: ../mail/em-folder-properties.c:500
+#| 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 "_Премести старе поруке у:"
+
+#: ../mail/em-folder-properties.c:541
+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 "_Обриши старе поруке"
+
+#: ../mail/em-folder-properties.c:606
+msgid "AutoArchive"
+msgstr "АутоАрхива"
+
+#: ../mail/em-folder-properties.c:685
 msgid "Folder Properties"
 msgstr "Особине фасцикле"
 
@@ -14226,78 +16850,67 @@ msgstr "Особине фасцикле"
 msgid "<click here to select a folder>"
 msgstr "<кликните овде да изаберете фасциклу>"
 
-#: ../mail/em-folder-selector.c:387
-msgid "C_reate"
-msgstr "_Направи"
-
-#: ../mail/em-folder-selector.c:393
-msgid "Folder _name:"
-msgstr "Назив _фасцикле:"
+#: ../mail/em-folder-selector.c:398
+#| msgid "Create a new mail folder"
+msgid "Create a new folder"
+msgstr "Направите нову фасциклу"
 
 #: ../mail/em-folder-tree.c:682
 msgid "Folder names cannot contain '/'"
 msgstr "Називи фасцикли не могу да садрже „/“"
 
-#: ../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 "Стабло фасцикле за пошту"
 
-#: ../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 "Премештам фасциклу „%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 "Умножавам фасциклу „%s“"
 
-#: ../mail/em-folder-tree.c:2219 ../mail/message-list.c:2284
+#: ../mail/em-folder-tree.c:2261 ../mail/message-list.c:2467
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Премештам поруке у фасциклу „%s“"
 
-#: ../mail/em-folder-tree.c:2223 ../mail/message-list.c:2286
+#: ../mail/em-folder-tree.c:2265 ../mail/message-list.c:2469
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Умножавам поруке у фасциклу „%s“"
 
-#: ../mail/em-folder-tree.c:2242
+#: ../mail/em-folder-tree.c:2284
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Не могу да убацим поруку(е) у оставу на највишем нивоу"
 
 #. 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 "НЕОДГОВАРА"
 
-#: ../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 "Учитавам..."
 
-#: ../mail/em-folder-utils.c:506
+#: ../mail/em-folder-utils.c:488
 msgid "Move Folder To"
 msgstr "Премести фасциклу у"
 
-#: ../mail/em-folder-utils.c:506
+#: ../mail/em-folder-utils.c:488
 msgid "Copy Folder To"
 msgstr "Умножи фасциклу у"
 
-#: ../mail/em-folder-utils.c:604
-msgid "Create Folder"
-msgstr "Направи фасциклу"
-
-#: ../mail/em-folder-utils.c:605
-msgid "Specify where to create the folder:"
-msgstr "Наведите где направити фасциклу:"
-
 #: ../mail/em-subscription-editor.c:855
 msgid "_Subscribe"
 msgstr "Пријави _се"
@@ -14310,80 +16923,100 @@ msgstr "Пријави се на _приказане"
 msgid "Subscribe To _All"
 msgstr "Пријави се _на све"
 
-#: ../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 "_Одјави се"
 
-#: ../mail/em-subscription-editor.c:978
+#: ../mail/em-subscription-editor.c:979
 msgid "Unsu_bscribe From Hidden"
 msgstr "О_дјави се са скривених"
 
-#: ../mail/em-subscription-editor.c:986
+#: ../mail/em-subscription-editor.c:987
 msgid "Unsubscribe From _All"
 msgstr "Одја_ви се са свих"
 
-#: ../mail/em-subscription-editor.c:1704
+#: ../mail/em-subscription-editor.c:1339
+#: ../modules/mail/e-mail-shell-view-private.c:1026
+#, c-format
+msgid "%d unread, "
+msgid_plural "%d unread, "
+msgstr[0] "%d непрочитана, "
+msgstr[1] "%d непрочитане, "
+msgstr[2] "%d непрочитаних, "
+msgstr[3] "%d непрочитана, "
+
+#: ../mail/em-subscription-editor.c:1343
+#: ../modules/mail/e-mail-shell-view-private.c:1036
+#, c-format
+msgid "%d total"
+msgid_plural "%d total"
+msgstr[0] "%d укупно"
+msgstr[1] "%d укупно"
+msgstr[2] "%d укупно"
+msgstr[3] "%d укупно"
+
+#: ../mail/em-subscription-editor.c:1749
 msgid "Folder Subscriptions"
 msgstr "Пријаве на фасцикле"
 
-#: ../mail/em-subscription-editor.c:1743
+#: ../mail/em-subscription-editor.c:1788
 msgid "_Account:"
 msgstr "_Налог:"
 
-#: ../mail/em-subscription-editor.c:1756
+#: ../mail/em-subscription-editor.c:1801
 msgid "Clear Search"
 msgstr "Очисти претрагу"
 
-#: ../mail/em-subscription-editor.c:1773
+#: ../mail/em-subscription-editor.c:1818
 msgid "Sho_w items that contain:"
 msgstr "_Прикажи ставке које садрже:"
 
-#: ../mail/em-subscription-editor.c:1820
+#: ../mail/em-subscription-editor.c:1865
 msgid "Subscribe to the selected folder"
 msgstr "Пријавите се на изабрану фасциклу"
 
-#: ../mail/em-subscription-editor.c:1821
+#: ../mail/em-subscription-editor.c:1866
 msgid "Su_bscribe"
 msgstr "П_ријави се"
 
-#: ../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 "Одјавите се са изабране фасцикле"
 
-#: ../mail/em-subscription-editor.c:1906
+#: ../mail/em-subscription-editor.c:1951
 msgid "Collapse all folders"
 msgstr "Скупите све фасцикле"
 
-#: ../mail/em-subscription-editor.c:1907
+#: ../mail/em-subscription-editor.c:1952
 msgid "C_ollapse All"
 msgstr "_Скупи све"
 
-#: ../mail/em-subscription-editor.c:1917
+#: ../mail/em-subscription-editor.c:1962
 msgid "Expand all folders"
 msgstr "Разгранајте све фасцикле"
 
-#: ../mail/em-subscription-editor.c:1918
+#: ../mail/em-subscription-editor.c:1963
 msgid "E_xpand All"
 msgstr "_Разгранај све"
 
-#: ../mail/em-subscription-editor.c:1928
+#: ../mail/em-subscription-editor.c:1973
 msgid "Refresh the folder list"
 msgstr "Освежите списак фасцикли"
 
-#: ../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 "_Освежи"
 
-#: ../mail/em-subscription-editor.c:1940
+#: ../mail/em-subscription-editor.c:1985
 msgid "Stop the current operation"
 msgstr "Зауставите тренутну операцију"
 
-#: ../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:979
 msgid "_Stop"
 msgstr "_Заустави"
 
@@ -14391,7 +17024,7 @@ msgstr "_Заустави"
 #. * 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 +17033,20 @@ msgstr[1] "Сигурно желите да отворите %d поруке о
 msgstr[2] "Сигурно желите да отворите %d порука одједном?"
 msgstr[3] "Сигурно желите да отворите ову једну поруку?"
 
-#: ../mail/em-utils.c:131
-#: ../modules/mailto-handler/evolution-mailto-handler.c:148
-msgid "_Do not show this message again"
-msgstr "_Не приказуј више ову поруку"
-
-#: ../mail/em-utils.c:241
+#: ../mail/em-utils.c:177
 msgid "Message Filters"
 msgstr "Пропусници порука"
 
-#: ../mail/em-utils.c:970
+#: ../mail/em-utils.c:923
 #, c-format
 msgid "Messages from %s"
 msgstr "Поруке које је послао %s"
 
+#: ../mail/em-utils.c:1680
+#| msgid "_Delete junk messages"
+msgid "Deleting old messages"
+msgstr "Бришем старе поруке"
+
 #: ../mail/em-vfolder-editor.c:104
 msgid "Search _Folders"
 msgstr "Фас_цикле претраге"
@@ -14422,95 +17055,421 @@ msgstr "Фас_цикле претраге"
 msgid "Add Folder"
 msgstr "Додај фасциклу"
 
-#: ../mail/em-vfolder-editor-rule.c:518
+#: ../mail/em-vfolder-editor-rule.c:521
 msgid "Search Folder Sources"
 msgstr "Извор фасцикле претраге"
 
-#: ../mail/em-vfolder-editor-rule.c:550
+#: ../mail/em-vfolder-editor-rule.c:553
 msgid "Automatically update on any _source folder change"
 msgstr "Сам освежи при _свакој измени изворне фасцикле"
 
-#: ../mail/em-vfolder-editor-rule.c:562
+#: ../mail/em-vfolder-editor-rule.c:565
 msgid "All local folders"
 msgstr "Све локалне фасцикле"
 
-#: ../mail/em-vfolder-editor-rule.c:563
+#: ../mail/em-vfolder-editor-rule.c:566
 msgid "All active remote folders"
 msgstr "Све активне мрежне фасцикле"
 
-#: ../mail/em-vfolder-editor-rule.c:564
+#: ../mail/em-vfolder-editor-rule.c:567
 msgid "All local and active remote folders"
 msgstr "Све локалне и активне мрежне фасцикле"
 
-#: ../mail/em-vfolder-editor-rule.c:565
+#: ../mail/em-vfolder-editor-rule.c:568
 msgid "Specific folders"
 msgstr "Одређене фасцикле"
 
-#: ../mail/em-vfolder-editor-rule.c:603
+#: ../mail/em-vfolder-editor-rule.c:606
 msgid "include subfolders"
 msgstr "укључи подфасцикле"
 
+#: ../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 "Пошиљалац"
+
+#: ../mail/filtertypes.xml.in.h:6 ../mail/searchtypes.xml.in.h:6
+#: ../mail/vfoldertypes.xml.in.h:6
+msgid "starts with"
+msgstr "почиње са"
+
+#: ../mail/filtertypes.xml.in.h:7 ../mail/searchtypes.xml.in.h:7
+#: ../mail/vfoldertypes.xml.in.h:7
+msgid "does not start with"
+msgstr "не почиње са"
+
+#: ../mail/filtertypes.xml.in.h:8 ../mail/searchtypes.xml.in.h:8
+#: ../mail/vfoldertypes.xml.in.h:8
+msgid "ends with"
+msgstr "завршава се са"
+
+#: ../mail/filtertypes.xml.in.h:9 ../mail/searchtypes.xml.in.h:9
+#: ../mail/vfoldertypes.xml.in.h:9
+msgid "does not end with"
+msgstr "не завршава се са"
+
+#: ../mail/filtertypes.xml.in.h:10 ../mail/searchtypes.xml.in.h:12
+#: ../mail/vfoldertypes.xml.in.h:12
+msgid "sounds like"
+msgstr "звучи као"
+
+#: ../mail/filtertypes.xml.in.h:11 ../mail/searchtypes.xml.in.h:13
+#: ../mail/vfoldertypes.xml.in.h:13
+msgid "does not sound like"
+msgstr "не звучи као"
+
+#: ../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 "Примаоци"
+
+#: ../mail/filtertypes.xml.in.h:13 ../mail/searchtypes.xml.in.h:14
+#: ../mail/vfoldertypes.xml.in.h:14
+msgid "CC"
+msgstr "ЦЦ"
+
+#: ../mail/filtertypes.xml.in.h:14 ../mail/searchtypes.xml.in.h:15
+#: ../mail/vfoldertypes.xml.in.h:15
+msgid "BCC"
+msgstr "БЦЦ"
+
+# bug(slobo): вероватно извештај о достави
+#: ../mail/filtertypes.xml.in.h:15 ../mail/searchtypes.xml.in.h:16
+#: ../mail/vfoldertypes.xml.in.h:16
+msgid "Sender or Recipients"
+msgstr "Пошиљалац или примаоци"
+
+#: ../mail/filtertypes.xml.in.h:17 ../mail/searchtypes.xml.in.h:18
+#: ../mail/vfoldertypes.xml.in.h:18
+msgid "has words"
+msgstr "садржи речи"
+
+#: ../mail/filtertypes.xml.in.h:18 ../mail/searchtypes.xml.in.h:19
+#: ../mail/vfoldertypes.xml.in.h:19
+msgid "does not have words"
+msgstr "не садржи речи"
+
+#: ../mail/filtertypes.xml.in.h:19 ../mail/searchtypes.xml.in.h:20
+#: ../mail/vfoldertypes.xml.in.h:20
+msgid "Specific header"
+msgstr "Одређено заглавље"
+
+#: ../mail/filtertypes.xml.in.h:20 ../mail/searchtypes.xml.in.h:21
+#: ../mail/vfoldertypes.xml.in.h:21
+msgid "exists"
+msgstr "постоји"
+
+#: ../mail/filtertypes.xml.in.h:21 ../mail/searchtypes.xml.in.h:22
+#: ../mail/vfoldertypes.xml.in.h:22
+msgid "does not exist"
+msgstr "не постоји"
+
+#: ../mail/filtertypes.xml.in.h:22 ../mail/searchtypes.xml.in.h:24
+#: ../mail/vfoldertypes.xml.in.h:24
+msgid "Message Body"
+msgstr "Тело поруке"
+
+#: ../mail/filtertypes.xml.in.h:23 ../mail/searchtypes.xml.in.h:25
+#: ../mail/vfoldertypes.xml.in.h:25
+msgid "Expression"
+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 "Израз у слободној форми"
+
+#: ../mail/filtertypes.xml.in.h:25 ../mail/searchtypes.xml.in.h:27
+#: ../mail/vfoldertypes.xml.in.h:27
+msgid "Date sent"
+msgstr "Датум слања"
+
+#: ../mail/filtertypes.xml.in.h:26 ../mail/searchtypes.xml.in.h:28
+#: ../mail/vfoldertypes.xml.in.h:28
+msgid "is before"
+msgstr "је пре"
+
+#: ../mail/filtertypes.xml.in.h:27 ../mail/searchtypes.xml.in.h:29
+#: ../mail/vfoldertypes.xml.in.h:29
+msgid "is after"
+msgstr "је после"
+
+#: ../mail/filtertypes.xml.in.h:28 ../mail/searchtypes.xml.in.h:30
+#: ../mail/vfoldertypes.xml.in.h:30
+msgid "Date received"
+msgstr "Датум примања"
+
+#: ../mail/filtertypes.xml.in.h:29 ../mail/searchtypes.xml.in.h:31
+#: ../mail/vfoldertypes.xml.in.h:31
+msgid "Label"
+msgstr "Натпис"
+
+#: ../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 "Резултат"
+
+#: ../mail/filtertypes.xml.in.h:33 ../mail/searchtypes.xml.in.h:35
+#: ../mail/vfoldertypes.xml.in.h:35
+msgid "Size (kB)"
+msgstr "Величина (kB)"
+
+#: ../mail/filtertypes.xml.in.h:35 ../mail/searchtypes.xml.in.h:37
+#: ../mail/vfoldertypes.xml.in.h:37
+msgid "Replied to"
+msgstr "Одговорено"
+
+#: ../mail/filtertypes.xml.in.h:37 ../mail/searchtypes.xml.in.h:40
+#: ../mail/vfoldertypes.xml.in.h:40
+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
+msgid "Read"
+msgstr "Читај"
+
+#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:128
+#: ../mail/vfoldertypes.xml.in.h:42
+msgid "Junk"
+msgstr "Ђубре"
+
+#: ../mail/filtertypes.xml.in.h:40 ../mail/searchtypes.xml.in.h:42
+#: ../mail/vfoldertypes.xml.in.h:43
+msgid "Follow Up"
+msgstr "Следи"
+
+#: ../mail/filtertypes.xml.in.h:41 ../mail/searchtypes.xml.in.h:43
+#: ../mail/vfoldertypes.xml.in.h:44
+msgid "is Flagged"
+msgstr "је означено"
+
+#: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44
+#: ../mail/vfoldertypes.xml.in.h:45
+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"
+msgid "is Completed"
+msgstr "је завршено"
+
+#: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
+#: ../mail/vfoldertypes.xml.in.h:47
+#| msgid "% Completed"
+msgid "is not Completed"
+msgstr "није завршено"
+
+#: ../mail/filtertypes.xml.in.h:48 ../mail/searchtypes.xml.in.h:50
+#: ../mail/vfoldertypes.xml.in.h:51
+msgid "Mailing list"
+msgstr "Дописна листа"
+
+#: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51
+#: ../mail/vfoldertypes.xml.in.h:52
+msgid "Regex Match"
+msgstr "Регизр одговара"
+
+#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
+#: ../mail/vfoldertypes.xml.in.h:53
+msgid "Message Header"
+msgstr "Заглавље поруке"
+
+#: ../mail/filtertypes.xml.in.h:51
+msgid "Source Account"
+msgstr "Изворни налог"
+
+#: ../mail/filtertypes.xml.in.h:52
+msgid "Pipe to Program"
+msgstr "Повежи на програм"
+
+#: ../mail/filtertypes.xml.in.h:53
+msgid "returns"
+msgstr "повратно"
+
+#: ../mail/filtertypes.xml.in.h:54
+msgid "does not return"
+msgstr "не враћа"
+
+#: ../mail/filtertypes.xml.in.h:55
+msgid "returns greater than"
+msgstr "повратно веће од"
+
+#: ../mail/filtertypes.xml.in.h:56
+msgid "returns less than"
+msgstr "повратно мање од"
+
+#: ../mail/filtertypes.xml.in.h:57
+msgid "Junk Test"
+msgstr "Провера ђубрета"
+
+#: ../mail/filtertypes.xml.in.h:58
+msgid "Message is Junk"
+msgstr "Порука је ђубре"
+
+#: ../mail/filtertypes.xml.in.h:59
+msgid "Message is not Junk"
+msgstr "Порука није ђубре"
+
+#: ../mail/filtertypes.xml.in.h:60 ../mail/vfoldertypes.xml.in.h:54
+msgid "Message Location"
+msgstr "Локација поруке"
+
+#: ../mail/filtertypes.xml.in.h:61 ../mail/searchtypes.xml.in.h:53
+#: ../mail/vfoldertypes.xml.in.h:55
+msgid "Match All"
+msgstr "Одговара све"
+
+#: ../mail/filtertypes.xml.in.h:65
+msgid "Stop Processing"
+msgstr "Прекини обраду"
+
+#: ../mail/filtertypes.xml.in.h:66
+msgid "Set Label"
+msgstr "Постави ознаку"
+
+#: ../mail/filtertypes.xml.in.h:67
+msgid "Assign Color"
+msgstr "Додели боју"
+
+#: ../mail/filtertypes.xml.in.h:68
+msgid "Unset Color"
+msgstr "Непостављена боја"
+
+#: ../mail/filtertypes.xml.in.h:69
+msgid "Assign Score"
+msgstr "Додели резултат"
+
+#: ../mail/filtertypes.xml.in.h:70
+msgid "Adjust Score"
+msgstr "Прерачунај"
+
+#: ../mail/filtertypes.xml.in.h:71
+msgid "Set Status"
+msgstr "Постави статус"
+
+#: ../mail/filtertypes.xml.in.h:72 ../mail/searchtypes.xml.in.h:38
+#: ../mail/vfoldertypes.xml.in.h:38
+msgid "Deleted"
+msgstr "Обрисано"
+
+#: ../mail/filtertypes.xml.in.h:73
+msgid "Unset Status"
+msgstr "Непостављен статус"
+
+#: ../mail/filtertypes.xml.in.h:74
+msgid "Beep"
+msgstr "Звоно"
+
+#: ../mail/filtertypes.xml.in.h:75
+msgid "Play Sound"
+msgstr "Пусти звук"
+
+#: ../mail/filtertypes.xml.in.h:76
+msgid "Run Program"
+msgstr "Покрени програм"
+
+#: ../mail/filtertypes.xml.in.h:77
+msgid "Forward to"
+msgstr "Проследи"
+
 #: ../mail/importers/elm-importer.c:173
 msgid "Importing Elm data"
 msgstr "Увожење Елм података"
 
-#: ../mail/importers/elm-importer.c:374
+#: ../mail/importers/elm-importer.c:376
 msgid "Evolution Elm importer"
 msgstr "Елм увозник Еволуције"
 
-#: ../mail/importers/elm-importer.c:375
+#: ../mail/importers/elm-importer.c:377
 msgid "Import mail from Elm."
 msgstr "Увози пошту из Елма."
 
 #: ../mail/importers/evolution-mbox-importer.c:134
+#: ../mail/importers/kmail-importer.c:210
 #: ../plugins/dbx-import/dbx-importer.c:246
 msgid "_Destination folder:"
 msgstr "_Одредишна фасцикла:"
 
 #: ../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 "Изаберите фасциклу"
 
 #: ../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 "Изаберите фасциклу за увоз"
 
-#: ../mail/importers/evolution-mbox-importer.c:435
+#: ../mail/importers/evolution-mbox-importer.c:509
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Наслов"
 
-#: ../mail/importers/evolution-mbox-importer.c:440
+#: ../mail/importers/evolution-mbox-importer.c:514
 msgctxt "mboxImp"
 msgid "From"
 msgstr "Шаље"
 
-#: ../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 "Беркли поштанско сандуче (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:494
+#: ../mail/importers/evolution-mbox-importer.c:569
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Увозник за фасцикле облика Беркли поштанског сандучета"
 
+#: ../mail/importers/kmail-importer.c:263
+#, c-format
+#| msgid "Address"
+msgid "%d Address"
+msgid_plural "%d Addresses"
+msgstr[0] "%d адреса"
+msgstr[1] "%d адресe"
+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
+msgid "Trash"
+msgstr "Смеће"
+
 #: ../mail/importers/mail-importer.c:54
 msgid "Importing mailbox"
 msgstr "Увожење поштанског сандучета"
 
+#: ../mail/importers/mail-importer.c:60
+#| msgid "Import mail from Elm."
+msgid "Importing mail and contacts from KMail"
+msgstr "Увозим пошту и контакте из КМејла."
+
 #. 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 "Увозим „%s“"
 
-#: ../mail/importers/mail-importer.c:309
+#: ../mail/importers/mail-importer.c:555
 #, c-format
 msgid "Scanning %s"
 msgstr "Претражујем „%s“"
@@ -14519,11 +17478,11 @@ msgstr "Претражујем „%s“"
 msgid "Importing Pine data"
 msgstr "Увожење Пине података"
 
-#: ../mail/importers/pine-importer.c:475
+#: ../mail/importers/pine-importer.c:477
 msgid "Evolution Pine importer"
 msgstr "Еволуцијин Пине увозник"
 
-#: ../mail/importers/pine-importer.c:476
+#: ../mail/importers/pine-importer.c:478
 msgid "Import mail from Pine."
 msgstr "Увози пошту из програма Пине."
 
@@ -14606,122 +17565,123 @@ msgstr "Подразумевано понашање"
 msgid "For_mat messages in HTML"
 msgstr "Обликуј поруке у ХТМ_Л"
 
-#: ../mail/mail-config.ui.h:9
-msgid "Automatically insert _emoticon images"
-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 "Уникод знак за _смајлије"
+
+#: ../mail/mail-config.ui.h:12
 msgid "Always request rea_d receipt"
 msgstr "Увек тражи _повратницу"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:13
 msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "Кодирај називе датотека на начин _Аутлука/Гпоште"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:14
+#| msgid "Saving message to Outbox."
+msgid "Send messages through Outbo_x folder"
+msgstr "Шаљи поруке кроз фасциклу _За слање."
+
+#: ../mail/mail-config.ui.h:15
+msgid "Number of characters for word w_rapping:"
+msgstr "Бро_ј знакова за преламање речи"
+
+#: ../mail/mail-config.ui.h:16
 msgid "Ch_aracter encoding:"
 msgstr "Кодна ст_рана:"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:17
 msgid "Replies and Forwards"
 msgstr "Одговори и прослеђивања"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:18
 msgid "_Reply style:"
 msgstr "_Стил одговора:"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:19
 msgid "_Forward style:"
 msgstr "Стил _прослеђивања:"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:20
 msgid "Start _typing at the bottom on replying"
 msgstr "У одговору започни _куцање при дну"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:21
 msgid "_Keep signature above the original message on replying"
 msgstr "Задржи потпис _изнад оригиналне поруке при одговору"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:22
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "_Занемари „Одговор-за:“ за дописне листе"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:23
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "Одговор _групи иде само на дописну листу, ако је могуће"
 
-#: ../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 ""
 "Дигитално _потпиши поруке када је оригинална порука потписана (ПГП или С/"
 "МИМЕ)"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:25
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Приложи"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:26
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "Унутар (Аутлук стил)"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:27
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Цитирано"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:28
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Не цитирај"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:29
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "Унутар"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:31
 msgid "Sig_natures"
 msgstr "Пот_писи"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:32
 msgid "Signatures"
 msgstr "Потписи"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:33
 msgid "_Languages"
 msgstr "_Језици"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:34
 msgid "Languages Table"
 msgstr "Табела језика"
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:35
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "Списак језика овде осликава само оне језике за које имате инсталиран речник."
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:37
 msgid "Check spelling while I _type"
 msgstr "Провери правопис док _куцам"
 
-#: ../mail/mail-config.ui.h:34
-msgid "Color for _misspelled words:"
-msgstr "Боја за _погрешно написане речи:"
-
-#: ../mail/mail-config.ui.h:35
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
-msgid "Pick a color"
-msgstr "Изаберите боју"
-
-#: ../mail/mail-config.ui.h:36
-msgid "Spell Checking"
-msgstr "Провера правописа"
-
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:39
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -14730,73 +17690,81 @@ msgstr ""
 "пре извршавања следећих означених радњи:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:41
 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:41
+#: ../mail/mail-config.ui.h:43
 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:43
+#: ../mail/mail-config.ui.h:45
+#| msgid "Sending a message with only _Bcc recipients defined"
+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
 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:45
+#: ../mail/mail-config.ui.h:49
 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:47
+#: ../mail/mail-config.ui.h:51
 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:49
+#: ../mail/mail-config.ui.h:53
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "Слања поруке са _примаоцима који нису унешени као адресе поште"
 
-#: ../mail/mail-config.ui.h:50
+#. 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"
+msgid "Sending a message using _key accelerator (Ctrl+Enter)"
+msgstr "Слања поруке помоћу пре_чице (Ctrl + Enter)"
+
+#: ../mail/mail-config.ui.h:56
 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:54
-#| msgid "Search Folders"
+#: ../mail/mail-config.ui.h:60
 msgid "Use for Folders"
 msgstr "Користи за фасцикле"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:61
 msgid "A_dd"
 msgstr "_Додај"
 
-#: ../mail/mail-config.ui.h:57
-#| msgid "_Remove"
+#: ../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:59
-#| msgid "Sender or Recipients"
+#: ../mail/mail-config.ui.h:65
 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:61 ../modules/mail/em-composer-prefs.c:870
-#| msgid "_Account:"
+#: ../mail/mail-config.ui.h:67 ../modules/mail/em-composer-prefs.c:864
 msgid "Account"
 msgstr "Налог"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:68
 msgid "Send account overrides"
 msgstr "Преписивања налога слања"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:69
 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 +17776,230 @@ msgstr ""
 "Списак примаоца може да садржи делимичне адресе или називе. Делови адресе и "
 "назива се упоређују засебно."
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:70
 msgid "_Folder override has precedence over Recipient override"
 msgstr "Преписивање _фасцикле има предност над преписивањем примаоца"
 
-#: ../mail/mail-config.ui.h:65
-#| msgid "Source Account"
+#: ../mail/mail-config.ui.h:71
 msgid "Send Account"
 msgstr "Налог слања"
 
-#: ../mail/mail-config.ui.h:71 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:77 ../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:78 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "б"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:79
 msgid "Start up"
 msgstr "Покретање"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:80
 msgid "Check for new _messages on start"
 msgstr "Провери нове _поруке приликом покретања"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:81
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Провери нове _поруке у свим активним налозима"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:82
 msgid "Message Display"
 msgstr "Приказ поруке"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:83
 msgid "_Use the same fonts as other applications"
 msgstr "_Користи исте фонтове као други програми"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:84
 msgid "S_tandard Font:"
 msgstr "_Стандардни фонт:"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:85
 msgid "Select HTML fixed width font"
 msgstr "Изаберите ХТМЛ фонт сталне величине"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:86
 msgid "Select HTML variable width font"
 msgstr "Изаберите ХТМЛ фонт променљиве величине"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:87
 msgid "Fix_ed Width Font:"
 msgstr "Фонт _сталне ширине:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:88
 msgid "_Mark messages as read after"
 msgstr "_Означи поруке као прочитане после"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:90
 msgid "Highlight _quotations with"
 msgstr "Нагласи _цитате са"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:91
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
+msgid "Pick a color"
+msgstr "Изаберите боју"
+
+#: ../mail/mail-config.ui.h:92
 msgid "color"
 msgstr "боја"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:93
 msgid "Default character e_ncoding:"
 msgstr "Подразумеванa _кодна страна:"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:94
 msgid "Apply the same _view settings to all folders"
 msgstr "Примени иста подешавања _прегледа на свим фасциклама"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:95
 msgid "F_all back to threading messages by subject"
 msgstr "Вра_ти се на низање порука по наслову"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:96
 msgid "Delete Mail"
 msgstr "Обриши пошту"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:97
 msgid "Empty _trash folders"
 msgstr "Испразни фасцикле _смећа"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:98
 msgid "Confirm _when expunging a folder"
 msgstr "_Потврди када празниш фасциклу"
 
+#: ../mail/mail-config.ui.h:99
+msgid "Archive Mail"
+msgstr "Архивирај поруку"
+
+#: ../mail/mail-config.ui.h:100
+msgid "On This Computer A_rchive folder:"
+msgstr "Архива на овом рачунару:"
+
+#: ../mail/mail-config.ui.h:101
+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:93
+#: ../mail/mail-config.ui.h:103
 msgid "_Show animated images"
 msgstr "Прикажи _анимиране слике"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:104
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Упозори при слању ХТМЛ поште контактима који их не желе"
 
-#: ../mail/mail-config.ui.h:95
-msgid "Loading Images"
-msgstr "Учитавање слика"
+#: ../mail/mail-config.ui.h:105
+msgid "Loading Remote Content"
+msgstr "Учитавам удаљени садржај"
 
-#: ../mail/mail-config.ui.h:96
-msgid "_Never load images from the Internet"
-msgstr "_Никада не учитавај слике са Интернета"
+#: ../mail/mail-config.ui.h:106
+#| msgid "_Never load images from the Internet"
+msgid "_Never load remote content from the Internet"
+msgstr "_Никада не учитавај удаљени садржај са Интернета"
 
-#: ../mail/mail-config.ui.h:97
-msgid "_Load images only in messages from contacts"
-msgstr "_Учитај слике само у порукама од контакта"
+#: ../mail/mail-config.ui.h:107
+#| msgid "_Load images only in messages from contacts"
+msgid "_Load remote content only in messages from contacts"
+msgstr "_Учитај удаљени садржај само у порукама од контакта"
 
-#: ../mail/mail-config.ui.h:98
-msgid "_Always load images from the Internet"
-msgstr "_Увек учитај слике са Интернета"
+#: ../mail/mail-config.ui.h:108
+#| msgid "_Always load images from the Internet"
+msgid "_Always load remote content from the Internet"
+msgstr "_Увек учитај удаљени садржај са Интернета"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:109
+#| msgid "_Add"
+msgid "Add"
+msgstr "Додај"
+
+#: ../mail/mail-config.ui.h:110
+#| msgid "_Remove"
+msgid "Remove"
+msgstr "Уклони"
+
+#: ../mail/mail-config.ui.h:111
+msgid "Allow for sites:"
+msgstr "Дозволи за сајтове:"
+
+#: ../mail/mail-config.ui.h:112
+#| msgid "All local folders"
+msgid "Allow for senders:"
+msgstr "Дозволи за пошиљаоце:"
+
+#: ../mail/mail-config.ui.h:113
 msgid "HTML Messages"
 msgstr "ХТМЛ поруке"
 
-#: ../mail/mail-config.ui.h:100 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:114 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Ознаке"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:115
 msgid "Sender Photograph"
 msgstr "Фотографија пошиљаоца"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:116
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Прикажи фотографију пошиљаоца у прегледу поште"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:117
+msgid "Search gra_vatar.com for the photograph of sender"
+msgstr "По_тражи слику пошиљаоца на gravatar.com"
+
+#: ../mail/mail-config.ui.h:118
 msgid "Displayed Message Headers"
 msgstr "Приказана заглавља порука"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:119
 msgid "Mail Headers Table"
 msgstr "Табела заглавља поште"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:120
 #: ../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 "Формат датум/време"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:122
 msgid "Check incoming _messages for junk"
 msgstr "Провери има ли ђубрета у _пристиглој пошти"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:123
 msgid "_Delete junk messages"
 msgstr "_Обриши поруке ђубра"
 
-#: ../mail/mail-config.ui.h:109
-msgid "Check cu_stom headers for junk"
-msgstr "Провери има ли ђубрета у _прилагођеним заглављима"
+#: ../mail/mail-config.ui.h:124
+#| msgid "Junk Test"
+msgid "Junk Test Options"
+msgstr "Опције за тестирање ђубрета"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:125
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Не означава_ј поруке као ђубре ако је пошиљалац у мом адресару"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:126
 msgid "_Lookup in local address book only"
 msgstr "_Потражи само у локалном адресару"
 
-#: ../mail/mail-config.ui.h:112
-msgid "Option is ignored if a match for custom junk headers is found."
-msgstr ""
-"Опција се занемарује уколико је пронађено поклапање са произвољним заглављем "
-"ђубрета."
+#: ../mail/mail-config.ui.h:127
+msgid "Check cu_stom headers for junk"
+msgstr "Провери има ли ђубрета у _прилагођеним заглављима"
 
-#: ../mail/mail-config.ui.h:114
+#: ../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:158
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:174
 msgid "No encryption"
 msgstr "Без шифровања"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:130
 msgid "TLS encryption"
 msgstr "ТЛС шифровање"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:131
 msgid "SSL encryption"
 msgstr "ССЛ шифровање"
 
@@ -15137,7 +18148,7 @@ msgstr ""
 "\n"
 "Многи системи ел. поште додају порукама заглавље „Привидно-ка“ које има само "
 "БЦЦ примаоце. Ово ће заглавље, ако је додато, излистати све примаоце поруке. "
-"Да избегнете ово, додајте барем једног „Прима:“ или „CC:“ примаоца. "
+"Да избегнете ово, додајте барем једног „Прима:“ или „ЦЦ:“ примаоца. "
 
 #: ../mail/mail.error.xml.h:15
 msgid ""
@@ -15149,14 +18160,34 @@ msgstr ""
 "Многи системи ел. поште додају порукама заглавље „Привидно-ка“ које имају "
 "само БЦЦ примаоце. Ово ће заглавље, ако је додато, у сваком случају "
 "излистати све примаоце поруке. Да избегнете ово, додајте барем једног "
-"„Прима:“ или „CC:“ примаоца."
+"„Прима:“ или „ЦЦ:“ примаоца."
 
 # 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:17
+#: ../mail/mail.error.xml.h:20
 msgid ""
 "The following recipient was not recognized as a valid mail address:\n"
 "{0}"
@@ -15165,11 +18196,11 @@ msgstr ""
 "{0}"
 
 # mail:ask-send-only-bcc primary
-#: ../mail/mail.error.xml.h:19
+#: ../mail/mail.error.xml.h:22
 msgid "Are you sure you want to send a message with invalid addresses?"
 msgstr "Сигурно желите да пошаљете поруку са неисправним адресама?"
 
-#: ../mail/mail.error.xml.h:20
+#: ../mail/mail.error.xml.h:23
 msgid ""
 "The following recipients were not recognized as valid mail addresses:\n"
 "{0}"
@@ -15177,11 +18208,11 @@ msgstr ""
 "Следећи примаоци нису препознати као исправне адресе ел. поште:\n"
 "{0}"
 
-#: ../mail/mail.error.xml.h:22
+#: ../mail/mail.error.xml.h:25
 msgid "Send private reply?"
 msgstr "Да пошаљем приватан одговор?"
 
-#: ../mail/mail.error.xml.h:23
+#: ../mail/mail.error.xml.h:26
 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 +18222,11 @@ msgstr ""
 "покушава да преусмери ваш одговор назад на листу. Да ли сте сигурни да "
 "желите да наставите?"
 
-#: ../mail/mail.error.xml.h:24
+#: ../mail/mail.error.xml.h:27
 msgid "Reply _Privately"
 msgstr "Одговори _приватно"
 
-#: ../mail/mail.error.xml.h:26
+#: ../mail/mail.error.xml.h:29
 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 +18237,11 @@ msgstr ""
 "наставите?"
 
 # bug(slobo): вероватно извештај о достави
-#: ../mail/mail.error.xml.h:28
+#: ../mail/mail.error.xml.h:31
 msgid "Send reply to all recipients?"
 msgstr "Да пошаљем одговоре свим примаоцима?"
 
-#: ../mail/mail.error.xml.h:29
+#: ../mail/mail.error.xml.h:32
 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 +18249,12 @@ msgstr ""
 "Одговарате на поруку која је послата већем броју прималаца. Да ли сте "
 "сигурни да желите СВИМА да одговорите?"
 
-#: ../mail/mail.error.xml.h:30
+#: ../mail/mail.error.xml.h:33
 msgid ""
 "This message cannot be sent because you have not specified any recipients"
 msgstr "Ова порука се не може послати пошто нисте навели ниједног примаоца"
 
-#: ../mail/mail.error.xml.h:31
+#: ../mail/mail.error.xml.h:34
 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 +18262,11 @@ msgstr ""
 "Унесите важећу адресу ел. поште у поље „Прима:“. Можете претражити адресе "
 "ел. поште кликом на дугме „Прима:“ поред поља за унос."
 
-#: ../mail/mail.error.xml.h:32
+#: ../mail/mail.error.xml.h:35
 msgid "Use default drafts folder?"
 msgstr "Да користим подразумевану фасциклу нацрта?"
 
-#: ../mail/mail.error.xml.h:33
+#: ../mail/mail.error.xml.h:36
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?"
@@ -15243,11 +18274,11 @@ msgstr ""
 "Не могу да отворим фасциклу нацрта за овај налог. Да користим системску "
 "фасциклу нацрта уместо тога?"
 
-#: ../mail/mail.error.xml.h:34
+#: ../mail/mail.error.xml.h:37
 msgid "Use _Default"
 msgstr "Користи _основно"
 
-#: ../mail/mail.error.xml.h:35
+#: ../mail/mail.error.xml.h:38
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder \"{0}\"?"
@@ -15255,39 +18286,39 @@ msgstr ""
 "Сигурно желите трајно да уклоните све обрисане поруке из фасцикле „{0}“?"
 
 # mail:ask-empty-trash secondary
-#: ../mail/mail.error.xml.h:36
+#: ../mail/mail.error.xml.h:39
 msgid "If you continue, you will not be able to recover these messages."
 msgstr "Уколико наставите, нећете моћи да вратите ове поруке."
 
-#: ../mail/mail.error.xml.h:37
+#: ../mail/mail.error.xml.h:40
 msgid "_Expunge"
 msgstr "Из_баци"
 
-#: ../mail/mail.error.xml.h:38
+#: ../mail/mail.error.xml.h:41
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 msgstr ""
 "Сигурно желите трајно да уклоните све обрисане поруке из свих фасцикли?"
 
-#: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../mail/mail.error.xml.h:42
+#: ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "_Empty Trash"
 msgstr "_Избаци смеће"
 
-#: ../mail/mail.error.xml.h:40
+#: ../mail/mail.error.xml.h:43
 msgid "Opening too many messages at once may take a long time."
 msgstr "Отварање превише порука одједном може да потраје мало дуже."
 
-#: ../mail/mail.error.xml.h:41
+#: ../mail/mail.error.xml.h:44
 msgid "_Open Messages"
 msgstr "_Отвори поруке"
 
-#: ../mail/mail.error.xml.h:42
+#: ../mail/mail.error.xml.h:45
 msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr "Имате непослате поруке, да ли желите ипак да изађете?"
 
-#: ../mail/mail.error.xml.h:43
+#: ../mail/mail.error.xml.h:46
 msgid ""
 "If you quit, these messages will not be sent until Evolution is started "
 "again."
@@ -15298,59 +18329,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:50
 msgid "Error while {0}."
 msgstr "Грешка приликом {0}."
 
-#: ../mail/mail.error.xml.h:48
+#: ../mail/mail.error.xml.h:51
 msgid "Error while performing operation."
 msgstr "Грешка током извршавања операције."
 
-#: ../mail/mail.error.xml.h:49
+#: ../mail/mail.error.xml.h:52
 msgid "Enter password."
 msgstr "Унесите лозинку."
 
-#: ../mail/mail.error.xml.h:50
+#: ../mail/mail.error.xml.h:53
 msgid "Error loading filter definitions."
 msgstr "Грешка при учитавању дефиниција филтера."
 
-#: ../mail/mail.error.xml.h:51
+#: ../mail/mail.error.xml.h:54
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Не могу да сачувам у директоријуму „{0}“."
 
 # mail:no-write-path-exists primary
 # mail:no-write-path-notfile primary
-#: ../mail/mail.error.xml.h:52
+#: ../mail/mail.error.xml.h:55
 msgid "Cannot save to file \"{0}\"."
 msgstr "Не могу да сачувам у датотеку „{0}“."
 
-#: ../mail/mail.error.xml.h:53
+#: ../mail/mail.error.xml.h:56
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Не могу да направим директоријум за чување, због „{1}“"
 
-#: ../mail/mail.error.xml.h:54
+#: ../mail/mail.error.xml.h:57
 msgid "Cannot create temporary save directory."
 msgstr "Не могу да направим привремени директоријум за чување."
 
-#: ../mail/mail.error.xml.h:55
+#: ../mail/mail.error.xml.h:58
 msgid "File exists but cannot overwrite it."
 msgstr "Датотека постоји али не могу да је препишем."
 
-#: ../mail/mail.error.xml.h:56
+#: ../mail/mail.error.xml.h:59
 msgid "File exists but is not a regular file."
 msgstr "Датотека постоји али није регуларна."
 
-#: ../mail/mail.error.xml.h:57
+#: ../mail/mail.error.xml.h:60
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Не могу да обришем фасциклу „{0}“."
 
-#: ../mail/mail.error.xml.h:58
+#: ../mail/mail.error.xml.h:61
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Не могу да обришем системску фасциклу „{0}“."
 
 # bug: Ximian Evolution -> Evolution
 # mail:no-rename-spethal-folder secondary
-#: ../mail/mail.error.xml.h:59
+#: ../mail/mail.error.xml.h:62
 msgid ""
 "System folders are required for Evolution to function correctly and cannot "
 "be renamed, moved, or deleted."
@@ -15358,23 +18389,23 @@ msgstr ""
 "Системске фасцикле су неопходне Еволуцији да би исправно радила и не могу "
 "бити преименоване, премештене или обрисане."
 
-#: ../mail/mail.error.xml.h:60
+#: ../mail/mail.error.xml.h:63
 msgid "Failed to expunge folder &quot;{0}&quot;."
-msgstr "Нисам успео да избацим фасциклу „{0}“."
+msgstr "Не могу да избацим фасциклу „{0}“."
 
-#: ../mail/mail.error.xml.h:62
+#: ../mail/mail.error.xml.h:65
 msgid "Failed to refresh folder &quot;{0}&quot;."
-msgstr "Нисам успео да освежим фасциклу „{0}“."
+msgstr "Не могу да освежим фасциклу „{0}“."
 
-#: ../mail/mail.error.xml.h:63
+#: ../mail/mail.error.xml.h:66
 msgid "Cannot rename or move system folder \"{0}\"."
 msgstr "Не могу да преименујем или да преместим системску фасциклу„{0}“."
 
-#: ../mail/mail.error.xml.h:64
+#: ../mail/mail.error.xml.h:67
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Да обришем фасциклу „{0}“ и све подфасцикле?"
 
-#: ../mail/mail.error.xml.h:65
+#: ../mail/mail.error.xml.h:68
 msgid ""
 "If you delete the folder, all of its contents and its subfolders' contents "
 "will be deleted permanently."
@@ -15382,20 +18413,20 @@ msgstr ""
 "Уколико обришете фасциклу, сав њен садржај и садржај подфасцикли биће трајно "
 "обрисани."
 
-#: ../mail/mail.error.xml.h:67
+#: ../mail/mail.error.xml.h:70
 msgid "Really delete folder \"{0}\"?"
 msgstr "Да обришем фасциклу „{0}“?"
 
-#: ../mail/mail.error.xml.h:68
+#: ../mail/mail.error.xml.h:71
 msgid ""
 "If you delete the folder, all of its contents will be deleted permanently."
 msgstr "Уколико обришете фасциклу, сав њен садржај биће трајно обрисан."
 
-#: ../mail/mail.error.xml.h:69
+#: ../mail/mail.error.xml.h:72
 msgid "These messages are not copies."
 msgstr "Ове поруке нису умношци."
 
-#: ../mail/mail.error.xml.h:70
+#: ../mail/mail.error.xml.h:73
 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 +18437,70 @@ msgstr ""
 "којима се физички налазе. Да ли заиста желите да избришете ове поруке?"
 
 # mail:no-rename-folder primary
-#: ../mail/mail.error.xml.h:71
+#: ../mail/mail.error.xml.h:74
 msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgstr "Не могу да преименујем „{0}“ у „{1}“."
 
 # bug: use the same message as above
-#: ../mail/mail.error.xml.h:72
+#: ../mail/mail.error.xml.h:75
 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:73
+#: ../mail/mail.error.xml.h:76
 msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr "Не могу да преместим фасциклу „{0}“ у „{1}“."
 
 # mail:no-copy-folder-nostore secondary
-#: ../mail/mail.error.xml.h:74
+#: ../mail/mail.error.xml.h:77
 msgid "Cannot open source folder. Error: {2}"
 msgstr "Не могу да отворим фасциклу извора. Грешка: {2}"
 
 # mail:no-copy-folder-to-nostore secondary
-#: ../mail/mail.error.xml.h:75
+#: ../mail/mail.error.xml.h:78
 msgid "Cannot open target folder. Error: {2}"
 msgstr "Не могу да отворим фасциклу мете. Грешка: {2}"
 
 # mail:no-copy-folder-to-nostore primary
-#: ../mail/mail.error.xml.h:76
+#: ../mail/mail.error.xml.h:79
 msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr "Не могу да умножим фасциклу „{0}“ у „{1}“."
 
-#: ../mail/mail.error.xml.h:77
+#: ../mail/mail.error.xml.h:80
 msgid "Cannot create folder \"{0}\"."
 msgstr "Не могу да направим фасциклу „{0}“."
 
 # mail:no-move-folder-to-nostore primary
-#: ../mail/mail.error.xml.h:78
+#: ../mail/mail.error.xml.h:81
 msgid "Cannot open folder. Error: {1}"
 msgstr "Не могу да отворим фасциклу. Грешка: {1}"
 
 # mail:account-notunique primary
-#: ../mail/mail.error.xml.h:79
+#: ../mail/mail.error.xml.h:82
 msgid "Cannot save changes to account."
 msgstr "Не могу да сачувам измене на налогу."
 
-#: ../mail/mail.error.xml.h:80
+#: ../mail/mail.error.xml.h:83
 msgid "You have not filled in all of the required information."
 msgstr "Нисте унели све потребне податке."
 
-#: ../mail/mail.error.xml.h:81
+#: ../mail/mail.error.xml.h:84
 msgid "You may not create two accounts with the same name."
 msgstr "Не можете да направите два налога са истим именом."
 
-#: ../mail/mail.error.xml.h:82
+#: ../mail/mail.error.xml.h:85
 msgid "Are you sure you want to delete this account?"
 msgstr "Сигурно желите да обришете овај налог?"
 
-#: ../mail/mail.error.xml.h:83
+#: ../mail/mail.error.xml.h:86
 msgid "If you proceed, the account information will be deleted permanently."
 msgstr "Уколико наставите, подаци о налогу биће трајно обрисани."
 
-#: ../mail/mail.error.xml.h:84
+#: ../mail/mail.error.xml.h:87
 msgid "Are you sure you want to delete this account and all its proxies?"
 msgstr "Сигурно желите да обришете овај налог и све припадајуће елементе?"
 
-#: ../mail/mail.error.xml.h:85
+#: ../mail/mail.error.xml.h:88
 msgid ""
 "If you proceed, the account information and\n"
 "all proxy information will be deleted permanently."
@@ -15477,29 +18508,28 @@ msgstr ""
 "Уколико наставите, подаци о налогу и сви\n"
 "подаци посредника биће трајно обрисани."
 
-#: ../mail/mail.error.xml.h:87
+#: ../mail/mail.error.xml.h:90
 msgid ""
 "Are you sure you want to disable this account and delete all its proxies?"
 msgstr "Сигурно желите да искључите овај налог и обришете све посреднике?"
 
-#: ../mail/mail.error.xml.h:88
+#: ../mail/mail.error.xml.h:91
 msgid "If you proceed, all proxy accounts will be deleted permanently."
 msgstr "Ако наставите, сви налози посредника биће трајно уклоњени."
 
-#: ../mail/mail.error.xml.h:89
+#: ../mail/mail.error.xml.h:92
 msgid "Do _Not Disable"
 msgstr "Немој _искључити"
 
-#: ../mail/mail.error.xml.h:90
-#: ../plugins/publish-calendar/publish-calendar.c:655
+#: ../mail/mail.error.xml.h:93
 msgid "_Disable"
 msgstr "_Искључи"
 
-#: ../mail/mail.error.xml.h:91
+#: ../mail/mail.error.xml.h:94
 msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgstr "Не могу да уредим фасциклу претраге „{0}“ јер не постоји."
 
-#: ../mail/mail.error.xml.h:92
+#: ../mail/mail.error.xml.h:95
 msgid ""
 "This folder may have been added implicitly,\n"
 "go to the Search Folder editor to add it explicitly, if required."
@@ -15507,39 +18537,39 @@ msgstr ""
 "Ова фасцикла је можда посредно додата,\n"
 "идите у уређивач фасцикле претраге и додајте је изричито, ако желите."
 
-#: ../mail/mail.error.xml.h:94
+#: ../mail/mail.error.xml.h:97
 msgid "Cannot add Search Folder \"{0}\"."
 msgstr "Не могу да додам фасциклу претраге „{0}“."
 
-#: ../mail/mail.error.xml.h:95
+#: ../mail/mail.error.xml.h:98
 msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgstr "Фасцикла са именом „{0}“ већ постоји. Доделите јој неки други назив."
 
-#: ../mail/mail.error.xml.h:96
+#: ../mail/mail.error.xml.h:99
 msgid "Search Folders automatically updated."
 msgstr "Фасцикле претраге су аутоматски ажуриране."
 
-#: ../mail/mail.error.xml.h:97
+#: ../mail/mail.error.xml.h:100
 msgid "Mail filters automatically updated."
 msgstr "Пропусници поште су аутоматски ажурирани."
 
-#: ../mail/mail.error.xml.h:98
+#: ../mail/mail.error.xml.h:101
 msgid "Missing folder."
 msgstr "Недостајућа фасцикла."
 
-#: ../mail/mail.error.xml.h:99
+#: ../mail/mail.error.xml.h:102
 msgid "You must specify a folder."
 msgstr "Морате да наведете фасциклу."
 
-#: ../mail/mail.error.xml.h:101
+#: ../mail/mail.error.xml.h:104
 msgid "You must name this Search Folder."
 msgstr "Морате да дате назив овој фасцикли претраге."
 
-#: ../mail/mail.error.xml.h:102
+#: ../mail/mail.error.xml.h:105
 msgid "No folder selected."
 msgstr "Није изабрана ниједна фасцикла."
 
-#: ../mail/mail.error.xml.h:103
+#: ../mail/mail.error.xml.h:106
 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 +18579,11 @@ msgstr ""
 "Било да појединачно изаберете фасцикле, и/или да изаберете све локалне "
 "фасцикле, све мрежне фасцикле или и једне и друге."
 
-#: ../mail/mail.error.xml.h:105
+#: ../mail/mail.error.xml.h:108
 msgid "Problem migrating old mail folder \"{0}\"."
 msgstr "Проблем при преносу старе фасцикле поште „{0}“."
 
-#: ../mail/mail.error.xml.h:106
+#: ../mail/mail.error.xml.h:109
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
 "\n"
@@ -15565,23 +18595,19 @@ msgstr ""
 "Можете или да игноришете ову фасциклу, да је препишете или да допуните њен "
 "садржај, или да изађете."
 
-#: ../mail/mail.error.xml.h:109
-msgid "Ignore"
-msgstr "Занемари"
-
-#: ../mail/mail.error.xml.h:110
+#: ../mail/mail.error.xml.h:113
 msgid "_Overwrite"
 msgstr "_Препиши"
 
-#: ../mail/mail.error.xml.h:111
+#: ../mail/mail.error.xml.h:114
 msgid "_Append"
 msgstr "_Прикачи"
 
-#: ../mail/mail.error.xml.h:112
+#: ../mail/mail.error.xml.h:115
 msgid "Evolution's local mail format has changed."
 msgstr "Еволуцијин локални формат поште је промењен."
 
-#: ../mail/mail.error.xml.h:113
+#: ../mail/mail.error.xml.h:116
 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 +18625,19 @@ msgstr ""
 "избришете налог након успешног пресељавања података. Уверите се да има "
 "довољно простора на диску уколико одлучите да их преселите сада."
 
-#: ../mail/mail.error.xml.h:116
+#: ../mail/mail.error.xml.h:119
 msgid "_Exit Evolution"
 msgstr "_Изађи из Еволуције"
 
-#: ../mail/mail.error.xml.h:117
+#: ../mail/mail.error.xml.h:120
 msgid "_Migrate Now"
 msgstr "П_ресели сада"
 
-#: ../mail/mail.error.xml.h:118
+#: ../mail/mail.error.xml.h:121
 msgid "Unable to read license file."
 msgstr "Не могу да прочитам датотеку лиценце."
 
-#: ../mail/mail.error.xml.h:119
+#: ../mail/mail.error.xml.h:122
 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 +18645,27 @@ msgstr ""
 "Не могу да прочитам датотеку лиценце „{0}“, због проблема са инсталацијом. "
 "Нећете моћи да користите овог достављача док не прихватите лиценцу."
 
-#: ../mail/mail.error.xml.h:120
+#: ../mail/mail.error.xml.h:123
 msgid "Please wait."
 msgstr "Сачекајте."
 
-#: ../mail/mail.error.xml.h:121
+#: ../mail/mail.error.xml.h:124
 msgid "Querying server for a list of supported authentication mechanisms."
 msgstr ""
 "Слање упита серверу за листу подржаних механизама потврђивања идентитета."
 
-#: ../mail/mail.error.xml.h:122
+#: ../mail/mail.error.xml.h:125
 msgid ""
 "Failed to query server for a list of supported authentication mechanisms."
 msgstr ""
-"Нисам успео да пропитам сервер за списак подржаних механизама потврђивања "
+"Не могу да пропитам сервер за списак подржаних механизама потврђивања "
 "идентитета."
 
-#: ../mail/mail.error.xml.h:123
+#: ../mail/mail.error.xml.h:126
 msgid "Synchronize folders locally for offline usage?"
 msgstr "Ускладити фасцикле локално за рад ван мреже?"
 
-#: ../mail/mail.error.xml.h:124
+#: ../mail/mail.error.xml.h:127
 msgid ""
 "Do you want to locally synchronize the folders that are marked for offline "
 "usage?"
@@ -15647,27 +18673,27 @@ msgstr ""
 "Желите ли локално да ускладите фасцикле које су означене за коришћење ван "
 "мреже?"
 
-#: ../mail/mail.error.xml.h:125
+#: ../mail/mail.error.xml.h:128
 msgid "Do _Not Synchronize"
 msgstr "_Не усклађуј"
 
-#: ../mail/mail.error.xml.h:126
+#: ../mail/mail.error.xml.h:129
 msgid "_Synchronize"
 msgstr "_Усклади"
 
-#: ../mail/mail.error.xml.h:127
+#: ../mail/mail.error.xml.h:130
 msgid "Do you want to mark all messages as read?"
 msgstr "Да ли желите да све поруке означите прочитаним?"
 
-#: ../mail/mail.error.xml.h:128
+#: ../mail/mail.error.xml.h:131
 msgid "This will mark all messages as read in the selected folder."
 msgstr "Ово означава све поруке као прочитане у изабраној фасцикли."
 
-#: ../mail/mail.error.xml.h:129
+#: ../mail/mail.error.xml.h:132
 msgid "Also mark messages in subfolders?"
 msgstr "Да означим такође и поруке у подфасциклама?"
 
-#: ../mail/mail.error.xml.h:130
+#: ../mail/mail.error.xml.h:133
 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 +18701,195 @@ msgstr ""
 "Желите ли да означите поруке као прочитане само у тренутној фасцикли, или и "
 "оне у подфасциклама?"
 
-#: ../mail/mail.error.xml.h:131
+#: ../mail/mail.error.xml.h:134
 msgid "In Current Folder and _Subfolders"
 msgstr "У тренутној фасцикли и _подфасциклама"
 
 # bug: requires a comment on usage
-#: ../mail/mail.error.xml.h:132
+#: ../mail/mail.error.xml.h:135
 msgid "In Current _Folder Only"
 msgstr "Само у тренутној _фасцикли"
 
-#: ../mail/mail.error.xml.h:133
+#: ../mail/mail.error.xml.h:136
 msgid "Should Evolution close this window when replying or forwarding?"
 msgstr ""
 "Треба ли Еволуција да затвори овај прозор када одговара или прослеђује?"
 
-#: ../mail/mail.error.xml.h:134
+#: ../mail/mail.error.xml.h:137
 msgid "_Yes, Always"
 msgstr "_Да, увек"
 
-#: ../mail/mail.error.xml.h:135
+#: ../mail/mail.error.xml.h:138
 msgid "_No, Never"
 msgstr "_Не, никада"
 
-#: ../mail/mail.error.xml.h:136
+#: ../mail/mail.error.xml.h:139
 msgid "Copy folder in folder tree."
 msgstr "Умножите фасциклу у стабло фасцикли."
 
-#: ../mail/mail.error.xml.h:137
+#: ../mail/mail.error.xml.h:140
 msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr ""
 "Да ли сте сигурни да желите да умножите фасциклу „{0}“ у фасциклу „{1}“?"
 
-#: ../mail/mail.error.xml.h:140
-msgid "_Always"
-msgstr "_Увек"
+#: ../mail/mail.error.xml.h:142
+#| msgid "Do _not Send"
+msgid "Do _not copy"
+msgstr "Н_е умножавај"
 
-#: ../mail/mail.error.xml.h:141
-msgid "N_ever"
-msgstr "_Никада"
+#: ../mail/mail.error.xml.h:143
+#| msgid "_Always"
+msgid "_Always copy"
+msgstr "_Увек умножи"
 
-#: ../mail/mail.error.xml.h:142
+#: ../mail/mail.error.xml.h:144
+#| msgid "N_ever"
+msgid "N_ever copy"
+msgstr "_Никад не умножавај"
+
+#: ../mail/mail.error.xml.h:145
 msgid "Move folder in folder tree."
 msgstr "Преместите фасциклу у стабло фасцикли."
 
-#: ../mail/mail.error.xml.h:143
+#: ../mail/mail.error.xml.h:146
 msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgstr ""
 "Да ли сте сигурни да желите да преместите фасциклу „{0}“ у фасциклу „{1}“?"
 
-#: ../mail/mail.error.xml.h:144
+#: ../mail/mail.error.xml.h:148
+#| msgid "Do _not Send"
+msgid "Do _not move"
+msgstr "Н_е премештај"
+
+#: ../mail/mail.error.xml.h:149
+#| msgid "_Always"
+msgid "_Always move"
+msgstr "_Увек премести"
+
+#: ../mail/mail.error.xml.h:150
+#| msgid "N_ever"
+msgid "N_ever move"
+msgstr "_Никад не премештај"
+
+#: ../mail/mail.error.xml.h:151
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "Ова порука се не може послати пошто је искључен налог са којег шаљете"
 
-#: ../mail/mail.error.xml.h:145
+#: ../mail/mail.error.xml.h:152
 msgid "Please enable the account or send using another account."
 msgstr "Омогућите налог или пошаљите користећи други налог."
 
-#: ../mail/mail.error.xml.h:146
+#: ../mail/mail.error.xml.h:153
 msgid "Mail Deletion Failed"
 msgstr "Неуспешно брисање поште"
 
-#: ../mail/mail.error.xml.h:147
+#: ../mail/mail.error.xml.h:154
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Немате довољна овлашћења да обришете ову пошту."
 
-#: ../mail/mail.error.xml.h:148
+#: ../mail/mail.error.xml.h:155
 msgid "\"Check Junk\" Failed"
 msgstr "Провера ђубрета није успела"
 
-#: ../mail/mail.error.xml.h:149
+#: ../mail/mail.error.xml.h:156
 msgid "\"Report Junk\" Failed"
 msgstr "Извештај за ђубре није успео"
 
-#: ../mail/mail.error.xml.h:150
+#: ../mail/mail.error.xml.h:157
 msgid "\"Report Not Junk\" Failed"
 msgstr "Извештавање да није ђубре није успело"
 
-#: ../mail/mail.error.xml.h:151
+#: ../mail/mail.error.xml.h:158
 msgid "Remove duplicate messages?"
 msgstr "Да уклоним дуплиране поруке?"
 
-#: ../mail/mail.error.xml.h:152
+#: ../mail/mail.error.xml.h:159
 msgid "No duplicate messages found."
 msgstr "Нису пронађене дупле поруке."
 
 #. Translators: {0} is replaced with a folder name
-#: ../mail/mail.error.xml.h:154
+#: ../mail/mail.error.xml.h:161
 msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "Фасцикла „{0}“ не садржи никакве дупле поруке."
 
-#: ../mail/mail.error.xml.h:155
+#: ../mail/mail.error.xml.h:162
+#| msgid "Failed to disconnect account &quot;{0}&quot;."
+msgid "Failed to connect account &quot;{0}&quot;."
+msgstr "Не могу да се повежем на налог „{0}“."
+
+#: ../mail/mail.error.xml.h:163
 msgid "Failed to disconnect account &quot;{0}&quot;."
-msgstr "Нисам успео да прекинем везу са налогом „{0}“."
+msgstr "Не могу да прекинем везу са налогом „{0}“."
 
-#: ../mail/mail.error.xml.h:157
+#: ../mail/mail.error.xml.h:164
 msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
-msgstr "Нисам успео да се одјавим са фасцикле „{0}“."
+msgstr "Не могу да се одјавим са фасцикле „{0}“."
 
-#: ../mail/mail.error.xml.h:158
+#: ../mail/mail.error.xml.h:165
 msgid "Unable to retrieve message."
 msgstr "Не могу да довучем поруку."
 
-#: ../mail/mail.error.xml.h:159
+#: ../mail/mail.error.xml.h:166
 msgid "{0}"
 msgstr "{0}"
 
-#: ../mail/mail.error.xml.h:160
+#: ../mail/mail.error.xml.h:167
+#| msgid "Send mail also when in offline _mode"
+msgid "Message is not available in offline mode."
+msgstr "Порука није доступна у режиму ван мреже."
+
+#: ../mail/mail.error.xml.h:168
+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 ""
+"Ово вероватно значи да порука није преузета у потпуности. Можда је фасцикла "
+"или налог у режиму за рад ван мреже. Уколико је то случај, након што се "
+"повежете на мрежу, изаберите ову фасциклу и идите на Датотека-&gt;Преузми "
+"поруке за рад ван мреже. Тако ћете преузети све поруке и моћи да их читате и "
+"када нисте при интернету."
+
+#: ../mail/mail.error.xml.h:169
 msgid "Failed to open folder."
-msgstr "Нисам успео да отворим фасциклу."
+msgstr "Не могу да отворим фасциклу."
 
 # bug: plural-forms
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:171
 msgid "Failed to find duplicate messages."
-msgstr "Нисам успео да пронађем дуплиране поруке."
+msgstr "Не могу да пронађем дуплиране поруке."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:172
 msgid "Failed to retrieve messages."
-msgstr "Нисам успео да довучем поруке."
+msgstr "Не могу да довучем поруке."
 
 # bug: plural-forms
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:173
 msgid "Failed to mark messages as read."
-msgstr "Нисам успео да означим поруке прочитаним."
+msgstr "Не могу да означим поруке прочитаним."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:174
 msgid "Failed to remove attachments from messages."
-msgstr "Нисам успео да уклоним прилоге из порука."
+msgstr "Не могу да уклоним прилоге из порука."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:175
 msgid "Failed to download messages for offline viewing."
-msgstr "Нисам успео да преузмем поруке за прегледање ван мреже."
+msgstr "Не могу да преузмем поруке за прегледање ван мреже."
 
 # bug: plural-forms
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:176
 msgid "Failed to save messages to disk."
-msgstr "Нисам успео да сачувам поруке на диск."
+msgstr "Не могу да сачувам поруке на диск."
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:177
 msgid "Hidden file is attached."
 msgstr "Скривена датотека је приложена."
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:178
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -15825,51 +18897,113 @@ msgstr ""
 "Прилог под називом {0} је скривена датотека и може да садржи осетљиве "
 "податке. Прегледајте је пре него ли је пошаљете."
 
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:179
 msgid "Printing failed."
 msgstr "Штампање није успело."
 
-#: ../mail/mail.error.xml.h:170
+#: ../mail/mail.error.xml.h:180
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "Штампач је одговорио „{0}“."
 
-#: ../mail/mail.error.xml.h:171
+#: ../mail/mail.error.xml.h:181
 msgid "Could not perform this operation on {0}."
 msgstr "Не могу да извршим ову радњу над „{0}“."
 
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:182
 msgid "You must be working online to complete this operation."
 msgstr "Морате да будете на мрежи да бисте завршили ову радњу."
 
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:183
 msgid "Message from &quot;{0}&quot; account:"
 msgstr "Порука са „{0}“ налога:"
 
-#: ../mail/mail-send-recv.c:188
+#: ../mail/mail.error.xml.h:184
+#| msgid "Failed to move an event into the calendar '{0}'"
+msgid "Failed to mark thread to be ignored in folder '{0}'"
+msgstr "Не могу да означим расправу као занемарену унутар фасцикле „{0}“"
+
+#: ../mail/mail.error.xml.h:185
+msgid "Failed to unmark thread from being ignored in folder '{0}'"
+msgstr "Не могу да означим расправу као незанемарену унутар фасцикле „{0}“"
+
+#: ../mail/mail.error.xml.h:186
+msgid "Failed to mark subthread to be ignored in folder '{0}'"
+msgstr "Не могу да означим подрасправу као занемарену унутар фасцикле „{0}“"
+
+#: ../mail/mail.error.xml.h:187
+msgid "Failed to unmark subthread from being ignored in folder '{0}'"
+msgstr "Не могу да означим подрасправу као незанемарену унутар фасцикле „{0}“"
+
+#: ../mail/mail.error.xml.h:188
+msgid "Remote content download had been blocked for this message."
+msgstr "Преузимање удаљеног садржаја је забрањено за ову поруку."
+
+#: ../mail/mail.error.xml.h:189
+msgid ""
+"You can download remote content manually, or set to remember to download "
+"remote content for this sender or used sites."
+msgstr ""
+"Можете преузети удаљени садржај руно или подесити да се садржај аутоматски "
+"преузима са овог сајта или од овог пошиљаоца."
+
+#. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
+#: ../mail/mail.error.xml.h:191
+#| msgid " (Completed "
+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
+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
+msgid "Overdue: {0} by {1}"
+msgstr "Завршен: {0} до {1}"
+
+#: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
 msgstr "Отказујем..."
 
-#: ../mail/mail-send-recv.c:526
+#: ../mail/mail-send-recv.c:636
 msgid "Send & Receive Mail"
 msgstr "Слање и примање поште"
 
-#: ../mail/mail-send-recv.c:542
+#: ../mail/mail-send-recv.c:650
 msgid "Cancel _All"
 msgstr "Откажи _све"
 
-#: ../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 "Освежавам..."
 
-#: ../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 "Чекам..."
 
-#: ../mail/mail-send-recv.c:997
+#: ../mail/mail-send-recv.c:1225
 #, c-format
 msgid "Checking for new mail at '%s'"
 msgstr "Вршим проверу за новом поштом на „%s“"
 
+#: ../mail/mail-send-recv.c:1452
+#, c-format
+msgid "Deleting junk and expunging trash at '%s'"
+msgstr "Бришем непожељно и избацујем смеће из „%s“"
+
+#: ../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“"
+
 #: ../mail/mail-vfolder-ui.c:66
 msgid "Search Folders"
 msgstr "Фасцикле претраге"
@@ -15882,86 +19016,86 @@ msgstr "Уреди фасциклу претраге"
 msgid "New Search Folder"
 msgstr "Нова фасцикла претраге"
 
-#: ../mail/message-list.c:287
+#: ../mail/message-list.c:291
 msgid "Unseen"
 msgstr "Невиђено"
 
-#: ../mail/message-list.c:288
+#: ../mail/message-list.c:292
 msgid "Seen"
 msgstr "Виђено"
 
-#: ../mail/message-list.c:289
+#: ../mail/message-list.c:293
 msgid "Answered"
 msgstr "Одговорено"
 
-#: ../mail/message-list.c:290
+#: ../mail/message-list.c:294
 msgid "Forwarded"
 msgstr "Прослеђено"
 
-#: ../mail/message-list.c:291
+#: ../mail/message-list.c:295
 msgid "Multiple Unseen Messages"
 msgstr "Вишеструке невиђене поруке"
 
-#: ../mail/message-list.c:292
+#: ../mail/message-list.c:296
 msgid "Multiple Messages"
 msgstr "Вишеструке поруке"
 
-#: ../mail/message-list.c:305
+#: ../mail/message-list.c:309
 msgid "Lowest"
 msgstr "Најниже"
 
-#: ../mail/message-list.c:306
+#: ../mail/message-list.c:310
 msgid "Lower"
 msgstr "Ниже"
 
-#: ../mail/message-list.c:310
+#: ../mail/message-list.c:314
 msgid "Higher"
 msgstr "Више"
 
-#: ../mail/message-list.c:311
+#: ../mail/message-list.c:315
 msgid "Highest"
 msgstr "Највише"
 
-#: ../mail/message-list.c:455 ../mail/message-list.c:5749
+#: ../mail/message-list.c:459 ../mail/message-list.c:6034
 msgid "Generating message list"
 msgstr "Прављење листе порука"
 
 #. 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:2041 ../modules/itip-formatter/itip-view.c:235
 msgid "Today %l:%M %p"
 msgstr "Данас у %l:%M %p"
 
-#: ../mail/message-list.c:1869
+#: ../mail/message-list.c:2050
 msgid "Yesterday %l:%M %p"
 msgstr "Јуче у %l:%M %p"
 
-#: ../mail/message-list.c:1881
+#: ../mail/message-list.c:2062
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1889
+#: ../mail/message-list.c:2070
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1891
+#: ../mail/message-list.c:2072
 msgid "%b %d %Y"
 msgstr "%d. %b %Y."
 
-#: ../mail/message-list.c:2771
+#: ../mail/message-list.c:2957
 msgid "Select all visible messages"
 msgstr "Изабери све видљиве поруке"
 
-#: ../mail/message-list.c:3399 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3622 ../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:4706
+#: ../mail/message-list.c:4978
 msgid "Follow-up"
 msgstr "Следи"
 
-#: ../mail/message-list.c:5687
+#: ../mail/message-list.c:5971
 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 +19107,7 @@ msgstr ""
 "покрените нову претрагу било чишћењем исте помоћу ставке изборника „Претрага—"
 ">Очисти“ или изменивши горњи упит."
 
-#: ../mail/message-list.c:5695
+#: ../mail/message-list.c:5979
 msgid "There are no messages in this folder."
 msgstr "Нема порука у овој фасцикли."
 
@@ -16005,38 +19139,48 @@ msgstr "Поруке"
 msgid "Subject - Trimmed"
 msgstr "Наслов — скраћено"
 
-#: ../mail/searchtypes.xml.h:1
+#: ../mail/searchtypes.xml.in.h:23 ../mail/vfoldertypes.xml.in.h:23
+msgid "Any header"
+msgstr "Било које заглавље"
+
+#: ../mail/searchtypes.xml.in.h:54
 msgid "Subject or Addresses contains"
 msgstr "Наслов или адресе садрже"
 
-#: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:2002
+#: ../mail/searchtypes.xml.in.h:55
+#: ../modules/mail/e-mail-shell-view-actions.c:2136
 msgid "Recipients contain"
 msgstr "Примаоци садрже"
 
-#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1995
+#: ../mail/searchtypes.xml.in.h:56
+#: ../modules/mail/e-mail-shell-view-actions.c:2129
 msgid "Message contains"
 msgstr "Порука садржи"
 
-#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:2016
+#: ../mail/searchtypes.xml.in.h:57
+#: ../modules/mail/e-mail-shell-view-actions.c:2150
 msgid "Subject contains"
 msgstr "Наслов садржи"
 
-#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:2009
+#: ../mail/searchtypes.xml.in.h:58
+#: ../modules/mail/e-mail-shell-view-actions.c:2143
 msgid "Sender contains"
 msgstr "Пошиљалац садржи"
 
-#: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1988
+#: ../mail/searchtypes.xml.in.h:59
+#: ../modules/mail/e-mail-shell-view-actions.c:2115
 msgid "Body contains"
 msgstr "Тело садржи"
 
+#: ../mail/searchtypes.xml.in.h:60
+#: ../modules/mail/e-mail-shell-view-actions.c:2122
+#| msgid "Expression"
+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:1212
+#: ../modules/mail/em-mailer-prefs.c:1552
 msgid "_Table column:"
 msgstr "Колона _табеле:"
 
@@ -16087,7 +19231,7 @@ msgid "_Contact"
 msgstr "_Контакт"
 
 #: ../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:1023
 msgid "Create a new contact"
 msgstr "Направите нови контакт"
 
@@ -16097,7 +19241,7 @@ msgid "Contact _List"
 msgstr "Ли_ста контакта"
 
 #: ../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:1030
 msgid "Create a new contact list"
 msgstr "Направите нови списак контакта"
 
@@ -16107,277 +19251,273 @@ msgid "Address _Book"
 msgstr "_Адресар"
 
 #: ../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:946
 msgid "Create a new address book"
 msgstr "Направите нови адресар"
 
-#: ../modules/addressbook/e-book-shell-backend.c:314
-msgid "Certificates"
-msgstr "Уверења"
-
 #: ../modules/addressbook/e-book-shell-view-actions.c:197
 msgid "Address Book Properties"
 msgstr "Поставке адресара"
 
 #. 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:520
+#: ../modules/addressbook/e-book-shell-view-actions.c:816
 msgid "Save as vCard"
 msgstr "Сачувајте као вКарту"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:878
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
 msgid "Co_py All Contacts To..."
 msgstr "Умножи _све контакте у..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/addressbook/e-book-shell-view-actions.c:925
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Умножите контакте изабраног адресара у други"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:885
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "D_elete Address Book"
 msgstr "О_бриши адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/addressbook/e-book-shell-view-actions.c:932
 msgid "Delete the selected address book"
 msgstr "Обришите изабрани адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:892
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Mo_ve All Contacts To..."
 msgstr "Премести _све контакте у..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
+#: ../modules/addressbook/e-book-shell-view-actions.c:939
 msgid "Move the contacts of the selected address book to another"
 msgstr "Преместите контакте изабраног адресара у други"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:899
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "_New Address Book"
 msgstr "_Нови адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:906
+#: ../modules/addressbook/e-book-shell-view-actions.c:951
 msgid "Address _Book Properties"
 msgstr "Подешавања адреса_ра"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "Show properties of the selected address book"
 msgstr "Прикажите својства изабраног адресара"
 
-#: ../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: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
 msgid "Re_fresh"
 msgstr "О_свежи"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "Refresh the selected address book"
 msgstr "Освежите изабрани адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:920
+#: ../modules/addressbook/e-book-shell-view-actions.c:965
 msgid "Address Book _Map"
 msgstr "_Мапа адресара"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:922
+#: ../modules/addressbook/e-book-shell-view-actions.c:967
 msgid "Show map with all contacts from selected address book"
 msgstr "Прикажите мапу са свим контактима из изабраних адресара"
 
-#: ../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: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/mail/e-mail-shell-view-actions.c:1730
 msgid "_Rename..."
 msgstr "_Преименуј..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:929
+#: ../modules/addressbook/e-book-shell-view-actions.c:974
 msgid "Rename the selected address book"
 msgstr "Преименујте изабрани адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:936
+#: ../modules/addressbook/e-book-shell-view-actions.c:981
 msgid "Stop loading"
 msgstr "Прекини учитавање"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:986
 msgid "_Copy Contact To..."
 msgstr "_Умножи контакт у..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:943
+#: ../modules/addressbook/e-book-shell-view-actions.c:988
 msgid "Copy selected contacts to another address book"
 msgstr "Умножите изабране контакте у други адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:948
+#: ../modules/addressbook/e-book-shell-view-actions.c:993
 msgid "_Delete Contact"
 msgstr "_Уклони Контакт"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:955
+#: ../modules/addressbook/e-book-shell-view-actions.c:1000
 msgid "_Find in Contact..."
 msgstr "_Пронађи у контакту..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:1002
 msgid "Search for text in the displayed contact"
 msgstr "Претражите текст у приказаном контакту"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:962
+#: ../modules/addressbook/e-book-shell-view-actions.c:1007
 msgid "_Forward Contact..."
 msgstr "_Проследи контакт..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:964
+#: ../modules/addressbook/e-book-shell-view-actions.c:1009
 msgid "Send selected contacts to another person"
 msgstr "Пошаљите изабране контакте другој особи"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:969
+#: ../modules/addressbook/e-book-shell-view-actions.c:1014
 msgid "_Move Contact To..."
 msgstr "_Премести контакт у..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:971
+#: ../modules/addressbook/e-book-shell-view-actions.c:1016
 msgid "Move selected contacts to another address book"
 msgstr "Преместите изабране контакте у други адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:976
+#: ../modules/addressbook/e-book-shell-view-actions.c:1021
 msgid "_New Contact..."
 msgstr "Нови кон_такт..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:983
+#: ../modules/addressbook/e-book-shell-view-actions.c:1028
 msgid "New Contact _List..."
 msgstr "Нова _листа контакта..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:990
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
 msgid "_Open Contact"
 msgstr "_Отвори контакт"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:992
+#: ../modules/addressbook/e-book-shell-view-actions.c:1037
 msgid "View the current contact"
 msgstr "Прегледајте текући контакт"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:997
+#: ../modules/addressbook/e-book-shell-view-actions.c:1042
 msgid "_Send Message to Contact..."
 msgstr "_Пошаљи поруку контакту..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:999
+#: ../modules/addressbook/e-book-shell-view-actions.c:1044
 msgid "Send a message to the selected contacts"
 msgstr "Пошаљите поруку изабраним контактима"
 
-#: ../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:1051
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "_Actions"
 msgstr "_Радње"
 
-#: ../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:1058
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-task-shell-view-actions.c:775
+#: ../modules/mail/e-mail-shell-view-actions.c:1902
 msgid "_Preview"
 msgstr "_Преглед"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1034
+#: ../modules/addressbook/e-book-shell-view-actions.c:1079
 msgid "Address Book Map"
 msgstr "Мапа адресара"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1066
+#: ../modules/addressbook/e-book-shell-view-actions.c:1111
 msgid "Contact _Preview"
 msgstr "Пре_глед контакта"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1068
+#: ../modules/addressbook/e-book-shell-view-actions.c:1113
 msgid "Show contact preview window"
 msgstr "Прикажите прозор за преглед контакта"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1074
+#: ../modules/addressbook/e-book-shell-view-actions.c:1119
 msgid "Show _Maps"
 msgstr "Прикажи _мапе"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1076
+#: ../modules/addressbook/e-book-shell-view-actions.c:1121
 msgid "Show maps in contact preview window"
 msgstr "Прикажите мапе у прозору за преглед контаката"
 
-#: ../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: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
 msgid "_Classic View"
 msgstr "_Класични приказ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1097
+#: ../modules/addressbook/e-book-shell-view-actions.c:1142
 msgid "Show contact preview below the contact list"
 msgstr "Прикажите преглед контакта испод контакт листе"
 
-#: ../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: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
 msgid "_Vertical View"
 msgstr "_Усправни преглед"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1104
+#: ../modules/addressbook/e-book-shell-view-actions.c:1149
 msgid "Show contact preview alongside the contact list"
 msgstr "Прикажите преглед контакта поред контакт листе"
 
-#: ../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: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
 msgid "Unmatched"
 msgstr "Не одговара"
 
-#: ../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: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
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Напредна претрага"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1162
+#: ../modules/addressbook/e-book-shell-view-actions.c:1207
 msgid "Print all shown contacts"
 msgstr "Штампај све приказане контакте"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1169
+#: ../modules/addressbook/e-book-shell-view-actions.c:1214
 msgid "Preview the contacts to be printed"
 msgstr "Преглед контаката пред штампу"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1176
+#: ../modules/addressbook/e-book-shell-view-actions.c:1221
 msgid "Print selected contacts"
 msgstr "Штампа изабране контакте"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1191
+#: ../modules/addressbook/e-book-shell-view-actions.c:1236
 msgid "S_ave Address Book as vCard"
 msgstr "_Сачувај адресар као вКарту"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1193
+#: ../modules/addressbook/e-book-shell-view-actions.c:1238
 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:1199
-#: ../modules/addressbook/e-book-shell-view-actions.c:1209
+#: ../modules/addressbook/e-book-shell-view-actions.c:1244
+#: ../modules/addressbook/e-book-shell-view-actions.c:1254
 msgid "_Save as vCard..."
 msgstr "_Сачувај као вКарту..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1201
+#: ../modules/addressbook/e-book-shell-view-actions.c:1246
 msgid "Save selected contacts as a vCard"
 msgstr "Сачувај изабране контакте као ВКарту"
 
-#: ../modules/addressbook/e-book-shell-view.c:311
+#: ../modules/addressbook/e-book-shell-view.c:313
 msgid "_Forward Contacts"
 msgstr "Проследи конт_акте"
 
-#: ../modules/addressbook/e-book-shell-view.c:313
+#: ../modules/addressbook/e-book-shell-view.c:315
 msgid "_Forward Contact"
 msgstr "Просле_ди контакт"
 
-#: ../modules/addressbook/e-book-shell-view.c:344
+#: ../modules/addressbook/e-book-shell-view.c:346
 msgid "_Send Message to Contacts"
 msgstr "_Пошаљи поруку контактима"
 
-#: ../modules/addressbook/e-book-shell-view.c:346
+#: ../modules/addressbook/e-book-shell-view.c:348
 msgid "_Send Message to List"
 msgstr "_Пошаљи поруку на листу"
 
-#: ../modules/addressbook/e-book-shell-view.c:348
+#: ../modules/addressbook/e-book-shell-view.c:350
 msgid "_Send Message to Contact"
 msgstr "_Пошаљи поруку контакту"
 
-#: ../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 +19527,162 @@ msgstr ""
 "\n"
 "То ће повратити све ваше личне податке, подешавања пропусника поште, итд."
 
-#: ../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 "_Врати из датотеке резерве:"
 
-#: ../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 "Изаберите датотеку резерве за повраћај"
 
 #. 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 "Врати из резерве"
 
-#: ../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 "Изаберите назив за датотеку резерве Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:249
+#: ../modules/backup-restore/evolution-backup-restore.c:250
 msgid "_Restart Evolution after backup"
 msgstr "_Поново покрени Еволуцију након прављења резерве"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:276
+#: ../modules/backup-restore/evolution-backup-restore.c:285
+#| msgid "_Restart Evolution after restore"
+msgid "Re_start Evolution after restore"
+msgstr "_Поново покрени Еволуцију након повраћаја"
+
+#: ../modules/backup-restore/evolution-backup-restore.c:327
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Изаберите назив датотеке резерве Еволуције за повраћај"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:289
-msgid "_Restart Evolution after restore"
-msgstr "_Поново покрени Еволуцију након повраћаја"
+#: ../modules/backup-restore/evolution-backup-restore.c:336
+#, c-format
+msgid "Checking content of backup file '%s', please wait..."
+msgstr "Проверавам садржај резервне датотеке „%s“..."
 
-#: ../modules/backup-restore/evolution-backup-restore.c:307
+#: ../modules/backup-restore/evolution-backup-restore.c:357
 msgid "_Back up Evolution Data..."
 msgstr "Направи _резерву података Еволуције..."
 
-#: ../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 "Направите резерву података и поставки Еволуције у архиву"
 
 # 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 "_Врати податке Еволуције..."
 
-#: ../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 "Вратите податке и поставке Еволуције из архиве"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:83
+#: ../modules/backup-restore/evolution-backup-tool.c:75
 msgid "Back up Evolution directory"
 msgstr "Директоријум за резерву Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:85
+#: ../modules/backup-restore/evolution-backup-tool.c:77
 msgid "Restore Evolution directory"
 msgstr "Директоријум за повраћај Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:87
+#: ../modules/backup-restore/evolution-backup-tool.c:79
 msgid "Check Evolution Back up"
 msgstr "Провери резерву Еволуције"
 
 # shell:noshell-reason title
-#: ../modules/backup-restore/evolution-backup-tool.c:89
+#: ../modules/backup-restore/evolution-backup-tool.c:81
 msgid "Restart Evolution"
 msgstr "Поново покреће Еволуцију"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:91
+#: ../modules/backup-restore/evolution-backup-tool.c:83
 msgid "With Graphical User Interface"
 msgstr "Са графичким окружењем"
 
 #. 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 "Гашење Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:330
+#: ../modules/backup-restore/evolution-backup-tool.c:290
 msgid "Backing Evolution accounts and settings"
 msgstr "Израдите резервну копију налога и поставке Еволуције"
 
-#: ../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 ""
 "Израда резервне копије података Еволуције (пошта, календари, задаци, белешке)"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:363
+#: ../modules/backup-restore/evolution-backup-tool.c:323
 msgid "Back up complete"
 msgstr "Израда резервне копије је завршена"
 
 # 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 "Поновно покретање Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:521
+#: ../modules/backup-restore/evolution-backup-tool.c:491
 msgid "Back up current Evolution data"
 msgstr "Направите резерву тренутних података Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:528
+#: ../modules/backup-restore/evolution-backup-tool.c:498
 msgid "Extracting files from back up"
 msgstr "Извлачим датотеке из резервне копије"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:610
+#: ../modules/backup-restore/evolution-backup-tool.c:580
 msgid "Loading Evolution settings"
 msgstr "Учитавам подешавања Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:676
+#: ../modules/backup-restore/evolution-backup-tool.c:650
 msgid "Removing temporary back up files"
 msgstr "Уклањање привремених резервних датотека"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:687
+#: ../modules/backup-restore/evolution-backup-tool.c:664
 msgid "Reloading registry service"
 msgstr "Поново учитавам услугу завођења"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:916
+#: ../modules/backup-restore/evolution-backup-tool.c:866
 msgid "Evolution Back Up"
 msgstr "Резервни примерак Еволуције"
 
-#: ../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 "Смештам резервни примерак у фасциклу „%s“"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:921
+#: ../modules/backup-restore/evolution-backup-tool.c:871
 msgid "Evolution Restore"
 msgstr "Повраћај Еволуције"
 
-#: ../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 "Враћам из фасцикле „%s“"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:991
+#: ../modules/backup-restore/evolution-backup-tool.c:941
 msgid "Backing up Evolution Data"
 msgstr "Израђује резервни примерак података Еволуције"
 
-#: ../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 "Сачекајте док Еволуција не направи резервни примерак података."
 
 # 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 "Повраћај података Еволуције"
 
-#: ../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 "Сачекајте док Еволуција не врати податке у првобитно стање."
 
-#: ../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 "Ово може потрајати, у зависности од количине података на налогу."
 
@@ -16545,8 +19691,9 @@ msgid "Invalid Evolution backup file"
 msgstr "Неисправна датотека резервног примерка Еволуције"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
-msgid "Please select a valid backup file to restore."
-msgstr "Изаберите исправну датотеку резерве за повраћај."
+#| msgid "Invalid Evolution backup file"
+msgid "File '{0}' is not a valid Evolution backup file."
+msgstr "„{0}“ није исправна резервна копија Еволуције."
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:3
 msgid "Are you sure you want to close Evolution?"
@@ -16562,8 +19709,9 @@ msgstr ""
 "него што наставите."
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Close and Back up Evolution"
-msgstr "Затворите и направите резерву Евојуције"
+#| msgid "Close and Back up Evolution"
+msgid "Close and _Back up Evolution"
+msgstr "Затвори и _направи резерву Евојуције"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid ""
@@ -16584,8 +19732,9 @@ msgstr ""
 
 # shell:noshell-reason title
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid "Close and Restore Evolution"
-msgstr "Затворите и вратите Еволуцију"
+#| msgid "Close and Restore Evolution"
+msgid "Close and _Restore Evolution"
+msgstr "Затвори и _врати резерву Еволуције"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
 msgid "Insufficient Permissions"
@@ -16595,92 +19744,98 @@ msgstr "Недовољна овлашћења"
 msgid "The selected folder is not writable."
 msgstr "У изабрану фасциклу се не може писати."
 
-#: ../modules/bogofilter/evolution-bogofilter.c:144
+#: ../modules/bogofilter/evolution-bogofilter.c:160
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
-msgstr "Нисам успео да изродим Богофилтер (%s): "
+msgstr "Не могу да изродим Богофилтер (%s): "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:162
+#: ../modules/bogofilter/evolution-bogofilter.c:178
 msgid "Failed to stream mail message content to Bogofilter: "
-msgstr "Нисам успео да упутим садржај поруке поште Богофилтеру: "
+msgstr "Не могу да упутим садржај поруке поште Богофилтеру: "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:211
+#: ../modules/bogofilter/evolution-bogofilter.c:227
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr "Или се Богофилтер урушио или није успео да анализира поруку поште"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:307
+#: ../modules/bogofilter/evolution-bogofilter.c:372
 msgid "Bogofilter Options"
 msgstr "Опције Богофилтера"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:316
+#: ../modules/bogofilter/evolution-bogofilter.c:381
 msgid "Convert message text to _Unicode"
 msgstr "Пребаци текст поруке у _Уникод"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:473
+#: ../modules/bogofilter/evolution-bogofilter.c:539
+#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
 msgid "Bogofilter"
 msgstr "Богофилтер"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
+#: ../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
 msgid "Standard LDAP Port"
 msgstr "Стандардни ЛДАП порт"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
+#: ../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:458
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
 msgid "Microsoft Global Catalog"
 msgstr "Мајкрософтов општи каталог"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:464
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
 msgid "Microsoft Global Catalog over SSL"
 msgstr "Мајкрософтов општи каталог преко ССЛ"
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:569
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:563
 msgid "Connecting to LDAP"
 msgstr "Повезујем се на ЛДАП"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:586
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:580
 msgid "Server Information"
 msgstr "Подаци сервера"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:613
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
 msgid "Port:"
 msgstr "Порт:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:627
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
 msgid "StartTLS (recommended)"
 msgstr "ПочетниТЛС (препоручено)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:629
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:623
 msgid "Encryption:"
 msgstr "Шифровање:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:653
+#: ../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:179
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:195
 msgid "Authentication"
 msgstr "Потврђивање идентитета"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:670
 msgid "Anonymous"
 msgstr "Анонимно"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:673
 msgid "Using email address"
 msgstr "Користи адресу ел. поште"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:682
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
 msgid "Using distinguished name (DN)"
 msgstr "Користи посебан назив (DN)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:678
 msgid "Method:"
 msgstr "Начин:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:689
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
 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 +19846,36 @@ msgstr ""
 "приступ на ваш ЛДАП сервер."
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:704
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:698
 msgid "Using LDAP"
 msgstr "Користи ЛДАП"
 
-#: ../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:715
+#: ../modules/mail/e-mail-shell-view.c:120
 msgid "Searching"
 msgstr "Претражујем"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:743
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:737
 msgid "Search Base:"
 msgstr "Основа претраге:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:747
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:741
 msgid "Find Possible Search Bases"
 msgstr "Нађи могуће базе за претрагу"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:769
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:763
 msgid "One Level"
 msgstr "Један ниво"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:771
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:765
 msgid "Subtree"
 msgstr "Подстабло"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:767
 msgid "Search Scope:"
 msgstr "Обим претраге:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:772
 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 +19887,28 @@ msgstr ""
 "за претрагу.  Обим претраге „Један ниво“ ће укључити само уносе један ниво "
 "испод ваше базе претраге."
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:787
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:781
 msgid "Search Filter:"
 msgstr "Филтер претраге:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:799
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:793
 msgid "Downloading"
 msgstr "Преузимам"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:820
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:814
 msgid "Limit:"
 msgstr "Ограничење:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
 msgid "contacts"
 msgstr "контакти"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:830
 msgid "Browse until limit is reached"
 msgstr "Разгледај све док се не достигне ограничење"
 
 #: ../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 "Адреса:"
@@ -16762,61 +19917,38 @@ msgstr "Адреса:"
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Избегавај ако-поклапа (потребно на Апачу < 2.2.8)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:441
-#, c-format
-msgid "HTTP Error: %s"
-msgstr "ХТТП грешка: %s"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:469
-msgid "Could not parse response"
-msgstr "Не могу да обрадим одговор"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:478
-msgid "Empty response"
-msgstr "Празан одговор"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:486
-msgid "Unexpected reply from server"
-msgstr "Неочекиван одговор са сервера"
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1118
-msgid "Could not locate user's calendars"
-msgstr "Не могу да пронађем корисников календар."
-
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1342
-msgid "Path"
-msgstr "Путања"
-
-#: ../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:213
 msgid "Choose a Calendar"
 msgstr "Изаберите календар"
 
-#: ../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:217
 msgid "Choose a Memo List"
 msgstr "Изаберите списак белешки"
 
-#: ../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:221
 msgid "Choose a Task List"
 msgstr "Изаберите списак садатака"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:218
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:313
 msgid "Find Calendars"
 msgstr "Пронађите календаре"
 
-#: ../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 "Пронађите спискове белешки"
 
-#: ../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 "Пронађите спискове задатака"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:242
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:337
 msgid "Email:"
 msgstr "Ел. пошта:"
 
-#: ../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 "Сервер управља позивима на састанак"
 
@@ -16824,40 +19956,31 @@ msgstr "Сервер управља позивима на састанак"
 msgid "Choose which address books to use."
 msgstr "Изаберите адресаре који ћете користити."
 
-#: ../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 "Користи у календару за рођендане и годишњице"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:126
+#: ../modules/cal-config-google/e-google-chooser-button.c:145
 msgid "Default User Calendar"
 msgstr "Основни кориснички календар"
 
-#: ../modules/cal-config-google/e-google-chooser.c:514
-#, c-format
-msgid "Enter Google password for user '%s'."
-msgstr "Унесите Гуглову лозинку за „%s“."
-
-#: ../modules/cal-config-google/e-google-chooser.c:531
-msgid "User declined to provide a password"
-msgstr "Корисник је одбио да достави лозинку"
-
-#: ../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 "Користите постојећу датотеку иКалендара (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 "Датотека иКалендара"
 
-#: ../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 "Изаберите датотеку иКалендара"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:199
+#: ../modules/cal-config-local/evolution-cal-config-local.c:198
 msgid "File:"
 msgstr "Датотека:"
 
-#: ../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 "Допушта Еволуцији да освежи датотеку"
 
@@ -16867,64 +19990,169 @@ msgstr "Допушта Еволуцији да освежи датотеку"
 #. *
 #. * 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 "Фаренхајт (°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 "Целзијус (°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 "Келвин (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 "Јединице:"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:319
+#: ../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:405
+#: ../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 "Увозим задатак"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:403
 msgid "Select a Calendar"
 msgstr "Изаберите календар"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:432
+#: ../modules/calendar/e-cal-attachment-handler.c:410
+#| msgid "D_elete Memo List"
+msgid "Select a Memo List"
+msgstr "Изаберите списак белешки"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:417
 msgid "Select a Task List"
 msgstr "Изаберите списак задатака"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:442
+#: ../modules/calendar/e-cal-attachment-handler.c:424
 msgid "I_mport to Calendar"
 msgstr "У_вези у календар"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:449
-msgid "I_mport to Tasks"
-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
+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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+#, 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
+msgid "Calendar Selector"
+msgstr "Изборник календара"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:690
+msgid "Memo List Selector"
+msgstr "Изборник спискова белешки"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:695
+msgid "Task List Selector"
+msgstr "Изборник списка задатака"
 
-#: ../modules/calendar/e-calendar-preferences.c:516
+#: ../modules/calendar/e-calendar-preferences.c:520
 msgid "Selected Calendars for Alarms"
 msgstr "Изабрани календари за аларме"
 
-#: ../modules/calendar/e-calendar-preferences.c:924
+#: ../modules/calendar/e-calendar-preferences.c:616
+msgid "Meeting Invitations"
+msgstr "Позивнице за састанак"
+
+#: ../modules/calendar/e-calendar-preferences.c:642
+msgid "_Delete message after acting"
+msgstr "_Обриши поруку након радње"
+
+#: ../modules/calendar/e-calendar-preferences.c:656
+#: ../modules/calendar/e-calendar-preferences.c:687
+msgid "Conflict Search"
+msgstr "Претрага преклапања"
+
+#. Source selector
+#: ../modules/calendar/e-calendar-preferences.c:671
+msgid "Select the calendars to search for meeting conflicts"
+msgstr "Бира календаре за претрагу преклапања у састанцима"
+
+#: ../modules/calendar/e-calendar-preferences.c:1057
 msgid "Ti_me and date:"
 msgstr "_Време и датум:"
 
-#: ../modules/calendar/e-calendar-preferences.c:925
+#: ../modules/calendar/e-calendar-preferences.c:1058
 msgid "_Date only:"
 msgstr "Само _датум:"
 
@@ -16985,7 +20213,7 @@ msgid "_24 hour"
 msgstr "_24 - часовни"
 
 #: ../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:1556
 msgid "Work Week"
 msgstr "Радна недеља"
 
@@ -17041,13 +20269,10 @@ msgstr "Н_ед"
 msgid "Day _ends:"
 msgstr "Крај _дана:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
-msgid "Alerts"
-msgstr "Упозорења"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
-msgid "_Ask for confirmation when deleting items"
-msgstr "_Тражи потврду за брисање ставки"
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#| msgid "Send Options"
+msgid "View Options"
+msgstr "Опције прегледа"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "_Time divisions:"
@@ -17074,137 +20299,135 @@ msgstr ""
 msgid "Sc_roll Month View by a week"
 msgstr "При_казује Месечни преглед по недељама"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "Alerts"
+msgstr "Упозорења"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:55
+msgid "_Ask for confirmation when deleting items"
+msgstr "_Тражи потврду за брисање ставки"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "Display"
 msgstr "Приказ"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "Task List"
 msgstr "Списак задатака"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Highlight t_asks due today"
 msgstr "Истакни _задатке у току дана"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Highlight _overdue tasks"
 msgstr "Истакни _неиспуњене задатке"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "_Сакриј завршене задатке после"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "Display reminders in _notification area only"
 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:65
+#| msgid "Delete completed tasks"
+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
 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:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:69
 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:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:71
 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:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:73
 msgid "before every anniversary/birthday"
 msgstr "пре сваке годишњице/рођендана"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:72
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
+msgid "Default _snooze time (in minutes)"
+msgstr "Подразумевано време одла_гања подсетника (у минутима)"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:75
 msgid "Select the calendars for reminder notification"
 msgstr "Изаберите календаре за обавештење подсетника"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:76
 msgid "Default Free/Busy Server"
 msgstr "Подразумевани сервер слободног/заузетог времена"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
-msgid "Template:"
-msgstr "Модел:"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:79
 #, 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:77
+#: ../modules/calendar/e-calendar-preferences.ui.h:80
 msgid "Publishing Information"
 msgstr "Подаци о објављивању"
 
-#: ../modules/calendar/e-cal-shell-backend.c:312
-#: ../modules/calendar/e-cal-shell-view-actions.c:190
-msgid "New Calendar"
-msgstr "Нови календар"
-
-#: ../modules/calendar/e-cal-shell-backend.c:321
+#: ../modules/calendar/e-cal-shell-backend.c:114
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Заказивање"
 
-#: ../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:1361
 msgid "Create a new appointment"
 msgstr "Прави ново заказивање"
 
-#: ../modules/calendar/e-cal-shell-backend.c:328
+#: ../modules/calendar/e-cal-shell-backend.c:121
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Целодневно за_казивање"
 
-#: ../modules/calendar/e-cal-shell-backend.c:330
+#: ../modules/calendar/e-cal-shell-backend.c:123
 msgid "Create a new all-day appointment"
 msgstr "Прави ново целодневно заказивање"
 
-#: ../modules/calendar/e-cal-shell-backend.c:335
+#: ../modules/calendar/e-cal-shell-backend.c:128
 msgctxt "New"
 msgid "M_eeting"
 msgstr "С_астанак"
 
-#: ../modules/calendar/e-cal-shell-backend.c:337
+#: ../modules/calendar/e-cal-shell-backend.c:130
 msgid "Create a new meeting request"
 msgstr "Прави нови захтев за састанком"
 
-#: ../modules/calendar/e-cal-shell-backend.c:345
+#: ../modules/calendar/e-cal-shell-backend.c:138
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Кале_ндар"
 
-#: ../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:1235
 msgid "Create a new calendar"
 msgstr "Прави нови календар"
 
-#: ../modules/calendar/e-cal-shell-backend.c:702
+#: ../modules/calendar/e-cal-shell-backend.c:257
 msgid "Calendar and Tasks"
 msgstr "Календар и задаци"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:118
-#, c-format
-msgid "Opening calendar '%s'"
-msgstr "Отварам календар „%s“"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:589
-msgid "Calendar Selector"
-msgstr "Изборник календара"
-
-#: ../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:181
 msgid "Print"
 msgstr "Штампај"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:290
+#: ../modules/calendar/e-cal-shell-view-actions.c:267
 msgid "Calendar Properties"
 msgstr "Особине календара"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:321
+#: ../modules/calendar/e-cal-shell-view-actions.c:296
 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 +20438,352 @@ 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:313
 msgid "Purge events older than"
 msgstr "Избаци догађаје старије од"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:584
-msgid "Copying Items"
-msgstr "Умножавање ставки"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:877
-msgid "Moving Items"
-msgstr "Премештање ставки"
+#: ../modules/calendar/e-cal-shell-view-actions.c:895
+#| msgid "Make this Occurrence _Movable"
+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:1210
+#: ../modules/calendar/e-cal-shell-view-actions.c:1055
 msgid "event"
 msgstr "догађај"
 
-#: ../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: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
 msgid "Save as iCalendar"
 msgstr "Сачувај као иКалендар"
 
-#: ../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:1191
+#: ../modules/calendar/e-memo-shell-view-actions.c:550
+#: ../modules/calendar/e-task-shell-view-actions.c:675
 msgid "_Copy..."
 msgstr "_Умножи..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1357
+#: ../modules/calendar/e-cal-shell-view-actions.c:1198
 msgid "D_elete Calendar"
 msgstr "Об_риши календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1359
+#: ../modules/calendar/e-cal-shell-view-actions.c:1200
 msgid "Delete the selected calendar"
 msgstr "Обришите изабрани календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1366
+#: ../modules/calendar/e-cal-shell-view-actions.c:1207
 msgid "Go Back"
 msgstr "Иди назад"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1373
+#: ../modules/calendar/e-cal-shell-view-actions.c:1214
 msgid "Go Forward"
 msgstr "Иди напред"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1380
+#: ../modules/calendar/e-cal-shell-view-actions.c:1221
 msgid "Select today"
 msgstr "Изабери данашњи дан"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1385
+#: ../modules/calendar/e-cal-shell-view-actions.c:1226
 msgid "Select _Date"
 msgstr "Изабери _датум"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1387
+#: ../modules/calendar/e-cal-shell-view-actions.c:1228
 msgid "Select a specific date"
 msgstr "Изаберите одређени датум"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+#: ../modules/calendar/e-cal-shell-view-actions.c:1233
 msgid "_New Calendar"
 msgstr "Нови _календар"
 
-#: ../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:1247
+#: ../modules/calendar/e-task-shell-view-actions.c:759
 msgid "Purg_e"
 msgstr "Изба_ци"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1249
 msgid "Purge old appointments and meetings"
 msgstr "Избаците стара заказивања и састанке"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1415
+#: ../modules/calendar/e-cal-shell-view-actions.c:1256
 msgid "Refresh the selected calendar"
 msgstr "Освежите изабрани календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1422
+#: ../modules/calendar/e-cal-shell-view-actions.c:1263
 msgid "Rename the selected calendar"
 msgstr "Преименујте изабрани календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1427
-#| msgid "Find _next"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1268
 msgid "Find _Next"
 msgstr "Нађи _следеће"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1429
+#: ../modules/calendar/e-cal-shell-view-actions.c:1270
 msgid "Find next occurrence of the current search string"
 msgstr "Пронађите следеће појављивање текуће ниске претраге"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
-#| msgid "Find _previous"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1275
 msgid "Find _Previous"
 msgstr "Нађи _претходно"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1436
+#: ../modules/calendar/e-cal-shell-view-actions.c:1277
 msgid "Find previous occurrence of the current search string"
 msgstr "Пронађите претходно појављивање текуће ниске претраге"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1441
-#| msgid "Stop _running search"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1282
 msgid "Stop _Running Search"
 msgstr "Заустави _текућу претрагу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1443
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
 msgid "Stop currently running search"
 msgstr "Зауставите тренутно покренуту претрагу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1289
 msgid "Show _Only This Calendar"
 msgstr "Прикажи _само овај календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1455
+#: ../modules/calendar/e-cal-shell-view-actions.c:1296
 msgid "Cop_y to Calendar..."
 msgstr "_Умножи у календар..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-cal-shell-view-actions.c:1303
 msgid "_Delegate Meeting..."
 msgstr "_Делегирај састанак..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1469
+#: ../modules/calendar/e-cal-shell-view-actions.c:1310
 msgid "_Delete Appointment"
 msgstr "_Обриши заказано"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1471
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
 msgid "Delete selected appointments"
 msgstr "Обришите изабрана заказивања"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1476
+#: ../modules/calendar/e-cal-shell-view-actions.c:1317
 msgid "Delete This _Occurrence"
 msgstr "Обриши ову _појаву"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1478
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Delete this occurrence"
 msgstr "Обришите ову појаву"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1483
+#: ../modules/calendar/e-cal-shell-view-actions.c:1324
 msgid "Delete All Occ_urrences"
 msgstr "Обриши све по_јаве"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1485
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "Delete all occurrences"
 msgstr "Обришите све појаве"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1490
+#: ../modules/calendar/e-cal-shell-view-actions.c:1331
 msgid "New All Day _Event..."
 msgstr "Нови целодневни _догађај..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1492
+#: ../modules/calendar/e-cal-shell-view-actions.c:1333
 msgid "Create a new all day event"
 msgstr "Направите нови целодневни догађај"
 
-#: ../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: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
 msgid "_Forward as iCalendar..."
 msgstr "_Проследи као иКалендар..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1504
+#: ../modules/calendar/e-cal-shell-view-actions.c:1345
 msgid "New _Meeting..."
 msgstr "Нови _састанак..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1506
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
 msgid "Create a new meeting"
 msgstr "Направите нови састанак"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../modules/calendar/e-cal-shell-view-actions.c:1352
 msgid "Mo_ve to Calendar..."
 msgstr "Прен_еси у календар..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1518
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
 msgid "New _Appointment..."
 msgstr "Ново _заказивање..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1525
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
 msgid "Make this Occurrence _Movable"
 msgstr "Нека ова појава буде _покретна"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1532
+#: ../modules/calendar/e-cal-shell-view-actions.c:1373
 msgid "_Open Appointment"
 msgstr "_Отвори састанак"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1534
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "View the current appointment"
 msgstr "Прегледајте текуће заказивање"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1539
+#: ../modules/calendar/e-cal-shell-view-actions.c:1380
 msgid "_Reply"
 msgstr "_Одговори"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1553
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "_Schedule Meeting..."
 msgstr "_Закажи састанак..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1555
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Converts an appointment to a meeting"
 msgstr "Претворите заказано у састанак"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1560
+#: ../modules/calendar/e-cal-shell-view-actions.c:1401
 msgid "Conv_ert to Appointment..."
 msgstr "Пре_твори у заказано..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1562
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "Converts a meeting to an appointment"
 msgstr "Претворите састанак у заказано"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1567
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
 msgid "Quit"
 msgstr "Изађи"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../modules/calendar/e-cal-shell-view-actions.c:1528
 msgid "Day"
 msgstr "Дан"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1689
+#: ../modules/calendar/e-cal-shell-view-actions.c:1530
 msgid "Show one day"
 msgstr "Прикажи један дан"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1694
+#: ../modules/calendar/e-cal-shell-view-actions.c:1535
 msgid "List"
 msgstr "Списак"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1696
+#: ../modules/calendar/e-cal-shell-view-actions.c:1537
 msgid "Show as list"
 msgstr "Прикажи као списак"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1701
+#: ../modules/calendar/e-cal-shell-view-actions.c:1542
 msgid "Month"
 msgstr "Месец"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1703
+#: ../modules/calendar/e-cal-shell-view-actions.c:1544
 msgid "Show one month"
 msgstr "Прикажи један месец"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1708
+#: ../modules/calendar/e-cal-shell-view-actions.c:1549
 msgid "Week"
 msgstr "Недеља"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-cal-shell-view-actions.c:1551
 msgid "Show one week"
 msgstr "Прикажи једну недељу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1717
+#: ../modules/calendar/e-cal-shell-view-actions.c:1558
 msgid "Show one work week"
 msgstr "Прикажи једну радну недељу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1725
+#: ../modules/calendar/e-cal-shell-view-actions.c:1566
 msgid "Active Appointments"
 msgstr "Активна заказивања"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1739
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
 msgid "Next 7 Days' Appointments"
 msgstr "Заказано за следећу недељу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1746
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
 msgid "Occurs Less Than 5 Times"
 msgstr "Дешава се мање од 5 пута"
 
-#: ../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:1618
+#: ../modules/calendar/e-memo-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Description contains"
 msgstr "Опис садржи"
 
-#: ../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:1625
+#: ../modules/calendar/e-memo-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-view-actions.c:947
 msgid "Summary contains"
 msgstr "Сажетак садржи"
 
-#: ../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: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
 msgid "Print..."
 msgstr "Штампај..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1796
+#: ../modules/calendar/e-cal-shell-view-actions.c:1637
 msgid "Print this calendar"
 msgstr "Штампа овај календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1803
+#: ../modules/calendar/e-cal-shell-view-actions.c:1644
 msgid "Preview the calendar to be printed"
 msgstr "Преглед календара пред штампу"
 
-#: ../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: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
 msgid "_Save as iCalendar..."
 msgstr "_Сачувај као иКалендар..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1902
+#: ../modules/calendar/e-cal-shell-view-actions.c:1743
 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:228
-#: ../modules/calendar/e-memo-shell-view-actions.c:524
+#: ../modules/calendar/e-cal-shell-view-memopad.c:206
+#: ../modules/calendar/e-memo-shell-view-actions.c:467
 msgid "memo"
 msgstr "белешка"
 
-#: ../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:249
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
 msgid "New _Memo"
 msgstr "Нова _белешка"
 
-#: ../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:251
+#: ../modules/calendar/e-memo-shell-backend.c:65
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "Create a new memo"
 msgstr "Направите једну нову белешку"
 
-#: ../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:256
+#: ../modules/calendar/e-memo-shell-view-actions.c:606
 msgid "_Open Memo"
 msgstr "_Отвори белешку"
 
-#: ../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:258
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
 msgid "View the selected memo"
 msgstr "Погледајте изабрану белешку"
 
-#: ../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: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
 msgid "Open _Web Page"
 msgstr "Отвори _Веб страницу"
 
-#: ../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:275
+#: ../modules/calendar/e-memo-shell-view-actions.c:773
 msgid "Print the selected memo"
 msgstr "Штампајте изабрану белешку"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1561
+#: ../modules/calendar/e-cal-shell-view-private.c:810
 msgid "Searching next matching event"
 msgstr "Тражим следећи одговарајући догађај"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1562
+#: ../modules/calendar/e-cal-shell-view-private.c:811
 msgid "Searching previous matching event"
 msgstr "Тражим претходни одговарајући догађај"
 
-#: ../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 +20792,7 @@ msgstr[1] "Не могу да пронађем одговарајући дога
 msgstr[2] "Не могу да пронађем одговарајући догађај у следећих %d година"
 msgstr[3] "Не могу да пронађем одговарајући догађај у следећој %d години"
 
-#: ../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 +20801,7 @@ msgstr[1] "Не могу да пронађем одговарајући дога
 msgstr[2] "Не могу да пронађем одговарајући догађај у претходних %d години"
 msgstr[3] "Не могу да пронађем одговарајући догађај у претходној %d години"
 
-#: ../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 "Не могу да тражим ако нема активног календара"
 
@@ -17593,177 +20809,163 @@ 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:295
-#: ../modules/calendar/e-task-shell-view-actions.c:641
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:274
+#: ../modules/calendar/e-task-shell-view-actions.c:585
 msgid "task"
 msgstr "задатак"
 
-#: ../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:309
+#: ../modules/calendar/e-task-shell-view-actions.c:647
 msgid "_Assign Task"
 msgstr "_Додели задатак"
 
-#: ../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:323
+#: ../modules/calendar/e-task-shell-view-actions.c:724
 msgid "_Mark as Complete"
 msgstr "_Означи као завршено"
 
-#: ../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:325
+#: ../modules/calendar/e-task-shell-view-actions.c:726
 msgid "Mark selected tasks as complete"
 msgstr "Обележите изабране задатке као завршене"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
 msgid "_Mark as Incomplete"
 msgstr "_Означи као незавршено"
 
-#: ../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:332
+#: ../modules/calendar/e-task-shell-view-actions.c:733
 msgid "Mark selected tasks as incomplete"
 msgstr "Обележите изабране задатке као незавршене"
 
-#: ../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:337
+#: ../modules/calendar/e-task-shell-view-actions.c:738
 msgid "New _Task"
 msgstr "Нови зад_атак"
 
-#: ../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:339
+#: ../modules/calendar/e-task-shell-backend.c:64
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 msgid "Create a new task"
 msgstr "Направите нови задатак"
 
-#: ../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:344
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "_Open Task"
 msgstr "_Отвори задатак"
 
-#: ../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:346
+#: ../modules/calendar/e-task-shell-view-actions.c:747
 msgid "View the selected task"
 msgstr "Прегледајте изабрани задатак"
 
-#: ../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:363
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Print the selected task"
 msgstr "Штампа изабрани задатак"
 
-#: ../modules/calendar/e-memo-shell-backend.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:195
-msgid "New Memo List"
-msgstr "Нови списак белешке"
-
-#: ../modules/calendar/e-memo-shell-backend.c:216
+#: ../modules/calendar/e-memo-shell-backend.c:63
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Белешк_а"
 
-#: ../modules/calendar/e-memo-shell-backend.c:223
+#: ../modules/calendar/e-memo-shell-backend.c:70
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Дељена белешка"
 
-#: ../modules/calendar/e-memo-shell-backend.c:225
+#: ../modules/calendar/e-memo-shell-backend.c:72
 msgid "Create a new shared memo"
 msgstr "Направите нову дељену белешку"
 
-#: ../modules/calendar/e-memo-shell-backend.c:233
+#: ../modules/calendar/e-memo-shell-backend.c:80
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Спи_сак белешки"
 
-#: ../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:566
 msgid "Create a new memo list"
 msgstr "Саставите нови списак белешки"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:116
-#, c-format
-msgid "Opening memo list '%s'"
-msgstr "Отварам списак белешки „%s“"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:545
-msgid "Memo List Selector"
-msgstr "Изборник спискова белешки"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:211
-#: ../modules/calendar/e-memo-shell-view-actions.c:226
+#: ../modules/calendar/e-memo-shell-view-actions.c:180
+#: ../modules/calendar/e-memo-shell-view-actions.c:195
 msgid "Print Memos"
 msgstr "Штампај белешке"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:267
+#: ../modules/calendar/e-memo-shell-view-actions.c:236
 msgid "Memo List Properties"
 msgstr "Особине списка задатака"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:586
+#: ../modules/calendar/e-memo-shell-view-actions.c:529
 msgid "_Delete Memo"
 msgstr "_Обриши белешку"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:593
+#: ../modules/calendar/e-memo-shell-view-actions.c:536
 msgid "_Find in Memo..."
 msgstr "П_ронађи у белешци..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:595
+#: ../modules/calendar/e-memo-shell-view-actions.c:538
 msgid "Search for text in the displayed memo"
 msgstr "Претражите текст у приказаној белешци"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:614
+#: ../modules/calendar/e-memo-shell-view-actions.c:557
 msgid "D_elete Memo List"
 msgstr "Об_риши списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:616
+#: ../modules/calendar/e-memo-shell-view-actions.c:559
 msgid "Delete the selected memo list"
 msgstr "Обришите изабрани списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-memo-shell-view-actions.c:564
 msgid "_New Memo List"
 msgstr "_Нови списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:637
+#: ../modules/calendar/e-memo-shell-view-actions.c:580
 msgid "Refresh the selected memo list"
 msgstr "Освежите изабрани списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:644
+#: ../modules/calendar/e-memo-shell-view-actions.c:587
 msgid "Rename the selected memo list"
 msgstr "Преименујте изабрани списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:649
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "Show _Only This Memo List"
 msgstr "Прикажи _само овај списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:728
+#: ../modules/calendar/e-memo-shell-view-actions.c:671
 msgid "Memo _Preview"
 msgstr "_Преглед белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:730
+#: ../modules/calendar/e-memo-shell-view-actions.c:673
 msgid "Show memo preview pane"
 msgstr "Прикажите преглед белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-memo-shell-view-actions.c:694
 msgid "Show memo preview below the memo list"
 msgstr "Прикажите преглед белешки испод списка белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
+#: ../modules/calendar/e-memo-shell-view-actions.c:701
 msgid "Show memo preview alongside the memo list"
 msgstr "Прикажите преглед белешки поред списка белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:816
+#: ../modules/calendar/e-memo-shell-view-actions.c:759
 msgid "Print the list of memos"
 msgstr "Штампајте списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:823
+#: ../modules/calendar/e-memo-shell-view-actions.c:766
 msgid "Preview the list of memos to be printed"
 msgstr "Прегледајте списак белешки за штампу"
 
-#: ../modules/calendar/e-memo-shell-view.c:238
+#: ../modules/calendar/e-memo-shell-view.c:212
 msgid "Delete Memos"
 msgstr "Обриши белешке"
 
-#: ../modules/calendar/e-memo-shell-view.c:240
+#: ../modules/calendar/e-memo-shell-view.c:214
 msgid "Delete Memo"
 msgstr "Обриши белешку"
 
-#: ../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 +20974,46 @@ msgstr[1] "%d белешке"
 msgstr[2] "%d белешки"
 msgstr[3] "%d белешка"
 
-#: ../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:539
 #, c-format
 msgid "%d selected"
 msgstr "изабраних — %d"
 
-#: ../modules/calendar/e-task-shell-backend.c:204
-#: ../modules/calendar/e-task-shell-view-actions.c:218
-msgid "New Task List"
-msgstr "Нови списак задатака"
-
-#: ../modules/calendar/e-task-shell-backend.c:213
+#: ../modules/calendar/e-task-shell-backend.c:62
 msgctxt "New"
 msgid "_Task"
 msgstr "_Задатак"
 
-#: ../modules/calendar/e-task-shell-backend.c:220
+#: ../modules/calendar/e-task-shell-backend.c:69
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Додељен_и задатак"
 
-#: ../modules/calendar/e-task-shell-backend.c:222
+#: ../modules/calendar/e-task-shell-backend.c:71
 msgid "Create a new assigned task"
 msgstr "Направите нови додељени задатак"
 
-#: ../modules/calendar/e-task-shell-backend.c:230
+#: ../modules/calendar/e-task-shell-backend.c:79
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Списак за_датака"
 
-#: ../modules/calendar/e-task-shell-backend.c:232
-#: ../modules/calendar/e-task-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-backend.c:81
+#: ../modules/calendar/e-task-shell-view-actions.c:691
 msgid "Create a new task list"
 msgstr "Направите нови списак задатака"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:116
-#, c-format
-msgid "Opening task list '%s'"
-msgstr "Отварам списак задатака „%s“"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:545
-msgid "Task List Selector"
-msgstr "Изборник списка задатака"
-
-#: ../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:203
+#: ../modules/calendar/e-task-shell-view-actions.c:218
 msgid "Print Tasks"
 msgstr "Штампај задатке"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:290
+#: ../modules/calendar/e-task-shell-view-actions.c:259
 msgid "Task List Properties"
 msgstr "Особине списка задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:585
+#: ../modules/calendar/e-task-shell-view-actions.c:529
 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 +21025,107 @@ msgstr ""
 "\n"
 "Да обришем ове задатке?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:592
+#: ../modules/calendar/e-task-shell-view-actions.c:536
 msgid "Do not ask me again"
 msgstr "Не питај ме поново"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:710
+#: ../modules/calendar/e-task-shell-view-actions.c:654
 msgid "_Delete Task"
 msgstr "_Обриши задатак"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:661
 msgid "_Find in Task..."
 msgstr "_Пронађи у задатку..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:719
+#: ../modules/calendar/e-task-shell-view-actions.c:663
 msgid "Search for text in the displayed task"
 msgstr "Претражи текст у приказаном задатку"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:738
+#: ../modules/calendar/e-task-shell-view-actions.c:682
 msgid "D_elete Task List"
 msgstr "О_бриши списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:684
 msgid "Delete the selected task list"
 msgstr "Обришите изабрани списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-view-actions.c:689
 msgid "_New Task List"
 msgstr "Но_ви списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:705
 msgid "Refresh the selected task list"
 msgstr "Освежите изабрани списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:712
 msgid "Rename the selected task list"
 msgstr "Преименујте изабрани списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:773
+#: ../modules/calendar/e-task-shell-view-actions.c:717
 msgid "Show _Only This Task List"
 msgstr "Прикажи _само овај списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:787
+#: ../modules/calendar/e-task-shell-view-actions.c:731
 msgid "Mar_k as Incomplete"
 msgstr "О_значи као незавршено"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:817
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "Delete completed tasks"
 msgstr "Обришите завршене задатке"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:892
+#: ../modules/calendar/e-task-shell-view-actions.c:836
 msgid "Task _Preview"
 msgstr "Преглед за_датака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:894
+#: ../modules/calendar/e-task-shell-view-actions.c:838
 msgid "Show task preview pane"
 msgstr "Прикажите преглед задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:915
+#: ../modules/calendar/e-task-shell-view-actions.c:859
 msgid "Show task preview below the task list"
 msgstr "Прикажите преглед испод списка задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:922
+#: ../modules/calendar/e-task-shell-view-actions.c:866
 msgid "Show task preview alongside the task list"
 msgstr "Прикажите преглед поред списка задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:930
+#: ../modules/calendar/e-task-shell-view-actions.c:874
 msgid "Active Tasks"
 msgstr "Активни задаци"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:944
+#: ../modules/calendar/e-task-shell-view-actions.c:888
 msgid "Completed Tasks"
 msgstr "Завршени задаци"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:951
+#: ../modules/calendar/e-task-shell-view-actions.c:895
 msgid "Next 7 Days' Tasks"
 msgstr "Задаци за следећу недељу"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:958
+#: ../modules/calendar/e-task-shell-view-actions.c:902
 msgid "Overdue Tasks"
 msgstr "Прекорачени задаци"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:965
+#: ../modules/calendar/e-task-shell-view-actions.c:909
 msgid "Tasks with Attachments"
 msgstr "Задаци са прилозима"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1015
+#: ../modules/calendar/e-task-shell-view-actions.c:959
 msgid "Print the list of tasks"
 msgstr "Штампајте списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1022
+#: ../modules/calendar/e-task-shell-view-actions.c:966
 msgid "Preview the list of tasks to be printed"
 msgstr "Прегледајте списак задатака пред штампу"
 
-#: ../modules/calendar/e-task-shell-view.c:373
+#: ../modules/calendar/e-task-shell-view.c:316
 msgid "Delete Tasks"
 msgstr "Обриши задатке"
 
-#: ../modules/calendar/e-task-shell-view.c:375
+#: ../modules/calendar/e-task-shell-view.c:318
 msgid "Delete Task"
 msgstr "Обриши задатак"
 
-#: ../modules/calendar/e-task-shell-view-private.c:632
-msgid "Expunging"
-msgstr "Избацивање"
-
-#: ../modules/calendar/e-task-shell-view-private.c:743
+#: ../modules/calendar/e-task-shell-view-private.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -17960,49 +21144,49 @@ msgstr "Приказује делове као позивницу"
 
 #. 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 "Данас у %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 "Данас у %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 "Данас у %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 "Сутра у %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 "Сутра у %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 "Сутра у %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 "Сутра у %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 +21196,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 +21268,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 "Непозната особа"
 
-#: ../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 "Одговорите у име %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 "Примљено у име %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 преко %s објављује следећи податак о састанку:"
 
-#: ../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 објављује следећи податак о састанку:"
 
-#: ../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 вам делегира следећи састанак:"
 
-#: ../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 преко %s захтева ваше присуство на следећем састанку:"
 
-#: ../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 захтева ваше присуство на следећем састанку:"
 
-#: ../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 преко %s жели да дода постојећем састанку:"
 
-#: ../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 жели да дода постојећем састанку:"
 
-#: ../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 преко %s жели да прими најновије информације за следећи састанак:"
 
-#: ../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 жели да прими најновији податак за следећи састанак:"
 
-#: ../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 преко %s шаље следећи одговор за састанак:"
 
-#: ../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 шаље следећи одговор за састанак:"
 
-#: ../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 преко %s отказује следећи састанак:"
 
-#: ../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 отказује следећи састанак:"
 
-#: ../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 преко %s предлаже следеће промене састанка."
 
-#: ../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 предлаже следеће измене састанка:"
 
-#: ../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 преко %s одбија следеће промене састанка:"
 
-#: ../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 одбија следеће измене састанка:"
 
-#: ../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 преко %s објављује следећи задатак:"
 
-#: ../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 објави следеће задужење:"
 
-#: ../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 захтева да %s преузме следећи задатак:"
 
-#: ../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 преко %s вам додељује задатак:"
 
-#: ../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 вам додељује задатак:"
 
-#: ../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 преко %s жели да дода постојећем задатку:"
 
-#: ../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 жели да дода постојећем задатку:"
 
-#: ../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 +21436,335 @@ msgid ""
 msgstr ""
 "%s преко %s жели да добије најновије информације за следећи додељени задатак:"
 
-#: ../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 жели да добије најновије информације за следећи додељени задатак:"
 
-#: ../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 преко %s враћа следећи одговор на додељени задатак:"
 
-#: ../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 шаље назад следећи одговор на додељени задатак:"
 
-#: ../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 преко %s отказује следећи додељени задатак:"
 
-#: ../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 отказује следећи додељени задатак:"
 
-#: ../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 преко %s предлаже следеће промене у додели задатка:"
 
-#: ../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 предлаже следеће промене у додели задатка:"
 
-#: ../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 преко %s одбија следећи додељени задатак:"
 
-#: ../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 одбија следећи додељени задатак:"
 
-#: ../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 преко %s објављује следећу белешку:"
 
-#: ../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 објављује следећу белешку:"
 
-#: ../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 преко %s жели да дода постојећој белешци:"
 
-#: ../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 жели да дода постојећој белешци:"
 
-#: ../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 преко %s отказује следећу дељену белешку:"
 
-#: ../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 отказује следеће дељену белешку:"
 
-#: ../modules/itip-formatter/itip-view.c:675
+#: ../modules/itip-formatter/itip-view.c:674
 msgid "All day:"
 msgstr "Целодневно:"
 
-#: ../modules/itip-formatter/itip-view.c:681
+#: ../modules/itip-formatter/itip-view.c:680
 msgid "Start day:"
 msgstr "Почетак дана:"
 
-#: ../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 "Време почетка:"
 
-#: ../modules/itip-formatter/itip-view.c:690
+#: ../modules/itip-formatter/itip-view.c:689
 msgid "End day:"
 msgstr "Крај дана:"
 
-#: ../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 "Време завршетка:"
 
-#: ../modules/itip-formatter/itip-view.c:1030
+#: ../modules/itip-formatter/itip-view.c:1039
 msgid "Ope_n Calendar"
 msgstr "О_твори календар"
 
-#: ../modules/itip-formatter/itip-view.c:1033
+#: ../modules/itip-formatter/itip-view.c:1042
 msgid "_Decline all"
 msgstr "Од_биј све"
 
-#: ../modules/itip-formatter/itip-view.c:1036
+#: ../modules/itip-formatter/itip-view.c:1045
 msgid "_Decline"
 msgstr "_Одбиј"
 
-#: ../modules/itip-formatter/itip-view.c:1039
+#: ../modules/itip-formatter/itip-view.c:1048
 msgid "_Tentative all"
 msgstr "Све са ре_зервом"
 
-#: ../modules/itip-formatter/itip-view.c:1042
+#: ../modules/itip-formatter/itip-view.c:1051
 msgid "_Tentative"
 msgstr "Са _резервом"
 
-#: ../modules/itip-formatter/itip-view.c:1045
+#: ../modules/itip-formatter/itip-view.c:1054
 msgid "Acce_pt all"
 msgstr "П_рихвати све"
 
-#: ../modules/itip-formatter/itip-view.c:1048
+#: ../modules/itip-formatter/itip-view.c:1057
 msgid "Acce_pt"
 msgstr "Прих_ваћено"
 
-#: ../modules/itip-formatter/itip-view.c:1051
+#: ../modules/itip-formatter/itip-view.c:1060
 msgid "Send _Information"
 msgstr "Пошаљи _податке"
 
-#: ../modules/itip-formatter/itip-view.c:1054
+#: ../modules/itip-formatter/itip-view.c:1063
 msgid "_Update Attendee Status"
 msgstr "Ажурирај стање учесни_ка"
 
-#: ../modules/itip-formatter/itip-view.c:1057
+#: ../modules/itip-formatter/itip-view.c:1066
+#: ../smime/gui/certificate-manager.c:1666
 msgid "_Update"
 msgstr "_Освежи"
 
-#: ../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 "Напомена:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1543
+#: ../modules/itip-formatter/itip-view.c:1554
 msgid "Send reply to sender"
 msgstr "Одговори пошиљаоцу"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1558
+#: ../modules/itip-formatter/itip-view.c:1569
 msgid "Send _updates to attendees"
 msgstr "Пошаљи _ажуриране податке учесницима"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1561
+#: ../modules/itip-formatter/itip-view.c:1572
 msgid "_Apply to all instances"
 msgstr "При_мени на све нивое"
 
-#: ../modules/itip-formatter/itip-view.c:1562
+#: ../modules/itip-formatter/itip-view.c:1573
 msgid "Show time as _free"
 msgstr "Прикажи време као _слободно"
 
-#: ../modules/itip-formatter/itip-view.c:1563
+#: ../modules/itip-formatter/itip-view.c:1574
 msgid "_Preserve my reminder"
 msgstr "_Очувај мој подсетник"
 
-#: ../modules/itip-formatter/itip-view.c:1564
+#: ../modules/itip-formatter/itip-view.c:1575
 msgid "_Inherit reminder"
 msgstr "_Наследи подсетник"
 
-#: ../modules/itip-formatter/itip-view.c:1894
+#: ../modules/itip-formatter/itip-view.c:1908
 msgid "_Tasks:"
 msgstr "_Задаци:"
 
-#: ../modules/itip-formatter/itip-view.c:1897
+#: ../modules/itip-formatter/itip-view.c:1911
 msgid "_Memos:"
 msgstr "_Белешке:"
 
-#: ../modules/itip-formatter/itip-view.c:3125
+#: ../modules/itip-formatter/itip-view.c:3217
 msgid "Sa_ve"
 msgstr "Са_чувај"
 
-#: ../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 "Статус учесника је ажуриран"
 
-#: ../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 "Једно заказивање у календару „%s“ је у исто време кад и овај састанак"
 
-#: ../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 "Пронашао сам заказивање у календару „%s“"
 
-#: ../modules/itip-formatter/itip-view.c:3906
+#: ../modules/itip-formatter/itip-view.c:4024
 msgid "Unable to find any calendars"
 msgstr "Не могу да пронађем ниједан календар"
 
-#: ../modules/itip-formatter/itip-view.c:3914
+#: ../modules/itip-formatter/itip-view.c:4032
 msgid "Unable to find this meeting in any calendar"
 msgstr "Не могу да пронађем овај састанак ни у једном календару"
 
-#: ../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 "Не могу да пронађем овај задатак ни у једном списку задатака"
 
-#: ../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 "Ниједан списак белешки не садржи ову белешку"
 
-#: ../modules/itip-formatter/itip-view.c:4268
+#: ../modules/itip-formatter/itip-view.c:4387
 msgid "Opening the calendar. Please wait..."
 msgstr "Отварам календар. Молим сачекајте..."
 
-#: ../modules/itip-formatter/itip-view.c:4273
+#: ../modules/itip-formatter/itip-view.c:4392
 msgid "Searching for an existing version of this appointment"
 msgstr "Претрага за једном постојећом верзијом овог заказивања је у току"
 
-#: ../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 "Не могу да пошаљем ставке календару „%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 "Послато календару „%s“ као прихваћено"
 
-#: ../modules/itip-formatter/itip-view.c:4688
+#: ../modules/itip-formatter/itip-view.c:4807
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Послато календару „%s“ као покушај"
 
-#: ../modules/itip-formatter/itip-view.c:4694
+#: ../modules/itip-formatter/itip-view.c:4813
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Послато календару „%s“ као одбијено"
 
-#: ../modules/itip-formatter/itip-view.c:4700
+#: ../modules/itip-formatter/itip-view.c:4819
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Послато календару „%s“ као отказано"
 
-#: ../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 "Чувам измене у календар. Молим сачекајте..."
 
-#: ../modules/itip-formatter/itip-view.c:4762
+#: ../modules/itip-formatter/itip-view.c:4881
 msgid "Unable to parse item"
 msgstr "Не могу да обрадим ставку"
 
-#: ../modules/itip-formatter/itip-view.c:4955
+#: ../modules/itip-formatter/itip-view.c:5074
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Организатор је уклонио делегата „%s“ "
 
-#: ../modules/itip-formatter/itip-view.c:4972
+#: ../modules/itip-formatter/itip-view.c:5091
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Делегату је послато обавештење о отказивању"
 
-#: ../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 "Не могу делегату да пошаљем обавештење о отказивању"
 
-#: ../modules/itip-formatter/itip-view.c:5024
+#: ../modules/itip-formatter/itip-view.c:5143
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Не могу да ажурирам учесника. %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 "Састанак није исправан и не може бити ажуриран"
 
-#: ../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 "Статус учесника није ажуриран због неисправног стања"
 
-#: ../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 "Статус учесника није освежен јер ставка више не постоји"
 
-#: ../modules/itip-formatter/itip-view.c:5317
+#: ../modules/itip-formatter/itip-view.c:5437
 msgid "Meeting information sent"
 msgstr "Податак о састанку је послат"
 
-#: ../modules/itip-formatter/itip-view.c:5322
+#: ../modules/itip-formatter/itip-view.c:5442
 msgid "Task information sent"
 msgstr "Податак о задатку је послат"
 
-#: ../modules/itip-formatter/itip-view.c:5327
+#: ../modules/itip-formatter/itip-view.c:5447
 msgid "Memo information sent"
 msgstr "Податак о белешци је послат"
 
-#: ../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 "Не могу да пошаљем податак о састанку, састанак не постоји"
 
-#: ../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 "Не могу да пошаљем податак о задатку, задужење не постоји"
 
-#: ../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 "Не могу да пошаљем податак о белешци, белешка не постоји"
 
 #. 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 "Сачувај календар"
 
-#: ../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 "Приложен календар није исправан"
 
-#: ../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 +21772,15 @@ msgstr ""
 "Порука пријављује да садржи календар, али тај календар није исправан "
 "иКалендар."
 
-#: ../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 "Ставка у календару није исправна"
 
-#: ../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 +21788,11 @@ msgstr ""
 "Порука садржи календар, али он не садржи догађаје, задатке или податке "
 "слободно/заузето."
 
-#: ../modules/itip-formatter/itip-view.c:5569
+#: ../modules/itip-formatter/itip-view.c:5689
 msgid "The calendar attached contains multiple items"
 msgstr "Календар у прилогу садржи више ставки"
 
-#: ../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 +21804,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 "Ништа"
 
-#: ../modules/itip-formatter/itip-view.c:6088
+#: ../modules/itip-formatter/itip-view.c:6209
 msgid "Tentatively Accepted"
 msgstr "Прихваћено с резервом"
 
-#: ../modules/itip-formatter/itip-view.c:6248
+#: ../modules/itip-formatter/itip-view.c:6369
 msgid "This meeting recurs"
 msgstr "Овај састанак се понавља"
 
-#: ../modules/itip-formatter/itip-view.c:6251
+#: ../modules/itip-formatter/itip-view.c:6372
 msgid "This task recurs"
 msgstr "Овај задатак се понавља"
 
-#: ../modules/itip-formatter/itip-view.c:6254
+#: ../modules/itip-formatter/itip-view.c:6375
 msgid "This memo recurs"
 msgstr "Ова белешка се понавља"
 
@@ -18653,45 +21838,19 @@ msgstr "Овај састанак је делегиран"
 msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr "„{0}“ делегира састанак. Желите ли да додате делегата „{1}“?"
 
-#: ../modules/itip-formatter/plugin/config-ui.c:81
-msgid "Meeting Invitations"
-msgstr "Позивнице за састанак"
-
-#: ../modules/itip-formatter/plugin/config-ui.c:107
-msgid "_Delete message after acting"
-msgstr "_Обриши поруку након радње"
-
-#: ../modules/itip-formatter/plugin/config-ui.c:121
-#: ../modules/itip-formatter/plugin/config-ui.c:152
-msgid "Conflict Search"
-msgstr "Претрага преклапања"
-
-#. Source selector
-#: ../modules/itip-formatter/plugin/config-ui.c:136
-msgid "Select the calendars to search for meeting conflicts"
-msgstr "Бира календаре за претрагу преклапања у састанцима"
-
-#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:1
-msgid "Itip Formatter"
-msgstr "Итип форматирање"
-
-#: ../modules/itip-formatter/plugin/org-gnome-itip-formatter.eplug.xml.h:2
-msgid "Display \"text/calendar\" MIME parts in mail messages."
-msgstr "Приказује МИМЕ делове „text/calendar“ у порукама."
-
-#: ../modules/mail-config/e-mail-config-google-summary.c:251
+#: ../modules/mail-config/e-mail-config-google-summary.c:259
 msgid "Google Features"
 msgstr "Гугл могућности"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:260
+#: ../modules/mail-config/e-mail-config-google-summary.c:268
 msgid "Add Google Ca_lendar to this account"
 msgstr "Додај ка_лендар Гугла овом налогу"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:268
+#: ../modules/mail-config/e-mail-config-google-summary.c:277
 msgid "Add Google Con_tacts to this account"
 msgstr "Додај ко_нтакте Гугла овом налогу"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:276
+#: ../modules/mail-config/e-mail-config-google-summary.c:286
 msgid "You may need to enable IMAP access"
 msgstr "Можда ћете морати да омогућите ИМАП приступ"
 
@@ -18733,60 +21892,60 @@ 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:53
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:79
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:92
 #: ../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:97
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
 #: ../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:110
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
 msgid "_Port:"
 msgstr "_Порт:"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:180
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:226
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:242
 msgid "User_name:"
 msgstr "Корисничко_име:"
 
 #: ../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-smtp-backend.c:163
 msgid "Encryption _method:"
 msgstr "Начин _шифровања:"
 
 #: ../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-smtp-backend.c:178
 msgid "STARTTLS after connecting"
 msgstr "СТАРТТЛС након повезивања"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:232
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:166
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:182
 msgid "SSL on a dedicated port"
 msgstr "ССЛ на одеђеном порту"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:69
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:70
 msgid "_Use custom binary, instead of 'sendmail'"
 msgstr "_Користи произвољни извршни, уместо „sendmail“"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:73
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:74
 msgid "_Custom binary:"
 msgstr "_Произвољни извршни:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:90
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:91
 msgid "U_se custom arguments"
 msgstr "Користи _произвољне аргументе"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:94
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:95
 msgid "Cus_tom arguments:"
 msgstr "Произвољни _аргументи:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:112
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:113
 msgid ""
 "Default arguments are '-i -f %F -- %R', where\n"
 "   %F - stands for the From address\n"
@@ -18796,27 +21955,27 @@ msgstr ""
 "   %F — означава адресу пошиљаоца\n"
 "   %R — означава адресе прималаца"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:127
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:128
 msgid "Send mail also when in offline _mode"
 msgstr "Пошаљи пошту такође у режиму _ван мреже"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:122
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:135
 msgid "Ser_ver requires authentication"
 msgstr "Сер_вер тражи потврђивање идентитета"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:208
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:224
 msgid "T_ype:"
 msgstr "_Врста:"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:246
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:245
 msgid "Yahoo! Features"
 msgstr "Јаху! могућности"
 
-#: ../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 "Додај Јаху! _календар и задатке овом налогу"
 
-#: ../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 +21984,46 @@ msgstr[1] "%d приложене поруке"
 msgstr[2] "%d приложених порука"
 msgstr[3] "Једна приложена порука"
 
-#: ../modules/mail/e-mail-shell-backend.c:314
+#: ../modules/mail/e-mail-shell-backend.c:353
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Порука"
 
-#: ../modules/mail/e-mail-shell-backend.c:316
+#: ../modules/mail/e-mail-shell-backend.c:355
 msgid "Compose a new mail message"
 msgstr "Саставите нову поруку"
 
-#: ../modules/mail/e-mail-shell-backend.c:324
+#: ../modules/mail/e-mail-shell-backend.c:363
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "Поштански _налог"
 
-#: ../modules/mail/e-mail-shell-backend.c:326
+#: ../modules/mail/e-mail-shell-backend.c:365
 msgid "Create a new mail account"
 msgstr "Направите нови налог за пошту"
 
-#: ../modules/mail/e-mail-shell-backend.c:331
+#: ../modules/mail/e-mail-shell-backend.c:370
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Фасцикла за пошту"
 
-#: ../modules/mail/e-mail-shell-backend.c:333
+#: ../modules/mail/e-mail-shell-backend.c:372
 msgid "Create a new mail folder"
 msgstr "Направите нову фасциклу за пошту"
 
-#: ../modules/mail/e-mail-shell-backend.c:644
+#: ../modules/mail/e-mail-shell-backend.c:687
 msgid "Mail Accounts"
 msgstr "Поштански налози"
 
-#: ../modules/mail/e-mail-shell-backend.c:653
+#: ../modules/mail/e-mail-shell-backend.c:696
 msgid "Mail Preferences"
 msgstr "Поставке поште"
 
-#: ../modules/mail/e-mail-shell-backend.c:662
+#: ../modules/mail/e-mail-shell-backend.c:705
 msgid "Composer Preferences"
 msgstr "Поставке састављача"
 
-#: ../modules/mail/e-mail-shell-backend.c:672
+#: ../modules/mail/e-mail-shell-backend.c:715
 msgid "Network Preferences"
 msgstr "Поставке мреже"
 
@@ -18875,131 +22034,152 @@ msgstr "Поставке мреже"
 # is not permitted.
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:964
+#: ../modules/mail/e-mail-shell-backend.c:1007
 msgctxt "label"
 msgid "None"
 msgstr "Ништа"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:670
+#: ../modules/mail/e-mail-shell-view-actions.c:713
 msgid "Marking messages as read..."
 msgstr "Означавам поруке прочитаним..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1512
+#: ../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 "_Изабери"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
 msgid "_Disable Account"
 msgstr "_Онемогући налог"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1514
+#: ../modules/mail/e-mail-shell-view-actions.c:1633
 msgid "Disable this account"
 msgstr "Искључите овај налог"
 
-#: ../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 "Трајно уклоните све обрисане поруке из свих фасцикли"
 
-#: ../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 "Измените особине овог налога"
 
-#: ../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 "Освежите списак фасцикли за овај налог"
 
-#: ../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 "_Преузми поруке за рад ван мреже"
 
-#: ../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 ""
 "Преузмите поруке за налоге и фасцикле које су означене за рад ван мреже"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1547
+#: ../modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Fl_ush Outbox"
 msgstr "Ис_празни „За слање“"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1554
+#: ../modules/mail/e-mail-shell-view-actions.c:1673
 msgid "_Copy Folder To..."
 msgstr "_Умножи фасциклу у..."
 
-#: ../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 "Умножите изабрану фасциклу у другу фасциклу"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1563
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
 msgid "Permanently remove this folder"
 msgstr "Трајно уклоните ову фасциклу"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1568
+#: ../modules/mail/e-mail-shell-view-actions.c:1687
 msgid "E_xpunge"
 msgstr "Изба_ци"
 
-#: ../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 "Трајно уклоните све обрисане поруке из ове фасцикле"
 
-#: ../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 "Означи све по_руке као прочитане"
 
-#: ../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 "Означите све поруке у фасцикли као прочитане"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1582
+#: ../modules/mail/e-mail-shell-view-actions.c:1701
 msgid "_Move Folder To..."
 msgstr "_Премести фасциклу у..."
 
-#: ../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 "Преместите изабрану фасциклу у другу фасциклу"
 
-#: ../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 "_Ново..."
 
-#: ../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 "Направите нову фасциклу за смештај поште"
 
-#: ../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 "Измените особине ове фасцикле"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1605
+#: ../modules/mail/e-mail-shell-view-actions.c:1725
 msgid "Refresh the folder"
 msgstr "Освежите фасциклу"
 
-#: ../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 "Промените назив ове фасцикле"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1617
+#: ../modules/mail/e-mail-shell-view-actions.c:1737
 msgid "Select Message _Thread"
 msgstr "Изабери _расправу"
 
-#: ../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 "Означите све поруке исте расправе као изабрану поруку"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1624
+#: ../modules/mail/e-mail-shell-view-actions.c:1744
 msgid "Select Message S_ubthread"
 msgstr "Изабери п_одниз поруке"
 
-#: ../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 "Изаберите све одговоре на тренутно изабрану поруку"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../modules/mail/e-mail-shell-view-actions.c:1758
 msgid "Empty _Trash"
 msgstr "Избаци _смеће"
 
-#: ../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 "Трајно уклоните све обрисане поруке са свих налога"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1645
+#: ../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 "Отвара прозорче из кога можете изабрати да одете у одређену фасциклу"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1772
 msgid "_New Label"
 msgstr "_Нова ознака"
 
@@ -19008,201 +22188,201 @@ msgstr "_Нова ознака"
 # When "None" is selected we want the field to be cleared.
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
-#: ../modules/mail/e-mail-shell-view-actions.c:1654
+#: ../modules/mail/e-mail-shell-view-actions.c:1781
 msgid "N_one"
 msgstr "Н_ишта"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1668
+#: ../modules/mail/e-mail-shell-view-actions.c:1795
 msgid "_Manage Subscriptions"
 msgstr "_Управљај пријавама"
 
-#: ../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 "Пријавите се или се одјавите са фасцикли на мрежним серверима"
 
-#: ../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 "Слање / п_римање"
 
-#: ../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 "Пошаљите припремљене и довуците нове ставке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1689
+#: ../modules/mail/e-mail-shell-view-actions.c:1816
 msgid "R_eceive All"
 msgstr "П_рими све"
 
-#: ../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 "Примите нове ставке са свих налога"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1823
 msgid "_Send All"
 msgstr "П_ошаљи све"
 
-#: ../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 "Пошаљите ставке на чекању у свим налозима"
 
-#: ../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 "Откажите тренутну операцију са поштом"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1731
+#: ../modules/mail/e-mail-shell-view-actions.c:1858
 msgid "Collapse All _Threads"
 msgstr "Скупи све _расправе"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1733
+#: ../modules/mail/e-mail-shell-view-actions.c:1860
 msgid "Collapse all message threads"
 msgstr "Скупите целокупно гранање расправа"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1738
+#: ../modules/mail/e-mail-shell-view-actions.c:1865
 msgid "E_xpand All Threads"
 msgstr "Разгранај све ра_справе"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1740
+#: ../modules/mail/e-mail-shell-view-actions.c:1867
 msgid "Expand all message threads"
 msgstr "Разгранајте све поруке у расправама"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1745
+#: ../modules/mail/e-mail-shell-view-actions.c:1872
 msgid "_Message Filters"
 msgstr "_Пропусници порука"
 
-#: ../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 "Направите или уредите правила за издвајање нове поште"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1752
+#: ../modules/mail/e-mail-shell-view-actions.c:1879
 msgid "_Subscriptions..."
 msgstr "_Пријаве..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1761
+#: ../modules/mail/e-mail-shell-view-actions.c:1888
 msgid "F_older"
 msgstr "_Фасцикла"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1768
+#: ../modules/mail/e-mail-shell-view-actions.c:1895
 msgid "_Label"
 msgstr "_Натпис"
 
-#: ../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 "Направи _фасциклу претраге из претраге..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1792
+#: ../modules/mail/e-mail-shell-view-actions.c:1919
 msgid "Search F_olders"
 msgstr "Фас_цикле претраге"
 
-#: ../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 "Направите или уредите дефиниције фасцикле претраге"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1833
+#: ../modules/mail/e-mail-shell-view-actions.c:1960
 msgid "_New Folder..."
 msgstr "_Нова фасцикла..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1861
+#: ../modules/mail/e-mail-shell-view-actions.c:1988
 msgid "Show Message _Preview"
 msgstr "Прика_жи преглед поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1863
+#: ../modules/mail/e-mail-shell-view-actions.c:1990
 msgid "Show message preview pane"
 msgstr "Прикажите преглед поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1869
+#: ../modules/mail/e-mail-shell-view-actions.c:1996
 msgid "Show _Deleted Messages"
 msgstr "Прикажи о_брисане поруке"
 
-#: ../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 "Прикажите обрисане поруке (као прецртане)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1877
+#: ../modules/mail/e-mail-shell-view-actions.c:2004
 msgid "_Group By Threads"
 msgstr "Групиши по _расправама"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1879
+#: ../modules/mail/e-mail-shell-view-actions.c:2006
 msgid "Threaded message list"
 msgstr "Списак порука по темама"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1885
+#: ../modules/mail/e-mail-shell-view-actions.c:2012
 msgid "_Unmatched Folder Enabled"
 msgstr "Укључена _непоклопљена фасцикла"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1887
+#: ../modules/mail/e-mail-shell-view-actions.c:2014
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Окида приликом укључивања непоклопљене фасцикле претраге"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1907
+#: ../modules/mail/e-mail-shell-view-actions.c:2034
 msgid "Show message preview below the message list"
 msgstr "Прикажите преглед поруке испод листе порука"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1914
+#: ../modules/mail/e-mail-shell-view-actions.c:2041
 msgid "Show message preview alongside the message list"
 msgstr "Прикажите преглед поруке поред списка порука"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1922
+#: ../modules/mail/e-mail-shell-view-actions.c:2049
 msgid "All Messages"
 msgstr "Све поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1929
+#: ../modules/mail/e-mail-shell-view-actions.c:2056
 msgid "Important Messages"
 msgstr "Важне поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1936
+#: ../modules/mail/e-mail-shell-view-actions.c:2063
 msgid "Last 5 Days' Messages"
 msgstr "Поруке у задњих 5 дана"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1943
+#: ../modules/mail/e-mail-shell-view-actions.c:2070
 msgid "Messages Not Junk"
 msgstr "Поруке нису ђубре"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1950
+#: ../modules/mail/e-mail-shell-view-actions.c:2077
 msgid "Messages with Attachments"
 msgstr "Поруке са прилозима"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1957
+#: ../modules/mail/e-mail-shell-view-actions.c:2084
 msgid "No Label"
 msgstr "Без ознаке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1964
+#: ../modules/mail/e-mail-shell-view-actions.c:2091
 msgid "Read Messages"
 msgstr "Прочитане поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1971
+#: ../modules/mail/e-mail-shell-view-actions.c:2098
 msgid "Unread Messages"
 msgstr "Непрочитане поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2023
+#: ../modules/mail/e-mail-shell-view-actions.c:2157
 msgid "Subject or Addresses contain"
 msgstr "Наслов или адресе садрже"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:2033
+#: ../modules/mail/e-mail-shell-view-actions.c:2167
 msgid "All Accounts"
 msgstr "свим налозима"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:2040
+#: ../modules/mail/e-mail-shell-view-actions.c:2174
 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:2047
+#: ../modules/mail/e-mail-shell-view-actions.c:2181
 msgid "Current Folder"
 msgstr "текућој фасцикли"
 
-#: ../modules/mail/e-mail-shell-view.c:636
+#: ../modules/mail/e-mail-shell-view.c:700
 msgid "All Account Search"
 msgstr "Претрага свих налога"
 
-#: ../modules/mail/e-mail-shell-view.c:744
+#: ../modules/mail/e-mail-shell-view.c:808
 msgid "Account Search"
 msgstr "Претрага налога"
 
-#: ../modules/mail/e-mail-shell-view-private.c:972
+#: ../modules/mail/e-mail-shell-view-private.c:954
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -19211,8 +22391,8 @@ msgstr[1] "%d изабране, "
 msgstr[2] "%d изабраних, "
 msgstr[3] "%d изабрана, "
 
-#: ../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:963
+#: ../modules/mail/e-mail-shell-view-private.c:980
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -19221,8 +22401,8 @@ msgstr[1] "%d обрисане"
 msgstr[2] "%d обрисаних"
 msgstr[3] "%d обрисана"
 
-#: ../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:989
+#: ../modules/mail/e-mail-shell-view-private.c:995
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -19231,7 +22411,7 @@ msgstr[1] "%d непожељне"
 msgstr[2] "%d непожељних"
 msgstr[3] "%d непожељна"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1020
+#: ../modules/mail/e-mail-shell-view-private.c:1002
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -19240,7 +22420,7 @@ msgstr[1] "%d нацрта"
 msgstr[2] "%d нацрта"
 msgstr[3] "%d нацрт"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1008
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -19249,7 +22429,7 @@ msgstr[1] "%d непослате"
 msgstr[2] "%d непослатих"
 msgstr[3] "%d непослата"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1032
+#: ../modules/mail/e-mail-shell-view-private.c:1014
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -19258,90 +22438,94 @@ msgstr[1] "%d послате"
 msgstr[2] "%d послатих"
 msgstr[3] "%d послата"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1044
+#: ../modules/mail/e-mail-shell-view-private.c:1031
 #, c-format
-msgid "%d unread, "
-msgid_plural "%d unread, "
-msgstr[0] "%d непрочитана, "
-msgstr[1] "%d непрочитане, "
-msgstr[2] "%d непрочитаних, "
-msgstr[3] "%d непрочитана, "
+#| msgid "%d unread, "
+#| msgid_plural "%d unread, "
+msgid "%d unread"
+msgid_plural "%d unread"
+msgstr[0] "%d непрочитана"
+msgstr[1] "%d непрочитане"
+msgstr[2] "%d непрочитаних"
+msgstr[3] "%d непрочитана"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1047
-#, c-format
-msgid "%d total"
-msgid_plural "%d total"
-msgstr[0] "%d укупно"
-msgstr[1] "%d укупно"
-msgstr[2] "%d укупно"
-msgstr[3] "%d укупно"
-
-#: ../modules/mail/e-mail-shell-view-private.c:1068
-msgid "Trash"
-msgstr "Смеће"
-
-#: ../modules/mail/e-mail-shell-view-private.c:1505
+#: ../modules/mail/e-mail-shell-view-private.c:1549
 msgid "Send / Receive"
 msgstr "Пошаљи / Прими"
 
-#: ../modules/mail/em-composer-prefs.c:443
-#| msgid "Select Folder"
+#: ../modules/mail/em-composer-prefs.c:414
 msgid "Select Folder to Add"
 msgstr "Изаберите фасциклу за додавање"
 
-#: ../modules/mail/em-composer-prefs.c:888
-#| msgid "F_older"
+#: ../modules/mail/em-composer-prefs.c:884
 msgid "Folder"
 msgstr "Фасцикла"
 
-#: ../modules/mail/em-composer-prefs.c:924
-#| msgid "Recipients"
+#: ../modules/mail/em-composer-prefs.c:920
 msgid "Recipient"
 msgstr "Прималац"
 
-#: ../modules/mail/em-composer-prefs.c:1195
+#: ../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
 msgid "Language(s)"
 msgstr "Језик(ци)"
 
 # bug: requires a comment on usage
 # слично као за месеце и недеље
-#: ../modules/mail/em-mailer-prefs.c:80
+#: ../modules/mail/em-mailer-prefs.c:79
 msgid "On exit, every time"
 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 day"
-msgstr "При изласку, једном дневно"
+#| 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 week"
-msgstr "При изласку, једном недељено"
+#| msgid "On exit, once per month"
+msgid "Once per month"
+msgstr "Једном током месеца"
 
-# bug: requires a comment on usage
 #: ../modules/mail/em-mailer-prefs.c:83
-msgid "On exit, once per month"
-msgstr "При изласку, једном месечно"
-
-#: ../modules/mail/em-mailer-prefs.c:84
 msgid "Immediately, on folder leave"
 msgstr "Одмах, при напуштању фасцикле"
 
-#: ../modules/mail/em-mailer-prefs.c:355
+#: ../modules/mail/em-mailer-prefs.c:420
 msgid "Header"
 msgstr "Заглавље"
 
-#: ../modules/mail/em-mailer-prefs.c:359
+#: ../modules/mail/em-mailer-prefs.c:424
 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:1214
+#: ../modules/mail/em-mailer-prefs.c:1554
 msgid "_Date header:"
 msgstr "Заглавље _датума:"
 
-#: ../modules/mail/em-mailer-prefs.c:1215
+#: ../modules/mail/em-mailer-prefs.c:1555
 msgid "Show _original header value"
 msgstr "Прикажи _оригиналну вредност заглавља"
 
@@ -19351,24 +22535,24 @@ msgstr "Да ли желите да Еволуцију учините подра
 
 #. 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 "Ваша порука за %s на тему „%s“ на %s је прочитана."
 
 #. 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 "Обавештење о пријему за „%s“"
 
-#: ../modules/mdn/evolution-mdn.c:539
+#: ../modules/mdn/evolution-mdn.c:531
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "Пошаљи повратницу читања за „%s“"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:544
+#: ../modules/mdn/evolution-mdn.c:536
 msgid "_Notify Sender"
 msgstr "Обавести _пошиљаоца"
 
@@ -19412,20 +22596,20 @@ msgstr "Управник прикључака"
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Напомена: неке измене неће бити укључене пре поновног покретања"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:297
+#: ../modules/plugin-manager/evolution-plugin-manager.c:296
 msgid "Overview"
 msgstr "Преглед"
 
-#: ../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 "Прикључак"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:487
+#: ../modules/plugin-manager/evolution-plugin-manager.c:486
 msgid "_Plugins"
 msgstr "_Прикључци"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:488
+#: ../modules/plugin-manager/evolution-plugin-manager.c:487
 msgid "Enable and disable plugins"
 msgstr "Укључује и искључује додатке"
 
@@ -19445,22 +22629,22 @@ msgstr "Прикажи ХТМЛ издање"
 msgid "Display HTML version of multipart/alternative message"
 msgstr "Приказује издање ХТМЛ-а поруке из више делова или неке друге"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:77
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
 #: ../modules/prefer-plain/plugin/config-ui.c:43
 msgid "Show HTML if present"
 msgstr "Прикажи ХТМЛ ако постоји"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
 #: ../modules/prefer-plain/plugin/config-ui.c:44
 msgid "Let Evolution choose the best part to show."
 msgstr "Пушта да Еволуција изабере најбољи део за приказ."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:81
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
 #: ../modules/prefer-plain/plugin/config-ui.c:47
 msgid "Show plain text if present"
 msgstr "Прикажи обичан текст ако постоји"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
 #: ../modules/prefer-plain/plugin/config-ui.c:48
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
@@ -19469,12 +22653,12 @@ msgstr ""
 "Приказује део са обичним текстом, ако постоји, иначе пушта да Еволуција "
 "изабере најбољи део за приказ."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:86
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
 #: ../modules/prefer-plain/plugin/config-ui.c:52
 msgid "Only ever show plain text"
 msgstr "Искључиво приказуј обичан текст"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
 #: ../modules/prefer-plain/plugin/config-ui.c:53
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
@@ -19504,57 +22688,63 @@ msgstr "Модел текста"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "Прегледа поруке као обичан текст, чак и ако садрже ХТМЛ."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:150
+#: ../modules/spamassassin/evolution-spamassassin.c:187
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
-msgstr "Нисам успео да изродим Убицу спама (%s): "
+msgstr "Не могу да изродим Убицу спама (%s): "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:173
+#: ../modules/spamassassin/evolution-spamassassin.c:210
 msgid "Failed to stream mail message content to SpamAssassin: "
-msgstr "Нисам успео да пошаљем садржај поруке поште до Убице спама: "
+msgstr "Не могу да пошаљем садржај поруке поште до Убице спама: "
 
 # 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 "Нисам успео да запишем „%s“ у Убици спама: "
+msgstr "Не могу да запишем „%s“ у Убици спама: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:220
+#: ../modules/spamassassin/evolution-spamassassin.c:257
 msgid "Failed to read output from SpamAssassin: "
-msgstr "Нисам успео да прочитам излаз из Убице спама: "
+msgstr "Не могу да прочитам излаз из Убице спама: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:275
+#: ../modules/spamassassin/evolution-spamassassin.c:312
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr "Или се Убица спама урушио или није успео да анализира поруку поште"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:355
+#: ../modules/spamassassin/evolution-spamassassin.c:535
 msgid "SpamAssassin Options"
 msgstr "Опције Убице спама"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:370
+#: ../modules/spamassassin/evolution-spamassassin.c:550
 msgid "I_nclude remote tests"
 msgstr "У_кључи мрежне провере"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:384
+#: ../modules/spamassassin/evolution-spamassassin.c:564
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "Ово ће Убицу спама учинити поузданијим , али споријим."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:558
+#: ../modules/spamassassin/evolution-spamassassin.c:739
+#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
 msgid "SpamAssassin"
 msgstr "Убица спама"
 
+#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
+#| msgid "Junk filtering software:"
+msgid "Junk filter using SpamAssassin"
+msgstr "Филтер непожељне поруке помоћу 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 "Увозим датотеке"
 
-#: ../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 "Увожење је отказано."
 
-#: ../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 "Увожење је завршено."
 
@@ -19582,11 +22772,11 @@ msgstr "Обликуј _као..."
 msgid "_Other languages"
 msgstr "_Други језици"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:481
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:438
 msgid "Text Highlight"
 msgstr "Истицање текста"
 
-#: ../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 "Истицање садржаја делова поште"
 
@@ -19615,10 +22805,6 @@ msgstr "_Ц#"
 msgid "_Cascade Style Sheet"
 msgstr "_Каскадни стил листа"
 
-#: ../modules/text-highlight/languages.c:72
-msgid "_HTML"
-msgstr "_ХТМЛ"
-
 #: ../modules/text-highlight/languages.c:80
 msgid "_Java"
 msgstr "_Јава"
@@ -19781,30 +22967,26 @@ msgid "_Prolog"
 msgstr "_Пролог"
 
 #: ../modules/text-highlight/languages.c:323
-msgid "_PostScript"
-msgstr "_Постскрипт"
-
-#: ../modules/text-highlight/languages.c:328
 msgid "_R"
 msgstr "_Ð "
 
-#: ../modules/text-highlight/languages.c:333
+#: ../modules/text-highlight/languages.c:328
 msgid "_RPM Spec"
 msgstr "_РПМ навод"
 
-#: ../modules/text-highlight/languages.c:338
+#: ../modules/text-highlight/languages.c:333
 msgid "_Scala"
 msgstr "_Размера"
 
-#: ../modules/text-highlight/languages.c:343
+#: ../modules/text-highlight/languages.c:338
 msgid "_Smalltalk"
 msgstr "_Смолток"
 
-#: ../modules/text-highlight/languages.c:349
+#: ../modules/text-highlight/languages.c:344
 msgid "_TCSH"
 msgstr "_ТЦСХ"
 
-#: ../modules/text-highlight/languages.c:354
+#: ../modules/text-highlight/languages.c:349
 msgid "_VHDL"
 msgstr "_ВХДЛ"
 
@@ -19847,11 +23029,11 @@ msgstr "Прикажите делове као контакт адресара"
 msgid "Evolution Web Inspector"
 msgstr "Надзорник веба Еволуције"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:122
+#: ../plugins/attachment-reminder/attachment-reminder.c:126
 msgid "_Do not show this message again."
 msgstr "_Не приказуј поново ову поруку."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:584
+#: ../plugins/attachment-reminder/attachment-reminder.c:465
 #: ../plugins/templates/templates.c:478
 msgid "Keywords"
 msgstr "Кључне речи"
@@ -19884,35 +23066,35 @@ msgstr "Подсетник прилога"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "Подсећа када заборавите да додате прилог у поруку."
 
-#: ../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 "Аутоматски контакти"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:660
+#: ../plugins/bbdb/bbdb.c:739
 msgid "Create _address book entries when sending mails"
 msgstr "Направи уносе у _адресар при слању поште"
 
-#: ../plugins/bbdb/bbdb.c:667
+#: ../plugins/bbdb/bbdb.c:749
 msgid "Select Address book for Automatic Contacts"
 msgstr "Изабери адресар за Аутоматске контакте"
 
-#: ../plugins/bbdb/bbdb.c:684
+#: ../plugins/bbdb/bbdb.c:769
 msgid "Instant Messaging Contacts"
 msgstr "Контакти тренутних порука"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:784
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "_Усклађује слике и податке контакта са листом другара из Пиџина"
 
-#: ../plugins/bbdb/bbdb.c:706
+#: ../plugins/bbdb/bbdb.c:794
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Бира адресар за листу пријатеља Пиџина"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:719
+#: ../plugins/bbdb/bbdb.c:810
 msgid "Synchronize with _buddy list now"
 msgstr "Усклади са _листом другара сада"
 
@@ -19998,12 +23180,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "Ништа"
 
-#: ../plugins/email-custom-header/email-custom-header.c:538
+#: ../plugins/email-custom-header/email-custom-header.c:539
 msgid "_Custom Header"
 msgstr "_Прилагођено заглавље"
 
 #. 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 +23193,11 @@ msgstr ""
 "Формат за навођење кључа прилагођеног заглавља је:\n"
 "Вредности назив кључа прилагођеног заглавља су раздвојени са „;“."
 
-#: ../plugins/email-custom-header/email-custom-header.c:861
+#: ../plugins/email-custom-header/email-custom-header.c:862
 msgid "Key"
 msgstr "Кључ"
 
-#: ../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 "Вредности"
@@ -20049,8 +23231,8 @@ msgstr ""
 msgid "_Automatically launch when a new mail is edited"
 msgstr "_Сам покрени када је нова порука измењена"
 
-#: ../plugins/external-editor/external-editor.c:417
-#: ../plugins/external-editor/external-editor.c:419
+#: ../plugins/external-editor/external-editor.c:484
+#: ../plugins/external-editor/external-editor.c:486
 msgid "Compose in External Editor"
 msgstr "Саставља у спољном уређивачу"
 
@@ -20098,23 +23280,27 @@ msgstr ""
 "Покренут је спољни уређивач. Прозор састављача поруке није могуће затворити "
 "док је активан уређивач."
 
-#: ../plugins/face/face.c:288
+#: ../plugins/face/face.c:294
 msgid "Select a Face Picture"
 msgstr "Изаберите слику лица"
 
-#: ../plugins/face/face.c:298
+#: ../plugins/face/face.c:304
 msgid "Image files"
 msgstr "Датотеке слика"
 
-#: ../plugins/face/face.c:357
+#: ../plugins/face/face.c:392
 msgid "_Insert Face picture by default"
 msgstr "_Унапред уметни слику контакта"
 
-#: ../plugins/face/face.c:370
+#: ../plugins/face/face.c:405
 msgid "Load new _Face picture"
 msgstr "Учитај нову _слику контакта"
 
-#: ../plugins/face/face.c:431
+#: ../plugins/face/face.c:449
+msgid "Change Face Image"
+msgstr "Мења постојећу слику контакта"
+
+#: ../plugins/face/face.c:537
 msgid "Include _Face"
 msgstr "Укључи _слику"
 
@@ -20135,25 +23321,35 @@ msgid "Invalid Image Size"
 msgstr "Неисправна величина слике"
 
 #: ../plugins/face/org-gnome-face.error.xml.h:4
-msgid "Please select an image of size 48 * 48"
-msgstr "Изаберите слику величине 48 * 48"
+msgid ""
+"Please select a PNG image of size 48 * 48 pixels, whose file size doesn't "
+"exceed 723 bytes."
+msgstr ""
+"Изаберите ПНГ слику од 48x48 пиксела, чија величина не прелази 723 бајта."
 
 #: ../plugins/face/org-gnome-face.error.xml.h:5
-msgid "Not an image"
-msgstr "Није слика"
+msgid "Incorrect Face Image Byte Size"
+msgstr "Неисправна величина слике у бајтима"
 
 #: ../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 ""
-"Изабрана датотека изгледа да није слика исправног „.png“ формата. Грешка: {0}"
+"Величина слике за контакт је {0} бајта, иако она не сме бити већа од 723 "
+"бајта. Изаберите ПНГ слику од 48x48 пиксела, чина величина не прелази 723 "
+"бајта."
 
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
-msgid "Inline Image"
-msgstr "Унутрашња слика"
+#: ../plugins/face/org-gnome-face.error.xml.h:7
+msgid "Not an image"
+msgstr "Није слика"
 
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
-msgid "View image attachments directly in mail messages."
-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
 msgid "Get List _Archive"
@@ -20292,8 +23488,8 @@ msgstr ""
 "\n"
 "Заглавље: {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 +23500,55 @@ msgstr[3] "Примили сте нову поруку."
 
 #. 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 "Шаље: %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 "Наслов: %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 "Нова пошта у Еволуцији"
 
 #. 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 "Прикажи %s"
 
-#: ../plugins/mail-notification/mail-notification.c:661
+#: ../plugins/mail-notification/mail-notification.c:685
 msgid "_Play sound when a new message arrives"
 msgstr "Звучно _обавести када стигне нова порука"
 
-#: ../plugins/mail-notification/mail-notification.c:693
+#: ../plugins/mail-notification/mail-notification.c:717
 msgid "_Beep"
 msgstr "_Запишти"
 
-#: ../plugins/mail-notification/mail-notification.c:706
+#: ../plugins/mail-notification/mail-notification.c:730
 msgid "Use sound _theme"
 msgstr "Користи звук _теме"
 
-#: ../plugins/mail-notification/mail-notification.c:725
+#: ../plugins/mail-notification/mail-notification.c:749
 msgid "Play _file:"
 msgstr "Пусти звучну _датотеку:"
 
-#: ../plugins/mail-notification/mail-notification.c:734
+#: ../plugins/mail-notification/mail-notification.c:758
 msgid "Select sound file"
 msgstr "Изаберите звучну датотеку"
 
-#: ../plugins/mail-notification/mail-notification.c:790
+#: ../plugins/mail-notification/mail-notification.c:835
 msgid "Notify new messages for _Inbox only"
 msgstr "Обавести о новим порукама само за _Сандуче"
 
-#: ../plugins/mail-notification/mail-notification.c:800
+#: ../plugins/mail-notification/mail-notification.c:851
 msgid "Show _notification when a new message arrives"
 msgstr "Прикажи _обавештење када пристигне нова порука"
 
@@ -20370,7 +23566,28 @@ msgstr "Обавештава вас када стигне нова порука.
 msgid "Created from a mail by %s"
 msgstr "Сачињено из поруке коју шаље %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:594
+#| msgid "_Cancel"
+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"
+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"
+msgctxt "mail-to-task"
+msgid "_New"
+msgstr "_Нови"
+
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -20379,7 +23596,7 @@ msgstr ""
 "Изабрани календар већ садржи догађај „%s“. Желите ли да уредите стари "
 "догађај?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:616
+#: ../plugins/mail-to-task/mail-to-task.c:619
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -20387,7 +23604,7 @@ msgid ""
 msgstr ""
 "Изабрани списак већ садржи задатак „%s“. Желите ли да уредите стари задатак?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:619
+#: ../plugins/mail-to-task/mail-to-task.c:622
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -20395,7 +23612,7 @@ msgid ""
 msgstr ""
 "Изабрани списак већ садржи белешку „%s“. Желите ли да уредите стару белешку?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:639
+#: ../plugins/mail-to-task/mail-to-task.c:642
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -20416,7 +23633,7 @@ msgstr[3] ""
 "Изабрали сте %d пошта да преведете у догађаје. Да ли заиста желите све да их "
 "додате?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:646
+#: ../plugins/mail-to-task/mail-to-task.c:649
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -20437,7 +23654,7 @@ msgstr[3] ""
 "Изабрали сте %d пошта да преведете у задатке. Да ли заиста желите све да их "
 "додате?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:653
+#: ../plugins/mail-to-task/mail-to-task.c:656
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -20458,29 +23675,29 @@ msgstr[3] ""
 "Изабрали сте %d пошта да преведете у белешке. Да ли заиста желите све да их "
 "додате?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:674
+#: ../plugins/mail-to-task/mail-to-task.c:677
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Да ли желите да наставите са превођењем преосталих пошта?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:750
+#: ../plugins/mail-to-task/mail-to-task.c:753
 msgid "[No Summary]"
 msgstr "[Без сажетка]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:763
+#: ../plugins/mail-to-task/mail-to-task.c:766
 msgid "Invalid object returned from a server"
 msgstr "Неисправан објекат враћен са сервера"
 
-#: ../plugins/mail-to-task/mail-to-task.c:818
+#: ../plugins/mail-to-task/mail-to-task.c:821
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Дошло је до грешке у обради: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:852
+#: ../plugins/mail-to-task/mail-to-task.c:857
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Не могу да отворим календар. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:856
+#: ../plugins/mail-to-task/mail-to-task.c:861
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -20488,7 +23705,7 @@ msgstr ""
 "Изабрани календар је само за читање, стога не можете направити догађај. "
 "Изаберите други календар."
 
-#: ../plugins/mail-to-task/mail-to-task.c:859
+#: ../plugins/mail-to-task/mail-to-task.c:864
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
@@ -20496,7 +23713,7 @@ msgstr ""
 "Изабрани списак задатака је само за читање, стога не можете направити "
 "задатак. Изаберите други списак задатака."
 
-#: ../plugins/mail-to-task/mail-to-task.c:862
+#: ../plugins/mail-to-task/mail-to-task.c:867
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
@@ -20504,35 +23721,35 @@ msgstr ""
 "Изабрани списак белешки је само за читање, стога не можете направити "
 "белешку. Изаберите други списак белешки."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1261
+#: ../plugins/mail-to-task/mail-to-task.c:1269
 msgid "Create an _Appointment"
 msgstr "Направи _заказивање"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1263
+#: ../plugins/mail-to-task/mail-to-task.c:1271
 msgid "Create a new event from the selected message"
 msgstr "Прави нови догађај од изабране поруке"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1268
+#: ../plugins/mail-to-task/mail-to-task.c:1276
 msgid "Create a Mem_o"
 msgstr "Направи белешк_у"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1270
+#: ../plugins/mail-to-task/mail-to-task.c:1278
 msgid "Create a new memo from the selected message"
 msgstr "Прави нову белешку од изабране поруке"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1275
+#: ../plugins/mail-to-task/mail-to-task.c:1283
 msgid "Create a _Task"
 msgstr "Направи _задатак"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1277
+#: ../plugins/mail-to-task/mail-to-task.c:1285
 msgid "Create a new task from the selected message"
 msgstr "Прави нови задатак од изабране поруке"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1285
+#: ../plugins/mail-to-task/mail-to-task.c:1293
 msgid "Create a _Meeting"
 msgstr "Направи _састанак"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1287
+#: ../plugins/mail-to-task/mail-to-task.c:1295
 msgid "Create a new meeting from the selected message"
 msgstr "Прави нови састанак од изабране поруке"
 
@@ -20613,25 +23830,20 @@ msgstr "Објављивање на %s је успешно завршено"
 #: ../plugins/publish-calendar/publish-calendar.c:290
 #, c-format
 msgid "Mount of %s failed:"
-msgstr "Нисам успео да монтирам %s:"
-
-#: ../plugins/publish-calendar/publish-calendar.c:655
-#: ../plugins/publish-calendar/publish-calendar.ui.h:35
-msgid "E_nable"
-msgstr "О_могући"
+msgstr "Не могу да монтирам %s:"
 
-#: ../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 "Сигурно желите да уклоните ову локацију?"
 
 #. 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 "Не могу да објавим расправу."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1152
+#: ../plugins/publish-calendar/publish-calendar.c:1107
 msgid "_Publish Calendar Information"
 msgstr "Објави распоред из _календара"
 
@@ -20712,6 +23924,7 @@ msgid "_Username:"
 msgstr "_Корисничко име:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:29
+#: ../smime/gui/certificate-manager.c:774
 msgid "_Password:"
 msgstr "_Лозинка:"
 
@@ -20723,8 +23936,8 @@ msgstr "_Запамти лозинку"
 msgid "Publishing Location"
 msgstr "Место објављивања"
 
-#: ../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 "Неисправан ЈИБ извора „%s“"
@@ -20816,7 +24029,7 @@ msgstr "_Обавиј вредности са:"
 msgid "Comma separated values (.csv)"
 msgstr "Вредности раздвојене зарезом (.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 "иКалендар (.ics)"
 
@@ -20841,16 +24054,15 @@ msgstr "%FT%T"
 msgid "RDF (.rdf)"
 msgstr "РДФ (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:120
+#: ../plugins/save-calendar/save-calendar.c:119
 msgid "_Format:"
 msgstr "_Формат:"
 
-#: ../plugins/save-calendar/save-calendar.c:186
+#: ../plugins/save-calendar/save-calendar.c:184
 msgid "Select destination file"
 msgstr "Изаберите одредишну датотеку"
 
-#: ../plugins/save-calendar/save-calendar.c:190
-#| msgid "_Save"
+#: ../plugins/save-calendar/save-calendar.c:188
 msgid "_Save As"
 msgstr "_Сачувај као"
 
@@ -20876,34 +24088,55 @@ msgstr ""
 "$ORIG[тема], $ORIG[шаље], $ORIG[прима] or $ORIG[порука], које ће бити "
 "замењене вредностима из ел. поште на коју одговарате."
 
-#: ../plugins/templates/templates.c:1146
+#: ../plugins/templates/templates.c:1245
 msgid "No Title"
 msgstr "Без звања"
 
-#: ../plugins/templates/templates.c:1255
+#: ../plugins/templates/templates.c:1354
 msgid "Save as _Template"
 msgstr "Сачувај као _шаблон"
 
-#: ../plugins/templates/templates.c:1257
+#: ../plugins/templates/templates.c:1356
 msgid "Save as Template"
 msgstr "Чува као шаблон"
 
-#: ../shell/e-shell.c:302
+#: ../shell/e-shell.c:337
 msgid "Preparing to go offline..."
 msgstr "Припремам се за рад ван мреже..."
 
-#: ../shell/e-shell.c:355
+#: ../shell/e-shell.c:390
 msgid "Preparing to go online..."
 msgstr "Припремам се за рад на мрежи..."
 
-#: ../shell/e-shell.c:436
+#: ../shell/e-shell.c:501
 msgid "Preparing to quit"
 msgstr "Припремам се да изађем"
 
-#: ../shell/e-shell.c:442
+#: ../shell/e-shell.c:507
 msgid "Preparing to quit..."
 msgstr "Припремам се да изађем..."
 
+#: ../shell/e-shell.c:1024
+msgid "Credentials are required to connect to the destination host."
+msgstr "Потребна су овлашћења за приступање циљном, удаљеном рачунару."
+
+#: ../shell/e-shell.c:1203 ../shell/e-shell-window-actions.c:827
+msgid "New _Window"
+msgstr "Нови _прозор"
+
+#: ../shell/e-shell.c:1214
+#| msgid "_Quick Reference"
+msgid "Quick _Reference"
+msgstr "Кратак _подсетник"
+
+#: ../shell/e-shell.c:1216 ../shell/e-shell-window-actions.c:764
+msgid "_About"
+msgstr "_О програму"
+
+#: ../shell/e-shell.c:1217 ../shell/e-shell-window-actions.c:862
+msgid "_Quit"
+msgstr "_Изађи"
+
 #: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
 msgid "Searches"
 msgstr "Претраге"
@@ -20916,38 +24149,34 @@ msgstr "Сачувај претрагу"
 #. * 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 "Прика_жи:"
 
 #. 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 "П_ретражи:"
 
 #. 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 " _у "
 
-#: ../shell/e-shell-utils.c:174
+#: ../shell/e-shell-utils.c:176
 msgid "vCard (.vcf)"
 msgstr "вКарта (.vcf)"
 
-#: ../shell/e-shell-utils.c:198
+#: ../shell/e-shell-utils.c:200
 msgid "All Files (*)"
 msgstr "Све датотеке (*)"
 
-#: ../shell/e-shell-view.c:291
-msgid "Saving user interface state"
-msgstr "Чувам стање корисничког сучеља"
-
 #. 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 prevod org>\n"
@@ -20956,290 +24185,290 @@ msgstr ""
 "\n"
 "http://prevod.org — превод на српски језик."
 
-#: ../shell/e-shell-window-actions.c:84
+#: ../shell/e-shell-utils.c:420
 msgid "Evolution Website"
 msgstr "Веб страница Еволуције"
 
-#: ../shell/e-shell-window-actions.c:340
+#: ../shell/e-shell-view.c:292
+msgid "Saving user interface state"
+msgstr "Чувам стање корисничког сучеља"
+
+#: ../shell/e-shell-window-actions.c:277
 msgid "Categories Editor"
 msgstr "Уређивач категорија"
 
-#: ../shell/e-shell-window-actions.c:716
+#: ../shell/e-shell-window-actions.c:585
 msgid "Bug Buddy is not installed."
 msgstr "Бубаждајин помоћник није инсталиран."
 
-#: ../shell/e-shell-window-actions.c:717
+#: ../shell/e-shell-window-actions.c:586
 msgid "Bug Buddy could not be run."
 msgstr "Бубаждајин помоћник не може бити покренут."
 
-#: ../shell/e-shell-window-actions.c:895
-msgid "_About"
-msgstr "_О програму"
-
-#: ../shell/e-shell-window-actions.c:897
+#: ../shell/e-shell-window-actions.c:766
 msgid "Show information about Evolution"
 msgstr "Приказује податке о Еволуцији"
 
-#: ../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 "_Затвори прозор"
 
-#: ../shell/e-shell-window-actions.c:923
+#: ../shell/e-shell-window-actions.c:792
 msgid "_Contents"
 msgstr "_Садржај"
 
-#: ../shell/e-shell-window-actions.c:925
+#: ../shell/e-shell-window-actions.c:794
 msgid "Open the Evolution User Guide"
 msgstr "Отворите корисничко упутство Еволуције"
 
-#: ../shell/e-shell-window-actions.c:951
+#: ../shell/e-shell-window-actions.c:820
 msgid "I_mport..."
 msgstr "_Увези..."
 
-#: ../shell/e-shell-window-actions.c:953
+#: ../shell/e-shell-window-actions.c:822
 msgid "Import data from other programs"
 msgstr "Увезите податке из других програма"
 
-#: ../shell/e-shell-window-actions.c:958
-msgid "New _Window"
-msgstr "Нови _прозор"
-
-#: ../shell/e-shell-window-actions.c:960
+#: ../shell/e-shell-window-actions.c:829
 msgid "Create a new window displaying this view"
 msgstr "Отворите нов прозор за приказ овог прегледа"
 
-#: ../shell/e-shell-window-actions.c:972
+#: ../shell/e-shell-window-actions.c:841
 msgid "Available Cate_gories"
 msgstr "Доступне _категорије"
 
-#: ../shell/e-shell-window-actions.c:974
+#: ../shell/e-shell-window-actions.c:843
 msgid "Manage available categories"
 msgstr "Управљајте доступним категоријама"
 
-#: ../shell/e-shell-window-actions.c:986
+#: ../shell/e-shell-window-actions.c:855
 msgid "_Quick Reference"
 msgstr "_Кратак подсетник"
 
-#: ../shell/e-shell-window-actions.c:988
+#: ../shell/e-shell-window-actions.c:857
 msgid "Show Evolution's shortcut keys"
 msgstr "Прикажите пречице тастатуре Еволуције"
 
-#: ../shell/e-shell-window-actions.c:993
-#| msgid "Quit"
-msgid "_Quit"
-msgstr "_Изађи"
-
-#: ../shell/e-shell-window-actions.c:995
+#: ../shell/e-shell-window-actions.c:864
 msgid "Exit the program"
 msgstr "Изађите из програма"
 
-#: ../shell/e-shell-window-actions.c:1000
+#: ../shell/e-shell-window-actions.c:869
 msgid "_Advanced Search..."
 msgstr "_Напредна претрага..."
 
-#: ../shell/e-shell-window-actions.c:1002
+#: ../shell/e-shell-window-actions.c:871
 msgid "Construct a more advanced search"
 msgstr "Образујте напреднију претрагу"
 
-#: ../shell/e-shell-window-actions.c:1009
+#: ../shell/e-shell-window-actions.c:878
 msgid "Clear the current search parameters"
 msgstr "Очистите параметре тренутне претраге"
 
-#: ../shell/e-shell-window-actions.c:1014
+#: ../shell/e-shell-window-actions.c:883
 msgid "_Edit Saved Searches..."
 msgstr "_Уреди сачуване претраге..."
 
-#: ../shell/e-shell-window-actions.c:1016
+#: ../shell/e-shell-window-actions.c:885
 msgid "Manage your saved searches"
 msgstr "Управљајте вашим сачуваним претрагама"
 
-#: ../shell/e-shell-window-actions.c:1023
+#: ../shell/e-shell-window-actions.c:892
 msgid "Click here to change the search type"
 msgstr "Кликните овде да промените врсту претраге"
 
-#: ../shell/e-shell-window-actions.c:1028
+#: ../shell/e-shell-window-actions.c:897
 msgid "_Find Now"
 msgstr "Про_нађи сада"
 
-#: ../shell/e-shell-window-actions.c:1030
+#: ../shell/e-shell-window-actions.c:899
 msgid "Execute the current search parameters"
 msgstr "Извршите параметре тренутне претраге"
 
-#: ../shell/e-shell-window-actions.c:1035
+#: ../shell/e-shell-window-actions.c:904
 msgid "_Save Search..."
 msgstr "_Сачувај претрагу..."
 
-#: ../shell/e-shell-window-actions.c:1037
+#: ../shell/e-shell-window-actions.c:906
 msgid "Save the current search parameters"
 msgstr "Сачувајте параметре тренутне претраге"
 
-#: ../shell/e-shell-window-actions.c:1049
+#: ../shell/e-shell-window-actions.c:918
 msgid "Submit _Bug Report..."
 msgstr "Пошаљи извештај о _грешци..."
 
-#: ../shell/e-shell-window-actions.c:1051
+#: ../shell/e-shell-window-actions.c:920
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Пошаљите извештај о грешци Бубаждајиним помоћником"
 
-#: ../shell/e-shell-window-actions.c:1056
+#: ../shell/e-shell-window-actions.c:925
 msgid "_Work Offline"
 msgstr "Рад _ван мреже"
 
-#: ../shell/e-shell-window-actions.c:1058
+#: ../shell/e-shell-window-actions.c:927
 msgid "Put Evolution into offline mode"
 msgstr "Поставите Еволуцију у рад ван мреже"
 
-#: ../shell/e-shell-window-actions.c:1063
+#: ../shell/e-shell-window-actions.c:932
 msgid "_Work Online"
 msgstr "_Рад на мрежи"
 
-#: ../shell/e-shell-window-actions.c:1065
+#: ../shell/e-shell-window-actions.c:934
 msgid "Put Evolution into online mode"
 msgstr "Поставите Еволуцију у рад на мрежи"
 
-#: ../shell/e-shell-window-actions.c:1093
+#: ../shell/e-shell-window-actions.c:962
 msgid "Lay_out"
 msgstr "_Распоред"
 
-#: ../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 "_Ново"
+
+#: ../shell/e-shell-window-actions.c:977
 msgid "_Search"
 msgstr "Пре_тражи"
 
-#: ../shell/e-shell-window-actions.c:1114
+#: ../shell/e-shell-window-actions.c:984
 msgid "_Switcher Appearance"
 msgstr "_Изглед пребацивача"
 
-#: ../shell/e-shell-window-actions.c:1128
+#: ../shell/e-shell-window-actions.c:998
 msgid "_Window"
 msgstr "Про_зор"
 
-#: ../shell/e-shell-window-actions.c:1157
+#: ../shell/e-shell-window-actions.c:1027
 msgid "Show Side _Bar"
 msgstr "Прикажи _бочну површ"
 
-#: ../shell/e-shell-window-actions.c:1159
+#: ../shell/e-shell-window-actions.c:1029
 msgid "Show the side bar"
 msgstr "Прикажите бочну површ"
 
-#: ../shell/e-shell-window-actions.c:1165
+#: ../shell/e-shell-window-actions.c:1035
 msgid "Show _Buttons"
 msgstr "Прикажи _дугмад"
 
-#: ../shell/e-shell-window-actions.c:1167
+#: ../shell/e-shell-window-actions.c:1037
 msgid "Show the switcher buttons"
 msgstr "Прикажите дугмад пребацивача"
 
-#: ../shell/e-shell-window-actions.c:1173
+#: ../shell/e-shell-window-actions.c:1043
 msgid "Show _Status Bar"
 msgstr "Прикажи траку _стања"
 
-#: ../shell/e-shell-window-actions.c:1175
+#: ../shell/e-shell-window-actions.c:1045
 msgid "Show the status bar"
 msgstr "Прикажите траку стања"
 
-#: ../shell/e-shell-window-actions.c:1181
+#: ../shell/e-shell-window-actions.c:1051
 msgid "Show _Tool Bar"
 msgstr "Прикажи траку _алата"
 
-#: ../shell/e-shell-window-actions.c:1183
+#: ../shell/e-shell-window-actions.c:1053
 msgid "Show the tool bar"
 msgstr "Прикажите траку алата"
 
-#: ../shell/e-shell-window-actions.c:1205
+#: ../shell/e-shell-window-actions.c:1075
 msgid "_Icons Only"
 msgstr "Само _иконице"
 
-#: ../shell/e-shell-window-actions.c:1207
+#: ../shell/e-shell-window-actions.c:1077
 msgid "Display window buttons with icons only"
 msgstr "Прикажите дугмад прозора само са иконицама"
 
-#: ../shell/e-shell-window-actions.c:1212
+#: ../shell/e-shell-window-actions.c:1082
 msgid "_Text Only"
 msgstr "Само _текст"
 
-#: ../shell/e-shell-window-actions.c:1214
+#: ../shell/e-shell-window-actions.c:1084
 msgid "Display window buttons with text only"
 msgstr "Прикажите дугмад прозора само са текстом"
 
-#: ../shell/e-shell-window-actions.c:1219
+#: ../shell/e-shell-window-actions.c:1089
 msgid "Icons _and Text"
 msgstr "Иконице _и текст"
 
-#: ../shell/e-shell-window-actions.c:1221
+#: ../shell/e-shell-window-actions.c:1091
 msgid "Display window buttons with icons and text"
 msgstr "Прикажите дугмад прозора са иконицама и текстом"
 
-#: ../shell/e-shell-window-actions.c:1226
+#: ../shell/e-shell-window-actions.c:1096
 msgid "Tool_bar Style"
 msgstr "Стил тра_ке алата"
 
-#: ../shell/e-shell-window-actions.c:1228
+#: ../shell/e-shell-window-actions.c:1098
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Прикажите дугмад прозора користећи подешавања траке алата радне површи"
 
-#: ../shell/e-shell-window-actions.c:1236
+#: ../shell/e-shell-window-actions.c:1106
 msgid "Delete Current View"
 msgstr "Обриши тренутни преглед"
 
-#: ../shell/e-shell-window-actions.c:1243
+#: ../shell/e-shell-window-actions.c:1113
 msgid "Save Custom View..."
 msgstr "Сачувај прилагођен преглед..."
 
-#: ../shell/e-shell-window-actions.c:1245
+#: ../shell/e-shell-window-actions.c:1115
 msgid "Save current custom view"
 msgstr "Сачувајте тренутни кориснички преглед"
 
-#: ../shell/e-shell-window-actions.c:1252
+#: ../shell/e-shell-window-actions.c:1122
 msgid "C_urrent View"
 msgstr "Т_ренутни преглед"
 
-#: ../shell/e-shell-window-actions.c:1262
+#: ../shell/e-shell-window-actions.c:1132
 msgid "Custom View"
 msgstr "Прилагођен преглед"
 
-#: ../shell/e-shell-window-actions.c:1264
+#: ../shell/e-shell-window-actions.c:1134
 msgid "Current view is a customized view"
 msgstr "Тренутан преглед је подесио корисник"
 
-#: ../shell/e-shell-window-actions.c:1272
+#: ../shell/e-shell-window-actions.c:1142
 msgid "Page Set_up..."
 msgstr "Подешавање _странице..."
 
-#: ../shell/e-shell-window-actions.c:1274
+#: ../shell/e-shell-window-actions.c:1144
 msgid "Change the page settings for your current printer"
 msgstr "Измените поставке странице за тренутни штампач"
 
-#: ../shell/e-shell-window-actions.c:1635
+#: ../shell/e-shell-window-actions.c:1507
 #, c-format
 msgid "Switch to %s"
 msgstr "Пређи на %s"
 
-#: ../shell/e-shell-window-actions.c:1758
+#: ../shell/e-shell-window-actions.c:1630
 #, c-format
 msgid "Select view: %s"
 msgstr "Изабери преглед: %s"
 
-#: ../shell/e-shell-window-actions.c:1775
+#: ../shell/e-shell-window-actions.c:1647
 #, c-format
 msgid "Delete view: %s"
 msgstr "Обриши преглед: %s"
 
-#: ../shell/e-shell-window-actions.c:1869
+#: ../shell/e-shell-window-actions.c:1741
 msgid "Execute these search parameters"
 msgstr "Извршите ове параметре претраге"
 
-#: ../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:555
+#| msgid "New"
+msgctxt "toolbar-button"
 msgid "New"
-msgstr "Ново"
+msgstr "Нова"
 
 #. 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 — Еволуција"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:182
+#: ../shell/main.c:199
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -21274,7 +24503,7 @@ msgstr ""
 "Надамо се да ћете уживати у плодовима нашег напорног рада, и \n"
 "жељно ишчекујемо ваш допринос!\n"
 
-#: ../shell/main.c:206
+#: ../shell/main.c:223
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -21282,13 +24511,13 @@ msgstr ""
 "Хвала\n"
 "Тим Еволуције\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:229
 msgid "Do not tell me again"
 msgstr "Немој ми поново рећи"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:301
+#: ../shell/main.c:318
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -21296,40 +24525,40 @@ msgstr ""
 "Покреће Еволуцију приказујући одређене компоненте. Доступне опције су: "
 "„mail“, „calendar“, „contacts“, „tasks“ и „memos“"
 
-#: ../shell/main.c:305
+#: ../shell/main.c:322
 msgid "Apply the given geometry to the main window"
 msgstr "Примени дату геометрију на главни прозор"
 
-#: ../shell/main.c:309
+#: ../shell/main.c:326
 msgid "Start in online mode"
 msgstr "Почни рад на мрежи"
 
-#: ../shell/main.c:311
+#: ../shell/main.c:328
 msgid "Ignore network availability"
 msgstr "Занемари доступност мреже"
 
-#: ../shell/main.c:314
+#: ../shell/main.c:331
 msgid "Forcibly shut down Evolution"
 msgstr "Силом угаси Еволуцију"
 
-#: ../shell/main.c:317
+#: ../shell/main.c:334
 msgid "Disable loading of any plugins."
 msgstr "Искључи учитавање свих додатака."
 
-#: ../shell/main.c:319
+#: ../shell/main.c:336
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Искључи окно за преглед поште, контакта и задатака."
 
-#: ../shell/main.c:323
+#: ../shell/main.c:340
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Увози адресе датотека датих као остатак аргумената."
 
 # shell:noshell-reason title
-#: ../shell/main.c:325
+#: ../shell/main.c:342
 msgid "Request a running Evolution process to quit"
 msgstr "Захтева крај покренутог процеса Еволуције"
 
-#: ../shell/main.c:402
+#: ../shell/main.c:419
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
@@ -21338,11 +24567,11 @@ msgstr ""
 "Не могу да покренем Еволуцију.  Други примерак Еволуције можда не одговара. "
 "Грешка система: %s"
 
-#: ../shell/main.c:496 ../shell/main.c:501
+#: ../shell/main.c:473 ../shell/main.c:478
 msgid "- The Evolution PIM and Email Client"
 msgstr "— Еволуција руководилац личним податацима и клијент ел. поште"
 
-#: ../shell/main.c:568
+#: ../shell/main.c:536
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -21351,7 +24580,7 @@ msgstr ""
 "%s: „--online“ и „--offline“ се не могу користити заједно.\n"
 "  Покрените „%s --help“ за више података.\n"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:542
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -21399,7 +24628,113 @@ msgstr ""
 "решење можете прво да покушате да надоградите на Еволуцију 2, а затим на "
 "Еволуцију 3."
 
-#: ../smime/gui/ca-trust-dialog.c:108
+#: ../shell/shell.error.xml.h:11
+#| msgid "Unknown background operation"
+msgid "Close Evolution with pending background operations?"
+msgstr "Да ли да затворим Еволуцију и откажем тренутне радње?"
+
+#: ../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 ""
+"Еволуцији треба много времена да се искључи, што указује на могуће проблеме "
+"у мрежној вези. Да ли желите да прекинем све тренутне радне и да одмах "
+"изађем из програма?"
+
+#: ../shell/shell.error.xml.h:13
+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}“"
+
+#: ../shell/shell.error.xml.h:25
+msgid "Failed to finish trust prompt for '{0}'"
+msgstr "Не могу да завршим упит поверења за „{0}“"
+
+#: ../shell/shell.error.xml.h:26
+msgid "SSL certificate for '{0}' is not trusted."
+msgstr "ССЛ уверење за „{0}“ није од поверења."
+
+#: ../shell/shell.error.xml.h:27
+msgid "Reason: {1}"
+msgstr "Разлог: {1}"
+
+#: ../shell/shell.error.xml.h:29
+msgid "SSL certificate for address book '{0}' is not trusted."
+msgstr "ССЛ уверење за адресар „{0}“ није од поверења."
+
+#: ../shell/shell.error.xml.h:30
+msgid "SSL certificate for calendar '{0}' is not trusted."
+msgstr "ССЛ уверење за календар „{0}“ није од поверења."
+
+#: ../shell/shell.error.xml.h:31
+msgid "SSL certificate for mail account '{0}' is not trusted."
+msgstr "ССЛ уверење за налог е-поште „{0}“ није од поверења."
+
+#: ../shell/shell.error.xml.h:32
+msgid "SSL certificate for memo list '{0}' is not trusted."
+msgstr "ССЛ уверење за списак белешки „{0}“ није од поверења."
+
+#: ../shell/shell.error.xml.h:33
+msgid "SSL certificate for task list '{0}' is not trusted."
+msgstr "ССЛ уверење за списак задатака „{0}“ није од поверења."
+
+#: ../smime/gui/ca-trust-dialog.c:106
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -21410,101 +24745,293 @@ msgstr ""
 "\n"
 "Уредите поставке поверења:"
 
-#: ../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 "Назив уверења"
 
-#: ../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 "Издато је организацији"
 
-#: ../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 "Издато је организационој јединици"
 
-#: ../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 "Серијски број"
 
-#: ../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 "Намене"
 
-#: ../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 "Издавач"
 
-#: ../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 "Издала је организација"
 
-#: ../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 "Издала је организациона јединица"
 
-#: ../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 "Издато"
 
-#: ../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 "Истиче"
 
-#: ../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 "СХА1 отисак"
 
-#: ../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 "МД5 Отисак"
 
-#: ../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 "Адреса ел. поште"
 
-#: ../smime/gui/certificate-manager.c:621
+#: ../smime/gui/certificate-manager.c:652
+msgid "Select a file to backup your key and certificate..."
+msgstr "Изаберите датотеку за резервну копију кључева и уверења..."
+
+#. 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-резервна-копија.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 "Изаберите датотеку..."
+
+#: ../smime/gui/certificate-manager.c:763
+msgid "_Include certificate chain in the backup"
+msgstr "_Укључи ланац уверења у резервну копију"
+
+#. 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 ""
+"Лозинка за резервну копију уверења коју овде поставите служи да је заштити.\n"
+"Морате да поставите лозинку како би наставили са прављењем резервне копије."
+
+#: ../smime/gui/certificate-manager.c:788
+#| msgid "_Password:"
+msgid "_Repeat Password:"
+msgstr "Поновите _лозинку:"
+
+#: ../smime/gui/certificate-manager.c:807
+msgid "Passwords do not match"
+msgstr "Лозинке које сте унели нису исте"
+
+#. 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 ""
+"Важно:\n"
+"Уколико заборавите лозинку резервне копије уверења, више нећете моћи да "
+"повратите резервну копију.\n"
+"Запишите је негде на сигурно место."
+
+#: ../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 "Не могу да направим резервну копију кључа и уверења"
+
+#: ../smime/gui/certificate-manager.c:953
 msgid "Select a certificate to import..."
 msgstr "Изаберите уверење за увоз..."
 
-#: ../smime/gui/certificate-manager.c:635
-msgid "All files"
-msgstr "Све датотеке"
-
-#: ../smime/gui/certificate-manager.c:671
+#: ../smime/gui/certificate-manager.c:1003
 msgid "Failed to import certificate"
-msgstr "Нисам успео да увезем уверење"
+msgstr "Не могу да увезем уверење"
+
+#: ../smime/gui/certificate-manager.c:1119
+msgctxt "CamelTrust"
+msgid "Ask when used"
+msgstr "Питај приликом употребе"
+
+#: ../smime/gui/certificate-manager.c:1121
+#| msgid "Never"
+msgctxt "CamelTrust"
+msgid "Never"
+msgstr "Никада"
 
-#: ../smime/gui/certificate-manager.c:1053
+#: ../smime/gui/certificate-manager.c:1123
+msgctxt "CamelTrust"
+msgid "Marginally"
+msgstr "Понекад"
+
+#: ../smime/gui/certificate-manager.c:1125
+msgctxt "CamelTrust"
+msgid "Fully"
+msgstr "Увек"
+
+#: ../smime/gui/certificate-manager.c:1127
+msgctxt "CamelTrust"
+msgid "Ultimately"
+msgstr "Ултимативно"
+
+#: ../smime/gui/certificate-manager.c:1129
+msgctxt "CamelTrust"
+msgid "Temporarily"
+msgstr "Привремено"
+
+#: ../smime/gui/certificate-manager.c:1335
+#| msgid "Certificate Authority Trust"
+msgid "Change certificate trust"
+msgstr "Измена поверења за уверење"
+
+#: ../smime/gui/certificate-manager.c:1347
+#, c-format
+msgid "Change trust for the host '%s':"
+msgstr "Измена поверења за удаљени рачунар „%s“:"
+
+#: ../smime/gui/certificate-manager.c:1371
+msgctxt "CamelTrust"
+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 "_Никада не веруј овом уверењу"
+
+#: ../smime/gui/certificate-manager.c:1373
+msgctxt "CamelTrust"
+msgid "_Temporarily trusted (this session only)"
+msgstr "П_ривремено поверење (само током сесије)"
+
+#: ../smime/gui/certificate-manager.c:1374
+msgctxt "CamelTrust"
+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)."
+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 "Име удаљеног рачунара"
+
+#: ../smime/gui/certificate-manager.c:1633
+msgid "Issuer"
+msgstr "Издавач"
+
+#: ../smime/gui/certificate-manager.c:1634
+#| msgid "Fingerprints"
+msgid "Fingerprint"
+msgstr "Отисак прста"
+
+#: ../smime/gui/certificate-manager.c:1635
+msgid "Trust"
+msgstr "Поверење"
+
+#: ../smime/gui/certificate-manager.c:1656
+#| msgid "_Edit CA Trust"
+msgid "_Edit Trust"
+msgstr "_Уреди поверење"
+
+#: ../smime/gui/certificate-manager.c:1975
 msgid "All PKCS12 files"
 msgstr "Све ПКЦС12 датотеке"
 
-#: ../smime/gui/certificate-manager.c:1070
+#: ../smime/gui/certificate-manager.c:1992
 msgid "All email certificate files"
 msgstr "Све датотеке уверења поште"
 
-#: ../smime/gui/certificate-manager.c:1087
+#: ../smime/gui/certificate-manager.c:2009
 msgid "All CA certificate files"
 msgstr "Све датотеке ЦА уверења"
 
@@ -21545,26 +25072,7 @@ msgstr "Унесите нову лозинку за базу уверења"
 msgid "Enter new password"
 msgstr "Унесите нову лозинку"
 
-#. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
-#, c-format
-msgid ""
-"Issued to:\n"
-"  Subject: %s\n"
-msgstr ""
-"Коме је издато:\n"
-"  Наслов: %s\n"
-
-#: ../smime/gui/e-cert-selector.c:122
-#, c-format
-msgid ""
-"Issued by:\n"
-"  Subject: %s\n"
-msgstr ""
-"Издао је:\n"
-"  Наслов: %s\n"
-
-#: ../smime/gui/e-cert-selector.c:175
+#: ../smime/gui/e-cert-selector.c:180
 msgid "Select certificate"
 msgstr "Изаберите уверење"
 
@@ -21631,26 +25139,23 @@ msgstr ""
 "политику и процедуре (ако су доступни)."
 
 #: ../smime/gui/smime-ui.ui.h:25
-msgid "Certificate"
-msgstr "Уверење"
+#| msgid "Certificate"
+msgid "C_ertificate:"
+msgstr "У_верење:"
 
 #: ../smime/gui/smime-ui.ui.h:26
-msgid "Certificate details"
-msgstr "Детаљи уверења"
-
-#: ../smime/gui/smime-ui.ui.h:27
 msgid "Email Certificate Trust Settings"
 msgstr "Подешавања поверења у уверења ел. поште"
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Trust the authenticity of this certificate"
 msgstr "Веруј у веродостојност овог уверења"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Не веруј у веродостојност овог уверења"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "_Edit CA Trust"
 msgstr "_Уреди ЦА поверење"
 
@@ -21667,19 +25172,48 @@ msgstr "Потпиши"
 msgid "Encrypt"
 msgstr "Шифруј"
 
-#: ../smime/lib/e-cert-db.c:718
+#: ../smime/lib/e-cert-db.c:787
 msgid "Certificate already exists"
 msgstr "Уверење већ постоји"
 
-#: ../smime/lib/e-pkcs12.c:199
+#: ../smime/lib/e-pkcs12.c:201
 msgid "PKCS12 File Password"
 msgstr "ПКЦС12 лозинка датотеке"
 
-#: ../smime/lib/e-pkcs12.c:200
+#: ../smime/lib/e-pkcs12.c:202
 msgid "Enter password for PKCS12 file:"
 msgstr "Унесите лозинку за ПКЦС12 датотеку:"
 
-#: ../smime/lib/e-pkcs12.c:307
+#: ../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"
+
+#: ../smime/lib/e-pkcs12.c:335
+#, c-format
+msgid "Unable to setup password integrity, err_code: %i"
+msgstr "Не могу да подесим интегритет лозинке, код грешке: %i"
+
+#: ../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"
+
+#: ../smime/lib/e-pkcs12.c:408
 msgid "Imported Certificate"
 msgstr "Увежено уверење"
 
@@ -21755,6 +25289,168 @@ msgstr "Са _роком"
 msgid "With _Status"
 msgstr "Са _стањем"
 
+#~ msgid "Web addresses"
+#~ msgstr "Веб адресе"
+
+#~ msgid "Could not open destination"
+#~ msgstr "Не могу да отворим одредиште"
+
+#~ msgid "Cannot create object"
+#~ msgstr "Не могу да направим објекат"
+
+#~ msgid "Could not open source"
+#~ msgstr "Не могу да отворим извор"
+
+#~ msgid "The event could not be deleted due to a dbus error: %s"
+#~ msgstr "Догађај не може бити обрисан због дбас грешке: %s"
+
+#~ msgid "The task could not be deleted due to a dbus error: %s"
+#~ msgstr "Задатак не може бити обрисан због дбас грешке: %s"
+
+#~ msgid "The memo could not be deleted due to a dbus error: %s"
+#~ msgstr "Белешка не може бити обрисана због дбас грешке: %s"
+
+#~ msgid "The item could not be deleted due to a dbus error: %s"
+#~ msgstr "Ставка не може бити обрисана због дбас грешке: %s"
+
+#~ msgid "The event could not be deleted because permission was denied"
+#~ msgstr "Догађај не може бити обрисан јер је одбијена дозвола"
+
+#~ msgid "The task could not be deleted because permission was denied"
+#~ msgstr "Задатак не може бити обрисан јер је одбијена дозвола"
+
+#~ msgid "The memo could not be deleted because permission was denied"
+#~ msgstr "Белешка не може бити обрисана јер је одбијена дозвола"
+
+#~ msgid "The item could not be deleted because permission was denied"
+#~ msgstr "Ставка не може бити обрисана јер је одбијена дозвола"
+
+#~ msgid "The event could not be deleted due to an error: %s"
+#~ msgstr "Догађај не може бити обрисан због грешке: %s"
+
+#~ msgid "The task could not be deleted due to an error: %s"
+#~ msgstr "Задатак не може бити обрисан због грешке: %s"
+
+#~ msgid "The memo could not be deleted due to an error: %s"
+#~ msgstr "Белешка не може бити обрисана због грешке: %s"
+
+#~ msgid "The item could not be deleted due to an error: %s"
+#~ msgstr "Ставка не може бити обрисана због грешке: %s"
+
+#~ msgid "Customize"
+#~ msgstr "Прилагоди"
+
+#~ msgid "Custom Reminder:"
+#~ msgstr "Произвољан подсетник:"
+
+#~ msgid "Deleting selected objects"
+#~ msgstr "Бришем изабране објекте"
+
+#~ msgid "Untitled Message"
+#~ msgstr "Неименована порука"
+
+#~ msgid "Spell checking color"
+#~ msgstr "Боја за проверу правописа"
+
+#~ msgid "Underline color for misspelled words when using inline spelling."
+#~ msgstr "Боја за подвлачење правописних грешки приликом провере правописа."
+
+#~ msgid ""
+#~ "Determines whether to use the same fonts for both \"From\" and \"Subject"
+#~ "\" lines in the \"Messages\" column in vertical view"
+#~ msgstr ""
+#~ "Утврђује да ли да користи исти фонт у пољима „Шаље“ and „Наслов“ у "
+#~ "усправном прегледу колоне „Поруке“"
+
+#~ msgid ""
+#~ "Determines whether to use the same fonts for both \"From\" and \"Subject"
+#~ "\" lines in the \"Messages\" column in vertical view."
+#~ msgstr ""
+#~ "Утврђује да ли да користи исти фонт у пољима „Шаље“ and „Наслов“ у "
+#~ "усправном прегледу колоне „Поруке“."
+
+#~ msgid "Invalid authentication result code (%d)"
+#~ msgstr "Неисправан код резултата потврђивања идентитета (%d)"
+
+#~ msgid "Completed On"
+#~ msgstr "Завршено за"
+
+#~ msgid "is not set"
+#~ msgstr "није подешено"
+
+#~ msgid "is set"
+#~ msgstr "подешено"
+
+#~ msgid "Loading Images"
+#~ msgstr "Учитавање слика"
+
+#~ msgid "Option is ignored if a match for custom junk headers is found."
+#~ msgstr ""
+#~ "Опција се занемарује уколико је пронађено поклапање са произвољним "
+#~ "заглављем ђубрета."
+
+#~ msgid "Please select a valid backup file to restore."
+#~ msgstr "Изаберите исправну датотеку резерве за повраћај."
+
+#~ msgid "HTTP Error: %s"
+#~ msgstr "ХТТП грешка: %s"
+
+#~ msgid "Could not parse response"
+#~ msgstr "Не могу да обрадим одговор"
+
+#~ msgid "Empty response"
+#~ msgstr "Празан одговор"
+
+#~ msgid "Unexpected reply from server"
+#~ msgstr "Неочекиван одговор са сервера"
+
+#~ msgid "Could not locate user's calendars"
+#~ msgstr "Не могу да пронађем корисников календар."
+
+#~ msgid "Path"
+#~ msgstr "Путања"
+
+#~ msgid "Enter Google password for user '%s'."
+#~ msgstr "Унесите Гуглову лозинку за „%s“."
+
+#~ msgid "User declined to provide a password"
+#~ msgstr "Корисник је одбио да достави лозинку"
+
+#~ msgid "Expunging"
+#~ msgstr "Избацивање"
+
+#~ msgid "Itip Formatter"
+#~ msgstr "Итип форматирање"
+
+#~ msgid "Display \"text/calendar\" MIME parts in mail messages."
+#~ msgstr "Приказује МИМЕ делове „text/calendar“ у порукама."
+
+#~ msgid "_PostScript"
+#~ msgstr "_Постскрипт"
+
+#~ msgid "Please select an image of size 48 * 48"
+#~ msgstr "Изаберите слику величине 48 * 48"
+
+#~ msgid "View image attachments directly in mail messages."
+#~ msgstr "Прегледајте прилоге са сликама директно у порукама."
+
+#~ msgid ""
+#~ "Issued to:\n"
+#~ "  Subject: %s\n"
+#~ msgstr ""
+#~ "Коме је издато:\n"
+#~ "  Наслов: %s\n"
+
+#~ msgid ""
+#~ "Issued by:\n"
+#~ "  Subject: %s\n"
+#~ msgstr ""
+#~ "Издао је:\n"
+#~ "  Наслов: %s\n"
+
+#~ msgid "Certificate details"
+#~ msgstr "Детаљи уверења"
+
 #~ msgid "Original Contact:"
 #~ msgstr "Оригиналан контакт:"
 
@@ -21782,9 +25478,6 @@ msgstr "Са _стањем"
 #~ msgid "_Secure HTTP Proxy:"
 #~ msgstr "_Безбедан ХТТП посредник:"
 
-#~ msgid "No _Proxy for:"
-#~ msgstr "Без _посредника за:"
-
 #~ msgid "Use Authe_ntication"
 #~ msgstr "Користи _потврђивање идентитета"
 
@@ -21839,9 +25532,6 @@ msgstr "Са _стањем"
 #~ msgid "Expires On"
 #~ msgstr "Истиче"
 
-#~ msgid "Fingerprints"
-#~ msgstr "Отисци"
-
 #~ msgid "Certificate Hierarchy"
 #~ msgstr "Хијерархија уверења"
 
@@ -21962,9 +25652,6 @@ msgstr "Са _стањем"
 #~ msgid "Certificate Signature Algorithm"
 #~ msgstr "Алгоритам потписа уверења"
 
-#~ msgid "Issuer"
-#~ msgstr "Издавач"
-
 #~ msgid "Issuer Unique ID"
 #~ msgstr "Јединствени ИБ издавача"