[evolution] Update Serbian Latin translation



commit 2eade22e1ff0cd2bf452ec3f5ced5ce4ea7cc15e
Author: Милош Поповић <gpopac gmail com>
Date:   Sun Aug 27 19:51:28 2017 +0000

    Update Serbian Latin translation

 po/sr latin po | 5176 +++++++++++++++++++++++++++-----------------------------
 1 files changed, 2510 insertions(+), 2666 deletions(-)
---
diff --git a/po/sr latin po b/po/sr latin po
index 43102a8..0bb2602 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -7,23 +7,25 @@
 # Miloš Popović <gpopac gmail com>, 2010—2015.
 # Miroslav Nikolić <miroslavnikolic rocketmail com>, 2011—2017.
 # Marko M. Kostić <marko m kostic gmail com>, 2015—2016.
+# Borisav Živanović <borisavzivanovic gmail com>, 2017.
 #: ../src/shell/main.c:519
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?product=evolut";
-"ion&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2017-02-28 17:53+0000\n"
-"PO-Revision-Date: 2017-03-05 08:09+0200\n"
-"Last-Translator: Miroslav Nikolić <miroslavnikolic rocketmail com>\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=evolution&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-08-24 12:50+0000\n"
+"PO-Revision-Date: 2017-08-20 16:53+0200\n"
+"Last-Translator: Marko M. Kostić <marko m kostic gmail com>\n"
 "Language-Team: srpski <gnome-sr googlegroups org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : "
-"n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=4; plural=n==1? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 "X-Project-Style: gnome\n"
+"X-Generator: Poedit 2.0.3\n"
 
 #: ../evolution.appdata.xml.in.h:1 ../data/evolution.desktop.in.in.h:1
 #: ../src/mail/e-mail-browser.c:1098
@@ -45,12 +47,6 @@ msgstr ""
 "funkcionalnost pošte, kalendara i adresara."
 
 #: ../evolution.appdata.xml.in.h:4
-#| msgid ""
-#| "Evolution supports a wide range of industry standard data formats and "
-#| "network protocols for information exchange, with an emphasis on standards "
-#| "compliance and security. Evolution can also integrate smoothly with "
-#| "Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) "
-#| "extension."
 msgid ""
 "Evolution supports a wide range of industry standard data formats and "
 "network protocols for information exchange, with an emphasis on standards "
@@ -59,8 +55,8 @@ msgid ""
 msgstr ""
 "Evolucija podržava širok opseg zapisa industrijskih standardnih podataka i "
 "mrežnih protokola za razmenu informacija, sa naglaskom na saglasnost "
-"standarda i bezebdnost. Evolucija može takođe glatko da se objedini sa "
-"Majkrosoftovom razmenom posredstvom proširenja „Usluge veb razmene“."
+"standarda i bezbednost. Evolucija može takođe glatko da se objedini sa "
+"Majkrosoftovom razmenom posredstvom proširenja „Usluge veb razmene“ (EWS)."
 
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
@@ -83,29 +79,30 @@ msgstr "Evolucija — pošta i kalendar"
 
 #: ../data/evolution.desktop.in.in.h:5
 msgid "email;calendar;contact;addressbook;task;"
-msgstr "e-pošta;pošta;kalendar;kontakt;adresar;zadatak;"
+msgstr ""
+"e-pošta;pošta;kalendar;kontakt;adresar;zadatak;mejl;e-pošta;pošta;kalendar;"
+"kontakt;adresar;zadatak;mejl;email;calendar;contact;addressbook;task;"
 
 #: ../data/evolution.desktop.in.in.h:6
 msgid "New Window"
 msgstr "Novi prozor"
 
 #: ../data/evolution.desktop.in.in.h:7
-#| msgid "Compose Message"
 msgid "Compose a Message"
 msgstr "Sastavite poruku"
 
 #: ../data/evolution.desktop.in.in.h:8
 #: ../src/e-util/e-name-selector-dialog.c:448
-#: ../src/modules/addressbook/e-book-shell-backend.c:301
+#: ../src/modules/addressbook/e-book-shell-backend.c:307
 #: ../src/modules/addressbook/e-book-shell-view.c:371
 msgid "Contacts"
 msgstr "Kontakti"
 
 #: ../data/evolution.desktop.in.in.h:9
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:833
-#: ../src/e-util/e-send-options.c:544
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:845
+#: ../src/e-util/e-send-options.c:544 ../src/e-util/e-webdav-browser.c:469
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:197
-#: ../src/modules/calendar/e-cal-shell-view.c:577
+#: ../src/modules/calendar/e-cal-shell-view.c:582
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:21
 msgid "Calendar"
 msgstr "Kalendar"
@@ -115,13 +112,14 @@ msgstr "Kalendar"
 #: ../src/mail/importers/elm-importer.c:330
 #: ../src/mail/importers/kmail-importer.c:251
 #: ../src/mail/importers/pine-importer.c:423
-#: ../src/modules/mail/e-mail-shell-view.c:1240
+#: ../src/modules/mail/e-mail-shell-view.c:1247
 #: ../src/smime/gui/certificate-manager.c:1682
 msgid "Mail"
 msgstr "Pošta"
 
 #: ../data/evolution.desktop.in.in.h:11 ../src/calendar/gui/e-memo-table.c:368
-#: ../src/modules/calendar/e-cal-shell-content.c:1665
+#: ../src/e-util/e-webdav-browser.c:459
+#: ../src/modules/calendar/e-cal-shell-content.c:1719
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:194
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:209
 #: ../src/modules/calendar/e-memo-shell-view.c:313
@@ -129,11 +127,12 @@ msgid "Memos"
 msgstr "Beleške"
 
 #: ../data/evolution.desktop.in.in.h:12 ../src/calendar/gui/e-task-table.c:696
-#: ../src/calendar/gui/print.c:2408
+#: ../src/calendar/gui/print.c:2418
 #: ../src/calendar/importers/icalendar-importer.c:77
 #: ../src/calendar/importers/icalendar-importer.c:1114
+#: ../src/e-util/e-webdav-browser.c:460
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:65
-#: ../src/modules/calendar/e-cal-shell-content.c:1625
+#: ../src/modules/calendar/e-cal-shell-content.c:1679
 #: ../src/modules/calendar/e-task-shell-view-actions.c:218
 #: ../src/modules/calendar/e-task-shell-view-actions.c:233
 #: ../src/modules/calendar/e-task-shell-view.c:471
@@ -142,14 +141,14 @@ msgstr "Zadaci"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
-msgstr "Ukljčivanje oblikovanja adrese"
+msgstr "Omogući formatiranje adrese"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:2
 msgid ""
 "Whether addresses should be formatted according to standard in their "
 "destination country"
 msgstr ""
-"Da li će adrese biti oblikovane prema standardu u državama njihovog odredišta"
+"Da li će adrese biti formatirane prema standardu u državama njihovog odredišta"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:3
 msgid "Autocomplete length"
@@ -188,19 +187,14 @@ msgid "Contact layout style"
 msgstr "Stil razmeštaja kontakta"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:10
-#| msgid ""
-#| "The layout style determines where to place the preview pane in relation "
-#| "to the contact list. \"0\" (Classic View) places the preview pane below "
-#| "the contact list. \"1\" (Vertical View) places the preview pane next to "
-#| "the contact list."
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the contact list. “0” (Classic View) places the preview pane below the "
 "contact list. “1” (Vertical View) places the preview pane next to the "
 "contact list."
 msgstr ""
-"Stil razmeštaja utvrđuje položaj pregleda u odnosu na listu kontakta. 0 — ("
-"klasičan pregled) postavlja pregled ispod liste kontakta. 1 — (uspravan "
+"Stil razmeštaja utvrđuje položaj pregleda u odnosu na listu kontakta. 0 — "
+"(klasičan pregled) postavlja pregled ispod liste kontakta. 1 — (uspravan "
 "pregled) postavlja pregled pored liste kontakta."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:11
@@ -221,11 +215,11 @@ msgstr "Položaj površi za pregled kontakata kada je okrenuta uspravno."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:15
 msgid "Show maps"
-msgstr "Prikaži mape"
+msgstr "Prikaži karte"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:16
 msgid "Whether to show maps in preview pane"
-msgstr "Da li da prikaže mape u površi za pregled"
+msgstr "Da li da prikaže karte u površi za pregled"
 
 # note(slobo): message thread, niz --> bolji prevod je rasprava
 # note(slobo): ponegde sam za summary koristio --> „u kratkim crtama“
@@ -240,9 +234,6 @@ msgid "Primary address book"
 msgstr "Primarni adresar"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:18
-#| msgid ""
-#| "The UID of the selected (or \"primary\") address book in the sidebar of "
-#| "the \"Contacts\" view"
 msgid ""
 "The UID of the selected (or “primary”) address book in the sidebar of the "
 "“Contacts” view"
@@ -306,6 +297,18 @@ msgstr "Određuje da li da prikaže beleške u uređivaču"
 msgid "Whether to show Certificates tab in the editor"
 msgstr "Određuje da li da prikaže karticu sa uverenjima u uređivaču"
 
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:33
+msgid "Where to open contact locations"
+msgstr "Odakle da otvorim mesta sa kontaktima"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:34
+msgid ""
+"Currently supported values are “openstreetmap” and “google”; if unknown set, "
+"uses “openstreetmap”"
+msgstr ""
+"Trenutno su podržane vrednosti „openstreetmap“ i „google“. U slučaju "
+"nepoznate vrednosti, koristiće se „openstreetmap“"
+
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
 msgid "Convert mail messages to Unicode"
 msgstr "Prebacuje poruke pošte u Unikod"
@@ -329,8 +332,8 @@ msgid ""
 "arguments."
 msgstr ""
 "Puna putanja do naredbe za pokretanje Bogo-filtera. Ukoliko nije je postavljena "
-"koristi se podrazumevana putanja zadata tokom kompajliranja programa, obično "
-"„/usr/bin/bogofilter“. Naredba ne treba da sadrži dodatne opcije."
+"koristi se podrazumevana putanja zadata tokom kompajliranja programa, obično „/"
+"usr/bin/bogofilter“. Naredba ne treba da sadrži dodatne opcije."
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
 msgid "Save directory for reminder audio"
@@ -353,9 +356,6 @@ msgid "Birthday and anniversary reminder units"
 msgstr "Jedinice podsetnika na rođendane i godišnjice"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:6
-#| msgid ""
-#| "Units for a birthday or anniversary reminder, \"minutes\", \"hours\" or "
-#| "\"days\""
 msgid ""
 "Units for a birthday or anniversary reminder, “minutes”, “hours” or “days”"
 msgstr ""
@@ -524,9 +524,6 @@ msgid "The second timezone for a Day View"
 msgstr "Druga vremenska zona u Dnevnom pregledu"
 
 #: ../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"
 msgid ""
 "Shows the second time zone in a Day View, if set. Value is similar to one "
 "used in a “timezone” key"
@@ -547,9 +544,6 @@ msgid "Maximum number of recently used timezones to remember"
 msgstr "Najveći broj nedavno korišćenih vremenskih zona za pamćenje"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:45
-#| msgid ""
-#| "Maximum number of recently used timezones to remember in a 'day-second-"
-#| "zones' list"
 msgid ""
 "Maximum number of recently used timezones to remember in a “day-second-"
 "zones” list"
@@ -570,7 +564,6 @@ msgid "Default reminder units"
 msgstr "Podrazumevane jedinice podsetnika"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:49
-#| msgid "Units for a default reminder, \"minutes\", \"hours\" or \"days\""
 msgid "Units for a default reminder, “minutes”, “hours” or “days”"
 msgstr "Jedinice za podrazumevani podsetnik, „minuti“, „sati“ ili „dani“"
 
@@ -650,9 +643,6 @@ msgid "Hide task units"
 msgstr "Sakrij jedinice zadataka"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
-#| msgid ""
-#| "Units for determining when to hide tasks, \"minutes\", \"hours\" or \"days"
-#| "\""
 msgid "Units for determining when to hide tasks, “minutes”, “hours” or “days”"
 msgstr ""
 "Jedinice za određivanje kada sakriti zaduženja, „minuti“, „sati“ ili „dani“"
@@ -686,8 +676,6 @@ msgid "Time the last reminder ran, in time_t"
 msgstr "Vreme poslednjeg pokretanja podsetnika, u „time_t“"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
-#| msgctxt "iCalImp"
-#| msgid "has reminders"
 msgid "Allow past reminders"
 msgstr "Dopušta prošle podsetnike"
 
@@ -699,7 +687,6 @@ msgstr ""
 "dogodili"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
-#| msgid "Marcus Bains Line Color - Day View"
 msgid "Marcus Bains Line Color — Day View"
 msgstr "Boja Markus Bejns linije — Dnevni pregled"
 
@@ -708,7 +695,6 @@ msgid "Color to draw the Marcus Bains line in the Day View"
 msgstr "Boja za iscrtavanje Markus Bejns linije u Dnevnom pregledu"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:78
-#| msgid "Marcus Bains Line Color - Time bar"
 msgid "Marcus Bains Line Color — Time bar"
 msgstr "Boja Markus Bejns linije — traka vremena"
 
@@ -740,19 +726,14 @@ msgid "Memo layout style"
 msgstr "Stil razmeštaja beleške"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:85
-#| 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 list. \"1\" (Vertical View) places the preview pane next to the memo "
-#| "list"
 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 "
 "list. “1” (Vertical View) places the preview pane next to the memo list"
 msgstr ""
-"Stil razmeštaja utvrđuje položaj pregleda u odnosu na spisak beleški. „0“ ("
-"klasičan pregled) postavlja pregled ispod spiska beleški. „1“ (vertikalan "
-"pregled) postavlja pregled pored spiska beleški"
+"Stil razmeštaja utvrđuje položaj pregleda u odnosu na spisak beleški. "
+"„0“ (klasičan pregled) postavlja pregled ispod spiska beleški. "
+"„1“ (vertikalan pregled) postavlja pregled pored spiska beleški"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:86
 msgid "Memo preview pane position (vertical)"
@@ -799,7 +780,6 @@ msgid "Whether or not to use the notification tray for display reminders"
 msgstr "Da li da koristi obaveštajnu zonu za prikazivanje podsetnika"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
-#| msgid "Show display reminders in notification tray"
 msgid "Show reminder notification dialog always on top"
 msgstr "Prikazuje prozorče obaveštenja podsetnika uvek na vrhu"
 
@@ -825,9 +805,6 @@ msgid "Primary calendar"
 msgstr "Primarni kalendar"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
-#| msgid ""
-#| "The UID of the selected (or \"primary\") calendar in the sidebar of the "
-#| "\"Calendar\" view"
 msgid ""
 "The UID of the selected (or “primary”) calendar in the sidebar of the "
 "“Calendar” view"
@@ -840,9 +817,6 @@ msgid "Primary memo list"
 msgstr "Primarni spisak beleški"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
-#| msgid ""
-#| "The UID of the selected (or \"primary\") memo list in the sidebar of the "
-#| "\"Memos\" view"
 msgid ""
 "The UID of the selected (or “primary”) memo list in the sidebar of the "
 "“Memos” view"
@@ -854,9 +828,6 @@ msgid "Primary task list"
 msgstr "Primarni spisak zadataka"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
-#| msgid ""
-#| "The UID of the selected (or \"primary\") task list in the sidebar of the "
-#| "\"Tasks\" view"
 msgid ""
 "The UID of the selected (or “primary”) task list in the sidebar of the "
 "“Tasks” view"
@@ -922,7 +893,6 @@ msgid "Show the memo preview pane"
 msgstr "Prikazuje pregled beleški"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
-#| msgid "If \"true\", show the memo preview pane in the main window"
 msgid "If “true”, show the memo preview pane in the main window"
 msgstr "Ukoliko je izabrano, u glavnom prozoru prikazuje pregled beleški"
 
@@ -931,7 +901,6 @@ msgid "Show the task preview pane"
 msgstr "Prikazuje pregled zadataka"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
-#| msgid "If \"true\", show the task preview pane in the main window"
 msgid "If “true”, show the task preview pane in the main window"
 msgstr "Ukoliko je izabrano, u glavnom prozoru prikazuje pregled zadataka"
 
@@ -965,9 +934,6 @@ msgid "Tasks due today color"
 msgstr "Boja zadatka za danas"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
-#| msgid ""
-#| "Background color of tasks that are due today, in \"#rrggbb\" format. Used "
-#| "together with task-due-today-highlight"
 msgid ""
 "Background color of tasks that are due today, in “#rrggbb” format. Used "
 "together with task-due-today-highlight"
@@ -984,19 +950,14 @@ msgid "Task layout style"
 msgstr "Stil razmeštaja"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
-#| 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 list. \"1\" (Vertical View) places the preview pane next to the task "
-#| "list"
 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 "
 "list. “1” (Vertical View) places the preview pane next to the task list"
 msgstr ""
-"Stil razmeštaja utvrđuje položaj pregleda u odnosu na spisak zadataka. „0“ ("
-"klasičan pregled) postavlja pregled ispod spiska zadataka. „1“ (vertikalan "
-"pregled) postavlja pregled pored spiska zadataka"
+"Stil razmeštaja utvrđuje položaj pregleda u odnosu na spisak zadataka. "
+"„0“ (klasičan pregled) postavlja pregled ispod spiska zadataka. "
+"„1“ (vertikalan pregled) postavlja pregled pored spiska zadataka"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 msgid "Task preview pane position (vertical)"
@@ -1034,9 +995,6 @@ msgid "Overdue tasks color"
 msgstr "Boja neispunjenih zadataka"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
-#| msgid ""
-#| "Background color of tasks that are overdue, in \"#rrggbb\" format. Used "
-#| "together with task-overdue-highlight."
 msgid ""
 "Background color of tasks that are overdue, in “#rrggbb” format. Used "
 "together with task-overdue-highlight."
@@ -1057,9 +1015,6 @@ msgid "Timezone"
 msgstr "Vremenska zona"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
-#| msgid ""
-#| "The default timezone to use for dates and times in the calendar, as an "
-#| "untranslated Olson timezone database location like \"America/New York\""
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like “America/New York”"
@@ -1140,9 +1095,6 @@ msgid "(Deprecated) First day of the week, from Sunday (0) to Saturday (6)"
 msgstr "(Zastarelo) Dan kojim počinje sedmica, od nedelje (0) do subote (6)"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:161
-#| msgid ""
-#| "This key was deprecated in version 3.10 and should no longer be used. Use "
-#| "\"week-start-day-name\" instead."
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“week-start-day-name” instead."
@@ -1155,10 +1107,6 @@ msgid "(Deprecated) Work days"
 msgstr "(Zastarelo) Radni dani"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:163
-#| 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-day-monday\", \"work-day-tuesday\", etc. keys instead.)"
 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-"
@@ -1173,10 +1121,6 @@ msgid "Previous Evolution version"
 msgstr "Prethodno izdanje Evolucije"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:2
-#| msgid ""
-#| "The most recently used version of Evolution, expressed as \"major.minor."
-#| "micro\". This is used for data and settings migration from older to newer "
-#| "versions."
 msgid ""
 "The most recently used version of Evolution, expressed as “major.minor."
 "micro”. This is used for data and settings migration from older to newer "
@@ -1195,22 +1139,18 @@ msgid "The list of disabled plugins in Evolution"
 msgstr "Spisak isključenih priključaka u Evoluciji"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:5
-#| msgid "The window's X coordinate"
 msgid "The window’s X coordinate"
 msgstr "Vodoravna koordinata prozora"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:6
-#| msgid "The window's Y coordinate"
 msgid "The window’s Y coordinate"
 msgstr "Uspravna koordinata prozora"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:7
-#| msgid "The window's width in pixels"
 msgid "The window’s width in pixels"
 msgstr "Širina prozora u tačkama"
 
 #: ../data/org.gnome.evolution.gschema.xml.in.h:8
-#| msgid "The window's height in pixels"
 msgid "The window’s height in pixels"
 msgstr "Visina prozora u tačkama"
 
@@ -1219,22 +1159,18 @@ msgid "Whether the window is maximized"
 msgstr "Da li će prozor biti uvećan"
 
 #: ../data/org.gnome.evolution.importer.gschema.xml.in.h:1
-#| msgid "Gnome Calendar's calendar import done"
 msgid "GNOME Calendar’s calendar import done"
 msgstr "Obavljeni uvoz kalendara Gnomovog kalendara"
 
 #: ../data/org.gnome.evolution.importer.gschema.xml.in.h:2
-#| msgid "Whether calendar from Gnome Calendar has been imported or not"
 msgid "Whether calendar from GNOME Calendar has been imported or not"
 msgstr "Da li je kalendar iz Gnomovog kalendara uvezen ili nije"
 
 #: ../data/org.gnome.evolution.importer.gschema.xml.in.h:3
-#| msgid "Gnome Calendar's tasks import done"
 msgid "GNOME Calendar’s tasks import done"
 msgstr "Obavljeni uvoz zadataka Gnomovog kalendara"
 
 #: ../data/org.gnome.evolution.importer.gschema.xml.in.h:4
-#| msgid "Whether tasks from Gnome Calendar have been imported or not"
 msgid "Whether tasks from GNOME Calendar have been imported or not"
 msgstr "Da li su zaduženja iz Gnomovog kalendara uvezena ili nisu"
 
@@ -1264,9 +1200,6 @@ msgid "Name of the editor to prefer in the message composer"
 msgstr "Naziv uređivača koji se želi u sastavljaču poruka"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:6
-#| msgid ""
-#| "If the name doesn't correspond to any known editor, then the built-in "
-#| "WebKit editor is used."
 msgid ""
 "If the name doesn’t correspond to any known editor, then the built-in WebKit "
 "editor is used."
@@ -1279,10 +1212,6 @@ msgid "Path where picture gallery should search for its content"
 msgstr "Putanja u kojoj galerija slika treba da traži svoj sadržaj"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:8
-#| msgid ""
-#| "This value can be an empty string, which means it'll use the system "
-#| "Picture folder, usually set to ~/Pictures. This folder will be also used "
-#| "when the set path is not pointing to the existent folder"
 msgid ""
 "This value can be an empty string, which means it’ll use the system Picture "
 "folder, usually set to ~/Pictures. This folder will be also used when the "
@@ -1368,19 +1297,14 @@ msgid "Group Reply replies to list"
 msgstr "Grupisanje odgovora Odgovori na spisku"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
-#| msgid ""
-#| "Instead of the normal \"Reply to All\" behaviour, this option will make "
-#| "the 'Group Reply' toolbar button try to reply only to the mailing list "
-#| "through which you happened to receive the copy of the message to which "
-#| "you're replying."
 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 "
 "which you happened to receive the copy of the message to which you’re "
 "replying."
 msgstr ""
-"Umesto normalnog ponašanja odgovoranja svima, ova opcija će napraviti dugme „"
-"Odgovor grupi“ na traci alata koje će pokušati da odgovori samo na dopisnu "
+"Umesto normalnog ponašanja odgovoranja svima, ova opcija će napraviti dugme "
+"„Odgovor grupi“ na traci alata koje će pokušati da odgovori samo na dopisnu "
 "listi preko koje ste navikli da primate primerak poruke na koju odgovarate."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
@@ -1422,46 +1346,34 @@ msgid "List of dictionary language codes used for spell checking."
 msgstr "Spisak oznaka jezika rečnika koji se koriste za proveru pravopisa."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:33
-#| msgid "Show \"Bcc\" field when sending a mail message"
 msgid "Show “Bcc” field when sending a mail message"
 msgstr "Prikazivanje polja „Bcc“ pri slanju poruke"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
-#| msgid ""
-#| "Show the \"Bcc\" field when sending a mail message. This is controlled "
-#| "from the View menu when a mail account is chosen."
 msgid ""
 "Show the “Bcc” field when sending a mail message. This is controlled from "
 "the View menu when a mail account is chosen."
 msgstr ""
-"Prikazuje polje „Bcc“ pri slanju poruke. Ovo se postavlja iz izbornika „Pregled“"
-" nakon izbora naloga pošte."
+"Prikazuje polje „Bcc“ pri slanju poruke. Ovo se postavlja iz izbornika "
+"„Pregled“ nakon izbora naloga pošte."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
-#| msgid "Show \"Cc\" field when sending a mail message"
 msgid "Show “Cc” field when sending a mail message"
 msgstr "Prikazivanje polja „Cc“ pri slanju poruke"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h: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 “Cc” field when sending a mail message. This is controlled from the "
 "View menu when a mail account is chosen."
 msgstr ""
-"Prikazuje polje „Bcc“ pri slanju poruke. Ovo se postavlja iz izbornika „Pregled“"
-" nakon izbora naloga pošte."
+"Prikazuje polje „Bcc“ pri slanju poruke. Ovo se postavlja iz izbornika "
+"„Pregled“ nakon izbora naloga pošte."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
-#| msgid "Show \"From\" override field when sending a mail message"
 msgid "Show “From” override field when sending a mail message"
 msgstr "Prikazuje polje „Šalje“ sa imenom kontakta pri slanju poruke"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
-#| msgid ""
-#| "Show the \"From\" override field when sending a mail message. This is "
-#| "controlled from the View menu when a mail account is chosen."
 msgid ""
 "Show the “From” override field when sending a mail message. This is "
 "controlled from the View menu when a mail account is chosen."
@@ -1470,14 +1382,10 @@ msgstr ""
 "iz menija „Pregled“ nakon izbora naloga pošte."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
-#| msgid "Show \"Reply To\" field when sending a mail message"
 msgid "Show “Reply To” field when sending a mail message"
 msgstr "Prikazivanje polja „Odgovor za“ kada šalje poruku"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
-#| msgid ""
-#| "Show the \"Reply To\" field when sending a mail message. This is "
-#| "controlled from the View menu when a mail account is chosen."
 msgid ""
 "Show the “Reply To” field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -1486,14 +1394,10 @@ msgstr ""
 "izbornika „Pregled“ nakon izbora naloga pošte."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
-#| msgid "Show \"From\" field when posting to a newsgroup"
 msgid "Show “From” field when posting to a newsgroup"
 msgstr "Prikazivanje polja „Šalje“ pri slanju na dopisnu listu"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
-#| msgid ""
-#| "Show the \"From\" field when posting to a newsgroup. This is controlled "
-#| "from the View menu when a news account is chosen."
 msgid ""
 "Show the “From” field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -1502,14 +1406,10 @@ msgstr ""
 "izbornika „Pregled“ nakon izbora naloga dopisne liste."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
-#| msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgid "Show “Reply To” field when posting to a newsgroup"
 msgstr "Prikazivanje polja „Odgovor za“ pri slanju na dopisnna spisku"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
-#| msgid ""
-#| "Show the \"Reply To\" field when posting to a newsgroup. This is "
-#| "controlled from the View menu when a news account is chosen."
 msgid ""
 "Show the “Reply To” field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -1557,10 +1457,22 @@ msgstr ""
 "korisniku da pošalje poruku po potrebi."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
+msgid "Include signature in new messages only"
+msgstr "Uključi potpis samo u novim porukama"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+msgid ""
+"Include selected signature only for new messages, but have no signature "
+"added for Replies or Forwards."
+msgstr ""
+"Uključi izabrani potpis samo u novim porukama, ali ne u odgovorima ili u "
+"prosleđenim porukama."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
 msgid "Put personalized signatures at the top of replies"
 msgstr "Postavlja personalizovane potpise iznad odgovora"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
 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 "
@@ -1570,11 +1482,11 @@ msgstr ""
 "se odgovara na poruku. Ovo utvrđuje da li će biti postavljen na vrh ili na "
 "dno poruke."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
 msgid "Do not add signature delimiter"
 msgstr "Ne dodaje razdvojnik potpisa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -1582,19 +1494,11 @@ msgstr ""
 "Izaberite ovu opciju u slučaju da ne želite dodavanje razdvojnika ispred "
 "potpisa prilikom pisanja poruke."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 msgid "Ignore list Reply-To:"
 msgstr "Zanemaruje listu „Odgovor-za:“"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
-#| msgid ""
-#| "Some mailing lists set a Reply-To: header to trick users into sending "
-#| "replies to the list, even when they ask Evolution to make a private "
-#| "reply. Setting this option to TRUE will attempt to ignore such Reply-To: "
-#| "headers, so that Evolution will do as you ask it. If you use the private "
-#| "reply action, it will reply privately, while if you use the 'Reply to "
-#| "List' action it will do that. It works by comparing the Reply-To: header "
-#| "with a List-Post: header, if there is one."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 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. "
@@ -1612,16 +1516,11 @@ msgstr ""
 "koristite radnju „Odgovori na listu“ onda će to da uradi. Vrši se upoređivanje "
 "zaglavlje „Odgovor-za“ sa zaglavljem „Spisak objava“, ako postoji."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-#| msgid "List of localized 'Re'"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid "List of localized “Re”"
 msgstr "Spisak lokalizovanih „Odg“"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
-#| msgid ""
-#| "Comma-separated list of localized 'Re' abbreviations to skip in a subject "
-#| "text when replying to a message, as an addition to the standard \"Re\" "
-#| "prefix. An example is 'SV,AV'."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 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” prefix. "
@@ -1631,16 +1530,11 @@ msgstr ""
 "preskočene u tekstu prilikom odgovaranja na poruku, kao dodatak standardnom "
 "„Odg“ prefiksu. Jedan primer je „SV,AV“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
-#| msgid "List of localized 'Re'"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid "List of localized “Re” separators"
 msgstr "Spisak lokalizovanih „Odg“"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
-#| 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\" "
-#| "prefix. An example is 'SV,AV'."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid ""
 "A list of localized “Re” separators, used to skip in a subject text when "
 "replying to a message, as an addition to the standard “:” and the Unicode "
@@ -1650,38 +1544,32 @@ msgstr ""
 "preskočene u tekstu prilikom odgovaranja na poruku, kao dodatak standardnom "
 "„:“ i Unikodovom „:“ razdvojniku."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Number of characters for wrapping"
 msgstr "Broj znakova za prelom"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid "Will autowrap lines after given number of characters."
 msgstr "Automatski prelama linije teksta nakon zadatog broja znakova."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
-#| msgid ""
-#| "Number of To and CC recipients to ask 'prompt-on-many-to-cc-recips' from"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid ""
 "Number of To and CC recipients to ask “prompt-on-many-to-cc-recips” from"
 msgstr ""
 "Broj Za i CC primaoca nakon koga se pojavljuje „prompt-on-many-to-cc-recips“"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid ""
 "When to ask, when the number of To and CC recipients reaches this value."
 msgstr ""
-"Kada se postavlja pitanje. Kada bron Za i CC primaoca dostigne ovu vrednost."
+"Kada se postavlja pitanje. Kada broj Za i CC primaoca dostigne ovu vrednost."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Whether to always show Sign and Encrypt buttons on the toolbar"
 msgstr ""
 "Da li se prikazuju dugmići za potpis i šifrovanje unutar palete sa alata"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
-#| 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."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 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 "
@@ -1691,44 +1579,39 @@ msgstr ""
 "biti prikazani unutar trake sa alatima sastavljača poruka. U suprotnom će "
 "biti prikazani samo kada se koriste."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Wrap quoted text in replies"
 msgstr "Prelama citirani tekst u odgovorima"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
-#| msgid "If set to 'true' quoted text in replies will be wrapped."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "If set to “true” quoted text in replies will be wrapped."
 msgstr "Ako je izabrano citirani tekst u odgovorima biće prelomljen."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Whether to obey Content-Disposition:inline message header hint"
 msgstr "Da li da posluša savet zaglavlja poruke „Razmeštaj-sadržaja:na_mreži“"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
-#| msgid ""
-#| "Set to 'false' to block automatic display of attachments with Content-"
-#| "Disposition: inline."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid ""
 "Set to “false” to block automatic display of attachments with Content-"
 "Disposition: inline."
 msgstr ""
-"Poništite ovu opciju da blokirate automatski prikaz priloga sa "
-"„razmeštajem-sadržaja:na mreži“."
+"Poništite ovu opciju da blokirate automatski prikaz priloga sa „razmeštajem-"
+"sadržaja:na mreži“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Save file format for drag-and-drop operation"
 msgstr "Format datoteke čuvanja za radnju prevlačenja i ubacivanja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
-#| msgid "Can be either 'mbox' or 'pdf'."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Can be either “mbox” or “pdf”."
 msgstr "Može biti „mbox“ ili „pdf“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Show image animations"
 msgstr "Prikazivanje animiranih slika"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -1736,11 +1619,11 @@ msgstr ""
 "Omogućava animirane slike u HTML pošti. Mnogim korisnicima smetaju animirane "
 "slike i umesto njih žele nepokretne slike."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Enable or disable type ahead search feature"
 msgstr "Uključuje ili isključuje mogućnost traženja kucanja unapred"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -1748,11 +1631,11 @@ msgstr ""
 "Omogućava pretraživanje iz bočne površi, što donosi interaktivnost u pretrazi "
 "naziva fascikli."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Enable or disable magic space bar"
 msgstr "Uključuje ili isključuje magičnu razmaknicu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -1760,59 +1643,57 @@ msgstr ""
 "Uključite ovo da bi razmaknicom pomerali tekst poruke pri pregledanju, kao i "
 "spisak poruka i fascikli."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 "Omogućiti da koriste slična podešavanja prikaza liste poruke za sve fascikle"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "Omogućiti da koriste slična podešavanja prikaza liste poruke za sve fascikle."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
-#| msgid "Mark citations in the message \"Preview\""
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Mark citations in the message “Preview”"
 msgstr "Označava citate u pregledu poruke"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
-#| msgid "Mark citations in the message \"Preview\"."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Mark citations in the message “Preview”."
 msgstr "Označava citate u pregledu poruke."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid "Citation highlight color"
 msgstr "Boja isticanja citata"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "Citation highlight color."
 msgstr "Boja za isticanja citata."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "Enable/disable caret mode"
 msgstr "Uključuje/isključuje prikaz kursora"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Omogućava prikaz kursora, tako da vidite kursor dok čitate poruku."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Default charset in which to display messages"
 msgstr "Podrazumevani skup znakova za prikaz poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Default charset in which to display messages."
 msgstr "Podrazumevani skup znakova za prikaz poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "Samostalno učitava slike za HTML poruke preko HTTP-a"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Show notification about missing remote content"
 msgstr "Prikazuje obaveštenje o nedostajućem udaljenom sadržaju"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid ""
 "When the message preview shows a message which requires to download remote "
 "content, while the download is not allowed for the user or the site, then "
@@ -1822,27 +1703,27 @@ msgstr ""
 "sadržaja, a preuzimanje nije dopušteno korisnicima ili sajtu, tada prikazuje "
 "obaveštenje o tome na vrhu panela za pregled."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Show Animations"
 msgstr "Prikazivanje animacija"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Show animated images as animations."
 msgstr "Prikazuje animirane slike kao animacije."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Show all message headers"
 msgstr "Prikazivanje svih zaglavlja poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Show all the headers when viewing a messages."
 msgstr "Prikazuje sva zaglavlja pri pregledu poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "List of headers to show when viewing a message."
 msgstr "Spisak zaglavlja za prikazivanje pri pregledu poruke."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 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 "
@@ -1852,36 +1733,36 @@ msgstr ""
 "koja ukazuje da li je zaglavlje uključeno. Isključena zaglavlja nisu prikazana "
 "uprilikom pregleda pruke, ali su još uvek na spisku u postavkama."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Show photo of the sender"
 msgstr "Prikazivanje slike pošiljaoca"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Prikazuje sliku pošiljaoca u oknu za čitanje poruke."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Search gravatar.com for photo of the sender"
 msgstr "Pretražuje gravatar.com kako bi našao sliku pošiljaoca"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Allow searching also at gravatar.com for photo of the sender."
 msgstr ""
 "Omogućava pretragu sajta gravatar.com kako bi pronašao fotografiju pošiljaoca."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Mark as Seen after specified timeout"
 msgstr "Označava poruku viđenom posle navedenog roka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "Mark as Seen after specified timeout."
 msgstr "Označava poruku viđenom posle navedenog roka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Mark as Seen always after specified timeout"
 msgstr "Uvek označava poruku viđenom posle navedenog roka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid ""
 "If set to true, the selected message will be set as unread after the timeout "
 "also after the folder change."
@@ -1889,56 +1770,56 @@ msgstr ""
 "Ako je izabrano, izabrana poruka će biti označena kao nepročitana nakon "
 "određeno vremena i nakon izmene fascikle."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Timeout for marking messages as seen"
 msgstr "Vreme za označavanje poruka kao viđenim"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "Vreme u milisekundama za koje će poruke biti označene kao viđenim."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid "Show Attachment Bar"
 msgstr "Prikaz trake priloga"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments."
 msgstr ""
 "Prikazuje traku priloga ispod okna pregleda poruke kada poruka ima priloge."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "Sender email-address column in the message list"
 msgstr "Prikaz kolone e-adresa pošiljaoca u spisku poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "Prikazuje e-adresu pošiljaoca u posebnoj koloni u spisku poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "Show deleted messages in the message-list"
 msgstr "Prikazivanje obrisanih poruka u listi poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Prikazuje obrisane poruke (kao precrtane) u listi poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Show junk messages in the message-list"
 msgstr "Prikazivanje nepoželjnih poruka na spisku poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Show junk messages (with a red strike-through) in the message-list."
 msgstr "Prikazuje nepoželjne poruke (precrtane crvenom bojom) na spisku poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid "Enable Unmatched search folder"
 msgstr "Uključi nepoklopljene fascikle pretrage"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
@@ -1946,14 +1827,11 @@ msgstr ""
 "Uključuje nepoklopljene fascikle pretrage unutar fascikli pretrage. Ne radi "
 "ništa ako je su isključene fascikle pretrage."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Skriva pregled po fasciklama i uklanja izbor"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
-#| 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."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 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."
@@ -1961,36 +1839,31 @@ msgstr ""
 "Ovak ključ je pročitan jednom i potom vraćen na „false“ (netačno). Ovo uklanja "
 "poštu sa spiska i pregled za tu fasciklu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "Height of the message-list pane"
 msgstr "Visina površi liste poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Height of the message-list pane."
 msgstr "Visina površi za liste poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid "Whether message headers are collapsed in the user interface"
 msgstr "Da li su zaglavlja poruke skupljena u korisničkom sučelju"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Width of the message-list pane"
 msgstr "Širina površi spiska poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "Width of the message-list pane."
 msgstr "Širina površi spiska poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Layout style"
 msgstr "Stil razmeštaja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
-#| 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 message list. \"1\" (Vertical View) places the preview pane next to "
-#| "the message list."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 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 "
@@ -1998,38 +1871,38 @@ msgid ""
 "message list."
 msgstr ""
 "Stil razmeštaja utvrđuje gde će biti postavljen pregled u odnosu na spisak "
-"poruka. 0 — (klasičan pregled) smešta ovu površ ispoda spiska poruka. 1 — ("
-"vertikalan pregled) smešta površ pored spiska poruka."
+"poruka. 0 — (klasičan pregled) smešta ovu površ ispoda spiska poruka. 1 — "
+"(vertikalan pregled) smešta površ pored spiska poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Variable width font"
 msgstr "Font promenljive veličine"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "The variable width font for mail display."
 msgstr "Font promenljive veličine za prikaz pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Terminal font"
 msgstr "Font terminala"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "The terminal font for mail display."
 msgstr "Font terminala za prikaz pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Use custom fonts"
 msgstr "Korišćenje sopstvenih fontova"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid "Use custom fonts for displaying mail."
 msgstr "Koristi prilagođene fontove za prikaz pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Sažima prikaz adresa u Za/CC/BCC"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -2037,14 +1910,11 @@ msgstr ""
 "Vrši sažimanje prikaza adresa u Prima/CC/BCC na broj određen u broju adresa "
 "(address_count)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Broj adresa za prikaz u KO/CC/BCC"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
-#| msgid ""
-#| "This sets the number of addresses to show in default message list view, "
-#| "beyond which a '...' is shown."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a “...” is shown."
@@ -2052,11 +1922,11 @@ msgstr ""
 "Ovo podešava broj adresa za prikaz u podrazumevanom pregledu spiska poruka, "
 "posle čega je prikazano „...“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Thread the message-list based on Subject"
 msgstr "Prikaz poruke prema naslovu rasprave"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -2064,11 +1934,11 @@ msgstr ""
 "Da li pokušati prikaz rasprave po naslovu kada poruke ne sadrže zaglavlja „In-"
 "Reply-To“ ili „References“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Default value for thread expand state"
 msgstr "Podrazumevana vrednost za raširenu raspravu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -2076,15 +1946,11 @@ msgstr ""
 "Ovo podešavanje određuje da li će niti podrazumevano biti raširene ili "
 "skupljene. Evolucija zahteva ponovno pokretanje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Da li se poruke nižu na osnovu poslednje poruke u raspravi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
-#| msgid ""
-#| "This setting specifies whether the threads should be sorted based on "
-#| "latest message in each thread, rather than by message's date. Evolution "
-#| "requires a restart."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 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 "
@@ -2093,11 +1959,11 @@ msgstr ""
 "Ovo podešavanje određuje da li će niti biti razvrstani po poslednjoj poruci "
 "jedne niti, umesto po datumu. Evolucija zahteva ponovno pokretanje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Whether sort thread children always ascending"
 msgstr "Da li se podrasprave ređaju rastući"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 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."
@@ -2105,11 +1971,11 @@ msgstr ""
 "Ovo podešavanje određuje da li će rasprave nižeg nivoa biti razvrstani "
 "rastući, umesto na istom način kao unutar roditeljskih niti."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Ređa naloge azbučnim redom u stablu fascikle"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 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 "
@@ -2121,89 +1987,99 @@ msgstr ""
 "izuzetkom fascikli „Na ovom računaru“ i „Potraži“, u suprotnom nalozi bivaju "
 "poređani na osnovu poretka koji je zadao korisnik"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Log filter actions"
 msgstr "Dnevnik radnji filtera"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Log filter actions to the specified log file."
 msgstr "Beleži radnje filtera u navedenu datoteku dnevnika."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Logfile to log filter actions"
 msgstr "Dnevnik datoteka za beleženje radnji filtera"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
-msgid "Logfile to log filter actions."
-msgstr "Dnevnik datoteka za beleženje radnji filtera."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+msgid ""
+"If not set, or being “stdout”, then the logging is done to stdout, instead "
+"to a file."
+msgstr ""
+"Ako nije podešeno, ili je podešeno na „stdout“, onda se dnevnik ispisuje na "
+"standardni izlaz umesto u datoteku."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Flush Outbox after filtering"
 msgstr "Prazni slanje nakon filtriranja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
-#| 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 "
-#| "one minute after the last action invocation."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 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 "
 "one minute after the last action invocation."
 msgstr ""
 "Da li će fascikla slanja biti očišćena nakon obavljenog filtriranja. Čišćenje "
-"ove fascikle će se dogoditi samo ako se koristi neka radnja filtera „Prosledi“"
-" i otprilike jedan minut posle prizivanja poslednje radnje."
+"ove fascikle će se dogoditi samo ako se koristi neka radnja filtera "
+"„Prosledi“ i otprilike jedan minut posle prizivanja poslednje radnje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Default forward style"
 msgstr "Podrazumevani stil prosleđivanja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid "Default reply style"
 msgstr "Podrazumevani stil odgovora"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
-msgstr "Upozorenje na slanje poruke kada se koristi prečica (Ktrl + Unesi)"
+msgstr "Upozorenje na slanje poruke kada se koristi prečica (Ctrl+Enter)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid ""
 "Prompt the user when he or she tries to send a message with a key "
 "accelerator."
 msgstr ""
 "Upozorava korisnika kada pokuša da pošalje pouku pomoću prečice sa tastature."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Prompt on empty subject"
 msgstr "Postavlja upit kada je naslov prazan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Postavlja upit korisniku kada pokuša da pošalje poruku bez naslova."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Prompt when emptying the trash"
 msgstr "Postavlja upit prilikom pražnjenja smeća"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "Postavlja upit korisniku kada pokuša da isprazni smeće."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Prompt when user expunges"
 msgstr "Postavlja upit pri pražnjenju"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Postavlja upit korisniku kada pokuša da isprazni fasciklu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+msgid "Prompt when user calls Empty Junk"
+msgstr "Postavlja upit korisniku kada pokuša da isprazni smeće"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+msgid "Prompt the user when he or she tries to Empty a Junk folder."
+msgstr ""
+"Postavlja upit korisniku kada pokuša da isprazni fasciklu sa "
+"smećem."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "Upitaće pre slanja primaocima koji nisu unešeni kao adrese pošte"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -2211,19 +2087,19 @@ msgstr ""
 "Omogućava/onemogućava ponavljanje upozorenja kada pokušavate da pošaljete poruku "
 "primaocima koji nisu unešeni kao adrese pošte"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Prompt when user only fills Bcc"
 msgstr "Postavlja upit kada korisnik unese samo nevidljivu grafitnu kopiju (Bcc)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Postavlja upit korisniku kada pokuša da pošalje poruku bez primalaca."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Postavlja upit kada korisnik pokuša da pošalje neželjeni HTML"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -2231,12 +2107,12 @@ msgstr ""
 "Postavlja upit kada korisnik pokuša da pošalje HTML poruku primaocima koji "
 "možda ne žele da primaju HTML poštu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Postavlja upit korisniku kada pokuša da otvori 10 ili više poruka odjednom"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -2244,19 +2120,19 @@ msgstr ""
 "Ukoliko korisnik pokuša da otvori 10 ili više poruka odjednom, pitaće ga da "
 "li zaista želi to da uradi."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Prompt while marking multiple messages"
 msgstr "Postavlja upit pri označavanju više poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Uključuje ili isključuje upozorenje pri označavanju više poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Prompt when deleting messages in search folder"
 msgstr "Postavlja upit kod brisanja poruka iz fascikle pretrage"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 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 "
@@ -2265,39 +2141,29 @@ msgstr ""
 "Omogućava/onemogućava ponavljanje upozorenja da je brisanje poruke iz fascikle "
 "pretrage trajno, a ne samo uklanjanje iz rezultata pretrage."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr ""
-"Pitaće da li da umnoži fasciklu prevlačenjem i ubacivanjem u stablu fascikli"
+"Pitaće da li da kopira fasciklu prevlačenjem i ubacivanjem u stablu fascikli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
-#| 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 "
-#| "folders in folder tree without asking, or 'ask' - (or any other value) "
-#| "will ask user."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 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 "
 "folders in folder tree without asking, or “ask” — (or any other value) will "
 "ask user."
 msgstr ""
-"Moguće vrednosti su: „never“ — neće dopustiti umnožavanje fascikli "
-"prevlačenjem i ubacivanjem u stablo fascikli; „always“ — dopustiće umnožavanje "
-"fascikli prevlačenjem i ubacivanjem u stablo fascikli bez pitanja, ili „ask“ — ("
-"ili svaka druga vrednost) pitaće korisnika."
+"Moguće vrednosti su: „never“ — neće dopustiti kopiranje fascikli "
+"prevlačenjem i ubacivanjem u stablo fascikli; „always“ — dopustiće kopiranje "
+"fascikli prevlačenjem i ubacivanjem u stablo fascikli bez pitanja, ili „ask“ — "
+"(ili svaka druga vrednost) pitaće korisnika."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr ""
 "Pitaće da li da premesti fasciklu prevlačenjem i ubacivanjem u stablu fascikli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
-#| 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 "
-#| "folders in folder tree without asking, or 'ask' - (or any other value) "
-#| "will ask user."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 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 "
@@ -2306,14 +2172,14 @@ msgid ""
 msgstr ""
 "Moguće vrednosti su: „never“ — neće dopustiti premeštanje fascikli "
 "prevlačenjem i ubacivanjem u stablo fascikli; „always“ — dopustiće premeštanje "
-"fascikli prevlačenjem i ubacivanjem u stablo fascikli bez pitanja, ili „ask“ — ("
-"ili svaka druga vrednost) pitaće korisnika."
+"fascikli prevlačenjem i ubacivanjem u stablo fascikli bez pitanja, ili „ask“ — "
+"(ili svaka druga vrednost) pitaće korisnika."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Prompt when replying privately to list messages"
 msgstr "Postavlja upit kada odgovarate privatno na listu poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 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."
@@ -2321,11 +2187,11 @@ msgstr ""
 "Omogućava/onemogućava ponavljanje upozorenja da šaljete privatan odgovor na "
 "poruku koja je stigla sa dopisne liste."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Postavlja upit kada dopisna lista oduzme privatne odgovore"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 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 "
@@ -2335,30 +2201,25 @@ msgstr ""
 "odgovor na poruku koja je stigla sa dopisne liste, ali u listi zaglavlje "
 "„Odgovor-za“ je podešeno da vas preusmeri da odgovorite na listu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "Prompt when replying to many recipients"
 msgstr "Postavlja upit kada odgovarate većem broju primalaca"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr ""
 "Omogućava/onemogućava ponavljanje upozorenja da šaljete odgovor mnogim ljudima."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
-#| msgid ""
-#| "Prompt when switching composer mode and the content needs to lose its "
-#| "formatting"
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid ""
 "Prompt when switching composer format and the content needs to lose its "
 "formatting"
-msgstr "Upozorenje o gubitku formatiranja prilikom prebacivanja u ređim sastavljača"
+msgstr ""
+"Upozorenje o gubitku formatiranja prilikom prebacivanja u ređim sastavljača"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
-#| msgid ""
-#| "It disables/enables the repeated prompts to warn that you are switching "
-#| "composer mode and the content needs to lose its formatting."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid ""
 "It disables/enables the repeated prompts to warn that you are switching "
 "composer format and the content needs to lose its formatting."
@@ -2366,14 +2227,11 @@ msgstr ""
 "Omogućava/onemogućava ponavljanje upozorenja kada pokušavate da se prebacite u "
 "režim sastavljača i pri tome izgubite formatiranje sadržaja."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Prompt when sending to many To and CC recipients"
 msgstr "Upozorava kada šaljete e-poruku velikom broju primalaca"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
-#| msgid ""
-#| "Enable or disable the prompt when sending to many To and CC recipients. "
-#| "The 'composer-many-to-cc-recips-num' defines the threshold."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid ""
 "Enable or disable the prompt when sending to many To and CC recipients. The "
 "“composer-many-to-cc-recips-num” defines the threshold."
@@ -2382,7 +2240,7 @@ msgstr ""
 "pošiljaoca navedenih u poljima „Za“ ili „CC“. Vrednost „composer-many-to-cc-"
 "recips-num“ određuje prag za upozorenje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid ""
 "Policy for automatically closing the message browser window when forwarding "
 "or replying to the displayed message."
@@ -2390,45 +2248,42 @@ msgstr ""
 "Politika za samostalno zatvaranje prozora preglednika poruka prilikom "
 "prosleđivanja ili odgovaranja na prikazanu poruku."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid "Empty Trash folders on exit"
 msgstr "Prazni fascikle sa smećem na izlazu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Prazni sve fascikle sa smećem pri zatvaranju Evolucije."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Najmanje dana između pražnjenja smeća na izlazu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Najmanje vreme između pražnjenja smeća na izlazu, u danima."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid "Last time Empty Trash was run"
 msgstr "Poslednje vreme pražnjenja smeća"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "Kada je poslednji put izvršeno pražnjenje smeća, u danima od 1. januara, 1970 "
 "(epoh)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Vreme u sekundama za koje se prikazuje greška u statusnoj traci."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "Level beyond which the message should be logged."
 msgstr "Nivo nakon kojeg se poruka zavodi u dnevnik."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
-#| msgid ""
-#| "This can have three possible values. \"0\" for errors. \"1\" for "
-#| "warnings. \"2\" for debug messages."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid ""
 "This can have three possible values. “0” for errors. “1” for warnings. “2” "
 "for debug messages."
@@ -2436,16 +2291,11 @@ msgstr ""
 "Može imati tri moguće vrednosti: 0 — za greške, 1 — za upozorenja i 2 — za "
 "poruke o dijagnozi kvara."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
-#| msgid "Show original \"Date\" header value."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid "Show original “Date” header value."
 msgstr "Prikazuje originalnu vrednost zaglavlja datuma."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
-#| 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 format and local time zone."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 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 "
@@ -2455,11 +2305,11 @@ msgstr ""
 "se vremenske zone razlikuju). Inače uvek prikazuje vrednost zaglavlja „Datum“ "
 "prema postavkama i vremenskoj zoni korisnika."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid "List of Labels and their associated colors"
 msgstr "Spisak oznaka i njima dodeljenih boja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 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."
@@ -2467,50 +2317,46 @@ msgstr ""
 "Spisak oznaka koje poznaje poštanski deo Evolucije. Spisak sadrži nizove "
 "oblika ime:boja gde boja koristi HTML heksa kodiranje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid "Check incoming mail being junk"
-msgstr "Vrši proveru da li je pristigla pošta đubre"
+msgstr "Proveri da li dolazna pošta sadrži đubre"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 msgid "Run junk test on incoming mail."
 msgstr "Proverava da li ima đubreta u dolaznoj pošti."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid "Empty Junk folders on exit"
 msgstr "Prazni fascikle sa đubretom pri izlazu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Prazni sve fascikle sa đubretom pri zatvaranju Evolucije."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Najmanje dana između pražnjenja đubreta na izlazu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Najmanje vreme između pražnjenja đubreta na izlazu, u danima."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 msgid "Last time Empty Junk was run"
 msgstr "Vreme poslednjeg pražnjenja đubreta"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "Kada je poslednji put izvršeno pražnjenje đubreta, u danima od 1. januara, 1970 "
-"(epoh)."
+"(epoha)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid "The default plugin for Junk hook"
 msgstr "Podrazumevani dodatak kuke za đubre"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
-#| 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 to the other available plugins."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 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 "
@@ -2520,16 +2366,11 @@ msgstr ""
 "priključci. Ukoliko je pomenuti podrazumevani priključak isključen, preostali "
 "dostupni priključci neće biti aktivirani."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Utvrđuje da li u adresaru da pregleda adrese pošiljaoca"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
-#| 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 can be slow, if remote address books (like LDAP) are "
-#| "marked for autocompletion."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 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 "
@@ -2541,7 +2382,7 @@ msgstr ""
 "samodopunjavanje. Može biti sporo ako su adresari (recimo LDAP) označeni za "
 "samodopunjavanje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -2549,7 +2390,7 @@ msgstr ""
 "Utvrđuje da li samo u adresaru da pregleda adrese u potrazi za neželjenom "
 "poštom"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 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 "
@@ -2559,13 +2400,13 @@ msgstr ""
 "da li da se adresa traži samo u lokalnom adresaru kako bi se izdvojila pošta "
 "primljena od poznatih pošiljalaca od one neželjene."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Utvrđuje da li da koristi prilagođena zaglavlja prilikom provere neželjene "
 "pošte"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 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 "
@@ -2574,14 +2415,11 @@ msgstr ""
 "Utvrđuje da li da koristi prilagođena zaglavlja prilikom provere neželjene "
 "pošte. Ukoliko je opcija uključena a zaglavlja navedena, provera će biti brža."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 msgid "Custom headers to use while checking for junk."
 msgstr "Prilagođena zaglavlja za upotrebu prilikom provere neželjene pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
-#| msgid ""
-#| "Custom headers to use while checking for junk. The list elements are "
-#| "string in the format \"headername=value\"."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format “headername=value”."
@@ -2589,31 +2427,31 @@ msgstr ""
 "Prilagođena zaglavlja za upotrebu prilikom provere neželjene pošte. Elementi "
 "spiska su niz formata „headername=value“ (ime zaglavlja=vrednost)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 msgid "UID string of the default account."
 msgstr "JIB niz podrazumevanog naloga."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 msgid "Save directory"
 msgstr "Direktorijum čuvanja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 msgid "Directory for saving mail component files."
 msgstr "Direktorijum za čuvanje datoteka modula za poštu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 msgid "Composer load/attach directory"
 msgstr "Direktorijum sastavljača za učitavanje/prilaganje"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 msgid "Directory for loading/attaching files to composer."
 msgstr "Direktorijum za učitavanje/prilaganje datoteka u sastavljač."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 msgid "Check for new messages on start"
 msgstr "Vrši proveru za novim porukama prilikom pokretanja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -2621,16 +2459,11 @@ msgstr ""
 "Da li će vršiti proveru za novim porukama prilikom pokretanja Evolucije. Ovo "
 "uključuje i slanje poruka iz fascikle Poslato."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 msgid "Check for new messages in all active accounts"
 msgstr "Vrši proveru za novim porukama u svim aktivnim nalozima"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
-#| 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 started. This option is used only together with "
-#| "'send_recv_on_start' option."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 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 "
@@ -2641,11 +2474,11 @@ msgstr ""
 "pokretanja Evolucije. Ova opcija se koristi samo zajedno sa "
 "„send_recv_on_start“ (pošalji_primi_pri_pokretanju) opcijom."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 msgid "Server synchronization interval"
 msgstr "Interval usaglašavanja sa serverom"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -2653,16 +2486,11 @@ msgstr ""
 "Kontroliše učestalost usklađivanja lokalnih izmena sa mrežnim serverom pošte. "
 "Interval mora biti najmanje 30 sekundi."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
 msgid "Allow expunge in virtual folders"
 msgstr "Dozvoli pražnjenje virtuelnih fascikli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
-#| 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."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
 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 "
@@ -2674,13 +2502,12 @@ msgstr ""
 "pokrenuta nad svim fasciklama i za sve izbrisane poruke u virtuelnoj "
 "fascikli, ne samo za obrisane poruke koje pripadaju virtuelnoj fascikli."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
 #: ../src/mail/mail-config.ui.h:9
-#| msgid "Inherit theme colors in HTML mode"
 msgid "Inherit theme colors in HTML format"
 msgstr "Nasledi boju teme iz HTML režima"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
 msgid ""
 "When enabled the theme colors for background, text and links are sent in "
 "resulting HTML formatted message."
@@ -2688,11 +2515,11 @@ msgstr ""
 "Kada je omogućeno boja pozadine, teksta i veze će biti poslata u krajnjoj "
 "HTML poruci."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
 msgid "An Archive folder for On This Computer folders."
 msgstr "Fascikla Arhiva unutar fascikle Na ovom računaru."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
 msgid ""
 "An Archive folder to use for Messages|Archive... feature when in an On This "
 "Computer folder."
@@ -2700,14 +2527,61 @@ msgstr ""
 "Fascikla Arhiva koja se koristi za poruke|arhive... mogućnost se javlja "
 "unutar fascikle Na ovom računaru."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
+msgid "Whether the To Do bar is visible in the main window"
+msgstr "Da li će traka sa zadacima biti vidljiva u glavnom prozoru"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
+msgid "Stores whether the To Do bar is visible in the main window."
+msgstr "Čuva podešavanje vidljivosti trake sa zadacima u glavnom prozoru."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
+msgid "Width of the To Do bar in the main window"
+msgstr "Širina trake sa zadacima u glavnom prozoru"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
+msgid "Holds the width of the To Do bar for the main window."
+msgstr "Čuva širinu trake sa zadacima glavnog prozora"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
+msgid "Whether the To Do bar is visible in a sub-window"
+msgstr "Da li će traka alata biti vidljiva u pod-prozoru"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
+msgid "Stores whether the To Do bar is visible in a sub-window."
+msgstr "Čuva podešavanje vidljivosti trake sa zadacima u pod-prozoru."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
+msgid "Width of the To Do bar in a sub-window"
+msgstr "Širina trake sa zadacima u pod-prozoru"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
+msgid "Holds the width of the To Do bar for a sub-window."
+msgstr "Čuva širinu trake sa zadacima u pod-prozoru."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
+msgid "Whether the To Do bar should show also completed tasks"
+msgstr "Da li traka sa zadacima treba da prikazuje i završene zadatke"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
+msgid "Stores whether the To Do bar should show also completed tasks."
+msgstr "Čuva podešavanje prikazivanja završenih zadataka u traci sa zadacima."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
+msgid "Show start up wizard"
+msgstr "Prikaži čarobnjaka za pokretanje"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
+msgid "Whether show start up wizard when there is no mail account configured."
+msgstr ""
+"Da li treba prikazati čarobnjaka za pokretanje pri pokretanju programa ako "
+"nijedan nalog e-pošte nije podešen."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
 msgid "(Deprecated) Default forward style"
 msgstr "(Zastarelo) Podrazumevani stil prosleđivanja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
-#| msgid ""
-#| "This key was deprecated in version 3.10 and should no longer be used. Use "
-#| "\"forward-style-name\" instead."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“forward-style-name” instead."
@@ -2715,14 +2589,11 @@ msgstr ""
 "Ovaj ključ je zastareo u izdanju 3.10 i ne treba više da se koristi. Umesto "
 "njega koristite „forward-style-name“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
 msgid "(Deprecated) Default reply style"
 msgstr "(Zastarelo) Podrazumevani stil odgovora"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
-#| msgid ""
-#| "This key was deprecated in version 3.10 and should no longer be used. Use "
-#| "\"reply-style-name\" instead."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“reply-style-name” instead."
@@ -2730,14 +2601,11 @@ msgstr ""
 "Ovaj ključ je zastareo u izdanju 3.10 i ne treba više da se koristi. Umesto "
 "njega koristite „reply-style-name“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "(Zastarelo) Spisak proizvoljnih zaglavlja i da li su uključena."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
-#| msgid ""
-#| "This key was deprecated in version 3.10 and should no longer be used. Use "
-#| "\"show-headers\" instead."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:259
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“show-headers” instead."
@@ -2745,14 +2613,11 @@ msgstr ""
 "Ovaj ključ je zastareo u izdanju 3.10 i ne treba više da se koristi. Umesto "
 "njega koristite „show-headers“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "(Zastarelo) Učitava slike za HTML poruke preko HTTP-a"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
-#| msgid ""
-#| "This key was deprecated in version 3.10 and should no longer be used. Use "
-#| "\"image-loading-policy\" instead."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:261
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“image-loading-policy” instead."
@@ -2760,7 +2625,7 @@ msgstr ""
 "Ovaj ključ je zastareo u izdanju 3.10 i ne treba više da se koristi. Umesto "
 "njega koristite „image-loading-policy“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:262
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
@@ -2768,10 +2633,7 @@ msgstr ""
 "(Zastarelo) Pita da li da zatvori prozor sa porukom kada korisnik prosleđuje "
 "ili odgovara na poruku prikazanu u prozoru"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
-#| msgid ""
-#| "This key was deprecated in version 3.10 and should no longer be used. Use "
-#| "\"browser-close-on-reply-policy\" instead."
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:263
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“browser-close-on-reply-policy” instead."
@@ -2824,8 +2686,6 @@ msgid "Enable autocontacts"
 msgstr "Uključuje samokontakte"
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:6
-#| msgid ""
-#| "Whether contacts should be automatically added to the user's address book."
 msgid ""
 "Whether contacts should be automatically added to the user’s address book."
 msgstr "Da li će kontakti biti samostalno dodati u korisnički adresar."
@@ -2870,11 +2730,6 @@ msgid "List of Custom Headers"
 msgstr "Spisak prilagođenih zaglavlja"
 
 #: ../data/org.gnome.evolution.plugin.email-custom-header.gschema.xml.in.h:2
-#| msgid ""
-#| "The key specifies the list of custom headers that you can add to an "
-#| "outgoing message. The format for specifying a Header and Header value is: "
-#| "Name of the custom header followed by \"=\" and the values separated by "
-#| "\";\""
 msgid ""
 "The key specifies the list of custom headers that you can add to an outgoing "
 "message. The format for specifying a Header and Header value is: Name of the "
@@ -2959,10 +2814,6 @@ msgid "Enable audible notifications when new messages arrive."
 msgstr "Uključuje zvučna obaveštenja kada stigne nova poruka."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:10
-#| msgid ""
-#| "Whether to make a sound of any kind when new messages arrive. If \"false"
-#| "\", the \"notify-sound-beep\", \"notify-sound-file\", \"notify-sound-play-"
-#| "file\" and \"notify-sound-use-theme\" keys are disregarded."
 msgid ""
 "Whether to make a sound of any kind when new messages arrive. If “false”, "
 "the “notify-sound-beep”, “notify-sound-file”, “notify-sound-play-file” and "
@@ -2985,9 +2836,6 @@ msgid "Sound filename to be played."
 msgstr "Naziv zvučne datoteke za puštanje."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:14
-#| msgid ""
-#| "Sound file to be played when new messages arrive, if \"notify-sound-play-"
-#| "file\" is \"true\"."
 msgid ""
 "Sound file to be played when new messages arrive, if “notify-sound-play-"
 "file” is “true”."
@@ -3000,9 +2848,6 @@ msgid "Whether to play a sound file."
 msgstr "Da li da pusti zvučnu datoteku."
 
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:16
-#| msgid ""
-#| "Whether to play a sound file when new messages arrive. The name of the "
-#| "sound file is given by the 'notify-sound-file' key."
 msgid ""
 "Whether to play a sound file when new messages arrive. The name of the sound "
 "file is given by the “notify-sound-file” key."
@@ -3025,12 +2870,6 @@ msgid "Mode to use when displaying mails"
 msgstr "Režim za korišćenje prilikom prikaza pošte"
 
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:2
-#| msgid ""
-#| "The mode to use for displaying mails. \"normal\" makes Evolution choose "
-#| "the best part to show, \"prefer_plain\" makes it use the text part, if "
-#| "present, \"prefer_source\" makes it use the text part, if present, "
-#| "otherwise shows HTML source, and \"only_plain\" forces Evolution to only "
-#| "show plain text"
 msgid ""
 "The mode to use for displaying mails. “normal” makes Evolution choose the "
 "best part to show, “prefer_plain” makes it use the text part, if present, "
@@ -3082,9 +2921,6 @@ msgid "Initial attachment view"
 msgstr "Polazni pregled priloga"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:4
-#| msgid ""
-#| "Initial view for attachment bar widgets. \"0\" is Icon View, \"1\" is "
-#| "List View."
 msgid ""
 "Initial view for attachment bar widgets. “0” is Icon View, “1” is List View."
 msgstr ""
@@ -3152,16 +2988,13 @@ msgid "List of button names to hide in the window switcher"
 msgstr "Spisak naziva dugmadi za skrivanje u prebacivaču prozora"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:18
-#| msgid ""
-#| "Valid values are 'mail', 'addressbook', 'calendar', 'tasks' and 'memos'. "
-#| "Change of this requires restart of the application."
 msgid ""
 "Valid values are “mail”, “addressbook”, “calendar”, “tasks” and “memos”. "
 "Change of this requires restart of the application."
 msgstr ""
-"Ispravne vrednosti su „mail“ (pošta), „addressbook“ (adresar), „calendar“ "
-"(kalendar), „tasks“ (zadaci) i „memos“ (beleške). Izmena ovoga zahteva "
-"ponovno pokretanje programa."
+"Ispravne vrednosti su „mail“ (pošta), „addressbook“ (adresar), "
+"„calendar“ (kalendar), „tasks“ (zadaci) i „memos“ (beleške). Izmena ovoga "
+"zahteva ponovno pokretanje programa."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:19
 msgid "Window buttons are visible"
@@ -3176,26 +3009,20 @@ msgid "Window button style"
 msgstr "Stil dugmadi prozora"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:22
-#| msgid ""
-#| "The style of the window buttons. Can be \"text\", \"icons\", \"both\", "
-#| "\"toolbar\". If \"toolbar\" is set, the style of the buttons is "
-#| "determined by the GNOME toolbar setting."
 msgid ""
 "The style of the window buttons. Can be “text”, “icons”, “both”, “toolbar”. "
 "If “toolbar” is set, the style of the buttons is determined by the GNOME "
 "toolbar setting."
 msgstr ""
-"Stil dugmadi prozora. Može biti „text“ (tekst), „icons“ (ikone), „both“ "
-"(oboje), „toolbar“ (traka alata). Ako je postavljeno „toolbar“, Gnomovo "
-"podešavanje trake alata utvrđuje stil."
+"Stil dugmadi prozora. Može biti „text“ (tekst), „icons“ (ikone), "
+"„both“ (oboje), „toolbar“ (traka alata). Ako je postavljeno „toolbar“, "
+"Gnomovo podešavanje trake alata utvrđuje stil."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:23
-#| msgid "Sidebar is visible"
 msgid "Menubar is visible"
 msgstr "Traka izbornika je vidljiva"
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:24
-#| msgid "Whether the sidebar should be visible."
 msgid "Whether the menubar should be visible."
 msgstr "Da li će traka izbornika biti vidljiva."
 
@@ -3280,6 +3107,21 @@ msgstr ""
 "koja je određena tokom kompajliranja programa, obično „/usr/bin/sa-learn“. "
 "Naredba ne treba da sadrži dodatne opcije."
 
+#: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:1
+msgid "Theme name to use, defaults to “bclear”"
+msgstr "Naziv teme, podrazumevano je „bclear“"
+
+#: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:2
+msgid ""
+"Use “highlight --list-scripts=themes” to get the list of installed themes "
+"and then the value to one of them. The change requires only re-format of the "
+"message part to take into effect, like using right-click→Format As→...."
+msgstr ""
+"Koristi “highlight --list-scripts=themes” da bi dobio spisak instaliranih "
+"tema i onda vrednost ka jednoj od njih. Ova izmena zahteva samo ponovno "
+"oblikovanje dela poruke da bi bila primenjena, poput korišćenja desnog "
+"klika→Oblikuj kao→...."
+
 #: ../data/views/addressbook/galview.xml.h:1
 msgid "_Address Cards"
 msgstr "_Karte adresara"
@@ -3341,11 +3183,11 @@ msgstr "Za š_iroki prikaz"
 msgid "As Sent Folder for Wi_de View"
 msgstr "Kao fascikla slanja za _široki prikaz"
 
-#: ../data/views/memos/galview.xml.h:1
+#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2439
 msgid "_Memos"
 msgstr "Be_leške"
 
-#: ../data/views/tasks/galview.xml.h:1
+#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2443
 #: ../src/plugins/pst-import/pst-importer.c:571
 msgid "_Tasks"
 msgstr "_Zadaci"
@@ -3416,9 +3258,8 @@ msgid "Could not remove address book."
 msgstr "Ne mogu da uklonim adresar."
 
 #: ../src/addressbook/addressbook.error.xml.h:11
-#| msgid "Delete address book '{0}'?"
-msgid "Delete address book “{0}”?"
-msgstr "Da obrišem adresar „{0}“?"
+msgid "Are you sure you want to delete address book “{0}”?"
+msgstr "Sigurno želite da obrišete adresar „{0}“?"
 
 # malo aorista ;-)
 #: ../src/addressbook/addressbook.error.xml.h:12
@@ -3426,19 +3267,16 @@ msgid "This address book will be removed permanently."
 msgstr "Ovaj adresar će biti trajno uklonjen."
 
 #: ../src/addressbook/addressbook.error.xml.h:13
-#: ../src/calendar/calendar.error.xml.h:7 ../src/mail/mail.error.xml.h:69
+#: ../src/calendar/calendar.error.xml.h:7 ../src/e-util/e-system.error.xml.h:27
+#: ../src/mail/mail.error.xml.h:69
 msgid "Do _Not Delete"
 msgstr "Ne _briši"
 
 #: ../src/addressbook/addressbook.error.xml.h:14
-#| msgid "Delete remote address book &quot;{0}&quot;?"
 msgid "Delete remote address book “{0}”?"
 msgstr "Da obrišem udaljeni adresar „{0}“?"
 
 #: ../src/addressbook/addressbook.error.xml.h:15
-#| msgid ""
-#| "This will permanently remove the address book &quot;{0}&quot; from the "
-#| "server. Are you sure you want to proceed?"
 msgid ""
 "This will permanently remove the address book “{0}” from the server. Are you "
 "sure you want to proceed?"
@@ -3448,6 +3286,7 @@ msgstr ""
 
 #: ../src/addressbook/addressbook.error.xml.h:16
 #: ../src/calendar/calendar.error.xml.h:65
+#: ../src/e-util/e-system.error.xml.h:28
 msgid "_Delete From Server"
 msgstr "_Obriši sa servera"
 
@@ -3456,7 +3295,6 @@ msgid "Category editor not available."
 msgstr "Uređivač kategorija nije dostupan."
 
 #: ../src/addressbook/addressbook.error.xml.h:18
-#| msgid "Unable to open address book '{0}'"
 msgid "Unable to open address book “{0}”"
 msgstr "Ne mogu da otvorim adresar „{0}“"
 
@@ -3465,7 +3303,6 @@ msgid "Unable to perform search."
 msgstr "Pretraga nije moguća."
 
 #: ../src/addressbook/addressbook.error.xml.h:20
-#| msgid "Failed to refresh address book '{0}'"
 msgid "Failed to refresh address book “{0}”"
 msgstr "Ne mogu da osvežim adresar „{0}“"
 
@@ -3493,7 +3330,7 @@ msgid ""
 "cannot be removed from the source. Do you want to save a copy instead?"
 msgstr ""
 "Pokušavate da premestite kontakt iz jednog adresara u drugi ali se on ne "
-"može ukloniti iz izvora. Želite li da sačuvate umnožak umesto toga?"
+"može ukloniti iz izvora. Želite li da sačuvate kopiju umesto toga?"
 
 #: ../src/addressbook/addressbook.error.xml.h:26
 msgid ""
@@ -3523,7 +3360,6 @@ msgid "Error saving {0} to {1}: {2}"
 msgstr "Greška pri čuvanju {0} u {1}: {2}"
 
 #: ../src/addressbook/addressbook.error.xml.h:32
-#| msgid "Address '{0}' already exists."
 msgid "Address “{0}” already exists."
 msgstr "Adresa „{0}“ već postoji."
 
@@ -3539,13 +3375,14 @@ msgstr ""
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:721
 #: ../src/calendar/gui/e-comp-editor-page-general.c:1355
+#: ../src/e-util/e-accounts-window.c:1540
 #: ../src/e-util/e-mail-signature-manager.c:328
 #: ../src/e-util/e-name-selector-dialog.c:1033 ../src/e-util/filter.ui.h:23
 #: ../src/mail/e-mail-account-manager.c:719
 #: ../src/mail/e-mail-label-manager.c:371
 #: ../src/mail/em-folder-properties.c:1031
 #: ../src/mail/em-vfolder-editor-rule.c:397
-#: ../src/mail/em-vfolder-editor-rule.c:626 ../src/mail/mail-config.ui.h:60
+#: ../src/mail/em-vfolder-editor-rule.c:626 ../src/mail/mail-config.ui.h:61
 #: ../src/modules/mail/em-composer-prefs.c:422
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:543
 #: ../src/plugins/email-custom-header/email-custom-header.c:837
@@ -3575,14 +3412,10 @@ msgid "Add with duplicates"
 msgstr "Dodaj sa duplikatima"
 
 #: ../src/addressbook/addressbook.error.xml.h:39
-#| msgid "List '{0}' is already in this contact list."
 msgid "List “{0}” is already in this contact list."
 msgstr "Spisak „{0}“ je već na ovom spisku kontakata."
 
 #: ../src/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?"
 msgid ""
 "A contact list named “{0}” is already in this contact list. Would you like "
 "to add it anyway?"
@@ -3605,9 +3438,6 @@ msgstr "Nije moguće dodati novi kontakt"
 
 #. For Translators: {0} is the name of the address book source
 #: ../src/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."
 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."
@@ -3621,9 +3451,6 @@ msgstr "Ne mogu da sačuvam kontakt, adresar se još uvek otvara"
 
 #. For Translators: {0} is the name of the address book source
 #: ../src/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."
 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."
@@ -3632,7 +3459,6 @@ msgstr ""
 "sačekajte dok se ne otvori, ili izaberite neki drugi adresar."
 
 #: ../src/addressbook/addressbook.error.xml.h:49
-#| msgid "Search for text in the displayed contact"
 msgid "Something has gone wrong when displaying the contact"
 msgstr "Nešto je pošlo naopako prilikom prikazivanja kontakta"
 
@@ -3699,7 +3525,7 @@ msgstr "Uređivač za kontakte"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:13
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1996
-#: ../src/mail/mail-config.ui.h:37
+#: ../src/mail/mail-config.ui.h:38
 msgid "Options"
 msgstr "Mogućnosti"
 
@@ -3722,9 +3548,9 @@ msgstr "Mogućnosti"
 #: ../src/composer/e-composer-actions.c:227 ../src/e-util/e-activity-bar.c:357
 #: ../src/e-util/e-attachment-dialog.c:309
 #: ../src/e-util/e-attachment-store.c:664
-#: ../src/e-util/e-attachment-store.c:832 ../src/e-util/e-attachment-view.c:301
-#: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:137
-#: ../src/e-util/e-category-editor.c:207 ../src/e-util/e-charset-combo-box.c:99
+#: ../src/e-util/e-attachment-store.c:832 ../src/e-util/e-attachment-view.c:302
+#: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:140
+#: ../src/e-util/e-category-editor.c:211 ../src/e-util/e-charset-combo-box.c:99
 #: ../src/e-util/e-color-chooser-widget.c:125
 #: ../src/e-util/e-filter-datespec.c:289
 #: ../src/e-util/e-html-editor-actions.c:321
@@ -3734,17 +3560,18 @@ msgstr "Mogućnosti"
 #: ../src/e-util/e-passwords.c:468 ../src/e-util/e-rule-context.c:813
 #: ../src/e-util/e-rule-editor.c:178 ../src/e-util/e-rule-editor.c:280
 #: ../src/e-util/e-rule-editor.c:789 ../src/e-util/e-send-options.ui.h:16
-#: ../src/e-util/e-source-config-dialog.c:377
+#: ../src/e-util/e-source-config-dialog.c:360
 #: ../src/e-util/e-source-selector-dialog.c:370
 #: ../src/e-util/e-table-config.c:548 ../src/e-util/e-table-config.ui.h:3
 #: ../src/e-util/e-timezone-dialog.ui.h:2
-#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4065
+#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4096
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:267
-#: ../src/mail/e-mail-config-window.c:331 ../src/mail/e-mail-label-dialog.c:194
+#: ../src/mail/e-mail-config-window.c:334 ../src/mail/e-mail-label-dialog.c:194
 #: ../src/mail/e-mail-tag-editor.c:168 ../src/mail/em-folder-selector.c:318
 #: ../src/mail/mail-config.ui.h:2 ../src/mail/mail.error.xml.h:16
 #: ../src/mail/mail-send-recv.c:747 ../src/mail/mail-send-recv.c:829
 #: ../src/mail/mail-vfolder-ui.c:149 ../src/mail/mail-vfolder-ui.c:271
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:277
 #: ../src/modules/backup-restore/evolution-backup-tool.c:932
 #: ../src/modules/calendar/e-cal-attachment-handler.c:283
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
@@ -3752,7 +3579,7 @@ msgstr "Mogućnosti"
 #: ../src/plugins/publish-calendar/publish-calendar.c:788
 #: ../src/plugins/publish-calendar/url-editor-dialog.c:419
 #: ../src/plugins/save-calendar/save-calendar.c:185
-#: ../src/shell/e-shell-content.c:657 ../src/shell/e-shell-content.c:764
+#: ../src/shell/e-shell-content.c:639 ../src/shell/e-shell-content.c:746
 #: ../src/shell/e-shell-utils.c:70 ../src/shell/e-shell-utils.c:139
 #: ../src/smime/gui/certificate-manager.c:665
 #: ../src/smime/gui/certificate-manager.c:742
@@ -3767,26 +3594,26 @@ msgstr "_Otkaži"
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
 #: ../src/addressbook/gui/widgets/eab-contact-merging.c:719
 #: ../src/calendar/calendar.error.xml.h:47
-#: ../src/calendar/gui/e-comp-editor.c:2107
+#: ../src/calendar/gui/e-comp-editor.c:2115
 #: ../src/composer/e-composer-actions.c:228
 #: ../src/composer/e-composer-actions.c:348
 #: ../src/e-util/e-attachment-store.c:833
 #: ../src/e-util/e-mail-signature-script-dialog.c:370
-#: ../src/e-util/e-web-view.c:4066
+#: ../src/e-util/e-webdav-browser.c:2467 ../src/e-util/e-web-view.c:4097
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:268
-#: ../src/shell/e-shell-content.c:658 ../src/shell/e-shell-utils.c:140
+#: ../src/shell/e-shell-content.c:640 ../src/shell/e-shell-utils.c:140
 #: ../src/smime/gui/certificate-manager.c:666
 #: ../src/smime/gui/certificate-manager.c:743
 msgid "_Save"
 msgstr "_Sačuvaj"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:16
-#: ../src/calendar/gui/e-comp-editor.c:2004
-#: ../src/calendar/gui/e-comp-editor.c:2076
-#: ../src/e-util/e-preferences-window.c:380
+#: ../src/calendar/gui/e-comp-editor.c:2012
+#: ../src/calendar/gui/e-comp-editor.c:2084
+#: ../src/e-util/e-preferences-window.c:390
 #: ../src/e-util/e-send-options.ui.h:15
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../src/shell/e-shell.c:1309 ../src/shell/e-shell-window-actions.c:964
+#: ../src/shell/e-shell.c:1309 ../src/shell/e-shell-window-actions.c:994
 msgid "_Help"
 msgstr "Po_moć"
 
@@ -3816,8 +3643,8 @@ msgid "Full _Name..."
 msgstr "Puno _ime..."
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:23
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:750
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1169
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:762
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1181
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Email"
 msgstr "E-pošta"
@@ -3937,20 +3764,21 @@ msgid "_Anniversary:"
 msgstr "_Godišnjica:"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:52
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:881
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:893
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:47
 #: ../src/calendar/gui/e-calendar-view.c:2045
 msgid "Anniversary"
 msgstr "Godišnjica"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:880
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:892
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:46
 #: ../src/calendar/gui/e-calendar-view.c:2044
 msgid "Birthday"
 msgstr "Rođendan"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../src/modules/addressbook/autocompletion-config.c:127
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Miscellaneous"
 msgstr "Razno"
@@ -3992,16 +3820,16 @@ msgstr "Kuća"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:63
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:82
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:848
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:860
 #: ../src/addressbook/gui/widgets/e-contact-map.c:380
 msgid "Work"
 msgstr "Posao"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:64
 #: ../src/addressbook/gui/widgets/eab-contact-formatter.c:84
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:513
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:915
-#: ../src/calendar/gui/e-cal-model.c:3823
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:525
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:927
+#: ../src/calendar/gui/e-cal-model.c:3798
 msgid "Other"
 msgstr "Drugo"
 
@@ -4026,13 +3854,14 @@ msgstr "Dodaj X._509"
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:69
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
 #: ../src/calendar/gui/e-comp-editor-page-general.c:1371
-#: ../src/e-util/e-attachment-view.c:355 ../src/e-util/e-filter-rule.c:223
+#: ../src/e-util/e-attachment-view.c:356 ../src/e-util/e-filter-rule.c:223
 #: ../src/e-util/e-mail-signature-manager.c:368
 #: ../src/e-util/e-name-selector-dialog.c:1037
 #: ../src/e-util/filter.error.xml.h:18 ../src/e-util/filter.ui.h:25
+#: ../src/mail/e-mail-config-identity-page.c:871
 #: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:438
 #: ../src/mail/em-folder-properties.c:1037
-#: ../src/mail/em-vfolder-editor-rule.c:631 ../src/mail/mail-config.ui.h:61
+#: ../src/mail/em-vfolder-editor-rule.c:631 ../src/mail/mail-config.ui.h:62
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:553
 #: ../src/plugins/email-custom-header/email-custom-header.c:847
 #: ../src/plugins/publish-calendar/publish-calendar.c:789
@@ -4050,29 +3879,29 @@ msgid "_Load X.509"
 msgstr "Učitaj X.5_09"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:72
-#: ../src/modules/addressbook/e-book-shell-backend.c:312
+#: ../src/modules/addressbook/e-book-shell-backend.c:318
 msgid "Certificates"
 msgstr "Uverenja"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:260
-#: ../src/calendar/gui/e-comp-editor.c:2039
+#: ../src/calendar/gui/e-comp-editor.c:2047
 #: ../src/e-util/e-html-editor-actions.c:913
 msgid "_Undo"
 msgstr "O_pozovi"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:262
-#: ../src/calendar/gui/e-comp-editor.c:2041 ../src/e-util/e-focus-tracker.c:120
+#: ../src/calendar/gui/e-comp-editor.c:2049 ../src/e-util/e-focus-tracker.c:120
 msgid "Undo"
 msgstr "Opozovi"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:267
-#: ../src/calendar/gui/e-comp-editor.c:2046
+#: ../src/calendar/gui/e-comp-editor.c:2054
 #: ../src/e-util/e-html-editor-actions.c:899
 msgid "_Redo"
 msgstr "Po_novi"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:269
-#: ../src/calendar/gui/e-comp-editor.c:2048 ../src/e-util/e-focus-tracker.c:136
+#: ../src/calendar/gui/e-comp-editor.c:2056 ../src/e-util/e-focus-tracker.c:136
 msgid "Redo"
 msgstr "Ponovi"
 
@@ -4092,7 +3921,6 @@ msgstr "Greška pri uklanjanju kontakta"
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:741
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3102
 #, c-format
-#| msgid "Contact Editor - %s"
 msgid "Contact Editor — %s"
 msgstr "Uređivač za kontakte — %s"
 
@@ -4120,7 +3948,7 @@ msgstr "Otvoreno X.506 uverenje"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3272
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4320
-#: ../src/e-util/e-attachment-store.c:662 ../src/e-util/e-category-editor.c:145
+#: ../src/e-util/e-attachment-store.c:662 ../src/e-util/e-category-editor.c:148
 #: ../src/e-util/e-html-editor-actions.c:322
 #: ../src/e-util/e-html-editor-actions.c:416
 #: ../src/e-util/e-image-chooser-dialog.c:172 ../src/plugins/face/face.c:296
@@ -4179,26 +4007,22 @@ msgstr ""
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4676
 #, c-format
-#| msgid "'%s' has an invalid format"
 msgid "“%s” has an invalid format"
 msgstr "„%s“ ima neispravan format"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4684
 #, c-format
-#| msgid "'%s' cannot be a future date"
 msgid "“%s” cannot be a future date"
 msgstr "„%s“ ne može biti budući datum"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4692
 #, c-format
-#| msgid "%s'%s' has an invalid format"
 msgid "%s“%s” has an invalid format"
 msgstr "%s„%s“ ima neispravan format"
 
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4705
 #: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4719
 #, c-format
-#| msgid "%s'%s' is empty"
 msgid "%s“%s” is empty"
 msgstr "%s„%s“ je prazan"
 
@@ -4212,7 +4036,7 @@ msgstr "Neispravan kontakt."
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:317
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:302
 #: ../src/e-util/e-attachment-dialog.c:311
-#: ../src/e-util/e-categories-dialog.c:81 ../src/e-util/e-category-editor.c:208
+#: ../src/e-util/e-categories-dialog.c:81 ../src/e-util/e-category-editor.c:212
 #: ../src/e-util/e-charset-combo-box.c:100
 #: ../src/e-util/e-color-chooser-widget.c:126
 #: ../src/e-util/e-filter-datespec.c:290
@@ -4220,17 +4044,18 @@ msgstr "Neispravan kontakt."
 #: ../src/e-util/e-passwords.c:469 ../src/e-util/e-rule-context.c:814
 #: ../src/e-util/e-rule-editor.c:179 ../src/e-util/e-rule-editor.c:281
 #: ../src/e-util/e-rule-editor.c:790 ../src/e-util/e-send-options.ui.h:17
-#: ../src/e-util/e-source-config-dialog.c:378
+#: ../src/e-util/e-source-config-dialog.c:361
 #: ../src/e-util/e-source-selector-dialog.c:371
 #: ../src/e-util/e-table-config.c:549 ../src/e-util/e-table-config.ui.h:4
 #: ../src/e-util/e-timezone-dialog.ui.h:3
-#: ../src/mail/e-mail-config-window.c:332 ../src/mail/e-mail-tag-editor.c:169
+#: ../src/mail/e-mail-config-window.c:335 ../src/mail/e-mail-tag-editor.c:169
 #: ../src/mail/em-folder-selector.c:44 ../src/mail/mail-config.ui.h:3
 #: ../src/mail/mail-dialogs.ui.h:24 ../src/mail/mail-vfolder-ui.c:150
 #: ../src/mail/mail-vfolder-ui.c:272
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:278
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
 #: ../src/plugins/publish-calendar/url-editor-dialog.c:420
-#: ../src/shell/e-shell-content.c:659 ../src/shell/e-shell-content.c:765
+#: ../src/shell/e-shell-content.c:641 ../src/shell/e-shell-content.c:747
 #: ../src/shell/main.c:180 ../src/smime/gui/certificate-manager.c:1349
 #: ../src/smime/gui/e-cert-selector.c:236 ../src/smime/gui/smime-ui.ui.h:18
 msgid "_OK"
@@ -4387,29 +4212,29 @@ msgstr "D_no"
 msgid "Contact List Members"
 msgstr "Članovi kontakt liste"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1485
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1499
 msgid "_Members"
 msgstr "_Članovi"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1625
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1639
 msgid "Error adding list"
 msgstr "Greška pri dodavanju liste"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1645
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1659
 msgid "Error modifying list"
 msgstr "Greška pri izmeni liste"
 
-#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1665
+#: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1679
 msgid "Error removing list"
 msgstr "Greška pri uklanjanju liste"
 
 #: ../src/addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1219
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1225
 msgid "Name contains"
 msgstr "Naziv sadrži"
 
 #: ../src/addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1212
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1218
 msgid "Email begins with"
 msgstr "E-pošta počinje sa"
 
@@ -4417,8 +4242,8 @@ msgstr "E-pošta počinje sa"
 #: ../src/calendar/gui/caltypes.xml.in.h:26
 #: ../src/calendar/gui/memotypes.xml.in.h:19
 #: ../src/calendar/gui/tasktypes.xml.in.h:30
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1205
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1662
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1211
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1713
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:782
 #: ../src/modules/calendar/e-task-shell-view-actions.c:983
 msgid "Any field contains"
@@ -4438,154 +4263,159 @@ msgstr "Polje koje sadrži"
 msgid "evolution address book"
 msgstr "Adresar Evolucije"
 
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:149
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:185
 msgid "Copy _Email Address"
-msgstr "Umnoži elektronsku _adresu"
+msgstr "Kopiraj elektronsku _adresu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:151
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:187
 #: ../src/e-util/e-web-view.c:368
 msgid "Copy the email address to the clipboard"
-msgstr "Umnožava adrese u spisak isečaka"
+msgstr "Kopira adrese u spisak isečaka"
 
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:156
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:192
 #: ../src/e-util/e-web-view.c:380
 msgid "_Send New Message To..."
 msgstr "_Pošalji poruku za..."
 
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:158
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:194
 #: ../src/e-util/e-web-view.c:382
 msgid "Send a mail message to this address"
 msgstr "Šalje poruku na ovu adresu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-display.c:290
-#: ../src/e-util/e-web-view.c:1317
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:321
+#: ../src/e-util/e-web-view.c:1349
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite da pošaljete %s"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:142
+#: ../src/addressbook/gui/widgets/eab-contact-display.c:335
+#, c-format
+msgid "Click to open map for %s"
+msgstr "Kliknite da otvorite kartu za %s"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:154
 msgid "Open map"
-msgstr "Otvorite mapu"
+msgstr "Otvorite kartu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:438
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:450
 msgid "SIP"
 msgstr "SIP"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:682
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:694
 msgid "List Members:"
 msgstr "Članovi liste:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:754
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:766
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "Nadimak"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:755
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:767
 msgid "AIM"
 msgstr "AIM"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:756
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:768
 msgid "GroupWise"
 msgstr "GroupVajz"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:757
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:769
 msgid "ICQ"
 msgstr "ICKu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:758
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:770
 msgid "Jabber"
 msgstr "Džaber"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:759
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:771
 msgid "MSN"
 msgstr "MSN"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:760
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:772
 msgid "Yahoo"
 msgstr "Jahu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:761
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:773
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:762
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:774
 msgid "Skype"
 msgstr "Skajp"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:763
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:775
 msgid "Twitter"
 msgstr "Tviter"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:825
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:837
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "Preduzeće"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:826
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:838
 msgid "Department"
 msgstr "Odeljenje"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:827
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:839
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Office"
 msgstr "Kancelarija"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:828
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:840
 msgid "Profession"
 msgstr "Zanimanje"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:829
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:841
 msgid "Position"
 msgstr "Položaj"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:830
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:842
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "Rukovodilac"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:831
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:843
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "Pomoćnik"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:832
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:844
 msgid "Video Chat"
 msgstr "Video razgovor"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:834
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:846
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Slobodno/zauzeto"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:835
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:876
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:847
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:888
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:836
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:848
 msgid "Fax"
 msgstr "Faks"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:838
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:879
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:905
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:850
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:891
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:917
 msgid "Address"
 msgstr "Adresa"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:874
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:886
 msgid "Home Page"
 msgstr "Matična stranica"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:875
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:887
 msgid "Web Log"
 msgstr "Veb log"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:877
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:889
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:20
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:882
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:894
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "Supružnik"
@@ -4593,28 +4423,28 @@ msgstr "Supružnik"
 # Create the default Person calendar
 # Create the default Person task list
 # orange
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:892
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:904
 msgid "Personal"
 msgstr "Lično"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:937
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:949
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "Napomena"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1133
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1145
 msgid "List Members"
 msgstr "Članovi liste"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1154
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1166
 msgid "Job Title"
 msgstr "Zvanje na poslu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1195
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1207
 msgid "Home page"
 msgstr "Matična stranica"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1205
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1217
 msgid "Blog"
 msgstr "Blog"
 
@@ -4624,7 +4454,7 @@ msgstr "Blog"
 #: ../src/calendar/gui/e-cal-model-tasks.c:556
 #: ../src/calendar/gui/e-task-table.c:209
 #: ../src/calendar/gui/e-task-table.c:224
-#: ../src/calendar/gui/e-task-table.c:634 ../src/calendar/gui/print.c:3586
+#: ../src/calendar/gui/e-task-table.c:634 ../src/calendar/gui/print.c:3596
 #: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:966
 msgid "Cancelled"
 msgstr "Otkazano"
@@ -4776,7 +4606,7 @@ msgstr "Premesti kontakt u"
 
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:587
 msgid "Copy contact to"
-msgstr "Umnoži kontakt u"
+msgstr "Kopiraj kontakt u"
 
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:590
 msgid "Move contacts to"
@@ -4784,7 +4614,7 @@ msgstr "Premesti kontakte u"
 
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:592
 msgid "Copy contacts to"
-msgstr "Umnoži kontakte u"
+msgstr "Kopiraj kontakte u"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-model.c:160
 msgid "No contacts"
@@ -4817,14 +4647,14 @@ msgstr "Seče označene kontakte u spisak isečaka"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.c:686
 msgid "Copy selected contacts to the clipboard"
-msgstr "Umnožava označene kontakte u spisak isečaka"
+msgstr "Kopira označene kontakte u spisak isečaka"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.c:692
 msgid "Paste contacts from the clipboard"
 msgstr "Ubacuje kontakte iz spiska isečaka"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.c:698
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1015
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1021
 msgid "Delete selected contacts"
 msgstr "Briše izabrane kontakte"
 
@@ -4859,15 +4689,17 @@ msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Sigurno želite da obrišete ovaj kontakt (%s)?"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.c:1361
-#: ../src/calendar/gui/e-comp-editor.c:1997 ../src/e-util/e-focus-tracker.c:783
+#: ../src/calendar/gui/e-comp-editor.c:2005
+#: ../src/e-util/e-accounts-window.c:1727 ../src/e-util/e-focus-tracker.c:783
 #: ../src/e-util/evolution-source-viewer.c:806
+#: ../src/e-util/e-webdav-browser.c:2688
 #: ../src/mail/e-mail-account-manager.c:737
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1087
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1093
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1524
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:676
 #: ../src/modules/calendar/e-task-shell-view-actions.c:830
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1699
-#: ../src/shell/e-shell-window-actions.c:822
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1680
+#: ../src/shell/e-shell-window-actions.c:852
 #: ../src/smime/gui/certificate-manager.c:1672 ../src/smime/gui/smime-ui.ui.h:8
 msgid "_Delete"
 msgstr "_Obriši"
@@ -4895,7 +4727,6 @@ msgstr[3] ""
 "Da li zaista želite da prikažete sve ove kontakte?"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.c:1516
-#| msgid "_Don't Display"
 msgid "_Don’t Display"
 msgstr "_Ne prikazuj"
 
@@ -5075,7 +4906,7 @@ msgstr "U_većaj"
 
 #. Zoom-out button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:417
-#: ../src/mail/e-mail-reader.c:2421
+#: ../src/mail/e-mail-reader.c:2415
 msgid "Zoom _Out"
 msgstr "U_manji"
 
@@ -5083,7 +4914,7 @@ msgstr "U_manji"
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:447
 #: ../src/e-util/e-html-editor-actions.c:1872
 #: ../src/e-util/e-html-editor-find-dialog.c:250
-#: ../src/shell/e-shell-window-actions.c:899
+#: ../src/shell/e-shell-window-actions.c:929
 msgid "_Find"
 msgstr "_Nađi"
 
@@ -5156,7 +4987,6 @@ msgid "Importing..."
 msgstr "Uvozim..."
 
 #: ../src/addressbook/importers/evolution-csv-importer.c:927
-#| msgid "Can't open .csv file"
 msgid "Can’t open .csv file"
 msgstr "Ne mogu da otvorim „.csv“ datoteku"
 
@@ -5185,7 +5015,6 @@ msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolucijin uvoznik CSV i Tab kontakata"
 
 #: ../src/addressbook/importers/evolution-ldif-importer.c:717
-#| msgid "Can't open .ldif file"
 msgid "Can’t open .ldif file"
 msgstr "Ne mogu da otvorim „.ldif“ datoteku"
 
@@ -5374,17 +5203,19 @@ msgstr "_Dremanje"
 #: ../src/calendar/alarm-notify/alarm-notify.ui.h:4
 #: ../src/calendar/gui/e-comp-editor-page-general.c:1363
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2239
-#: ../src/calendar/gui/e-comp-editor.c:2062
+#: ../src/calendar/gui/e-comp-editor.c:2070
+#: ../src/e-util/e-accounts-window.c:1719
 #: ../src/e-util/e-html-editor-actions.c:922
-#: ../src/e-util/e-mail-signature-manager.c:358 ../src/e-util/filter.ui.h:24
+#: ../src/e-util/e-mail-signature-manager.c:358
+#: ../src/e-util/e-webdav-browser.c:2681 ../src/e-util/filter.ui.h:24
 #: ../src/mail/e-mail-account-manager.c:728 ../src/mail/e-mail-browser.c:171
 #: ../src/mail/e-mail-label-manager.c:380
-#: ../src/mail/em-folder-properties.c:1034 ../src/mail/mail-config.ui.h:65
+#: ../src/mail/em-folder-properties.c:1034 ../src/mail/mail-config.ui.h:66
 #: ../src/plugins/attachment-reminder/attachment-reminder.c:548
 #: ../src/plugins/email-custom-header/email-custom-header.c:842
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
 #: ../src/plugins/templates/templates.c:468
-#: ../src/shell/e-shell-window-actions.c:950 ../src/smime/gui/smime-ui.ui.h:11
+#: ../src/shell/e-shell-window-actions.c:980 ../src/smime/gui/smime-ui.ui.h:11
 msgid "_Edit"
 msgstr "_Uređivanje"
 
@@ -5430,7 +5261,7 @@ msgstr "sati"
 
 #: ../src/calendar/alarm-notify/alarm-notify.ui.h:12
 #: ../src/e-util/e-interval-chooser.c:140 ../src/e-util/filter.ui.h:6
-#: ../src/mail/e-mail-config-provider-page.c:571
+#: ../src/mail/e-mail-config-provider-page.c:579
 msgid "minutes"
 msgstr "minuta"
 
@@ -5470,12 +5301,10 @@ msgstr "Upozorenje"
 
 #: ../src/calendar/alarm-notify/alarm-queue.c:2097
 #: ../src/mail/mail-dialogs.ui.h:20
-#: ../src/modules/mailto-handler/evolution-mailto-handler.c:112
 msgid "_No"
 msgstr "_Ne"
 
 #: ../src/calendar/alarm-notify/alarm-queue.c:2098
-#: ../src/modules/mailto-handler/evolution-mailto-handler.c:113
 msgid "_Yes"
 msgstr "_Da"
 
@@ -5628,12 +5457,10 @@ msgstr ""
 "Svi podaci u ovoj belešci biće uklonjeni i neće biti moguć njihov povraćaj."
 
 #: ../src/calendar/calendar.error.xml.h:15
-#| msgid "Are you sure you want to delete the meeting titled '{0}'?"
 msgid "Are you sure you want to delete the meeting titled “{0}”?"
 msgstr "Sigurno želite da obrišete sastanak nazvan „{0}“?"
 
 #: ../src/calendar/calendar.error.xml.h:16
-#| msgid "Are you sure you want to delete the appointment titled '{0}'?"
 msgid "Are you sure you want to delete the appointment titled “{0}”?"
 msgstr "Sigurno želite da obrišete zakazivanje nazvano „{0}“?"
 
@@ -5649,12 +5476,10 @@ msgid "Are you sure you want to delete this appointment?"
 msgstr "Sigurno želite da obrišete ovo zakazivanje?"
 
 #: ../src/calendar/calendar.error.xml.h:19
-#| msgid "Are you sure you want to delete the '{0}' task?"
 msgid "Are you sure you want to delete the “{0}” task?"
 msgstr "Sigurno želite da obrišete zadatak „{0}“?"
 
 #: ../src/calendar/calendar.error.xml.h:20
-#| msgid "Are you sure you want to delete the memo '{0}'?"
 msgid "Are you sure you want to delete the memo “{0}”?"
 msgstr "Sigurno želite da obrišete belešku „{0}“?"
 
@@ -5843,41 +5668,34 @@ msgid "Editor could not be loaded."
 msgstr "Uređivač nije mogao biti učitan."
 
 #: ../src/calendar/calendar.error.xml.h:57
-#| msgid "Delete calendar '{0}'?"
-msgid "Delete calendar “{0}”?"
-msgstr "Da obrišem kalendar „{0}“?"
+msgid "Are you sure you want to delete calendar “{0}”?"
+msgstr "Sigurno želite da obrišete kalendar „{0}“?"
 
 #: ../src/calendar/calendar.error.xml.h:58
 msgid "This calendar will be removed permanently."
 msgstr "Ovaj kalendar će biti trajno uklonjen."
 
 #: ../src/calendar/calendar.error.xml.h:59
-#| msgid "Delete task list '{0}'?"
-msgid "Delete task list “{0}”?"
-msgstr "Da obrišem spisak zadataka „{0}“?"
+msgid "Are you sure you want to delete task list “{0}”?"
+msgstr "Sigurno želite da obrišete spisak zadataka „{0}“?"
 
 #: ../src/calendar/calendar.error.xml.h:60
 msgid "This task list will be removed permanently."
 msgstr "Ovaj spisak zadataka će biti trajno uklonjen."
 
 #: ../src/calendar/calendar.error.xml.h:61
-#| msgid "Delete memo list '{0}'?"
-msgid "Delete memo list “{0}”?"
-msgstr "Da obrišem spisak beleški „{0}“?"
+msgid "Are you sure you want to delete memo list “{0}”?"
+msgstr "Sigurno želite da obrišete spisak beleški „{0}“?"
 
 #: ../src/calendar/calendar.error.xml.h:62
 msgid "This memo list will be removed permanently."
 msgstr "Ovaj spisak beleški će biti trajno uklonjen."
 
 #: ../src/calendar/calendar.error.xml.h:63
-#| msgid "Delete remote calendar '{0}'?"
-msgid "Delete remote calendar “{0}”?"
-msgstr "Da obrišem udaljeni kalendar „{0}“?"
+msgid "Are you sure you want to delete remote calendar “{0}”?"
+msgstr "Sigurno želite da obrišete udaljeni kalendar „{0}“?"
 
 #: ../src/calendar/calendar.error.xml.h:64
-#| msgid ""
-#| "This will permanently remove the calendar '{0}' from the server. Are you "
-#| "sure you want to proceed?"
 msgid ""
 "This will permanently remove the calendar “{0}” from the server. Are you "
 "sure you want to proceed?"
@@ -5886,14 +5704,10 @@ msgstr ""
 "želite da nastavite?"
 
 #: ../src/calendar/calendar.error.xml.h:66
-#| msgid "Delete remote task list '{0}'?"
-msgid "Delete remote task list “{0}”?"
-msgstr "Da obrišem udaljeni spisak zadataka „{0}“?"
+msgid "Are you sure you want to delete remote task list “{0}”?"
+msgstr "Sigurno želite da obrišete spisak zadataka „{0}“?"
 
 #: ../src/calendar/calendar.error.xml.h:67
-#| msgid ""
-#| "This will permanently remove the task list '{0}' from the server. Are you "
-#| "sure you want to proceed?"
 msgid ""
 "This will permanently remove the task list “{0}” from the server. Are you "
 "sure you want to proceed?"
@@ -5902,14 +5716,10 @@ msgstr ""
 "da želite da nastavite?"
 
 #: ../src/calendar/calendar.error.xml.h:68
-#| msgid "Delete remote memo list '{0}'?"
-msgid "Delete remote memo list “{0}”?"
-msgstr "Da obrišem udaljeni spisak beleški „{0}“?"
+msgid "Are you sure you want to delete remote memo list “{0}”?"
+msgstr "Sigurno želite da obrišete spisak beleški „{0}“?"
 
 #: ../src/calendar/calendar.error.xml.h:69
-#| msgid ""
-#| "This will permanently remove the memo list '{0}' from the server. Are you "
-#| "sure you want to proceed?"
 msgid ""
 "This will permanently remove the memo list “{0}” from the server. Are you "
 "sure you want to proceed?"
@@ -5947,7 +5757,6 @@ msgstr "Sigurno želite da sačuvate belešku bez sažetka?"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:76
-#| msgid "Error loading calendar '{0}'"
 msgid "Error loading calendar “{0}”"
 msgstr "Greška učitavanja kalendara „{0}“"
 
@@ -5961,9 +5770,6 @@ msgstr "Ne mogu da sačuvam događaj"
 
 #. Translators: {0} is the name of the calendar source
 #: ../src/calendar/calendar.error.xml.h:80
-#| msgid ""
-#| "'{0}' is a read-only calendar and cannot be modified. Please select a "
-#| "different calendar that can accept appointments."
 msgid ""
 "“{0}” is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
@@ -5977,9 +5783,6 @@ msgstr "Ne mogu da sačuvam zadatak"
 
 #. Translators: {0} is the name of the calendar source
 #: ../src/calendar/calendar.error.xml.h:83
-#| msgid ""
-#| "'{0}' does not support assigned tasks, please select a different task "
-#| "list."
 msgid ""
 "“{0}” does not support assigned tasks, please select a different task list."
 msgstr ""
@@ -5988,7 +5791,6 @@ msgstr ""
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:85
-#| msgid "Error loading task list '{0}'"
 msgid "Error loading task list “{0}”"
 msgstr "Greška učitavanja spiska zadataka „{0}“"
 
@@ -5998,7 +5800,6 @@ msgstr "Spisak zadataka nije označen za korišćenje van mreže."
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:88
-#| msgid "Error loading memo list '{0}'"
 msgid "Error loading memo list “{0}”"
 msgstr "Greška učitavanja spiska beleški „{0}“"
 
@@ -6008,7 +5809,6 @@ msgstr "Spisak beleški nije označen za korišćenje van mreže."
 
 #. Translators: {0} is the name of the calendar/memo list/task list.
 #: ../src/calendar/calendar.error.xml.h:91
-#| msgid "Failed to add timezone to '{0}'"
 msgid "Failed to add timezone to “{0}”"
 msgstr "Nisam uspeo da dodam vremensku zonu u „{0}“"
 
@@ -6019,235 +5819,196 @@ msgstr "Nisam uspeo da sačuvam priloge"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:95
-#| msgid "Failed to open calendar '{0}'"
 msgid "Failed to open calendar “{0}”"
 msgstr "Ne mogu da otvorim kalendar „{0}“"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:97
-#| msgid "Failed to open memo list '{0}'"
 msgid "Failed to open memo list “{0}”"
 msgstr "Ne mogu da otvorim spisak beleški „{0}“"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:99
-#| msgid "Failed to open task list '{0}'"
 msgid "Failed to open task list “{0}”"
 msgstr "Ne mogu da otvorim spisak zadataka „{0}“"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:101
-#| msgid "Failed to create an event in the calendar '{0}'"
 msgid "Failed to create an event in the calendar “{0}”"
 msgstr "Ne mogu da napravim događaj u kalendaru „{0}“"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:103
-#| msgid "Failed to create a memo in the memo list '{0}'"
 msgid "Failed to create a memo in the memo list “{0}”"
 msgstr "Ne mogu da napravim belešku u spisku beleški „{0}“"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:105
-#| msgid "Failed to create a task in the task list '{0}'"
 msgid "Failed to create a task in the task list “{0}”"
 msgstr "Ne mogu da napravim zadatak u spisak zadataka „{0}“"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:107
-#| msgid "Failed to modify an event in the calendar '{0}'"
 msgid "Failed to modify an event in the calendar “{0}”"
 msgstr "Ne mogu da izmenim događaj u kalendaru „{0}“"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:109
-#| msgid "Failed to modify a memo in the memo list '{0}'"
 msgid "Failed to modify a memo in the memo list “{0}”"
 msgstr "Ne mogu da izmenim belešku u spisku beleški „{0}“"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:111
-#| msgid "Failed to modify a task in the task list '{0}'"
 msgid "Failed to modify a task in the task list “{0}”"
 msgstr "Ne mogu da izmenim zadatak u spisku zadataka „{0}“"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:113
-#| msgid "Failed to delete an event in the calendar '{0}'"
 msgid "Failed to delete an event in the calendar “{0}”"
 msgstr "Ne mogu da obrišem događaj iz kalendara „{0}“"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:115
-#| msgid "Failed to delete a memo in the memo list '{0}'"
 msgid "Failed to delete a memo in the memo list “{0}”"
 msgstr "Ne mogu da obrišem belešku iz spiska beleški „{0}“"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:117
-#| msgid "Failed to delete a task in the task list '{0}'"
 msgid "Failed to delete a task in the task list “{0}”"
 msgstr "Ne mogu da obrišem zadatak iz spiska zadataka „{0}“"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:119
-#| msgid "Failed to update an event in the calendar '{0}'"
 msgid "Failed to update an event in the calendar “{0}”"
 msgstr "Ne mogu da ažuriram događaj iz kalendara „{0}“"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:121
-#| msgid "Failed to update a memo in the memo list '{0}'"
 msgid "Failed to update a memo in the memo list “{0}”"
 msgstr "Ne mogu da ažuriram belešku iz spiska beleški „{0}“"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:123
-#| msgid "Failed to update a task in the task list '{0}'"
 msgid "Failed to update a task in the task list “{0}”"
 msgstr "Ne mogu da ažuriram zadatak iz spiska zadataka „{0}“"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:125
-#| msgid "Failed to send an event to the calendar '{0}'"
 msgid "Failed to send an event to the calendar “{0}”"
 msgstr "Ne mogu da pošaljem događaj u kalendar „{0}“"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:127
-#| msgid "Failed to send a memo to the memo list '{0}'"
 msgid "Failed to send a memo to the memo list “{0}”"
 msgstr "Ne mogu da pošaljem belešku u spisak beleški „{0}“"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:129
-#| msgid "Failed to send a task to the task list '{0}'"
 msgid "Failed to send a task to the task list “{0}”"
 msgstr "Ne mogu da pošaljem pošaljem zadatak u spisak zadataka „{0}“"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:131
-#| msgid "Error creating view for the calendar '{0}'"
 msgid "Error creating view for the calendar “{0}”"
 msgstr "Greška u prikazivanju kalendara „{0}“"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:133
-#| msgid "Error creating view for the task list '{0}'"
 msgid "Error creating view for the task list “{0}”"
 msgstr "Greška u prikazivanju spiska zadataka „{0}“"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:135
-#| msgid "Error creating view for the memo list '{0}'"
 msgid "Error creating view for the memo list “{0}”"
 msgstr "Greška u prikazivanju spiska beleški „{0}“"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:137
-#| msgid "Failed to copy an event into the calendar '{0}'"
 msgid "Failed to copy an event into the calendar “{0}”"
-msgstr "Ne mogu da umnožim događaj u kalendar „{0}“"
+msgstr "Ne mogu da kopiram događaj u kalendar „{0}“"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:139
-#| msgid "Failed to copy a task into the task list '{0}'"
 msgid "Failed to copy a task into the task list “{0}”"
-msgstr "Ne mogu da umnožim zadatak u spisak zadataka „{0}“"
+msgstr "Ne mogu da kopiram zadatak u spisak zadataka „{0}“"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:141
-#| msgid "Failed to copy a memo into the memo list '{0}'"
 msgid "Failed to copy a memo into the memo list “{0}”"
-msgstr "Ne mogu da umnožim belešku u spisak beleški „{0}“"
+msgstr "Ne mogu da kopiram belešku u spisak beleški „{0}“"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:143
-#| msgid "Failed to move an event into the calendar '{0}'"
 msgid "Failed to move an event into the calendar “{0}”"
 msgstr "Ne mogu da premestim događaj u kalendar „{0}“"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:145
-#| msgid "Failed to move a task into the task list '{0}'"
 msgid "Failed to move a task into the task list “{0}”"
 msgstr "Ne mogu da premestim zadatak u spisak zadataka „{0}“"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:147
-#| msgid "Failed to move a memo into the memo list '{0}'"
 msgid "Failed to move a memo into the memo list “{0}”"
 msgstr "Nisam uspeo premestim belešku u spisak beleški „{0}“"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:149
-#| msgid "Failed to get an event from the calendar '{0}'"
 msgid "Failed to get an event from the calendar “{0}”"
 msgstr "Nisam uspeo da dobavim događaj iz kalendara „{0}“"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:151
-#| msgid "Failed to get a task from the task list '{0}'"
 msgid "Failed to get a task from the task list “{0}”"
 msgstr "Nisam uspeo da dobavim zadatak sa spiska zadataka „{0}“"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:153
-#| msgid "Failed to get a memo from the memo list '{0}'"
 msgid "Failed to get a memo from the memo list “{0}”"
 msgstr "Nisam uspeo da dobavim belešku sa spiska beleški „{0}“"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:155
-#| msgid "Copying an event into the calendar '{0}'"
 msgid "Copying an event into the calendar “{0}”"
-msgstr "Umnožavam događaj u kalendar „{0}“"
+msgstr "Kopiram događaj u kalendar „{0}“"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:157
-#| msgid "Copying a task into the task list '{0}'"
 msgid "Copying a task into the task list “{0}”"
-msgstr "Umnožavam zadatak u spisak zadataka „{0}“"
+msgstr "Kopiram zadatak u spisak zadataka „{0}“"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:159
-#| msgid "Copying a memo into the memo list '{0}'"
 msgid "Copying a memo into the memo list “{0}”"
-msgstr "Umnožavam belešku u spisak beleški „{0}“"
+msgstr "Kopiram belešku u spisak beleški „{0}“"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:161
-#| msgid "Moving an event into the calendar '{0}'"
 msgid "Moving an event into the calendar “{0}”"
 msgstr "Premeštam događaj u kalendar „{0}“"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:163
-#| msgid "Moving a task into the task list '{0}'"
 msgid "Moving a task into the task list “{0}”"
 msgstr "Premeštam zadatak u spisak zadataka „{0}“"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:165
-#| msgid "Moving a memo into the memo list '{0}'"
 msgid "Moving a memo into the memo list “{0}”"
 msgstr "Premeštam belešku u spisak beleški „{0}“"
 
 #. Translators: {0} is the name of the calendar.
 #: ../src/calendar/calendar.error.xml.h:167
-#| msgid "Failed to refresh calendar '{0}'"
 msgid "Failed to refresh calendar “{0}”"
 msgstr "Ne mogu da osvežim kalendar „{0}“"
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:169
-#| msgid "Failed to refresh task list '{0}'"
 msgid "Failed to refresh task list “{0}”"
 msgstr "Ne mogu da osvežim spisak zadataka „{0}“"
 
 #. Translators: {0} is the name of the memo list.
 #: ../src/calendar/calendar.error.xml.h:171
-#| msgid "Failed to refresh memo list '{0}'"
 msgid "Failed to refresh memo list “{0}”"
 msgstr "Ne mogu da osvežim spisak beleški „{0}“"
 
@@ -6256,7 +6017,6 @@ msgid "Failed to make an occurrence movable"
 msgstr "Ne mogu da napravim ovu pojavu pokretnom"
 
 #: ../src/calendar/calendar.error.xml.h:173
-#| msgid "Create a new window displaying this view"
 msgid "Something has gone wrong when displaying the event"
 msgstr "Nešto je pošlo naopako prilikom prikazivanja događaja"
 
@@ -6271,7 +6031,6 @@ msgstr ""
 "to ne pomaže, popunite izveštaj o grešci na Gnomovoj bubaždaji."
 
 #: ../src/calendar/calendar.error.xml.h:175
-#| msgid "Create a new window displaying this view"
 msgid "Something has gone wrong when displaying the memo"
 msgstr "Nešto je pošlo naopako prilikom prikazivanja beleške"
 
@@ -6286,7 +6045,6 @@ msgstr ""
 "to ne pomaže, popunite izveštaj o grešci na Gnomovoj bubaždaji."
 
 #: ../src/calendar/calendar.error.xml.h:177
-#| msgid "Mode to use when displaying mails"
 msgid "Something has gone wrong when displaying the task"
 msgstr "Nešto je pošlo naopako prilikom prikazivanja zadatka"
 
@@ -6699,7 +6457,7 @@ msgid "calendar view for one or more weeks"
 msgstr "pregled kalendara za jednu ili više nedelja"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:214
-#: ../src/e-util/e-filter-rule.c:770 ../src/mail/e-mail-config-page.c:127
+#: ../src/e-util/e-filter-rule.c:770 ../src/mail/e-mail-config-page.c:124
 msgid "Untitled"
 msgstr "Neimenovano"
 
@@ -6735,7 +6493,7 @@ msgstr "Stanje:"
 #: ../src/calendar/gui/e-cal-model-tasks.c:633
 #: ../src/calendar/gui/e-task-table.c:205
 #: ../src/calendar/gui/e-task-table.c:220
-#: ../src/calendar/gui/e-task-table.c:632 ../src/calendar/gui/print.c:3580
+#: ../src/calendar/gui/e-task-table.c:632 ../src/calendar/gui/print.c:3590
 msgid "In Progress"
 msgstr "U toku"
 
@@ -6747,7 +6505,7 @@ msgstr "U toku"
 #: ../src/calendar/gui/e-meeting-store.c:225
 #: ../src/calendar/gui/e-task-table.c:207
 #: ../src/calendar/gui/e-task-table.c:222
-#: ../src/calendar/gui/e-task-table.c:633 ../src/calendar/gui/print.c:3583
+#: ../src/calendar/gui/e-task-table.c:633 ../src/calendar/gui/print.c:3593
 #: ../src/calendar/gui/tasktypes.xml.in.h:13
 #: ../src/plugins/save-calendar/csv-format.c:377
 msgid "Completed"
@@ -6758,7 +6516,7 @@ msgstr "Završeno"
 #: ../src/calendar/gui/e-cal-model-tasks.c:550
 #: ../src/calendar/gui/e-task-table.c:203
 #: ../src/calendar/gui/e-task-table.c:218
-#: ../src/calendar/gui/e-task-table.c:631 ../src/calendar/gui/print.c:3577
+#: ../src/calendar/gui/e-task-table.c:631 ../src/calendar/gui/print.c:3587
 #: ../src/calendar/gui/tasktypes.xml.in.h:11
 msgid "Not Started"
 msgstr "Nije započet"
@@ -6775,7 +6533,7 @@ msgid "High"
 msgstr "Visok"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:329
-#: ../src/calendar/gui/e-cal-model.c:1888
+#: ../src/calendar/gui/e-cal-model.c:1890
 #: ../src/calendar/gui/e-task-table.c:549
 #: ../src/calendar/gui/tasktypes.xml.in.h:20
 #: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:321
@@ -6790,7 +6548,7 @@ msgid "Low"
 msgstr "Nizak"
 
 #: ../src/calendar/gui/e-cal-component-preview.c:350
-#: ../src/mail/e-mail-config-service-page.c:671
+#: ../src/mail/e-mail-config-service-page.c:531
 msgid "Description:"
 msgstr "Opis:"
 
@@ -6800,46 +6558,39 @@ msgstr "Veb stranica:"
 
 #: ../src/calendar/gui/e-cal-data-model.c:1631
 #, c-format
-#| msgid "Creating view for calendar '%s'"
 msgid "Creating view for calendar “%s”"
 msgstr "Prikazujem kalendar „%s“"
 
 #: ../src/calendar/gui/e-cal-data-model.c:1635
 #, c-format
-#| msgid "Creating view for task list '%s'"
 msgid "Creating view for task list “%s”"
 msgstr "Prikazujem spisak zadataka „%s“"
 
 #: ../src/calendar/gui/e-cal-data-model.c:1639
 #, c-format
-#| msgid "Creating view for memo list '%s'"
 msgid "Creating view for memo list “%s”"
 msgstr "Prikazujem spisak beleški „%s“"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:219 ../src/calendar/gui/e-cal-ops.c:1955
+#: ../src/calendar/gui/e-cal-dialogs.c:219 ../src/calendar/gui/e-cal-ops.c:1966
 msgid "Destination is read only"
 msgstr "Odredište je samo za čitanje"
 
 #: ../src/calendar/gui/e-cal-dialogs.c:299
 #, c-format
-#| msgid "Copying events to the calendar '%s'"
 msgid "Copying events to the calendar “%s”"
-msgstr "Umnožavam događaje u kalendar „%s“"
+msgstr "Kopiram događaje u kalendar „%s“"
 
 #: ../src/calendar/gui/e-cal-dialogs.c:305
 #, c-format
-#| msgid "Copying memos to the memo list '%s'"
 msgid "Copying memos to the memo list “%s”"
-msgstr "Umnožavam beleške u spisak beleški „%s“"
+msgstr "Kopiram beleške u spisak beleški „%s“"
 
 #: ../src/calendar/gui/e-cal-dialogs.c:311
 #, c-format
-#| msgid "Copying tasks to the task list '%s'"
 msgid "Copying tasks to the task list “%s”"
-msgstr "Umnožavam zadatke u spisak zadataka „%s“"
+msgstr "Kopiram zadatke u spisak zadataka „%s“"
 
 #: ../src/calendar/gui/e-cal-dialogs.c:530
-#| msgid "_Delete this item from all other recipient's mailboxes?"
 msgid "_Delete this item from all other recipient’s mailboxes?"
 msgstr ""
 "Da li da _izbrišem ovu stavku iz svih ostalih poštanskih sandučića primaoca?"
@@ -6853,7 +6604,7 @@ msgid "Select Date"
 msgstr "Izaberite datum"
 
 #: ../src/calendar/gui/e-cal-dialogs.c:693
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1248
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1288
 msgid "Select _Today"
 msgstr "Izaberi _današnji dan"
 
@@ -6957,7 +6708,7 @@ msgstr "Seče izabrane događaje u spisak isečaka"
 
 #: ../src/calendar/gui/e-calendar-view.c:457
 msgid "Copy selected events to the clipboard"
-msgstr "Umnožava izabrane događaje u spisak isečaka"
+msgstr "Kopira izabrane događaje u spisak isečaka"
 
 #: ../src/calendar/gui/e-calendar-view.c:463
 msgid "Paste events from the clipboard"
@@ -6968,22 +6719,21 @@ msgid "Delete selected events"
 msgstr "Briše izabrane događaje"
 
 #: ../src/calendar/gui/e-calendar-view.c:853
-#| msgid "Pasted text doesn't contain valid iCalendar data"
 msgid "Pasted text doesn’t contain valid iCalendar data"
 msgstr "Umetnuti tekst ne sadrži ispravne podatke iz iKalendara"
 
 #: ../src/calendar/gui/e-calendar-view.c:864
-#: ../src/calendar/gui/e-cal-ops.c:1552
+#: ../src/calendar/gui/e-cal-ops.c:1556
 msgid "Default calendar not found"
 msgstr "Nije pronađen podrazumevani kalendar"
 
 #: ../src/calendar/gui/e-calendar-view.c:869
-#: ../src/calendar/gui/e-cal-ops.c:1555
+#: ../src/calendar/gui/e-cal-ops.c:1559
 msgid "Default memo list not found"
 msgstr "Nije pronađen podrazumevani spisak beleški"
 
 #: ../src/calendar/gui/e-calendar-view.c:874
-#: ../src/calendar/gui/e-cal-ops.c:1558
+#: ../src/calendar/gui/e-cal-ops.c:1562
 msgid "Default task list not found"
 msgstr "Nije pronađen podrazumevani spisak zadataka"
 
@@ -7018,15 +6768,18 @@ msgid "Organizer: %s"
 msgstr "Organizator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
+#. Translators: It will display "Location: LocationOfTheAppointment"
 #: ../src/calendar/gui/e-calendar-view.c:1851
-#: ../src/calendar/gui/e-meeting-time-sel.c:2725
-#: ../src/calendar/gui/print.c:3531
+#: ../src/calendar/gui/e-meeting-time-sel.c:2731
+#: ../src/calendar/gui/e-to-do-pane.c:343 ../src/calendar/gui/print.c:3541
 #, c-format
 msgid "Location: %s"
 msgstr "Mesto: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
+#. Translators: It will display "Time: StartDateAndTime (Duration)"
 #: ../src/calendar/gui/e-calendar-view.c:1891
+#: ../src/calendar/gui/e-to-do-pane.c:411
 #, c-format
 msgid "Time: %s %s"
 msgstr "Vreme: %s %s"
@@ -7116,46 +6869,45 @@ msgstr "Izvor"
 #: ../src/calendar/gui/e-meeting-list-view.c:197
 #: ../src/calendar/gui/e-meeting-store.c:132
 #: ../src/calendar/gui/e-meeting-store.c:167
-#: ../src/calendar/gui/e-meeting-store.c:230 ../src/calendar/gui/print.c:1247
-#: ../src/calendar/gui/print.c:1264 ../src/e-util/e-charset.c:49
+#: ../src/calendar/gui/e-meeting-store.c:230 ../src/calendar/gui/print.c:1257
+#: ../src/calendar/gui/print.c:1274 ../src/e-util/e-charset.c:49
 #: ../src/modules/itip-formatter/itip-view.c:3412
 #: ../src/modules/itip-formatter/itip-view.c:6082
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:97
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../src/calendar/gui/e-cal-model.c:1402 ../src/calendar/gui/e-cal-ops.c:613
-#: ../src/calendar/gui/e-cal-ops.c:1249
+#: ../src/calendar/gui/e-cal-model.c:1402 ../src/calendar/gui/e-cal-ops.c:614
+#: ../src/calendar/gui/e-cal-ops.c:1250
 #: ../src/modules/calendar/e-cal-base-shell-backend.c:289
 #, c-format
-#| msgid "Source with UID '%s' not found"
 msgid "Source with UID “%s” not found"
 msgstr "Nije pronađen izvor sa UID brojem „%s“"
 
-#: ../src/calendar/gui/e-cal-model.c:1505 ../src/calendar/gui/e-cal-ops.c:185
-#: ../src/calendar/gui/e-cal-ops.c:1366
+#: ../src/calendar/gui/e-cal-model.c:1507 ../src/calendar/gui/e-cal-ops.c:186
+#: ../src/calendar/gui/e-cal-ops.c:1367
 msgid "Creating an event"
 msgstr "Pravim novi događaj"
 
-#: ../src/calendar/gui/e-cal-model.c:1509 ../src/calendar/gui/e-cal-ops.c:189
-#: ../src/calendar/gui/e-cal-ops.c:1370
+#: ../src/calendar/gui/e-cal-model.c:1511 ../src/calendar/gui/e-cal-ops.c:190
+#: ../src/calendar/gui/e-cal-ops.c:1371
 msgid "Creating a memo"
 msgstr "Pravim novu belešku"
 
-#: ../src/calendar/gui/e-cal-model.c:1513 ../src/calendar/gui/e-cal-ops.c:193
-#: ../src/calendar/gui/e-cal-ops.c:1374
+#: ../src/calendar/gui/e-cal-model.c:1515 ../src/calendar/gui/e-cal-ops.c:194
+#: ../src/calendar/gui/e-cal-ops.c:1375
 msgid "Creating a task"
 msgstr "Pravim novi zadatak"
 
-#: ../src/calendar/gui/e-cal-model.c:1890
+#: ../src/calendar/gui/e-cal-model.c:1892
 msgid "Recurring"
 msgstr "Periodičnost"
 
-#: ../src/calendar/gui/e-cal-model.c:1892
+#: ../src/calendar/gui/e-cal-model.c:1894
 msgid "Assigned"
 msgstr "Dodeljeno"
 
-#: ../src/calendar/gui/e-cal-model.c:1894
+#: ../src/calendar/gui/e-cal-model.c:1896
 #: ../src/calendar/gui/e-cal-model-tasks.c:1136
 #: ../src/calendar/gui/e-meeting-list-view.c:207
 #: ../src/calendar/gui/e-meeting-store.c:174
@@ -7164,14 +6916,14 @@ msgstr "Dodeljeno"
 msgid "Yes"
 msgstr "Da"
 
-#: ../src/calendar/gui/e-cal-model.c:1894
+#: ../src/calendar/gui/e-cal-model.c:1896
 #: ../src/calendar/gui/e-cal-model-tasks.c:1136
 #: ../src/calendar/gui/e-meeting-list-view.c:208
 #: ../src/calendar/gui/e-meeting-store.c:186
 msgid "No"
 msgstr "Ne"
 
-#: ../src/calendar/gui/e-cal-model.c:3818
+#: ../src/calendar/gui/e-cal-model.c:3793
 #: ../src/calendar/gui/e-meeting-list-view.c:219
 #: ../src/calendar/gui/e-meeting-store.c:194
 #: ../src/calendar/gui/e-meeting-store.c:217
@@ -7179,7 +6931,7 @@ msgstr "Ne"
 msgid "Accepted"
 msgstr "Prihvaćeno"
 
-#: ../src/calendar/gui/e-cal-model.c:3819
+#: ../src/calendar/gui/e-cal-model.c:3794
 #: ../src/calendar/gui/e-meeting-list-view.c:220
 #: ../src/calendar/gui/e-meeting-store.c:196
 #: ../src/calendar/gui/e-meeting-store.c:219
@@ -7187,7 +6939,7 @@ msgstr "Prihvaćeno"
 msgid "Declined"
 msgstr "Odbijeno"
 
-#: ../src/calendar/gui/e-cal-model.c:3820
+#: ../src/calendar/gui/e-cal-model.c:3795
 #: ../src/calendar/gui/e-meeting-list-view.c:221
 #: ../src/calendar/gui/e-meeting-store.c:198
 #: ../src/calendar/gui/e-meeting-store.c:221
@@ -7195,7 +6947,7 @@ msgstr "Odbijeno"
 msgid "Tentative"
 msgstr "Sa rezervom"
 
-#: ../src/calendar/gui/e-cal-model.c:3821
+#: ../src/calendar/gui/e-cal-model.c:3796
 #: ../src/calendar/gui/e-meeting-list-view.c:222
 #: ../src/calendar/gui/e-meeting-store.c:200
 #: ../src/calendar/gui/e-meeting-store.c:223
@@ -7203,13 +6955,13 @@ msgstr "Sa rezervom"
 msgid "Delegated"
 msgstr "Delegirano"
 
-#: ../src/calendar/gui/e-cal-model.c:3822
+#: ../src/calendar/gui/e-cal-model.c:3797
 msgid "Needs action"
 msgstr "Zahteva radnju"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
-#: ../src/calendar/gui/e-cal-model.c:3877
+#: ../src/calendar/gui/e-cal-model.c:3852
 #: ../src/calendar/gui/e-meeting-list-view.c:687
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
 #: ../src/calendar/gui/e-task-table.etspec.h:11
@@ -7251,32 +7003,32 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ništa"
 
-#: ../src/calendar/gui/e-cal-ops.c:304
+#: ../src/calendar/gui/e-cal-ops.c:305
 msgid "Modifying an event"
 msgstr "Ispravljam događaj"
 
 # mail:no-name-vfolder primary
-#: ../src/calendar/gui/e-cal-ops.c:308
+#: ../src/calendar/gui/e-cal-ops.c:309
 msgid "Modifying a memo"
 msgstr "Ispravljam belešku"
 
-#: ../src/calendar/gui/e-cal-ops.c:312
+#: ../src/calendar/gui/e-cal-ops.c:313
 msgid "Modifying a task"
 msgstr "Izpravljam zadatak"
 
-#: ../src/calendar/gui/e-cal-ops.c:411
+#: ../src/calendar/gui/e-cal-ops.c:412 ../src/calendar/gui/e-to-do-pane.c:1812
 msgid "Removing an event"
 msgstr "Uklanjam događaj"
 
-#: ../src/calendar/gui/e-cal-ops.c:415
+#: ../src/calendar/gui/e-cal-ops.c:416 ../src/calendar/gui/e-to-do-pane.c:1816
 msgid "Removing a memo"
 msgstr "Uklanjam belešku"
 
-#: ../src/calendar/gui/e-cal-ops.c:419
+#: ../src/calendar/gui/e-cal-ops.c:420 ../src/calendar/gui/e-to-do-pane.c:1820
 msgid "Removing a task"
 msgstr "Uklanjam zadatak"
 
-#: ../src/calendar/gui/e-cal-ops.c:510
+#: ../src/calendar/gui/e-cal-ops.c:511
 #, c-format
 msgid "Deleting an event"
 msgid_plural "Deleting %d events"
@@ -7285,7 +7037,7 @@ msgstr[1] "Uklanjam %d događaja"
 msgstr[2] "Uklanjam %d događaja"
 msgstr[3] "Uklanjam događaj"
 
-#: ../src/calendar/gui/e-cal-ops.c:514
+#: ../src/calendar/gui/e-cal-ops.c:515
 #, c-format
 msgid "Deleting a memo"
 msgid_plural "Deleting %d memos"
@@ -7294,7 +7046,7 @@ msgstr[1] "Uklanjam %d beleške"
 msgstr[2] "Uklanjam %d beleški"
 msgstr[3] "Uklanjam belešku"
 
-#: ../src/calendar/gui/e-cal-ops.c:518
+#: ../src/calendar/gui/e-cal-ops.c:519
 #, c-format
 msgid "Deleting a task"
 msgid_plural "Deleting %d tasks"
@@ -7303,7 +7055,7 @@ msgstr[1] "Uklanjam %d zadatka"
 msgstr[2] "Uklanjam %d zadataka"
 msgstr[3] "Uklanjam zadatak"
 
-#: ../src/calendar/gui/e-cal-ops.c:721
+#: ../src/calendar/gui/e-cal-ops.c:722
 #, c-format
 msgid "Pasting an event"
 msgid_plural "Pasting %d events"
@@ -7312,7 +7064,7 @@ msgstr[1] "Ubacujem %d događaja"
 msgstr[2] "Ubacujem %d događaja"
 msgstr[3] "Ubacujem događaj"
 
-#: ../src/calendar/gui/e-cal-ops.c:736
+#: ../src/calendar/gui/e-cal-ops.c:737
 #, c-format
 msgid "Pasting a memo"
 msgid_plural "Pasting %d memos"
@@ -7321,7 +7073,7 @@ msgstr[1] "Ubacujem %d beleške"
 msgstr[2] "Ubacujem %d beleški"
 msgstr[3] "Ubacujem belešku"
 
-#: ../src/calendar/gui/e-cal-ops.c:751
+#: ../src/calendar/gui/e-cal-ops.c:752
 #, c-format
 msgid "Pasting a task"
 msgid_plural "Pasting %d tasks"
@@ -7330,71 +7082,65 @@ msgstr[1] "Ubacujem %d zadatka"
 msgstr[2] "Ubacujem %d zadataka"
 msgstr[3] "Ubacujem zadatak"
 
-#: ../src/calendar/gui/e-cal-ops.c:850
+#: ../src/calendar/gui/e-cal-ops.c:851
 msgid "Updating an event"
 msgstr "Ažuriram događaj"
 
-#: ../src/calendar/gui/e-cal-ops.c:854
+#: ../src/calendar/gui/e-cal-ops.c:855
 msgid "Updating a memo"
 msgstr "Ažuriram belešku"
 
-#: ../src/calendar/gui/e-cal-ops.c:858
+#: ../src/calendar/gui/e-cal-ops.c:859
 msgid "Updating a task"
 msgstr "Ažuriram zadatak"
 
-#: ../src/calendar/gui/e-cal-ops.c:966
+#: ../src/calendar/gui/e-cal-ops.c:967
 #, c-format
-#| msgid "Getting events to purge in the calendar '%s'"
 msgid "Getting events to purge in the calendar “%s”"
 msgstr "Preuzimam događaje za čišćenje kalendara „%s“"
 
-#: ../src/calendar/gui/e-cal-ops.c:970
+#: ../src/calendar/gui/e-cal-ops.c:971
 #, c-format
-#| msgid "Getting memos to purge in the memo list '%s'"
 msgid "Getting memos to purge in the memo list “%s”"
 msgstr "Preuzimam beleške za čišćenje spiska beleški „%s“"
 
-#: ../src/calendar/gui/e-cal-ops.c:974
+#: ../src/calendar/gui/e-cal-ops.c:975
 #, c-format
-#| msgid "Getting tasks to purge in the task list '%s'"
 msgid "Getting tasks to purge in the task list “%s”"
 msgstr "Preuzimam zadatke za čišćenje spiska zadataka „%s“"
 
-#: ../src/calendar/gui/e-cal-ops.c:1000
+#: ../src/calendar/gui/e-cal-ops.c:1001
 #, c-format
-#| msgid "Purging events in the calendar '%s'"
 msgid "Purging events in the calendar “%s”"
 msgstr "Čistim događaje iz kalendara „%s“"
 
-#: ../src/calendar/gui/e-cal-ops.c:1004
+#: ../src/calendar/gui/e-cal-ops.c:1005
 #, c-format
-#| msgid "Purging memos in the memo list '%s'"
 msgid "Purging memos in the memo list “%s”"
 msgstr "Čistim beleške iz spiska beleški „%s“"
 
-#: ../src/calendar/gui/e-cal-ops.c:1008
+#: ../src/calendar/gui/e-cal-ops.c:1009
 #, c-format
-#| msgid "Purging tasks in the task list '%s'"
 msgid "Purging tasks in the task list “%s”"
 msgstr "Čistim zadatke iz spiska zadataka „%s“"
 
-#: ../src/calendar/gui/e-cal-ops.c:1108
+#: ../src/calendar/gui/e-cal-ops.c:1109
 msgid "Purging events"
 msgstr "Čistim događaje"
 
-#: ../src/calendar/gui/e-cal-ops.c:1112
+#: ../src/calendar/gui/e-cal-ops.c:1113
 msgid "Purging memos"
 msgstr "Čistim beleške"
 
-#: ../src/calendar/gui/e-cal-ops.c:1116
+#: ../src/calendar/gui/e-cal-ops.c:1117
 msgid "Purging tasks"
 msgstr "Čistim zadatke"
 
-#: ../src/calendar/gui/e-cal-ops.c:1218
+#: ../src/calendar/gui/e-cal-ops.c:1219
 msgid "Expunging completed tasks"
 msgstr "Uklanjam završene zadatke"
 
-#: ../src/calendar/gui/e-cal-ops.c:2049
+#: ../src/calendar/gui/e-cal-ops.c:2060
 #, c-format
 msgid "Moving an event"
 msgid_plural "Moving %d events"
@@ -7403,16 +7149,16 @@ msgstr[1] "Premeštam %d događaja"
 msgstr[2] "Premeštam %d događaja"
 msgstr[3] "Premeštam događaj"
 
-#: ../src/calendar/gui/e-cal-ops.c:2050
+#: ../src/calendar/gui/e-cal-ops.c:2061
 #, c-format
 msgid "Copying an event"
 msgid_plural "Copying %d events"
-msgstr[0] "Umnožavam %d događaj"
-msgstr[1] "Umnožavam %d događaja"
-msgstr[2] "Umnožavam %d događaja"
-msgstr[3] "Umnožavam događaj"
+msgstr[0] "Kopiram %d događaj"
+msgstr[1] "Kopiram %d događaja"
+msgstr[2] "Kopiram %d događaja"
+msgstr[3] "Kopiram događaj"
 
-#: ../src/calendar/gui/e-cal-ops.c:2056
+#: ../src/calendar/gui/e-cal-ops.c:2067
 #, c-format
 msgid "Moving a memo"
 msgid_plural "Moving %d memos"
@@ -7421,16 +7167,16 @@ msgstr[1] "Premeštam %d beleške"
 msgstr[2] "Premeštam %d beleški"
 msgstr[3] "Premeštam belešku"
 
-#: ../src/calendar/gui/e-cal-ops.c:2057
+#: ../src/calendar/gui/e-cal-ops.c:2068
 #, c-format
 msgid "Copying a memo"
 msgid_plural "Copying %d memos"
-msgstr[0] "Umnožavam %d belešku"
-msgstr[1] "Umnožavam %d beleške"
-msgstr[2] "Umnožavam %d beleški"
-msgstr[3] "Umnožavam belešku"
+msgstr[0] "Kopiram %d belešku"
+msgstr[1] "Kopiram %d beleške"
+msgstr[2] "Kopiram %d beleški"
+msgstr[3] "Kopiram belešku"
 
-#: ../src/calendar/gui/e-cal-ops.c:2063
+#: ../src/calendar/gui/e-cal-ops.c:2074
 #, c-format
 msgid "Moving a task"
 msgid_plural "Moving %d tasks"
@@ -7439,14 +7185,14 @@ msgstr[1] "Premeštam %d zadatka"
 msgstr[2] "Premeštam %d zadataka"
 msgstr[3] "Premeštam zadatak"
 
-#: ../src/calendar/gui/e-cal-ops.c:2064
+#: ../src/calendar/gui/e-cal-ops.c:2075
 #, c-format
 msgid "Copying a task"
 msgid_plural "Copying %d tasks"
-msgstr[0] "Umnožavam %d zadatak"
-msgstr[1] "Umnožavam %d zadatka"
-msgstr[2] "Umnožavam %d zadataka"
-msgstr[3] "Umnožavam zadatak"
+msgstr[0] "Kopiram %d zadatak"
+msgstr[1] "Kopiram %d zadatka"
+msgstr[2] "Kopiram %d zadataka"
+msgstr[3] "Kopiram zadatak"
 
 # strptime format of a weekday, a date and a time,
 # in 24-hour format.
@@ -7476,7 +7222,6 @@ msgstr ""
 "%s"
 
 #: ../src/calendar/gui/e-comp-editor-event.c:99
-#| msgid "Event's time is in the past"
 msgid "Event’s time is in the past"
 msgstr "Vreme događaja je u prošlosti"
 
@@ -7506,12 +7251,14 @@ msgstr "Vreme početka nije ispravno vreme"
 
 #: ../src/calendar/gui/e-comp-editor-event.c:442
 #: ../src/calendar/gui/e-comp-editor-event.c:458
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:199
-#: ../src/calendar/gui/e-comp-editor.c:338 ../src/mail/e-mail-display.c:2116
-#: ../src/mail/e-mail-reader-utils.c:646 ../src/mail/mail-send-recv.c:490
-#: ../src/mail/mail-send-recv.c:1288 ../src/plugins/face/face.c:174
-#: ../src/shell/e-shell.c:1073 ../src/shell/e-shell.c:1097
-#: ../src/smime/gui/certificate-manager.c:357
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:206
+#: ../src/calendar/gui/e-comp-editor.c:338
+#: ../src/em-format/e-mail-part-secure-button.c:93
+#: ../src/mail/e-mail-display.c:2116 ../src/mail/e-mail-reader-utils.c:806
+#: ../src/mail/mail-send-recv.c:490 ../src/mail/mail-send-recv.c:1288
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:172
+#: ../src/plugins/face/face.c:174 ../src/shell/e-shell.c:1073
+#: ../src/shell/e-shell.c:1097 ../src/smime/gui/certificate-manager.c:357
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
@@ -7632,13 +7379,11 @@ msgstr "Planiranje"
 
 #: ../src/calendar/gui/e-comp-editor-event.c:857
 #, c-format
-#| msgid "Meeting - %s"
 msgid "Meeting — %s"
 msgstr "Sastanak — %s"
 
 #: ../src/calendar/gui/e-comp-editor-event.c:858
 #, c-format
-#| msgid "Appointment - %s"
 msgid "Appointment — %s"
 msgstr "Zakazivanje — %s"
 
@@ -7670,13 +7415,11 @@ msgstr "Datum _početka:"
 
 #: ../src/calendar/gui/e-comp-editor-memo.c:247
 #, c-format
-#| msgid "Assigned Memo - %s"
 msgid "Assigned Memo — %s"
 msgstr "Dodeljena beleška — %s"
 
 #: ../src/calendar/gui/e-comp-editor-memo.c:248
 #, c-format
-#| msgid "Memo - %s"
 msgid "Memo — %s"
 msgstr "Beleška — %s"
 
@@ -7693,77 +7436,71 @@ msgstr[1] "Prilozi"
 msgstr[2] "Prilozi"
 msgstr[3] "Prilog"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:194
-#: ../src/e-util/e-attachment.c:2419
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:201
+#: ../src/e-util/e-attachment.c:2442
 #, c-format
-#| msgid "Could not load '%s'"
 msgid "Could not load “%s”"
 msgstr "Ne mogu da učitam „%s“"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:196
-#: ../src/e-util/e-attachment.c:2422
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:203
+#: ../src/e-util/e-attachment.c:2445
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Ne mogu da učitam prilog"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:401
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:422
 msgid ""
 "Some attachments are still being downloaded. Please wait until the download "
 "is finished."
 msgstr ""
 "Neki prilozi se još uvek preuzimaju. Sačekajte dok se ne završi preuzimanje."
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:428
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:452
 #, c-format
-#| msgid "Attachment '%s' cannot be found, remove it from the list, please"
 msgid "Attachment “%s” cannot be found, remove it from the list, please"
 msgstr "Ne mogu da nađem prilog „%s“, uklonite ga sa spiska"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:445
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:469
 #, c-format
-#| msgid ""
-#| "Attachment '%s' doesn't have valid URI, remove it from the list, please"
 msgid "Attachment “%s” doesn’t have valid URI, remove it from the list, please"
 msgstr "Prilog „%s“ nema ispravnu putanju, uklonite ga sa spiska"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:606
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:647
 #: ../src/composer/e-composer-actions.c:320
 msgid "_Attachment..."
 msgstr "_Prilog..."
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:608
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:649
 #: ../src/composer/e-composer-actions.c:322
-#: ../src/e-util/e-attachment-view.c:343
+#: ../src/e-util/e-attachment-view.c:344
 msgid "Attach a file"
 msgstr "Priložite datoteku"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:615
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:656
 msgid "_Attachments"
 msgstr "_Prilozi"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:617
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:658
 msgid "Show attachments"
 msgstr "Prikažite priloge"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:770
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:811
 #: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:725
 msgid "Icon View"
 msgstr "Pregled ikonicama"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:772
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:813
 #: ../src/e-util/e-attachment-bar.c:768 ../src/e-util/e-attachment-paned.c:727
 msgid "List View"
 msgstr "Pregled spiskom"
 
 #: ../src/calendar/gui/e-comp-editor-page-general.c:311
 #, c-format
-#| msgid "Cannot find attendee '%s' in the list of attendees"
 msgid "Cannot find attendee “%s” in the list of attendees"
 msgstr "Ne mogu da nađem učesnika „%s“ na spisku učesnika"
 
 #: ../src/calendar/gui/e-comp-editor-page-general.c:318
 #, c-format
-#| msgid "Not enough rights to delete attendee '%s'"
 msgid "Not enough rights to delete attendee “%s”"
 msgstr "Nemate dovoljna ovlašćenja za brisanje učesnika „%s“"
 
@@ -8091,13 +7828,14 @@ msgstr "Izuzeci"
 
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2231
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1777
-#: ../src/mail/mail-config.ui.h:64
+#: ../src/mail/e-mail-config-identity-page.c:853
+#: ../src/mail/mail-config.ui.h:65
 msgid "A_dd"
 msgstr "_Dodaj"
 
 #: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2247
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1785
-#: ../src/mail/mail-config.ui.h:66
+#: ../src/mail/mail-config.ui.h:67
 msgid "Re_move"
 msgstr "_Ukloni"
 
@@ -8418,12 +8156,10 @@ msgid "Show time as _busy"
 msgstr "Prikaži vreme kao _zauzeto"
 
 #: ../src/calendar/gui/e-comp-editor-task.c:224
-#| msgid "Task's start date is in the past"
 msgid "Task’s start date is in the past"
 msgstr "Početak zadatka je u prošlosti"
 
 #: ../src/calendar/gui/e-comp-editor-task.c:232
-#| msgid "Task's due date is in the past"
 msgid "Task’s due date is in the past"
 msgstr "Rok za završetak zadatka je u prošlosti"
 
@@ -8455,24 +8191,20 @@ msgid "Completed date cannot be in the future"
 msgstr "Datum završetka ne može biti u budućnosti"
 
 #: ../src/calendar/gui/e-comp-editor-task.c:607
-#| msgid "All _Day Event"
 msgid "All _Day Task"
 msgstr "Celodnevni događa_j"
 
 #: ../src/calendar/gui/e-comp-editor-task.c:609
-#| msgid "Toggles whether to have All Day Event"
 msgid "Toggles whether to have All Day Task"
 msgstr "Bira da li dozvoljava celodnevne zadatke"
 
 #: ../src/calendar/gui/e-comp-editor-task.c:818
 #, c-format
-#| msgid "Assigned Task - %s"
 msgid "Assigned Task — %s"
 msgstr "Dodeljen zadatak — %s"
 
 #: ../src/calendar/gui/e-comp-editor-task.c:819
 #, c-format
-#| msgid "Task - %s"
 msgid "Task — %s"
 msgstr "Zadatak — %s"
 
@@ -8485,169 +8217,172 @@ msgstr "prilog"
 msgid "Sending notifications to attendees..."
 msgstr "Šaljem obaveštenja učesnicima..."
 
-#: ../src/calendar/gui/e-comp-editor.c:993
+#: ../src/calendar/gui/e-comp-editor.c:997
 msgid "Saving changes..."
 msgstr "Čuvam izmene..."
 
-#: ../src/calendar/gui/e-comp-editor.c:1249
+#: ../src/calendar/gui/e-comp-editor.c:1257
 msgid "No Summary"
 msgstr "Bez sažetka"
 
 #. == Button box ==
-#: ../src/calendar/gui/e-comp-editor.c:1976
+#: ../src/calendar/gui/e-comp-editor.c:1984
 #: ../src/composer/e-composer-actions.c:327
+#: ../src/e-util/e-accounts-window.c:1743
 #: ../src/e-util/e-html-editor-dialog.c:194
 #: ../src/e-util/e-mail-signature-editor.c:309
 #: ../src/e-util/e-name-selector-dialog.c:548
-#: ../src/e-util/e-preferences-window.c:389
+#: ../src/e-util/e-preferences-window.c:399
 #: ../src/e-util/e-table-field-chooser-dialog.c:205
 #: ../src/mail/e-mail-browser.c:127 ../src/mail/e-mail-notes.c:931
 #: ../src/mail/em-folder-properties.c:1158
 #: ../src/mail/em-subscription-editor.c:1765
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:254
-#: ../src/shell/e-shell-window-actions.c:278
-#: ../src/shell/e-shell-window-actions.c:787
+#: ../src/shell/e-shell-window-actions.c:296
+#: ../src/shell/e-shell-window-actions.c:817
 #: ../src/smime/gui/certificate-manager.c:2212
 msgid "_Close"
 msgstr "_Zatvori"
 
-#: ../src/calendar/gui/e-comp-editor.c:1978
+#: ../src/calendar/gui/e-comp-editor.c:1986
 msgid "Close the current window"
 msgstr "Zatvorite trenutni prozor"
 
 #. copy menu item
-#: ../src/calendar/gui/e-comp-editor.c:1983 ../src/e-util/e-focus-tracker.c:773
+#: ../src/calendar/gui/e-comp-editor.c:1991 ../src/e-util/e-focus-tracker.c:773
 #: ../src/e-util/e-html-editor-actions.c:878 ../src/e-util/e-text.c:2110
 #: ../src/e-util/e-web-view.c:407 ../src/mail/e-mail-browser.c:134
-#: ../src/mail/mail.error.xml.h:146 ../src/shell/e-shell-window-actions.c:808
+#: ../src/mail/mail.error.xml.h:146 ../src/shell/e-shell-window-actions.c:838
 msgid "_Copy"
-msgstr "_Umnoži"
+msgstr "_Kopiraj"
 
-#: ../src/calendar/gui/e-comp-editor.c:1985 ../src/e-util/e-focus-tracker.c:173
+#: ../src/calendar/gui/e-comp-editor.c:1993 ../src/e-util/e-focus-tracker.c:173
 #: ../src/e-util/e-focus-tracker.c:229 ../src/e-util/e-focus-tracker.c:282
 #: ../src/e-util/e-focus-tracker.c:774 ../src/e-util/e-web-view.c:409
-#: ../src/e-util/e-web-view.c:1942 ../src/mail/e-mail-browser.c:136
-#: ../src/shell/e-shell-window-actions.c:810
+#: ../src/e-util/e-web-view.c:1977 ../src/mail/e-mail-browser.c:136
+#: ../src/shell/e-shell-window-actions.c:840
 msgid "Copy the selection"
-msgstr "Umnožite izabrano"
+msgstr "Kopira izabrano"
 
 #. cut menu item
-#: ../src/calendar/gui/e-comp-editor.c:1990 ../src/e-util/e-focus-tracker.c:768
+#: ../src/calendar/gui/e-comp-editor.c:1998 ../src/e-util/e-focus-tracker.c:768
 #: ../src/e-util/e-html-editor-actions.c:885 ../src/e-util/e-text.c:2096
-#: ../src/mail/e-mail-browser.c:141 ../src/shell/e-shell-window-actions.c:815
+#: ../src/mail/e-mail-browser.c:141 ../src/shell/e-shell-window-actions.c:845
 msgid "Cu_t"
 msgstr "_Iseci"
 
-#: ../src/calendar/gui/e-comp-editor.c:1992 ../src/e-util/e-focus-tracker.c:166
+#: ../src/calendar/gui/e-comp-editor.c:2000 ../src/e-util/e-focus-tracker.c:166
 #: ../src/e-util/e-focus-tracker.c:222 ../src/e-util/e-focus-tracker.c:276
-#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:1951
-#: ../src/mail/e-mail-browser.c:143 ../src/shell/e-shell-window-actions.c:817
+#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:1986
+#: ../src/mail/e-mail-browser.c:143 ../src/shell/e-shell-window-actions.c:847
 msgid "Cut the selection"
 msgstr "Isecite izabrano"
 
-#: ../src/calendar/gui/e-comp-editor.c:1999 ../src/e-util/e-focus-tracker.c:187
+#: ../src/calendar/gui/e-comp-editor.c:2007 ../src/e-util/e-focus-tracker.c:187
 #: ../src/e-util/e-focus-tracker.c:243 ../src/e-util/e-focus-tracker.c:784
-#: ../src/shell/e-shell-window-actions.c:824
+#: ../src/shell/e-shell-window-actions.c:854
 msgid "Delete the selection"
 msgstr "Obrišite izbor"
 
-#: ../src/calendar/gui/e-comp-editor.c:2006
+#: ../src/calendar/gui/e-comp-editor.c:2014
 msgid "View help"
 msgstr "Pogledaj pomoć"
 
 #. paste menu item
-#: ../src/calendar/gui/e-comp-editor.c:2011 ../src/e-util/e-focus-tracker.c:778
+#: ../src/calendar/gui/e-comp-editor.c:2019 ../src/e-util/e-focus-tracker.c:778
 #: ../src/e-util/e-html-editor-actions.c:892 ../src/e-util/e-text.c:2122
-#: ../src/mail/e-mail-browser.c:148 ../src/shell/e-shell-window-actions.c:843
+#: ../src/mail/e-mail-browser.c:148 ../src/shell/e-shell-window-actions.c:873
 msgid "_Paste"
 msgstr "_Ubaci"
 
-#: ../src/calendar/gui/e-comp-editor.c:2013 ../src/e-util/e-focus-tracker.c:180
+#: ../src/calendar/gui/e-comp-editor.c:2021 ../src/e-util/e-focus-tracker.c:180
 #: ../src/e-util/e-focus-tracker.c:236 ../src/e-util/e-focus-tracker.c:288
-#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:1960
-#: ../src/mail/e-mail-browser.c:150 ../src/shell/e-shell-window-actions.c:845
+#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:1995
+#: ../src/mail/e-mail-browser.c:150 ../src/shell/e-shell-window-actions.c:875
 msgid "Paste the clipboard"
 msgstr "Ubacite iz spiska isečaka"
 
-#: ../src/calendar/gui/e-comp-editor.c:2018
-#: ../src/composer/e-composer-actions.c:381 ../src/mail/e-mail-reader.c:2323
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1229
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1243
+#: ../src/calendar/gui/e-comp-editor.c:2026
+#: ../src/composer/e-composer-actions.c:381 ../src/mail/e-mail-reader.c:2317
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1235
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1249
 msgid "_Print..."
 msgstr "_Štampaj..."
 
-#: ../src/calendar/gui/e-comp-editor.c:2025 ../src/mail/e-mail-reader.c:2330
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1236
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1693
+#: ../src/calendar/gui/e-comp-editor.c:2033 ../src/mail/e-mail-reader.c:2324
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1242
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1744
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:813
 #: ../src/modules/calendar/e-task-shell-view-actions.c:1014
 msgid "Pre_view..."
 msgstr "_Pregled..."
 
-#: ../src/calendar/gui/e-comp-editor.c:2032 ../src/e-util/e-focus-tracker.c:788
+#: ../src/calendar/gui/e-comp-editor.c:2040 ../src/e-util/e-focus-tracker.c:788
 #: ../src/e-util/e-html-editor-actions.c:906 ../src/e-util/e-web-view.c:417
-#: ../src/mail/e-mail-browser.c:155 ../src/shell/e-shell-window-actions.c:920
+#: ../src/mail/e-mail-browser.c:155 ../src/shell/e-shell-window-actions.c:950
 msgid "Select _All"
 msgstr "Izaberi _sve"
 
-#: ../src/calendar/gui/e-comp-editor.c:2034 ../src/e-util/e-focus-tracker.c:194
+#: ../src/calendar/gui/e-comp-editor.c:2042 ../src/e-util/e-focus-tracker.c:194
 #: ../src/e-util/e-focus-tracker.c:250 ../src/e-util/e-focus-tracker.c:789
-#: ../src/mail/e-mail-browser.c:157 ../src/shell/e-shell-window-actions.c:922
+#: ../src/mail/e-mail-browser.c:157 ../src/shell/e-shell-window-actions.c:952
 msgid "Select all text"
 msgstr "Izaberite sav tekst"
 
-#: ../src/calendar/gui/e-comp-editor.c:2055
+#: ../src/calendar/gui/e-comp-editor.c:2063
 msgid "_Classification"
 msgstr "_Razvrstavanje"
 
-#: ../src/calendar/gui/e-comp-editor.c:2069
+#: ../src/calendar/gui/e-comp-editor.c:2077
 #: ../src/e-util/e-html-editor-actions.c:929
 #: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:164
-#: ../src/mail/e-mail-notes.c:945 ../src/shell/e-shell-window-actions.c:957
+#: ../src/mail/e-mail-notes.c:945 ../src/shell/e-shell-window-actions.c:987
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../src/calendar/gui/e-comp-editor.c:2083
+#: ../src/calendar/gui/e-comp-editor.c:2091
 #: ../src/e-util/e-html-editor-actions.c:950
 msgid "_Insert"
 msgstr "_Umetni"
 
-#: ../src/calendar/gui/e-comp-editor.c:2090
+#: ../src/calendar/gui/e-comp-editor.c:2098
 #: ../src/composer/e-composer-actions.c:371
 msgid "_Options"
 msgstr "_Mogućnosti"
 
-#: ../src/calendar/gui/e-comp-editor.c:2097
+#: ../src/calendar/gui/e-comp-editor.c:2105
 #: ../src/e-util/e-html-editor-actions.c:971 ../src/mail/e-mail-browser.c:178
-#: ../src/shell/e-shell-window-actions.c:1000
+#: ../src/shell/e-shell-window-actions.c:1030
 #: ../src/smime/gui/certificate-manager.c:1662 ../src/smime/gui/smime-ui.ui.h:3
 msgid "_View"
 msgstr "P_regled"
 
-#: ../src/calendar/gui/e-comp-editor.c:2109
+#: ../src/calendar/gui/e-comp-editor.c:2117
 msgid "Save current changes"
 msgstr "Sačuvajte tekuće izmene"
 
-#: ../src/calendar/gui/e-comp-editor.c:2114
+#: ../src/calendar/gui/e-comp-editor.c:2122
 #: ../src/e-util/e-mail-signature-editor.c:318 ../src/mail/e-mail-notes.c:940
 msgid "Save and Close"
 msgstr "Sačuvaj i zatvori"
 
-#: ../src/calendar/gui/e-comp-editor.c:2116
+#: ../src/calendar/gui/e-comp-editor.c:2124
 msgid "Save current changes and close editor"
 msgstr "Sačuvajte tekuće izmene i zatvorite uređivač"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../src/calendar/gui/e-day-view.c:2130 ../src/calendar/gui/e-week-view.c:1726
-#: ../src/calendar/gui/print.c:1070 ../src/calendar/gui/print.c:1089
-#: ../src/calendar/gui/print.c:2626 ../src/calendar/gui/print.c:2646
+#: ../src/calendar/gui/e-day-view.c:2130 ../src/calendar/gui/e-to-do-pane.c:239
+#: ../src/calendar/gui/e-week-view.c:1726 ../src/calendar/gui/print.c:1080
+#: ../src/calendar/gui/print.c:1099 ../src/calendar/gui/print.c:2636
+#: ../src/calendar/gui/print.c:2656
 msgid "am"
 msgstr "prp"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../src/calendar/gui/e-day-view.c:2133 ../src/calendar/gui/e-week-view.c:1729
-#: ../src/calendar/gui/print.c:1075 ../src/calendar/gui/print.c:1091
-#: ../src/calendar/gui/print.c:2631 ../src/calendar/gui/print.c:2648
+#: ../src/calendar/gui/e-day-view.c:2133 ../src/calendar/gui/e-to-do-pane.c:243
+#: ../src/calendar/gui/e-week-view.c:1729 ../src/calendar/gui/print.c:1085
+#: ../src/calendar/gui/print.c:1101 ../src/calendar/gui/print.c:2641
+#: ../src/calendar/gui/print.c:2658
 msgid "pm"
 msgstr "pop"
 
@@ -8665,7 +8400,7 @@ msgstr "pop"
 #: ../src/calendar/gui/e-day-view.c:3045
 #: ../src/calendar/gui/e-day-view-top-item.c:841
 #: ../src/calendar/gui/e-week-view-main-item.c:205
-#: ../src/calendar/gui/print.c:2093
+#: ../src/calendar/gui/print.c:2103
 msgid "%A %d %B"
 msgstr "%A %d. %B"
 
@@ -8733,51 +8468,51 @@ msgstr "Učesnici"
 #: ../src/calendar/gui/e-meeting-list-view.c:179
 #: ../src/calendar/gui/e-meeting-store.c:107
 #: ../src/calendar/gui/e-meeting-store.c:124
-#: ../src/calendar/gui/e-meeting-store.c:1015 ../src/calendar/gui/print.c:1243
+#: ../src/calendar/gui/e-meeting-store.c:1015 ../src/calendar/gui/print.c:1253
 msgid "Individual"
 msgstr "Pojedinac"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:180
 #: ../src/calendar/gui/e-meeting-store.c:109
-#: ../src/calendar/gui/e-meeting-store.c:126 ../src/calendar/gui/print.c:1244
+#: ../src/calendar/gui/e-meeting-store.c:126 ../src/calendar/gui/print.c:1254
 #: ../src/e-util/e-table-config.ui.h:1
 msgid "Group"
 msgstr "Grupa"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:181
 #: ../src/calendar/gui/e-meeting-store.c:111
-#: ../src/calendar/gui/e-meeting-store.c:128 ../src/calendar/gui/print.c:1245
+#: ../src/calendar/gui/e-meeting-store.c:128 ../src/calendar/gui/print.c:1255
 msgid "Resource"
 msgstr "Izvor"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:182
 #: ../src/calendar/gui/e-meeting-store.c:113
-#: ../src/calendar/gui/e-meeting-store.c:130 ../src/calendar/gui/print.c:1246
+#: ../src/calendar/gui/e-meeting-store.c:130 ../src/calendar/gui/print.c:1256
 msgid "Room"
 msgstr "Soba"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:193
 #: ../src/calendar/gui/e-meeting-store.c:142
-#: ../src/calendar/gui/e-meeting-store.c:159 ../src/calendar/gui/print.c:1260
+#: ../src/calendar/gui/e-meeting-store.c:159 ../src/calendar/gui/print.c:1270
 msgid "Chair"
 msgstr "Stolica"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:194
 #: ../src/calendar/gui/e-meeting-store.c:144
 #: ../src/calendar/gui/e-meeting-store.c:161
-#: ../src/calendar/gui/e-meeting-store.c:1018 ../src/calendar/gui/print.c:1261
+#: ../src/calendar/gui/e-meeting-store.c:1018 ../src/calendar/gui/print.c:1271
 msgid "Required Participant"
 msgstr "Obavezan učesnik"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:195
 #: ../src/calendar/gui/e-meeting-store.c:146
-#: ../src/calendar/gui/e-meeting-store.c:163 ../src/calendar/gui/print.c:1262
+#: ../src/calendar/gui/e-meeting-store.c:163 ../src/calendar/gui/print.c:1272
 msgid "Optional Participant"
 msgstr "Mogući učesnik"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:196
 #: ../src/calendar/gui/e-meeting-store.c:148
-#: ../src/calendar/gui/e-meeting-store.c:165 ../src/calendar/gui/print.c:1263
+#: ../src/calendar/gui/e-meeting-store.c:165 ../src/calendar/gui/print.c:1273
 msgid "Non-Participant"
 msgstr "Ne-učesnik"
 
@@ -8796,7 +8531,9 @@ msgstr "Učesnik                          "
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../src/calendar/gui/e-memo-table.etspec.h:3
 #: ../src/calendar/gui/e-task-table.etspec.h:3
+#: ../src/e-util/e-accounts-window.c:1370
 #: ../src/e-util/e-attachment-tree-view.c:205
+#: ../src/e-util/e-webdav-browser.c:2381
 #: ../src/mail/e-mail-account-tree-view.c:158
 msgid "Type"
 msgstr "Vrsta"
@@ -8894,7 +8631,7 @@ msgstr "_Vreme početka:"
 msgid "_End time:"
 msgstr "Vreme _završetka:"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:2721
+#: ../src/calendar/gui/e-meeting-time-sel.c:2727
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -8903,8 +8640,8 @@ msgstr ""
 "Sažetak: %s\n"
 "Mesto: %s"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:2723
-#: ../src/calendar/gui/print.c:3520
+#: ../src/calendar/gui/e-meeting-time-sel.c:2729
+#: ../src/calendar/gui/print.c:3530
 #, c-format
 msgid "Summary: %s"
 msgstr "Sažetak: %s"
@@ -8956,7 +8693,7 @@ msgstr "Seče izabrane beleške u spisak isečaka"
 
 #: ../src/calendar/gui/e-memo-table.c:751
 msgid "Copy selected memos to the clipboard"
-msgstr "Umnožava izabrane beleške u spisak isečaka"
+msgstr "Kopira izabrane beleške u spisak isečaka"
 
 #: ../src/calendar/gui/e-memo-table.c:757
 msgid "Paste memos from the clipboard"
@@ -9000,7 +8737,7 @@ msgstr "Seče izabrane zadatke u spisak isečaka"
 
 #: ../src/calendar/gui/e-task-table.c:1090
 msgid "Copy selected tasks to the clipboard"
-msgstr "Umnožava izabrane zadatke u spisak isečaka"
+msgstr "Kopira izabrane zadatke u spisak isečaka"
 
 #: ../src/calendar/gui/e-task-table.c:1096
 msgid "Paste tasks from the clipboard"
@@ -9050,42 +8787,107 @@ msgstr "Važnost"
 msgid "Select Timezone"
 msgstr "Izaberi vremensku zonu"
 
+#. Translators: It will display "Due: DueDateAndTime"
+#: ../src/calendar/gui/e-to-do-pane.c:365
+#, c-format
+msgid "Due: %s"
+msgstr "Rok: %s"
+
+#. Translators: It will display "Completed: DateAndTimeWhenCompleted"
+#: ../src/calendar/gui/e-to-do-pane.c:377
+#, c-format
+msgid "Completed: %s"
+msgstr "Završeno je: %s"
+
+#. strftime format of a weekday and a date.
+#: ../src/calendar/gui/e-to-do-pane.c:1328 ../src/e-util/e-cell-date-edit.c:328
+#: ../src/e-util/e-datetime-format.c:206
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1842
+#: ../src/modules/itip-formatter/itip-view.c:253
+msgid "Today"
+msgstr "Danas"
+
+#. strftime format of a weekday and a date.
+#: ../src/calendar/gui/e-to-do-pane.c:1330
+#: ../src/e-util/e-datetime-format.c:217
+#: ../src/modules/itip-formatter/itip-view.c:281
+msgid "Tomorrow"
+msgstr "Sutra"
+
+#: ../src/calendar/gui/e-to-do-pane.c:1892
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1449
+msgid "New _Appointment..."
+msgstr "Novo _zakazivanje..."
+
+#: ../src/calendar/gui/e-to-do-pane.c:1900
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1435
+msgid "New _Meeting..."
+msgstr "Novi _sastanak..."
+
+#: ../src/calendar/gui/e-to-do-pane.c:1908
+msgid "New _Task..."
+msgstr "Novi zad_atak..."
+
+#: ../src/calendar/gui/e-to-do-pane.c:1916
+msgid "_New Assigned Task..."
+msgstr "Dodeljen_i zadatak..."
+
+#: ../src/calendar/gui/e-to-do-pane.c:1929
+msgid "_Open..."
+msgstr "_Otvori..."
+
+#: ../src/calendar/gui/e-to-do-pane.c:1943
+msgid "_Delete This Instance..."
+msgstr "Obriši ovu _pojavu..."
+
+#: ../src/calendar/gui/e-to-do-pane.c:1951
+msgid "D_elete All Instances..."
+msgstr "Obriši sve _unose..."
+
+#: ../src/calendar/gui/e-to-do-pane.c:1959
+msgid "_Delete..."
+msgstr "_Obriši..."
+
+#: ../src/calendar/gui/e-to-do-pane.c:2249
+msgid "To Do"
+msgstr "Za uradi_ti"
+
 # month name. You can change the order but don't
 # change the specifiers or add anything.
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
 #: ../src/calendar/gui/e-week-view-main-item.c:222
-#: ../src/calendar/gui/print.c:2072
+#: ../src/calendar/gui/print.c:2082
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../src/calendar/gui/itip-utils.c:789 ../src/calendar/gui/itip-utils.c:851
-#: ../src/calendar/gui/itip-utils.c:985
+#: ../src/calendar/gui/itip-utils.c:793 ../src/calendar/gui/itip-utils.c:855
+#: ../src/calendar/gui/itip-utils.c:989
 msgid "An organizer must be set."
 msgstr "Organizator mora biti određen."
 
-#: ../src/calendar/gui/itip-utils.c:842
+#: ../src/calendar/gui/itip-utils.c:846
 msgid "At least one attendee is necessary"
 msgstr "Najmanje jedan učesnik je neophodan"
 
-#: ../src/calendar/gui/itip-utils.c:1073 ../src/calendar/gui/itip-utils.c:1234
+#: ../src/calendar/gui/itip-utils.c:1077 ../src/calendar/gui/itip-utils.c:1238
 msgid "Event information"
 msgstr "Podaci o događaju"
 
-#: ../src/calendar/gui/itip-utils.c:1076 ../src/calendar/gui/itip-utils.c:1237
+#: ../src/calendar/gui/itip-utils.c:1080 ../src/calendar/gui/itip-utils.c:1241
 msgid "Task information"
 msgstr "Podaci o zadatku"
 
-#: ../src/calendar/gui/itip-utils.c:1079 ../src/calendar/gui/itip-utils.c:1240
+#: ../src/calendar/gui/itip-utils.c:1083 ../src/calendar/gui/itip-utils.c:1244
 msgid "Memo information"
 msgstr "Podaci o belešci"
 
-#: ../src/calendar/gui/itip-utils.c:1082 ../src/calendar/gui/itip-utils.c:1258
+#: ../src/calendar/gui/itip-utils.c:1086 ../src/calendar/gui/itip-utils.c:1262
 msgid "Free/Busy information"
 msgstr "Podaci slobodno/zauzeto"
 
-#: ../src/calendar/gui/itip-utils.c:1085
+#: ../src/calendar/gui/itip-utils.c:1089
 msgid "Calendar information"
 msgstr "Podaci o kalendaru"
 
@@ -9093,7 +8895,7 @@ msgstr "Podaci o kalendaru"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1122
+#: ../src/calendar/gui/itip-utils.c:1126
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Prihvaćeno"
@@ -9102,7 +8904,7 @@ msgstr "Prihvaćeno"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1129
+#: ../src/calendar/gui/itip-utils.c:1133
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Prihvaćeno s rezervom"
@@ -9114,7 +8916,7 @@ msgstr "Prihvaćeno s rezervom"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1136 ../src/calendar/gui/itip-utils.c:1184
+#: ../src/calendar/gui/itip-utils.c:1140 ../src/calendar/gui/itip-utils.c:1188
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Odbijeno"
@@ -9123,7 +8925,7 @@ msgstr "Odbijeno"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1143
+#: ../src/calendar/gui/itip-utils.c:1147
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegirano"
@@ -9131,7 +8933,7 @@ msgstr "Delegirano"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1156
+#: ../src/calendar/gui/itip-utils.c:1160
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Osveženo"
@@ -9139,7 +8941,7 @@ msgstr "Osveženo"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1163
+#: ../src/calendar/gui/itip-utils.c:1167
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Otkaži"
@@ -9147,7 +8949,7 @@ msgstr "Otkaži"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1170
+#: ../src/calendar/gui/itip-utils.c:1174
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Osveži"
@@ -9155,166 +8957,166 @@ msgstr "Osveži"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../src/calendar/gui/itip-utils.c:1177
+#: ../src/calendar/gui/itip-utils.c:1181
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Protiv-predlog"
 
-#: ../src/calendar/gui/itip-utils.c:1255
+#: ../src/calendar/gui/itip-utils.c:1259
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Podaci slobodno/zauzeto (%s do %s)"
 
-#: ../src/calendar/gui/itip-utils.c:1263
+#: ../src/calendar/gui/itip-utils.c:1267
 msgid "iCalendar information"
 msgstr "Podaci iKalendara"
 
-#: ../src/calendar/gui/itip-utils.c:1292
+#: ../src/calendar/gui/itip-utils.c:1296
 #, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "Ne mogu da sačuvam unos, novi događaj se sukobljava sa nekim drugim."
 
-#: ../src/calendar/gui/itip-utils.c:1297
+#: ../src/calendar/gui/itip-utils.c:1301
 msgid "Unable to book a resource, error: "
 msgstr "Ne mogu da sačuvam unos, greška: "
 
-#: ../src/calendar/gui/itip-utils.c:1468
+#: ../src/calendar/gui/itip-utils.c:1472
 msgid "You must be an attendee of the event."
 msgstr "Morate biti učesnik događaja."
 
-#: ../src/calendar/gui/itip-utils.c:2149
+#: ../src/calendar/gui/itip-utils.c:2153
 msgid "Sending an event"
 msgstr "Šaljem događaj"
 
-#: ../src/calendar/gui/itip-utils.c:2153
+#: ../src/calendar/gui/itip-utils.c:2157
 msgid "Sending a memo"
 msgstr "Šaljem belešku"
 
-#: ../src/calendar/gui/itip-utils.c:2157
+#: ../src/calendar/gui/itip-utils.c:2161
 msgid "Sending a task"
 msgstr "Šaljem zadatak"
 
-#: ../src/calendar/gui/print.c:661
+#: ../src/calendar/gui/print.c:665
 msgid "1st"
 msgstr "1."
 
-#: ../src/calendar/gui/print.c:661
+#: ../src/calendar/gui/print.c:665
 msgid "2nd"
 msgstr "2."
 
-#: ../src/calendar/gui/print.c:661
+#: ../src/calendar/gui/print.c:665
 msgid "3rd"
 msgstr "3."
 
-#: ../src/calendar/gui/print.c:661
+#: ../src/calendar/gui/print.c:665
 msgid "4th"
 msgstr "4."
 
-#: ../src/calendar/gui/print.c:661
+#: ../src/calendar/gui/print.c:665
 msgid "5th"
 msgstr "5."
 
-#: ../src/calendar/gui/print.c:662
+#: ../src/calendar/gui/print.c:666
 msgid "6th"
 msgstr "6."
 
-#: ../src/calendar/gui/print.c:662
+#: ../src/calendar/gui/print.c:666
 msgid "7th"
 msgstr "7."
 
-#: ../src/calendar/gui/print.c:662
+#: ../src/calendar/gui/print.c:666
 msgid "8th"
 msgstr "8."
 
-#: ../src/calendar/gui/print.c:662
+#: ../src/calendar/gui/print.c:666
 msgid "9th"
 msgstr "9."
 
-#: ../src/calendar/gui/print.c:662
+#: ../src/calendar/gui/print.c:666
 msgid "10th"
 msgstr "10."
 
-#: ../src/calendar/gui/print.c:663
+#: ../src/calendar/gui/print.c:667
 msgid "11th"
 msgstr "11."
 
-#: ../src/calendar/gui/print.c:663
+#: ../src/calendar/gui/print.c:667
 msgid "12th"
 msgstr "12."
 
-#: ../src/calendar/gui/print.c:663
+#: ../src/calendar/gui/print.c:667
 msgid "13th"
 msgstr "13."
 
-#: ../src/calendar/gui/print.c:663
+#: ../src/calendar/gui/print.c:667
 msgid "14th"
 msgstr "14."
 
-#: ../src/calendar/gui/print.c:663
+#: ../src/calendar/gui/print.c:667
 msgid "15th"
 msgstr "15."
 
-#: ../src/calendar/gui/print.c:664
+#: ../src/calendar/gui/print.c:668
 msgid "16th"
 msgstr "16."
 
-#: ../src/calendar/gui/print.c:664
+#: ../src/calendar/gui/print.c:668
 msgid "17th"
 msgstr "17."
 
-#: ../src/calendar/gui/print.c:664
+#: ../src/calendar/gui/print.c:668
 msgid "18th"
 msgstr "18."
 
-#: ../src/calendar/gui/print.c:664
+#: ../src/calendar/gui/print.c:668
 msgid "19th"
 msgstr "19."
 
-#: ../src/calendar/gui/print.c:664
+#: ../src/calendar/gui/print.c:668
 msgid "20th"
 msgstr "20."
 
-#: ../src/calendar/gui/print.c:665
+#: ../src/calendar/gui/print.c:669
 msgid "21st"
 msgstr "21."
 
-#: ../src/calendar/gui/print.c:665
+#: ../src/calendar/gui/print.c:669
 msgid "22nd"
 msgstr "22."
 
-#: ../src/calendar/gui/print.c:665
+#: ../src/calendar/gui/print.c:669
 msgid "23rd"
 msgstr "23."
 
-#: ../src/calendar/gui/print.c:665
+#: ../src/calendar/gui/print.c:669
 msgid "24th"
 msgstr "24."
 
-#: ../src/calendar/gui/print.c:665
+#: ../src/calendar/gui/print.c:669
 msgid "25th"
 msgstr "25."
 
-#: ../src/calendar/gui/print.c:666
+#: ../src/calendar/gui/print.c:670
 msgid "26th"
 msgstr "26."
 
-#: ../src/calendar/gui/print.c:666
+#: ../src/calendar/gui/print.c:670
 msgid "27th"
 msgstr "27."
 
-#: ../src/calendar/gui/print.c:666
+#: ../src/calendar/gui/print.c:670
 msgid "28th"
 msgstr "28."
 
-#: ../src/calendar/gui/print.c:666
+#: ../src/calendar/gui/print.c:670
 msgid "29th"
 msgstr "29."
 
-#: ../src/calendar/gui/print.c:666
+#: ../src/calendar/gui/print.c:670
 msgid "30th"
 msgstr "30."
 
-#: ../src/calendar/gui/print.c:667
+#: ../src/calendar/gui/print.c:671
 msgid "31st"
 msgstr "31."
 
@@ -9322,114 +9124,114 @@ msgstr "31."
 #. Translators: These are workday abbreviations,
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_MONDAY
-#: ../src/calendar/gui/print.c:727
+#: ../src/calendar/gui/print.c:731
 msgid "Mo"
 msgstr "Po"
 
 #. G_DATE_TUESDAY
-#: ../src/calendar/gui/print.c:728
+#: ../src/calendar/gui/print.c:732
 msgid "Tu"
 msgstr "Ut"
 
 #. G_DATE_WEDNESDAY
-#: ../src/calendar/gui/print.c:729
+#: ../src/calendar/gui/print.c:733
 msgid "We"
 msgstr "Sr"
 
 #. G_DATE_THURSDAY
-#: ../src/calendar/gui/print.c:730
+#: ../src/calendar/gui/print.c:734
 msgid "Th"
 msgstr "Če"
 
 #. G_DATE_FRIDAY
-#: ../src/calendar/gui/print.c:731
+#: ../src/calendar/gui/print.c:735
 msgid "Fr"
 msgstr "Pe"
 
 #. G_DATE_SATURDAY
-#: ../src/calendar/gui/print.c:732
+#: ../src/calendar/gui/print.c:736
 msgid "Sa"
 msgstr "Su"
 
 #. G_DATE_SUNDAY
-#: ../src/calendar/gui/print.c:733
+#: ../src/calendar/gui/print.c:737
 msgid "Su"
 msgstr "Ne"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../src/calendar/gui/print.c:3313
+#: ../src/calendar/gui/print.c:3323
 msgid " to "
 msgstr " do "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../src/calendar/gui/print.c:3323
+#: ../src/calendar/gui/print.c:3333
 msgid " (Completed "
 msgstr " (Završeno je "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../src/calendar/gui/print.c:3329
+#: ../src/calendar/gui/print.c:3339
 msgid "Completed "
 msgstr "Završeno je "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../src/calendar/gui/print.c:3339
+#: ../src/calendar/gui/print.c:3349
 msgid " (Due "
 msgstr " (Rok "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../src/calendar/gui/print.c:3346
+#: ../src/calendar/gui/print.c:3356
 msgid "Due "
 msgstr "Rok "
 
-#: ../src/calendar/gui/print.c:3490
+#: ../src/calendar/gui/print.c:3500
 msgid "Appointment"
 msgstr "Zakazivanje"
 
-#: ../src/calendar/gui/print.c:3492 ../src/e-util/e-send-options.c:551
+#: ../src/calendar/gui/print.c:3502 ../src/e-util/e-send-options.c:551
 msgid "Task"
 msgstr "Zadatak"
 
-#: ../src/calendar/gui/print.c:3494
+#: ../src/calendar/gui/print.c:3504
 msgid "Memo"
 msgstr "Beleška"
 
-#: ../src/calendar/gui/print.c:3550
+#: ../src/calendar/gui/print.c:3560
 msgid "Attendees: "
 msgstr "Prisutni: "
 
-#: ../src/calendar/gui/print.c:3594
+#: ../src/calendar/gui/print.c:3604
 #, c-format
 msgid "Status: %s"
 msgstr "Stanje: %s"
 
-#: ../src/calendar/gui/print.c:3610
+#: ../src/calendar/gui/print.c:3620
 #, c-format
 msgid "Priority: %s"
 msgstr "Važnost: %s"
 
-#: ../src/calendar/gui/print.c:3628
+#: ../src/calendar/gui/print.c:3638
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Postotak završenog: %i"
 
-#: ../src/calendar/gui/print.c:3642
+#: ../src/calendar/gui/print.c:3652
 #, c-format
 msgid "URL: %s"
 msgstr "Adresa: %s"
 
-#: ../src/calendar/gui/print.c:3656
+#: ../src/calendar/gui/print.c:3666
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
-#: ../src/calendar/gui/print.c:3667
+#: ../src/calendar/gui/print.c:3677
 msgid "Contacts: "
 msgstr "Kontakti: "
 
@@ -9459,12 +9261,14 @@ msgid "Appointments and Meetings"
 msgstr "Zakazivanje i sastanci"
 
 #: ../src/calendar/importers/icalendar-importer.c:306
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:432
 #: ../src/modules/calendar/e-cal-base-shell-backend.c:181
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:178
 msgid "New Calendar"
 msgstr "Novi kalendar"
 
 #: ../src/calendar/importers/icalendar-importer.c:309
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:440
 #: ../src/modules/calendar/e-cal-base-shell-backend.c:189
 #: ../src/modules/calendar/e-task-shell-view-actions.c:202
 msgid "New Task List"
@@ -11227,12 +11031,12 @@ msgid "Open New Message window"
 msgstr "Otvara prozor za novu poruku"
 
 #: ../src/composer/e-composer-actions.c:341 ../src/shell/e-shell.c:1302
-#: ../src/shell/e-shell-window-actions.c:857
+#: ../src/shell/e-shell-window-actions.c:887
 msgid "_Preferences"
 msgstr "_Postavke"
 
 #: ../src/composer/e-composer-actions.c:343
-#: ../src/shell/e-shell-window-actions.c:859
+#: ../src/shell/e-shell-window-actions.c:889
 msgid "Configure Evolution"
 msgstr "Podesi Evoluciju"
 
@@ -11374,9 +11178,11 @@ msgstr "Sačuvaj nacrt"
 
 #: ../src/composer/e-composer-from-header.c:108
 #: ../src/e-util/e-mail-signature-script-dialog.c:416
+#: ../src/e-util/e-webdav-browser.c:2408
 #: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../src/mail/e-mail-config-identity-page.c:553
-#: ../src/mail/e-mail-config-summary-page.c:333
+#: ../src/mail/e-mail-config-identity-page.c:550
+#: ../src/mail/e-mail-config-summary-page.c:332
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:297
 msgid "_Name:"
 msgstr "_Ime:"
 
@@ -11429,11 +11235,11 @@ msgid "S_ubject:"
 msgstr "Na_slov:"
 
 #: ../src/composer/e-composer-header-table.c:883
-#: ../src/mail/e-mail-config-identity-page.c:746
+#: ../src/mail/e-mail-config-identity-page.c:743
 msgid "Si_gnature:"
 msgstr "Potp_is:"
 
-#: ../src/composer/e-composer-name-header.c:231
+#: ../src/composer/e-composer-name-header.c:237
 msgid "Click here for the address book"
 msgstr "Kliknite ovde za adresar"
 
@@ -11441,7 +11247,7 @@ msgstr "Kliknite ovde za adresar"
 msgid "Click here to select folders to post to"
 msgstr "Kliknite ovde da izaberete fascikle za slanje"
 
-#: ../src/composer/e-msg-composer.c:859
+#: ../src/composer/e-msg-composer.c:854
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -11449,7 +11255,7 @@ msgstr ""
 "Nije moguće potpisivanje odlazeće poruke: nije postavljeno uverenje za "
 "potpisivanje za ovaj nalog"
 
-#: ../src/composer/e-msg-composer.c:868
+#: ../src/composer/e-msg-composer.c:863
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -11458,22 +11264,19 @@ msgstr ""
 "Nije moguće šifrovanje odlazeće poruke: nije postavljeno uverenje za šifrovanje "
 "za ovaj nalog"
 
-#: ../src/composer/e-msg-composer.c:1606 ../src/composer/e-msg-composer.c:2412
+#: ../src/composer/e-msg-composer.c:1622 ../src/composer/e-msg-composer.c:2294
 msgid "Compose Message"
 msgstr "Sastavi poruku"
 
-#: ../src/composer/e-msg-composer.c:4767
+#: ../src/composer/e-msg-composer.c:4657
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "Sastavljač u telu poruke ne sadrži tekst, što ne može biti izmenjeno."
 
 #: ../src/composer/mail-composer.error.xml.h:1
-#| msgid "You cannot attach the file &quot;{0}&quot; to this message."
 msgid "You cannot attach the file “{0}” to this message."
 msgstr "Ne možete priložiti datoteku „{0}“ ovoj poruci."
 
 #: ../src/composer/mail-composer.error.xml.h:2
-#| msgid ""
-#| "The file '{0}' is not a regular file and cannot be sent in a message."
 msgid "The file “{0}” is not a regular file and cannot be sent in a message."
 msgstr "Datoteka „{0}“ nije regularna i ne može biti poslata u poruci."
 
@@ -11488,7 +11291,6 @@ msgstr "Ne mogu da dobijem poruke za prilaganje „{0}“."
 # system:no-load-file secondary
 #: ../src/composer/mail-composer.error.xml.h:4
 #: ../src/e-util/e-system.error.xml.h:5
-#| msgid "Because \"{1}\"."
 msgid "Because “{1}”."
 msgstr "Zbog „{1}“."
 
@@ -11513,19 +11315,14 @@ msgid "_Recover"
 msgstr "_Spasi"
 
 #: ../src/composer/mail-composer.error.xml.h:9
-#| msgid "Could not save to autosave file &quot;{0}&quot;."
 msgid "Could not save to autosave file “{0}”."
 msgstr "Ne mogu da sačuvam u samočuvajuću datoteku „{0}“."
 
 #: ../src/composer/mail-composer.error.xml.h:10
-#| msgid "Error saving to autosave because &quot;{1}&quot;."
 msgid "Error saving to autosave because “{1}”."
 msgstr "Greška u čuvanju samočuvajuće datoteke zbog „{1}“."
 
 #: ../src/composer/mail-composer.error.xml.h:11
-#| 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, titled “{0}”, you are "
 "composing?"
@@ -11559,8 +11356,6 @@ msgid "Could not create message."
 msgstr "Ne mogu da napravim poruku."
 
 #: ../src/composer/mail-composer.error.xml.h:19
-#| msgid ""
-#| "Because &quot;{0}&quot;, you may need to select different mail options."
 msgid ""
 "You may need to select different mail options.\n"
 "\n"
@@ -11571,7 +11366,6 @@ msgstr ""
 "Greška: {0}"
 
 #: ../src/composer/mail-composer.error.xml.h:22
-#| msgid "Could not read signature file &quot;{0}&quot;."
 msgid "Could not read signature file “{0}”."
 msgstr "Ne mogu da pročitam datoteku potpisa „{0}“."
 
@@ -11588,8 +11382,6 @@ msgid "An error occurred while saving to your Outbox folder."
 msgstr "Došlo je do greške tokom čuvanja u vašoj fascikli Za slanje."
 
 #: ../src/composer/mail-composer.error.xml.h:26
-#| msgid ""
-#| "The reported error was &quot;{0}&quot;. The message has not been sent."
 msgid "The reported error was “{0}”. The message has not been sent."
 msgstr "Prijavljena greška bejaše „{0}“. Poruka nije poslata."
 
@@ -11598,9 +11390,6 @@ msgid "An error occurred while saving to your Drafts folder."
 msgstr "Došlo je do greške tokom čuvanja u vašoj fascikli Nacrti."
 
 #: ../src/composer/mail-composer.error.xml.h:28
-#| msgid ""
-#| "The reported error was &quot;{0}&quot;. The message has most likely not "
-#| "been saved."
 msgid ""
 "The reported error was “{0}”. The message has most likely not been saved."
 msgstr "Prijavljena greška bejaše „{0}“. Poruka najverovatnije nije sačuvana."
@@ -11610,8 +11399,7 @@ msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "Došlo je do greške tokom slanja. Kako želite da nastavite?"
 
 #: ../src/composer/mail-composer.error.xml.h:30
-#: ../src/mail/mail.error.xml.h:175
-#| msgid "The reported error was &quot;{0}&quot;."
+#: ../src/mail/mail.error.xml.h:177
 msgid "The reported error was “{0}”."
 msgstr "Prijavljena greška bejaše „{0}“."
 
@@ -11632,10 +11420,6 @@ msgid "Saving message to Outbox."
 msgstr "Čuvam poruku u fascikli Za slanje."
 
 #: ../src/composer/mail-composer.error.xml.h:35
-#| msgid ""
-#| "The message will be saved to your local Outbox folder, because the "
-#| "destination service is currently unavailable. You can send the message by "
-#| "clicking the Send/Receive button in Evolution's toolbar."
 msgid ""
 "The message will be saved to your local Outbox folder, because the "
 "destination service is currently unavailable. You can send the message by "
@@ -11658,14 +11442,10 @@ msgstr ""
 "poruke se zaustavlja ukoliko je to urađeno slučajno ili se poruka šalje."
 
 #: ../src/composer/mail-composer.error.xml.h:39
-#| msgid "Are you sure you want to change the composer mode?"
 msgid "Are you sure you want to change the composer format?"
 msgstr "Da li želite da izmenite format sastavljanja poruke?"
 
 #: ../src/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?"
 msgid ""
 "Switching to Plain Text format will cause the text to lose all the HTML "
 "formatting. Do you want to continue?"
@@ -11674,7 +11454,6 @@ msgstr ""
 "formatiranje. Da li želite da nastavite?"
 
 #: ../src/composer/mail-composer.error.xml.h:41
-#| msgid "_Don't lose formatting"
 msgid "_Don’t lose formatting"
 msgstr "_Zadrži format"
 
@@ -11687,7 +11466,6 @@ msgid "An error occurred while saving to your Templates folder."
 msgstr "Došlo je do greške tokom čuvanja u vašoj fascikli Šabloni."
 
 #: ../src/composer/mail-composer.error.xml.h:44
-#| msgid "Are you sure you want to discard the message you are composing?"
 msgid "Are you sure you want to convert the message into a meeting?"
 msgstr "Da li sigurno želite da pretvorite poruku u sastanak?"
 
@@ -11700,12 +11478,10 @@ msgstr ""
 "izmene odbačene."
 
 #: ../src/composer/mail-composer.error.xml.h:46
-#| msgid "Create a _Meeting"
 msgid "Convert to _Meeting"
 msgstr "Pretvori u _sastanak"
 
 #: ../src/composer/mail-composer.error.xml.h:47
-#| msgid "Are you sure you want to send the message?"
 msgid "Are you sure you want to convert the event into a message?"
 msgstr "Da li sigurno želite da pretvorite događaj u poruku?"
 
@@ -11718,12 +11494,10 @@ msgstr ""
 "izmene odbačene."
 
 #: ../src/composer/mail-composer.error.xml.h:49
-#| msgid "Important Messages"
 msgid "Convert to _Message"
 msgstr "Pretvori u _poruku"
 
 #: ../src/composer/mail-composer.error.xml.h:50
-#| msgid "Are you sure you want to save the memo without a summary?"
 msgid "Are you sure you want to convert the memo into a message?"
 msgstr "Da li sigurno želite da pretvorite belešku u poruku?"
 
@@ -11736,7 +11510,6 @@ msgstr ""
 "izmene odbačene."
 
 #: ../src/composer/mail-composer.error.xml.h:52
-#| msgid "Are you sure you want to save the task without a summary?"
 msgid "Are you sure you want to convert the task into a message?"
 msgstr "Da li sigurno želite da pretvorite zadatak u poruku?"
 
@@ -11766,11 +11539,11 @@ msgstr ""
 msgid "Display as attachment"
 msgstr "Prikaži kao prilog"
 
-#: ../src/em-format/e-mail-formatter-audio.c:150
+#: ../src/em-format/e-mail-formatter-audio.c:151
 msgid "Audio Player"
 msgstr "Zvučni uređaj"
 
-#: ../src/em-format/e-mail-formatter-audio.c:151
+#: ../src/em-format/e-mail-formatter-audio.c:152
 msgid "Play the attachment in embedded audio player"
 msgstr "Pusti prilog u ugrađenom programu"
 
@@ -11810,6 +11583,7 @@ msgid "Format part as an RFC822 message"
 msgstr "Oblikuje deo kao RFC822 poruku"
 
 #: ../src/em-format/e-mail-formatter-print.c:51
+#: ../src/e-util/e-webdav-browser.c:2352
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:92
 #: ../src/mail/e-mail-label-tree-view.c:96
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:64
@@ -11835,7 +11609,7 @@ msgstr "Naslov"
 #. pseudo-header
 #: ../src/em-format/e-mail-formatter-quote-headers.c:197
 #: ../src/em-format/e-mail-formatter-utils.c:341
-#: ../src/modules/mail/em-mailer-prefs.c:1488
+#: ../src/modules/mail/em-mailer-prefs.c:1494
 msgid "Mailer"
 msgstr "Pošiljalac"
 
@@ -11870,21 +11644,25 @@ msgstr "Običan tekst"
 msgid "Format part as plain text"
 msgstr "Oblikuje deo kao običan tekst"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:44
+#: ../src/em-format/e-mail-formatter-secure-button.c:45
 msgid "Unsigned"
 msgstr "Nepotpisano"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:44
+#: ../src/em-format/e-mail-formatter-secure-button.c:47
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Ova poruka nije potpisana. Nije sigurno da je ova poruka verodostojna."
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:45
+#: ../src/em-format/e-mail-formatter-secure-button.c:49
 msgid "Valid signature"
 msgstr "Ispravan potpis"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:45
+#: ../src/em-format/e-mail-formatter-secure-button.c:50
+msgid "Valid signature, but sender address and signer address do not match"
+msgstr "Važeći potpis, ali se adrese pošiljaoca i potpisnika ne poklapaju"
+
+#: ../src/em-format/e-mail-formatter-secure-button.c:51
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -11892,22 +11670,22 @@ msgstr ""
 "Ova poruka je potpisana i ispravna što znači da je pošiljalac poruke vrlo "
 "verovatno verodostojan."
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:46
+#: ../src/em-format/e-mail-formatter-secure-button.c:53
 msgid "Invalid signature"
 msgstr "Neispravan potpis"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:46
+#: ../src/em-format/e-mail-formatter-secure-button.c:55
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 "Potpis ove poruke nije mogao biti proveren, možda je izmenjena u prenosu."
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:47
+#: ../src/em-format/e-mail-formatter-secure-button.c:57
 msgid "Valid signature, but cannot verify sender"
 msgstr "Ispravan potpis, ali ne mogu da proverim pošiljaoca"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:47
+#: ../src/em-format/e-mail-formatter-secure-button.c:59
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -11915,11 +11693,11 @@ msgstr ""
 "Ova poruka je potpisana ispravnim potpisom, ali pošiljalac poruke ne može "
 "biti proveren."
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:48
+#: ../src/em-format/e-mail-formatter-secure-button.c:61
 msgid "This message is signed, but the public key is not in your keyring"
 msgstr "Ova poruka je potpisana, ali javni ključ nije u vašem privesku ključeva"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:48
+#: ../src/em-format/e-mail-formatter-secure-button.c:63
 msgid ""
 "This message was digitally signed, but the corresponding public key is not "
 "present in your keyring. If you want to be able to verify the authenticity "
@@ -11933,11 +11711,11 @@ msgstr ""
 "pouzdane metode i dodate ga na privezak za ključeve. Do tada, nema garancije "
 "da je ova poruka zaista došla od te osobe i da je stigla nepromenjena."
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:57
+#: ../src/em-format/e-mail-formatter-secure-button.c:72
 msgid "Unencrypted"
 msgstr "Nešifrovano"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:57
+#: ../src/em-format/e-mail-formatter-secure-button.c:72
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -11945,11 +11723,11 @@ msgstr ""
 "Ova poruka nije šifrovana. Njen sadržaj je moguće videti u prenosu preko "
 "Interneta."
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:58
+#: ../src/em-format/e-mail-formatter-secure-button.c:73
 msgid "Encrypted, weak"
 msgstr "Šifrovano, slabo"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:58
+#: ../src/em-format/e-mail-formatter-secure-button.c:73
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -11958,22 +11736,22 @@ msgstr ""
 "Ova poruka je šifrovana, ali slabim algoritmom. Teško je, ali ne i nemoguće "
 "da neko sa strane u dogledno vreme vidi sadržaj ove poruke."
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:59
+#: ../src/em-format/e-mail-formatter-secure-button.c:74
 msgid "Encrypted"
 msgstr "Šifrovano"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:59
+#: ../src/em-format/e-mail-formatter-secure-button.c:74
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 "Ova poruka je šifrovana.  Teško će neko sa strane videti sadržaj ove poruke."
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:60
+#: ../src/em-format/e-mail-formatter-secure-button.c:75
 msgid "Encrypted, strong"
 msgstr "Šifrovano, jako"
 
-#: ../src/em-format/e-mail-formatter-secure-button.c:60
+#: ../src/em-format/e-mail-formatter-secure-button.c:75
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -12064,7 +11842,6 @@ msgstr "Pokazivač na FTP stranicu (%s)"
 
 #: ../src/em-format/e-mail-parser-message-external.c:110
 #, c-format
-#| msgid "Pointer to local file (%s) valid at site \"%s\""
 msgid "Pointer to local file (%s) valid at site “%s”"
 msgstr "Pokazivač na lokalnu datoteku (%s) koja odgovara stranici „%s“"
 
@@ -12080,7 +11857,6 @@ msgstr "Pokazivač na udaljeni podatak (%s)"
 
 #: ../src/em-format/e-mail-parser-message-external.c:149
 #, c-format
-#| msgid "Pointer to unknown external data (\"%s\" type)"
 msgid "Pointer to unknown external data (“%s” type)"
 msgstr "Pokazivač na nepoznati spoljni podatak (tipa „%s“)"
 
@@ -12124,16 +11900,25 @@ msgstr "Grupe vesti"
 msgid "Face"
 msgstr "Lice"
 
-#: ../src/em-format/e-mail-part-secure-button.c:116
+#: ../src/em-format/e-mail-part-secure-button.c:92
+#, c-format
+msgid "Failed to import certificate: %s"
+msgstr "Ne mogu da uvezem uverenje: %s"
+
+#: ../src/em-format/e-mail-part-secure-button.c:185
 #: ../src/shell/shell.error.xml.h:28 ../src/smime/gui/smime-ui.ui.h:16
 msgid "_View Certificate"
 msgstr "Pregledaj _uverenje"
 
-#: ../src/em-format/e-mail-part-secure-button.c:131
+#: ../src/em-format/e-mail-part-secure-button.c:198
+msgid "_Import Certificate"
+msgstr "_Uvezi uverenje"
+
+#: ../src/em-format/e-mail-part-secure-button.c:207
 msgid "This certificate is not viewable"
 msgstr "Ovo uverenje nije čitljivo"
 
-#: ../src/em-format/e-mail-part-utils.c:551
+#: ../src/em-format/e-mail-part-utils.c:556
 #, c-format
 msgid "%s attachment"
 msgstr "%s prilog"
@@ -12151,6 +11936,74 @@ msgstr "Kalendar: od %s do %s"
 msgid "evolution calendar item"
 msgstr "stavka kalendara evolucije"
 
+#: ../src/e-util/e-accounts-window.c:509 ../src/e-util/e-accounts-window.c:624
+#: ../src/e-util/e-accounts-window.c:827
+#: ../src/modules/mail/e-mail-shell-backend.c:840
+msgid "Mail Accounts"
+msgstr "Poštanski nalozi"
+
+#: ../src/e-util/e-accounts-window.c:516 ../src/e-util/e-accounts-window.c:653
+#: ../src/e-util/e-accounts-window.c:841
+msgid "Address Books"
+msgstr "Adresari"
+
+#: ../src/e-util/e-accounts-window.c:522 ../src/e-util/e-accounts-window.c:654
+#: ../src/e-util/e-accounts-window.c:842
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
+msgid "Calendars"
+msgstr "Kalendari"
+
+#: ../src/e-util/e-accounts-window.c:528 ../src/e-util/e-accounts-window.c:655
+#: ../src/e-util/e-accounts-window.c:843
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:82
+msgid "Memo Lists"
+msgstr "Spisak beleški"
+
+#: ../src/e-util/e-accounts-window.c:534 ../src/e-util/e-accounts-window.c:656
+#: ../src/e-util/e-accounts-window.c:844
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
+msgid "Task Lists"
+msgstr "Spisak zadataka"
+
+# has "activatable" set.
+#: ../src/e-util/e-accounts-window.c:1326
+#: ../src/mail/e-mail-account-tree-view.c:84
+#: ../src/modules/mail/em-composer-prefs.c:1305
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:355
+#: ../src/plugins/publish-calendar/publish-calendar.c:853
+msgid "Enabled"
+msgstr "Uključen"
+
+#: ../src/e-util/e-accounts-window.c:1342
+#: ../src/mail/e-mail-account-tree-view.c:108
+msgid "Account Name"
+msgstr "Naziv naloga"
+
+#. { "collection",     N_("Collection _Account"),      "evolution" },
+#: ../src/e-util/e-accounts-window.c:1463
+msgid "_Mail Account"
+msgstr "Poštanski nalog"
+
+#: ../src/e-util/e-accounts-window.c:1464
+msgid "Address _Book"
+msgstr "_Adresar"
+
+#: ../src/e-util/e-accounts-window.c:1465
+msgid "_Calendar"
+msgstr "_Kalendar"
+
+#: ../src/e-util/e-accounts-window.c:1466
+msgid "M_emo List"
+msgstr "Spisak beleški"
+
+#: ../src/e-util/e-accounts-window.c:1467
+msgid "_Task List"
+msgstr "Spisak zadataka"
+
+#: ../src/e-util/e-accounts-window.c:1659
+msgid "Evolution Accounts"
+msgstr "Nalozi Evolucije"
+
 #. Translators: This is a cancelled activity.
 #: ../src/e-util/e-activity.c:256
 #, c-format
@@ -12191,12 +12044,12 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% završeno)"
 
 #: ../src/e-util/e-activity-proxy.c:350
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1870
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1851
 msgid "Cancel"
 msgstr "Otkaži"
 
 #. Translators: Escape is a keyboard binding.
-#: ../src/e-util/e-alert-bar.c:124
+#: ../src/e-util/e-alert-bar.c:125
 msgid "Close this message (Escape)"
 msgstr "Zatvorite ovu poruku (Napusti)"
 
@@ -12213,47 +12066,45 @@ msgstr "Ne mogu da započnem raspravu: "
 msgid "Attached message"
 msgstr "Priložena poruka"
 
-#: ../src/e-util/e-attachment.c:2040 ../src/e-util/e-attachment.c:3093
+#: ../src/e-util/e-attachment.c:2063 ../src/e-util/e-attachment.c:3116
 msgid "Operation was cancelled"
 msgstr "Radnja je otkazana"
 
 #. Translators: Default attachment filename.
-#: ../src/e-util/e-attachment.c:2224 ../src/e-util/e-attachment.c:2940
-#: ../src/e-util/e-attachment.c:3383 ../src/e-util/e-attachment-store.c:886
+#: ../src/e-util/e-attachment.c:2247 ../src/e-util/e-attachment.c:2963
+#: ../src/e-util/e-attachment.c:3406 ../src/e-util/e-attachment-store.c:886
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../src/e-util/e-attachment.c:2302 ../src/e-util/e-attachment.c:3443
+#: ../src/e-util/e-attachment.c:2325 ../src/e-util/e-attachment.c:3466
 msgid "A load operation is already in progress"
 msgstr "Operacija učitavanja je već u toku"
 
-#: ../src/e-util/e-attachment.c:2310 ../src/e-util/e-attachment.c:3451
+#: ../src/e-util/e-attachment.c:2333 ../src/e-util/e-attachment.c:3474
 msgid "A save operation is already in progress"
 msgstr "Operacija čuvanja je već u toku"
 
-#: ../src/e-util/e-attachment.c:2707
+#: ../src/e-util/e-attachment.c:2730
 #, c-format
-#| msgid "Could not open %s:"
 msgid "Could not open “%s”"
 msgstr "Ne mogu da otvorim „%s“"
 
-#: ../src/e-util/e-attachment.c:2710
+#: ../src/e-util/e-attachment.c:2733
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Ne mogu da otvorim prilog"
 
-#: ../src/e-util/e-attachment.c:3460
+#: ../src/e-util/e-attachment.c:3483
 msgid "Attachment contents not loaded"
 msgstr "Sadržaj priloga nije učitan"
 
 # * found, so just bail completely.
-#: ../src/e-util/e-attachment.c:3551
+#: ../src/e-util/e-attachment.c:3574
 #, c-format
-#| msgid "Could not save '%s'"
 msgid "Could not save “%s”"
 msgstr "Ne mogu da sačuvam „%s“"
 
-#: ../src/e-util/e-attachment.c:3554
+#: ../src/e-util/e-attachment.c:3577
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Ne mogu da sačuvam prilog"
@@ -12270,6 +12121,7 @@ msgstr "_Naziv datoteke:"
 #: ../src/e-util/e-attachment-dialog.c:354
 #: ../src/e-util/e-html-editor-image-dialog.c:508
 #: ../src/e-util/e-html-editor-link-dialog.c:241
+#: ../src/e-util/e-webdav-browser.c:2447
 msgid "_Description:"
 msgstr "_Opis:"
 
@@ -12342,46 +12194,45 @@ msgstr "Sačuvaj _samo izvučene datoteke"
 msgid "Save extracted files and the original _archive"
 msgstr "Sačuvaj izvučene datoteke i originalne _arhive"
 
-#: ../src/e-util/e-attachment-view.c:308
+#: ../src/e-util/e-attachment-view.c:309
 msgid "Open With Other Application..."
 msgstr "Otvori drugim programom..."
 
-#: ../src/e-util/e-attachment-view.c:315
+#: ../src/e-util/e-attachment-view.c:316
 msgid "S_ave All"
 msgstr "Sač_uvaj sve"
 
-#: ../src/e-util/e-attachment-view.c:322
+#: ../src/e-util/e-attachment-view.c:323
 msgid "Sa_ve As"
 msgstr "Sačuvaj _kao"
 
-#: ../src/e-util/e-attachment-view.c:331
+#: ../src/e-util/e-attachment-view.c:332
 #: ../src/plugins/save-calendar/save-calendar.c:351
 #: ../src/plugins/save-calendar/save-calendar.c:382
 #: ../src/plugins/save-calendar/save-calendar.c:413
 msgid "Save _As"
 msgstr "Sačuvaj _kao"
 
-#: ../src/e-util/e-attachment-view.c:341
+#: ../src/e-util/e-attachment-view.c:342
 msgid "A_dd Attachment..."
 msgstr "Do_daj prilog..."
 
-#: ../src/e-util/e-attachment-view.c:348
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1095
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1276
+#: ../src/e-util/e-attachment-view.c:349
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1101
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1316
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:605
 #: ../src/modules/calendar/e-task-shell-view-actions.c:731
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1664
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1735
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1645
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1716
 msgid "_Properties"
 msgstr "_Svojstva"
 
-#: ../src/e-util/e-attachment-view.c:658
+#: ../src/e-util/e-attachment-view.c:778
 #, c-format
-#| msgid "Open With \"%s\""
 msgid "Open With “%s”"
 msgstr "Otvori programom „%s“"
 
-#: ../src/e-util/e-attachment-view.c:661
+#: ../src/e-util/e-attachment-view.c:781
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Otvori ovaj prilog u „%s“"
@@ -12396,12 +12247,12 @@ msgstr "Sam dopunjava ovim adresarom"
 
 #: ../src/e-util/e-book-source-config.c:277
 msgid "Copy book content locally for offline operation"
-msgstr "Umnožava sadržaj knjige lokalno za rad van mreže"
+msgstr "Kopira sadržaj knjige lokalno za rad van mreže"
 
 #. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com";
 #: ../src/e-util/e-buffer-tagger.c:410
 msgid "Ctrl-click to open a link"
-msgstr "Pritisnite taster Ktrl i kliknite da otvorite vezu"
+msgstr "Pritisnite taster Ctrl i kliknite da otvorite vezu"
 
 #: ../src/e-util/e-calendar.c:272
 msgid "Previous month"
@@ -12459,35 +12310,35 @@ msgstr "Boja:"
 
 #: ../src/e-util/e-cal-source-config.c:428
 msgid "Copy calendar contents locally for offline operation"
-msgstr "Umnožava sadržaj kalendara lokalno za rad van mreže"
+msgstr "Kopira sadržaj kalendara lokalno za rad van mreže"
 
 #: ../src/e-util/e-cal-source-config.c:432
 msgid "Copy task list contents locally for offline operation"
-msgstr "Umnožava sadržaj spiska zadataka lokalno za rad van mreže"
+msgstr "Kopira sadržaj spiska zadataka lokalno za rad van mreže"
 
 #: ../src/e-util/e-cal-source-config.c:436
 msgid "Copy memo list contents locally for offline operation"
-msgstr "Umnožava sadržaj spiska beleški lokalno za rad van mreže"
+msgstr "Kopira sadržaj spiska beleški lokalno za rad van mreže"
 
-#: ../src/e-util/e-categories-editor.c:224
+#: ../src/e-util/e-categories-editor.c:246
 msgid "Currently _used categories:"
 msgstr "Trenutno _korišćene kategorije:"
 
-#: ../src/e-util/e-categories-editor.c:235
+#: ../src/e-util/e-categories-editor.c:257
 msgid "_Available Categories:"
 msgstr "_Dostupne kategorije:"
 
-#: ../src/e-util/e-categories-editor.c:275
+#: ../src/e-util/e-categories-editor.c:297
 msgctxt "category"
 msgid "_New"
 msgstr "_Nova"
 
-#: ../src/e-util/e-categories-editor.c:279
+#: ../src/e-util/e-categories-editor.c:301
 msgctxt "category"
 msgid "_Edit"
 msgstr "_Uređivanje"
 
-#: ../src/e-util/e-categories-editor.c:283
+#: ../src/e-util/e-categories-editor.c:305
 msgctxt "category"
 msgid "_Delete"
 msgstr "_Obriši"
@@ -12498,39 +12349,36 @@ msgstr "Ikonica"
 
 #: ../src/e-util/e-category-completion.c:304
 #, c-format
-#| msgid "Create category \"%s\""
 msgid "Create category “%s”"
 msgstr "Izrada kategorije „%s“"
 
-#: ../src/e-util/e-category-editor.c:135
+#: ../src/e-util/e-category-editor.c:138
 msgid "Category Icon"
 msgstr "Ikonica kategorije"
 
-#: ../src/e-util/e-category-editor.c:139
+#: ../src/e-util/e-category-editor.c:142
 msgid "_No Image"
 msgstr "_Bez slike"
 
-#: ../src/e-util/e-category-editor.c:172
+#: ../src/e-util/e-category-editor.c:175
 msgid "Category _Name"
 msgstr "_Naziv kategorije"
 
-#: ../src/e-util/e-category-editor.c:184
+#: ../src/e-util/e-category-editor.c:188
 msgid "Category _Icon"
 msgstr "_Ikonica kategorije"
 
-#: ../src/e-util/e-category-editor.c:210
+#: ../src/e-util/e-category-editor.c:214
 msgid "Category Properties"
 msgstr "Osobine kategorije"
 
-#: ../src/e-util/e-category-editor.c:271
+#: ../src/e-util/e-category-editor.c:275
 #, c-format
-#| msgid ""
-#| "There is already a category '%s' in the configuration. Please use another "
-#| "name"
 msgid ""
 "There is already a category “%s” in the configuration. Please use another "
 "name"
-msgstr "Već postoji kategorija „%s“ u podešavanjima. Molim izaberite drugi naziv"
+msgstr ""
+"Već postoji kategorija „%s“ u podešavanjima. Molim izaberite drugi naziv"
 
 #: ../src/e-util/e-cell-combo.c:183
 msgid "popup list"
@@ -12545,13 +12393,6 @@ msgstr "?"
 msgid "Now"
 msgstr "Sada"
 
-#. strftime format of a weekday and a date.
-#: ../src/e-util/e-cell-date-edit.c:328 ../src/e-util/e-datetime-format.c:206
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1791
-#: ../src/modules/itip-formatter/itip-view.c:253
-msgid "Today"
-msgstr "Danas"
-
 # 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.
@@ -12568,7 +12409,7 @@ msgstr "Ništa"
 msgid "OK"
 msgstr "U redu"
 
-#: ../src/e-util/e-cell-date-edit.c:897
+#: ../src/e-util/e-cell-date-edit.c:901
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Vreme mora biti u formatu: %s"
@@ -12669,7 +12510,6 @@ msgstr "Drugo..."
 
 #: ../src/e-util/e-client-cache.c:1149 ../src/e-util/e-client-cache.c:1280
 #, c-format
-#| msgid "Cannot create a client object from extension name '%s'"
 msgid "Cannot create a client object from extension name “%s”"
 msgstr "Ne mogu da napravim predmet programa iz naziva proširenja „%s“"
 
@@ -12838,9 +12678,9 @@ msgid "white"
 msgstr "bela"
 
 #: ../src/e-util/e-color-combo.c:642 ../src/mail/e-mail-account-tree-view.c:135
-#: ../src/mail/e-mail-config-security-page.c:406
-#: ../src/mail/e-mail-config-security-page.c:570
-#: ../src/mail/e-mail-reader.c:4049 ../src/mail/mail-config.ui.h:75
+#: ../src/mail/e-mail-config-security-page.c:404
+#: ../src/mail/e-mail-config-security-page.c:568
+#: ../src/mail/e-mail-reader.c:4043 ../src/mail/mail-config.ui.h:76
 msgid "Default"
 msgstr "Osnovno"
 
@@ -12856,21 +12696,21 @@ msgstr "Deo teksta za unos datuma"
 msgid "Click this button to show a calendar"
 msgstr "Pritisnite na ovo dugme da prikažete kalendar"
 
-#: ../src/e-util/e-dateedit.c:626
+#: ../src/e-util/e-dateedit.c:627
 msgid "Drop-down combination box to select time"
 msgstr "Prozorče za izbor vremena"
 
 # note(slobo): možda treba rok
-#: ../src/e-util/e-dateedit.c:627
+#: ../src/e-util/e-dateedit.c:628
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "Vreme"
 
-#: ../src/e-util/e-dateedit.c:701
+#: ../src/e-util/e-dateedit.c:702
 msgid "No_w"
 msgstr "_Sada"
 
-#: ../src/e-util/e-dateedit.c:708
+#: ../src/e-util/e-dateedit.c:709
 msgid "_Today"
 msgstr "_Danas"
 
@@ -12881,7 +12721,7 @@ msgstr "_Danas"
 # is not permitted.
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../src/e-util/e-dateedit.c:717
+#: ../src/e-util/e-dateedit.c:718
 msgid "_None"
 msgstr "_Ništa"
 
@@ -12892,25 +12732,19 @@ msgstr "_Ništa"
 # is not permitted.
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../src/e-util/e-dateedit.c:1839 ../src/e-util/e-dateedit.c:2087
+#: ../src/e-util/e-dateedit.c:1877 ../src/e-util/e-dateedit.c:2125
 msgctxt "date"
 msgid "None"
 msgstr "Ništa"
 
-#: ../src/e-util/e-dateedit.c:1979
+#: ../src/e-util/e-dateedit.c:2017
 msgid "Invalid Date Value"
 msgstr "Neispravan datum"
 
-#: ../src/e-util/e-dateedit.c:2024
+#: ../src/e-util/e-dateedit.c:2062
 msgid "Invalid Time Value"
 msgstr "Neispravno vreme"
 
-#. strftime format of a weekday and a date.
-#: ../src/e-util/e-datetime-format.c:217
-#: ../src/modules/itip-formatter/itip-view.c:281
-msgid "Tomorrow"
-msgstr "Sutra"
-
 #: ../src/e-util/e-datetime-format.c:219
 msgid "Yesterday"
 msgstr "Juče"
@@ -12976,34 +12810,30 @@ msgstr "Sledeće %a"
 msgid "Use locale default"
 msgstr "Koristi podrazumevani lokalitet"
 
-#: ../src/e-util/e-datetime-format.c:573
+#: ../src/e-util/e-datetime-format.c:592
 msgid "Format:"
 msgstr "Oblik:"
 
 #. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ days ]"
 #: ../src/e-util/e-dialog-widgets.c:181
-#| msgid "days"
 msgctxt "time-unit"
 msgid "days"
 msgstr "dana"
 
 #. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ weeks ]"
 #: ../src/e-util/e-dialog-widgets.c:183
-#| msgid "weeks"
 msgctxt "time-unit"
 msgid "weeks"
 msgstr "nedelje"
 
 #. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ months ]"
 #: ../src/e-util/e-dialog-widgets.c:185
-#| msgid "months"
 msgctxt "time-unit"
 msgid "months"
 msgstr "meseca"
 
 #. Translators: This is part of: "Do not synchronize locally mails older than [ xxx ] [ years ]"
 #: ../src/e-util/e-dialog-widgets.c:187
-#| msgid "years"
 msgctxt "time-unit"
 msgid "years"
 msgstr "godine"
@@ -13125,7 +12955,6 @@ msgstr "(Nepoznat naziv datoteke)"
 #. Translators: The string value is the basename of a file.
 #: ../src/e-util/e-file-utils.c:125
 #, c-format
-#| msgid "Writing \"%s\""
 msgid "Writing “%s”"
 msgstr "Upisujem „%s“"
 
@@ -13133,7 +12962,6 @@ msgstr "Upisujem „%s“"
 #. * remote file, the second string value is the hostname.
 #: ../src/e-util/e-file-utils.c:130
 #, c-format
-#| msgid "Writing \"%s\" to %s"
 msgid "Writing “%s” to %s"
 msgstr "Upisujem „%s“ u %s"
 
@@ -13318,10 +13146,11 @@ msgstr "Pronađite stavke koje zadovoljavaju sledeće uslove"
 #. name:
 #: ../src/e-util/e-filter-rule.c:858
 #: ../src/e-util/e-html-editor-page-dialog.c:59
-#: ../src/e-util/e-mail-identity-combo-box.c:597
+#: ../src/e-util/e-mail-identity-combo-box.c:694
 #: ../src/e-util/e-mail-signature-combo-box.c:422
-#: ../src/libemail-engine/camel-null-store.c:28
-#: ../src/mail/e-mail-config-summary-page.c:140
+#: ../src/libemail-engine/camel-null-store.c:29
+#: ../src/mail/e-mail-autoconfig.c:644
+#: ../src/mail/e-mail-config-summary-page.c:141
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:629
 msgid "None"
 msgstr "Ništa"
@@ -13390,7 +13219,7 @@ msgstr "Tekstualna datoteka"
 
 #: ../src/e-util/e-html-editor-actions.c:880
 msgid "Copy selected text to the clipboard"
-msgstr "Umnožava izabrani tekst u spisak isečaka"
+msgstr "Kopira izabrani tekst u spisak isečaka"
 
 #: ../src/e-util/e-html-editor-actions.c:887
 msgid "Cut selected text to the clipboard"
@@ -13534,32 +13363,26 @@ msgid "_Normal"
 msgstr "_Obično"
 
 #: ../src/e-util/e-html-editor-actions.c:1102
-#| msgid "Header _1"
 msgid "Heading _1"
 msgstr "Naslov _1"
 
 #: ../src/e-util/e-html-editor-actions.c:1109
-#| msgid "Header _2"
 msgid "Heading _2"
 msgstr "Naslov _2"
 
 #: ../src/e-util/e-html-editor-actions.c:1116
-#| msgid "Header _3"
 msgid "Heading _3"
 msgstr "Naslov _3"
 
 #: ../src/e-util/e-html-editor-actions.c:1123
-#| msgid "Header _4"
 msgid "Heading _4"
 msgstr "Naslov _4"
 
 #: ../src/e-util/e-html-editor-actions.c:1130
-#| msgid "Header _5"
 msgid "Heading _5"
 msgstr "Naslov _5"
 
 #: ../src/e-util/e-html-editor-actions.c:1137
-#| msgid "Header _6"
 msgid "Heading _6"
 msgstr "Naslov _6"
 
@@ -13863,19 +13686,19 @@ msgstr "_Pravilo"
 msgid "_Table"
 msgstr "_Tabela"
 
-#: ../src/e-util/e-html-editor.c:689
+#: ../src/e-util/e-html-editor.c:732
 msgid "Paragraph Style"
 msgstr "Stil pasusa"
 
-#: ../src/e-util/e-html-editor.c:703
+#: ../src/e-util/e-html-editor.c:746
 msgid "Editing Mode"
 msgstr "Režim za uređivanje"
 
-#: ../src/e-util/e-html-editor.c:715
+#: ../src/e-util/e-html-editor.c:758
 msgid "Font Color"
 msgstr "Boja fonta"
 
-#: ../src/e-util/e-html-editor.c:725
+#: ../src/e-util/e-html-editor.c:768
 msgid "Font Size"
 msgstr "Veličina fonta"
 
@@ -14248,7 +14071,6 @@ msgstr "Zameni"
 
 #: ../src/e-util/e-html-editor-spell-check-dialog.c:83
 #, c-format
-#| msgid "<b>Suggestions for '%s'</b>"
 msgid "<b>Suggestions for “%s”</b>"
 msgstr "<b>Predlog za „%s“</b>"
 
@@ -14292,7 +14114,7 @@ msgid "Add word"
 msgstr "Dodaj reč"
 
 #: ../src/e-util/e-html-editor-spell-check-dialog.c:505
-#: ../src/mail/mail-config.ui.h:39
+#: ../src/mail/mail-config.ui.h:40
 msgid "Spell Checking"
 msgstr "Provera pravopisa"
 
@@ -14314,6 +14136,7 @@ msgstr "_Okvir:"
 
 #: ../src/e-util/e-html-editor-table-dialog.c:686
 #: ../src/e-util/e-html-editor-text-dialog.c:248
+#: ../src/e-util/e-webdav-browser.c:2418
 msgid "_Color:"
 msgstr "_Boja:"
 
@@ -14364,15 +14187,11 @@ msgid "Import a _single file"
 msgstr "Uvezi _jednu datoteku"
 
 #: ../src/e-util/e-import-assistant.c:406
-#: ../src/modules/startup-wizard/e-mail-config-import-page.c:211
+#: ../src/modules/startup-wizard/e-mail-config-import-page.c:209
 msgid "Please select the information that you would like to import:"
 msgstr "Izaberite podatke koje želite da uvezete:"
 
 #: ../src/e-util/e-import-assistant.c:536
-#| msgid ""
-#| "Evolution checked for settings to import from the following applications: "
-#| "Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If "
-#| "you would like to try again, please click the \"Back\" button."
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
@@ -14383,7 +14202,7 @@ msgstr ""
 "ponovo, kliknite na dugme „Nazad“."
 
 #: ../src/e-util/e-import-assistant.c:562
-#: ../src/modules/startup-wizard/e-mail-config-import-page.c:240
+#: ../src/modules/startup-wizard/e-mail-config-import-page.c:238
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
@@ -14442,7 +14261,6 @@ msgid "Select a File"
 msgstr "Izaberite datoteku"
 
 #: ../src/e-util/e-import-assistant.c:1365
-#| msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgid "Click “Apply” to begin importing the file into Evolution."
 msgstr "Kliknite na „Primeni“ da započnete uvoz datoteke u Evoluciju."
 
@@ -14458,15 +14276,15 @@ msgstr "Zatvori"
 msgid "_Save and Close"
 msgstr "_Sačuvaj i zatvori"
 
-#: ../src/e-util/e-mail-signature-editor.c:559
+#: ../src/e-util/e-mail-signature-editor.c:558
 msgid "Edit Signature"
 msgstr "Uredi potpis"
 
-#: ../src/e-util/e-mail-signature-editor.c:592
+#: ../src/e-util/e-mail-signature-editor.c:591
 msgid "_Signature Name:"
 msgstr "Naziv _potpisa:"
 
-#: ../src/e-util/e-mail-signature-editor.c:628
+#: ../src/e-util/e-mail-signature-editor.c:627
 msgid "Unnamed"
 msgstr "Bez imena"
 
@@ -14522,25 +14340,21 @@ msgstr "Ne mogu da prikažem pomoć za Evoluciju."
 
 #: ../src/e-util/e-misc-utils.c:2501
 #, c-format
-#| msgid "Opening calendar '%s'"
 msgid "Opening calendar “%s”"
 msgstr "Otvaram kalendar „%s“"
 
 #: ../src/e-util/e-misc-utils.c:2504
 #, c-format
-#| msgid "Opening memo list '%s'"
 msgid "Opening memo list “%s”"
 msgstr "Otvaram spisak beleški „%s“"
 
 #: ../src/e-util/e-misc-utils.c:2507
 #, c-format
-#| msgid "Opening task list '%s'"
 msgid "Opening task list “%s”"
 msgstr "Otvaram spisak zadataka „%s“"
 
 #: ../src/e-util/e-misc-utils.c:2510
 #, c-format
-#| msgid "Opening address book '%s'"
 msgid "Opening address book “%s”"
 msgstr "Otvaram adresar „%s“"
 
@@ -14567,14 +14381,15 @@ msgstr "_Potraži:"
 
 #: ../src/e-util/e-name-selector-dialog.c:363
 #: ../src/e-util/e-name-selector-dialog.c:1330
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1181
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1624
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1187
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1675
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:758
 #: ../src/modules/calendar/e-task-shell-view-actions.c:931
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
 
 #: ../src/e-util/e-name-selector-dialog.c:365
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:338
 msgid "Co_ntacts"
 msgstr "Ko_ntakti"
 
@@ -14592,25 +14407,25 @@ msgid "Select Contacts from Address Book"
 msgstr "Izaberite kontakte iz adresara"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../src/e-util/e-name-selector-entry.c:3207
+#: ../src/e-util/e-name-selector-entry.c:3222
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "_Raširi %s unutar"
 
 #. Copy Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3223
+#: ../src/e-util/e-name-selector-entry.c:3238
 #, c-format
 msgid "Cop_y %s"
-msgstr "_Umnoži %s"
+msgstr "_Kopiraj %s"
 
 #. Cut Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3234
+#: ../src/e-util/e-name-selector-entry.c:3249
 #, c-format
 msgid "C_ut %s"
 msgstr "_Iseci %s"
 
 #. Edit Contact item
-#: ../src/e-util/e-name-selector-entry.c:3252
+#: ../src/e-util/e-name-selector-entry.c:3267
 #, c-format
 msgid "_Edit %s"
 msgstr "_Uredi %s"
@@ -14658,7 +14473,7 @@ msgstr "_Zapamti ovu lozinku"
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamti ovu lozinku do kraja ove sesije"
 
-#: ../src/e-util/e-preferences-window.c:319
+#: ../src/e-util/e-preferences-window.c:329
 msgid "Evolution Preferences"
 msgstr "Podešavanja Evolucije"
 
@@ -14971,7 +14786,7 @@ msgstr "Vrsta:"
 msgid "Name:"
 msgstr "Ime:"
 
-#: ../src/e-util/e-source-config.c:814
+#: ../src/e-util/e-source-config.c:814 ../src/e-util/e-webdav-browser.c:1748
 msgid "Name cannot be empty"
 msgstr "Ime ne može biti prazno"
 
@@ -15054,7 +14869,6 @@ msgstr "Dalje..."
 #. + Add to Dictionary
 #: ../src/e-util/e-spell-entry.c:588
 #, c-format
-#| msgid "Add \"%s\" to Dictionary"
 msgid "Add “%s” to Dictionary"
 msgstr "Dodaj „%s“ u rečnik"
 
@@ -15068,52 +14882,40 @@ msgid "Spelling Suggestions"
 msgstr "Predlozi pravopisa"
 
 #: ../src/e-util/e-system.error.xml.h:1
-#| msgid "A file named \"{0}\" already exists. Do you want to replace it?"
 msgid "A file named “{0}” already exists. Do you want to replace it?"
 msgstr "Datoteka pod nazivom „{0}“ već postoji. Da li želite da je zamenite?"
 
 #: ../src/e-util/e-system.error.xml.h:2
-#| msgid ""
-#| "The file already exists in \"{0}\". Replacing it will overwrite its "
-#| "contents."
 msgid ""
 "The file already exists in “{0}”. Replacing it will overwrite its contents."
 msgstr ""
 "Već postoji datoteka u „{0}“. Ukoliko je zamenite prepisaćete njen sadržaj."
 
 #: ../src/e-util/e-system.error.xml.h:4
-#| msgid "Cannot save file \"{0}\"."
 msgid "Cannot save file “{0}”."
 msgstr "Ne mogu da sačuvam datoteku „{0}“."
 
 #: ../src/e-util/e-system.error.xml.h:6
-#| msgid "Cannot open file \"{0}\"."
 msgid "Cannot open file “{0}”."
 msgstr "Ne mogu da otvorim datoteku „{0}“."
 
 #: ../src/e-util/e-system.error.xml.h:7
-#| msgid "Failed to remove data source &quot;{0}&quot;."
 msgid "Failed to remove data source “{0}”."
 msgstr "Ne mogu da uklonim izvor podataka „{0}“."
 
 #: ../src/e-util/e-system.error.xml.h:8 ../src/mail/mail.error.xml.h:64
-#| msgid "The reported error was &quot;{1}&quot;."
 msgid "The reported error was “{1}”."
 msgstr "Prijavljena greška bejaše „{1}“."
 
 #: ../src/e-util/e-system.error.xml.h:9
-#| msgid "Failed to update data source &quot;{0}&quot;."
 msgid "Failed to update data source “{0}”."
 msgstr "Ne mogu da osvežim izvor podataka „{0}“."
 
 #: ../src/e-util/e-system.error.xml.h:10
-#| msgid "Failed to delete resource &quot;{0}&quot;."
 msgid "Failed to delete resource “{0}”."
 msgstr "Ne mogu da obrišem resurs „{0}“."
 
 #: ../src/e-util/e-system.error.xml.h:11
-#| msgid ""
-#| "The address book backend servicing &quot;{0}&quot; has quit unexpectedly."
 msgid "The address book backend servicing “{0}” has quit unexpectedly."
 msgstr "Pozadinac adresara koji uslužuje „{0}“ je neočekivano prestao da radi."
 
@@ -15125,10 +14927,9 @@ msgstr ""
 "pokrene."
 
 #: ../src/e-util/e-system.error.xml.h:13
-#| msgid ""
-#| "The calendar backend servicing &quot;{0}&quot; has quit unexpectedly."
 msgid "The calendar backend servicing “{0}” has quit unexpectedly."
-msgstr "Pozadinac kalendara koji uslužuje „{0}“ je neočekivano prestao da radi."
+msgstr ""
+"Pozadinac kalendara koji uslužuje „{0}“ je neočekivano prestao da radi."
 
 #: ../src/e-util/e-system.error.xml.h:14
 msgid ""
@@ -15138,8 +14939,6 @@ msgstr ""
 "pokrene."
 
 #: ../src/e-util/e-system.error.xml.h:15
-#| msgid ""
-#| "The memo list backend servicing &quot;{0}&quot; has quit unexpectedly."
 msgid "The memo list backend servicing “{0}” has quit unexpectedly."
 msgstr ""
 "Pozadinac spiska beleški koji uslužuje „{0}“ je neočekivano prestao da radi."
@@ -15150,8 +14949,6 @@ msgstr ""
 "Neke od vaših beleški neće biti dostupne dok se Evolucija ponovo ne pokrene."
 
 #: ../src/e-util/e-system.error.xml.h:17
-#| msgid ""
-#| "The task list backend servicing &quot;{0}&quot; has quit unexpectedly."
 msgid "The task list backend servicing “{0}” has quit unexpectedly."
 msgstr ""
 "Pozadinac spiska zadataka koji uslužuje „{0}“ je neočekivano prestao da radi."
@@ -15162,25 +14959,18 @@ msgstr ""
 "Neki od vaših zadataka neće biti dostupni dok se Evolucija ponovo ne pokrene."
 
 #: ../src/e-util/e-system.error.xml.h:19
-#| msgid ""
-#| "The address book backend servicing &quot;{0}&quot; encountered an error."
 msgid "The address book backend servicing “{0}” encountered an error."
 msgstr "Pozadinac adresara koji uslužuje „{0}“ je naišao na grešku."
 
 #: ../src/e-util/e-system.error.xml.h:20
-#| msgid "The calendar backend servicing &quot;{0}&quot; encountered an error."
 msgid "The calendar backend servicing “{0}” encountered an error."
 msgstr "Pozadinac kalendara koji uslužuje „{0}“ je naišao na grešku."
 
 #: ../src/e-util/e-system.error.xml.h:21
-#| msgid ""
-#| "The memo list backend servicing &quot;{0}&quot; encountered an error."
 msgid "The memo list backend servicing “{0}” encountered an error."
 msgstr "Pozadinac spiska beleški koji uslužuje „{0}“ je naišao na grešku."
 
 #: ../src/e-util/e-system.error.xml.h:22
-#| msgid ""
-#| "The task list backend servicing &quot;{0}&quot; encountered an error."
 msgid "The task list backend servicing “{0}” encountered an error."
 msgstr "Pozadinac spiska zadataka koji uslužuje „{0}“ je naišao na grešku."
 
@@ -15198,6 +14988,18 @@ msgstr ""
 "ponovo tako što ćete ponovo otvoriti prozor. Ako ni to ne pomaže, popunite "
 "izveštaj o grešci na Gnomovoj bubaždaji."
 
+#: ../src/e-util/e-system.error.xml.h:25
+msgid "Are you sure you want to delete remote collection “{0}”?"
+msgstr "Sigurno želite da obrišete udaljenu zbirku „{0}“?"
+
+#: ../src/e-util/e-system.error.xml.h:26
+msgid ""
+"This will permanently remove the collection “{0}” from the server. Are you "
+"sure you want to proceed?"
+msgstr ""
+"Ovo će trajno ukloniti zbirku „{0}“ sa servera. Da li ste sigurni da želite "
+"da nastavite?"
+
 #: ../src/e-util/e-table-click-to-add.c:687
 #: ../src/e-util/gal-a11y-e-table-click-to-add.c:59
 #: ../src/e-util/gal-a11y-e-table-click-to-add.c:140
@@ -15439,7 +15241,7 @@ msgid ""
 "zone.\n"
 "Use the right mouse button to zoom out."
 msgstr ""
-"Koristite levi taster miša da uvećate mapu i izaberete vremensku zonu.\n"
+"Koristite levi taster miša da uvećate kartu i izaberete vremensku zonu.\n"
 "Koristite desni taster miša za umanjivanje."
 
 #: ../src/e-util/e-timezone-dialog.ui.h:6
@@ -15476,17 +15278,158 @@ msgid "Flags"
 msgstr "Opcije"
 
 #: ../src/e-util/evolution-source-viewer.c:729
-#: ../src/mail/e-mail-config-identity-page.c:1148
+#: ../src/mail/e-mail-config-identity-page.c:1230
 msgid "Identity"
 msgstr "Identitet"
 
+#: ../src/e-util/e-webdav-browser.c:447
+msgid "Address book"
+msgstr "Adresar"
+
+#: ../src/e-util/e-webdav-browser.c:458
+msgid "Events"
+msgstr "Događaji"
+
+#: ../src/e-util/e-webdav-browser.c:473
+msgid "Collection"
+msgstr "Zbirka"
+
+#: ../src/e-util/e-webdav-browser.c:514
+msgid "Loading…"
+msgstr "Učitavam…"
+
+#: ../src/e-util/e-webdav-browser.c:1383
+msgid "Searching collection children…"
+msgstr "Pretražujem decu zbirke…"
+
+#: ../src/e-util/e-webdav-browser.c:1385
+msgid "Failed to search for collection children"
+msgstr "Nisam uspeo da pretražim decu zbirke"
+
+#: ../src/e-util/e-webdav-browser.c:1419
+msgid "Searching for user home, please wait…"
+msgstr "Tražim ličnu fasciklu korisnika, sačekajte…"
+
+#: ../src/e-util/e-webdav-browser.c:1421
+msgid "Failed to search for user home"
+msgstr "Ne mogu da nađem ličnu fasciklu korisnika"
+
+#: ../src/e-util/e-webdav-browser.c:1763
+msgid "At least one component type should be set"
+msgstr "Najmanje jedna vrsta dela bi trebala biti podešena"
+
+#: ../src/e-util/e-webdav-browser.c:1781
+msgid "Failed to get selected collection HREF"
+msgstr "Nisam uspeo da dobavim odabranu zbirku HREF"
+
+#: ../src/e-util/e-webdav-browser.c:1812
+msgid "Saving changes…"
+msgstr "Čuvam izmene…"
+
+#: ../src/e-util/e-webdav-browser.c:1813
+msgid "Failed to save changes"
+msgstr "Nisam uspeo da sačuvam izmene"
+
+#: ../src/e-util/e-webdav-browser.c:1815
+msgid "Creating new book…"
+msgstr "Pravim novu knjigu…"
+
+# bug: plural-forms
+#: ../src/e-util/e-webdav-browser.c:1816
+msgid "Failed to create new book"
+msgstr "Ne mogu da napravim novu knjigu"
+
+#: ../src/e-util/e-webdav-browser.c:1818
+msgid "Creating new calendar…"
+msgstr "Pravim novi kalendar…"
+
+#: ../src/e-util/e-webdav-browser.c:1819
+msgid "Failed to create new calendar"
+msgstr "Nisam uspeo da napravim novi kalendar"
+
+#: ../src/e-util/e-webdav-browser.c:1821
+msgid "Creating new collection…"
+msgstr "Pravim novu zbirku…"
+
+# bug: plural-forms
+#: ../src/e-util/e-webdav-browser.c:1822
+msgid "Failed to create new collection"
+msgstr "Ne mogu da napravim zbirku"
+
+#: ../src/e-util/e-webdav-browser.c:1961
+msgid "It is not allowed to create book under another book or calendar"
+msgstr "Nije dozvoljeno pravljenje knjige u drugoj knjizi ili kalendaru."
+
+#. if (button == webdav_browser->priv->create_calendar_button)
+#: ../src/e-util/e-webdav-browser.c:1963
+msgid "It is not allowed to create calendar under another book or calendar"
+msgstr "Nije dozvoljeno pravljenje kalendara u drugoj knjizi ili kalendaru"
+
+#: ../src/e-util/e-webdav-browser.c:2189
+msgid "Deleting book…"
+msgstr "Brišem knjigu…"
+
+#: ../src/e-util/e-webdav-browser.c:2190
+msgid "Failed to delete book"
+msgstr "Ne mogu da obrišem knjigu"
+
+#: ../src/e-util/e-webdav-browser.c:2193
+msgid "Deleting calendar…"
+msgstr "Brišem kalendar…"
+
+#: ../src/e-util/e-webdav-browser.c:2194
+msgid "Failed to delete calendar"
+msgstr "Nisam uspeo da obrišem kalendar"
+
+#: ../src/e-util/e-webdav-browser.c:2197
+msgid "Deleting collection…"
+msgstr "Brišem zbirku…"
+
+#: ../src/e-util/e-webdav-browser.c:2198
+msgid "Failed to delete collection"
+msgstr "Nisam uspeo da obrišem zbirku"
+
+#: ../src/e-util/e-webdav-browser.c:2429
+msgid "For Components:"
+msgstr "Za delove:"
+
+#: ../src/e-util/e-webdav-browser.c:2435
+msgid "_Events"
+msgstr "_Događaji"
+
+#: ../src/e-util/e-webdav-browser.c:2625
+msgid "WebDAV server:"
+msgstr "WebDAV server:"
+
+#: ../src/e-util/e-webdav-browser.c:2660
+msgid "Create _Book"
+msgstr "Napravi belešk_u"
+
+#: ../src/e-util/e-webdav-browser.c:2667
+msgid "Create _Calendar"
+msgstr "_Napravi kalendar"
+
+#: ../src/e-util/e-webdav-browser.c:2674
+msgid "Create Collectio_n"
+msgstr "Napravi _zbirku"
+
+#. widget = gtk_button_new_with_mnemonic (_("_Permissions"));
+#. gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+#. webdav_browser->priv->permissions_button = widget;
+#: ../src/e-util/e-webdav-browser.c:2699
+#: ../src/mail/em-subscription-editor.c:1976
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1652
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1723
+msgid "_Refresh"
+msgstr "_Osveži"
+
 #: ../src/e-util/e-web-view.c:346
 msgid "_Copy Link Location"
-msgstr "_Umnoži mesto veze"
+msgstr "_Kopiraj mesto veze"
 
 #: ../src/e-util/e-web-view.c:348
 msgid "Copy the link to the clipboard"
-msgstr "Umnožava vezu u spisak isečaka"
+msgstr "Kopira vezu u spisak isečaka"
 
 #: ../src/e-util/e-web-view.c:356
 msgid "_Open Link in Browser"
@@ -15498,23 +15441,23 @@ msgstr "Otvori vezu u veb pretraživaču"
 
 #: ../src/e-util/e-web-view.c:366
 msgid "_Copy Email Address"
-msgstr "_Umnoži e-adresu"
+msgstr "_Kopiraj e-adresu"
 
 #: ../src/e-util/e-web-view.c:373
 msgid "Copy _Raw Email Address"
-msgstr "Umnoži sa_mo e-adresu"
+msgstr "Kopiraj sa_mo e-adresu"
 
 #: ../src/e-util/e-web-view.c:375
 msgid "Copy the raw email address to the clipboard"
-msgstr "Umnožava samo čistu adresu elektronske pošte u spisak isečaka"
+msgstr "Kopira samo čistu adresu elektronske pošte u spisak isečaka"
 
 #: ../src/e-util/e-web-view.c:390
 msgid "_Copy Image"
-msgstr "_Umnoži sliku"
+msgstr "_Kopiraj sliku"
 
 #: ../src/e-util/e-web-view.c:392
 msgid "Copy the image to the clipboard"
-msgstr "Umnožite sliku u ostavu"
+msgstr "Kopira sliku u ostavu"
 
 #: ../src/e-util/e-web-view.c:397
 msgid "Save _Image..."
@@ -15524,70 +15467,64 @@ msgstr "Sačuvaj _sliku..."
 msgid "Save the image to a file"
 msgstr "Sačuvajte sliku u datoteku"
 
-#: ../src/e-util/e-web-view.c:419 ../src/e-util/e-web-view.c:1964
+#: ../src/e-util/e-web-view.c:419 ../src/e-util/e-web-view.c:1999
 msgid "Select all text and images"
 msgstr "Izaberi sav tekst i slike"
 
-#: ../src/e-util/e-web-view.c:1322
+#: ../src/e-util/e-web-view.c:1354
 #, c-format
 msgid "Click to call %s"
 msgstr "Kliknite da pozovete %s"
 
-#: ../src/e-util/e-web-view.c:1324
+#: ../src/e-util/e-web-view.c:1356
 msgid "Click to hide/unhide addresses"
 msgstr "Kliknite da sakrijete/otkrijete adrese"
 
-#: ../src/e-util/e-web-view.c:1335
+#: ../src/e-util/e-web-view.c:1367
 #, c-format
 msgid "Go to the section %s of the message"
 msgstr "Idi na odeljak %s ove poruke"
 
-#: ../src/e-util/e-web-view.c:1337
+#: ../src/e-util/e-web-view.c:1369
 msgid "Go to the beginning of the message"
 msgstr "Idi na početak poruke"
 
-#: ../src/e-util/e-web-view.c:1341
+#: ../src/e-util/e-web-view.c:1373
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknite da otvorite %s"
 
-#: ../src/e-util/e-web-view.c:3875
+#: ../src/e-util/e-web-view.c:3906
 msgid "Copying image to clipboard"
-msgstr "Umnožavam sliku u ostavu"
+msgstr "Kopiram sliku u ostavu"
 
-#: ../src/e-util/e-web-view.c:4063
+#: ../src/e-util/e-web-view.c:4094
 msgid "Save Image"
 msgstr "Sačuvaj sliku"
 
-#: ../src/e-util/e-web-view.c:4104
+#: ../src/e-util/e-web-view.c:4135
 #, c-format
-#| msgid "Saving image to '%s'"
 msgid "Saving image to “%s”"
 msgstr "Čuvam sliku u „%s“"
 
-#: ../src/e-util/e-web-view.c:4199
+#: ../src/e-util/e-web-view.c:4230
 #, c-format
-#| msgid "Cannot get URI '%s', do not know how to download it."
 msgid "Cannot get URI “%s”, do not know how to download it."
 msgstr "Ne mogu da dobavim putanju „%s“, ne znam kako da je preuzmem."
 
 #: ../src/e-util/e-widget-undo.c:428
-#| msgid "Undo 'Insert text'"
 msgid "Undo “Insert text”"
 msgstr "Poništi „Umetni tekst“"
 
 #: ../src/e-util/e-widget-undo.c:430
-#| msgid "Redo 'Insert text'"
 msgid "Redo “Insert text”"
 msgstr "Povrati „Umetni tekst“"
 
 #: ../src/e-util/e-widget-undo.c:444
-#| msgid "Undo 'Delete text'"
 msgid "Undo “Delete text”"
 msgstr "Poništi „Obriši tekst“"
 
 #: ../src/e-util/e-widget-undo.c:446
-#| msgid "Redo 'Delete text'"
 msgid "Redo “Delete text”"
 msgstr "Povrati „Obriši tekst“"
 
@@ -15609,17 +15546,14 @@ msgid "You must specify a filename."
 msgstr "Morate dati naziv datoteci."
 
 #: ../src/e-util/filter.error.xml.h:5
-#| msgid "File &quot;{0}&quot; does not exist or is not a regular file."
 msgid "File “{0}” does not exist or is not a regular file."
 msgstr "Datoteka „{0}“ ne postoji ili nije regularna."
 
 #: ../src/e-util/filter.error.xml.h:6
-#| msgid "Bad regular expression &quot;{0}&quot;."
 msgid "Bad regular expression “{0}”."
 msgstr "Loš regularan izraz „{0}“."
 
 #: ../src/e-util/filter.error.xml.h:7
-#| msgid "Could not compile regular expression &quot;{1}&quot;."
 msgid "Could not compile regular expression “{1}”."
 msgstr "Ne mogu da prevedem regularan izraz „{1}“."
 
@@ -15633,7 +15567,6 @@ msgid "You must name this filter."
 msgstr "Morate dati ime ovom filteru."
 
 #: ../src/e-util/filter.error.xml.h:10
-#| msgid "Name &quot;{0}&quot; already used."
 msgid "Name “{0}” already used."
 msgstr "Naziv „{0}“ je već upotrebljen."
 
@@ -15658,7 +15591,6 @@ msgid "One or more values cannot be empty."
 msgstr "Jedna ili više vrednosti ne mogu biti prazne."
 
 #: ../src/e-util/filter.error.xml.h:16
-#| msgid "Are you sure you want to remove rule '{0}'?"
 msgid "Are you sure you want to remove rule “{0}”?"
 msgstr "Sigurno želite da uklonite pravilo „{0}“?"
 
@@ -15679,7 +15611,7 @@ msgid "a time relative to the current time"
 msgstr "vreme u odnosu na trenutno vreme"
 
 # bug: plural-forms
-#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:92
+#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:93
 msgid "seconds"
 msgstr "sekunde"
 
@@ -15710,9 +15642,6 @@ msgid "Compare against"
 msgstr "Uporedi sa"
 
 #: ../src/e-util/filter.ui.h:15
-#| msgid ""
-#| "The message's date will be compared against\n"
-#| "the current time when filtering occurs."
 msgid ""
 "The message’s date will be compared against\n"
 "the current time when filtering occurs."
@@ -15721,9 +15650,6 @@ msgstr ""
 "trenutnim vremenom kada se filtriranje desilo."
 
 #: ../src/e-util/filter.ui.h:17
-#| msgid ""
-#| "The message's date will be compared against\n"
-#| "12:00am of the date specified."
 msgid ""
 "The message’s date will be compared against\n"
 "12:00am of the date specified."
@@ -15732,9 +15658,6 @@ msgstr ""
 "00:00 navedenog datuma."
 
 #: ../src/e-util/filter.ui.h:19
-#| msgid ""
-#| "The message's date will be compared against\n"
-#| "a time relative to when filtering occurs."
 msgid ""
 "The message’s date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -15799,7 +15722,7 @@ msgstr "_Napravi novi pregled"
 msgid "_Replace existing view"
 msgstr "_Zameni postojeći pregled"
 
-#: ../src/e-util/widgets.error.xml.h:1 ../src/mail/mail.error.xml.h:201
+#: ../src/e-util/widgets.error.xml.h:1 ../src/mail/mail.error.xml.h:203
 msgid "Do you wish to save your changes?"
 msgstr "Da li želite da sačuvate izmene?"
 
@@ -15807,7 +15730,7 @@ msgstr "Da li želite da sačuvate izmene?"
 msgid "This signature has been changed, but has not been saved."
 msgstr "Ovaj potpis je promenjen, ali nije sačuvan."
 
-#: ../src/e-util/widgets.error.xml.h:3 ../src/mail/mail.error.xml.h:203
+#: ../src/e-util/widgets.error.xml.h:3 ../src/mail/mail.error.xml.h:205
 msgid "_Discard changes"
 msgstr "_Odbaci izmene"
 
@@ -15821,7 +15744,7 @@ msgstr "Dajte jedno jedinstveno ime koje predstavlja ovaj potpis."
 
 #: ../src/e-util/widgets.error.xml.h:6
 msgid "Unable to copy image to clipboard."
-msgstr "Ne mogu da umnožim sliku u ostavu."
+msgstr "Ne mogu da kopiram sliku u ostavu."
 
 #: ../src/e-util/widgets.error.xml.h:7
 msgid "Unable to save image."
@@ -15857,7 +15780,6 @@ msgstr ""
 
 #: ../src/libemail-engine/e-mail-folder-utils.c:106
 #, c-format
-#| msgid "Saving message to folder '%s'"
 msgid "Saving message to folder “%s”"
 msgstr "Čuvam poruku u fasciklu „%s“"
 
@@ -15881,13 +15803,11 @@ msgstr "Tražim duplikate u porukama"
 
 #: ../src/libemail-engine/e-mail-folder-utils.c:1150
 #, c-format
-#| msgid "Removing folder '%s'"
 msgid "Removing folder “%s”"
 msgstr "Uklanjam fasciklu „%s“"
 
 #: ../src/libemail-engine/e-mail-folder-utils.c:1331
 #, c-format
-#| msgid "File \"%s\" has been removed."
 msgid "File “%s” has been removed."
 msgstr "Datoteka „%s“ je uklonjena."
 
@@ -15910,14 +15830,13 @@ msgstr[3] "Čuvam jednu poruku"
 
 #: ../src/libemail-engine/e-mail-folder-utils.c:1961
 #, c-format
-#| msgid "Invalid folder URI '%s'"
 msgid "Invalid folder URI “%s”"
 msgstr "Neispravna putanja fascikle „%s“"
 
 #. Some local folders
 #: ../src/libemail-engine/e-mail-session.c:125
 #: ../src/mail/em-folder-properties.c:1150
-#: ../src/mail/em-folder-tree-model.c:1236
+#: ../src/mail/em-folder-tree-model.c:1237
 #: ../src/mail/importers/kmail-libs.c:139
 #: ../src/modules/mail/e-mail-shell-view-private.c:1026
 #: ../src/modules/mail/e-mail-shell-view-private.c:1037
@@ -15926,7 +15845,7 @@ msgstr "Sanduče"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
 #: ../src/libemail-engine/e-mail-session.c:126
-#: ../src/mail/em-folder-tree-model.c:1229
+#: ../src/mail/em-folder-tree-model.c:1230
 #: ../src/mail/importers/kmail-libs.c:145
 #: ../src/modules/mail/e-mail-shell-view-private.c:1024
 msgid "Drafts"
@@ -15934,7 +15853,7 @@ msgstr "Nacrti"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
 #: ../src/libemail-engine/e-mail-session.c:127
-#: ../src/mail/em-folder-tree-model.c:1240
+#: ../src/mail/em-folder-tree-model.c:1241
 #: ../src/mail/importers/kmail-libs.c:141
 #: ../src/modules/mail/e-mail-shell-view-private.c:1028
 msgid "Outbox"
@@ -15942,7 +15861,7 @@ msgstr "Za slanje"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
 #: ../src/libemail-engine/e-mail-session.c:128
-#: ../src/mail/em-folder-tree-model.c:1244
+#: ../src/mail/em-folder-tree-model.c:1245
 #: ../src/mail/importers/kmail-libs.c:143
 #: ../src/modules/mail/e-mail-shell-view-private.c:1030
 msgid "Sent"
@@ -15950,7 +15869,7 @@ msgstr "Poslato"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
 #: ../src/libemail-engine/e-mail-session.c:129
-#: ../src/mail/em-folder-tree-model.c:1232
+#: ../src/mail/em-folder-tree-model.c:1233
 #: ../src/mail/importers/kmail-libs.c:147
 #: ../src/modules/mail/e-mail-shell-view-private.c:1032
 #: ../src/plugins/templates/e-templates-store.c:2212
@@ -15977,41 +15896,35 @@ msgstr "Nije pronađen identitet za korišćenje, prosleđivanje poruke je otkaz
 
 #: ../src/libemail-engine/e-mail-session.c:2444
 #, c-format
-#| msgid "Waiting for '%s'"
 msgid "Waiting for “%s”"
 msgstr "Čekam na „%s“"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:524
+#: ../src/libemail-engine/e-mail-session-utils.c:526
 msgid "No mail transport service available"
 msgstr "Nema dostupne usluge prenosa pošte"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:614
+#: ../src/libemail-engine/e-mail-session-utils.c:616
 #: ../src/libemail-engine/mail-ops.c:706
 #, c-format
-#| msgid "Posting message to '%s'"
 msgid "Posting message to “%s”"
 msgstr "Kačim poruku na „%s“"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:651
+#: ../src/libemail-engine/e-mail-session-utils.c:653
 #: ../src/libemail-engine/mail-ops.c:742
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Neuspela primena odlaznih propusnika: %s"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:681
-#: ../src/libemail-engine/e-mail-session-utils.c:716
-#: ../src/libemail-engine/mail-ops.c:766 ../src/libemail-engine/mail-ops.c:801
+#: ../src/libemail-engine/e-mail-session-utils.c:686
+#: ../src/libemail-engine/e-mail-session-utils.c:721
+#: ../src/libemail-engine/mail-ops.c:770 ../src/libemail-engine/mail-ops.c:805
 #, c-format
-#| msgid "Storing sent message to '%s'"
 msgid "Storing sent message to “%s”"
 msgstr "Čuvam poslatu poruku u „%s“"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:705
-#: ../src/libemail-engine/mail-ops.c:790
+#: ../src/libemail-engine/e-mail-session-utils.c:710
+#: ../src/libemail-engine/mail-ops.c:794
 #, c-format
-#| msgid ""
-#| "Failed to append to %s: %s\n"
-#| "Appending to local 'Sent' folder instead."
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local “Sent” folder instead."
@@ -16019,33 +15932,29 @@ msgstr ""
 "Ne mogu da prikačim u %s: %s\n"
 "Umesto toga prikačiću u lokalnu fasciklu „Poslato“."
 
-#: ../src/libemail-engine/e-mail-session-utils.c:735
-#: ../src/libemail-engine/mail-ops.c:818
+#: ../src/libemail-engine/e-mail-session-utils.c:740
+#: ../src/libemail-engine/mail-ops.c:822
 #, c-format
-#| msgid "Failed to append to local 'Sent' folder: %s"
 msgid "Failed to append to local “Sent” folder: %s"
 msgstr "Ne mogu da prikačim u lokalnu fasciklu „Poslato“: %s"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:923
-#: ../src/libemail-engine/mail-ops.c:978 ../src/libemail-engine/mail-ops.c:1080
+#: ../src/libemail-engine/e-mail-session-utils.c:928
+#: ../src/libemail-engine/mail-ops.c:983 ../src/libemail-engine/mail-ops.c:1085
 msgid "Sending message"
 msgstr "Slanje poruke"
 
 #: ../src/libemail-engine/e-mail-store-utils.c:188
 #, c-format
-#| msgid "Disconnecting from '%s'"
 msgid "Disconnecting from “%s”"
 msgstr "Prekidanje veze sa „%s“"
 
 #: ../src/libemail-engine/e-mail-store-utils.c:264
 #, c-format
-#| msgid "Reconnecting to '%s'"
 msgid "Reconnecting to “%s”"
 msgstr "Ponovno povezivanje na „%s“"
 
 #: ../src/libemail-engine/e-mail-store-utils.c:349
 #, c-format
-#| msgid "Preparing account '%s' for offline"
 msgid "Preparing account “%s” for offline"
 msgstr "Pripremam nalog „%s“ za rad van mreže"
 
@@ -16057,8 +15966,8 @@ msgstr "Filtriranje izabranih poruka"
 #, c-format
 msgid ""
 "Failed to filter selected messages. One reason can be that folder location "
-"set in one or more filters is invalid. Please check your filters in Edit-"
-">Message Filters.\n"
+"set in one or more filters is invalid. Please check your filters in "
+"Edit→Message Filters.\n"
 "Original error was: %s"
 msgstr ""
 "Ne mogu da izdvojim izabrane poruke. Jedan od razloga može biti i taj da je "
@@ -16068,7 +15977,6 @@ msgstr ""
 
 #: ../src/libemail-engine/mail-ops.c:226
 #, c-format
-#| msgid "Fetching mail from '%s'"
 msgid "Fetching mail from “%s”"
 msgstr "Preuzimam poštu sa „%s“"
 
@@ -16076,8 +15984,8 @@ msgstr "Preuzimam poštu sa „%s“"
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
-"in one or more filters is invalid. Please check your filters in Edit-"
-">Message Filters.\n"
+"in one or more filters is invalid. Please check your filters in Edit→Message "
+"Filters.\n"
 "Original error was: %s"
 msgstr ""
 "Ne mogu da primenim odlazne filtere. Jedan od razloga može biti i taj da je "
@@ -16085,7 +15993,7 @@ msgstr ""
 "filtere u izborniku „Uređivanje—>Filteri poruka“.\n"
 "Izvorna greška beše: %s"
 
-#: ../src/libemail-engine/mail-ops.c:989
+#: ../src/libemail-engine/mail-ops.c:994
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Šaljem poruku %d od %d"
@@ -16094,7 +16002,7 @@ msgstr "Šaljem poruku %d od %d"
 #. Translators: The string is distinguished by total
 #. * count of messages to be sent.  Failed messages is
 #. * always more than zero.
-#: ../src/libemail-engine/mail-ops.c:1041
+#: ../src/libemail-engine/mail-ops.c:1046
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
@@ -16103,75 +16011,77 @@ msgstr[1] "Ne mogu da pošaljem %d od %d poruka"
 msgstr[2] "Ne mogu da pošaljem %d od %d poruka"
 msgstr[3] "Ne mogu da pošaljem %d od %d poruke"
 
-#: ../src/libemail-engine/mail-ops.c:1047
+#: ../src/libemail-engine/mail-ops.c:1052
 msgid "Cancelled."
 msgstr "Otkazano."
 
-#: ../src/libemail-engine/mail-ops.c:1049
+#: ../src/libemail-engine/mail-ops.c:1054
 msgid "Complete."
 msgstr "Završeno."
 
-#: ../src/libemail-engine/mail-ops.c:1164
+#: ../src/libemail-engine/mail-ops.c:1169
 #, c-format
-#| msgid "Moving messages to '%s'"
 msgid "Moving messages to “%s”"
 msgstr "Premeštam poruke u „%s“"
 
-#: ../src/libemail-engine/mail-ops.c:1165
+#: ../src/libemail-engine/mail-ops.c:1170
 #, c-format
-#| msgid "Copying messages to '%s'"
 msgid "Copying messages to “%s”"
-msgstr "Umnožavam poruke u „%s“"
+msgstr "Kopiram poruke u „%s“"
 
-#: ../src/libemail-engine/mail-ops.c:1284
+#: ../src/libemail-engine/mail-ops.c:1289
 #, c-format
-#| msgid "Storing folder '%s'"
 msgid "Storing folder “%s”"
 msgstr "Smeštam fasciklu „%s“"
 
-#: ../src/libemail-engine/mail-ops.c:1412
+#: ../src/libemail-engine/mail-ops.c:1417
 #, c-format
-#| msgid "Expunging and storing account '%s'"
 msgid "Expunging and storing account “%s”"
 msgstr "Praznim i smeštam nalog „%s“"
 
-#: ../src/libemail-engine/mail-ops.c:1413
+#: ../src/libemail-engine/mail-ops.c:1418
 #, c-format
-#| msgid "Storing account '%s'"
 msgid "Storing account “%s”"
 msgstr "Smeštam nalog „%s“"
 
-#: ../src/libemail-engine/mail-ops.c:1488
+#: ../src/libemail-engine/mail-ops.c:1493
 #, c-format
-#| msgid "Emptying trash in '%s'"
 msgid "Emptying trash in “%s”"
 msgstr "Izbacujem smeće u „%s“"
 
-#: ../src/libemail-engine/mail-ops.c:1580
+#: ../src/libemail-engine/mail-ops.c:1585
 #, c-format
-#| msgid "Processing folder changes in '%s'"
 msgid "Processing folder changes in “%s”"
 msgstr "Obrađujem izmene fascikle u „%s“"
 
 #: ../src/libemail-engine/mail-tools.c:68
 #, c-format
-#| msgid "Could not create spool directory '%s': %s"
 msgid "Could not create spool directory “%s”: %s"
 msgstr "Ne mogu da napravim direktorijum za pripremu „%s“: %s"
 
 #: ../src/libemail-engine/mail-tools.c:108
 #, c-format
-#| msgid "Trying to movemail a non-mbox source '%s'"
 msgid "Trying to movemail a non-mbox source “%s”"
 msgstr "Pokušavam da premestim poštu iz ne-mboks izvora „%s“"
 
-#: ../src/libemail-engine/mail-tools.c:257
+#. Translators: This is a subject attribution for forwarded messages. The %s is replaced with subject of the 
original message.
+#: ../src/libemail-engine/mail-tools.c:193
+#, c-format
+msgid "[Fwd: %s]"
+msgstr "[Prosleđeno: %s]"
+
+#. Translators: This is a subject attribution for forwarded messages, used when there could not be used any 
subject.
+#. It results in "[Fwd: No Subject]" being used as a subject of the forwarded message.
+#: ../src/libemail-engine/mail-tools.c:196
+msgid "No Subject"
+msgstr "Bez imena primaoca"
+
+#: ../src/libemail-engine/mail-tools.c:271
 #, c-format
-#| msgid "Forwarded message - %s"
 msgid "Forwarded message — %s"
 msgstr "Prosleđena poruka — %s"
 
-#: ../src/libemail-engine/mail-tools.c:259
+#: ../src/libemail-engine/mail-tools.c:273
 msgid "Forwarded message"
 msgstr "Prosleđena poruka"
 
@@ -16182,7 +16092,6 @@ msgstr "Podešavanje fascikle pretrage: %s"
 
 #: ../src/libemail-engine/mail-vfolder.c:302
 #, c-format
-#| msgid "Updating Search Folders for '%s' - %s"
 msgid "Updating Search Folders for “%s : %s”"
 msgstr "Ažuriranje fascikla pretrage za „%s — %s“"
 
@@ -16193,14 +16102,6 @@ msgstr "Ažuriranje fascikla pretrage za „%s — %s“"
 #. * in front of its name, without quotes.
 #: ../src/libemail-engine/mail-vfolder.c:666
 #, c-format
-#| msgid ""
-#| "The Search Folder \"%s\" has been modified to account for the deleted "
-#| "folder\n"
-#| "\"%s\"."
-#| msgid_plural ""
-#| "The following Search Folders\n"
-#| "%s have been modified to account for the deleted folder\n"
-#| "\"%s\"."
 msgid ""
 "The Search Folder “%s” has been modified to account for the deleted folder\n"
 "“%s”."
@@ -16244,29 +16145,64 @@ msgstr "Možete da prevučete i ubacite nazive naloga da ih ponovo poređate."
 msgid "De_fault"
 msgstr "Pod_razumevano"
 
-# has "activatable" set.
-#: ../src/mail/e-mail-account-tree-view.c:84
-#: ../src/modules/mail/em-composer-prefs.c:1299
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:355
-#: ../src/plugins/publish-calendar/publish-calendar.c:853
-msgid "Enabled"
-msgstr "Uključen"
+#: ../src/mail/e-mail-autoconfig.c:634
+#, c-format
+msgid "Host: %s:%d"
+msgstr "Domaćin: %s:%d"
 
-#: ../src/mail/e-mail-account-tree-view.c:108
-msgid "Account Name"
-msgstr "Naziv naloga"
+#: ../src/mail/e-mail-autoconfig.c:638
+#, c-format
+msgid "User: %s"
+msgstr "Korisnik: %s"
+
+#: ../src/mail/e-mail-autoconfig.c:642
+#, c-format
+msgid "Security method: %s"
+msgstr "Metoda bezbednosti: %s"
+
+#: ../src/mail/e-mail-autoconfig.c:643
+#: ../src/mail/e-mail-config-summary-page.c:144
+msgid "TLS"
+msgstr "TLS"
 
-#: ../src/mail/e-mail-autoconfig.c:620
+#: ../src/mail/e-mail-autoconfig.c:644
+#: ../src/mail/e-mail-config-summary-page.c:147
+msgid "STARTTLS"
+msgstr "STARTTLS"
+
+#: ../src/mail/e-mail-autoconfig.c:648
+#, c-format
+msgid "Authentication mechanism: %s"
+msgstr "Mehanizam za identifikovanje: %s"
+
+#: ../src/mail/e-mail-autoconfig.c:783
 msgid "No email address provided"
 msgstr "Nije dostavljena adresa e-pošte"
 
-#: ../src/mail/e-mail-autoconfig.c:629
+#: ../src/mail/e-mail-autoconfig.c:792
 msgid "Missing domain in email address"
 msgstr "Nedostaje domen u adresi e-pošte"
 
-#: ../src/mail/e-mail-browser.c:129 ../src/shell/e-shell-window-actions.c:782
-#: ../src/shell/e-shell-window-actions.c:789
-#: ../src/shell/e-shell-window-actions.c:796
+#: ../src/mail/e-mail-autoconfig.c:1097
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:78
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:79
+msgid "IMAP server"
+msgstr "IMAP server"
+
+#: ../src/mail/e-mail-autoconfig.c:1104
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:80
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:81
+msgid "POP3 server"
+msgstr "POP3 server"
+
+#: ../src/mail/e-mail-autoconfig.c:1111
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:82
+msgid "SMTP server"
+msgstr "SMTP server:"
+
+#: ../src/mail/e-mail-browser.c:129 ../src/shell/e-shell-window-actions.c:812
+#: ../src/shell/e-shell-window-actions.c:819
+#: ../src/shell/e-shell-window-actions.c:826
 msgid "Close this window"
 msgstr "Zatvorite ovaj prozor"
 
@@ -16275,20 +16211,20 @@ msgid "(No Subject)"
 msgstr "(Bez subjekta)"
 
 #. GtkAssistant's back button label.
-#: ../src/mail/e-mail-config-assistant.c:47
+#: ../src/mail/e-mail-config-assistant.c:48
 msgid "Go _Back"
 msgstr "Idi _nazad"
 
 #. GtkAssistant sinks the floating button reference.
-#: ../src/mail/e-mail-config-assistant.c:116
+#: ../src/mail/e-mail-config-assistant.c:123
 msgid "_Skip Lookup"
 msgstr "_Preskoči pretragu"
 
-#: ../src/mail/e-mail-config-assistant.c:661
+#: ../src/mail/e-mail-config-assistant.c:718
 msgid "Evolution Account Assistant"
 msgstr "Pomoćnik naloga Evolucije"
 
-#: ../src/mail/e-mail-config-assistant.c:955
+#: ../src/mail/e-mail-config-assistant.c:1025
 msgid "_Revise Details"
 msgstr "_Obnovi pojedinosti"
 
@@ -16300,173 +16236,174 @@ msgstr "Propitujem vrste potvrđivanja identiteta..."
 msgid "Check for Supported Types"
 msgstr "Proverite za podržanim vrstama"
 
-#: ../src/mail/e-mail-config-confirm-page.c:156
-#| msgid ""
-#| "Congratulations, your mail configuration is complete.\n"
-#| "\n"
-#| "You are now ready to send and receive email using Evolution.\n"
-#| "\n"
-#| "Click \"Apply\" to save your settings."
-msgid ""
-"Congratulations, your mail configuration is complete.\n"
-"\n"
-"You are now ready to send and receive email using Evolution.\n"
-"\n"
-"Click “Apply” to save your settings."
-msgstr ""
-"Čestitamo, podešavanje pošte je završeno.\n"
-"\n"
-"Sada ste spremni koristite Evoluciju za slanje i primanje pošte.\n"
-"\n"
-"Kliknite „Primeni“ da sačuvate postavke."
-
-#: ../src/mail/e-mail-config-confirm-page.c:168
-msgid "Done"
-msgstr "Urađeno"
-
-#: ../src/mail/e-mail-config-defaults-page.c:378
-msgid "Checking server settings..."
-msgstr "Proveravam podešavanja servera..."
-
-#: ../src/mail/e-mail-config-defaults-page.c:496
+#: ../src/mail/e-mail-config-composing-page.c:116
 msgctxt "ReplyForward"
 msgid "Use global setting"
 msgstr "Koristi opšta podešavanja"
 
-#: ../src/mail/e-mail-config-defaults-page.c:498
-#: ../src/mail/mail-config.ui.h:26
+#: ../src/mail/e-mail-config-composing-page.c:118
+#: ../src/mail/mail-config.ui.h:27
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Priloži"
 
-#: ../src/mail/e-mail-config-defaults-page.c:500
-#: ../src/mail/mail-config.ui.h:27
+#: ../src/mail/e-mail-config-composing-page.c:120
+#: ../src/mail/mail-config.ui.h:28
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "Unutar (Autluk stil)"
 
-#: ../src/mail/e-mail-config-defaults-page.c:502
-#: ../src/mail/mail-config.ui.h:28
+#: ../src/mail/e-mail-config-composing-page.c:122
+#: ../src/mail/mail-config.ui.h:29
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Citirano"
 
-#: ../src/mail/e-mail-config-defaults-page.c:504
-#: ../src/mail/mail-config.ui.h:29
+#: ../src/mail/e-mail-config-composing-page.c:124
+#: ../src/mail/mail-config.ui.h:30
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Ne citiraj"
 
-#: ../src/mail/e-mail-config-defaults-page.c:830
+#: ../src/mail/e-mail-config-composing-page.c:397
+#: ../src/mail/e-mail-config-composing-page.c:606
+msgid "Composing Messages"
+msgstr "Sastavljanje poruka"
+
+#: ../src/mail/e-mail-config-composing-page.c:406
+msgid "Alway_s carbon-copy (cc) to:"
+msgstr "Uvek pošalji _grafitnu kopiju (Cc):"
+
+#: ../src/mail/e-mail-config-composing-page.c:431
+msgid "Always _blind carbon-copy (bcc) to:"
+msgstr "Uvek pošalji _nevidljivu grafitnu kopiju (Bcc):"
+
+#: ../src/mail/e-mail-config-composing-page.c:462
+msgid "Re_ply style:"
+msgstr "_Stil odgovora:"
+
+#: ../src/mail/e-mail-config-composing-page.c:488
+#: ../src/mail/mail-config.ui.h:20
+msgid "Start _typing at the bottom"
+msgstr "Započni _kucanje pri dnu"
+
+#: ../src/mail/e-mail-config-composing-page.c:495
+#: ../src/mail/mail-config.ui.h:21
+msgid "_Keep signature above the original message"
+msgstr "Zadrži potpis _iznad originalne poruke"
+
+#: ../src/mail/e-mail-config-composing-page.c:512
+msgid "Message Receipts"
+msgstr "Priznanice poruke"
+
+#: ../src/mail/e-mail-config-composing-page.c:521
+msgid "S_end message receipts:"
+msgstr "_Pošalji povratnice:"
+
+#: ../src/mail/e-mail-config-composing-page.c:546
+msgid "Never"
+msgstr "Nikada"
+
+#: ../src/mail/e-mail-config-composing-page.c:552
+msgid "Always"
+msgstr "Uvek"
+
+#: ../src/mail/e-mail-config-composing-page.c:558
+msgid "Ask for each message"
+msgstr "Pitaj za svaku poruku"
+
+#: ../src/mail/e-mail-config-confirm-page.c:154
+msgid ""
+"Congratulations, your mail configuration is complete.\n"
+"\n"
+"You are now ready to send and receive email using Evolution.\n"
+"\n"
+"Click “Apply” to save your settings."
+msgstr ""
+"Čestitamo, podešavanje pošte je završeno.\n"
+"\n"
+"Sada ste spremni koristite Evoluciju za slanje i primanje pošte.\n"
+"\n"
+"Kliknite „Primeni“ da sačuvate postavke."
+
+#: ../src/mail/e-mail-config-confirm-page.c:166
+msgid "Done"
+msgstr "Urađeno"
+
+#: ../src/mail/e-mail-config-defaults-page.c:314
+msgid "Checking server settings..."
+msgstr "Proveravam podešavanja servera..."
+
+#: ../src/mail/e-mail-config-defaults-page.c:663
 msgid "Special Folders"
 msgstr "Posebne fascikle"
 
-#: ../src/mail/e-mail-config-defaults-page.c:839
+#: ../src/mail/e-mail-config-defaults-page.c:672
 msgid "Draft Messages _Folder:"
 msgstr "Fascikla poruka _nacrta:"
 
-#: ../src/mail/e-mail-config-defaults-page.c:849
+#: ../src/mail/e-mail-config-defaults-page.c:682
 msgid "Choose a folder for saving draft messages."
 msgstr "Izaberite fasciklu za čuvanje poruka nacrta."
 
-#: ../src/mail/e-mail-config-defaults-page.c:863
+#: ../src/mail/e-mail-config-defaults-page.c:698
 msgid "Sent _Messages Folder:"
 msgstr "Fascikla poslatih _poruka:"
 
-#: ../src/mail/e-mail-config-defaults-page.c:873
+#: ../src/mail/e-mail-config-defaults-page.c:726
 msgid "Choose a folder for saving sent messages."
 msgstr "Izaberite fasciklu za čuvanje poslatih poruka."
 
-#: ../src/mail/e-mail-config-defaults-page.c:892
+#: ../src/mail/e-mail-config-defaults-page.c:752
 msgid "S_ave replies in the folder of the message being replied to"
 msgstr "Sačuvaj _odgovore u fascikli poruke na koju se odgovara"
 
-#: ../src/mail/e-mail-config-defaults-page.c:909
+#: ../src/mail/e-mail-config-defaults-page.c:775
 msgid "Archi_ve Folder:"
 msgstr "Fascikla _arhive:"
 
-#: ../src/mail/e-mail-config-defaults-page.c:919
-#: ../src/modules/mail/em-mailer-prefs.c:1401
+#: ../src/mail/e-mail-config-defaults-page.c:785
+#: ../src/modules/mail/em-mailer-prefs.c:1407
 msgid "Choose a folder to archive messages to."
 msgstr "Izaberite fascikle za arhiviranje poruke."
 
-#: ../src/mail/e-mail-config-defaults-page.c:933
+#: ../src/mail/e-mail-config-defaults-page.c:799
 msgid "_Templates Folder:"
 msgstr "Fascikla _šablona:"
 
-#: ../src/mail/e-mail-config-defaults-page.c:943
+#: ../src/mail/e-mail-config-defaults-page.c:809
 msgid "Choose a folder to use for template messages."
 msgstr "Izaberite fasciklu za šablonske poruke."
 
-#: ../src/mail/e-mail-config-defaults-page.c:965
+#: ../src/mail/e-mail-config-defaults-page.c:831
 msgid "_Restore Defaults"
 msgstr "_Povrati osnovno"
 
-#: ../src/mail/e-mail-config-defaults-page.c:982
+#: ../src/mail/e-mail-config-defaults-page.c:848
 msgid "_Lookup Folders"
 msgstr "_Pretraži fasciklu"
 
-#: ../src/mail/e-mail-config-defaults-page.c:1000
+#: ../src/mail/e-mail-config-defaults-page.c:866
 msgid "Use a Real Folder for _Trash:"
 msgstr "Koristi stvarnu fasciklu za _smeće:"
 
-#: ../src/mail/e-mail-config-defaults-page.c:1001
+#: ../src/mail/e-mail-config-defaults-page.c:867
 msgid "Choose a folder for deleted messages."
 msgstr "Izaberite fasciklu za obrisane poruke."
 
-#: ../src/mail/e-mail-config-defaults-page.c:1010
+#: ../src/mail/e-mail-config-defaults-page.c:876
 msgid "Use a Real Folder for _Junk:"
 msgstr "Koristi stvarnu fasciklu za _đubre:"
 
-#: ../src/mail/e-mail-config-defaults-page.c:1011
+#: ../src/mail/e-mail-config-defaults-page.c:877
 msgid "Choose a folder for junk messages."
 msgstr "Izaberite fasciklu za nepoželjne poruke."
 
-#: ../src/mail/e-mail-config-defaults-page.c:1028
-msgid "Composing Messages"
-msgstr "Sastavljanje poruka"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1037
-msgid "Alway_s carbon-copy (cc) to:"
-msgstr "Uvek pošalji _grafitnu kopiju (Cc):"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1062
-msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "Uvek pošalji _nevidljivu grafitnu kopiju (Bcc):"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1093
-msgid "Re_ply style:"
-msgstr "_Stil odgovora:"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1129
-msgid "Message Receipts"
-msgstr "Priznanice poruke"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1138
-msgid "S_end message receipts:"
-msgstr "_Pošalji povratnice:"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1163
-msgid "Never"
-msgstr "Nikada"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1169
-msgid "Always"
-msgstr "Uvek"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1175
-msgid "Ask for each message"
-msgstr "Pitaj za svaku poruku"
-
-#: ../src/mail/e-mail-config-defaults-page.c:1282
+#: ../src/mail/e-mail-config-defaults-page.c:981
 msgid "Defaults"
 msgstr "Osnovno"
 
-#: ../src/mail/e-mail-config-identity-page.c:516
-#| 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 "
-#| "information in email you send."
+#: ../src/mail/e-mail-config-identity-page.c:513
 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 information in "
@@ -16475,16 +16412,13 @@ msgstr ""
 "Unesite ime i elektronsku adresu. „Neobavezna“ polja ne moraju biti popunjena, "
 "osim ako ne želite da ove podatke uključite u poruke koje šaljete."
 
-#: ../src/mail/e-mail-config-identity-page.c:544
-#: ../src/mail/e-mail-config-summary-page.c:324
+#: ../src/mail/e-mail-config-identity-page.c:541
+#: ../src/mail/e-mail-config-summary-page.c:323
 msgid "Account Information"
 msgstr "Podaci o nalogu"
 
-#: ../src/mail/e-mail-config-identity-page.c:582
-#: ../src/mail/e-mail-config-summary-page.c:354
-#| msgid ""
-#| "The above name will be used to identify this account.\n"
-#| "Use for example, \"Work\" or \"Personal\"."
+#: ../src/mail/e-mail-config-identity-page.c:579
+#: ../src/mail/e-mail-config-summary-page.c:353
 msgid ""
 "The above name will be used to identify this account.\n"
 "Use for example, “Work” or “Personal”."
@@ -16492,55 +16426,44 @@ msgstr ""
 "Ovo ime će biti korisno za prepoznavanje naloga.\n"
 "Na primer, „Poslovni“ ili „Lični“."
 
-#: ../src/mail/e-mail-config-identity-page.c:599
+#: ../src/mail/e-mail-config-identity-page.c:596
 msgid "Required Information"
 msgstr "Obavezni podaci"
 
-#: ../src/mail/e-mail-config-identity-page.c:608
+#: ../src/mail/e-mail-config-identity-page.c:605
 msgid "Full Nam_e:"
 msgstr "_Ime i prezime:"
 
-#: ../src/mail/e-mail-config-identity-page.c:637
+#: ../src/mail/e-mail-config-identity-page.c:634
 msgid "Email _Address:"
 msgstr "Adresa _e-pošte:"
 
-#: ../src/mail/e-mail-config-identity-page.c:686
+#: ../src/mail/e-mail-config-identity-page.c:683
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Dodatni podaci"
 
-#: ../src/mail/e-mail-config-identity-page.c:695
+#: ../src/mail/e-mail-config-identity-page.c:692
 msgid "Re_ply-To:"
 msgstr "Od_govor:"
 
-#: ../src/mail/e-mail-config-identity-page.c:724
+#: ../src/mail/e-mail-config-identity-page.c:721
 msgid "Or_ganization:"
 msgstr "Or_ganizacija:"
 
-#: ../src/mail/e-mail-config-identity-page.c:779
+#: ../src/mail/e-mail-config-identity-page.c:776
 msgid "Add Ne_w Signature..."
 msgstr "Dodaj no_vi potpis..."
 
-#: ../src/mail/e-mail-config-identity-page.c:793
+#: ../src/mail/e-mail-config-identity-page.c:790
 msgid "A_liases:"
 msgstr "_Alijasi:"
 
-#: ../src/mail/e-mail-config-identity-page.c:855
-#: ../src/mail/mail-config.ui.h:113
-msgid "Add"
-msgstr "Dodaj"
-
-#: ../src/mail/e-mail-config-identity-page.c:864
-#| msgid "_Edit"
-msgid "Edit"
-msgstr "Uredi"
-
-#: ../src/mail/e-mail-config-identity-page.c:873
-#: ../src/mail/mail-config.ui.h:114
-msgid "Remove"
-msgstr "Ukloni"
+#: ../src/mail/e-mail-config-identity-page.c:862
+msgid "Edi_t"
+msgstr "_Uredi"
 
-#: ../src/mail/e-mail-config-identity-page.c:887
+#: ../src/mail/e-mail-config-identity-page.c:885
 msgid "_Look up mail server details based on the entered e-mail address"
 msgstr "_Potraži podatke servera pošte na osnovu unete adrese e-pošte"
 
@@ -16563,23 +16486,23 @@ msgid "Reply To is not a valid email"
 msgstr "Primalac nije ispravna e-pošta"
 
 #: ../src/mail/e-mail-config-identity-page.c:969
-#: ../src/mail/e-mail-config-summary-page.c:633
+#: ../src/mail/e-mail-config-summary-page.c:638
 msgid "Account Name cannot be empty"
 msgstr "Ime naloga ne može biti prazno"
 
-#: ../src/mail/e-mail-config-lookup-page.c:69
+#: ../src/mail/e-mail-config-lookup-page.c:65
 msgid "Looking up account details..."
 msgstr "Tražim pojedinosti naloga..."
 
-#: ../src/mail/e-mail-config-provider-page.c:529
+#: ../src/mail/e-mail-config-provider-page.c:537
 msgid "Checking for New Mail"
 msgstr "Vršim proveru za novom poštom"
 
-#: ../src/mail/e-mail-config-provider-page.c:545
+#: ../src/mail/e-mail-config-provider-page.c:553
 msgid "Check for _new messages every"
 msgstr "Proveri za _novu poštu svakih"
 
-#: ../src/mail/e-mail-config-provider-page.c:753
+#: ../src/mail/e-mail-config-provider-page.c:763
 msgid "Receiving Options"
 msgstr "Opcije za primanje"
 
@@ -16595,113 +16518,113 @@ msgctxt "PGPKeyDescription"
 msgid "%s — %s"
 msgstr "%s — %s"
 
-#: ../src/mail/e-mail-config-security-page.c:320
-#: ../src/mail/em-folder-properties.c:1070 ../src/mail/mail-config.ui.h:31
-#: ../src/modules/addressbook/autocompletion-config.c:114
+#: ../src/mail/e-mail-config-security-page.c:318
+#: ../src/mail/em-folder-properties.c:1070 ../src/mail/mail-config.ui.h:32
+#: ../src/modules/addressbook/autocompletion-config.c:115
 #: ../src/modules/calendar/e-calendar-preferences.c:644
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:48
-#: ../src/modules/mail/e-mail-shell-backend.c:729
+#: ../src/modules/mail/e-mail-shell-backend.c:737
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "Opšte"
 
-#: ../src/mail/e-mail-config-security-page.c:329
+#: ../src/mail/e-mail-config-security-page.c:327
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ne potpisuj zahteve za s_astanke (Autluk kompatibilnost)"
 
-#: ../src/mail/e-mail-config-security-page.c:351
+#: ../src/mail/e-mail-config-security-page.c:349
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "Prilično dobra privatnost (OpenPGP)"
 
-#: ../src/mail/e-mail-config-security-page.c:360
+#: ../src/mail/e-mail-config-security-page.c:358
 msgid "OpenPGP _Key ID:"
 msgstr "IB OpenPGP _ključa:"
 
-#: ../src/mail/e-mail-config-security-page.c:393
+#: ../src/mail/e-mail-config-security-page.c:391
 msgid "Si_gning algorithm:"
 msgstr "Algoritam _potpisivanja:"
 
-#: ../src/mail/e-mail-config-security-page.c:409
-#: ../src/mail/e-mail-config-security-page.c:573
-#: ../src/mail/mail-config.ui.h:76
+#: ../src/mail/e-mail-config-security-page.c:407
+#: ../src/mail/e-mail-config-security-page.c:571
+#: ../src/mail/mail-config.ui.h:77
 msgid "SHA1"
 msgstr "SHA1"
 
-#: ../src/mail/e-mail-config-security-page.c:412
-#: ../src/mail/e-mail-config-security-page.c:576
-#: ../src/mail/mail-config.ui.h:77
+#: ../src/mail/e-mail-config-security-page.c:410
+#: ../src/mail/e-mail-config-security-page.c:574
+#: ../src/mail/mail-config.ui.h:78
 msgid "SHA256"
 msgstr "SHA256"
 
-#: ../src/mail/e-mail-config-security-page.c:415
-#: ../src/mail/e-mail-config-security-page.c:579
-#: ../src/mail/mail-config.ui.h:78
+#: ../src/mail/e-mail-config-security-page.c:413
+#: ../src/mail/e-mail-config-security-page.c:577
+#: ../src/mail/mail-config.ui.h:79
 msgid "SHA384"
 msgstr "SHA384"
 
-#: ../src/mail/e-mail-config-security-page.c:418
-#: ../src/mail/e-mail-config-security-page.c:582
-#: ../src/mail/mail-config.ui.h:79
+#: ../src/mail/e-mail-config-security-page.c:416
+#: ../src/mail/e-mail-config-security-page.c:580
+#: ../src/mail/mail-config.ui.h:80
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../src/mail/e-mail-config-security-page.c:434
+#: ../src/mail/e-mail-config-security-page.c:432
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "_Uvek potpiši odlazeće poruke sa ovog naloga"
 
-#: ../src/mail/e-mail-config-security-page.c:446
+#: ../src/mail/e-mail-config-security-page.c:444
 msgid "Always enc_rypt outgoing messages when using this account"
 msgstr "Uvek _šifruj odlazeće poruke sa ovog naloga"
 
-#: ../src/mail/e-mail-config-security-page.c:458
+#: ../src/mail/e-mail-config-security-page.c:456
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Uv_ek i meni šifruj pri slanju šifrovane pošte"
 
-#: ../src/mail/e-mail-config-security-page.c:470
+#: ../src/mail/e-mail-config-security-page.c:468
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Uvek _veruj ključevima mog priveska pri šifrovanju"
 
-#: ../src/mail/e-mail-config-security-page.c:482
+#: ../src/mail/e-mail-config-security-page.c:480
 msgid "Prefer _inline sign/encrypt for plain text messages"
 msgstr ""
 "Koristi _unutrašnje potpisivanje ili šifrovanje za obične tekstualne poruke"
 
-#: ../src/mail/e-mail-config-security-page.c:506
+#: ../src/mail/e-mail-config-security-page.c:504
 msgid "Secure MIME (S/MIME)"
 msgstr "Sigurni MIME (S/MIME)"
 
-#: ../src/mail/e-mail-config-security-page.c:515
+#: ../src/mail/e-mail-config-security-page.c:513
 msgid "Sig_ning certificate:"
 msgstr "Uverenje _potpisivanja:"
 
-#: ../src/mail/e-mail-config-security-page.c:539
-#: ../src/mail/e-mail-config-security-page.c:637
+#: ../src/mail/e-mail-config-security-page.c:537
+#: ../src/mail/e-mail-config-security-page.c:635
 msgid "Select"
 msgstr "Izaberi"
 
-#: ../src/mail/e-mail-config-security-page.c:548
-#: ../src/mail/e-mail-config-security-page.c:646
-#: ../src/mail/mail-dialogs.ui.h:16 ../src/shell/e-shell-window-actions.c:885
+#: ../src/mail/e-mail-config-security-page.c:546
+#: ../src/mail/e-mail-config-security-page.c:644
+#: ../src/mail/mail-dialogs.ui.h:16 ../src/shell/e-shell-window-actions.c:915
 msgid "_Clear"
 msgstr "_Očisti"
 
-#: ../src/mail/e-mail-config-security-page.c:557
+#: ../src/mail/e-mail-config-security-page.c:555
 msgid "Signing _algorithm:"
 msgstr "Algoritam p_otpisa:"
 
-#: ../src/mail/e-mail-config-security-page.c:598
+#: ../src/mail/e-mail-config-security-page.c:596
 msgid "Always sign outgoing messages when using this account"
 msgstr "Uvek potpiši odlazeće poruke sa ovog naloga"
 
-#: ../src/mail/e-mail-config-security-page.c:613
+#: ../src/mail/e-mail-config-security-page.c:611
 msgid "Encryption certificate:"
 msgstr "Uverenje za šifrovanje:"
 
-#: ../src/mail/e-mail-config-security-page.c:655
+#: ../src/mail/e-mail-config-security-page.c:653
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "Uvek šifruj odlazeće poruke sa ovog naloga"
 
-#: ../src/mail/e-mail-config-security-page.c:667
+#: ../src/mail/e-mail-config-security-page.c:665
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "Uvek meni samom šifruj pri slanju šifrovane pošte"
 
@@ -16709,71 +16632,63 @@ msgstr "Uvek meni samom šifruj pri slanju šifrovane pošte"
 msgid "Sending Email"
 msgstr "Slanje pošte"
 
-#: ../src/mail/e-mail-config-service-page.c:639
+#: ../src/mail/e-mail-config-service-page.c:499
 msgid "Server _Type:"
 msgstr "_Vrsta servera:"
 
-#: ../src/mail/e-mail-config-summary-page.c:143
-msgid "TLS"
-msgstr "TLS"
-
-#: ../src/mail/e-mail-config-summary-page.c:146
-msgid "STARTTLS"
-msgstr "STARTTLS"
-
-#: ../src/mail/e-mail-config-summary-page.c:307
+#: ../src/mail/e-mail-config-summary-page.c:306
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr ""
 "Ovo je sažetak podešavanja koja će biti korišćena za pristup vašoj pošti."
 
-#: ../src/mail/e-mail-config-summary-page.c:371
+#: ../src/mail/e-mail-config-summary-page.c:370
 msgid "Personal Details"
 msgstr "Lični podaci"
 
-#: ../src/mail/e-mail-config-summary-page.c:380
+#: ../src/mail/e-mail-config-summary-page.c:379
 msgid "Full Name:"
 msgstr "Ime i prezime:"
 
-#: ../src/mail/e-mail-config-summary-page.c:394
+#: ../src/mail/e-mail-config-summary-page.c:393
 msgid "Email Address:"
 msgstr "Adresa e-pošte:"
 
-#: ../src/mail/e-mail-config-summary-page.c:408
+#: ../src/mail/e-mail-config-summary-page.c:407
 msgid "Receiving"
 msgstr "Primanje"
 
-#: ../src/mail/e-mail-config-summary-page.c:420
+#: ../src/mail/e-mail-config-summary-page.c:419
 msgid "Sending"
 msgstr "Slanje"
 
-#: ../src/mail/e-mail-config-summary-page.c:432
+#: ../src/mail/e-mail-config-summary-page.c:431
 msgid "Server Type:"
 msgstr "Vrsta servera:"
 
-#: ../src/mail/e-mail-config-summary-page.c:453
+#: ../src/mail/e-mail-config-summary-page.c:452
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:606
 msgid "Server:"
 msgstr "Server:"
 
-#: ../src/mail/e-mail-config-summary-page.c:474
+#: ../src/mail/e-mail-config-summary-page.c:473
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:704
 msgid "Username:"
 msgstr "Korisničko ime:"
 
-#: ../src/mail/e-mail-config-summary-page.c:495
+#: ../src/mail/e-mail-config-summary-page.c:494
 msgid "Security:"
 msgstr "Bezbednost:"
 
-#: ../src/mail/e-mail-config-summary-page.c:788
+#: ../src/mail/e-mail-config-summary-page.c:651
+msgid "Cannot have both receiving and sending parts set to None"
+msgstr "Delovi za slanje i primanje ne mogu u isto vreme biti podešeni na Ništa"
+
+#: ../src/mail/e-mail-config-summary-page.c:807
 msgid "Account Summary"
 msgstr "Sažetak naloga"
 
-#: ../src/mail/e-mail-config-welcome-page.c:157
-#| msgid ""
-#| "Welcome to the Evolution Mail Configuration Assistant.\n"
-#| "\n"
-#| "Click \"Next\" to begin."
+#: ../src/mail/e-mail-config-welcome-page.c:161
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -16783,12 +16698,12 @@ msgstr ""
 "\n"
 "Kliknite „Nastavi“ da započnete."
 
-#: ../src/mail/e-mail-config-welcome-page.c:167
-#: ../src/modules/startup-wizard/e-startup-assistant.c:152
+#: ../src/mail/e-mail-config-welcome-page.c:171
+#: ../src/modules/startup-wizard/e-startup-assistant.c:154
 msgid "Welcome"
 msgstr "Dobrodošli"
 
-#: ../src/mail/e-mail-config-window.c:326
+#: ../src/mail/e-mail-config-window.c:329
 msgid "Account Editor"
 msgstr "Uređivač naloga"
 
@@ -16862,49 +16777,49 @@ msgstr "Naziv _fascikle:"
 
 #. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
 #. The translated value should not contain spaces.
-#: ../src/mail/e-mail-free-form-exp.c:234
+#: ../src/mail/e-mail-free-form-exp.c:231
 msgctxt "ffe"
 msgid "Answered"
 msgstr "Odgovoreno"
 
-#: ../src/mail/e-mail-free-form-exp.c:235
+#: ../src/mail/e-mail-free-form-exp.c:232
 msgctxt "ffe"
 msgid "Deleted"
 msgstr "Obrisano"
 
-#: ../src/mail/e-mail-free-form-exp.c:236
+#: ../src/mail/e-mail-free-form-exp.c:233
 msgctxt "ffe"
 msgid "Draft"
 msgstr "Nacrt"
 
-#: ../src/mail/e-mail-free-form-exp.c:237
+#: ../src/mail/e-mail-free-form-exp.c:234
 msgctxt "ffe"
 msgid "Flagged"
 msgstr "Označeno"
 
-#: ../src/mail/e-mail-free-form-exp.c:238
+#: ../src/mail/e-mail-free-form-exp.c:235
 msgctxt "ffe"
 msgid "Seen"
 msgstr "Viđeno"
 
-#: ../src/mail/e-mail-free-form-exp.c:239
+#: ../src/mail/e-mail-free-form-exp.c:236
 msgctxt "ffe"
 msgid "Attachment"
 msgstr "Prilog"
 
-#: ../src/mail/e-mail-free-form-exp.c:487
+#: ../src/mail/e-mail-free-form-exp.c:484
 msgctxt "ffe"
 msgid "no"
 msgstr "ne"
 
-#: ../src/mail/e-mail-free-form-exp.c:488
+#: ../src/mail/e-mail-free-form-exp.c:485
 msgctxt "ffe"
 msgid "false"
 msgstr "netačno"
 
 #: ../src/mail/e-mail-junk-options.c:296
 msgid "Junk filtering software:"
-msgstr "Softver za filtriranje nepoželjne:"
+msgstr "Softver za filtriranje nepoželjnog:"
 
 #: ../src/mail/e-mail-label-dialog.c:222
 msgid "_Label name:"
@@ -16939,7 +16854,7 @@ msgstr "Kasni_je"
 
 #: ../src/mail/e-mail-label-manager.c:169
 #: ../src/mail/em-folder-properties.c:842
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1198
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1245
 msgid "Add Label"
 msgstr "Dodajte natpis"
 
@@ -17008,7 +16923,7 @@ msgstr "Naziv zaglavlja"
 msgid "Header Value"
 msgstr "Vrednost zaglavlja"
 
-#: ../src/mail/e-mail-printer.c:100 ../src/mail/mail-config.ui.h:125
+#: ../src/mail/e-mail-printer.c:100 ../src/mail/mail-config.ui.h:127
 msgid "Headers"
 msgstr "Zaglavlja"
 
@@ -17023,7 +16938,7 @@ msgstr "Premesti u fasciklu"
 
 #: ../src/mail/e-mail-reader.c:349 ../src/mail/filtertypes.xml.in.h:66
 msgid "Copy to Folder"
-msgstr "Umnoži u fasciklu"
+msgstr "Kopiraj u fasciklu"
 
 #: ../src/mail/e-mail-reader.c:353 ../src/mail/em-folder-utils.c:501
 #: ../src/mail/mail.error.xml.h:152
@@ -17032,623 +16947,622 @@ msgstr "Pre_mesti"
 
 #: ../src/mail/e-mail-reader.c:353 ../src/mail/em-folder-utils.c:501
 msgid "C_opy"
-msgstr "_Umnoži"
+msgstr "_Kopiraj"
 
-#: ../src/mail/e-mail-reader.c:485
+#: ../src/mail/e-mail-reader.c:479
 msgid "Deleting message note..."
 msgstr "Brišem napomenu poruke..."
 
-#: ../src/mail/e-mail-reader.c:1307 ../src/mail/e-mail-reader.c:1519
-#: ../src/mail/e-mail-reader.c:1559
+#: ../src/mail/e-mail-reader.c:1301 ../src/mail/e-mail-reader.c:1513
+#: ../src/mail/e-mail-reader.c:1553
 msgid "_Do not ask me again."
 msgstr "_Ne pitaj me ponovo."
 
-#: ../src/mail/e-mail-reader.c:1565
+#: ../src/mail/e-mail-reader.c:1559
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Uvek zanemari „Odgovor-za:“ za dopisne liste."
 
-#: ../src/mail/e-mail-reader.c:1768
+#: ../src/mail/e-mail-reader.c:1762
 msgid "Failed to retrieve message:"
 msgstr "Ne mogu da dovučem poruku:"
 
-#: ../src/mail/e-mail-reader.c:1813 ../src/mail/e-mail-reader.c:3172
+#: ../src/mail/e-mail-reader.c:1807 ../src/mail/e-mail-reader.c:3166
 #, c-format
-#| msgid "Retrieving message '%s'"
 msgid "Retrieving message “%s”"
 msgstr "Preuzimam poruku „%s“"
 
-#: ../src/mail/e-mail-reader.c:2001
+#: ../src/mail/e-mail-reader.c:1995
 msgid "A_dd Sender to Address Book"
 msgstr "Do_daj pošiljaoca u adresar"
 
-#: ../src/mail/e-mail-reader.c:2003
+#: ../src/mail/e-mail-reader.c:1997
 msgid "Add sender to address book"
 msgstr "Dodaj pošiljaoca u adresar"
 
-#: ../src/mail/e-mail-reader.c:2008
+#: ../src/mail/e-mail-reader.c:2002
 msgid "_Archive..."
 msgstr "_Arhiva..."
 
-#: ../src/mail/e-mail-reader.c:2010
+#: ../src/mail/e-mail-reader.c:2004
 msgid "Move selected messages to the Archive folder for the account"
 msgstr "Premešta izabrane poruke u fasciklu za arhiviranje poruke u ovom nalogu"
 
-#: ../src/mail/e-mail-reader.c:2015
+#: ../src/mail/e-mail-reader.c:2009
 msgid "Check for _Junk"
 msgstr "Proveri da li ima _đubreta"
 
-#: ../src/mail/e-mail-reader.c:2017
+#: ../src/mail/e-mail-reader.c:2011
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrira da li među izabranim porukama ima đubreta"
 
-#: ../src/mail/e-mail-reader.c:2022
+#: ../src/mail/e-mail-reader.c:2016
 msgid "_Copy to Folder..."
-msgstr "_Umnoži u fasciklu..."
+msgstr "_Kopiraj u fasciklu..."
 
-#: ../src/mail/e-mail-reader.c:2024
+#: ../src/mail/e-mail-reader.c:2018
 msgid "Copy selected messages to another folder"
-msgstr "Umnožava izabrane poruke u drugu fasciklu"
+msgstr "Kopira izabrane poruke u drugu fasciklu"
 
-#: ../src/mail/e-mail-reader.c:2029
+#: ../src/mail/e-mail-reader.c:2023
 msgid "_Delete Message"
 msgstr "_Obriši poruku"
 
-#: ../src/mail/e-mail-reader.c:2031
+#: ../src/mail/e-mail-reader.c:2025
 msgid "Mark the selected messages for deletion"
 msgstr "Označite izabranu(e) poruku(e) za brisanje"
 
-#: ../src/mail/e-mail-reader.c:2036
+#: ../src/mail/e-mail-reader.c:2030
 msgid "_Add note..."
 msgstr "_Dodaj belešku..."
 
-#: ../src/mail/e-mail-reader.c:2038
+#: ../src/mail/e-mail-reader.c:2032
 msgid "Add a note for the selected message"
 msgstr "Dodajte belešku za izabranu poruku"
 
-#: ../src/mail/e-mail-reader.c:2043
+#: ../src/mail/e-mail-reader.c:2037
 msgid "Delete no_te"
 msgstr "Obriši _belešku"
 
-#: ../src/mail/e-mail-reader.c:2045
+#: ../src/mail/e-mail-reader.c:2039
 msgid "Delete the note for the selected message"
 msgstr "Obrišite belešku za izabranu poruku"
 
-#: ../src/mail/e-mail-reader.c:2050
+#: ../src/mail/e-mail-reader.c:2044
 msgid "_Edit note..."
 msgstr "_Uredi belešku..."
 
-#: ../src/mail/e-mail-reader.c:2052
+#: ../src/mail/e-mail-reader.c:2046
 msgid "Edit a note for the selected message"
 msgstr "Uredite belešku za izabranu poruku"
 
-#: ../src/mail/e-mail-reader.c:2057
+#: ../src/mail/e-mail-reader.c:2051
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Napravi pravilo propusnika za dopisnu _listu..."
 
-#: ../src/mail/e-mail-reader.c:2059
+#: ../src/mail/e-mail-reader.c:2053
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Naravite pravilo za propuštanje poruka na ovu dopisnu listu"
 
-#: ../src/mail/e-mail-reader.c:2064
+#: ../src/mail/e-mail-reader.c:2058
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Napravi pravilo propusnika za _primaoce..."
 
-#: ../src/mail/e-mail-reader.c:2066
+#: ../src/mail/e-mail-reader.c:2060
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Napravite pravilo za propuštanje poruka ovim primaocima"
 
-#: ../src/mail/e-mail-reader.c:2071
+#: ../src/mail/e-mail-reader.c:2065
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Napravi pravilo propusnika za _pošiljaoca..."
 
-#: ../src/mail/e-mail-reader.c:2073
+#: ../src/mail/e-mail-reader.c:2067
 msgid "Create a rule to filter messages from this sender"
 msgstr "Napravite pravilo za propuštanje poruka sa ovog pošiljaoca"
 
-#: ../src/mail/e-mail-reader.c:2078
+#: ../src/mail/e-mail-reader.c:2072
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Napravi pravilo propusnika za _naslov..."
 
-#: ../src/mail/e-mail-reader.c:2080
+#: ../src/mail/e-mail-reader.c:2074
 msgid "Create a rule to filter messages with this subject"
 msgstr "Napravite pravilo za prpuštanje poruka sa ovim naslovom"
 
-#: ../src/mail/e-mail-reader.c:2085
+#: ../src/mail/e-mail-reader.c:2079
 msgid "A_pply Filters"
 msgstr "Pri_meni propusnike"
 
-#: ../src/mail/e-mail-reader.c:2087
+#: ../src/mail/e-mail-reader.c:2081
 msgid "Apply filter rules to the selected messages"
 msgstr "Primenite pravila propuštanja na izabrane poruke"
 
-#: ../src/mail/e-mail-reader.c:2092
+#: ../src/mail/e-mail-reader.c:2086
 msgid "_Find in Message..."
 msgstr "P_ronađi u poruci..."
 
-#: ../src/mail/e-mail-reader.c:2094
+#: ../src/mail/e-mail-reader.c:2088
 msgid "Search for text in the body of the displayed message"
 msgstr "Potražite tekst u telu prikazane poruke"
 
-#: ../src/mail/e-mail-reader.c:2099
+#: ../src/mail/e-mail-reader.c:2093
 msgid "_Clear Flag"
 msgstr "Sklo_ni oznaku"
 
-#: ../src/mail/e-mail-reader.c:2101
+#: ../src/mail/e-mail-reader.c:2095
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Uklonite oznaku za praćenje sa izabranih poruka"
 
-#: ../src/mail/e-mail-reader.c:2106
+#: ../src/mail/e-mail-reader.c:2100
 msgid "_Flag Completed"
 msgstr "Označ_i kao završeno"
 
-#: ../src/mail/e-mail-reader.c:2108
+#: ../src/mail/e-mail-reader.c:2102
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Postavite oznaku za praćenje kao završenu na izabranim porukama"
 
-#: ../src/mail/e-mail-reader.c:2113
+#: ../src/mail/e-mail-reader.c:2107
 msgid "Follow _Up..."
 msgstr "Sle_di..."
 
-#: ../src/mail/e-mail-reader.c:2115
+#: ../src/mail/e-mail-reader.c:2109
 msgid "Flag the selected messages for follow-up"
 msgstr "Označite izabrane poruke za praćenje"
 
-#: ../src/mail/e-mail-reader.c:2120
+#: ../src/mail/e-mail-reader.c:2114
 #: ../src/modules/mail/e-mail-attachment-handler.c:430
 msgid "_Attached"
 msgstr "Pri_loženo"
 
-#: ../src/mail/e-mail-reader.c:2122 ../src/mail/e-mail-reader.c:2129
+#: ../src/mail/e-mail-reader.c:2116 ../src/mail/e-mail-reader.c:2123
 #: ../src/modules/mail/e-mail-attachment-handler.c:432
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Prosledite izabranu poruku nekome kao prilog"
 
-#: ../src/mail/e-mail-reader.c:2127
+#: ../src/mail/e-mail-reader.c:2121
 msgid "Forward As _Attached"
 msgstr "Prosledi kao _prilog"
 
-#: ../src/mail/e-mail-reader.c:2134
+#: ../src/mail/e-mail-reader.c:2128
 #: ../src/modules/mail/e-mail-attachment-handler.c:437
 msgid "_Inline"
 msgstr "Unut_ar"
 
-#: ../src/mail/e-mail-reader.c:2136 ../src/mail/e-mail-reader.c:2143
+#: ../src/mail/e-mail-reader.c:2130 ../src/mail/e-mail-reader.c:2137
 #: ../src/modules/mail/e-mail-attachment-handler.c:439
 msgid "Forward the selected message in the body of a new message"
 msgstr "Prosledite izabranu poruku u telu nove poruke"
 
-#: ../src/mail/e-mail-reader.c:2141
+#: ../src/mail/e-mail-reader.c:2135
 msgid "Forward As _Inline"
 msgstr "Prosledi kao _unutar poruke"
 
-#: ../src/mail/e-mail-reader.c:2148
+#: ../src/mail/e-mail-reader.c:2142
 #: ../src/modules/mail/e-mail-attachment-handler.c:444
 msgid "_Quoted"
 msgstr "_Citirano"
 
-#: ../src/mail/e-mail-reader.c:2150 ../src/mail/e-mail-reader.c:2157
+#: ../src/mail/e-mail-reader.c:2144 ../src/mail/e-mail-reader.c:2151
 #: ../src/modules/mail/e-mail-attachment-handler.c:446
 msgid "Forward the selected message quoted like a reply"
 msgstr "Prosledite izabranu poruku citiranu kao odgovor"
 
-#: ../src/mail/e-mail-reader.c:2155
+#: ../src/mail/e-mail-reader.c:2149
 msgid "Forward As _Quoted"
 msgstr "Prosledi kao _citat"
 
-#: ../src/mail/e-mail-reader.c:2162
+#: ../src/mail/e-mail-reader.c:2156
 msgid "_Load Images"
 msgstr "_Učitaj slike"
 
-#: ../src/mail/e-mail-reader.c:2164
+#: ../src/mail/e-mail-reader.c:2158
 msgid "Force images in HTML mail to be loaded"
 msgstr "Prisilite učitavanje slika u HTML porukama"
 
-#: ../src/mail/e-mail-reader.c:2169 ../src/mail/e-mail-reader.c:2559
+#: ../src/mail/e-mail-reader.c:2163 ../src/mail/e-mail-reader.c:2553
 msgid "_Ignore Subthread"
 msgstr "Za_nemari podraspravu"
 
-#: ../src/mail/e-mail-reader.c:2171
+#: ../src/mail/e-mail-reader.c:2165
 msgid "Mark new mails in a subthread as read automatically"
 msgstr "Automatski označava nove e-poruke u ovoj podraspravi kao pročitane"
 
-#: ../src/mail/e-mail-reader.c:2176 ../src/mail/e-mail-reader.c:2563
+#: ../src/mail/e-mail-reader.c:2170 ../src/mail/e-mail-reader.c:2557
 msgid "_Ignore Thread"
 msgstr "_Zanemari raspravu"
 
-#: ../src/mail/e-mail-reader.c:2178
+#: ../src/mail/e-mail-reader.c:2172
 msgid "Mark new mails in this thread as read automatically"
 msgstr "Automatski označava nove e-poruke u ovoj raspravi kao pročitane"
 
-#: ../src/mail/e-mail-reader.c:2183
+#: ../src/mail/e-mail-reader.c:2177
 msgid "_Important"
 msgstr "_Važno"
 
-#: ../src/mail/e-mail-reader.c:2185
+#: ../src/mail/e-mail-reader.c:2179
 msgid "Mark the selected messages as important"
 msgstr "Označava izabranu poruku kao važnu"
 
-#: ../src/mail/e-mail-reader.c:2190
+#: ../src/mail/e-mail-reader.c:2184
 msgid "_Junk"
 msgstr "_Đubre"
 
-#: ../src/mail/e-mail-reader.c:2192
+#: ../src/mail/e-mail-reader.c:2186
 msgid "Mark the selected messages as junk"
 msgstr "Označava izabranu poruku kao neželjenu poštu"
 
-#: ../src/mail/e-mail-reader.c:2197
+#: ../src/mail/e-mail-reader.c:2191
 msgid "_Not Junk"
 msgstr "Ni_je đubre"
 
-#: ../src/mail/e-mail-reader.c:2199
+#: ../src/mail/e-mail-reader.c:2193
 msgid "Mark the selected messages as not being junk"
 msgstr "Označava izabranu poruku kao poželjnu poštu"
 
-#: ../src/mail/e-mail-reader.c:2204
+#: ../src/mail/e-mail-reader.c:2198
 msgid "_Read"
 msgstr "Pro_čitano"
 
-#: ../src/mail/e-mail-reader.c:2206
+#: ../src/mail/e-mail-reader.c:2200
 msgid "Mark the selected messages as having been read"
 msgstr "Označava izabranu poruku kao pročitanu"
 
-#: ../src/mail/e-mail-reader.c:2211 ../src/mail/e-mail-reader.c:2583
+#: ../src/mail/e-mail-reader.c:2205 ../src/mail/e-mail-reader.c:2577
 msgid "Do not _Ignore Subthread"
 msgstr "Ne zanema_ruj podrasprave"
 
-#: ../src/mail/e-mail-reader.c:2213
+#: ../src/mail/e-mail-reader.c:2207
 msgid "Do not mark new mails in a subthread as read automatically"
 msgstr "Ne označava nove poruke u ovoj podraspravi kao pročitane"
 
-#: ../src/mail/e-mail-reader.c:2218 ../src/mail/e-mail-reader.c:2587
+#: ../src/mail/e-mail-reader.c:2212 ../src/mail/e-mail-reader.c:2581
 msgid "Do not _Ignore Thread"
 msgstr "Ne zanemar_uj rasprave"
 
-#: ../src/mail/e-mail-reader.c:2220
+#: ../src/mail/e-mail-reader.c:2214
 msgid "Do not mark new mails in this thread as read automatically"
 msgstr "Ne označava nove poruke u ovoj raspravi kao pročitane"
 
-#: ../src/mail/e-mail-reader.c:2225
+#: ../src/mail/e-mail-reader.c:2219
 msgid "Uni_mportant"
 msgstr "Ne_važno"
 
-#: ../src/mail/e-mail-reader.c:2227
+#: ../src/mail/e-mail-reader.c:2221
 msgid "Mark the selected messages as unimportant"
 msgstr "Označite izabranu(e) poruku(e) kao nevažno"
 
-#: ../src/mail/e-mail-reader.c:2232
+#: ../src/mail/e-mail-reader.c:2226
 msgid "_Unread"
 msgstr "_Nepročitano"
 
-#: ../src/mail/e-mail-reader.c:2234
+#: ../src/mail/e-mail-reader.c:2228
 msgid "Mark the selected messages as not having been read"
 msgstr "Označite izabranu(e) poruku(e) kao nepročitano"
 
-#: ../src/mail/e-mail-reader.c:2239
+#: ../src/mail/e-mail-reader.c:2233
 #: ../src/modules/mail/e-mail-attachment-handler.c:416
 msgid "_Edit as New Message..."
 msgstr "_Uredi kao novu poruku..."
 
-#: ../src/mail/e-mail-reader.c:2241
+#: ../src/mail/e-mail-reader.c:2235
 #: ../src/modules/mail/e-mail-attachment-handler.c:418
 msgid "Open the selected messages in the composer for editing"
 msgstr "Otvorite izabranu poruku u sastavljaču radi uređivanja"
 
-#: ../src/mail/e-mail-reader.c:2246
+#: ../src/mail/e-mail-reader.c:2240
 msgid "Compose _New Message"
 msgstr "Sastavi _novu poruku"
 
-#: ../src/mail/e-mail-reader.c:2248
+#: ../src/mail/e-mail-reader.c:2242
 msgid "Open a window for composing a mail message"
 msgstr "Otvorite prozor za sastavljanje poruke"
 
-#: ../src/mail/e-mail-reader.c:2253
+#: ../src/mail/e-mail-reader.c:2247
 msgid "_Open in New Window"
 msgstr "_Otvori u novom prozoru"
 
-#: ../src/mail/e-mail-reader.c:2255
+#: ../src/mail/e-mail-reader.c:2249
 msgid "Open the selected messages in a new window"
 msgstr "Otvorite izabrane poruke u novom prozoru"
 
-#: ../src/mail/e-mail-reader.c:2260
+#: ../src/mail/e-mail-reader.c:2254
 msgid "_Move to Folder..."
 msgstr "_Premesti u fasciklu..."
 
-#: ../src/mail/e-mail-reader.c:2262
+#: ../src/mail/e-mail-reader.c:2256
 msgid "Move selected messages to another folder"
 msgstr "Premestite izabranu(e) poruku(e) u drugu fasciklu"
 
-#: ../src/mail/e-mail-reader.c:2267
+#: ../src/mail/e-mail-reader.c:2261
 msgid "_Next Message"
 msgstr "_Sledeća poruka"
 
-#: ../src/mail/e-mail-reader.c:2269
+#: ../src/mail/e-mail-reader.c:2263
 msgid "Display the next message"
 msgstr "Prikažite sledeću poruku"
 
-#: ../src/mail/e-mail-reader.c:2274
+#: ../src/mail/e-mail-reader.c:2268
 msgid "Next _Important Message"
 msgstr "Sledeća _važna poruka"
 
-#: ../src/mail/e-mail-reader.c:2276
+#: ../src/mail/e-mail-reader.c:2270
 msgid "Display the next important message"
 msgstr "Prikažite sledeću važnu poruku"
 
-#: ../src/mail/e-mail-reader.c:2281
+#: ../src/mail/e-mail-reader.c:2275
 msgid "Next _Thread"
 msgstr "_Sledeća rasprava"
 
-#: ../src/mail/e-mail-reader.c:2283
+#: ../src/mail/e-mail-reader.c:2277
 msgid "Display the next thread"
 msgstr "Prikažite sledeću raspravu"
 
-#: ../src/mail/e-mail-reader.c:2288
+#: ../src/mail/e-mail-reader.c:2282
 msgid "Next _Unread Message"
 msgstr "Sledeća _nepročitana poruka"
 
-#: ../src/mail/e-mail-reader.c:2290
+#: ../src/mail/e-mail-reader.c:2284
 msgid "Display the next unread message"
 msgstr "Prikažite sledeću nepročitanu poruku"
 
-#: ../src/mail/e-mail-reader.c:2295
+#: ../src/mail/e-mail-reader.c:2289
 msgid "_Previous Message"
 msgstr "_Prethodna poruka"
 
-#: ../src/mail/e-mail-reader.c:2297
+#: ../src/mail/e-mail-reader.c:2291
 msgid "Display the previous message"
 msgstr "Prikažite prethodnu poruku"
 
-#: ../src/mail/e-mail-reader.c:2302
+#: ../src/mail/e-mail-reader.c:2296
 msgid "Pr_evious Important Message"
 msgstr "Pr_ethodna važna poruka"
 
-#: ../src/mail/e-mail-reader.c:2304
+#: ../src/mail/e-mail-reader.c:2298
 msgid "Display the previous important message"
 msgstr "Prikažite prethodnu važnu poruku"
 
-#: ../src/mail/e-mail-reader.c:2309
+#: ../src/mail/e-mail-reader.c:2303
 msgid "Previous T_hread"
 msgstr "_Prethodna tema"
 
-#: ../src/mail/e-mail-reader.c:2311
+#: ../src/mail/e-mail-reader.c:2305
 msgid "Display the previous thread"
 msgstr "Prikažite prethodnu temu"
 
-#: ../src/mail/e-mail-reader.c:2316
+#: ../src/mail/e-mail-reader.c:2310
 msgid "P_revious Unread Message"
 msgstr "P_rethodna nepročitana poruka"
 
-#: ../src/mail/e-mail-reader.c:2318
+#: ../src/mail/e-mail-reader.c:2312
 msgid "Display the previous unread message"
 msgstr "Prikažite prethodnu nepročitanu poruku"
 
-#: ../src/mail/e-mail-reader.c:2325
+#: ../src/mail/e-mail-reader.c:2319
 msgid "Print this message"
 msgstr "Štampajte ovu poruku"
 
-#: ../src/mail/e-mail-reader.c:2332
+#: ../src/mail/e-mail-reader.c:2326
 msgid "Preview the message to be printed"
 msgstr "Pregledajte poruku pred štampu"
 
-#: ../src/mail/e-mail-reader.c:2337
+#: ../src/mail/e-mail-reader.c:2331
 #: ../src/modules/mail/e-mail-attachment-handler.c:451
 msgid "Re_direct"
 msgstr "Preu_smeri"
 
-#: ../src/mail/e-mail-reader.c:2339
+#: ../src/mail/e-mail-reader.c:2333
 #: ../src/modules/mail/e-mail-attachment-handler.c:453
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Preusmerite (bez čitanja) izabranu poruku nekome"
 
-#: ../src/mail/e-mail-reader.c:2344
+#: ../src/mail/e-mail-reader.c:2338
 msgid "Remo_ve Attachments"
 msgstr "_Ukloni priloge"
 
-#: ../src/mail/e-mail-reader.c:2346
+#: ../src/mail/e-mail-reader.c:2340
 msgid "Remove attachments"
 msgstr "Uklonite priloge"
 
-#: ../src/mail/e-mail-reader.c:2351
+#: ../src/mail/e-mail-reader.c:2345
 msgid "Remove Du_plicate Messages"
 msgstr "Ukloni _duplirane poruke"
 
-#: ../src/mail/e-mail-reader.c:2353
+#: ../src/mail/e-mail-reader.c:2347
 msgid "Checks selected messages for duplicates"
 msgstr "Proverite izabrane poruke za duplikate"
 
-#: ../src/mail/e-mail-reader.c:2358 ../src/mail/mail.error.xml.h:28
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1430
+#: ../src/mail/e-mail-reader.c:2352 ../src/mail/mail.error.xml.h:28
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1477
 #: ../src/modules/mail/e-mail-attachment-handler.c:395
 msgid "Reply to _All"
 msgstr "Odgovori _svima"
 
-#: ../src/mail/e-mail-reader.c:2360
+#: ../src/mail/e-mail-reader.c:2354
 #: ../src/modules/mail/e-mail-attachment-handler.c:397
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Sastavite odgovor svim primaocima izabrane poruke"
 
-#: ../src/mail/e-mail-reader.c:2365 ../src/mail/mail.error.xml.h:26
+#: ../src/mail/e-mail-reader.c:2359 ../src/mail/mail.error.xml.h:26
 #: ../src/modules/mail/e-mail-attachment-handler.c:402
 msgid "Reply to _List"
 msgstr "Odgovori na _listu"
 
-#: ../src/mail/e-mail-reader.c:2367
+#: ../src/mail/e-mail-reader.c:2361
 #: ../src/modules/mail/e-mail-attachment-handler.c:404
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Sastavite odgovor dopisnoj listi izabrane poruke"
 
-#: ../src/mail/e-mail-reader.c:2372
+#: ../src/mail/e-mail-reader.c:2366
 #: ../src/modules/mail/e-mail-attachment-handler.c:409
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljaocu"
 
-#: ../src/mail/e-mail-reader.c:2374
+#: ../src/mail/e-mail-reader.c:2368
 #: ../src/modules/mail/e-mail-attachment-handler.c:411
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Sastavite odgovor pošiljaocu izabrane poruke"
 
-#: ../src/mail/e-mail-reader.c:2379
+#: ../src/mail/e-mail-reader.c:2373
 msgid "_Save as mbox..."
 msgstr "_Sačuvaj kao mboks..."
 
-#: ../src/mail/e-mail-reader.c:2381
+#: ../src/mail/e-mail-reader.c:2375
 msgid "Save selected messages as an mbox file"
 msgstr "Sačuvajte izabrane poruke kao „mbox“ datoteku"
 
-#: ../src/mail/e-mail-reader.c:2386
+#: ../src/mail/e-mail-reader.c:2380
 msgid "_Message Source"
 msgstr "Izvo_rni kod poruke"
 
-#: ../src/mail/e-mail-reader.c:2388
+#: ../src/mail/e-mail-reader.c:2382
 msgid "Show the raw email source of the message"
 msgstr "Prikažite izvorni kod elektronske poruke"
 
-#: ../src/mail/e-mail-reader.c:2400
+#: ../src/mail/e-mail-reader.c:2394
 msgid "_Undelete Message"
 msgstr "P_ovrati poruku"
 
-#: ../src/mail/e-mail-reader.c:2402
+#: ../src/mail/e-mail-reader.c:2396
 msgid "Undelete the selected messages"
 msgstr "Povratite izabrane poruke"
 
-#: ../src/mail/e-mail-reader.c:2407
+#: ../src/mail/e-mail-reader.c:2401
 msgid "_Normal Size"
 msgstr "_Uobičajena veličina"
 
-#: ../src/mail/e-mail-reader.c:2409
+#: ../src/mail/e-mail-reader.c:2403
 msgid "Reset the text to its original size"
 msgstr "Vratite tekst na originalnu veličinu"
 
-#: ../src/mail/e-mail-reader.c:2414
+#: ../src/mail/e-mail-reader.c:2408
 msgid "_Zoom In"
 msgstr "U_većaj"
 
-#: ../src/mail/e-mail-reader.c:2416
+#: ../src/mail/e-mail-reader.c:2410
 msgid "Increase the text size"
 msgstr "Uvećajte veličinu teksta"
 
-#: ../src/mail/e-mail-reader.c:2423
+#: ../src/mail/e-mail-reader.c:2417
 msgid "Decrease the text size"
 msgstr "Umanjite veličinu teksta"
 
-#: ../src/mail/e-mail-reader.c:2430
+#: ../src/mail/e-mail-reader.c:2424
 msgid "Cre_ate"
 msgstr "_Napravi"
 
-#: ../src/mail/e-mail-reader.c:2437
+#: ../src/mail/e-mail-reader.c:2431
 msgid "Ch_aracter Encoding"
 msgstr "Kodna st_rana"
 
-#: ../src/mail/e-mail-reader.c:2444
+#: ../src/mail/e-mail-reader.c:2438
 #: ../src/modules/mail/e-mail-attachment-handler.c:423
 msgid "F_orward As"
 msgstr "_Prosledi kao"
 
-#: ../src/mail/e-mail-reader.c:2451
+#: ../src/mail/e-mail-reader.c:2445
 msgid "_Group Reply"
 msgstr "O_dgovori grupi"
 
-#: ../src/mail/e-mail-reader.c:2458
+#: ../src/mail/e-mail-reader.c:2452
 msgid "_Go To"
 msgstr "_Idi na"
 
-#: ../src/mail/e-mail-reader.c:2465
+#: ../src/mail/e-mail-reader.c:2459
 msgid "Mar_k As"
 msgstr "O_znači kao"
 
-#: ../src/mail/e-mail-reader.c:2472
+#: ../src/mail/e-mail-reader.c:2466
 msgid "_Message"
 msgstr "_Poruka"
 
-#: ../src/mail/e-mail-reader.c:2479
+#: ../src/mail/e-mail-reader.c:2473
 msgid "_Zoom"
 msgstr "Uv_ećaj"
 
-#: ../src/mail/e-mail-reader.c:2489
+#: ../src/mail/e-mail-reader.c:2483
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Napravi fasciklu pretrage sa dopisne _liste..."
 
-#: ../src/mail/e-mail-reader.c:2491
+#: ../src/mail/e-mail-reader.c:2485
 msgid "Create a search folder for this mailing list"
 msgstr "Napravite fasciklu pretrage za ovu dopisnu listu"
 
-#: ../src/mail/e-mail-reader.c:2496
+#: ../src/mail/e-mail-reader.c:2490
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Napravi fasciklu pretrage od pri_malaca..."
 
-#: ../src/mail/e-mail-reader.c:2498
+#: ../src/mail/e-mail-reader.c:2492
 msgid "Create a search folder for these recipients"
 msgstr "Napravite fasciklu pretrage za ove primaoce"
 
-#: ../src/mail/e-mail-reader.c:2503
+#: ../src/mail/e-mail-reader.c:2497
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Napravi fasciklu pretrage od po_šiljaoca..."
 
-#: ../src/mail/e-mail-reader.c:2505
+#: ../src/mail/e-mail-reader.c:2499
 msgid "Create a search folder for this sender"
 msgstr "Napravite fasciklu pretrage za ovog pošiljaoca"
 
-#: ../src/mail/e-mail-reader.c:2510
+#: ../src/mail/e-mail-reader.c:2504
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Napravi fasciklu pretrage iz _naslova..."
 
-#: ../src/mail/e-mail-reader.c:2512
+#: ../src/mail/e-mail-reader.c:2506
 msgid "Create a search folder for this subject"
 msgstr "Napravite fasciklu pretrage za ovaj naslov"
 
-#: ../src/mail/e-mail-reader.c:2551
+#: ../src/mail/e-mail-reader.c:2545
 msgid "Mark for Follo_w Up..."
 msgstr "Obeleži za _praćenje..."
 
-#: ../src/mail/e-mail-reader.c:2567
+#: ../src/mail/e-mail-reader.c:2561
 msgid "Mark as _Important"
 msgstr "Onači kao _važno"
 
-#: ../src/mail/e-mail-reader.c:2571
+#: ../src/mail/e-mail-reader.c:2565
 msgid "Mark as _Junk"
 msgstr "Označi kao _đubre"
 
-#: ../src/mail/e-mail-reader.c:2575
+#: ../src/mail/e-mail-reader.c:2569
 msgid "Mark as _Not Junk"
 msgstr "Označi da _nije đubre"
 
-#: ../src/mail/e-mail-reader.c:2579
+#: ../src/mail/e-mail-reader.c:2573
 msgid "Mar_k as Read"
 msgstr "O_znači kao pročitano"
 
-#: ../src/mail/e-mail-reader.c:2591
+#: ../src/mail/e-mail-reader.c:2585
 msgid "Mark as Uni_mportant"
 msgstr "Označi kao _nevažno"
 
-#: ../src/mail/e-mail-reader.c:2595
+#: ../src/mail/e-mail-reader.c:2589
 msgid "Mark as _Unread"
 msgstr "Označi kao _nepročitano"
 
-#: ../src/mail/e-mail-reader.c:2639
+#: ../src/mail/e-mail-reader.c:2633
 msgid "_Caret Mode"
 msgstr "Metod u_metanja"
 
-#: ../src/mail/e-mail-reader.c:2641
+#: ../src/mail/e-mail-reader.c:2635
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Prikažite trepćući kursor u telu prikazanih poruka"
 
-#: ../src/mail/e-mail-reader.c:2647
+#: ../src/mail/e-mail-reader.c:2641
 msgid "All Message _Headers"
 msgstr "Sva _zaglavlja poruke"
 
-#: ../src/mail/e-mail-reader.c:2649
+#: ../src/mail/e-mail-reader.c:2643
 msgid "Show messages with all email headers"
 msgstr "Prikažite poruku sa svim zaglavljima e-pošte"
 
-#: ../src/mail/e-mail-reader.c:3178
+#: ../src/mail/e-mail-reader.c:3172
 msgid "Retrieving message"
 msgstr "Preuzimam poruku"
 
-#: ../src/mail/e-mail-reader.c:4228
+#: ../src/mail/e-mail-reader.c:4222
 #: ../src/modules/mail/e-mail-attachment-handler.c:388
 msgid "_Forward"
 msgstr "Prosl_edi"
 
-#: ../src/mail/e-mail-reader.c:4229
+#: ../src/mail/e-mail-reader.c:4223
 #: ../src/modules/mail/e-mail-attachment-handler.c:390
 msgid "Forward the selected message to someone"
 msgstr "Prosleđuje izabranu poruku nekome"
@@ -17657,52 +17571,52 @@ msgstr "Prosleđuje izabranu poruku nekome"
 #. * (if possible and if that configuration option is enabled), or else
 #. * it will reply to all. The word "Group" was chosen because it covers
 #. * either of those, without too strongly implying one or the other.
-#: ../src/mail/e-mail-reader.c:4248
+#: ../src/mail/e-mail-reader.c:4242
 msgid "Group Reply"
 msgstr "Odgovor grupi"
 
-#: ../src/mail/e-mail-reader.c:4249
+#: ../src/mail/e-mail-reader.c:4243
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Odgovorite dopisnoj listi ili svim primaocima"
 
-#: ../src/mail/e-mail-reader.c:4315 ../src/mail/filtertypes.xml.in.h:67
+#: ../src/mail/e-mail-reader.c:4309 ../src/mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Obriši"
 
-#: ../src/mail/e-mail-reader.c:4327
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1241
+#: ../src/mail/e-mail-reader.c:4321
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1281
 msgid "Next"
 msgstr "Sledeće"
 
-#: ../src/mail/e-mail-reader.c:4331
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1234
+#: ../src/mail/e-mail-reader.c:4325
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1274
 msgid "Previous"
 msgstr "Prethodno"
 
-#: ../src/mail/e-mail-reader.c:4340 ../src/mail/mail-dialogs.ui.h:9
+#: ../src/mail/e-mail-reader.c:4334 ../src/mail/mail-dialogs.ui.h:9
 msgid "Reply"
 msgstr "Odgovori"
 
-#: ../src/mail/e-mail-reader.c:5413
+#: ../src/mail/e-mail-reader.c:5407
 #, c-format
 msgid "Allow remote content for anyone from %s"
 msgstr "Dozvoli udaljeni sadržaj svima sa %s"
 
-#: ../src/mail/e-mail-reader.c:5415
+#: ../src/mail/e-mail-reader.c:5409
 #, c-format
 msgid "Allow remote content for %s"
 msgstr "Dozvoli udaljeni sadržaj za %s"
 
-#: ../src/mail/e-mail-reader.c:5432
+#: ../src/mail/e-mail-reader.c:5426
 #, c-format
 msgid "Allow remote content from %s"
 msgstr "Dozvoli udaljeni sadržaj svima od %s"
 
-#: ../src/mail/e-mail-reader.c:5449
+#: ../src/mail/e-mail-reader.c:5443
 msgid "Do not show this message again"
 msgstr "Ne prikazuj više ovu poruku"
 
-#: ../src/mail/e-mail-reader.c:5497
+#: ../src/mail/e-mail-reader.c:5491
 msgid "Load remote content"
 msgstr "Učitaj udaljeni sadržaj"
 
@@ -17710,42 +17624,40 @@ msgstr "Učitaj udaljeni sadržaj"
 msgid "Do not warn me again"
 msgstr "Ne upozoravaj me ponovo"
 
-#: ../src/mail/e-mail-reader-utils.c:568
+#: ../src/mail/e-mail-reader-utils.c:633
+#, c-format
+msgid "Deleting messages in Junk folder “%s”…"
+msgstr "Brišem poruke u fascikli Đubre „%s“…"
+
+#: ../src/mail/e-mail-reader-utils.c:728
 #, c-format
-#| msgid "Refreshing folder '%s'"
 msgid "Refreshing folder “%s”"
 msgstr "Osvežavam fasciklu „%s“"
 
-#: ../src/mail/e-mail-reader-utils.c:1175
+#: ../src/mail/e-mail-reader-utils.c:1335
 msgid "Marking thread to be ignored"
 msgstr "Označavam raspravu kao zanemarenu"
 
-#: ../src/mail/e-mail-reader-utils.c:1179
+#: ../src/mail/e-mail-reader-utils.c:1339
 msgid "Unmarking thread from being ignored"
 msgstr "Označavam raspravi kao da nije zanemarena"
 
-#: ../src/mail/e-mail-reader-utils.c:1183
+#: ../src/mail/e-mail-reader-utils.c:1343
 msgid "Marking subthread to be ignored"
 msgstr "Označavam podraspravu kao zanemarenu"
 
-#: ../src/mail/e-mail-reader-utils.c:1187
+#: ../src/mail/e-mail-reader-utils.c:1347
 msgid "Unmarking subthread from being ignored"
 msgstr "Označavam podraspravu kao da nije zanemarena"
 
-#: ../src/mail/e-mail-reader-utils.c:1439
+#: ../src/mail/e-mail-reader-utils.c:1599
 msgid "Printing"
 msgstr "Štampam"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../src/mail/e-mail-reader-utils.c:1676
+#: ../src/mail/e-mail-reader-utils.c:1836
 #, c-format
-#| msgid ""
-#| "Folder '%s' contains %u duplicate message. Are you sure you want to "
-#| "delete it?"
-#| msgid_plural ""
-#| "Folder '%s' contains %u duplicate messages. Are you sure you want to "
-#| "delete them?"
 msgid ""
 "Folder “%s” contains %u duplicate message. Are you sure you want to delete "
 "it?"
@@ -17765,7 +17677,7 @@ msgstr[3] ""
 "Fascikla „%s“ sadrži %u dupliranu poruku. Da li ste sigurni da želite da je "
 "izbrišete?"
 
-#: ../src/mail/e-mail-reader-utils.c:2694
+#: ../src/mail/e-mail-reader-utils.c:2854
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Sačuvaj poruku"
@@ -17778,7 +17690,7 @@ msgstr[3] "Sačuvaj poruku"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../src/mail/e-mail-reader-utils.c:2715
+#: ../src/mail/e-mail-reader-utils.c:2875
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Poruka"
@@ -17786,7 +17698,7 @@ msgstr[1] "Poruke"
 msgstr[2] "Poruke"
 msgstr[3] "Poruka"
 
-#: ../src/mail/e-mail-reader-utils.c:3088
+#: ../src/mail/e-mail-reader-utils.c:3248
 msgid "Parsing message"
 msgstr "Obrađujem poruku"
 
@@ -17798,14 +17710,13 @@ msgstr "Poruka ne sadrži tekst."
 msgid "Flag to Follow Up"
 msgstr "Označi za praćenje"
 
-#: ../src/mail/e-mail-ui-session.c:813
+#: ../src/mail/e-mail-ui-session.c:821
 #, c-format
 msgid "%s authentication failed"
 msgstr "Nije uspelo %s potvrđivanje identiteta"
 
-#: ../src/mail/e-mail-ui-session.c:863
+#: ../src/mail/e-mail-ui-session.c:871
 #, c-format
-#| msgid "No data source found for UID '%s'"
 msgid "No data source found for UID “%s”"
 msgstr "Nije pronađen izvor podataka za JIB „%s“"
 
@@ -17863,7 +17774,7 @@ msgstr[3] ""
 
 #. This message is never removed from the camel operation, otherwise the GtkInfoBar
 #. hides itself and the user sees no feedback.
-#: ../src/mail/em-composer-utils.c:790
+#: ../src/mail/em-composer-utils.c:800
 msgid "Waiting for attachments to load..."
 msgstr "Čekam da se učitaju prilozi..."
 
@@ -17873,7 +17784,7 @@ msgstr "Čekam da se učitaju prilozi..."
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../src/mail/em-composer-utils.c:1745
+#: ../src/mail/em-composer-utils.c:1845
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -17881,24 +17792,30 @@ msgstr ""
 "U ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. u ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} piše:"
 
-#: ../src/mail/em-composer-utils.c:1751
+#: ../src/mail/em-composer-utils.c:1851
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Prosleđena poruka --------"
 
-#: ../src/mail/em-composer-utils.c:1756
+#: ../src/mail/em-composer-utils.c:1856
 msgid "-----Original Message-----"
 msgstr "-----Originalna poruka-----"
 
-#: ../src/mail/em-composer-utils.c:3074
+#. Translators: This is a reply attribution in the message reply subject. The %s is replaced with the 
subject of the original message.
+#: ../src/mail/em-composer-utils.c:2562
+#, c-format
+msgid "Re: %s"
+msgstr "Odgovoreno: %s"
+
+#: ../src/mail/em-composer-utils.c:3103
 msgid "an unknown sender"
 msgstr "nepoznati pošiljalac"
 
 #. FIXME GTK_WINDOW (composer)
-#: ../src/mail/em-composer-utils.c:3550
+#: ../src/mail/em-composer-utils.c:3581
 msgid "Posting destination"
 msgstr "Odredišna pošta"
 
-#: ../src/mail/em-composer-utils.c:3555
+#: ../src/mail/em-composer-utils.c:3586
 msgid "Choose folders to post the message to."
 msgstr "Izaberite fascikle za slanje poruke."
 
@@ -18000,7 +17917,6 @@ msgid "_Delete old messages"
 msgstr "_Obriši stare poruke"
 
 #: ../src/mail/em-folder-properties.c:1018
-#| msgid "Server Type:"
 msgid "Server Tag"
 msgstr "Oznaka servera"
 
@@ -18013,7 +17929,7 @@ msgstr "Natpis"
 msgid "AutoArchive"
 msgstr "AutoArhiva"
 
-#: ../src/mail/em-folder-properties.c:1076 ../src/mail/mail-config.ui.h:118
+#: ../src/mail/em-folder-properties.c:1076 ../src/mail/mail-config.ui.h:120
 #: ../src/mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Oznake"
@@ -18023,7 +17939,6 @@ msgid "Folder Properties"
 msgstr "Osobine fascikle"
 
 #: ../src/mail/em-folder-properties.c:1394
-#| msgid "Category Properties"
 msgid "Gathering folder properties"
 msgstr "Prikupljam svojstva fascikle"
 
@@ -18036,7 +17951,6 @@ msgid "Create a new folder"
 msgstr "Napravite novu fasciklu"
 
 #: ../src/mail/em-folder-tree.c:683
-#| msgid "Folder names cannot contain '/'"
 msgid "Folder names cannot contain “/”"
 msgstr "Nazivi fascikli ne mogu da sadrže „/“"
 
@@ -18076,7 +17990,7 @@ msgstr "Premeštam fasciklu „%s“"
 #: ../src/mail/em-folder-tree.c:2293 ../src/mail/em-folder-utils.c:85
 #, c-format
 msgid "Copying folder %s"
-msgstr "Umnožavam fasciklu „%s“"
+msgstr "Kopiram fasciklu „%s“"
 
 #: ../src/mail/em-folder-tree.c:2300 ../src/mail/message-list.c:2508
 #, c-format
@@ -18086,7 +18000,7 @@ msgstr "Premeštam poruke u fasciklu „%s“"
 #: ../src/mail/em-folder-tree.c:2304 ../src/mail/message-list.c:2510
 #, c-format
 msgid "Copying messages into folder %s"
-msgstr "Umnožavam poruke u fasciklu „%s“"
+msgstr "Kopiram poruke u fasciklu „%s“"
 
 #: ../src/mail/em-folder-tree.c:2323
 #, c-format
@@ -18099,8 +18013,8 @@ msgstr "Ne mogu da ubacim poruku(e) u ostavu na najvišem nivou"
 msgid "UNMATCHED"
 msgstr "NEODGOVARA"
 
-#: ../src/mail/em-folder-tree-model.c:1325
-#: ../src/mail/em-folder-tree-model.c:1701
+#: ../src/mail/em-folder-tree-model.c:1326
+#: ../src/mail/em-folder-tree-model.c:1702
 msgid "Loading..."
 msgstr "Učitavam..."
 
@@ -18110,7 +18024,7 @@ msgstr "Premesti fasciklu u"
 
 #: ../src/mail/em-folder-utils.c:502
 msgid "Copy Folder To"
-msgstr "Umnoži fasciklu u"
+msgstr "Kopiraj fasciklu u"
 
 #: ../src/mail/em-subscription-editor.c:855
 msgid "_Subscribe"
@@ -18126,7 +18040,7 @@ msgstr "Prijavi se _na sve"
 
 #: ../src/mail/em-subscription-editor.c:970
 #: ../src/mail/em-subscription-editor.c:1914 ../src/mail/mail.error.xml.h:73
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1770
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1751
 msgid "_Unsubscribe"
 msgstr "_Odjavi se"
 
@@ -18183,7 +18097,7 @@ msgid "Su_bscribe"
 msgstr "P_rijavi se"
 
 #: ../src/mail/em-subscription-editor.c:1913
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1772
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1753
 msgid "Unsubscribe from the selected folder"
 msgstr "Odjavite se sa izabrane fascikle"
 
@@ -18207,18 +18121,12 @@ msgstr "_Razgranaj sve"
 msgid "Refresh the folder list"
 msgstr "Osvežite spisak fascikli"
 
-#: ../src/mail/em-subscription-editor.c:1976
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1671
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1742
-msgid "_Refresh"
-msgstr "_Osveži"
-
 #: ../src/mail/em-subscription-editor.c:1987
 msgid "Stop the current operation"
 msgstr "Zaustavite trenutnu operaciju"
 
 #: ../src/mail/em-subscription-editor.c:1988
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:999
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1005
 msgid "_Stop"
 msgstr "_Zaustavi"
 
@@ -18436,7 +18344,7 @@ msgstr "Važno"
 msgid "Read"
 msgstr "Čitaj"
 
-#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:132
+#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:134
 #: ../src/mail/vfoldertypes.xml.in.h:44
 msgid "Junk"
 msgstr "Đubre"
@@ -18668,7 +18576,6 @@ msgstr "Uvozim poštu i kontakte iz K-pošte"
 #: ../src/plugins/dbx-import/dbx-importer.c:605
 #: ../src/plugins/pst-import/pst-importer.c:756
 #, c-format
-#| msgid "Importing '%s'"
 msgid "Importing “%s”"
 msgstr "Uvozim „%s“"
 
@@ -18720,14 +18627,6 @@ msgstr "Dodaj pravilo filtriranja"
 #. * of its name, without quotes.
 #: ../src/mail/mail-autofilter.c:509
 #, c-format
-#| msgid ""
-#| "The filter rule \"%s\" has been modified to account for the deleted "
-#| "folder\n"
-#| "\"%s\"."
-#| msgid_plural ""
-#| "The following filter rules\n"
-#| "%s have been modified to account for the deleted folder\n"
-#| "\"%s\"."
 msgid ""
 "The filter rule “%s” has been modified to account for the deleted folder\n"
 "“%s”."
@@ -18816,65 +18715,61 @@ msgstr "_Stil odgovora:"
 msgid "_Forward style:"
 msgstr "Stil _prosleđivanja:"
 
-#: ../src/mail/mail-config.ui.h:20
-msgid "Start _typing at the bottom on replying"
-msgstr "U odgovoru započni _kucanje pri dnu"
-
-#: ../src/mail/mail-config.ui.h:21
-msgid "_Keep signature above the original message on replying"
-msgstr "Zadrži potpis _iznad originalne poruke pri odgovoru"
-
 #: ../src/mail/mail-config.ui.h:22
+msgid "Include si_gnature in new messages only"
+msgstr "Stavi _potpis samo u nove poruke."
+
+#: ../src/mail/mail-config.ui.h:23
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "_Zanemari „Odgovor-za:“ za dopisne liste"
 
-#: ../src/mail/mail-config.ui.h:23
+#: ../src/mail/mail-config.ui.h:24
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "Odgovor _grupi ide samo na dopisnu listu, ako je moguće"
 
-#: ../src/mail/mail-config.ui.h:24
+#: ../src/mail/mail-config.ui.h:25
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr ""
 "Digitalno _potpiši poruke kada je originalna poruka potpisana (PGP ili S/"
 "MIME)"
 
-#: ../src/mail/mail-config.ui.h:25
+#: ../src/mail/mail-config.ui.h:26
 msgid "_Wrap quoted text in replies"
 msgstr "_Prelomi citirani tekst u odgovorima"
 
-#: ../src/mail/mail-config.ui.h:30
+#: ../src/mail/mail-config.ui.h:31
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "Unutar"
 
-#: ../src/mail/mail-config.ui.h:32
+#: ../src/mail/mail-config.ui.h:33
 msgid "Sig_natures"
 msgstr "Pot_pisi"
 
-#: ../src/mail/mail-config.ui.h:33
+#: ../src/mail/mail-config.ui.h:34
 msgid "Signatures"
 msgstr "Potpisi"
 
-#: ../src/mail/mail-config.ui.h:34
+#: ../src/mail/mail-config.ui.h:35
 msgid "_Languages"
 msgstr "_Jezici"
 
-#: ../src/mail/mail-config.ui.h:35
+#: ../src/mail/mail-config.ui.h:36
 msgid "Languages Table"
 msgstr "Tabela jezika"
 
-#: ../src/mail/mail-config.ui.h:36
+#: ../src/mail/mail-config.ui.h:37
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "Spisak jezika ovde oslikava samo one jezike za koje imate instaliran rečnik."
 
-#: ../src/mail/mail-config.ui.h:38
+#: ../src/mail/mail-config.ui.h:39
 msgid "Check spelling while I _type"
 msgstr "Proveri pravopis dok _kucam"
 
-#: ../src/mail/mail-config.ui.h:40
+#: ../src/mail/mail-config.ui.h:41
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -18883,76 +18778,76 @@ msgstr ""
 "izvršavanja sledećih označenih radnji:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:42
+#: ../src/mail/mail-config.ui.h:43
 msgid "Sending a message with an _empty subject line"
 msgstr "Slanja poruke sa praznom linijom _naslova"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:44
+#: ../src/mail/mail-config.ui.h:45
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Slanja poruke koja sadrži određene samo _Bcc primaoce"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:46
+#: ../src/mail/mail-config.ui.h:47
 msgid "Sending a message to many _To and CC recipients"
 msgstr "Slanja poruke za mnogo _Za i CC primaoca"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:48
+#: ../src/mail/mail-config.ui.h:49
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Slanja privatnog _odgovora na poruku dopisne liste"
 
 # bug(slobo): verovatno izveštaj o dostavi
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:50
+#: ../src/mail/mail-config.ui.h:51
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Slanja odgovora _većem broju primalaca"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:52
+#: ../src/mail/mail-config.ui.h:53
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "Dozvoljavanja _dopisnoj listi da preusmeri privatnu poruku na listu"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:54
+#: ../src/mail/mail-config.ui.h:55
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "Slanja poruke sa _primaocima koji nisu unešeni kao adrese pošte"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:56
+#: ../src/mail/mail-config.ui.h:57
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
-msgstr "Slanja poruke pomoću pre_čice (Ktrl + Unesi)"
+msgstr "Slanja poruke pomoću pre_čice (Ctrl+Enter)"
 
 #. Translators:
-#: ../src/mail/mail-config.ui.h:58
+#: ../src/mail/mail-config.ui.h:59
 msgid "Before composer _format changes from HTML to Plain Text"
 msgstr "Prvo se _format sastavljača menja iz HTML-a u običan tekst"
 
-#: ../src/mail/mail-config.ui.h:59
+#: ../src/mail/mail-config.ui.h:60
 msgid "Confirmations"
 msgstr "Potvrđivanja"
 
 #. Translators: Label of a frame with a list of folders for which to use selected account in Send account 
overrides
-#: ../src/mail/mail-config.ui.h:63
+#: ../src/mail/mail-config.ui.h:64
 msgid "Use for Folders"
 msgstr "Koristi za fascikle"
 
 # bug(slobo): verovatno izveštaj o dostavi
 #. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account 
overrides
-#: ../src/mail/mail-config.ui.h:68
+#: ../src/mail/mail-config.ui.h:69
 msgid "Use for Recipients"
 msgstr "Koristi za primaoce"
 
 #. Translators: Label of a frame with a list of configured accounts in Send account overrides
-#: ../src/mail/mail-config.ui.h:70 ../src/modules/mail/em-composer-prefs.c:875
+#: ../src/mail/mail-config.ui.h:71 ../src/modules/mail/em-composer-prefs.c:875
 msgid "Account"
 msgstr "Nalog"
 
-#: ../src/mail/mail-config.ui.h:71
+#: ../src/mail/mail-config.ui.h:72
 msgid "Send account overrides"
 msgstr "Prepisivanja naloga slanja"
 
-#: ../src/mail/mail-config.ui.h:72
+#: ../src/mail/mail-config.ui.h:73
 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 "
@@ -18964,215 +18859,227 @@ msgstr ""
 "Spisak primaoca može da sadrži delimične adrese ili nazive. Delovi adrese i "
 "naziva se upoređuju zasebno."
 
-#: ../src/mail/mail-config.ui.h:73
+#: ../src/mail/mail-config.ui.h:74
 msgid "_Folder override has precedence over Recipient override"
 msgstr "Prepisivanje _fascikle ima prednost nad prepisivanjem primaoca"
 
-#: ../src/mail/mail-config.ui.h:74
+#: ../src/mail/mail-config.ui.h:75
 msgid "Send Account"
 msgstr "Nalog slanja"
 
-#: ../src/mail/mail-config.ui.h:80 ../src/smime/gui/smime-ui.ui.h:27
+#: ../src/mail/mail-config.ui.h:81 ../src/smime/gui/smime-ui.ui.h:27
 msgid "a"
 msgstr "a"
 
-#: ../src/mail/mail-config.ui.h:81 ../src/smime/gui/smime-ui.ui.h:28
+#: ../src/mail/mail-config.ui.h:82 ../src/smime/gui/smime-ui.ui.h:28
 msgid "b"
 msgstr "b"
 
-#: ../src/mail/mail-config.ui.h:82
+#: ../src/mail/mail-config.ui.h:83
 msgid "Start up"
 msgstr "Pokretanje"
 
-#: ../src/mail/mail-config.ui.h:83
+#: ../src/mail/mail-config.ui.h:84
 msgid "Check for new _messages on start"
 msgstr "Proveri nove _poruke prilikom pokretanja"
 
-#: ../src/mail/mail-config.ui.h:84
+#: ../src/mail/mail-config.ui.h:85
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Proveri nove _poruke u svim aktivnim nalozima"
 
-#: ../src/mail/mail-config.ui.h:85
+#: ../src/mail/mail-config.ui.h:86
 msgid "Message Display"
 msgstr "Prikaz poruke"
 
-#: ../src/mail/mail-config.ui.h:86
+#: ../src/mail/mail-config.ui.h:87
 msgid "_Use the same fonts as other applications"
 msgstr "_Koristi iste fontove kao drugi programi"
 
-#: ../src/mail/mail-config.ui.h:87
+#: ../src/mail/mail-config.ui.h:88
 msgid "S_tandard Font:"
 msgstr "_Standardni font:"
 
-#: ../src/mail/mail-config.ui.h:88
+#: ../src/mail/mail-config.ui.h:89
 msgid "Select HTML fixed width font"
 msgstr "Izaberite HTML font stalne veličine"
 
-#: ../src/mail/mail-config.ui.h:89
+#: ../src/mail/mail-config.ui.h:90
 msgid "Select HTML variable width font"
 msgstr "Izaberite HTML font promenljive veličine"
 
-#: ../src/mail/mail-config.ui.h:90
+#: ../src/mail/mail-config.ui.h:91
 msgid "Fix_ed Width Font:"
 msgstr "Font _stalne širine:"
 
-#: ../src/mail/mail-config.ui.h:91
+#: ../src/mail/mail-config.ui.h:92
 msgid "_Mark messages as read after"
 msgstr "_Označi poruke kao pročitane posle"
 
-#: ../src/mail/mail-config.ui.h:93
+#: ../src/mail/mail-config.ui.h:94
 msgid "Highlight _quotations with"
 msgstr "Naglasi _citate sa"
 
-#: ../src/mail/mail-config.ui.h:94
+#: ../src/mail/mail-config.ui.h:95
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:62
 msgid "Pick a color"
 msgstr "Izaberite boju"
 
-#: ../src/mail/mail-config.ui.h:95
+#: ../src/mail/mail-config.ui.h:96
 msgid "color"
 msgstr "boja"
 
-#: ../src/mail/mail-config.ui.h:96
+#: ../src/mail/mail-config.ui.h:97
 msgid "Default character e_ncoding:"
 msgstr "Podrazumevana _kodna strana:"
 
-#: ../src/mail/mail-config.ui.h:97
+#: ../src/mail/mail-config.ui.h:98
 msgid "Apply the same _view settings to all folders"
 msgstr "Primeni ista podešavanja _pregleda na svim fasciklama"
 
-#: ../src/mail/mail-config.ui.h:98
+#: ../src/mail/mail-config.ui.h:99
 msgid "F_all back to threading messages by subject"
 msgstr "Vra_ti se na nizanje poruka po naslovu"
 
-#: ../src/mail/mail-config.ui.h:99
+#: ../src/mail/mail-config.ui.h:100
 msgid "Delete Mail"
 msgstr "Obriši poštu"
 
-#: ../src/mail/mail-config.ui.h:100
+#: ../src/mail/mail-config.ui.h:101
 msgid "Empty _trash folders"
 msgstr "Isprazni fascikle _smeća"
 
-#: ../src/mail/mail-config.ui.h:101
+#: ../src/mail/mail-config.ui.h:102
 msgid "Confirm _when expunging a folder"
 msgstr "_Potvrdi kada prazniš fasciklu"
 
-#: ../src/mail/mail-config.ui.h:102
+#: ../src/mail/mail-config.ui.h:103
+msgid "Confirm when emptying a _Junk folder"
+msgstr "_Potvrdi kada prazniš fasciklu sa đubretom"
+
+#: ../src/mail/mail-config.ui.h:104
 msgid "Archive Mail"
 msgstr "Arhiviraj poruku"
 
-#: ../src/mail/mail-config.ui.h:103
+#: ../src/mail/mail-config.ui.h:105
 msgid "Archive folder to use for On This Computer messages"
 msgstr ""
 "Fascikla za arhivu koja se koristi za poruke unutar fascikle „Na ovom "
 "računaru“"
 
-#: ../src/mail/mail-config.ui.h:104
+#: ../src/mail/mail-config.ui.h:106
 msgid "On This Computer A_rchive folder:"
 msgstr "_Arhiva na ovom računaru:"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../src/mail/mail-config.ui.h:106
+#: ../src/mail/mail-config.ui.h:108
 msgid "_Show animated images"
 msgstr "Prikaži _animirane slike"
 
-#: ../src/mail/mail-config.ui.h:107
+#: ../src/mail/mail-config.ui.h:109
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Upozori pri slanju HTML pošte kontaktima koji ih ne žele"
 
-#: ../src/mail/mail-config.ui.h:108
+#: ../src/mail/mail-config.ui.h:110
 msgid "Loading Remote Content"
 msgstr "Učitavam udaljeni sadržaj"
 
-#: ../src/mail/mail-config.ui.h:109
+#: ../src/mail/mail-config.ui.h:111
 msgid "_Never load remote content from the Internet"
 msgstr "_Nikada ne učitavaj udaljeni sadržaj sa Interneta"
 
-#: ../src/mail/mail-config.ui.h:110
+#: ../src/mail/mail-config.ui.h:112
 msgid "_Load remote content only in messages from contacts"
 msgstr "_Učitaj udaljeni sadržaj samo u porukama od kontakta"
 
-#: ../src/mail/mail-config.ui.h:111
+#: ../src/mail/mail-config.ui.h:113
 msgid "_Always load remote content from the Internet"
 msgstr "_Uvek učitaj udaljeni sadržaj sa Interneta"
 
-#: ../src/mail/mail-config.ui.h:112
+#: ../src/mail/mail-config.ui.h:114
 msgid "Notify about _missing remote content in the message preview"
 msgstr "Obavesti o _nedostajućem udaljenom sadržaju u pregledu poruke"
 
 #: ../src/mail/mail-config.ui.h:115
+msgid "Add"
+msgstr "Dodaj"
+
+#: ../src/mail/mail-config.ui.h:116
+msgid "Remove"
+msgstr "Ukloni"
+
+#: ../src/mail/mail-config.ui.h:117
 msgid "Allow for sites:"
 msgstr "Dozvoli za sajtove:"
 
-#: ../src/mail/mail-config.ui.h:116
+#: ../src/mail/mail-config.ui.h:118
 msgid "Allow for senders:"
 msgstr "Dozvoli za pošiljaoce:"
 
-#: ../src/mail/mail-config.ui.h:117
+#: ../src/mail/mail-config.ui.h:119
 msgid "HTML Messages"
 msgstr "HTML poruke"
 
-#: ../src/mail/mail-config.ui.h:119
+#: ../src/mail/mail-config.ui.h:121
 msgid "Sender Photograph"
 msgstr "Fotografija pošiljaoca"
 
-#: ../src/mail/mail-config.ui.h:120
+#: ../src/mail/mail-config.ui.h:122
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Prikaži fotografiju pošiljaoca u pregledu pošte"
 
-#: ../src/mail/mail-config.ui.h:121
+#: ../src/mail/mail-config.ui.h:123
 msgid "Search gra_vatar.com for the photograph of sender"
 msgstr "Po_traži sliku pošiljaoca na gravatar.com"
 
-#: ../src/mail/mail-config.ui.h:122
+#: ../src/mail/mail-config.ui.h:124
 msgid "Displayed Message Headers"
 msgstr "Prikazana zaglavlja poruka"
 
-#: ../src/mail/mail-config.ui.h:123
+#: ../src/mail/mail-config.ui.h:125
 msgid "Mail Headers Table"
 msgstr "Tabela zaglavlja pošte"
 
-#: ../src/mail/mail-config.ui.h:124
-#: ../src/modules/addressbook/autocompletion-config.c:117
+#: ../src/mail/mail-config.ui.h:126
+#: ../src/modules/addressbook/autocompletion-config.c:118
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "Format datum/vreme"
 
-#: ../src/mail/mail-config.ui.h:126
+#: ../src/mail/mail-config.ui.h:128
 msgid "Check incoming _messages for junk"
-msgstr "Proveri ima li đubreta u _pristigloj pošti"
+msgstr "Proveri ima li đubreta u do_laznoj pošti"
 
-#: ../src/mail/mail-config.ui.h:127
+#: ../src/mail/mail-config.ui.h:129
 msgid "_Delete junk messages"
 msgstr "_Obriši poruke đubra"
 
-#: ../src/mail/mail-config.ui.h:128
+#: ../src/mail/mail-config.ui.h:130
 msgid "Junk Test Options"
 msgstr "Opcije za testiranje đubreta"
 
-#: ../src/mail/mail-config.ui.h:129
+#: ../src/mail/mail-config.ui.h:131
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Ne označava_j poruke kao đubre ako je pošiljalac u mom adresaru"
 
-#: ../src/mail/mail-config.ui.h:130
+#: ../src/mail/mail-config.ui.h:132
 msgid "_Lookup in local address book only"
 msgstr "_Potraži samo u lokalnom adresaru"
 
-#: ../src/mail/mail-config.ui.h:131
+#: ../src/mail/mail-config.ui.h:133
 msgid "Check cu_stom headers for junk"
 msgstr "Proveri ima li đubreta u _prilagođenim zaglavljima"
 
-#: ../src/mail/mail-config.ui.h:133
+#: ../src/mail/mail-config.ui.h:135
 #: ../src/modules/mail-config/e-mail-config-remote-accounts.c:302
 #: ../src/modules/mail-config/e-mail-config-smtp-backend.c:245
 msgid "No encryption"
 msgstr "Bez šifrovanja"
 
-#: ../src/mail/mail-config.ui.h:134
+#: ../src/mail/mail-config.ui.h:136
 msgid "TLS encryption"
 msgstr "TLS šifrovanje"
 
-#: ../src/mail/mail-config.ui.h:135
+#: ../src/mail/mail-config.ui.h:137
 msgid "SSL encryption"
 msgstr "SSL šifrovanje"
 
@@ -19209,9 +19116,6 @@ msgid "Review"
 msgstr "Pregledaj"
 
 #: ../src/mail/mail-dialogs.ui.h:12
-#| msgid ""
-#| "The messages you have selected for follow up are listed below.\n"
-#| "Please select a follow up action from the \"Flag\" menu."
 msgid ""
 "The messages you have selected for follow up are listed below.\n"
 "Please select a follow up action from the “Flag” menu."
@@ -19270,7 +19174,6 @@ msgstr ""
 "podržava autentifikaciju."
 
 #: ../src/mail/mail.error.xml.h:3
-#| msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgid "Your login to your server “{0}” as “{0}” failed."
 msgstr "Prijava na server „{0}“ kao „{0}“ nije uspela."
 
@@ -19424,11 +19327,6 @@ msgid "Use default drafts folder?"
 msgstr "Da koristim podrazumevanu fasciklu nacrta?"
 
 #: ../src/mail/mail.error.xml.h:34
-#| msgid ""
-#| "Unable to open the drafts folder for this account. Use the system drafts "
-#| "folder instead?\n"
-#| "\n"
-#| "The reported error was &quot;{0}&quot;."
 msgid ""
 "Unable to open the drafts folder for this account. Use the system drafts "
 "folder instead?\n"
@@ -19445,9 +19343,6 @@ msgid "Use _Default"
 msgstr "Koristi _osnovno"
 
 #: ../src/mail/mail.error.xml.h:38
-#| msgid ""
-#| "Are you sure you want to permanently remove all the deleted messages in "
-#| "folder \"{0}\"?"
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in "
 "folder “{0}”?"
@@ -19471,7 +19366,7 @@ msgstr ""
 "Sigurno želite trajno da uklonite sve obrisane poruke iz svih fascikli?"
 
 #: ../src/mail/mail.error.xml.h:42
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1657
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1631
 msgid "_Empty Trash"
 msgstr "_Izbaci smeće"
 
@@ -19515,19 +19410,16 @@ msgid "Error loading filter definitions."
 msgstr "Greška pri učitavanju definicija filtera."
 
 #: ../src/mail/mail.error.xml.h:54
-#| msgid "Cannot save to directory \"{0}\"."
 msgid "Cannot save to directory “{0}”."
 msgstr "Ne mogu da sačuvam u direktorijumu „{0}“."
 
 # mail:no-write-path-exists primary
 # mail:no-write-path-notfile primary
 #: ../src/mail/mail.error.xml.h:55
-#| msgid "Cannot save to file \"{0}\"."
 msgid "Cannot save to file “{0}”."
 msgstr "Ne mogu da sačuvam u datoteku „{0}“."
 
 #: ../src/mail/mail.error.xml.h:56
-#| msgid "Cannot create the save directory, because \"{1}\""
 msgid "Cannot create the save directory, because “{1}”"
 msgstr "Ne mogu da napravim direktorijum za čuvanje, zbog „{1}“"
 
@@ -19544,12 +19436,10 @@ msgid "File exists but is not a regular file."
 msgstr "Datoteka postoji ali nije regularna."
 
 #: ../src/mail/mail.error.xml.h:60
-#| msgid "Cannot delete folder \"{0}\"."
 msgid "Cannot delete folder “{0}”."
 msgstr "Ne mogu da obrišem fasciklu „{0}“."
 
 #: ../src/mail/mail.error.xml.h:61
-#| msgid "Cannot delete system folder \"{0}\"."
 msgid "Cannot delete system folder “{0}”."
 msgstr "Ne mogu da obrišem sistemsku fasciklu „{0}“."
 
@@ -19564,29 +19454,22 @@ msgstr ""
 "biti preimenovane, premeštene ili obrisane."
 
 #: ../src/mail/mail.error.xml.h:63
-#| msgid "Failed to expunge folder &quot;{0}&quot;."
 msgid "Failed to expunge folder “{0}”."
 msgstr "Ne mogu da izbacim fasciklu „{0}“."
 
 #: ../src/mail/mail.error.xml.h:65
-#| msgid "Failed to refresh folder &quot;{0}&quot;."
 msgid "Failed to refresh folder “{0}”."
 msgstr "Ne mogu da osvežim fasciklu „{0}“."
 
 #: ../src/mail/mail.error.xml.h:66
-#| msgid "Cannot rename or move system folder \"{0}\"."
 msgid "Cannot rename or move system folder “{0}”."
 msgstr "Ne mogu da preimenujem ili da premestim sistemsku fasciklu„{0}“."
 
 #: ../src/mail/mail.error.xml.h:67
-#| msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgid "Really delete folder “{0}” and all of its subfolders?"
 msgstr "Da obrišem fasciklu „{0}“ i sve podfascikle?"
 
 #: ../src/mail/mail.error.xml.h:68
-#| msgid ""
-#| "If you delete the folder, all of its contents and its subfolders' "
-#| "contents will be deleted permanently."
 msgid ""
 "If you delete the folder, all of its contents and its subfolders’ contents "
 "will be deleted permanently."
@@ -19595,15 +19478,10 @@ msgstr ""
 "obrisani."
 
 #: ../src/mail/mail.error.xml.h:70
-#| msgid "Really unsubscribe folder \"{0}\"?"
 msgid "Really unsubscribe folder “{0}”?"
 msgstr "Da otpišem fasciklu „{0}“?"
 
 #: ../src/mail/mail.error.xml.h:71
-#| msgid ""
-#| "If you unsubscribe the folder, it might not be visible in the Evolution, "
-#| "while still being available on the server. You can re-subscribe in Folder-"
-#| ">Subscriptions... menu."
 msgid ""
 "If you unsubscribe the folder, it might not be visible in the Evolution, "
 "while still being available on the server. You can re-subscribe in "
@@ -19618,7 +19496,6 @@ msgid "Do _Not Unsubscribe"
 msgstr "_Ne otpisuj"
 
 #: ../src/mail/mail.error.xml.h:74
-#| msgid "Really delete folder \"{0}\"?"
 msgid "Really delete folder “{0}”?"
 msgstr "Da obrišem fasciklu „{0}“?"
 
@@ -19629,7 +19506,7 @@ msgstr "Ukoliko obrišete fasciklu, sav njen sadržaj biće trajno obrisan."
 
 #: ../src/mail/mail.error.xml.h:76
 msgid "These messages are not copies."
-msgstr "Ove poruke nisu umnošci."
+msgstr "Ove poruke nisu kopije."
 
 #: ../src/mail/mail.error.xml.h:77
 msgid ""
@@ -19637,25 +19514,22 @@ msgid ""
 "Folder will delete the actual messages from the folder or folders in which "
 "they physically reside. Do you really want to delete these messages?"
 msgstr ""
-"Poruke prikazane u fasciklama za pretragu nisu umnošci. Njihovim brisanjem iz "
+"Poruke prikazane u fasciklama za pretragu nisu kopije. Njihovim brisanjem iz "
 "fascikle za pretragu izbrisaćete stvarne poruke iz fascikle ili fascikli u "
 "kojima se fizički nalaze. Da li zaista želite da izbrišete ove poruke?"
 
 # mail:no-rename-folder primary
 #: ../src/mail/mail.error.xml.h:78
-#| msgid "Cannot rename \"{0}\" to \"{1}\"."
 msgid "Cannot rename “{0}” to “{1}”."
 msgstr "Ne mogu da preimenujem „{0}“ u „{1}“."
 
 # bug: use the same message as above
 #: ../src/mail/mail.error.xml.h:79
-#| msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgid "A folder named “{1}” already exists. Please use a different name."
 msgstr "Fascikla sa imenom „{1}“ već postoji. Dodelite joj neki drugi naziv."
 
 # mail:no-move-folder-to-nostore primary
 #: ../src/mail/mail.error.xml.h:80
-#| msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgid "Cannot move folder “{0}” to “{1}”."
 msgstr "Ne mogu da premestim fasciklu „{0}“ u „{1}“."
 
@@ -19671,12 +19545,10 @@ msgstr "Ne mogu da otvorim fasciklu mete. Greška: {2}"
 
 # mail:no-copy-folder-to-nostore primary
 #: ../src/mail/mail.error.xml.h:83
-#| msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgid "Cannot copy folder “{0}” to “{1}”."
-msgstr "Ne mogu da umnožim fasciklu „{0}“ u „{1}“."
+msgstr "Ne mogu da kopiram fasciklu „{0}“ u „{1}“."
 
 #: ../src/mail/mail.error.xml.h:84
-#| msgid "Cannot create folder \"{0}\"."
 msgid "Cannot create folder “{0}”."
 msgstr "Ne mogu da napravim fasciklu „{0}“."
 
@@ -19699,8 +19571,8 @@ msgid "You may not create two accounts with the same name."
 msgstr "Ne možete da napravite dva naloga sa istim imenom."
 
 #: ../src/mail/mail.error.xml.h:89
-msgid "Are you sure you want to delete this account?"
-msgstr "Sigurno želite da obrišete ovaj nalog?"
+msgid "Are you sure you want to delete account “{0}”?"
+msgstr "Sigurno želite da obrišete nalog „{0}“?"
 
 #: ../src/mail/mail.error.xml.h:90
 msgid "If you proceed, the account information will be deleted permanently."
@@ -19736,7 +19608,6 @@ msgid "_Disable"
 msgstr "_Isključi"
 
 #: ../src/mail/mail.error.xml.h:98
-#| msgid "Cannot edit Search Folder \"{0}\" as it does not exist."
 msgid "Cannot edit Search Folder “{0}” as it does not exist."
 msgstr "Ne mogu da uredim fasciklu pretrage „{0}“ jer ne postoji."
 
@@ -19749,12 +19620,10 @@ msgstr ""
 "idite u uređivač fascikle pretrage i dodajte je izričito, ako želite."
 
 #: ../src/mail/mail.error.xml.h:101
-#| msgid "Cannot add Search Folder \"{0}\"."
 msgid "Cannot add Search Folder “{0}”."
 msgstr "Ne mogu da dodam fasciklu pretrage „{0}“."
 
 #: ../src/mail/mail.error.xml.h:102
-#| msgid "A folder named \"{0}\" already exists. Please use a different name."
 msgid "A folder named “{0}” already exists. Please use a different name."
 msgstr "Fascikla sa imenom „{0}“ već postoji. Dodelite joj neki drugi naziv."
 
@@ -19793,16 +19662,10 @@ msgstr ""
 "fascikle, sve mrežne fascikle ili i jedne i druge."
 
 #: ../src/mail/mail.error.xml.h:112
-#| msgid "Problem migrating old mail folder \"{0}\"."
 msgid "Problem migrating old mail folder “{0}”."
 msgstr "Problem pri prenosu stare fascikle pošte „{0}“."
 
 #: ../src/mail/mail.error.xml.h:113
-#| msgid ""
-#| "A non-empty folder at \"{1}\" already exists.\n"
-#| "\n"
-#| "You can choose to ignore this folder, overwrite or append its contents, "
-#| "or quit."
 msgid ""
 "A non-empty folder at “{1}” already exists.\n"
 "\n"
@@ -19823,19 +19686,10 @@ msgid "_Append"
 msgstr "_Prikači"
 
 #: ../src/mail/mail.error.xml.h:119
-#| msgid "Evolution's local mail format has changed."
 msgid "Evolution’s local mail format has changed."
 msgstr "Evolucijin lokalni format pošte je promenjen."
 
 #: ../src/mail/mail.error.xml.h:120
-#| msgid ""
-#| "Evolution's local mail format has changed from mbox to Maildir. Your "
-#| "local mail must be migrated to the new format before Evolution can "
-#| "proceed. Do you want to migrate now?\n"
-#| "\n"
-#| "An mbox account will be created to preserve the old mbox folders. You can "
-#| "delete the account after ensuring the data is safely migrated. Please "
-#| "make sure there is enough disk space if you choose to migrate now."
 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 "
@@ -19866,9 +19720,6 @@ msgid "Unable to read license file."
 msgstr "Ne mogu da pročitam datoteku licence."
 
 #: ../src/mail/mail.error.xml.h:126
-#| msgid ""
-#| "Cannot read the license file \"{0}\", due to an installation problem. You "
-#| "will not be able to use this provider until you can accept its license."
 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."
@@ -19960,32 +19811,30 @@ msgstr "_Ne, nikada"
 
 #: ../src/mail/mail.error.xml.h:144
 msgid "Copy folder in folder tree."
-msgstr "Umnožite fasciklu u stablo fascikli."
+msgstr "Kopiram fasciklu u stablo fascikli."
 
 #: ../src/mail/mail.error.xml.h:145
-#| msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgid "Are you sure you want to copy folder “{0}” to folder “{1}”?"
 msgstr ""
-"Da li ste sigurni da želite da umnožite fasciklu „{0}“ u fasciklu „{1}“?"
+"Da li ste sigurni da želite da kopirate fasciklu „{0}“ u fasciklu „{1}“?"
 
 #: ../src/mail/mail.error.xml.h:147
 msgid "Do _not copy"
-msgstr "N_e umnožavaj"
+msgstr "N_e kopiraj"
 
 #: ../src/mail/mail.error.xml.h:148
 msgid "_Always copy"
-msgstr "_Uvek umnoži"
+msgstr "_Uvek kopiraj"
 
 #: ../src/mail/mail.error.xml.h:149
 msgid "N_ever copy"
-msgstr "_Nikad ne umnožavaj"
+msgstr "_Nikad ne kopiraj"
 
 #: ../src/mail/mail.error.xml.h:150
 msgid "Move folder in folder tree."
 msgstr "Premestite fasciklu u stablo fascikli."
 
 #: ../src/mail/mail.error.xml.h:151
-#| msgid "Are you sure you want to to move folder '{0}' to folder '{1}'?"
 msgid "Are you sure you want to to move folder “{0}” to folder “{1}”?"
 msgstr ""
 "Da li ste sigurni da želite da premestite fasciklu „{0}“ u fasciklu „{1}“?"
@@ -20013,76 +19862,75 @@ msgid "Please enable the account or send using another account."
 msgstr "Omogućite nalog ili pošaljite koristeći drugi nalog."
 
 #: ../src/mail/mail.error.xml.h:158
+msgid "This message cannot be sent because there is no mail account configured"
+msgstr "Ova poruka se ne može poslati pošto niste podesili nijedan nalog"
+
+#: ../src/mail/mail.error.xml.h:159
+msgid ""
+"There had not been found any active mail account to send the message. Create "
+"or enable one first, please."
+msgstr ""
+"Nijedan aktivan nalog e-pošte koji je potreban za slanje poruke nije "
+"pronađen. Napravite novi ili omogućite nalog."
+
+#: ../src/mail/mail.error.xml.h:160
 msgid "Mail Deletion Failed"
 msgstr "Neuspešno brisanje pošte"
 
-#: ../src/mail/mail.error.xml.h:159
+#: ../src/mail/mail.error.xml.h:161
 msgid "You do not have sufficient permissions to delete this mail."
 msgstr "Nemate dovoljna ovlašćenja da obrišete ovu poštu."
 
-#: ../src/mail/mail.error.xml.h:160
-#| msgid "\"Check Junk\" Failed"
+#: ../src/mail/mail.error.xml.h:162
 msgid "“Check Junk” Failed"
 msgstr "Provera đubreta nije uspela"
 
-#: ../src/mail/mail.error.xml.h:161
-#| msgid "\"Report Junk\" Failed"
+#: ../src/mail/mail.error.xml.h:163
 msgid "“Report Junk” Failed"
 msgstr "Izveštaj za đubre nije uspeo"
 
-#: ../src/mail/mail.error.xml.h:162
-#| msgid "\"Report Not Junk\" Failed"
+#: ../src/mail/mail.error.xml.h:164
 msgid "“Report Not Junk” Failed"
 msgstr "Izveštavanje da nije đubre nije uspelo"
 
-#: ../src/mail/mail.error.xml.h:163
+#: ../src/mail/mail.error.xml.h:165
 msgid "Remove duplicate messages?"
 msgstr "Da uklonim duplirane poruke?"
 
-#: ../src/mail/mail.error.xml.h:164
+#: ../src/mail/mail.error.xml.h:166
 msgid "No duplicate messages found."
 msgstr "Nisu pronađene duple poruke."
 
 #. Translators: {0} is replaced with a folder name
-#: ../src/mail/mail.error.xml.h:166
-#| msgid "Folder '{0}' doesn't contain any duplicate message."
+#: ../src/mail/mail.error.xml.h:168
 msgid "Folder “{0}” doesn’t contain any duplicate message."
 msgstr "Fascikla „{0}“ ne sadrži nikakve duple poruke."
 
-#: ../src/mail/mail.error.xml.h:167
-#| msgid "Failed to connect mail account '{0}'"
+#: ../src/mail/mail.error.xml.h:169
 msgid "Failed to connect account “{0}”."
 msgstr "Ne mogu da se povežem na nalog „{0}“."
 
-#: ../src/mail/mail.error.xml.h:168
-#| msgid "Failed to disconnect account &quot;{0}&quot;."
+#: ../src/mail/mail.error.xml.h:170
 msgid "Failed to disconnect account “{0}”."
 msgstr "Ne mogu da prekinem vezu sa nalogom „{0}“."
 
-#: ../src/mail/mail.error.xml.h:169
-#| msgid "Failed to unsubscribe from folder &quot;{0}&quot;."
+#: ../src/mail/mail.error.xml.h:171
 msgid "Failed to unsubscribe from folder “{0}”."
 msgstr "Ne mogu da se odjavim sa fascikle „{0}“."
 
-#: ../src/mail/mail.error.xml.h:170
+#: ../src/mail/mail.error.xml.h:172
 msgid "Unable to retrieve message."
 msgstr "Ne mogu da dovučem poruku."
 
-#: ../src/mail/mail.error.xml.h:171
+#: ../src/mail/mail.error.xml.h:173
 msgid "{0}"
 msgstr "{0}"
 
-#: ../src/mail/mail.error.xml.h:172
+#: ../src/mail/mail.error.xml.h:174
 msgid "Message is not available in offline mode."
 msgstr "Poruka nije dostupna u režimu van mreže."
 
-#: ../src/mail/mail.error.xml.h:173
-#| msgid ""
-#| "This can be due to the message not being downloaded yet. The folder, or "
-#| "the account, can be marked for offline synchronization. Then, once the "
-#| "account 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."
+#: ../src/mail/mail.error.xml.h:175
 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 "
@@ -20096,42 +19944,42 @@ msgstr ""
 "poruke za rad van mreže. Tako ćete preuzeti sve poruke i moći da ih čitate i "
 "kada niste pri internetu."
 
-#: ../src/mail/mail.error.xml.h:174
+#: ../src/mail/mail.error.xml.h:176
 msgid "Failed to open folder."
 msgstr "Ne mogu da otvorim fasciklu."
 
 # bug: plural-forms
-#: ../src/mail/mail.error.xml.h:176
+#: ../src/mail/mail.error.xml.h:178
 msgid "Failed to find duplicate messages."
 msgstr "Ne mogu da pronađem duplirane poruke."
 
-#: ../src/mail/mail.error.xml.h:177
+#: ../src/mail/mail.error.xml.h:179
 msgid "Failed to retrieve messages."
 msgstr "Ne mogu da dovučem poruke."
 
 # bug: plural-forms
-#: ../src/mail/mail.error.xml.h:178
+#: ../src/mail/mail.error.xml.h:180
 msgid "Failed to mark messages as read."
 msgstr "Ne mogu da označim poruke pročitanim."
 
-#: ../src/mail/mail.error.xml.h:179
+#: ../src/mail/mail.error.xml.h:181
 msgid "Failed to remove attachments from messages."
 msgstr "Ne mogu da uklonim priloge iz poruka."
 
-#: ../src/mail/mail.error.xml.h:180
+#: ../src/mail/mail.error.xml.h:182
 msgid "Failed to download messages for offline viewing."
 msgstr "Ne mogu da preuzmem poruke za pregledanje van mreže."
 
 # bug: plural-forms
-#: ../src/mail/mail.error.xml.h:181
+#: ../src/mail/mail.error.xml.h:183
 msgid "Failed to save messages to disk."
 msgstr "Ne mogu da sačuvam poruke na disk."
 
-#: ../src/mail/mail.error.xml.h:182
+#: ../src/mail/mail.error.xml.h:184
 msgid "Hidden file is attached."
 msgstr "Skrivena datoteka je priložena."
 
-#: ../src/mail/mail.error.xml.h:183
+#: ../src/mail/mail.error.xml.h:185
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -20139,53 +19987,47 @@ msgstr ""
 "Prilog pod nazivom {0} je skrivena datoteka i može da sadrži osetljive "
 "podatke. Pregledajte je pre nego li je pošaljete."
 
-#: ../src/mail/mail.error.xml.h:184
+#: ../src/mail/mail.error.xml.h:186
 msgid "Printing failed."
 msgstr "Štampanje nije uspelo."
 
-#: ../src/mail/mail.error.xml.h:185
-#| msgid "The printer replied &quot;{0}&quot;."
+#: ../src/mail/mail.error.xml.h:187
 msgid "The printer replied “{0}”."
 msgstr "Štampač je odgovorio „{0}“."
 
-#: ../src/mail/mail.error.xml.h:186
+#: ../src/mail/mail.error.xml.h:188
 msgid "Could not perform this operation on {0}."
 msgstr "Ne mogu da izvršim ovu radnju nad „{0}“."
 
-#: ../src/mail/mail.error.xml.h:187
+#: ../src/mail/mail.error.xml.h:189
 msgid "You must be working online to complete this operation."
 msgstr "Morate da budete na mreži da biste završili ovu radnju."
 
-#: ../src/mail/mail.error.xml.h:188
-#| msgid "Message from &quot;{0}&quot; account:"
+#: ../src/mail/mail.error.xml.h:190
 msgid "Message from “{0}” account:"
 msgstr "Poruka sa „{0}“ naloga:"
 
-#: ../src/mail/mail.error.xml.h:189
-#| msgid "Failed to mark thread to be ignored in folder '{0}'"
+#: ../src/mail/mail.error.xml.h:191
 msgid "Failed to mark thread to be ignored in folder “{0}”"
 msgstr "Ne mogu da označim raspravu kao zanemarenu unutar fascikle „{0}“"
 
-#: ../src/mail/mail.error.xml.h:190
-#| msgid "Failed to unmark thread from being ignored in folder '{0}'"
+#: ../src/mail/mail.error.xml.h:192
 msgid "Failed to unmark thread from being ignored in folder “{0}”"
 msgstr "Ne mogu da označim raspravu kao nezanemarenu unutar fascikle „{0}“"
 
-#: ../src/mail/mail.error.xml.h:191
-#| msgid "Failed to mark subthread to be ignored in folder '{0}'"
+#: ../src/mail/mail.error.xml.h:193
 msgid "Failed to mark subthread to be ignored in folder “{0}”"
 msgstr "Ne mogu da označim podraspravu kao zanemarenu unutar fascikle „{0}“"
 
-#: ../src/mail/mail.error.xml.h:192
-#| msgid "Failed to unmark subthread from being ignored in folder '{0}'"
+#: ../src/mail/mail.error.xml.h:194
 msgid "Failed to unmark subthread from being ignored in folder “{0}”"
 msgstr "Ne mogu da označim podraspravu kao nezanemarenu unutar fascikle „{0}“"
 
-#: ../src/mail/mail.error.xml.h:193
+#: ../src/mail/mail.error.xml.h:195
 msgid "Remote content download had been blocked for this message."
 msgstr "Preuzimanje udaljenog sadržaja je zabranjeno za ovu poruku."
 
-#: ../src/mail/mail.error.xml.h:194
+#: ../src/mail/mail.error.xml.h:196
 msgid ""
 "You can download remote content manually, or set to remember to download "
 "remote content for this sender or used sites."
@@ -20194,42 +20036,39 @@ msgstr ""
 "preuzima sa ovog sajta ili od ovog pošiljaoca."
 
 #. Translators: This constructs a string like "Follow-up, Completed on Tuesday, January 13, 2009"
-#: ../src/mail/mail.error.xml.h:196
+#: ../src/mail/mail.error.xml.h:198
 msgid "{0}, Completed on {1}"
 msgstr "{0}, završeno je {1}"
 
 #. Translators: This constructs a string like "Follow-up by Tuesday, January 13, 2009"
-#: ../src/mail/mail.error.xml.h:198
+#: ../src/mail/mail.error.xml.h:200
 msgid "{0} by {1}"
 msgstr "{0} do {1}"
 
 #. Translators: This constructs a string like "Overdue: Follow-up by Tuesday, January 13, 2009"
-#: ../src/mail/mail.error.xml.h:200
+#: ../src/mail/mail.error.xml.h:202
 msgid "Overdue: {0} by {1}"
 msgstr "Završen: {0} do {1}"
 
-#: ../src/mail/mail.error.xml.h:202
+#: ../src/mail/mail.error.xml.h:204
 msgid "This message note has been changed, but has not been saved."
 msgstr "Ova beleška poruke je izmenjena, ali nije sačuvana."
 
 #. Translators: {0} is the name of the folder where the delete of the message note failed.
-#: ../src/mail/mail.error.xml.h:205
-#| msgid "Failed to delete message note in folder '{0}'"
+#: ../src/mail/mail.error.xml.h:207
 msgid "Failed to delete message note in folder “{0}”"
 msgstr "Nisam uspeo da obrišem belešku poruke u fascikli „{0}“"
 
 #. Translators: {0} is the name of the folder where the store of the message note failed.
-#: ../src/mail/mail.error.xml.h:207
-#| msgid "Failed to store message note in folder '{0}'"
+#: ../src/mail/mail.error.xml.h:209
 msgid "Failed to store message note in folder “{0}”"
 msgstr "Nisam uspeo da smestim belešku poruke u fasciklu „{0}“"
 
-#: ../src/mail/mail.error.xml.h:208
-#| msgid "Search for text in the body of the displayed message"
+#: ../src/mail/mail.error.xml.h:210
 msgid "Something has gone wrong when displaying the message"
 msgstr "Nešto je pošlo naopako prilikom prikazivanja poruke"
 
-#: ../src/mail/mail.error.xml.h:209
+#: ../src/mail/mail.error.xml.h:211
 msgid ""
 "A WebKitWebProcess crashed when displaying the message. You can try again by "
 "moving to another message and back. If the issue persists, please file a bug "
@@ -20239,11 +20078,11 @@ msgstr ""
 "ponovo tako što ćete otići na neku drugu poruku i vratiti se nazad. Ako ni "
 "to ne pomaže, popunite izveštaj o grešci na Gnomovoj bubaždaji."
 
-#: ../src/mail/mail.error.xml.h:210
+#: ../src/mail/mail.error.xml.h:212
 msgid "Something has gone wrong when displaying the signature"
 msgstr "Nešto je pošlo naopako prilikom prikazivanja potpisa"
 
-#: ../src/mail/mail.error.xml.h:211
+#: ../src/mail/mail.error.xml.h:213
 msgid ""
 "A WebKitWebProcess crashed when displaying the signature. You can try again "
 "by moving to another signature and back. If the issue persists, please file "
@@ -20253,6 +20092,26 @@ msgstr ""
 "ponovo tako što ćete otići na neki drugi potpis i vratiti se nazad. Ako ni "
 "to ne pomaže, popunite izveštaj o grešci na Gnomovoj bubaždaji."
 
+#: ../src/mail/mail.error.xml.h:214
+msgid "Are you sure you want to delete all the messages in the Junk folder?"
+msgstr "Sigurno želite trajno da uklonite sve poruke iz fascikle Smeće?"
+
+#: ../src/mail/mail.error.xml.h:215
+msgid ""
+"These messages will be shown in the Trash folder, where they can be "
+"permanently deleted later."
+msgstr ""
+"Ove poruke će biti prikazane u fascikli sa smećem, odakle se kasnije mogu "
+"zauvek obrisati."
+
+#: ../src/mail/mail.error.xml.h:216
+msgid "_Empty Junk"
+msgstr "Isprazni _đubre"
+
+#: ../src/mail/mail.error.xml.h:217
+msgid "Failed to empty Junk folder “{0}”"
+msgstr "Ne mogu da ispraznim fasciklu sa đubretom „{0}“"
+
 #: ../src/mail/mail-send-recv.c:192
 msgid "Canceling..."
 msgstr "Otkazujem..."
@@ -20275,25 +20134,21 @@ msgstr "Čekam..."
 
 #: ../src/mail/mail-send-recv.c:1228
 #, c-format
-#| msgid "Checking for new mail at '%s'"
 msgid "Checking for new mail at “%s”"
 msgstr "Vršim proveru za novom poštom na „%s“"
 
 #: ../src/mail/mail-send-recv.c:1455
 #, c-format
-#| msgid "Deleting junk and expunging trash at '%s'"
 msgid "Deleting junk and expunging trash at “%s”"
 msgstr "Brišem nepoželjno i izbacujem smeće iz „%s“"
 
 #: ../src/mail/mail-send-recv.c:1457
 #, c-format
-#| msgid "Deleting junk at '%s'"
 msgid "Deleting junk at “%s”"
 msgstr "Brišem đubre iz „%s“"
 
 #: ../src/mail/mail-send-recv.c:1459
 #, c-format
-#| msgid "Expunging trash at '%s'"
 msgid "Expunging trash at “%s”"
 msgstr "Izbacujem smeće iz „%s“"
 
@@ -20349,7 +20204,7 @@ msgstr "Više"
 msgid "Highest"
 msgstr "Najviše"
 
-#: ../src/mail/message-list.c:470 ../src/mail/message-list.c:6286
+#: ../src/mail/message-list.c:470 ../src/mail/message-list.c:6289
 msgid "Generating message list"
 msgstr "Pravljenje liste poruka"
 
@@ -20389,12 +20244,7 @@ msgstr "Poruke"
 msgid "Follow-up"
 msgstr "Sledi"
 
-#: ../src/mail/message-list.c:6225
-#| 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 "
-#| "running a new search either by clearing it with Search->Clear menu item "
-#| "or by changing the query above."
+#: ../src/mail/message-list.c:6228
 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 "
@@ -20406,7 +20256,7 @@ msgstr ""
 "pokrenite novu pretragu bilo čišćenjem iste pomoću stavke izbornika "
 "„Pretraga→Očisti“ ili izmenivši gornji upit."
 
-#: ../src/mail/message-list.c:6233
+#: ../src/mail/message-list.c:6236
 msgid "There are no messages in this folder."
 msgstr "Nema poruka u ovoj fascikli."
 
@@ -20435,7 +20285,6 @@ msgid "Messages To"
 msgstr "Poruke"
 
 #: ../src/mail/message-list.etspec.h:20
-#| msgid "Subject - Trimmed"
 msgid "Subject — Trimmed"
 msgstr "Naslov — skraćeno"
 
@@ -20453,54 +20302,133 @@ msgid "Subject or Addresses contains"
 msgstr "Naslov ili adrese sadrže"
 
 #: ../src/mail/searchtypes.xml.in.h:58
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2186
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2179
 msgid "Recipients contain"
 msgstr "Primaoci sadrže"
 
 #: ../src/mail/searchtypes.xml.in.h:59
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2179
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2172
 msgid "Message contains"
 msgstr "Poruka sadrži"
 
 #: ../src/mail/searchtypes.xml.in.h:60
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2200
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2193
 msgid "Subject contains"
 msgstr "Naslov sadrži"
 
 #: ../src/mail/searchtypes.xml.in.h:61
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2193
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2186
 msgid "Sender contains"
 msgstr "Pošiljalac sadrži"
 
 #: ../src/mail/searchtypes.xml.in.h:62
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2165
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2158
 msgid "Body contains"
 msgstr "Telo sadrži"
 
 #: ../src/mail/searchtypes.xml.in.h:63
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2172
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2165
 msgid "Free form expression"
 msgstr "Izraz u slobodnoj formi"
 
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:275
+msgid "Edit Collection"
+msgstr "Izmenite zbirku"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:312
+msgid "Use for"
+msgstr "Koristi za"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:316
+#: ../src/plugins/pst-import/pst-importer.c:522
+msgid "_Mail"
+msgstr "_Pošta"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:327
+msgid "C_alendar"
+msgstr "_Kalendar"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:428
+#: ../src/modules/addressbook/e-book-shell-backend.c:262
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:137
+msgid "New Address Book"
+msgstr "Novi adresar"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:436
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:185
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:178
+msgid "New Memo List"
+msgstr "Novi spisak beleške"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:480
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:210
+msgid "Address Book Properties"
+msgstr "Postavke adresara"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:484
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:283
+msgid "Calendar Properties"
+msgstr "Osobine kalendara"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:488
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:250
+msgid "Memo List Properties"
+msgstr "Osobine spiska zadataka"
+
+#: ../src/modules/accounts-window/e-accounts-window-editors.c:492
+#: ../src/modules/calendar/e-task-shell-view-actions.c:274
+msgid "Task List Properties"
+msgstr "Osobine spiska zadataka"
+
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:174
+msgid "_Back"
+msgstr "_Nazad"
+
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:195
+msgid "_Browse"
+msgstr "_Pregledaj"
+
+#: ../src/modules/accounts-window/e-webdav-browser-page.c:197
+msgid ""
+"Browse a WebDAV (CalDAV or CardDAV) server and create, edit or delete "
+"address books, calendars, memo lists or task lists there"
+msgstr ""
+"Pretražite WebDAV (CalDAV ili CardDAV) server i napravite, uredite ili "
+"obrišite adresare, kalendare, beleške ili rokovnik."
+
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a 
date in message list
-#: ../src/modules/addressbook/autocompletion-config.c:123
-#: ../src/modules/mail/em-mailer-prefs.c:1556
+#: ../src/modules/addressbook/autocompletion-config.c:124
+#: ../src/modules/mail/em-mailer-prefs.c:1562
 msgid "_Table column:"
 msgstr "Kolona _tabele:"
 
-#: ../src/modules/addressbook/autocompletion-config.c:126
-msgid "Address formatting"
-msgstr "Oblikovanje adrese"
-
-#: ../src/modules/addressbook/autocompletion-config.c:129
+#: ../src/modules/addressbook/autocompletion-config.c:130
 msgid "_Format address according to standard of its destination country"
 msgstr "_Oblikuj adresu prema standardu države njenog odredišta"
 
-#: ../src/modules/addressbook/autocompletion-config.c:137
+#. Translators: This is part of a sentence "Open maps with OpenStreetMap" and "Open maps with Google"
+#: ../src/modules/addressbook/autocompletion-config.c:143
+msgctxt "OpenMap"
+msgid "Open _maps with"
+msgstr "Otvorite _karte sa"
+
+#. Translators: This is part of "Open maps with OpenStreetMap"
+#: ../src/modules/addressbook/autocompletion-config.c:150
+msgctxt "OpenMap"
+msgid "OpenStreetMap"
+msgstr "OpenStreetMap"
+
+#. Translators: This is part of "Open maps with Google"
+#: ../src/modules/addressbook/autocompletion-config.c:153
+msgctxt "OpenMap"
+msgid "Google"
+msgstr "Gugl"
+
+#: ../src/modules/addressbook/autocompletion-config.c:169
 msgid "Autocompletion"
 msgstr "Samodovršavanje"
 
-#: ../src/modules/addressbook/autocompletion-config.c:140
+#: ../src/modules/addressbook/autocompletion-config.c:172
 msgid "Always _show address of the autocompleted contact"
 msgstr "Uvek _prikazuj adresu samodopunjenog kontakta"
 
@@ -20524,298 +20452,289 @@ msgstr "Podaci za stupanje u vezu"
 msgid "Contact information for %s"
 msgstr "Podaci o kontaktu za %s"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:256
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:137
-msgid "New Address Book"
-msgstr "Novi adresar"
-
-#: ../src/modules/addressbook/e-book-shell-backend.c:265
+#: ../src/modules/addressbook/e-book-shell-backend.c:271
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:267
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1043
+#: ../src/modules/addressbook/e-book-shell-backend.c:273
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1049
 msgid "Create a new contact"
 msgstr "Napravite novi kontakt"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:272
+#: ../src/modules/addressbook/e-book-shell-backend.c:278
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Li_sta kontakta"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:274
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1050
+#: ../src/modules/addressbook/e-book-shell-backend.c:280
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1056
 msgid "Create a new contact list"
 msgstr "Napravite novi spisak kontakta"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:282
+#: ../src/modules/addressbook/e-book-shell-backend.c:288
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Adresar"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:284
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:966
+#: ../src/modules/addressbook/e-book-shell-backend.c:290
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:972
 msgid "Create a new address book"
 msgstr "Napravite novi adresar"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:210
-msgid "Address Book Properties"
-msgstr "Postavke adresara"
-
 #. Translators: This is a save dialog title
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:533
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:829
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:534
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:835
 msgid "Save as vCard"
 msgstr "Sačuvajte kao vKartu"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:936
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:942
 msgid "Co_py All Contacts To..."
-msgstr "Umnoži _sve kontakte u..."
+msgstr "Kopiraj _sve kontakte u..."
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:938
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:944
 msgid "Copy the contacts of the selected address book to another"
-msgstr "Umnožite kontakte izabranog adresara u drugi"
+msgstr "Kopira kontakte izabranog adresara u drugi"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:943
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:949
 msgid "D_elete Address Book"
 msgstr "O_briši adresar"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:945
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:951
 msgid "Delete the selected address book"
-msgstr "Obrišite izabrani adresar"
+msgstr "Briše izabrani adresar"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:950
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:956
 msgid "_Manage Address Book groups..."
 msgstr "_Upravljaj grupama adresara..."
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:952
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:958
 #: ../src/modules/calendar/e-task-shell-view-actions.c:719
 msgid "Manage task list groups order and visibility"
-msgstr "Upravljajte redosledom i vidljivošću grupa spiskova zadataka"
+msgstr "Upravlja redosledom i vidljivošću grupa spiskova zadataka"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:957
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:963
 msgid "Mo_ve All Contacts To..."
 msgstr "Premesti _sve kontakte u..."
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:959
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:965
 msgid "Move the contacts of the selected address book to another"
-msgstr "Premestite kontakte izabranog adresara u drugi"
+msgstr "Premešta kontakte izabranog adresara u drugi"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:964
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:970
 msgid "_New Address Book"
 msgstr "_Novi adresar"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:971
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:977
 msgid "Address _Book Properties"
 msgstr "Podešavanja adresa_ra"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:973
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:979
 msgid "Show properties of the selected address book"
-msgstr "Prikažite svojstva izabranog adresara"
+msgstr "Prikazuje svojstva izabranog adresara"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:978
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1290
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:984
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1330
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:612
 #: ../src/modules/calendar/e-task-shell-view-actions.c:738
 msgid "Re_fresh"
 msgstr "O_sveži"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:980
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:986
 msgid "Refresh the selected address book"
-msgstr "Osvežite izabrani adresar"
+msgstr "Osvežava izabrani adresar"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:985
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:991
 msgid "Address Book _Map"
-msgstr "_Mapa adresara"
+msgstr "_Karta adresara"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:987
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:993
 msgid "Show map with all contacts from selected address book"
-msgstr "Prikažite mapu sa svim kontaktima iz izabranih adresara"
+msgstr "Prikazuje kartu sa svim kontaktima iz izabranih adresara"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:992
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1297
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:998
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1337
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:619
 #: ../src/modules/calendar/e-task-shell-view-actions.c:745
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1749
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1730
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:994
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1000
 msgid "Rename the selected address book"
-msgstr "Preimenujte izabrani adresar"
+msgstr "Preimenuje izabrani adresar"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1001
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1007
 msgid "Stop loading"
 msgstr "Prekini učitavanje"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1006
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1012
 msgid "_Copy Contact To..."
-msgstr "_Umnoži kontakt u..."
+msgstr "_Kopiraj kontakt u..."
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1008
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1014
 msgid "Copy selected contacts to another address book"
-msgstr "Umnožite izabrane kontakte u drugi adresar"
+msgstr "Kopira izabrane kontakte u drugi adresar"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1013
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1019
 msgid "_Delete Contact"
 msgstr "_Ukloni Kontakt"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1020
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1026
 msgid "_Find in Contact..."
 msgstr "_Pronađi u kontaktu..."
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1022
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1028
 msgid "Search for text in the displayed contact"
 msgstr "Pretražite tekst u prikazanom kontaktu"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1027
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1033
 msgid "_Forward Contact..."
 msgstr "_Prosledi kontakt..."
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1029
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1035
 msgid "Send selected contacts to another person"
-msgstr "Pošaljite izabrane kontakte drugoj osobi"
+msgstr "Šalje izabrane kontakte drugoj osobi"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1034
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1040
 msgid "_Move Contact To..."
 msgstr "_Premesti kontakt u..."
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1036
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1042
 msgid "Move selected contacts to another address book"
-msgstr "Premestite izabrane kontakte u drugi adresar"
+msgstr "Premešta izabrane kontakte u drugi adresar"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1041
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1047
 msgid "_New Contact..."
 msgstr "Novi kon_takt..."
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1048
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1054
 msgid "New Contact _List..."
 msgstr "Nova _lista kontakta..."
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1055
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1061
 msgid "_Open Contact"
 msgstr "_Otvori kontakt"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1057
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1063
 msgid "View the current contact"
 msgstr "Pregledajte tekući kontakt"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1062
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1068
 msgid "_Send Message to Contact..."
 msgstr "_Pošalji poruku kontaktu..."
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1064
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1070
 msgid "Send a message to the selected contacts"
-msgstr "Pošaljite poruku izabranim kontaktima"
+msgstr "Šalje poruku izabranim kontaktima"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1071
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1460
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1077
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1507
 #: ../src/modules/calendar/e-task-shell-view-actions.c:810
 msgid "_Actions"
 msgstr "_Radnje"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1078
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1084
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:663
 #: ../src/modules/calendar/e-task-shell-view-actions.c:817
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1921
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1902
 msgid "_Preview"
 msgstr "_Pregled"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1091
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1489
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1097
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1536
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:680
 #: ../src/modules/calendar/e-task-shell-view-actions.c:834
 msgid "_Manage groups..."
 msgstr "_Upravljaj grupama..."
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1103
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1109
 msgid "Address Book Map"
-msgstr "Mapa adresara"
+msgstr "Karta adresara"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1135
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1141
 msgid "Contact _Preview"
 msgstr "Pre_gled kontakta"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1137
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1143
 msgid "Show contact preview window"
-msgstr "Prikažite prozor za pregled kontakta"
+msgstr "Prikazuje prozor za pregled kontakta"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1143
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1149
 msgid "Show _Maps"
-msgstr "Prikaži _mape"
+msgstr "Prikaži _karte"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1145
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1151
 msgid "Show maps in contact preview window"
-msgstr "Prikažite mape u prozoru za pregled kontakata"
+msgstr "Prikazuje karte u prozoru za pregled kontakata"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1164
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1170
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:741
 #: ../src/modules/calendar/e-task-shell-view-actions.c:907
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2067
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2060
 msgid "_Classic View"
 msgstr "_Klasični prikaz"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1166
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1172
 msgid "Show contact preview below the contact list"
 msgstr "Prikažite pregled kontakta ispod kontakt liste"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1171
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1177
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:748
 #: ../src/modules/calendar/e-task-shell-view-actions.c:914
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2074
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2067
 msgid "_Vertical View"
 msgstr "_Uspravni pregled"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1173
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1179
 msgid "Show contact preview alongside the contact list"
-msgstr "Prikažite pregled kontakta pored kontakt liste"
+msgstr "Prikazuje pregled kontakta pored kontakt liste"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1188
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1645
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1194
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1696
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:765
 #: ../src/modules/calendar/e-task-shell-view-actions.c:966
 msgid "Unmatched"
 msgstr "Ne odgovara"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1198
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1655
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1204
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1706
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:775
 #: ../src/modules/calendar/e-task-shell-view-actions.c:976
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2158
-#: ../src/shell/e-shell-content.c:655
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2151
+#: ../src/shell/e-shell-content.c:637
 msgid "Advanced Search"
 msgstr "Napredna pretraga"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1231
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1237
 msgid "Print all shown contacts"
 msgstr "Štampaj sve prikazane kontakte"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1238
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1244
 msgid "Preview the contacts to be printed"
 msgstr "Pregled kontakata pred štampu"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1245
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1251
 msgid "Print selected contacts"
 msgstr "Štampa izabrane kontakte"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1260
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1266
 msgid "S_ave Address Book as vCard"
 msgstr "_Sačuvaj adresar kao vKartu"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1262
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1268
 msgid "Save the contacts of the selected address book as a vCard"
-msgstr "Sačuvajte kontakte izabranog adresara kao vKartu"
+msgstr "Čuva kontakte izabranog adresara kao vKartu"
 
 #. Translators: This is an action label
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1268
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1278
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1274
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1284
 msgid "_Save as vCard..."
 msgstr "_Sačuvaj kao vKartu..."
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1270
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1276
 msgid "Save selected contacts as a vCard"
-msgstr "Sačuvaj izabrane kontakte kao VKartu"
+msgstr "Čuva izabrane kontakte kao VKartu"
 
 #: ../src/modules/addressbook/e-book-shell-view.c:311
 msgid "_Forward Contacts"
@@ -20837,7 +20756,7 @@ msgstr "_Pošalji poruku na listu"
 msgid "_Send Message to Contact"
 msgstr "_Pošalji poruku kontaktu"
 
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:164
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:162
 msgid ""
 "You can restore Evolution from a backup file.\n"
 "\n"
@@ -20847,57 +20766,56 @@ msgstr ""
 "\n"
 "To će povratiti sve vaše lične podatke, podešavanja propusnika pošte, itd."
 
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:179
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:177
 msgid "_Restore from a backup file:"
 msgstr "_Vrati iz datoteke rezerve:"
 
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:190
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:188
 msgid "Choose a backup file to restore"
 msgstr "Izaberite datoteku rezerve za povraćaj"
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:310
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:291
 #: ../src/modules/backup-restore/e-mail-config-restore-ready-page.c:57
 msgid "Restore from Backup"
 msgstr "Vrati iz rezerve"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:233
+#: ../src/modules/backup-restore/evolution-backup-restore.c:285
 msgid "Select name of the Evolution backup file"
 msgstr "Izaberite naziv za datoteku rezerve Evolucije"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:266
+#: ../src/modules/backup-restore/evolution-backup-restore.c:318
 msgid "_Restart Evolution after backup"
 msgstr "_Ponovo pokreni Evoluciju nakon pravljenja rezerve"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:301
+#: ../src/modules/backup-restore/evolution-backup-restore.c:353
 msgid "Re_start Evolution after restore"
 msgstr "_Ponovo pokreni Evoluciju nakon povraćaja"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:343
+#: ../src/modules/backup-restore/evolution-backup-restore.c:395
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Izaberite naziv datoteke rezerve Evolucije za povraćaj"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:352
+#: ../src/modules/backup-restore/evolution-backup-restore.c:404
 #, c-format
-#| msgid "Checking content of backup file '%s', please wait..."
 msgid "Checking content of backup file “%s”, please wait..."
 msgstr "Proveravam sadržaj rezervne datoteke „%s“..."
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:373
+#: ../src/modules/backup-restore/evolution-backup-restore.c:425
 msgid "_Back up Evolution Data..."
 msgstr "Napravi _rezervu podataka Evolucije..."
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:375
+#: ../src/modules/backup-restore/evolution-backup-restore.c:427
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "Napravite rezervu podataka i postavki Evolucije u arhivu"
 
 # shell:noshell-reason title
-#: ../src/modules/backup-restore/evolution-backup-restore.c:380
+#: ../src/modules/backup-restore/evolution-backup-restore.c:432
 msgid "R_estore Evolution Data..."
 msgstr "_Vrati podatke Evolucije..."
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:382
+#: ../src/modules/backup-restore/evolution-backup-restore.c:434
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Vratite podatke i postavke Evolucije iz arhive"
 
@@ -20973,7 +20891,6 @@ msgstr "Rezervni primerak Evolucije"
 
 #: ../src/modules/backup-restore/evolution-backup-tool.c:900
 #, c-format
-#| msgid "Backing up to the folder %s"
 msgid "Backing up to the file %s"
 msgstr "Smeštam rezervni primerak u datoteku „%s“"
 
@@ -20983,7 +20900,6 @@ msgstr "Povraćaj Evolucije"
 
 #: ../src/modules/backup-restore/evolution-backup-tool.c:905
 #, c-format
-#| msgid "Restoring from the folder %s"
 msgid "Restoring from the file %s"
 msgstr "Vraćam iz datoteke „%s“"
 
@@ -21013,7 +20929,6 @@ msgid "Invalid Evolution backup file"
 msgstr "Neispravna datoteka rezervnog primerka Evolucije"
 
 #: ../src/modules/backup-restore/org-gnome-backup-restore.error.xml.h:2
-#| msgid "File '{0}' is not a valid Evolution backup file."
 msgid "File “{0}” is not a valid Evolution backup file."
 msgstr "„{0}“ nije ispravna rezervna kopija Evolucije."
 
@@ -21170,10 +21085,6 @@ msgid "Method:"
 msgstr "Način:"
 
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:697
-#| msgid ""
-#| "This is the method Evolution will use to authenticate you.  Note that "
-#| "setting this to \"Using email address\" requires anonymous access to your "
-#| "LDAP server."
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to “Using email address” requires anonymous access to your LDAP "
@@ -21214,11 +21125,6 @@ msgid "Search Scope:"
 msgstr "Obim pretrage:"
 
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:786
-#| 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 below your search base.  A search scope of \"One Level\" will "
-#| "only include the entries one level beneath your search base."
 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 "
@@ -21428,44 +21334,33 @@ msgstr "U_vezi u spisak beleški"
 msgid "I_mport to Task List"
 msgstr "U_vezi u spisak zadataka"
 
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:185
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:178
-msgid "New Memo List"
-msgstr "Novi spisak beleške"
-
 #: ../src/modules/calendar/e-cal-base-shell-sidebar.c:563
 #, c-format
-#| msgid "Copying an event into the calendar '%s'"
 msgid "Copying an event into the calendar “%s”"
-msgstr "Umnožavam događaj u kalendar „%s“"
+msgstr "Kopiram događaj u kalendar „%s“"
 
 #: ../src/modules/calendar/e-cal-base-shell-sidebar.c:564
 #, c-format
-#| msgid "Moving an event into the calendar '%s'"
 msgid "Moving an event into the calendar “%s”"
 msgstr "Premeštam događaj u kalendar „%s“"
 
 #: ../src/modules/calendar/e-cal-base-shell-sidebar.c:569
 #, c-format
-#| msgid "Copying a memo into the memo list '%s'"
 msgid "Copying a memo into the memo list “%s”"
-msgstr "Umnožavam belešku u spisak beleški „%s“"
+msgstr "Kopiram belešku u spisak beleški „%s“"
 
 #: ../src/modules/calendar/e-cal-base-shell-sidebar.c:570
 #, c-format
-#| msgid "Moving a memo into the memo list '%s'"
 msgid "Moving a memo into the memo list “%s”"
 msgstr "Premeštam belešku u spisak beleški „%s“"
 
 #: ../src/modules/calendar/e-cal-base-shell-sidebar.c:575
 #, c-format
-#| msgid "Copying a task into the task list '%s'"
 msgid "Copying a task into the task list “%s”"
-msgstr "Umnožavam zadatak u spisak zadataka „%s“"
+msgstr "Kopiram zadatak u spisak zadataka „%s“"
 
 #: ../src/modules/calendar/e-cal-base-shell-sidebar.c:576
 #, c-format
-#| msgid "Moving a task into the task list '%s'"
 msgid "Moving a task into the task list “%s”"
 msgstr "Premeštam zadatak u spisak zadataka „%s“"
 
@@ -21482,7 +21377,6 @@ msgid "Task List Selector"
 msgstr "Izbornik spiska zadataka"
 
 #: ../src/modules/calendar/e-calendar-preferences.c:525
-#| msgid "Select the calendars for reminder notification"
 msgid "Selected Calendars for Notifications of Reminders"
 msgstr "Izabrani kalendari za obaveštenja podsetnika"
 
@@ -21581,7 +21475,7 @@ msgid "_24 hour"
 msgstr "_24-časovni"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:18
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1607
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1658
 msgid "Work Week"
 msgstr "Radna nedelja"
 
@@ -21735,7 +21629,6 @@ msgid "Display reminders in _notification area only"
 msgstr "Prikaži podsetnike samo u _obaveštajnoj zoni"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:68
-#| msgid "Display reminders in _notification area only"
 msgid "Keep reminder notification _window always on top"
 msgstr "Drži _prozor obaveštenja podsetnika uvek na vrhu"
 
@@ -21744,19 +21637,16 @@ msgid "Display reminders for completed _tasks"
 msgstr "Prikaži podsetnike za za_vršene zadatke"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:70
-#| msgid "Display reminders for completed _tasks"
 msgid "Display reminders for _past events"
 msgstr "Prikaži podsetnike za _prošle događaje"
 
 #. This is the first half of a user preference. "Set default reminder [time-period] before every new 
appointment"
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:72
-#| msgid "Default reminder value"
 msgid "Set _default reminder"
 msgstr "Podesi _osnovni podsetnik"
 
 #. This is the last half of a user preference. "Set default reminder [time-period] before every new 
appointment"
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:74
-#| msgid "before every appointment"
 msgid "before every new appointment"
 msgstr "pre svakog novog zakazivanja"
 
@@ -21775,26 +21665,9 @@ msgid "Default _snooze time (in minutes)"
 msgstr "Podrazumevano vreme odla_ganja podsetnika (u minutima)"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:80
-#| msgid "Select the calendars for reminder notification"
 msgid "Select the sources for reminder notification:"
 msgstr "Izaberite izvore za obaveštenje podsetnika:"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
-#| msgid "Calendar"
-msgid "Calendars"
-msgstr "Kalendari"
-
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:82
-#| msgctxt "New"
-#| msgid "Memo Li_st"
-msgid "Memo Lists"
-msgstr "Spisak beleški"
-
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
-#| msgid "Task List"
-msgid "Task Lists"
-msgstr "Spisak zadataka"
-
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:84
 msgid "Default Free/Busy Server"
 msgstr "Podrazumevani server slobodnog/zauzetog vremena"
@@ -21808,45 +21681,45 @@ msgstr "%u i %d će biti zamenjeni korisnikom i domenom iz elektronske adrese."
 msgid "Publishing Information"
 msgstr "Podaci o objavljivanju"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:112
+#: ../src/modules/calendar/e-cal-shell-backend.c:113
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Zakazivanje"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:114
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1404
+#: ../src/modules/calendar/e-cal-shell-backend.c:115
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1451
 msgid "Create a new appointment"
 msgstr "Pravi novo zakazivanje"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:119
+#: ../src/modules/calendar/e-cal-shell-backend.c:120
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Celodnevno za_kazivanje"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:121
+#: ../src/modules/calendar/e-cal-shell-backend.c:122
 msgid "Create a new all-day appointment"
 msgstr "Pravi novo celodnevno zakazivanje"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:126
+#: ../src/modules/calendar/e-cal-shell-backend.c:127
 msgctxt "New"
 msgid "M_eeting"
 msgstr "S_astanak"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:128
+#: ../src/modules/calendar/e-cal-shell-backend.c:129
 msgid "Create a new meeting request"
 msgstr "Pravi novi zahtev za sastankom"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:136
+#: ../src/modules/calendar/e-cal-shell-backend.c:137
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_ndar"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:138
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1271
+#: ../src/modules/calendar/e-cal-shell-backend.c:139
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1311
 msgid "Create a new calendar"
 msgstr "Pravi novi kalendar"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:255
+#: ../src/modules/calendar/e-cal-shell-backend.c:256
 msgid "Calendar and Tasks"
 msgstr "Kalendar i zadaci"
 
@@ -21854,10 +21727,6 @@ msgstr "Kalendar i zadaci"
 msgid "Print"
 msgstr "Štampaj"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:283
-msgid "Calendar Properties"
-msgstr "Osobine kalendara"
-
 #: ../src/modules/calendar/e-cal-shell-view-actions.c:312
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -21879,11 +21748,11 @@ msgstr "Neka ova pojava bude pokretna"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1084
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1124
 msgid "event"
 msgstr "događaj"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1086
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1126
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:207
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:275
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:496
@@ -21891,142 +21760,150 @@ msgstr "događaj"
 msgid "Save as iCalendar"
 msgstr "Sačuvaj kao iKalendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1220
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1260
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:577
 #: ../src/modules/calendar/e-task-shell-view-actions.c:703
 msgid "_Copy..."
-msgstr "_Umnoži..."
+msgstr "_Kopiraj…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1227
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1267
 msgid "D_elete Calendar"
 msgstr "Ob_riši kalendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1229
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1269
 msgid "Delete the selected calendar"
 msgstr "Obrišite izabrani kalendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1236
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1276
 msgid "Go Back"
 msgstr "Idi nazad"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1243
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1283
 msgid "Go Forward"
 msgstr "Idi napred"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1250
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1290
 msgid "Select today"
 msgstr "Izaberi današnji dan"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1255
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1295
 msgid "Select _Date"
 msgstr "Izaberi _datum"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1257
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1297
 msgid "Select a specific date"
 msgstr "Izaberite određeni datum"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1262
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1302
 msgid "_Manage Calendar groups..."
 msgstr "_Upravljaj grupama kalendara..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1264
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1304
 msgid "Manage Calendar groups order and visibility"
 msgstr "Upravljajte redosledom i vidljivošću grupa kalendara"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1269
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1309
 msgid "_New Calendar"
 msgstr "Novi _kalendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1283
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1323
 #: ../src/modules/calendar/e-task-shell-view-actions.c:801
 msgid "Purg_e"
 msgstr "Izba_ci"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1285
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1325
 msgid "Purge old appointments and meetings"
 msgstr "Izbacite stara zakazivanja i sastanke"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1292
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1332
 msgid "Refresh the selected calendar"
 msgstr "Osvežite izabrani kalendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1299
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1339
 msgid "Rename the selected calendar"
 msgstr "Preimenujte izabrani kalendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1304
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1344
 msgid "Find _Next"
 msgstr "Nađi _sledeće"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1306
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1346
 msgid "Find next occurrence of the current search string"
 msgstr "Pronađite sledeće pojavljivanje tekuće niske pretrage"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1311
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1351
 msgid "Find _Previous"
 msgstr "Nađi _prethodno"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1313
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1353
 msgid "Find previous occurrence of the current search string"
 msgstr "Pronađite prethodno pojavljivanje tekuće niske pretrage"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1318
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1358
 msgid "Stop _Running Search"
 msgstr "Zaustavi _tekuću pretragu"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1320
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1360
 msgid "Stop currently running search"
 msgstr "Zaustavite trenutno pokrenutu pretragu"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1365
 msgid "Sho_w All Calendars"
 msgstr "Prikaži _sve kalendare"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1332
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1372
 msgid "Show _Only This Calendar"
 msgstr "Prikaži _samo ovaj kalendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1339
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1379
 msgid "Cop_y to Calendar..."
-msgstr "_Umnoži u kalendar..."
+msgstr "_Kopiraj u kalendar…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1346
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1386
 msgid "_Delegate Meeting..."
 msgstr "_Delegiraj sastanak..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1353
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "_Delete Appointment"
 msgstr "_Obriši zakazano"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1355
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1395
 msgid "Delete selected appointments"
 msgstr "Obrišite izabrana zakazivanja"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1360
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "Delete This _Occurrence"
 msgstr "Obriši ovu _pojavu"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1362
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1402
 msgid "Delete this occurrence"
 msgstr "Obrišite ovu pojavu"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1367
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1407
 msgid "Delete All Occ_urrences"
 msgstr "Obriši sve po_jave"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1369
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1409
 msgid "Delete all occurrences"
 msgstr "Obrišite sve pojave"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1374
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1414
+msgid "Edit as Ne_w..."
+msgstr "_Uredi kao novu..."
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1416
+msgid "Edit the current appointment as new"
+msgstr "Uredi trenutni dogovoreni sastanak kao novi"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1421
 msgid "New All Day _Event..."
 msgstr "Novi celodnevni _događaj..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1376
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1423
 msgid "Create a new all day event"
 msgstr "Napravite novi celodnevni događaj"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1381
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1428
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:241
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:315
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:570
@@ -22034,121 +21911,112 @@ msgstr "Napravite novi celodnevni događaj"
 msgid "_Forward as iCalendar..."
 msgstr "_Prosledi kao iKalendar..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1388
-msgid "New _Meeting..."
-msgstr "Novi _sastanak..."
-
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1390
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1437
 msgid "Create a new meeting"
 msgstr "Napravite novi sastanak"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1395
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1442
 msgid "Mo_ve to Calendar..."
 msgstr "Pren_esi u kalendar..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1402
-msgid "New _Appointment..."
-msgstr "Novo _zakazivanje..."
-
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "Make this Occurrence _Movable"
 msgstr "Neka ova pojava bude _pokretna"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1416
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1463
 msgid "_Open Appointment"
 msgstr "_Otvori sastanak"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1418
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1465
 msgid "View the current appointment"
 msgstr "Pregledajte tekuće zakazivanje"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1470
 msgid "_Reply"
 msgstr "_Odgovori"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1437
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1484
 msgid "_Schedule Meeting..."
 msgstr "_Zakaži sastanak..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1439
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1486
 msgid "Converts an appointment to a meeting"
 msgstr "Pretvorite zakazano u sastanak"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1444
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1491
 msgid "Conv_ert to Appointment..."
 msgstr "Pre_tvori u zakazano..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1446
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1493
 msgid "Converts a meeting to an appointment"
 msgstr "Pretvorite sastanak u zakazano"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1451
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1498
 msgid "Quit"
 msgstr "Izađi"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1579
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1630
 msgid "Day"
 msgstr "Dan"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1581
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Show one day"
 msgstr "Prikaži jedan dan"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1586
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1637
 msgid "List"
 msgstr "Spisak"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Show as list"
 msgstr "Prikaži kao spisak"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1593
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1644
 msgid "Month"
 msgstr "Mesec"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1646
 msgid "Show one month"
 msgstr "Prikaži jedan mesec"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1600
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1651
 msgid "Week"
 msgstr "Nedelja"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1602
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1653
 msgid "Show one week"
 msgstr "Prikaži jednu nedelju"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1609
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1660
 msgid "Show one work week"
 msgstr "Prikaži jednu radnu nedelju"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1617
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1668
 msgid "Active Appointments"
 msgstr "Aktivna zakazivanja"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1631
-#| msgid "Next 7 Days' Appointments"
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1682
 msgid "Next 7 Days’ Appointments"
 msgstr "Zakazano za sledeću nedelju"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1638
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1689
 msgid "Occurs Less Than 5 Times"
 msgstr "Dešava se manje od 5 puta"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1669
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1720
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:789
 #: ../src/modules/calendar/e-task-shell-view-actions.c:990
 msgid "Description contains"
 msgstr "Opis sadrži"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1676
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1727
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:796
 #: ../src/modules/calendar/e-task-shell-view-actions.c:997
 msgid "Summary contains"
 msgstr "Sažetak sadrži"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1686
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1700
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1737
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1751
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:272
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:360
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:806
@@ -22158,15 +22026,15 @@ msgstr "Sažetak sadrži"
 msgid "Print..."
 msgstr "Štampaj..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1688
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1739
 msgid "Print this calendar"
 msgstr "Štampa ovaj kalendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1695
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1746
 msgid "Preview the calendar to be printed"
 msgstr "Pregled kalendara pred štampu"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1717
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1768
 #: ../src/modules/calendar/e-cal-shell-view-memopad.c:282
 #: ../src/modules/calendar/e-cal-shell-view-taskpad.c:370
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:837
@@ -22174,7 +22042,7 @@ msgstr "Pregled kalendara pred štampu"
 msgid "_Save as iCalendar..."
 msgstr "_Sačuvaj kao iKalendar..."
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1794
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1845
 msgid "Go To"
 msgstr "Idi na"
 
@@ -22336,10 +22204,6 @@ msgstr "Sastavite novi spisak beleški"
 msgid "Print Memos"
 msgstr "Štampaj beleške"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:250
-msgid "Memo List Properties"
-msgstr "Osobine spiska zadataka"
-
 #: ../src/modules/calendar/e-memo-shell-view-actions.c:556
 msgid "_Delete Memo"
 msgstr "_Obriši belešku"
@@ -22464,10 +22328,6 @@ msgstr "Napravite novi spisak zadataka"
 msgid "Print Tasks"
 msgstr "Štampaj zadatke"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:274
-msgid "Task List Properties"
-msgstr "Osobine spiska zadataka"
-
 #: ../src/modules/calendar/e-task-shell-view-actions.c:557
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -22561,7 +22421,6 @@ msgid "Completed Tasks"
 msgstr "Završeni zadaci"
 
 #: ../src/modules/calendar/e-task-shell-view-actions.c:945
-#| msgid "Next 7 Days' Tasks"
 msgid "Next 7 Days’ Tasks"
 msgstr "Zadaci za sledeću nedelju"
 
@@ -22599,25 +22458,36 @@ msgstr[2] "%d zadataka"
 msgstr[3] "%d zadatak"
 
 #: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:319
-#| msgid "Create a _Meeting"
 msgid "Convert to M_eeting"
 msgstr "Pretvori u _sastanak"
 
 #: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:321
-#| msgid "Create a new meeting request"
 msgid "Convert the message to a meeting request"
 msgstr "Pretvorite poruku u zahtev za sastankom"
 
 #: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:357
-#| msgid "Important Messages"
 msgid "Convert to M_essage"
 msgstr "Pretvori u _poruku"
 
 #: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:359
-#| msgid "Compose a new mail message"
 msgid "Convert to the mail message"
 msgstr "Pretvorite u poruku pošte"
 
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:83
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:84
+msgid "CalDAV server"
+msgstr "CalDAV server"
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:85
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:86
+msgid "CardDAV server"
+msgstr "CardDAV server"
+
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:87
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:88
+msgid "LDAP server"
+msgstr "LDAP server"
+
 #: ../src/modules/itip-formatter/e-mail-formatter-itip.c:162
 msgid "ITIP"
 msgstr "ITIP"
@@ -23111,30 +22981,29 @@ msgstr "Status učesnika je ažuriran"
 
 #: ../src/modules/itip-formatter/itip-view.c:3701
 #, c-format
-#| msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgid "An appointment “%s” in the calendar “%s” conflicts with this meeting"
 msgstr "Zakazivanje „%s“ u kalendaru „%s“ je u isto vreme kad i ovaj sastanak"
 
 #: ../src/modules/itip-formatter/itip-view.c:3707
 #, c-format
-#| msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgid ""
 "The calendar “%s” contains an appointment which conflicts with this meeting"
 msgid_plural ""
 "The calendar “%s” contains %d appointments which conflict with this meeting"
-msgstr[0] "Kalendar „%s“ sadrži %d zakazivanje koje se sukobljava sa ovim sastankom"
-msgstr[1] "Kalendar „%s“ sadrži %d zakazivanja koja se sukobljavaju sa ovim sastankom"
-msgstr[2] "Kalendar „%s“ sadrži %d zakazivanja koja se sukobljavaju sa ovim sastankom"
+msgstr[0] ""
+"Kalendar „%s“ sadrži %d zakazivanje koje se sukobljava sa ovim sastankom"
+msgstr[1] ""
+"Kalendar „%s“ sadrži %d zakazivanja koja se sukobljavaju sa ovim sastankom"
+msgstr[2] ""
+"Kalendar „%s“ sadrži %d zakazivanja koja se sukobljavaju sa ovim sastankom"
 msgstr[3] "Kalendar „%s“ sadrži zakazivanje koje se sukobljava sa ovim sastankom"
 
 #: ../src/modules/itip-formatter/itip-view.c:3740
 #, c-format
-#| msgid "Found the appointment in the calendar '%s'"
 msgid "Found the appointment in the calendar “%s”"
 msgstr "Pronašao sam zakazivanje u kalendaru „%s“"
 
 #: ../src/modules/itip-formatter/itip-view.c:3749
-#| msgid "The meeting is invalid and cannot be updated"
 msgid "This meeting invitation is obsolete. It had been updated."
 msgstr "Ovaj poziv na sastanak je zastareo. Stoga je osvežen."
 
@@ -23164,31 +23033,26 @@ msgstr "Pretraga za jednom postojećom verzijom ovog zakazivanja je u toku"
 
 #: ../src/modules/itip-formatter/itip-view.c:4654
 #, c-format
-#| msgid "Unable to send item to calendar '%s'.  %s"
 msgid "Unable to send item to calendar “%s”.  %s"
 msgstr "Ne mogu da pošaljem stavke kalendaru „%s“.  %s"
 
 #: ../src/modules/itip-formatter/itip-view.c:4669
 #, c-format
-#| msgid "Sent to calendar '%s' as accepted"
 msgid "Sent to calendar “%s” as accepted"
 msgstr "Poslato kalendaru „%s“ kao prihvaćeno"
 
 #: ../src/modules/itip-formatter/itip-view.c:4674
 #, c-format
-#| msgid "Sent to calendar '%s' as tentative"
 msgid "Sent to calendar “%s” as tentative"
 msgstr "Poslato kalendaru „%s“ kao pokušaj"
 
 #: ../src/modules/itip-formatter/itip-view.c:4680
 #, c-format
-#| msgid "Sent to calendar '%s' as declined"
 msgid "Sent to calendar “%s” as declined"
 msgstr "Poslato kalendaru „%s“ kao odbijeno"
 
 #: ../src/modules/itip-formatter/itip-view.c:4686
 #, c-format
-#| msgid "Sent to calendar '%s' as cancelled"
 msgid "Sent to calendar “%s” as cancelled"
 msgstr "Poslato kalendaru „%s“ kao otkazano"
 
@@ -23343,8 +23207,6 @@ msgid "This meeting has been delegated"
 msgstr "Ovaj sastanak je delegiran"
 
 #: ../src/modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:3
-#| msgid ""
-#| "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgid "“{0}” has delegated the meeting. Do you want to add the delegate “{1}”?"
 msgstr "„{0}“ delegira sastanak. Želite li da dodate delegata „{1}“?"
 
@@ -23370,7 +23232,6 @@ msgstr "IMAP pristup"
 #. Translators: This is part of a sentence "You may need to enable IMAP access and Calendars to synchronize",
 #. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
 #: ../src/modules/mail-config/e-mail-config-google-summary.c:315
-#| msgid "Do _Not Synchronize"
 msgctxt "GoggleSummary"
 msgid "Calendars to synchronize"
 msgstr "kalendare da se usaglase"
@@ -23379,7 +23240,6 @@ msgstr "kalendare da se usaglase"
 #. where the 'IMAP access' and 'Calendars to synchronize' are clickable.
 #: ../src/modules/mail-config/e-mail-config-google-summary.c:318
 #, c-format
-#| msgid "You may need to enable IMAP access"
 msgctxt "GoggleSummary"
 msgid "You may need to enable %s and %s"
 msgstr "Možda ćete morati da omogućite %s i %s"
@@ -23486,7 +23346,6 @@ msgid "TLS on a dedicated port"
 msgstr "TLS na dodeljenom priključniku"
 
 #: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:75
-#| msgid "_Use custom binary, instead of 'sendmail'"
 msgid "_Use custom binary, instead of “sendmail”"
 msgstr "_Koristi proizvoljni izvršni, umesto „sendmail“"
 
@@ -23503,10 +23362,6 @@ msgid "Cus_tom arguments:"
 msgstr "Proizvoljni _argumenti:"
 
 #: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:120
-#| msgid ""
-#| "Default arguments are '-i -f %F -- %R', where\n"
-#| "   %F - stands for the From address\n"
-#| "   %R - stands for the recipient addresses"
 msgid ""
 "Default arguments are “-i -f %F -- %R”, where\n"
 "   %F — stands for the From address\n"
@@ -23550,84 +23405,80 @@ msgstr[1] "%d priložene poruke"
 msgstr[2] "%d priloženih poruka"
 msgstr[3] "Jedna priložena poruka"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:375
+#: ../src/modules/mail/e-mail-shell-backend.c:383
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Poruka"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:377
+#: ../src/modules/mail/e-mail-shell-backend.c:385
 msgid "Compose a new mail message"
 msgstr "Sastavite novu poruku"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:385
+#: ../src/modules/mail/e-mail-shell-backend.c:393
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "Poštanski _nalog"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:387
+#: ../src/modules/mail/e-mail-shell-backend.c:395
 msgid "Create a new mail account"
 msgstr "Napravite novi nalog za poštu"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:392
+#: ../src/modules/mail/e-mail-shell-backend.c:400
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Fascikla za poštu"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:394
+#: ../src/modules/mail/e-mail-shell-backend.c:402
 msgid "Create a new mail folder"
 msgstr "Napravite novu fasciklu za poštu"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:709
+#: ../src/modules/mail/e-mail-shell-backend.c:717
 msgctxt "NetworkMonitor"
 msgid "base"
 msgstr "osnovno"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:712
+#: ../src/modules/mail/e-mail-shell-backend.c:720
 msgctxt "NetworkMonitor"
 msgid "netlink"
 msgstr "mrežna veza"
 
 #. Translators: One of the known implementation names of the GNetworkMonitor. Either translate
 #. it to some user-frienly form, or keep it as is.
-#: ../src/modules/mail/e-mail-shell-backend.c:715
+#: ../src/modules/mail/e-mail-shell-backend.c:723
 msgctxt "NetworkMonitor"
 msgid "networkmanager"
 msgstr "upravnik veze"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:749
+#: ../src/modules/mail/e-mail-shell-backend.c:757
 msgctxt "NetworkMonitor"
 msgid "Method to detect _online state:"
 msgstr "Način za _otkrivanje stanja na mreži:"
 
 #. Always as the first
-#: ../src/modules/mail/e-mail-shell-backend.c:758
+#: ../src/modules/mail/e-mail-shell-backend.c:766
 msgctxt "NetworkMonitor"
 msgid "Default"
 msgstr "Osnovno"
 
 #. Always as the last
-#: ../src/modules/mail/e-mail-shell-backend.c:772
+#: ../src/modules/mail/e-mail-shell-backend.c:780
 msgctxt "NetworkMonitor"
 msgid "Always Online"
 msgstr "Uvek na mreži"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:832
-msgid "Mail Accounts"
-msgstr "Poštanski nalozi"
-
-#: ../src/modules/mail/e-mail-shell-backend.c:841
+#: ../src/modules/mail/e-mail-shell-backend.c:849
 msgid "Mail Preferences"
 msgstr "Postavke pošte"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:850
+#: ../src/modules/mail/e-mail-shell-backend.c:858
 msgid "Composer Preferences"
 msgstr "Postavke sastavljača"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:859
+#: ../src/modules/mail/e-mail-shell-backend.c:867
 msgid "Network Preferences"
 msgstr "Postavke mreže"
 
@@ -23638,148 +23489,156 @@ msgstr "Postavke mreže"
 # is not permitted.
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../src/modules/mail/e-mail-shell-backend.c:1151
+#: ../src/modules/mail/e-mail-shell-backend.c:1220
 msgctxt "label"
 msgid "None"
 msgstr "Ništa"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:734
+#: ../src/modules/mail/e-mail-shell-view-actions.c:781
 msgid "Marking messages as read..."
 msgstr "Označavam poruke pročitanim..."
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1093
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1140
 msgid "Go to Folder"
 msgstr "Idi u fasciklu"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1097
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1144
 msgid "_Select"
 msgstr "_Izaberi"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1650
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1624
 msgid "_Disable Account"
 msgstr "_Onemogući nalog"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1652
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1626
 msgid "Disable this account"
 msgstr "Isključite ovaj nalog"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1659
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1633
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Trajno uklonite sve obrisane poruke iz svih fascikli"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1666
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1638
+msgid "Empty _Junk"
+msgstr "Isprazni _đubre"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1640
+msgid "Delete all Junk messages from all folders"
+msgstr "Trajno ukloni sve nepoželjne poruke iz svih fascikli"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1647
 msgid "Edit properties of this account"
 msgstr "Izmenite osobine ovog naloga"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1654
 msgid "Refresh list of folders of this account"
 msgstr "Osvežite spisak fascikli za ovaj nalog"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1678
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1659
 msgid "_Download Messages for Offline Usage"
 msgstr "_Preuzmi poruke za rad van mreže"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1680
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1661
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Preuzmite poruke za naloge i fascikle koje su označene za rad van mreže"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1685
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1666
 msgid "Fl_ush Outbox"
 msgstr "Is_prazni „Za slanje“"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1692
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
 msgid "_Copy Folder To..."
-msgstr "_Umnoži fasciklu u..."
+msgstr "_Kopiraj fasciklu u…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1694
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1675
 msgid "Copy the selected folder into another folder"
-msgstr "Umnožite izabranu fasciklu u drugu fasciklu"
+msgstr "Kopira izabranu fasciklu u drugu fasciklu"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1682
 msgid "Permanently remove this folder"
 msgstr "Trajno uklonite ovu fasciklu"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1706
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1687
 msgid "E_xpunge"
 msgstr "Izba_ci"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1708
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1689
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Trajno uklonite sve obrisane poruke iz ove fascikle"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1713
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1821
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1694
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1802
 msgid "Mar_k All Messages as Read"
 msgstr "Označi sve po_ruke kao pročitane"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1715
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1823
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1696
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1804
 msgid "Mark all messages in the folder as read"
 msgstr "Označite sve poruke u fascikli kao pročitane"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1720
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
 msgid "_Move Folder To..."
-msgstr "_Premesti fasciklu u..."
+msgstr "_Premesti fasciklu u…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1722
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1703
 msgid "Move the selected folder into another folder"
 msgstr "Premestite izabranu fasciklu u drugu fasciklu"
 
 #. Translators: An action caption to create a new mail folder
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1728
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1709
 msgid "_New..."
-msgstr "_Novo..."
+msgstr "_Novo…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1730
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1711
 msgid "Create a new folder for storing mail"
 msgstr "Napravite novu fasciklu za smeštaj pošte"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1737
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1718
 msgid "Change the properties of this folder"
 msgstr "Izmenite osobine ove fascikle"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1725
 msgid "Refresh the folder"
 msgstr "Osvežite fasciklu"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1751
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1732
 msgid "Change the name of this folder"
 msgstr "Promenite naziv ove fascikle"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1756
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1737
 msgid "Select Message _Thread"
 msgstr "Izaberi _raspravu"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1739
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Označite sve poruke iste rasprave kao izabranu poruku"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1763
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
 msgid "Select Message S_ubthread"
 msgstr "Izaberi p_odniz poruke"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1765
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1746
 msgid "Select all replies to the currently selected message"
 msgstr "Izaberite sve odgovore na trenutno izabranu poruku"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1777
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
 msgid "Empty _Trash"
 msgstr "Izbaci _smeće"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1779
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1760
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Trajno uklonite sve obrisane poruke sa svih naloga"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1784
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1765
 msgid "Go to _Folder"
 msgstr "Idi u _fasciklu"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1786
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1767
 msgid "Opens a dialog to select a folder to go to"
 msgstr "Otvara prozorče iz koga možete izabrati da odete u određenu fasciklu"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1791
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1772
 msgid "_New Label"
 msgstr "_Nova oznaka"
 
@@ -23790,217 +23649,224 @@ msgstr "_Nova oznaka"
 # is not permitted.
 #. Translators: "None" is used in the message label context menu.
 #. *              It removes all labels from the selected messages.
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1800
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1781
 msgid "N_one"
 msgstr "N_išta"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1814
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1795
 msgid "_Manage Subscriptions"
 msgstr "_Upravljaj prijavama"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1816
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1900
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1797
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1881
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Prijavite se ili se odjavite sa fascikli na mrežnim serverima"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1828
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1849
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1809
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1830
 msgid "Send / _Receive"
 msgstr "Slanje / p_rimanje"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1830
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1811
 msgid "Send queued items and retrieve new items"
 msgstr "Pošaljite pripremljene i dovucite nove stavke"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1835
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1816
 msgid "R_eceive All"
 msgstr "P_rimi sve"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1837
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1818
 msgid "Receive new items from all accounts"
 msgstr "Primite nove stavke sa svih naloga"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1842
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1823
 msgid "_Send All"
 msgstr "P_ošalji sve"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1844
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1825
 msgid "Send queued items in all accounts"
 msgstr "Pošaljite stavke na čekanju u svim nalozima"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1872
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1853
 msgid "Cancel the current mail operation"
 msgstr "Otkažite trenutnu operaciju sa poštom"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1877
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1858
 msgid "Collapse All _Threads"
 msgstr "Skupi sve _rasprave"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1879
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1860
 msgid "Collapse all message threads"
 msgstr "Skupite celokupno grananje rasprava"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1884
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1865
 msgid "E_xpand All Threads"
 msgstr "Razgranaj sve ra_sprave"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1886
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1867
 msgid "Expand all message threads"
 msgstr "Razgranajte sve poruke u raspravama"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1891
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1872
 msgid "_Message Filters"
 msgstr "_Propusnici poruka"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1893
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1874
 msgid "Create or edit rules for filtering new mail"
 msgstr "Napravite ili uredite pravila za izdvajanje nove pošte"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1898
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1879
 msgid "_Subscriptions..."
-msgstr "_Prijave..."
+msgstr "_Prijave…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1907
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1888
 msgid "F_older"
 msgstr "_Fascikla"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1914
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1895
 msgid "_Label"
 msgstr "_Natpis"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1931
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1912
 msgid "C_reate Search Folder From Search..."
-msgstr "Napravi _fasciklu pretrage iz pretrage..."
+msgstr "Napravi _fasciklu pretrage iz pretrage…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1938
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1919
 msgid "Search F_olders"
 msgstr "Fas_cikle pretrage"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1940
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1921
 msgid "Create or edit search folder definitions"
 msgstr "Napravite ili uredite definicije fascikle pretrage"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1979
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1964
 msgid "_New Folder..."
-msgstr "_Nova fascikla..."
+msgstr "_Nova fascikla…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2007
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1992
 msgid "Show Message _Preview"
 msgstr "Prika_ži pregled poruke"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2009
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1994
 msgid "Show message preview pane"
 msgstr "Prikažite pregled poruke"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2015
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2000
 msgid "Show _Attachment Bar"
 msgstr "Prikaži traku _priloga"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2017
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2002
 msgid ""
 "Show Attachment Bar below the message preview pane when the message has "
 "attachments"
 msgstr ""
 "Prikažite traku priloga ispod okna pregleda poruke kada poruka ima priloge"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2023
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2008
 msgid "Show _Deleted Messages"
 msgstr "Prikaži o_brisane poruke"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2025
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2010
 msgid "Show deleted messages with a line through them"
 msgstr "Prikažite obrisane poruke (kao precrtane)"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2031
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2016
 msgid "Show _Junk Messages"
 msgstr "Prikaži _nepoželjne poruke"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2033
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2018
 msgid "Show junk messages with a red line through them"
 msgstr "Prikažite nepoželjne poruke precrtane crvenom linijom"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2039
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2024
 msgid "_Group By Threads"
 msgstr "Grupiši po _raspravama"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2041
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2026
 msgid "Threaded message list"
 msgstr "Spisak poruka po temama"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2047
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2032
+msgid "Show To _Do Bar"
+msgstr "Prikaži traku sa _zadacima"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2034
+msgid "Show To Do bar with appointments and tasks"
+msgstr "Prikaži traku sa zadacima sa sastancima i zadacima"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2040
 msgid "_Unmatched Folder Enabled"
 msgstr "Uključena _nepoklopljena fascikla"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2049
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2042
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Okida prilikom uključivanja nepoklopljene fascikle pretrage"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2069
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2062
 msgid "Show message preview below the message list"
 msgstr "Prikažite pregled poruke ispod liste poruka"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2076
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2069
 msgid "Show message preview alongside the message list"
 msgstr "Prikažite pregled poruke pored spiska poruka"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2084
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2077
 msgid "All Messages"
 msgstr "Sve poruke"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2091
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2084
 msgid "Important Messages"
 msgstr "Važne poruke"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2098
-#| msgid "Last 5 Days' Messages"
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2091
 msgid "Last 5 Days’ Messages"
 msgstr "Poruke u proteklih 5 dana"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2105
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2098
 msgid "Messages Not Junk"
 msgstr "Poruke nisu đubre"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2112
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2105
 msgid "Messages with Attachments"
 msgstr "Poruke sa prilozima"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2119
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2112
 msgid "Messages with Notes"
 msgstr "Poruke sa beleškama"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2126
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2119
 msgid "No Label"
 msgstr "Bez oznake"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2133
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2126
 msgid "Read Messages"
 msgstr "Pročitane poruke"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2140
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2133
 msgid "Unread Messages"
 msgstr "Nepročitane poruke"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2147
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2140
 msgid "Message Thread"
 msgstr "Tema poruke"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2207
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2200
 msgid "Subject or Addresses contain"
 msgstr "Naslov ili adrese sadrže"
 
 # bug: requires a comment on usage
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2217
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2210
 msgid "All Accounts"
 msgstr "svim nalozima"
 
 # bug: requires a comment on usage
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2224
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2217
 msgid "Current Account"
 msgstr "tekućem nalogu"
 
 # #-#-#-#-#  evolution.gnome-3-4.sr.po (evolution)  #-#-#-#-#
 # bug: requires a comment on usage
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2231
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2224
 msgid "Current Folder"
 msgstr "tekućoj fascikli"
 
@@ -24105,7 +23971,7 @@ msgstr "Odmah pošalji"
 msgid "Send after 5 minutes"
 msgstr "Pošalji nakon 5 minuta"
 
-#: ../src/modules/mail/em-composer-prefs.c:1303
+#: ../src/modules/mail/em-composer-prefs.c:1309
 msgid "Language(s)"
 msgstr "Jezik(ci)"
 
@@ -24143,14 +24009,22 @@ msgid "Contains Value"
 msgstr "Sadrži vrednost"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail 
message window/preview
-#: ../src/modules/mail/em-mailer-prefs.c:1558
+#: ../src/modules/mail/em-mailer-prefs.c:1564
 msgid "_Date header:"
 msgstr "Zaglavlje _datuma:"
 
-#: ../src/modules/mail/em-mailer-prefs.c:1559
+#: ../src/modules/mail/em-mailer-prefs.c:1565
 msgid "Show _original header value"
 msgstr "Prikaži _originalnu vrednost zaglavlja"
 
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:112
+msgid "Do _not change settings"
+msgstr "_Ne menjaj podešavanja"
+
+#: ../src/modules/mailto-handler/evolution-mailto-handler.c:113
+msgid "_Set as default email client"
+msgstr "Podesi kao podrazumevani program e-pošte"
+
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:138
 msgid "Do you want to make Evolution your default email client?"
 msgstr "Da li želite da Evoluciju učinite podrazumevanim klijentom e-pošte?"
@@ -24159,20 +24033,17 @@ msgstr "Da li želite da Evoluciju učinite podrazumevanim klijentom e-pošte?"
 #. * is the subject of the email, third %s is the date.
 #: ../src/modules/mdn/evolution-mdn.c:308
 #, c-format
-#| msgid "Your message to %s about \"%s\" on %s has been read."
 msgid "Your message to %s about “%s” on %s has been read."
 msgstr "Vaša poruka za %s na temu „%s“ na %s je pročitana."
 
 #. Translators: %s is the subject of the email message.
 #: ../src/modules/mdn/evolution-mdn.c:374
 #, c-format
-#| msgid "Delivery Notification for \"%s\""
 msgid "Delivery Notification for “%s”"
 msgstr "Obaveštenje o prijemu za „%s“"
 
 #: ../src/modules/mdn/evolution-mdn.c:540
 #, c-format
-#| msgid "Send a read receipt to '%s'"
 msgid "Send a read receipt to “%s”"
 msgstr "Pošalji povratnicu čitanja za „%s“"
 
@@ -24194,7 +24065,6 @@ msgid "Evolution is currently offline."
 msgstr "Evolucija je trenutno van mreže."
 
 #: ../src/modules/offline-alert/evolution-offline-alert.error.xml.h:2
-#| msgid "Click 'Work Online' to return to online mode."
 msgid "Click “Work Online” to return to online mode."
 msgstr "Kliknite na „Rad na mreži​​“ da se vratite na režim na mreži."
 
@@ -24337,7 +24207,6 @@ msgstr "Ne mogu da pošaljem sadržaj poruke pošte do Ubice spama: "
 # bug: plural-forms
 #: ../src/modules/spamassassin/evolution-spamassassin.c:230
 #, c-format
-#| msgid "Failed to write '%s' to SpamAssassin: "
 msgid "Failed to write “%s” to SpamAssassin: "
 msgstr "Ne mogu da zapišem „%s“ u Ubici spama: "
 
@@ -24377,15 +24246,15 @@ msgstr "Filter nepoželjne poruke pomoću Ubice spama"
 msgid "Importing Files"
 msgstr "Uvozim datoteke"
 
-#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:259
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:257
 msgid "Import cancelled."
 msgstr "Uvoženje je otkazano."
 
-#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:276
+#: ../src/modules/startup-wizard/e-mail-config-import-progress-page.c:274
 msgid "Import complete."
 msgstr "Uvoženje je završeno."
 
-#: ../src/modules/startup-wizard/e-startup-assistant.c:156
+#: ../src/modules/startup-wizard/e-startup-assistant.c:158
 msgid ""
 "Welcome to Evolution.\n"
 "\n"
@@ -24397,23 +24266,27 @@ msgstr ""
 "Nekoliko narednih ekrana će omogućiti Evoluciji da se poveže na vaše naloge "
 "e-pošte i da uveze datoteke iz drugih programa."
 
-#: ../src/modules/startup-wizard/evolution-startup-wizard.c:226
+#: ../src/modules/startup-wizard/e-startup-assistant.c:165
+msgid "Do not _show this wizard again"
+msgstr "Ne pr_ikazuj više ovog čarobnjaka"
+
+#: ../src/modules/startup-wizard/evolution-startup-wizard.c:212
 msgid "Loading accounts..."
-msgstr "Učitavam naloge..."
+msgstr "Učitavam naloge…"
 
 #: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:93
 msgid "_Format as..."
-msgstr "Oblikuj _kao..."
+msgstr "Oblikuj _kao…"
 
 #: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:101
 msgid "_Other languages"
 msgstr "_Drugi jezici"
 
-#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:436
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:453
 msgid "Text Highlight"
 msgstr "Isticanje teksta"
 
-#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:437
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:454
 msgid "Syntax highlighting of mail parts"
 msgstr "Isticanje sadržaja delova pošte"
 
@@ -24686,7 +24559,7 @@ msgstr ""
 
 #: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:3
 msgid "_Add Attachment..."
-msgstr "_Dodaj prilog..."
+msgstr "_Dodaj prilog…"
 
 #: ../src/plugins/attachment-reminder/org-gnome-attachment-reminder.error.xml.h:4
 msgid "_Edit Message"
@@ -24822,9 +24695,6 @@ msgstr "_Prilagođeno zaglavlje"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the 
format of the key values
 #: ../src/plugins/email-custom-header/email-custom-header.c:807
-#| msgid ""
-#| "The format for specifying a Custom Header key value is:\n"
-#| "Name of the Custom Header key values separated by \";\"."
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by “;”."
@@ -24859,9 +24729,6 @@ msgid "Command to be executed to launch the editor: "
 msgstr "Naredba za izvršavanje radi pokretanja uređivača: "
 
 #: ../src/plugins/external-editor/external-editor.c:112
-#| msgid ""
-#| "For XEmacs use \"xemacs\"\n"
-#| "For Vim use \"gvim -f\""
 msgid ""
 "For XEmacs use “xemacs”\n"
 "For Vim use “gvim -f”"
@@ -24963,9 +24830,6 @@ msgid "Invalid Image Size"
 msgstr "Neispravna veličina slike"
 
 #: ../src/plugins/face/org-gnome-face.error.xml.h:4
-#| msgid ""
-#| "Please select a PNG image of size 48 * 48 pixels, whose file size doesn't "
-#| "exceed 723 bytes."
 msgid ""
 "Please select a PNG image of size 48 × 48 pixels, whose file size doesn’t "
 "exceed 723 bytes."
@@ -24977,10 +24841,6 @@ msgid "Incorrect Face Image Byte Size"
 msgstr "Neispravna veličina slike u bajtima"
 
 #: ../src/plugins/face/org-gnome-face.error.xml.h:6
-#| 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."
 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 "
@@ -25008,11 +24868,11 @@ msgstr "Pribavlja arhivu liste kojoj ova poruka pripada"
 
 #: ../src/plugins/mailing-list-actions/mailing-list-actions.c:420
 msgid "Copy _Message Archive URL"
-msgstr "Umnoži adresu arhive _poruke"
+msgstr "Kopiraj adresu arhive _poruke"
 
 #: ../src/plugins/mailing-list-actions/mailing-list-actions.c:422
 msgid "Copy direct URL for the selected message in its archive"
-msgstr "Umnožite neposrednu adresu za izabranu poruku u njenoj arhivi"
+msgstr "Kopira neposrednu adresu za izabranu poruku u njenoj arhivi"
 
 #: ../src/plugins/mailing-list-actions/mailing-list-actions.c:427
 msgid "Get List _Usage Information"
@@ -25093,12 +24953,6 @@ msgid "Send e-mail message to mailing list?"
 msgstr "Da pošaljem elektronsku poruku na dopisnu listu?"
 
 #: ../src/plugins/mailing-list-actions/org-gnome-mailing-list-actions.error.xml.h:6
-#| msgid ""
-#| "An e-mail message will be sent to the URL \"{0}\". You can either send "
-#| "the message automatically, or see and change it first.\n"
-#| "\n"
-#| "You should receive an answer from the mailing list shortly after the "
-#| "message has been sent."
 msgid ""
 "An e-mail message will be sent to the URL “{0}”. You can either send the "
 "message automatically, or see and change it first.\n"
@@ -25150,8 +25004,8 @@ msgstr ""
 "Zaglavlje: {0}"
 
 #. Translators: '%d' is the count of mails received.
-#: ../src/plugins/mail-notification/mail-notification.c:398
-#: ../src/plugins/mail-notification/mail-notification.c:434
+#: ../src/plugins/mail-notification/mail-notification.c:401
+#: ../src/plugins/mail-notification/mail-notification.c:437
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -25162,55 +25016,55 @@ msgstr[3] "Primili ste novu poruku."
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user example com"
-#: ../src/plugins/mail-notification/mail-notification.c:409
+#: ../src/plugins/mail-notification/mail-notification.c:412
 #, c-format
 msgid "From: %s"
 msgstr "Šalje: %s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../src/plugins/mail-notification/mail-notification.c:423
+#: ../src/plugins/mail-notification/mail-notification.c:426
 #, c-format
 msgid "Subject: %s"
 msgstr "Naslov: %s"
 
 # shell:noshell-reason title
-#: ../src/plugins/mail-notification/mail-notification.c:440
+#: ../src/plugins/mail-notification/mail-notification.c:443
 msgid "New email in Evolution"
 msgstr "Nova pošta u Evoluciji"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../src/plugins/mail-notification/mail-notification.c:481
+#: ../src/plugins/mail-notification/mail-notification.c:483
 #, c-format
 msgid "Show %s"
 msgstr "Prikaži %s"
 
-#: ../src/plugins/mail-notification/mail-notification.c:685
+#: ../src/plugins/mail-notification/mail-notification.c:687
 msgid "_Play sound when a new message arrives"
 msgstr "Zvučno _obavesti kada stigne nova poruka"
 
-#: ../src/plugins/mail-notification/mail-notification.c:717
+#: ../src/plugins/mail-notification/mail-notification.c:719
 msgid "_Beep"
 msgstr "_Zapišti"
 
-#: ../src/plugins/mail-notification/mail-notification.c:730
+#: ../src/plugins/mail-notification/mail-notification.c:732
 msgid "Use sound _theme"
 msgstr "Koristi zvuk _teme"
 
-#: ../src/plugins/mail-notification/mail-notification.c:749
+#: ../src/plugins/mail-notification/mail-notification.c:751
 msgid "Play _file:"
 msgstr "Pusti zvučnu _datoteku:"
 
-#: ../src/plugins/mail-notification/mail-notification.c:758
+#: ../src/plugins/mail-notification/mail-notification.c:760
 msgid "Select sound file"
 msgstr "Izaberite zvučnu datoteku"
 
-#: ../src/plugins/mail-notification/mail-notification.c:835
+#: ../src/plugins/mail-notification/mail-notification.c:837
 msgid "Notify new messages for _Inbox only"
 msgstr "Obavesti o novim porukama samo za _Sanduče"
 
-#: ../src/plugins/mail-notification/mail-notification.c:851
+#: ../src/plugins/mail-notification/mail-notification.c:853
 msgid "Show _notification when a new message arrives"
 msgstr "Prikaži _obaveštenje kada pristigne nova poruka"
 
@@ -25248,9 +25102,6 @@ msgstr "_Novi"
 
 #: ../src/plugins/mail-to-task/mail-to-task.c:598
 #, c-format
-#| msgid ""
-#| "Selected calendar contains event '%s' already. Would you like to edit the "
-#| "old event?"
 msgid ""
 "Selected calendar contains event “%s” already. Would you like to edit the "
 "old event?"
@@ -25260,9 +25111,6 @@ msgstr ""
 
 #: ../src/plugins/mail-to-task/mail-to-task.c:601
 #, c-format
-#| msgid ""
-#| "Selected task list contains task '%s' already. Would you like to edit the "
-#| "old task?"
 msgid ""
 "Selected task list contains task “%s” already. Would you like to edit the "
 "old task?"
@@ -25271,9 +25119,6 @@ msgstr ""
 
 #: ../src/plugins/mail-to-task/mail-to-task.c:604
 #, c-format
-#| msgid ""
-#| "Selected memo list contains memo '%s' already. Would you like to edit the "
-#| "old memo?"
 msgid ""
 "Selected memo list contains memo “%s” already. Would you like to edit the "
 "old memo?"
@@ -25442,10 +25287,6 @@ msgstr "Uvozi Autluk poruke iz PST datoteke"
 msgid "Outlook personal folders (.pst)"
 msgstr "Lične fascikle Autluka (.pst)"
 
-#: ../src/plugins/pst-import/pst-importer.c:522
-msgid "_Mail"
-msgstr "_Pošta"
-
 #: ../src/plugins/pst-import/pst-importer.c:551
 msgid "Destination folder:"
 msgstr "Odredišna fascikla:"
@@ -25608,7 +25449,6 @@ msgstr "Mesto objavljivanja"
 #: ../src/plugins/publish-calendar/publish-format-fb.c:82
 #: ../src/plugins/publish-calendar/publish-format-ical.c:102
 #, c-format
-#| msgid "Invalid source UID '%s'"
 msgid "Invalid source UID “%s”"
 msgstr "Neispravan JIB izvora „%s“"
 
@@ -25788,7 +25628,6 @@ msgid "Preparing to quit..."
 msgstr "Pripremam se da izađem..."
 
 #: ../src/shell/e-shell.c:926
-#| msgid "_Open Desktop Settings"
 msgid "Open _Settings"
 msgstr "_Otvori podešavanja"
 
@@ -25796,7 +25635,7 @@ msgstr "_Otvori podešavanja"
 msgid "Credentials are required to connect to the destination host."
 msgstr "Potrebna su ovlašćenja za pristupanje ciljnom, udaljenom računaru."
 
-#: ../src/shell/e-shell.c:1297 ../src/shell/e-shell-window-actions.c:836
+#: ../src/shell/e-shell.c:1297 ../src/shell/e-shell-window-actions.c:866
 msgid "New _Window"
 msgstr "Novi _prozor"
 
@@ -25804,19 +25643,19 @@ msgstr "Novi _prozor"
 msgid "Quick _Reference"
 msgstr "Kratak _podsetnik"
 
-#: ../src/shell/e-shell.c:1310 ../src/shell/e-shell-window-actions.c:773
+#: ../src/shell/e-shell.c:1310 ../src/shell/e-shell-window-actions.c:796
 msgid "_About"
 msgstr "_O programu"
 
-#: ../src/shell/e-shell.c:1311 ../src/shell/e-shell-window-actions.c:871
+#: ../src/shell/e-shell.c:1311 ../src/shell/e-shell-window-actions.c:901
 msgid "_Quit"
 msgstr "_Izađi"
 
-#: ../src/shell/e-shell-content.c:718 ../src/shell/e-shell-content.c:719
+#: ../src/shell/e-shell-content.c:700 ../src/shell/e-shell-content.c:701
 msgid "Searches"
 msgstr "Pretrage"
 
-#: ../src/shell/e-shell-content.c:762
+#: ../src/shell/e-shell-content.c:744
 msgid "Save Search"
 msgstr "Sačuvaj pretragu"
 
@@ -25859,6 +25698,7 @@ msgstr ""
 "Miloš Popović <gpopac gmail com>\n"
 "Miroslav Nikolić <miroslavnikolic rocketmail com>\n"
 "Marko M. Kostić <marko m kostic gmail com>\n"
+"Borisav Živanović <borisavzivanovic gmail com>\n"
 "\n"
 "http://prevod.org — prevod na srpski jezik."
 
@@ -25870,275 +25710,280 @@ msgstr "Veb stranica Evolucije"
 msgid "Saving user interface state"
 msgstr "Čuvam stanje korisničkog sučelja"
 
-#: ../src/shell/e-shell-window-actions.c:275
+#: ../src/shell/e-shell-window-actions.c:293
 msgid "Categories Editor"
 msgstr "Uređivač kategorija"
 
-#: ../src/shell/e-shell-window-actions.c:594
+#: ../src/shell/e-shell-window-actions.c:612
 msgid "Bug Buddy is not installed."
 msgstr "Bubaždajin pomoćnik nije instaliran."
 
-#: ../src/shell/e-shell-window-actions.c:595
+#: ../src/shell/e-shell-window-actions.c:613
 msgid "Bug Buddy could not be run."
 msgstr "Bubaždajin pomoćnik ne može biti pokrenut."
 
-#: ../src/shell/e-shell-window-actions.c:775
+#: ../src/shell/e-shell-window-actions.c:798
 msgid "Show information about Evolution"
 msgstr "Prikazuje podatke o Evoluciji"
 
-#: ../src/shell/e-shell-window-actions.c:780
-#: ../src/shell/e-shell-window-actions.c:794
+#: ../src/shell/e-shell-window-actions.c:803
+msgid "_Accounts"
+msgstr "_Nalozi"
+
+#: ../src/shell/e-shell-window-actions.c:805
+msgid "Configure Evolution Accounts"
+msgstr "Podesi naloge Evolucije"
+
+#: ../src/shell/e-shell-window-actions.c:810
+#: ../src/shell/e-shell-window-actions.c:824
 msgid "_Close Window"
 msgstr "_Zatvori prozor"
 
-#: ../src/shell/e-shell-window-actions.c:801
+#: ../src/shell/e-shell-window-actions.c:831
 msgid "_Contents"
 msgstr "_Sadržaj"
 
-#: ../src/shell/e-shell-window-actions.c:803
+#: ../src/shell/e-shell-window-actions.c:833
 msgid "Open the Evolution User Guide"
 msgstr "Otvorite korisničko uputstvo Evolucije"
 
-#: ../src/shell/e-shell-window-actions.c:829
+#: ../src/shell/e-shell-window-actions.c:859
 msgid "I_mport..."
 msgstr "_Uvezi..."
 
-#: ../src/shell/e-shell-window-actions.c:831
+#: ../src/shell/e-shell-window-actions.c:861
 msgid "Import data from other programs"
 msgstr "Uvezite podatke iz drugih programa"
 
-#: ../src/shell/e-shell-window-actions.c:838
+#: ../src/shell/e-shell-window-actions.c:868
 msgid "Create a new window displaying this view"
 msgstr "Otvorite nov prozor za prikaz ovog pregleda"
 
-#: ../src/shell/e-shell-window-actions.c:850
+#: ../src/shell/e-shell-window-actions.c:880
 msgid "Available Cate_gories"
 msgstr "Dostupne _kategorije"
 
-#: ../src/shell/e-shell-window-actions.c:852
+#: ../src/shell/e-shell-window-actions.c:882
 msgid "Manage available categories"
 msgstr "Upravljajte dostupnim kategorijama"
 
-#: ../src/shell/e-shell-window-actions.c:864
+#: ../src/shell/e-shell-window-actions.c:894
 msgid "_Quick Reference"
 msgstr "_Kratak podsetnik"
 
-#: ../src/shell/e-shell-window-actions.c:866
-#| msgid "Show Evolution's shortcut keys"
+#: ../src/shell/e-shell-window-actions.c:896
 msgid "Show Evolution’s shortcut keys"
 msgstr "Prikažite prečice tastature Evolucije"
 
-#: ../src/shell/e-shell-window-actions.c:873
+#: ../src/shell/e-shell-window-actions.c:903
 msgid "Exit the program"
 msgstr "Izađite iz programa"
 
-#: ../src/shell/e-shell-window-actions.c:878
+#: ../src/shell/e-shell-window-actions.c:908
 msgid "_Advanced Search..."
 msgstr "_Napredna pretraga..."
 
-#: ../src/shell/e-shell-window-actions.c:880
+#: ../src/shell/e-shell-window-actions.c:910
 msgid "Construct a more advanced search"
 msgstr "Obrazujte napredniju pretragu"
 
-#: ../src/shell/e-shell-window-actions.c:887
+#: ../src/shell/e-shell-window-actions.c:917
 msgid "Clear the current search parameters"
 msgstr "Očistite parametre trenutne pretrage"
 
-#: ../src/shell/e-shell-window-actions.c:892
+#: ../src/shell/e-shell-window-actions.c:922
 msgid "_Edit Saved Searches..."
 msgstr "_Uredi sačuvane pretrage..."
 
-#: ../src/shell/e-shell-window-actions.c:894
+#: ../src/shell/e-shell-window-actions.c:924
 msgid "Manage your saved searches"
 msgstr "Upravljajte vašim sačuvanim pretragama"
 
-#: ../src/shell/e-shell-window-actions.c:901
+#: ../src/shell/e-shell-window-actions.c:931
 msgid "Click here to change the search type"
 msgstr "Kliknite ovde da promenite vrstu pretrage"
 
-#: ../src/shell/e-shell-window-actions.c:906
+#: ../src/shell/e-shell-window-actions.c:936
 msgid "_Find Now"
 msgstr "Pro_nađi sada"
 
-#: ../src/shell/e-shell-window-actions.c:908
+#: ../src/shell/e-shell-window-actions.c:938
 msgid "Execute the current search parameters"
 msgstr "Izvršite parametre trenutne pretrage"
 
-#: ../src/shell/e-shell-window-actions.c:913
+#: ../src/shell/e-shell-window-actions.c:943
 msgid "_Save Search..."
 msgstr "_Sačuvaj pretragu..."
 
-#: ../src/shell/e-shell-window-actions.c:915
+#: ../src/shell/e-shell-window-actions.c:945
 msgid "Save the current search parameters"
 msgstr "Sačuvajte parametre trenutne pretrage"
 
-#: ../src/shell/e-shell-window-actions.c:927
+#: ../src/shell/e-shell-window-actions.c:957
 msgid "Submit _Bug Report..."
 msgstr "Pošalji izveštaj o _grešci..."
 
-#: ../src/shell/e-shell-window-actions.c:929
+#: ../src/shell/e-shell-window-actions.c:959
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Pošaljite izveštaj o grešci Bubaždajinim pomoćnikom"
 
-#: ../src/shell/e-shell-window-actions.c:934
+#: ../src/shell/e-shell-window-actions.c:964
 msgid "_Work Offline"
 msgstr "Rad _van mreže"
 
-#: ../src/shell/e-shell-window-actions.c:936
+#: ../src/shell/e-shell-window-actions.c:966
 msgid "Put Evolution into offline mode"
 msgstr "Postavite Evoluciju u rad van mreže"
 
-#: ../src/shell/e-shell-window-actions.c:941
+#: ../src/shell/e-shell-window-actions.c:971
 msgid "_Work Online"
 msgstr "_Rad na mreži"
 
-#: ../src/shell/e-shell-window-actions.c:943
+#: ../src/shell/e-shell-window-actions.c:973
 msgid "Put Evolution into online mode"
 msgstr "Postavite Evoluciju u rad na mreži"
 
-#: ../src/shell/e-shell-window-actions.c:971
+#: ../src/shell/e-shell-window-actions.c:1001
 msgid "Lay_out"
 msgstr "_Raspored"
 
 #. Translators: This is a New menu item caption, under File->New
-#: ../src/shell/e-shell-window-actions.c:979
+#: ../src/shell/e-shell-window-actions.c:1009
 msgid "_New"
 msgstr "_Novo"
 
-#: ../src/shell/e-shell-window-actions.c:986
+#: ../src/shell/e-shell-window-actions.c:1016
 msgid "_Search"
 msgstr "Pre_traži"
 
-#: ../src/shell/e-shell-window-actions.c:993
+#: ../src/shell/e-shell-window-actions.c:1023
 msgid "_Switcher Appearance"
 msgstr "_Izgled prebacivača"
 
-#: ../src/shell/e-shell-window-actions.c:1007
+#: ../src/shell/e-shell-window-actions.c:1037
 msgid "_Window"
 msgstr "Pro_zor"
 
-#: ../src/shell/e-shell-window-actions.c:1036
-#| msgid "Show _Status Bar"
+#: ../src/shell/e-shell-window-actions.c:1066
 msgid "Show _Menu Bar"
 msgstr "Prikaži traku _izbornika"
 
-#: ../src/shell/e-shell-window-actions.c:1038
-#| msgid "Show the side bar"
+#: ../src/shell/e-shell-window-actions.c:1068
 msgid "Show the menu bar"
 msgstr "Prikažite traku izbornika"
 
-#: ../src/shell/e-shell-window-actions.c:1044
+#: ../src/shell/e-shell-window-actions.c:1074
 msgid "Show Side _Bar"
 msgstr "Prikaži _bočnu površ"
 
-#: ../src/shell/e-shell-window-actions.c:1046
+#: ../src/shell/e-shell-window-actions.c:1076
 msgid "Show the side bar"
 msgstr "Prikažite bočnu površ"
 
-#: ../src/shell/e-shell-window-actions.c:1052
+#: ../src/shell/e-shell-window-actions.c:1082
 msgid "Show _Buttons"
 msgstr "Prikaži _dugmad"
 
-#: ../src/shell/e-shell-window-actions.c:1054
+#: ../src/shell/e-shell-window-actions.c:1084
 msgid "Show the switcher buttons"
 msgstr "Prikažite dugmad prebacivača"
 
-#: ../src/shell/e-shell-window-actions.c:1060
+#: ../src/shell/e-shell-window-actions.c:1090
 msgid "Show _Status Bar"
 msgstr "Prikaži traku _stanja"
 
-#: ../src/shell/e-shell-window-actions.c:1062
+#: ../src/shell/e-shell-window-actions.c:1092
 msgid "Show the status bar"
 msgstr "Prikažite traku stanja"
 
-#: ../src/shell/e-shell-window-actions.c:1068
+#: ../src/shell/e-shell-window-actions.c:1098
 msgid "Show _Tool Bar"
 msgstr "Prikaži traku _alata"
 
-#: ../src/shell/e-shell-window-actions.c:1070
+#: ../src/shell/e-shell-window-actions.c:1100
 msgid "Show the tool bar"
 msgstr "Prikažite traku alata"
 
-#: ../src/shell/e-shell-window-actions.c:1092
+#: ../src/shell/e-shell-window-actions.c:1122
 msgid "_Icons Only"
 msgstr "Samo _ikonice"
 
-#: ../src/shell/e-shell-window-actions.c:1094
+#: ../src/shell/e-shell-window-actions.c:1124
 msgid "Display window buttons with icons only"
 msgstr "Prikažite dugmad prozora samo sa ikonicama"
 
-#: ../src/shell/e-shell-window-actions.c:1099
+#: ../src/shell/e-shell-window-actions.c:1129
 msgid "_Text Only"
 msgstr "Samo _tekst"
 
-#: ../src/shell/e-shell-window-actions.c:1101
+#: ../src/shell/e-shell-window-actions.c:1131
 msgid "Display window buttons with text only"
 msgstr "Prikažite dugmad prozora samo sa tekstom"
 
-#: ../src/shell/e-shell-window-actions.c:1106
+#: ../src/shell/e-shell-window-actions.c:1136
 msgid "Icons _and Text"
 msgstr "Ikonice _i tekst"
 
-#: ../src/shell/e-shell-window-actions.c:1108
+#: ../src/shell/e-shell-window-actions.c:1138
 msgid "Display window buttons with icons and text"
 msgstr "Prikažite dugmad prozora sa ikonicama i tekstom"
 
-#: ../src/shell/e-shell-window-actions.c:1113
+#: ../src/shell/e-shell-window-actions.c:1143
 msgid "Tool_bar Style"
 msgstr "Stil tra_ke alata"
 
-#: ../src/shell/e-shell-window-actions.c:1115
+#: ../src/shell/e-shell-window-actions.c:1145
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Prikažite dugmad prozora koristeći podešavanja trake alata radne površi"
 
-#: ../src/shell/e-shell-window-actions.c:1123
+#: ../src/shell/e-shell-window-actions.c:1153
 msgid "Delete Current View"
 msgstr "Obriši trenutni pregled"
 
-#: ../src/shell/e-shell-window-actions.c:1130
+#: ../src/shell/e-shell-window-actions.c:1160
 msgid "Save Custom View..."
 msgstr "Sačuvaj prilagođen pregled..."
 
-#: ../src/shell/e-shell-window-actions.c:1132
+#: ../src/shell/e-shell-window-actions.c:1162
 msgid "Save current custom view"
 msgstr "Sačuvajte trenutni korisnički pregled"
 
-#: ../src/shell/e-shell-window-actions.c:1139
+#: ../src/shell/e-shell-window-actions.c:1169
 msgid "C_urrent View"
 msgstr "T_renutni pregled"
 
-#: ../src/shell/e-shell-window-actions.c:1149
+#: ../src/shell/e-shell-window-actions.c:1179
 msgid "Custom View"
 msgstr "Prilagođen pregled"
 
-#: ../src/shell/e-shell-window-actions.c:1151
+#: ../src/shell/e-shell-window-actions.c:1181
 msgid "Current view is a customized view"
 msgstr "Trenutan pregled je podesio korisnik"
 
-#: ../src/shell/e-shell-window-actions.c:1159
+#: ../src/shell/e-shell-window-actions.c:1189
 msgid "Page Set_up..."
 msgstr "Podešavanje _stranice..."
 
-#: ../src/shell/e-shell-window-actions.c:1161
+#: ../src/shell/e-shell-window-actions.c:1191
 msgid "Change the page settings for your current printer"
 msgstr "Izmenite postavke stranice za trenutni štampač"
 
-#: ../src/shell/e-shell-window-actions.c:1530
+#: ../src/shell/e-shell-window-actions.c:1560
 #, c-format
 msgid "Switch to %s"
 msgstr "Pređi na %s"
 
-#: ../src/shell/e-shell-window-actions.c:1653
+#: ../src/shell/e-shell-window-actions.c:1683
 #, c-format
 msgid "Select view: %s"
 msgstr "Izaberi pregled: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1670
+#: ../src/shell/e-shell-window-actions.c:1700
 #, c-format
 msgid "Delete view: %s"
 msgstr "Obriši pregled: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1771
+#: ../src/shell/e-shell-window-actions.c:1804
 msgid "Execute these search parameters"
 msgstr "Izvršite ove parametre pretrage"
 
@@ -26150,9 +25995,8 @@ msgid "New"
 msgstr "Nova"
 
 #. Translators: This is used for the main window title.
-#: ../src/shell/e-shell-window-private.c:720
+#: ../src/shell/e-shell-window-private.c:721
 #, c-format
-#| msgid "%s - Evolution"
 msgid "%s — Evolution"
 msgstr "%s — Evolucija"
 
@@ -26207,15 +26051,12 @@ msgstr "Nemoj mi ponovo reći"
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
 #: ../src/shell/main.c:314
-#| msgid ""
-#| "Start Evolution showing the specified component. Available options are "
-#| "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "“mail”, “calendar”, “contacts”, “tasks”, and “memos”"
 msgstr ""
-"Pokreće Evoluciju prikazujući određene komponente. Dostupne opcije su: „mail“"
-", „calendar“, „contacts“, „tasks“ i „memos“"
+"Pokreće Evoluciju prikazujući određene komponente. Dostupne opcije su: "
+"„mail“, „calendar“, „contacts“, „tasks“ i „memos“"
 
 #: ../src/shell/main.c:318
 msgid "Apply the given geometry to the main window"
@@ -26260,15 +26101,11 @@ msgstr ""
 "Greška sistema: %s"
 
 #: ../src/shell/main.c:466 ../src/shell/main.c:471
-#| msgid "- The Evolution PIM and Email Client"
 msgid "— The Evolution PIM and Email Client"
 msgstr "— Evolucija rukovodilac ličnim podatacima i klijent e-pošte"
 
 #: ../src/shell/main.c:533
 #, c-format
-#| msgid ""
-#| "%s: --online and --offline cannot be used together.\n"
-#| "  Run '%s --help' for more information.\n"
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Run “%s --help” for more information.\n"
@@ -26278,9 +26115,6 @@ msgstr ""
 
 #: ../src/shell/main.c:539
 #, c-format
-#| msgid ""
-#| "%s: --force-online and --offline cannot be used together.\n"
-#| "  Run '%s --help' for more information.\n"
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
 "  Run “%s --help” for more information.\n"
@@ -26350,17 +26184,14 @@ msgid "Keep _Waiting"
 msgstr "_Sačekaj"
 
 #: ../src/shell/shell.error.xml.h:15
-#| msgid "Failed to get values from '{0}'"
 msgid "Failed to get values from “{0}”"
 msgstr "Ne mogu da dobijem ispravne vrednosti od „{0}“"
 
 #: ../src/shell/shell.error.xml.h:16
-#| msgid "Failed to invoke authenticate for '{0}'"
 msgid "Failed to invoke authenticate for “{0}”"
 msgstr "Ne mogu da se prijavim na „{0}“"
 
 #: ../src/shell/shell.error.xml.h:17
-#| msgid "Failed to connect '{0}'"
 msgid "Failed to connect “{0}”"
 msgstr "Ne mogu da se povežem na „{0}“"
 
@@ -26369,42 +26200,34 @@ msgid "_Reconnect"
 msgstr "_Ponovo se poveži"
 
 #: ../src/shell/shell.error.xml.h:19
-#| msgid "Failed to connect address book '{0}'"
 msgid "Failed to connect address book “{0}”"
 msgstr "Ne mogu da se povežem na adresar „{0}“"
 
 #: ../src/shell/shell.error.xml.h:20
-#| msgid "Failed to connect calendar '{0}'"
 msgid "Failed to connect calendar “{0}”"
 msgstr "Ne mogu da se povežem na kalendar „{0}“"
 
 #: ../src/shell/shell.error.xml.h:21
-#| msgid "Failed to connect mail account '{0}'"
 msgid "Failed to connect mail account “{0}”"
 msgstr "Ne mogu da se povežem na nalog elektronske pošte „{0}“"
 
 #: ../src/shell/shell.error.xml.h:22
-#| msgid "Failed to connect memo list '{0}'"
 msgid "Failed to connect memo list “{0}”"
 msgstr "Ne mogu da se povežem na spisa beleški „{0}“"
 
 #: ../src/shell/shell.error.xml.h:23
-#| msgid "Failed to connect task list '{0}'"
 msgid "Failed to connect task list “{0}”"
 msgstr "Ne mogu da se povežem na spisak zadataka „{0}“"
 
 #: ../src/shell/shell.error.xml.h:24
-#| msgid "Failed to prompt for credentials for '{0}'"
 msgid "Failed to prompt for credentials for “{0}”"
 msgstr "Ne mogu da zatražim punomoćje za „{0}“"
 
 #: ../src/shell/shell.error.xml.h:25
-#| msgid "Failed to finish trust prompt for '{0}'"
 msgid "Failed to finish trust prompt for “{0}”"
 msgstr "Ne mogu da završim upit poverenja za „{0}“"
 
 #: ../src/shell/shell.error.xml.h:26
-#| msgid "SSL certificate for '{0}' is not trusted."
 msgid "SSL certificate for “{0}” is not trusted."
 msgstr "SSL uverenje za „{0}“ nije od poverenja."
 
@@ -26413,36 +26236,27 @@ msgid "Reason: {1}"
 msgstr "Razlog: {1}"
 
 #: ../src/shell/shell.error.xml.h:29
-#| msgid "SSL certificate for address book '{0}' is not trusted."
 msgid "SSL certificate for address book “{0}” is not trusted."
 msgstr "SSL uverenje za adresar „{0}“ nije od poverenja."
 
 #: ../src/shell/shell.error.xml.h:30
-#| msgid "SSL certificate for calendar '{0}' is not trusted."
 msgid "SSL certificate for calendar “{0}” is not trusted."
 msgstr "SSL uverenje za kalendar „{0}“ nije od poverenja."
 
 #: ../src/shell/shell.error.xml.h:31
-#| msgid "SSL certificate for mail account '{0}' is not trusted."
 msgid "SSL certificate for mail account “{0}” is not trusted."
 msgstr "SSL uverenje za nalog e-pošte „{0}“ nije od poverenja."
 
 #: ../src/shell/shell.error.xml.h:32
-#| msgid "SSL certificate for memo list '{0}' is not trusted."
 msgid "SSL certificate for memo list “{0}” is not trusted."
 msgstr "SSL uverenje za spisak beleški „{0}“ nije od poverenja."
 
 #: ../src/shell/shell.error.xml.h:33
-#| msgid "SSL certificate for task list '{0}' is not trusted."
 msgid "SSL certificate for task list “{0}” is not trusted."
 msgstr "SSL uverenje za spisak zadataka „{0}“ nije od poverenja."
 
 #: ../src/smime/gui/ca-trust-dialog.c:104
 #, c-format
-#| msgid ""
-#| "Certificate '%s' is a CA certificate.\n"
-#| "\n"
-#| "Edit trust settings:"
 msgid ""
 "Certificate “%s” is a CA certificate.\n"
 "\n"
@@ -26642,7 +26456,6 @@ msgstr "Izmena poverenja za uverenje"
 
 #: ../src/smime/gui/certificate-manager.c:1358
 #, c-format
-#| msgid "Change trust for the host '%s':"
 msgid "Change trust for the host “%s”:"
 msgstr "Izmena poverenja za udaljeni računar „%s“:"
 
@@ -26744,13 +26557,11 @@ msgstr ""
 
 #: ../src/smime/gui/component.c:53
 #, c-format
-#| msgid "Enter the password for '%s', token '%s'"
 msgid "Enter the password for “%s”, token “%s”"
 msgstr "Unesite lozinku za „%s“, prsten „%s“"
 
 #: ../src/smime/gui/component.c:55
 #, c-format
-#| msgid "Enter the password for '%s'"
 msgid "Enter the password for “%s”"
 msgstr "Unesite lozinku za „%s“"
 
@@ -26862,7 +26673,7 @@ msgstr "Potpiši"
 msgid "Encrypt"
 msgstr "Šifruj"
 
-#: ../src/smime/lib/e-cert-db.c:786
+#: ../src/smime/lib/e-cert-db.c:788
 msgid "Certificate already exists"
 msgstr "Uverenje već postoji"
 
@@ -26903,6 +26714,39 @@ msgstr "Ne mogu upišem i sačuvam na disk, kod greške: %i"
 msgid "Imported Certificate"
 msgstr "Uveženo uverenje"
 
+#~ msgid "Logfile to log filter actions."
+#~ msgstr "Dnevnik datoteka za beleženje radnji filtera."
+
+#~ msgid "Delete address book “{0}”?"
+#~ msgstr "Da obrišem adresar „{0}“?"
+
+#~ msgid "Delete calendar “{0}”?"
+#~ msgstr "Da obrišem kalendar „{0}“?"
+
+#~ msgid "Delete task list “{0}”?"
+#~ msgstr "Da obrišem spisak zadataka „{0}“?"
+
+#~ msgid "Delete memo list “{0}”?"
+#~ msgstr "Da obrišem spisak beleški „{0}“?"
+
+#~ msgid "Delete remote calendar “{0}”?"
+#~ msgstr "Da obrišem udaljeni kalendar „{0}“?"
+
+#~ msgid "Delete remote task list “{0}”?"
+#~ msgstr "Da obrišem udaljeni spisak zadataka „{0}“?"
+
+#~ msgid "Delete remote memo list “{0}”?"
+#~ msgstr "Da obrišem udaljeni spisak beleški „{0}“?"
+
+#~ msgid "Edit"
+#~ msgstr "Uredi"
+
+#~ msgid "Are you sure you want to delete this account?"
+#~ msgstr "Sigurno želite da obrišete ovaj nalog?"
+
+#~ msgid "Address formatting"
+#~ msgstr "Oblikovanje adrese"
+
 # mail-composer:no-sig-file secondary
 # mail:no-create-tmp-path secondary
 # mail:no-delete-folder secondary
@@ -27426,7 +27270,7 @@ msgstr "Uveženo uverenje"
 #~ msgstr "_Lozinka:"
 
 #~ msgid "Copy..."
-#~ msgstr "Umnoži..."
+#~ msgstr "Kopiraj..."
 
 #~ msgid "No writable calendar is available."
 #~ msgstr "Nema dostupnog kalendara za upisivanje."



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