[evolution] Update Serbian (Latin) translation



commit 060bc419300d52199d76434238cb3fe5351c27be
Author: Милош Поповић <gpopac gmail com>
Date:   Tue Sep 10 11:34:45 2019 +0000

    Update Serbian (Latin) translation
    
    (cherry picked from commit b2dede9df5765754c096097b5e48dd9cca547c8e)

 po/sr latin po | 10685 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 6028 insertions(+), 4657 deletions(-)
---
diff --git a/po/sr latin po b/po/sr latin po
index aff5a2b512..1abf1943bd 100644
--- a/po/sr latin po
+++ b/po/sr latin po
@@ -11,11 +11,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
-"product=evolution&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2018-02-15 11:05+0000\n"
-"PO-Revision-Date: 2018-02-20 17:20+0100\n"
-"Last-Translator: Miloš Popović <gpopac gmail com>\n"
+"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/evolution/issues\n";
+"POT-Creation-Date: 2019-08-26 13:09+0000\n"
+"PO-Revision-Date: 2019-09-10 13:30+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"
@@ -24,7 +23,7 @@ msgstr ""
 "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.6\n"
+"X-Generator: Poedit 2.2.3\n"
 "X-Poedit-Bookmarks: -1,1163,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
@@ -59,8 +58,8 @@ msgid ""
 "Whether force showing the mail address with the name of the autocompleted "
 "contact in the entry."
 msgstr ""
-"Da li će u unosu da prisili prikazivanje adrese e-pošte sa imenom "
-"samodopunjenog kontakta."
+"Da li će u unosu da prisili prikazivanje adrese e-pošte imenom samodopunjenog "
+"kontakta."
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:7
 msgid "URI for the folder last used in the select names dialog"
@@ -81,7 +80,7 @@ msgid ""
 "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 — "
+"Stil razmeštaja utvrđuje položaj pregleda u odnosu na spisak kontakta. 0 — "
 "(klasičan pregled) postavlja pregled ispod liste kontakta. 1 — (uspravan "
 "pregled) postavlja pregled pored liste kontakta."
 
@@ -266,7 +265,7 @@ msgstr "Traži potvrdu za brisanje stavki"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:10
 msgid "Whether to ask for confirmation when deleting an appointment or task"
-msgstr "Da li da traži potvrdu za brisanje zakazivanja ili zadatka"
+msgstr "Da li da traži potvrdu prilikom brisanja sastanka ili zadatka"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:11
 msgid "Confirm expunge"
@@ -274,7 +273,7 @@ msgstr "Potvrdi pražnjenje"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:12
 msgid "Whether to ask for confirmation when expunging appointments and tasks"
-msgstr "Da li da traži potvrdu pri izbacivanjuzakazivanja ili zadatka"
+msgstr "Da li da traži potvrdu pri izbacivanju sastanka ili zadatka"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:13
 msgid "Month view vertical pane position"
@@ -455,98 +454,102 @@ msgid "Units for a default reminder, “minutes”, “hours” or “days”"
 msgstr "Jedinice za podrazumevani podsetnik, „minuti“, „sati“ ili „dani“"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:50
-msgid "Default reminder snooze interval, in minutes"
-msgstr "Podrazumevano vreme za odlaganje podsetnika u minutima"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
-msgid ""
-"Default reminder snooze interval, in minutes, to be filled in the reminder "
-"notification dialog"
-msgstr ""
-"Podrazumevano vreme za odlaganje podsetnika u minutima, koje se unosi u "
-"prozorče sa obeveštenjima podsetnika"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
 msgid "Show categories field in the event/meeting/task editor"
 msgstr "Prikaži polje kategorije u uređivaču događaja/sastanaka/zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:51
 msgid "Whether to show categories field in the event/meeting editor"
 msgstr "Da li da prikaže polje kategorije u uređivaču događaja/sastanaka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:52
 msgid "Show Role field in the event/task/meeting editor"
 msgstr "Prikaži polje uloge u uređivaču događaja/zadataka/sastanaka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:53
 msgid "Whether to show role field in the event/task/meeting editor"
 msgstr ""
 "Da li da prikaže polje sa ulogom u uređivaču događaja/zadataka/sastanaka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:54
 msgid "Show RSVP field in the event/task/meeting editor"
 msgstr "Prikaži polje Molim odgovorite u uređivaču događaja/zadataka/sastanaka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:55
 msgid "Whether to show RSVP field in the event/task/meeting editor"
 msgstr ""
 "Da li da prikaže polje Molim odgovorite u uređivaču događaja/zadataka/"
 "sastanaka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:56
 msgid "Show status field in the event/task/meeting editor"
 msgstr "Prikaži polje stanja u uređivaču događaja/zadataka/sastanaka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:57
 msgid "Whether to show status field in the event/task/meeting editor"
 msgstr "Da li da prikaže polje statusa u uređivaču događaja/zadataka/sastanaka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:58
 msgid "Show timezone field in the event/meeting editor"
 msgstr "Prikaži polje vremenske zone u uređivaču događaja/sastanaka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:59
 msgid "Whether to show timezone field in the event/meeting editor"
 msgstr "Da li da prikaže polje vremenske zone u uređivaču događaja/sastanaka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:60
 msgid "Show type field in the event/task/meeting editor"
 msgstr "Prikaži polje tipa u uređivaču događaja/zadataka/sastanaka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:61
 msgid "Whether to show type field in the event/task/meeting editor"
 msgstr "Da li da prikaže polje tipa u uređivaču događaja/zadataka/sastanaka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:62
 msgid "Hide completed tasks"
 msgstr "Sakrij završene zadatke"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:63
 msgid "Whether to hide completed tasks in the tasks view"
 msgstr "Da li da sakrije završene zadatke u pregledu zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:64
 msgid "Hide task units"
 msgstr "Sakrij jedinice zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:65
 msgid "Units for determining when to hide tasks, “minutes”, “hours” or “days”"
 msgstr ""
 "Jedinice za određivanje kada sakriti zaduženja, „minuti“, „sati“ ili „dani“"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:66
 msgid "Hide task value"
 msgstr "Sakrij vrednost zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:67
 msgid "Number of units for determining when to hide tasks"
 msgstr "Broj jedinica za određivanje kada sakriti zadatke"
 
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:68
+msgid "Hide cancelled events"
+msgstr "Sakrij otkazane događaje"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:69
+msgid "Whether to hide cancelled events in the calendar view"
+msgstr "Da li da sakrije otkazane događaje u prikazu kalendara"
+
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:70
+msgid "Hide cancelled tasks"
+msgstr "Sakrij otkazane zadatke"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
+msgid "Whether to hide cancelled tasks in the tasks view"
+msgstr "Da li da sakrije otkazane zadatke u pregledu zadataka"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
 msgid "Horizontal pane position"
 msgstr "Pozicija položene površi"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
 msgid ""
 "Position of the horizontal pane, between the date navigator calendar and the "
 "task list when not in the month view, in pixels"
@@ -554,25 +557,14 @@ msgstr ""
 "Pozicija položene površi, između dela kalendara za datum i spiska zadataka "
 "kada nije postavljen mesečni pregled, u pikselima"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:74
 msgid "Last reminder time"
 msgstr "Poslednje vreme podsetnika"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
 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
-msgid "Allow past reminders"
-msgstr "Dopušta prošle podsetnike"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:75
-msgid ""
-"Whether can show reminders for events/tasks/memos which already happened"
-msgstr ""
-"Da li može da pokaže podsetnike za događaje/zadatke/beleške koji su se već "
-"dogodili"
-
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:76
 msgid "Marcus Bains Line Color — Day View"
 msgstr "Boja Markus Bejns linije — Dnevni pregled"
@@ -651,47 +643,18 @@ msgid "Whether to scroll a Month View by a week, not by a month"
 msgstr "Da li da prikaže Mesečni pregled po nedeljama, umesto mesecima"
 
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:92
-msgid "Reminder programs"
-msgstr "Programi podsetnika"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
-msgid "Programs that are allowed to be run by reminders"
-msgstr "Programi koji mogu biti pokrenuti podsetnicima"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
-msgid "Show display reminders in notification tray"
-msgstr "Prikazuje podsetnike u obaveštajnoj zoni"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
-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 reminder notification dialog always on top"
-msgstr "Prikazuje prozorče obaveštenja podsetnika uvek na vrhu"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
-msgid ""
-"Whether or not to show reminder notification dialog always on top. Note this "
-"works only as a hint for the window manager, which may or may not obey it."
-msgstr ""
-"Da li da prikazuje prozorče obaveštenja podsetnika uvek na vrhu. Znajte da "
-"ovo radi samo kao savet za upravnika prozora, koji može a i ne mora ovo da "
-"odradi."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 msgid "Preferred New button item"
 msgstr "Željena stavka novog dugmeta"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:93
 msgid "Name of the preferred New toolbar button item"
 msgstr "Naziv željene stavke novog dugmeta trake alata"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:94
 msgid "Primary calendar"
 msgstr "Primarni kalendar"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:95
 msgid ""
 "The UID of the selected (or “primary”) calendar in the sidebar of the "
 "“Calendar” view"
@@ -699,33 +662,33 @@ msgstr ""
 "JIB izabranog (ili „primarnog“) kalendara u bočnoj površi u pregledu "
 "„Kalendar“"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:96
 msgid "Primary memo list"
 msgstr "Primarni spisak beleški"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:97
 msgid ""
 "The UID of the selected (or “primary”) memo list in the sidebar of the "
 "“Memos” view"
 msgstr ""
 "JIB izabrane (ili „primarne“) beleške u bočnoj površi u pregledu „Beleške“"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:98
 msgid "Primary task list"
 msgstr "Primarni spisak zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:99
 msgid ""
 "The UID of the selected (or “primary”) task list in the sidebar of the "
 "“Tasks” view"
 msgstr ""
 "JIB izabranog (ili „primarnog“) zadatka u bočnoj površi u pregledu „Zadaci“"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:100
 msgid "Free/busy template URL"
 msgstr "Model adresa za slobodno/zauzeto vreme"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:102
 #, no-c-format
 msgid ""
 "The URL template to use as a free/busy data fallback, %u is replaced by the "
@@ -734,21 +697,21 @@ msgstr ""
 "Model adrese za korišćenje u povraćaju vremena slobodno/zauzeto, %u se "
 "zamenjuje korisničkim delom elektronske adrese, a %d domenom"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:103
 msgid "Recurrent Events in Italic"
 msgstr "Događaji ponavljanja iskošenim slovima"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:104
 msgid "Show days with recurrent events in italic font in bottom left calendar"
 msgstr ""
 "Prikazuje dane sa događajima koji se ponavljaju iskošenim slovnim likom u "
 "donjem levom kalendaru"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:105
 msgid "Search range for time-based searching in years"
 msgstr "Opseg pretrage za pretraživanje na osnovu vremena u godinama"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:106
 msgid ""
 "How many years can the time-based search go forward or backward from "
 "currently selected day when searching for another occurrence; default is ten "
@@ -758,69 +721,69 @@ msgstr ""
 "trenutno izabranog dana prilikom pretrage za još jednim dešavanjem; osnovno "
 "je deset godina"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:107
 msgid "Show appointment end times in week and month views"
-msgstr "Prikazuje vremena zakazanog završetka u nedeljnim i mesečnim pregledima"
+msgstr "Prikazuje vreme završetka sastanka u nedeljnim i mesečnim pregledima"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:108
 msgid "Whether to display the end time of events in the week and month views"
 msgstr ""
 "Da li da prikaže vremena završetka događaja u nedeljnim i mesečnim pregledima"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:109
 msgid "Show appointment icons in the month view"
 msgstr "Prikazuje ikonicu sastanka u mesečnom pregledu"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:110
 msgid "Whether to show icons of events in the month view"
 msgstr "Da li će prikazati ikonicu događaja u mesečnom pregledu"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:111
 msgid "Show the memo preview pane"
 msgstr "Prikazuje pregled beleški"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:112
 msgid "If “true”, show the memo preview pane in the main window"
 msgstr "Ukoliko je izabrano, u glavnom prozoru prikazuje pregled beleški"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:113
 msgid "Show the task preview pane"
 msgstr "Prikazuje pregled zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:114
 msgid "If “true”, show the task preview pane in the main window"
 msgstr "Ukoliko je izabrano, u glavnom prozoru prikazuje pregled zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:115
 msgid "Show week numbers in Day View, Work Week View, and Date Navigator"
 msgstr ""
 "Prikazuje broj nedelje u dnevnom pregledu, u pregledu radne nedelje i "
 "pretraživaču datuma"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:116
 msgid "Whether to show week numbers in various places in the Calendar"
 msgstr "Da li da pokaže brojeve nedelja na raznim mestima u kalendaru"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:117
 msgid "Vertical position for the tag pane"
 msgstr "Uspravan položaj za površ oznake"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:118
 msgid "Highlight tasks due today"
 msgstr "Isticanje zadataka u toku dana"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:119
 msgid ""
 "Whether highlight tasks due today with a special color (task-due-today-color)"
 msgstr ""
 "Da li će zadaci u toku dana biti istaknuti posebnom bojom (boja-zadatka-u-"
 "toku-dana)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:120
 msgid "Tasks due today color"
 msgstr "Boja zadatka za danas"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:121
 msgid ""
 "Background color of tasks that are due today, in “#rrggbb” format. Used "
 "together with task-due-today-highlight"
@@ -828,15 +791,15 @@ msgstr ""
 "Boja pozadine zaduženja za danas, u obliku „#rrggbb“. Koristi se zajedno sa "
 "isticanjem-zadatka-u-toku-dana"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:122
 msgid "Task preview pane position (horizontal)"
 msgstr "Pozicija pregleda zadataka (horizontalno)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:123
 msgid "Task layout style"
 msgstr "Stil razmeštaja"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:124
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the task list. “0” (Classic View) places the preview pane below the task "
@@ -846,42 +809,30 @@ msgstr ""
 "„0“ (klasičan pregled) postavlja pregled ispod spiska zadataka. "
 "„1“ (vertikalan pregled) postavlja pregled pored spiska zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:125
 msgid "Task preview pane position (vertical)"
 msgstr "Pozicija pregleda zadataka (vertikalno)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:126
 msgid "Position of the task preview pane when oriented vertically"
 msgstr "Pozicija pregleda zadataka kada je postavljeno vertikalno"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
-msgid "Show reminders for completed tasks"
-msgstr "Prikaži podsetnike za završene zadatke"
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
-msgid ""
-"Whether to show reminders for completed tasks. When set to false, reminders "
-"for completed tasks are suppressed."
-msgstr ""
-"Da li da prikaže podsetnike za završene zadatke. Kada nije postavljeno, neće "
-"se prikazivati podsetnici za završene zadatke."
-
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:127
 msgid "Highlight overdue tasks"
 msgstr "Isticanje neispunjenih zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:128
 msgid ""
 "Whether highlight overdue tasks with a special color (task-overdue-color)"
 msgstr ""
 "Da li će neispunjeni zadaci biti istaknuti posebnom bojom (boja-neispunjenog-"
 "zadatka)"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:129
 msgid "Overdue tasks color"
 msgstr "Boja neispunjenih zadataka"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:130
 msgid ""
 "Background color of tasks that are overdue, in “#rrggbb” format. Used "
 "together with task-overdue-highlight."
@@ -889,19 +840,19 @@ msgstr ""
 "Boja pozadine neispunjenih zadataka, u obliku „#rrggbb“. Koristi se zajedno "
 "sa isticanjem-neispunjenih-zadatka."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:131
 msgid "Time divisions"
 msgstr "Podela vremena"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:132
 msgid "Intervals shown in Day and Work Week views, in minutes"
 msgstr "Intervali prikazani u dnevnim i nedeljnim pregledima, u minutima"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:133
 msgid "Timezone"
 msgstr "Vremenska zona"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:134
 msgid ""
 "The default timezone to use for dates and times in the calendar, as an "
 "untranslated Olson timezone database location like “America/New York”"
@@ -909,79 +860,79 @@ msgstr ""
 "Podrazumevana vremenska zona koju kalendar koristi za datum i vreme, kao "
 "neprevedeno mesto baze vremenske zone Olsen, kao „Amerika/Njujork“"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:135
 msgid "Twenty four hour time format"
 msgstr "24-časovni oblik vremena"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:136
 msgid "Whether to show times in twenty four hour format instead of using am/pm"
 msgstr "Da li da prikaže vreme u dvadesetočasovnom formatu, umesto prp/pop"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:137
 msgid "Birthday and anniversary reminder"
 msgstr "Podsetnik na rođendane i godišnjice"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:138
 msgid "Whether to set a reminder for birthdays and anniversaries"
 msgstr "Da li da postavi podsetnik na rođendane i godišnjice"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:139
 msgid "Default appointment reminder"
-msgstr "Podrazumevani podsetnik za zakazivanje"
+msgstr "Podrazumevani podsetnik za sastanke"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:140
 msgid "Whether to set a default reminder for appointments"
-msgstr "Da li da postavi podrazumevani podsetnik za zakazivanja"
+msgstr "Da li da postavi podrazumevani podsetnik za sastanke"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:141
 msgid "Use system timezone"
 msgstr "Koristi vremensku zonu sistema"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:142
 msgid "Use the system timezone instead of the timezone selected in Evolution"
 msgstr "Koristi vremensku zonu sistema umesto one koja je izabrana u Evoluciji"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:143
 msgid "First day of the week"
 msgstr "Prvi dan sedmice"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:144
 msgid "Monday is a work day"
 msgstr "Ponedeljak je radni dan"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:145
 msgid "Tuesday is a work day"
 msgstr "Utorak je radni dan"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:146
 msgid "Wednesday is a work day"
 msgstr "Sreda je radni dan"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:147
 msgid "Thursday is a work day"
 msgstr "Četvrtak je radni dan"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:148
 msgid "Friday is a work day"
 msgstr "Petak je radni dan"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:149
 msgid "Saturday is a work day"
 msgstr "Subota je radni dan"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:150
 msgid "Sunday is a work day"
 msgstr "Nedelja je radni dan"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:151
 msgid "Create events, memos and tasks as Private by default"
 msgstr "Podrazumevano pravi privatne događaje, beleške i zadatke"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:152
 msgid "Draw events as flat, not shaded."
 msgstr "Iscrtaj događaje kao ravne, a ne kao osenčene."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:153
 msgid ""
 "Whether to order days in the Week View from left to right, rather than from "
 "top to bottom."
@@ -989,11 +940,23 @@ msgstr ""
 "Da li da poređam dane u nedeljnom pregledu s leva na desno umesto od dole ka "
 "gore."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:154
+msgid ""
+"Allow direct edit of event Summary when clicking on it in the Day, Work "
+"Week, Week or Month view."
+msgstr ""
+"Dozvoli neposredno uređivanje sažetka događaja na klik u pregledu dana, radne "
+"nedenje, nedelje ili meseca."
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:155
+msgid "User-defined reminder times, in minutes"
+msgstr "Određeno vreme za odlaganje podsetnika u minutima"
+
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:156
 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:163
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:157
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“week-start-day-name” instead."
@@ -1001,11 +964,11 @@ msgstr ""
 "Ovaj ključ je zastareo u izdanju 3.10 i ne treba više da se koristi. Umesto "
 "njega koristite „week-start-day-name“."
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:158
 msgid "(Deprecated) Work days"
 msgstr "(Zastarelo) Radni dani"
 
-#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:159
 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-"
@@ -1245,34 +1208,50 @@ 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"
-msgstr "Prikazivanje polja „Bcc“ pri slanju poruke"
+msgid "List of recently used spell checking languages"
+msgstr "Spisak skoro korišćenih provera pravopisa jezika"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:34
 msgid ""
+"List of dictionary language codes used for spell checking, which had been "
+"used recently."
+msgstr ""
+"Spisak jezičkih kodova rečnika koji su korišćeni za proveru pravopisa i koju "
+"su nedavno korišćeni."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+msgid "How many recently used spell checking languages to remember"
+msgstr "Koliko nedavno korišćenih provera pravopisa u jezicima treba zapamtiti"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+msgid "Show “Bcc” field when sending a mail message"
+msgstr "Prikaz polja „Slepa kopija“ pri slanju poruke"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+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."
+"Prikaz polje „Slepa kopija“ pri slanju poruke. Ovo se postavlja iz menija "
+"Pregled“ nakon izbora naloga pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
 msgid "Show “Cc” field when sending a mail message"
-msgstr "Prikazivanje polja „Cc“ pri slanju poruke"
+msgstr "Prikaz polja „Kopija“ pri slanju poruke"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
 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 "
+"Prikazuje polje „Kopija“ pri slanju poruke. Ovo se postavlja iz menija "
 "„Pregled“ nakon izbora naloga pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
 msgid "Show “From” override field when sending a mail message"
-msgstr "Prikazuje polje „Šalje“ sa imenom kontakta pri slanju poruke"
+msgstr "Prikaz polja „Šalje“ sa imenom kontakta pri slanju poruke"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
 msgid ""
 "Show the “From” override field when sending a mail message. This is "
 "controlled from the View menu when a mail account is chosen."
@@ -1280,11 +1259,11 @@ msgstr ""
 "Prikazuje polje „Šalje“ sa imenom kontakta pri slanju poruke. Ovo se postavlja "
 "iz menija „Pregled“ nakon izbora naloga pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
 msgid "Show “Reply To” field when sending a mail message"
-msgstr "Prikazivanje polja „Odgovor za“ kada šalje poruku"
+msgstr "Prikaz polja „Odgovor za“ kada šalje poruku"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
 msgid ""
 "Show the “Reply To” field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -1292,11 +1271,11 @@ msgstr ""
 "Prikazuje polje „Odgovor za“ pri slanju na poruke. Ovo se postavlja iz "
 "izbornika „Pregled“ nakon izbora naloga pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
 msgid "Show “From” field when posting to a newsgroup"
-msgstr "Prikazivanje polja „Šalje“ pri slanju na dopisnu listu"
+msgstr "Prikaz polja „Šalje“ pri slanju na dopisnu listu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
 msgid ""
 "Show the “From” field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -1304,11 +1283,11 @@ msgstr ""
 "Prikazuje polje „Šalje“ pri slanju na dopisnu listu. Ovo se postavlja iz "
 "izbornika „Pregled“ nakon izbora naloga dopisne liste."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
 msgid "Show “Reply To” field when posting to a newsgroup"
-msgstr "Prikazivanje polja „Odgovor za“ pri slanju na dopisnna spisku"
+msgstr "Prikaz polja „Odgovor za“ pri slanju na dopisnna spisku"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
 msgid ""
 "Show the “Reply To” field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -1316,11 +1295,11 @@ msgstr ""
 "Prikazuje polje „Odgovor za“ pri slanju na dopisnu listu. Ovo se postavlja iz "
 "izbornika „Pregled“ nakon izbora naloga dopisne liste."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
 msgid "Digitally sign replies when the original message is signed"
 msgstr "Digitalno potpisuje odgovore kada je potpisana originalna poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
 msgid ""
 "Automatically enable PGP or S/MIME signatures when replying to a message "
 "which is also PGP or S/MIME signed."
@@ -1328,11 +1307,11 @@ msgstr ""
 "Sam uključuje PGP ili S/MIME potpise kada odgovara na poruke koje su takođe "
 "PGP ili S/MIME potpisane."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
 msgid "Encode filenames in an Outlook/GMail way"
 msgstr "Kodiranje naziva datoteka na način Autluka/Gpošte"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
 msgid ""
 "Encode filenames in the mail headers same as Outlook or GMail do, to let "
 "them display correctly filenames with UTF-8 letters sent by Evolution, "
@@ -1343,11 +1322,11 @@ msgstr ""
 "kako bi ispravno prikazali nazive sa UTF-8 slovima koje šalje Evolucija, "
 "pošto se ne pridržavaju RFC 2231, nego koriste neispravan standard RFC 2047."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
 msgid "Send messages through Outbox folder"
 msgstr "Šalji poruku kroz fasciklu Za slanje"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
 msgid ""
 "Always save messages to Outbox folder when sending, to let a user choose "
 "when the messages should be sent."
@@ -1355,11 +1334,11 @@ msgstr ""
 "Uvek čuva poruku u fasciklu „Za slanje“ prilikom slanja, što omogućava "
 "korisniku da pošalje poruku po potrebi."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
 msgid ""
 "Include selected signature only for new messages, but have no signature "
 "added for Replies or Forwards."
@@ -1367,11 +1346,11 @@ 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
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 msgid "Put personalized signatures at the top of replies"
 msgstr "Postavlja personalizovane potpise iznad odgovora"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
 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 "
@@ -1381,11 +1360,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:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid "Do not add signature delimiter"
 msgstr "Ne dodaje razdvojnik potpisa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -1393,11 +1372,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:57
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid "Keep original message signature in replies"
 msgstr "Zadrži izvorni potpis poruke u odgovorima"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid ""
 "When set to TRUE, keep original message signature in replies, otherwise "
 "strip the signature and everything below it when replying to the message."
@@ -1405,11 +1384,11 @@ msgstr ""
 "Kada je postavljeno na tačno, čuva izvorni potpis poruke u odgovorima. U "
 "suprotnom skida potpis i sve ispod njega, prilikom odgovaranja na poruku."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid "Ignore list Reply-To:"
-msgstr "Zanemaruje listu „Odgovor-za:“"
+msgstr "Zanemari listu Odgovori na:"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 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. "
@@ -1419,19 +1398,20 @@ msgid ""
 "it will do that. It works by comparing the Reply-To: header with a List-"
 "Post: header, if there is one."
 msgstr ""
-"Neke dopisne liste podešavaju zaglavlje „Odgovor-za:“ da prevare korisnike da "
-"šalju odgovore na listu, čak i kada oni traže od Evolucije da da privatni "
-"odgovor. Postavljanje ove opcije će pokušati da zanemari takva zaglavlja "
-"„Odgovor-za“, tako da će Evolucija da uradi onako kako ste vi zatražili. Ako "
-"koristite radnju privatnog odgovora, onda će odgovoriti privatno, a ako "
-"koristite radnju „Odgovori na listu“ onda će to da uradi. Vrši se upoređivanje "
-"zaglavlje „Odgovor-za“ sa zaglavljem „Spisak objava“, ako postoji."
+"Neke dopisne liste podešavaju zaglavlje „Odgovori na:“ da prevare korisnike "
+"da šalju odgovore na listu, čak i kada oni traže od Evolucije da pošalje "
+"privatni odgovor. Postavljanje ove opcije će pokušati da zanemari takva "
+"zaglavlja „Odgovori na“, tako da će Evolucija da uradi onako kako ste vi "
+"zatražili. Ako koristite radnju privatnog odgovora, onda će odgovoriti "
+"privatno, a ako 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:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid "List of localized “Re”"
 msgstr "Spisak lokalizovanih „Odg“"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 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. "
@@ -1441,11 +1421,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:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid "List of localized “Re” separators"
 msgstr "Spisak lokalizovanih „Odg“"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 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 "
@@ -1455,11 +1435,11 @@ msgstr ""
 "preskočene u tekstu prilikom odgovaranja na poruku, kao dodatak standardnom "
 "„:“ i Unikodovom „:“ razdvojniku."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Use localized “Fwd”/“Re” in message Subject"
 msgstr "Koristi prevod za „Pro“/„Odg“ u naslovu poruke"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid ""
 "When set to true, uses localized “Fwd”/“Re” in message Subject on reply and "
 "forward as provided by current locale translation, otherwise uses "
@@ -1469,32 +1449,34 @@ msgstr ""
 "odgovaranju ili prosleđivanju u onom obliku dostupnom u prevodu, a u suprotnom "
 "koristi verziju bez prevoda."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Number of characters for wrapping"
 msgstr "Broj znakova za prelom"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 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:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 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“"
+"Broj primaoca u Prima i Kopija nakon koga se pojavljuje „prompt-on-many-to-cc-"
+"recips“"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid ""
 "When to ask, when the number of To and CC recipients reaches this value."
 msgstr ""
-"Kada se postavlja pitanje. Kada broj Za i CC primaoca dostigne ovu vrednost."
+"Kada se postavlja pitanje. Kada broj primaoca iz Prima i Kopija dostigne ovu "
+"vrednost."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 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:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 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 "
@@ -1504,19 +1486,58 @@ 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:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "Wrap quoted text in replies"
 msgstr "Prelama citirani tekst u odgovorima"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 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:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+msgid "Convert UTC time in reply credits to local time"
+msgstr "Pretvori UTC vreme u lokalno vreme, u zaslugama odgovora"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+msgid ""
+"Whether the time in reply credits should be converted to local time when "
+"it’s in UTC in the message."
+msgstr ""
+"Da li vreme u zaslugama odgovora treba pretvoriti u lokalno vreme ako se "
+"koristi UTC u poruci."
+
+# bug: plural-forms
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+msgid "Mark replied to messages as read"
+msgstr "Označi odgovorene poruke kao pročitane"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+msgid ""
+"When replying to a message and marking it as being replied to, then whether "
+"also mark it as read."
+msgstr ""
+"Kada se odgovara na poruku i označava poruka da je u stanju odgovoranja, da li "
+"je treba takođe označiti i kao pročitanu."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+msgid "Whether start Plain Text composer with Preformatted paragraph mode"
+msgstr ""
+"Da li treba pokrenuti uređivača običnog teksta u režimu predodređenog pasusa"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+msgid ""
+"When set to true, new Plain Text messages will have preselected Preformatted "
+"paragraph mode. The Normal paragraph mode will be used when set to false."
+msgstr ""
+"Kada je podešeno na tačno, nove poruke u običnom tekstu koristiće režim "
+"predodređenog pasusa. Režim običnog pasusa biće korišćen kada je podešeno na "
+"netačno."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 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:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid ""
 "Set to “false” to block automatic display of attachments with Content-"
 "Disposition: inline."
@@ -1524,19 +1545,19 @@ msgstr ""
 "Poništite ovu opciju da blokirate automatski prikaz priloga sa „razmeštajem-"
 "sadržaja:na mreži“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 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:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "Can be either “mbox” or “pdf”."
 msgstr "Može biti „mbox“ ili „pdf“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Show image animations"
 msgstr "Prikazivanje animiranih slika"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -1544,11 +1565,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:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 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:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -1556,11 +1577,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:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 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:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -1568,57 +1589,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:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 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:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 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:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Mark citations in the message “Preview”"
 msgstr "Označava citate u pregledu poruke"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Mark citations in the message “Preview”."
 msgstr "Označava citate u pregledu poruke."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Citation highlight color"
 msgstr "Boja isticanja citata"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Citation highlight color."
 msgstr "Boja za isticanja citata."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Enable/disable caret mode"
 msgstr "Uključuje/isključuje prikaz kursora"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 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:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Default charset in which to display messages"
 msgstr "Podrazumevani skup znakova za prikaz poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Default charset in which to display messages."
 msgstr "Podrazumevani skup znakova za prikaz poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 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:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 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:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 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 "
@@ -1628,27 +1649,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:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Show Animations"
 msgstr "Prikazivanje animacija"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Show animated images as animations."
 msgstr "Prikazuje animirane slike kao animacije."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Show all message headers"
 msgstr "Prikazivanje svih zaglavlja poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 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:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 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:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 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 "
@@ -1658,36 +1679,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:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Show photo of the sender"
 msgstr "Prikazivanje slike pošiljaoca"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 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:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 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:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 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:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 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:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 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:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 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:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid ""
 "If set to true, the selected message will be set as unread after the timeout "
 "also after the folder change."
@@ -1695,56 +1716,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:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 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:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 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:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Show Attachment Bar"
 msgstr "Prikaz trake priloga"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 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:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 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:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 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:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Show deleted messages in the message-list"
 msgstr "Prikazivanje obrisanih poruka u listi poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 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:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 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:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 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:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Enable Unmatched search folder"
 msgstr "Uključi nepoklopljene fascikle pretrage"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
@@ -1752,11 +1773,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:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 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:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 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."
@@ -1764,31 +1785,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:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Height of the message-list pane"
 msgstr "Visina površi liste poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Height of the message-list pane."
 msgstr "Visina površi za liste poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 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:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid "Width of the message-list pane"
 msgstr "Širina površi spiska poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Width of the message-list pane."
 msgstr "Širina površi spiska poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid "Layout style"
 msgstr "Stil razmeštaja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 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 "
@@ -1799,47 +1820,47 @@ msgstr ""
 "poruka. 0 — (klasičan pregled) smešta ovu površ ispoda spiska poruka. 1 — "
 "(vertikalan pregled) smešta površ pored spiska poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Variable width font"
 msgstr "Font promenljive veličine"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 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:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Terminal font"
 msgstr "Font terminala"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "The terminal font for mail display."
 msgstr "Font terminala za prikaz pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid "Use custom fonts"
 msgstr "Korišćenje sopstvenih fontova"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 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:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Compress display of addresses in TO/CC/BCC"
-msgstr "Sažima prikaz adresa u Za/CC/BCC"
+msgstr "Sažima prikaz adresa u Prima/Kopija/Slepa kopija"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
 msgstr ""
-"Vrši sažimanje prikaza adresa u Prima/CC/BCC na broj određen u broju adresa "
-"(address_count)."
+"Vrši sažimanje prikaza adresa u Prima/Kopija/Slepa kopija na broj određen u "
+"broju adresa (address_count)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid "Number of addresses to display in TO/CC/BCC"
-msgstr "Broj adresa za prikaz u KO/CC/BCC"
+msgstr "Broj adresa za prikaz u Prima/Kopija/Slepa kopija"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a “...” is shown."
@@ -1847,23 +1868,38 @@ 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:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+msgid ""
+"Show mails in headers part of the message preview when name is available"
+msgstr "Prikazuj adresu pošte u zaglavljima poruke i kada postoji ime osobe"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+msgid ""
+"When set to false, the mail addresses which contain both the name and the "
+"email parts in headers like To/Cc/Bcc will be shown only with the name part, "
+"without the actual email, with the name made clickable."
+msgstr ""
+"Kada je isključeno, adrese pošte koje sadrže ime i adresu u zaglavljima Prima/"
+"Kopija/Slepa kopija će biti prikazane samo kao ime, bez prave adrese pošte i "
+"sa mogućnošću da se ime proširi kada se na njega klikne."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid "Thread the message-list based on Subject"
 msgstr "Prikaz poruke prema naslovu rasprave"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
 msgstr ""
-"Da li pokušati prikaz rasprave po naslovu kada poruke ne sadrže zaglavlja „In-"
-"Reply-To“ ili „References“."
+"Da li pokušati prikaz rasprave po naslovu kada poruke ne sadrže zaglavlja „U "
+"odgovoru na“ ili „Reference“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid "Default value for thread expand state"
 msgstr "Podrazumevana vrednost za raširenu raspravu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -1871,11 +1907,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:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 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:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 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 "
@@ -1884,11 +1920,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:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 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:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 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."
@@ -1896,11 +1932,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:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 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:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 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 "
@@ -1912,19 +1948,19 @@ 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:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid "Log filter actions"
 msgstr "Dnevnik radnji filtera"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 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:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid "Logfile to log filter actions"
 msgstr "Dnevnik datoteka za beleženje radnji filtera"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid ""
 "If not set, or being “stdout”, then the logging is done to stdout, instead "
 "to a file."
@@ -1932,11 +1968,11 @@ 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:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "Flush Outbox after filtering"
 msgstr "Prazni slanje nakon filtriranja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 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 "
@@ -1946,63 +1982,71 @@ msgstr ""
 "ove fascikle će se dogoditi samo ako se koristi neka radnja filtera "
 "„Prosledi“ i otprilike jedan minut posle prizivanja poslednje radnje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Default forward style"
 msgstr "Podrazumevani stil prosleđivanja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Default reply style"
 msgstr "Podrazumevani stil odgovora"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+msgid ""
+"Forward and reply attribution language tag, like en_US. Empty string means "
+"to use the same language as the user interface."
+msgstr ""
+"Pripisani jezik u prosleđenim porukama i odgovorima, npr. en_GB. Prazno polje "
+"znači da se koristi isti vaš podrazumevani jezik."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
 msgstr "Upozorenje na slanje poruke kada se koristi prečica (Ctrl+Enter)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 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:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Prompt on empty subject"
 msgstr "Postavlja upit kada je naslov prazan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 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:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Prompt when emptying the trash"
 msgstr "Postavlja upit prilikom pražnjenja smeća"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 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:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Prompt when user expunges"
 msgstr "Postavlja upit pri pražnjenju"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 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:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 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:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 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:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 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:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -2010,19 +2054,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:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Prompt when user only fills Bcc"
-msgstr "Postavlja upit kada korisnik unese samo nevidljivu grafitnu kopiju (Bcc)"
+msgstr "Postavlja upit kada korisnik unese samo Slepu kopiju"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 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:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 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:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -2030,12 +2074,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:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 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:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -2043,19 +2087,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:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Prompt while marking multiple messages"
 msgstr "Postavlja upit pri označavanju više poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 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:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 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:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 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 "
@@ -2064,12 +2108,12 @@ msgstr ""
 "Omogućava/onemogućava ponavljanje upozorenja da je brisanje poruke iz fascikle "
 "pretrage trajno, a ne samo uklanjanje iz rezultata pretrage."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr ""
 "Pitaće da li da kopira fasciklu prevlačenjem i ubacivanjem u stablu fascikli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 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 "
@@ -2081,12 +2125,12 @@ msgstr ""
 "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:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 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:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 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 "
@@ -2098,11 +2142,11 @@ msgstr ""
 "fascikli prevlačenjem i ubacivanjem u stablo fascikli bez pitanja, ili „ask“ — "
 "(ili svaka druga vrednost) pitaće korisnika."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 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:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 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."
@@ -2110,11 +2154,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:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 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:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 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 "
@@ -2122,27 +2166,27 @@ msgid ""
 msgstr ""
 "Omogućava/onemogućava ponavljanje upozorenja da pokušavate da pošaljete privatni "
 "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"
+"„Odgovori na“ je podešeno da vas preusmeri da odgovorite na listu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 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:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 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:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 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"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid ""
 "It disables/enables the repeated prompts to warn that you are switching "
 "composer format and the content needs to lose its formatting."
@@ -2150,20 +2194,20 @@ 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:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 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:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 msgid ""
 "Enable or disable the prompt when sending to many To and CC recipients. The "
 "“composer-many-to-cc-recips-num” defines the threshold."
 msgstr ""
 "Omogućava ili onemogućava upozorenje kada se poruka šalje na veliki broj "
-"pošiljaoca navedenih u poljima „Za“ ili „CC“. Vrednost „composer-many-to-cc-"
-"recips-num“ određuje prag za upozorenje."
+"pošiljaoca navedenih u poljima „Prima“ ili „Kopija“. Vrednost „composer-many-"
+"to-cc-recips-num“ određuje prag za upozorenje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid ""
 "Policy for automatically closing the message browser window when forwarding "
 "or replying to the displayed message."
@@ -2171,42 +2215,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:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
 msgid "Empty Trash folders on exit"
 msgstr "Prazni fascikle sa smećem na izlazu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
 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:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
 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:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
 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:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid "Last time Empty Trash was run"
 msgstr "Poslednje vreme pražnjenja smeća"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 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:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 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:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 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:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid ""
 "This can have three possible values. “0” for errors. “1” for warnings. “2” "
 "for debug messages."
@@ -2214,11 +2258,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:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid "Show original “Date” header value."
 msgstr "Prikazuje originalnu vrednost zaglavlja datuma."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 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 "
@@ -2228,11 +2272,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:209
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 msgid "List of Labels and their associated colors"
 msgstr "Spisak oznaka i njima dodeljenih boja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 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."
@@ -2240,46 +2284,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:211
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 msgid "Check incoming mail being junk"
 msgstr "Proveri da li dolazna pošta sadrži đubre"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
 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:213
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
 msgid "Empty Junk folders on exit"
 msgstr "Prazni fascikle sa đubretom pri izlazu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:226
 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:215
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:227
 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:216
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:228
 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:217
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:229
 msgid "Last time Empty Junk was run"
 msgstr "Vreme poslednjeg pražnjenja đubreta"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
 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 "
 "(epoha)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
 msgid "The default plugin for Junk hook"
 msgstr "Podrazumevani dodatak kuke za đubre"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
 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 "
@@ -2289,11 +2333,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:221
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Utvrđuje da li u imeniku prikaže pregled adrese pošiljaoca"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:234
 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 "
@@ -2305,7 +2349,7 @@ msgstr ""
 "samodopunjavanje. Može biti sporo ako su imeniku (recimo LDAP) označeni za "
 "samodopunjavanje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:235
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -2313,7 +2357,7 @@ msgstr ""
 "Utvrđuje da li samo u imeniku prikaže pregled adrese u potrazi za neželjenom "
 "poštom"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:224
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:236
 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 "
@@ -2323,13 +2367,13 @@ msgstr ""
 "da li da se adresa traži samo u lokalnom imeniku kako bi se izdvojila pošta "
 "primljena od poznatih pošiljalaca od one neželjene."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:225
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:237
 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:226
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:238
 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 "
@@ -2338,11 +2382,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:227
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
 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:228
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:240
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format “headername=value”."
@@ -2350,31 +2394,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:229
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
 msgid "UID string of the default account."
 msgstr "JIB niz podrazumevanog naloga."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:230
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:242
 msgid "Save directory"
 msgstr "Direktorijum čuvanja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:231
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
 msgid "Directory for saving mail component files."
-msgstr "Direktorijum za čuvanje datoteka modula za poštu."
+msgstr "Direktorijum za čuvanje datoteka iz pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:232
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:244
 msgid "Composer load/attach directory"
 msgstr "Direktorijum sastavljača za učitavanje/prilaganje"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:233
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:245
 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:234
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:246
 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:235
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:247
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -2382,11 +2426,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:236
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:248
 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:237
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:249
 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 "
@@ -2397,11 +2441,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:238
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
 msgid "Server synchronization interval"
 msgstr "Interval usaglašavanja sa serverom"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:239
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:251
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -2409,11 +2453,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:240
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:252
 msgid "Allow expunge in virtual folders"
 msgstr "Dozvoli pražnjenje virtuelnih fascikli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:241
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:253
 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 "
@@ -2425,12 +2469,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:242
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:254
 #: ../src/mail/mail-config.ui.h:9
 msgid "Inherit theme colors in HTML format"
 msgstr "Nasledi boju teme iz HTML režima"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:243
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:255
 msgid ""
 "When enabled the theme colors for background, text and links are sent in "
 "resulting HTML formatted message."
@@ -2438,11 +2482,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:244
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:256
 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:245
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
 msgid ""
 "An Archive folder to use for Messages|Archive... feature when in an On This "
 "Computer folder."
@@ -2450,69 +2494,69 @@ 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:246
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
 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:247
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:259
 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:248
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:260
 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:249
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:261
 msgid "Holds the width of the To Do bar for the main window."
-msgstr "Čuva širinu trake sa zadacima glavnog prozora"
+msgstr "Čuva širinu trake sa zadacima glavnog prozora."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:250
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:262
 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:251
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:263
 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:252
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:264
 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:253
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:265
 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:254
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:266
 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:255
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:267
 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:256
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:268
 msgid "Whether the To Do bar should show also tasks without Due date"
 msgstr "Da li traka sa zadacima treba da prikazuje i zadatke bez roka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:257
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:269
 msgid "Stores whether the To Do bar should show also tasks without Due date."
 msgstr "Čuva podešavanje prikazivanja zadataka bez roka u traci sa zadacima."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:258
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:270
 msgid "Show start up wizard"
 msgstr "Prikaži čarobnjaka za pokretanje"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:259
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:271
 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:260
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:272
 msgid "Whether go to the previous message after message deletion"
 msgstr "Da li da odem na prethodnu poruku nakon brisanja poruke"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:261
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:273
 msgid ""
 "If set to true, goes to the previous message when the selected is deleted; "
 "or to the next message, when it’s set to false."
@@ -2520,11 +2564,11 @@ msgstr ""
 "Ako je izabrano ide se na prethodnu poruku kada se trenutno označena obriše, "
 "ili na sledeću u suprotnom."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:262
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:274
 msgid "Show Subject above Sender in Messages column"
 msgstr "Prikaži naslov iznad imena pošiljaoca, u koloni za poruke"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:263
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:275
 msgid ""
 "Whether to show Subject above Sender (From/To) in the Messages column, "
 "usually shown in the Vertical/Wide view of the message list"
@@ -2532,23 +2576,132 @@ msgstr ""
 "Da li treba prikazivati naslov iznad naziva pošiljaoca (Šalje/Prima) u koloni "
 "za poruke, obično se prikazuje u vertikalnom/širokom pregledu spiska poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:264
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:276
 msgid "Visually wrap long lines in composer"
 msgstr "Vidno prelamaj dugačke linije u sastavljaču"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:265
-#: ../src/composer/e-composer-actions.c:552
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:277
+#: ../src/composer/e-composer-actions.c:542
 msgid ""
 "Whether to visually wrap long lines of text to avoid horizontal scrolling"
 msgstr ""
 "Da li treba vidno prelamati dugačke linije teksta zarad izbegavanja "
 "vodoravnog prevlačenja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:266
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:278
+msgid "Alternative reply style"
+msgstr "Stil alternativnog odgovora"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:279
+msgid "Format message in HTML"
+msgstr "Sastavljaj poruke kao HTML"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:280
+msgid "Put the cursor at the bottom of alternative replies"
+msgstr "Postavlja kursor na dno alternativnih odgovora"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:281
+msgid ""
+"This determines whether the cursor is placed at the top of the message or "
+"the bottom when using Alternative Reply."
+msgstr ""
+"Određuje da li je kursor postavljen na vrhu ili na dnu teksta poruke prilikom "
+"Alternativnog odgovora."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:282
+msgid "Apply chosen template when using Alternative Reply"
+msgstr "Primeni izabrani šablon prilikom Alternativnog odgovora"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:283
+msgid "Last chosen template’s folder URI for Alternative Reply"
+msgstr "Adresa poslednje izabrane fascikle sa šablonima za Alterantivni odgovor"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:284
+msgid "Last chosen template’s message UID for Alternative Reply"
+msgstr "JIB poslednje izabrane poruka iz šablona za Alternativni odgovor"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:285
+msgid ""
+"Whether preserve original message subject when applying template for "
+"Alternative Reply"
+msgstr ""
+"Da li da sačuva originalni naslov poruke ako se primenjuje šablon za "
+"Alternativni odgovor"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:286
+msgid ""
+"Whether set “body” in mailto: URI as Preformatted paragraph style. If set to "
+"“false”, then Normal paragraph style will be used."
+msgstr ""
+"Da li da postavi „telo“ u primaoca: adresa u predodređenom stilu pasusa. "
+"Ukoliko je isključeno, koristi se normalni stil pasusa."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:287
+msgid ""
+"Close the message browser window when the selected message is deleted or "
+"marked as Junk."
+msgstr ""
+"Zatvori prozor za pregled poruke kada je izabrana poruka obrisana ili "
+"premeštena u nepoželjne."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:288
+msgid ""
+"Collapse archive folders in Move/Copy message to Folder and Go to Folder "
+"selectors."
+msgstr ""
+"Sakupi fascikle arhive prilikom izbora Premesti/Kopiraj poruku u Fasciklu i "
+"Idi u fasciklu."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:289
+msgid ""
+"Where to lookup recipient S/MIME certificates or PGP keys when encrypting "
+"messages."
+msgstr ""
+"Da li da potražim S/MIME uverenja primaoca ili PGP ključeve prilikom šifrovanja "
+"poruka."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:290
+msgid ""
+"The “off” value completely disables certificate lookup; the “autocompleted” "
+"value provides certificates only for auto-completed contacts; the “books” "
+"value uses certificates from auto-completed contacts and searches in books "
+"marked for auto-completion."
+msgstr ""
+"Uverenja će potpuno biti onemogućena ukoliko je „isključeno“; vrednost "
+"„samodopunjeni“ će izdati uverenja samo za kontakte koji su samodopunjni; "
+"vrednost „knjige“ će izdati uverenja za samodopunjene kontakte i pretrage u "
+"knjigama koje su označene za samodopunjavanje."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:291
+msgid "Whether Send/Receive should also download of messages for offline."
+msgstr "Da li da Pošalji/Preuzmi preuzima poruke kada je program mreže."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:292
+msgid ""
+"If enabled, whenever Send/Receive is run it also runs synchronization of "
+"messages for offline use. The option is disabled by default."
+msgstr ""
+"Ukoliko je omogućeno, kada se pokrene Pošalji/Primi započeće sinhronizacija "
+"poruka i za korisnike koji nisu na mreži. Ova opcija je podrazumevano "
+"isključena."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:293
+msgid "Whether display delivery notification parts inline."
+msgstr "Da li se delovi obaveštenja o dostavi prikazuju u redu."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:294
+msgid ""
+"If enabled, the message/delivery-status and message/disposition-notification "
+"parts are shown automatically inline."
+msgstr ""
+"Ukoliko je omogućeno, poruka/status isporuke i poruka/obaveštenje o rasporedu "
+"će biti prikazani automatski u redu."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:295
 msgid "(Deprecated) Default forward style"
 msgstr "(Zastarelo) Podrazumevani stil prosleđivanja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:267
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:296
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“forward-style-name” instead."
@@ -2556,11 +2709,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:268
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:297
 msgid "(Deprecated) Default reply style"
 msgstr "(Zastarelo) Podrazumevani stil odgovora"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:269
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:298
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“reply-style-name” instead."
@@ -2568,11 +2721,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:270
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:299
 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:271
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:300
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“show-headers” instead."
@@ -2580,11 +2733,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:272
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:301
 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:273
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:302
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“image-loading-policy” instead."
@@ -2592,7 +2745,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:274
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:303
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
@@ -2600,7 +2753,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:275
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:304
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "“browser-close-on-reply-policy” instead."
@@ -2658,37 +2811,45 @@ msgid ""
 msgstr "Da li će kontakti biti samostalno dodati u korisnički imenik."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:7
+msgid "Whether to set “File under” field as “First Last”"
+msgstr "Dali da postavim „Smesti pod“ kao „Prvi Poslednji“"
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
+msgid "Set File under as “First Last”, instead of “Last, First”."
+msgstr "Postavlja Smesti pod kao „Prvi Poslednji“, umesto „Prvi, Poslednji“."
+
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
 msgid "Pidgin address book source"
 msgstr "Izvor Pidžinovih imenika"
 
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:8
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
 msgid ""
 "Address book to use for storing automatically synced contacts from Pidgin."
 msgstr ""
 "Imenik koji će biti korišćen za smeštaj samostalno usaglašene kontakte sa "
 "Golupka."
 
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
 msgid "Pidgin check interval"
 msgstr "Period provere Pidžina"
 
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:10
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
 msgid "Check interval for Pidgin syncing of contacts."
 msgstr "Period provere za Pidžin usklađivanje kontakata."
 
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:11
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:13
 msgid "Pidgin last sync MD5"
 msgstr "MD5 poslednjeg usklađivanja Golupka"
 
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:12
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:14
 msgid "Pidgin last sync MD5."
 msgstr "MD5 poslednjeg usklađivanja Pidžina."
 
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:13
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:15
 msgid "Pidgin last sync time"
 msgstr "Vreme poslednjeg usklađivanja Pidžina"
 
-#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:14
+#: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:16
 msgid "Pidgin last sync time."
 msgstr "Vreme poslednjeg usklađivanja Pidžina."
 
@@ -2743,6 +2904,14 @@ msgstr "Brisanje obrađenih"
 msgid "Whether to delete processed iTip objects"
 msgstr "Da li da obriše obrađene iTip objekte"
 
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:3
+msgid "Preserve existing reminder by default"
+msgstr "Podrazumevano čuvaj podsetnike"
+
+#: ../data/org.gnome.evolution.plugin.itip.gschema.xml.in.h:4
+msgid "Whether to preset option to preserve existing reminder by default"
+msgstr "Određuje da li se podrazumevano čuvaju postojeći podsetnici"
+
 #: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:1
 msgid "Notify new messages for Inbox only."
 msgstr "Obaveštava samo za nove poruke u Sandučetu."
@@ -2832,6 +3001,15 @@ msgstr ""
 "Pušta zvuk teme kada stigne nova poruka, ukoliko nije uključeno obaveštenje "
 "sirenom."
 
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:19
+msgid "Do not notify for these accounts"
+msgstr "Ne šalji obaveštene za ove naloge"
+
+#: ../data/org.gnome.evolution.plugin.mail-notification.gschema.xml.in.h:20
+msgid ""
+"Contains UIDs of accounts for which the notifications should be avoided."
+msgstr "Sadrži spisak JIB naloga za koje treba izbegavati ispisivanje poruka."
+
 #: ../data/org.gnome.evolution.plugin.prefer-plain.gschema.xml.in.h:1
 msgid "Mode to use when displaying mails"
 msgstr "Režim za korišćenje prilikom prikaza pošte"
@@ -2925,7 +3103,7 @@ msgstr ""
 "autoar-om."
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:11
-#: ../src/shell/main.c:317
+#: ../src/shell/main.c:331
 msgid "Start in offline mode"
 msgstr "Započinje rad van mreže"
 
@@ -3045,19 +3223,33 @@ msgstr ""
 
 #: ../data/org.gnome.evolution.shell.gschema.xml.in.h:37
 msgid ""
-"It can be either “.gz” or “.xz” and it influences what extension will be "
-"preselected in the file chooser."
+"It can be either “.gz” or “.xz” and it influences what extension will be "
+"preselected in the file chooser."
+msgstr ""
+"Može biti ili '.gz' ili '.xz' i utiče na ekstenziju koja je će biti odabrana "
+"u biraču datoteka."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:38
+msgid "Prefix of the URI to use to search the web with selected text."
+msgstr ""
+"Prefiks adrese koja se koristi za pretragu veba na osnovu izabranog teksta."
+
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:39
+msgid ""
+"The prefix of a URL to be used for searches on the web. The actual text "
+"selection is escaped and appended to this string. The URI should start with "
+"https://.";
 msgstr ""
-"Može biti ili '.gz' ili '.xz' i utiče na ekstenziju koja je će biti odabrana "
-"u biraču datoteka."
+"Prefiks adrese koja se koristi za pretraživanje veba. Izabrani tekst će biti "
+"preuzet i dodat ovom prefiksu. Adresa treba da počinje sa https://.";
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:1
 msgid "Use only local spam tests."
-msgstr "Koristi samo lokalne provere spama."
+msgstr "Koristi lokalnu proveru nepoželjne pošte."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:2
 msgid "Use only the local spam tests (no DNS)."
-msgstr "Koristi samo lokalne provere spama (bez DNS-a)."
+msgstr "Koristi lokalnu proveru nepoželjne pošte (bez DNS-a)."
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
 msgid "Full path command to run spamassassin"
@@ -3089,10 +3281,14 @@ msgstr ""
 "Naredba ne treba da sadrži dodatne opcije."
 
 #: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:1
+msgid "Whether the text-highlight module is enabled"
+msgstr "Da li je modul za isticanje teksta omogućen"
+
+#: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:2
 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
+#: ../data/org.gnome.evolution.text-highlight.gschema.xml.in.h:3
 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 "
@@ -3101,22 +3297,22 @@ 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→...."
+"klika→Formatiraj kao→...."
 
-#: ../data/org.gnome.Evolution.appdata.xml.in.h:1
+#: ../data/org.gnome.Evolution.appdata.xml.in.in.h:1
 #: ../data/org.gnome.Evolution.desktop.in.in.h:1
-#: ../src/mail/e-mail-browser.c:1112
+#: ../src/mail/e-mail-browser.c:1252
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:208
 #: ../src/shell/e-shell-window-private.c:240
 msgid "Evolution"
 msgstr "Evolucija"
 
-#: ../data/org.gnome.Evolution.appdata.xml.in.h:2
+#: ../data/org.gnome.Evolution.appdata.xml.in.in.h:2
 #: ../data/org.gnome.Evolution.desktop.in.in.h:4
 msgid "Manage your email, contacts and schedule"
 msgstr "Upravljajte vašom poštom, kontaktima i obavezama"
 
-#: ../data/org.gnome.Evolution.appdata.xml.in.h:3
+#: ../data/org.gnome.Evolution.appdata.xml.in.in.h:3
 msgid ""
 "Evolution is a personal information management application that provides "
 "integrated mail, calendaring and address book functionality."
@@ -3124,7 +3320,7 @@ msgstr ""
 "Evolucija je program za upravljanje ličnim podacima koji obezbeđuje objedinjenu "
 "funkcionalnost pošte, kalendara i imenika."
 
-#: ../data/org.gnome.Evolution.appdata.xml.in.h:4
+#: ../data/org.gnome.Evolution.appdata.xml.in.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 "
@@ -3136,11 +3332,15 @@ msgstr ""
 "standarda i bezbednost. Evolucija može takođe glatko da se objedini sa "
 "Majkrosoftovom razmenom posredstvom proširenja „Usluge veb razmene“ (EWS)."
 
+#: ../data/org.gnome.Evolution.appdata.xml.in.in.h:5
+msgid "The Evolution Team"
+msgstr "Tim Evolucije"
+
 # bug(slobo): tooltip bi mogao da bude i „Pošaljite e-poruku prijateljima i pored
 # ovako uštogljenih originala
 # msgstr "Paket poslovnih programa"
 #: ../data/org.gnome.Evolution.desktop.in.in.h:2
-#: ../src/shell/e-shell-utils.c:428
+#: ../src/shell/e-shell-utils.c:352
 msgid "Groupware Suite"
 msgstr "Paket grupe"
 
@@ -3165,17 +3365,17 @@ msgstr "Sastavite poruku"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:8
 #: ../src/e-util/e-name-selector-dialog.c:448
-#: ../src/modules/addressbook/e-book-shell-backend.c:307
-#: ../src/modules/addressbook/e-book-shell-view.c:371
+#: ../src/modules/addressbook/e-book-shell-backend.c:314
+#: ../src/modules/addressbook/e-book-shell-view.c:412
 msgid "Contacts"
 msgstr "Kontakti"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:9
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:845
-#: ../src/e-util/e-collection-account-wizard.c:559
-#: ../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:582
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:954
+#: ../src/e-util/e-collection-account-wizard.c:816
+#: ../src/e-util/e-send-options.c:544 ../src/e-util/e-webdav-browser.c:470
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:199
+#: ../src/modules/calendar/e-cal-shell-view.c:599
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:22
 msgid "Calendar"
 msgstr "Kalendar"
@@ -3185,40 +3385,275 @@ msgstr "Kalendar"
 #: ../src/e-util/e-send-options.c:536 ../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:1249
-#: ../src/smime/gui/certificate-manager.c:1682
+#: ../src/modules/mail/e-mail-shell-view.c:1493
+#: ../src/smime/gui/certificate-manager.c:1666
 msgid "Mail"
 msgstr "Pošta"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:11
-#: ../src/calendar/gui/e-memo-table.c:368 ../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
+#: ../src/calendar/gui/e-memo-table.c:457 ../src/e-util/e-webdav-browser.c:460
+#: ../src/modules/calendar/e-cal-shell-content.c:1763
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:196
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:211
+#: ../src/modules/calendar/e-memo-shell-view.c:335
 msgid "Memos"
 msgstr "Beleške"
 
 #: ../data/org.gnome.Evolution.desktop.in.in.h:12
-#: ../src/calendar/gui/e-task-table.c:697 ../src/calendar/gui/print.c:2408
+#: ../src/calendar/gui/e-task-table.c:624 ../src/calendar/gui/print.c:2426
 #: ../src/calendar/importers/icalendar-importer.c:77
-#: ../src/calendar/importers/icalendar-importer.c:1110
-#: ../src/e-util/e-webdav-browser.c:460
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
-#: ../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
+#: ../src/calendar/importers/icalendar-importer.c:1141
+#: ../src/e-util/e-webdav-browser.c:461
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:71
+#: ../src/modules/calendar/e-cal-shell-content.c:1723
+#: ../src/modules/calendar/e-task-shell-view-actions.c:220
+#: ../src/modules/calendar/e-task-shell-view-actions.c:235
+#: ../src/modules/calendar/e-task-shell-view.c:508
 msgid "Tasks"
 msgstr "Zadaci"
 
-#: ../data/org.gnome.Evolution-alarm-notify.desktop.in.in.h:1
-msgid "Evolution Alarm Notify"
-msgstr "Obaveštenje alarma Evolucije"
+#: ../data/ui/evolution-shortcuts.ui.h:1
+msgctxt "shortcut window"
+msgid "Keyboard Shortcuts"
+msgstr "Prečice tastature"
+
+#: ../data/ui/evolution-shortcuts.ui.h:2
+msgctxt "shortcut window"
+msgid "General"
+msgstr "Opšte"
+
+#: ../data/ui/evolution-shortcuts.ui.h:3
+msgctxt "shortcut window"
+msgid "Select Mail component"
+msgstr "Prelazak na odeljak za poštu"
+
+#: ../data/ui/evolution-shortcuts.ui.h:4
+msgctxt "shortcut window"
+msgid "Select Contacts component"
+msgstr "Prelazak na odeljak za kontakte"
+
+#: ../data/ui/evolution-shortcuts.ui.h:5
+msgctxt "shortcut window"
+msgid "Select Calendar component"
+msgstr "Prelazak na odeljak za kalendar"
+
+#: ../data/ui/evolution-shortcuts.ui.h:6
+msgctxt "shortcut window"
+msgid "Select Tasks component"
+msgstr "Prelazak na odeljak za zadatke"
+
+#: ../data/ui/evolution-shortcuts.ui.h:7
+msgctxt "shortcut window"
+msgid "Select Memos component"
+msgstr "Prelazak na odeljak za beleške"
+
+#: ../data/ui/evolution-shortcuts.ui.h:8
+msgctxt "shortcut window"
+msgid "Create a new item in current component"
+msgstr "Pravljenje nove stavke u trenutnom odeljku"
+
+#: ../data/ui/evolution-shortcuts.ui.h:9
+msgctxt "shortcut window"
+msgid "Cycle focus between panes"
+msgstr "Promena fokusa u površima programa"
+
+#: ../data/ui/evolution-shortcuts.ui.h:10
+msgctxt "shortcut window"
+msgid "Open the Evolution user guide"
+msgstr "Otvaranje korisničko uputstvo Evolucije"
+
+#: ../data/ui/evolution-shortcuts.ui.h:11
+msgctxt "shortcut window"
+msgid "Clear search bar"
+msgstr "Očisti pretragu"
+
+#: ../data/ui/evolution-shortcuts.ui.h:12
+msgctxt "shortcut window"
+msgid "Move mails or contacts to folder"
+msgstr "Premeštanje pošte ili kontakata u fasciklu"
+
+#: ../data/ui/evolution-shortcuts.ui.h:13
+msgctxt "shortcut window"
+msgid "Copy mails or contacts to folder"
+msgstr "Kopiranje pošte ili kontakata u fasciklu"
+
+#: ../data/ui/evolution-shortcuts.ui.h:14
+msgctxt "shortcut window"
+msgid "Preferences"
+msgstr "Postavke"
+
+#: ../data/ui/evolution-shortcuts.ui.h:15
+msgctxt "shortcut window"
+msgid "Open new window"
+msgstr "Otvaranje novog prozora"
+
+#: ../data/ui/evolution-shortcuts.ui.h:16
+msgctxt "shortcut window"
+msgid "Close window"
+msgstr "Zatvaranje prozora"
+
+#: ../data/ui/evolution-shortcuts.ui.h:17
+msgctxt "shortcut window"
+msgid "Quit Evolution"
+msgstr "Izlazak iz Evolucije"
+
+# 48x48/emblems/emblem-mail.icon.in.h:1
+#: ../data/ui/evolution-shortcuts.ui.h:18
+msgctxt "shortcut window"
+msgid "Mail"
+msgstr "Pošta"
+
+#: ../data/ui/evolution-shortcuts.ui.h:19
+msgctxt "shortcut window"
+msgid "Create a new message"
+msgstr "Pravljenje nove beleške"
+
+#: ../data/ui/evolution-shortcuts.ui.h:20
+msgctxt "shortcut window"
+msgid "Send and receive messages"
+msgstr "Slanje i primanje poruka"
+
+#: ../data/ui/evolution-shortcuts.ui.h:21
+msgctxt "shortcut window"
+msgid "Apply filters to selection"
+msgstr "Primena filtera za izabrano"
+
+#: ../data/ui/evolution-shortcuts.ui.h:22
+msgctxt "shortcut window"
+msgid "Open selection in new window"
+msgstr "Otvaranje izabranog u novom prozoru"
+
+#: ../data/ui/evolution-shortcuts.ui.h:23
+msgctxt "shortcut window"
+msgid "Go to folder"
+msgstr "Odlazak u fasciklu"
+
+# bug: plural-forms
+#: ../data/ui/evolution-shortcuts.ui.h:24
+msgctxt "shortcut window"
+msgid "Mark selected messages as read"
+msgstr "Označavanje da su izabrane poruke pročitane"
+
+#: ../data/ui/evolution-shortcuts.ui.h:25
+msgctxt "shortcut window"
+msgid "Mark selected messages as unread"
+msgstr "Označavanje da izabrane poruke nisu pročitane"
+
+#: ../data/ui/evolution-shortcuts.ui.h:26
+msgctxt "shortcut window"
+msgid "Jump to the next unread message"
+msgstr "Odlazak na sledeću nepročitanu poruku"
+
+#: ../data/ui/evolution-shortcuts.ui.h:27
+msgctxt "shortcut window"
+msgid "Jump to the previous unread message"
+msgstr "Odlazak na prethodnu nepročitanu poruku"
+
+#: ../data/ui/evolution-shortcuts.ui.h:28
+msgctxt "shortcut window"
+msgid "Forward selected messages"
+msgstr "Prosleđivanje izabranih poruka"
+
+#: ../data/ui/evolution-shortcuts.ui.h:29
+msgctxt "shortcut window"
+msgid "Reply to sender"
+msgstr "Odgovor pošiljaocu"
+
+#: ../data/ui/evolution-shortcuts.ui.h:30
+msgctxt "shortcut window"
+msgid "Reply to list"
+msgstr "Odgovor na listu"
+
+# bug(slobo): verovatno izveštaj o dostavi
+#: ../data/ui/evolution-shortcuts.ui.h:31
+msgctxt "shortcut window"
+msgid "Reply to all recipients"
+msgstr "Odgovor svim primaocima"
+
+#: ../data/ui/evolution-shortcuts.ui.h:32
+msgctxt "shortcut window"
+msgid "Scroll up"
+msgstr "Listanje nagore"
+
+#: ../data/ui/evolution-shortcuts.ui.h:33
+msgctxt "shortcut window"
+msgid "Scroll down"
+msgstr "Listanje nadole"
+
+#: ../data/ui/evolution-shortcuts.ui.h:34
+msgctxt "shortcut window"
+msgid "Calendar"
+msgstr "Kalendar"
+
+#: ../data/ui/evolution-shortcuts.ui.h:35
+msgctxt "shortcut window"
+msgid "Create a new appointment"
+msgstr "Pravljenje novog sastanak"
+
+#: ../data/ui/evolution-shortcuts.ui.h:36
+msgctxt "shortcut window"
+msgid "Create a new meeting"
+msgstr "Pravljenje novog sastanka"
+
+#: ../data/ui/evolution-shortcuts.ui.h:37
+msgctxt "shortcut window"
+msgid "Create a new task"
+msgstr "Pravljenje novog zadatka"
+
+#: ../data/ui/evolution-shortcuts.ui.h:38
+msgctxt "shortcut window"
+msgid "Create a new memo"
+msgstr "Pravljenje nove beleške"
+
+#: ../data/ui/evolution-shortcuts.ui.h:39
+msgctxt "shortcut window"
+msgid "Go to today"
+msgstr "Odlazak na današnji dan"
+
+#: ../data/ui/evolution-shortcuts.ui.h:40
+msgctxt "shortcut window"
+msgid "Go to date"
+msgstr "Odlazak na datum"
+
+#: ../data/ui/evolution-shortcuts.ui.h:41
+msgctxt "shortcut window"
+msgid "Day View"
+msgstr "Dnevni pregled"
+
+#: ../data/ui/evolution-shortcuts.ui.h:42
+msgctxt "shortcut window"
+msgid "Work Week View"
+msgstr "Pregled radne nedelje"
+
+#: ../data/ui/evolution-shortcuts.ui.h:43
+msgctxt "shortcut window"
+msgid "Week View"
+msgstr "Nedeljni pregled"
+
+#: ../data/ui/evolution-shortcuts.ui.h:44
+msgctxt "shortcut window"
+msgid "Month View"
+msgstr "Mesečni pregled"
+
+#: ../data/ui/evolution-shortcuts.ui.h:45
+msgctxt "shortcut window"
+msgid "List View"
+msgstr "Pregled spiskom"
+
+#: ../data/ui/evolution-shortcuts.ui.h:46
+msgctxt "shortcut window"
+msgid "Contacts"
+msgstr "Kontakti"
+
+#: ../data/ui/evolution-shortcuts.ui.h:47
+msgctxt "shortcut window"
+msgid "Create a new contact"
+msgstr "Pravljenje novog kontakta"
 
-#: ../data/org.gnome.Evolution-alarm-notify.desktop.in.in.h:2
-msgid "Calendar event notifications"
-msgstr "Obaveštenja o događajima kalendara"
+#: ../data/ui/evolution-shortcuts.ui.h:48
+msgctxt "shortcut window"
+msgid "Create a new contact list"
+msgstr "Pravljenje novog spiska kontakta"
 
 #: ../data/views/addressbook/galview.xml.h:1
 msgid "_Address Cards"
@@ -3281,11 +3716,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 ../src/e-util/e-webdav-browser.c:2439
+#: ../data/views/memos/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2448
 msgid "_Memos"
 msgstr "Be_leške"
 
-#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2443
+#: ../data/views/tasks/galview.xml.h:1 ../src/e-util/e-webdav-browser.c:2452
 #: ../src/plugins/pst-import/pst-importer.c:571
 msgid "_Tasks"
 msgstr "_Zadaci"
@@ -3410,30 +3845,34 @@ msgstr ""
 "veličinu i da je sačuvate?"
 
 #: ../src/addressbook/addressbook.error.xml.h:24
+msgid "An expected image size is up to 96 x 96 pixels."
+msgstr "Očekivana veličina slike je do 96 × 96 piksela."
+
+#: ../src/addressbook/addressbook.error.xml.h:25
 msgid "_Resize"
 msgstr "_Promeni veličinu"
 
-#: ../src/addressbook/addressbook.error.xml.h:25
+#: ../src/addressbook/addressbook.error.xml.h:26
 msgid "_Use as it is"
 msgstr "_Koristi tako kako je"
 
-#: ../src/addressbook/addressbook.error.xml.h:26
+#: ../src/addressbook/addressbook.error.xml.h:27
 msgid "_Do not save"
 msgstr "_Ne čuvaj"
 
-#: ../src/addressbook/addressbook.error.xml.h:27
+#: ../src/addressbook/addressbook.error.xml.h:28
 msgid "Unable to save {0}."
 msgstr "Ne mogu da sačuvam {0}."
 
-#: ../src/addressbook/addressbook.error.xml.h:28
+#: ../src/addressbook/addressbook.error.xml.h:29
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Greška pri čuvanju {0} u {1}: {2}"
 
-#: ../src/addressbook/addressbook.error.xml.h:29
+#: ../src/addressbook/addressbook.error.xml.h:30
 msgid "Address “{0}” already exists."
 msgstr "Adresa „{0}“ već postoji."
 
-#: ../src/addressbook/addressbook.error.xml.h:30
+#: ../src/addressbook/addressbook.error.xml.h:31
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
@@ -3441,31 +3880,31 @@ msgstr ""
 "Kontakt sa ovom adresom već postoji. Želite li ipak da dodate novu kartu sa "
 "istom adresom?"
 
-#: ../src/addressbook/addressbook.error.xml.h:31
+#: ../src/addressbook/addressbook.error.xml.h:32
 #: ../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:1359
-#: ../src/e-util/e-accounts-window.c:1526
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:751
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1525
+#: ../src/e-util/e-accounts-window.c:1563
 #: ../src/e-util/e-mail-signature-manager.c:328
-#: ../src/e-util/e-name-selector-dialog.c:1033 ../src/e-util/filter.ui.h:25
-#: ../src/mail/e-mail-account-manager.c:719
+#: ../src/e-util/e-name-selector-dialog.c:1029 ../src/e-util/filter.ui.h:25
+#: ../src/mail/e-mail-account-manager.c:721
 #: ../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: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
+#: ../src/mail/em-folder-properties.c:1330
+#: ../src/mail/em-vfolder-editor-rule.c:408
+#: ../src/mail/em-vfolder-editor-rule.c:637 ../src/mail/mail-config.ui.h:63
+#: ../src/modules/mail/em-composer-prefs.c:423
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:544
+#: ../src/plugins/email-custom-header/email-custom-header.c:839
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../src/plugins/templates/templates.c:463
+#: ../src/plugins/templates/templates.c:464
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../src/addressbook/addressbook.error.xml.h:32
+#: ../src/addressbook/addressbook.error.xml.h:33
 msgid "Some addresses already exist in this contact list."
 msgstr "Neke adrese već postoje na ovom spisku kontakata."
 
-#: ../src/addressbook/addressbook.error.xml.h:33
+#: ../src/addressbook/addressbook.error.xml.h:34
 msgid ""
 "You are trying to add addresses that are part of this list already. Would "
 "you like to add them anyway?"
@@ -3473,19 +3912,19 @@ msgstr ""
 "Pokušavate da dodate adrese koje su već deo ove liste. Da li ipak želite da "
 "ih dodate?"
 
-#: ../src/addressbook/addressbook.error.xml.h:34
+#: ../src/addressbook/addressbook.error.xml.h:35
 msgid "Skip duplicates"
 msgstr "Preskoči duplikate"
 
-#: ../src/addressbook/addressbook.error.xml.h:35
+#: ../src/addressbook/addressbook.error.xml.h:36
 msgid "Add with duplicates"
 msgstr "Dodaj sa duplikatima"
 
-#: ../src/addressbook/addressbook.error.xml.h:36
+#: ../src/addressbook/addressbook.error.xml.h:37
 msgid "List “{0}” is already in this contact list."
 msgstr "Spisak „{0}“ je već na ovom spisku kontakata."
 
-#: ../src/addressbook/addressbook.error.xml.h:37
+#: ../src/addressbook/addressbook.error.xml.h:38
 msgid ""
 "A contact list named “{0}” is already in this contact list. Would you like "
 "to add it anyway?"
@@ -3493,21 +3932,21 @@ msgstr ""
 "Spisak kontakata pod nazivom „{0}“ se već nalazi na ovom spisku. Da li ipak "
 "želite da ga dodate?"
 
-#: ../src/addressbook/addressbook.error.xml.h:38
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1280
+#: ../src/addressbook/addressbook.error.xml.h:39
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1241
 msgid "Failed to delete contact"
 msgstr "Ne mogu da obrišem kontakt"
 
-#: ../src/addressbook/addressbook.error.xml.h:39
+#: ../src/addressbook/addressbook.error.xml.h:40
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "Nemate dovoljna ovlašćenja da brišete kontakte iz ovog imenika."
 
-#: ../src/addressbook/addressbook.error.xml.h:40
+#: ../src/addressbook/addressbook.error.xml.h:41
 msgid "Cannot add new contact"
 msgstr "Nije moguće dodati novi kontakt"
 
 #. For Translators: {0} is the name of the address book source
-#: ../src/addressbook/addressbook.error.xml.h:42
+#: ../src/addressbook/addressbook.error.xml.h:43
 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."
@@ -3515,12 +3954,12 @@ msgstr ""
 "Imenik „{0}“ je samo za čitanje i nije podložan izmenama. Izaberite drugi "
 "imenik sa bočne trake u pregledu Kontakti."
 
-#: ../src/addressbook/addressbook.error.xml.h:43
+#: ../src/addressbook/addressbook.error.xml.h:44
 msgid "Cannot save a contact, address book is still opening"
 msgstr "Ne mogu da sačuvam kontakt, imenik se još uvek otvara"
 
 #. For Translators: {0} is the name of the address book source
-#: ../src/addressbook/addressbook.error.xml.h:45
+#: ../src/addressbook/addressbook.error.xml.h:46
 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."
@@ -3528,19 +3967,35 @@ msgstr ""
 "Ne mogu da sačuvam kontakt u imenik „{0}“, jer se još uvek otvara. Ili "
 "sačekajte dok se ne otvori, ili izaberite neki drugi imenik."
 
-#: ../src/addressbook/addressbook.error.xml.h:46
+#: ../src/addressbook/addressbook.error.xml.h:47
 msgid "Something has gone wrong when displaying the contact"
 msgstr "Nešto je pošlo naopako prilikom prikazivanja kontakta"
 
-#: ../src/addressbook/addressbook.error.xml.h:47
+#: ../src/addressbook/addressbook.error.xml.h:48
 msgid ""
 "A WebKitWebProcess crashed when displaying the contact. You can try again by "
 "moving to another contact and back. If the issue persists, please file a bug "
-"report in the GNOME bugzilla."
+"report in GNOME Gitlab."
 msgstr ""
-"Veb proces VebKita se urušio prilikom prikazivanja kontakta. Možete pokišati "
-"ponovo tako što ćete otići na neki drugi kontakt i vratiti se nazad. Ako ni "
-"to ne pomaže, popunite izveštaj o grešci na Gnomovoj bubaždaji."
+"Veb proces VebKita se urušio prilikom prikazivanja kontakta. Možete ga "
+"pokrenuti ponovo tako što ćete otići na neki drugi kontakt i vratiti se "
+"nazad. Ako ni to ne pomogne, popunite izveštaj o grešci na Gnomov Gitlab."
+
+#: ../src/addressbook/addressbook.error.xml.h:49
+msgid "Failed to refresh list of account address books"
+msgstr "Ne mogu da osvežim spisak adresara sa naloga"
+
+#: ../src/addressbook/addressbook.error.xml.h:50
+msgid "Do you want to unset contact image?"
+msgstr "Da li želite da uklonite sliku kontakta?"
+
+#: ../src/addressbook/addressbook.error.xml.h:51
+msgid "Do _Not Unset"
+msgstr "_Ne uklanjaj"
+
+#: ../src/addressbook/addressbook.error.xml.h:52
+msgid "_Unset"
+msgstr "_Ukloni"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:1
 msgid "Show Telephone"
@@ -3587,111 +4042,118 @@ msgid "Show Certificates"
 msgstr "Prikaži uverenja"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:725
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:747
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3108
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:724
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:746
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3115
 msgid "Contact Editor"
 msgstr "Uređivač za kontakte"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:13
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1976
-#: ../src/mail/mail-config.ui.h:38
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2353
+#: ../src/mail/mail-config.ui.h:40
 msgid "Options"
 msgstr "Mogućnosti"
 
 #. This is only shown if the EActivity has a GCancellable.
 #. no flags
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:14
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3271
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3504
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4319
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3278
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3508
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4340
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4346
 #: ../src/addressbook/gui/contact-editor/e-contact-editor-fullname.c:220
 #: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:453
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:14
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:2
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:472
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:716
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:510
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:746
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:316
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1360
-#: ../src/calendar/gui/e-cal-dialogs.c:694
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:301
-#: ../src/composer/e-composer-actions.c:229 ../src/e-util/e-activity-bar.c:357
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1321
+#: ../src/calendar/gui/e-cal-dialogs.c:689
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:304
+#: ../src/composer/e-composer-actions.c:228 ../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: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-collection-account-wizard.c:1563
-#: ../src/e-util/e-collection-account-wizard.c:1798
+#: ../src/e-util/e-attachment-store.c:658
+#: ../src/e-util/e-attachment-store.c:668
+#: ../src/e-util/e-attachment-store.c:848
+#: ../src/e-util/e-attachment-store.c:854 ../src/e-util/e-attachment-view.c:301
+#: ../src/e-util/e-categories-dialog.c:80 ../src/e-util/e-category-editor.c:169
+#: ../src/e-util/e-category-editor.c:257 ../src/e-util/e-charset-combo-box.c:99
+#: ../src/e-util/e-collection-account-wizard.c:238
+#: ../src/e-util/e-collection-account-wizard.c:1838
+#: ../src/e-util/e-collection-account-wizard.c:2074
 #: ../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
-#: ../src/e-util/e-html-editor-actions.c:415
-#: ../src/e-util/e-image-chooser-dialog.c:169
+#: ../src/e-util/e-filter-datespec.c:300
+#: ../src/e-util/e-html-editor-actions.c:304
+#: ../src/e-util/e-html-editor-actions.c:348
+#: ../src/e-util/e-html-editor-actions.c:430
+#: ../src/e-util/e-image-chooser-dialog.c:179
 #: ../src/e-util/e-mail-signature-script-dialog.c:366
-#: ../src/e-util/e-passwords.c:468 ../src/e-util/e-rule-context.c:813
+#: ../src/e-util/e-passwords.c:468 ../src/e-util/e-rule-context.c:816
 #: ../src/e-util/e-rule-editor.c:187 ../src/e-util/e-rule-editor.c:298
-#: ../src/e-util/e-rule-editor.c:930 ../src/e-util/e-send-options.ui.h:16
+#: ../src/e-util/e-rule-editor.c:933 ../src/e-util/e-send-options.ui.h:16
 #: ../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:4133
+#: ../src/e-util/evolution-source-viewer.c:835 ../src/e-util/e-web-view.c:4347
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:267
 #: ../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:867 ../src/mail/mail-send-recv.c:949
-#: ../src/mail/mail-vfolder-ui.c:149 ../src/mail/mail-vfolder-ui.c:271
+#: ../src/mail/e-mail-tag-editor.c:160 ../src/mail/em-composer-utils.c:4047
+#: ../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:874
+#: ../src/mail/mail-send-recv.c:955 ../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:936
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:409
-#: ../src/modules/calendar/e-cal-attachment-handler.c:283
+#: ../src/modules/calendar/e-cal-attachment-handler.c:281
 #: ../src/plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
-#: ../src/plugins/face/face.c:295
+#: ../src/plugins/face/face.c:298
 #: ../src/plugins/publish-calendar/publish-calendar.c:789
 #: ../src/plugins/publish-calendar/url-editor-dialog.c:419
-#: ../src/plugins/save-calendar/save-calendar.c:185
-#: ../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
-#: ../src/smime/gui/certificate-manager.c:966
-#: ../src/smime/gui/certificate-manager.c:1348
+#: ../src/plugins/save-calendar/save-calendar.c:186
+#: ../src/shell/e-shell-content.c:641 ../src/shell/e-shell-content.c:748
+#: ../src/shell/e-shell-utils.c:69 ../src/shell/e-shell-utils.c:133
+#: ../src/smime/gui/certificate-manager.c:651
+#: ../src/smime/gui/certificate-manager.c:723
+#: ../src/smime/gui/certificate-manager.c:951
+#: ../src/smime/gui/certificate-manager.c:1332
 #: ../src/smime/gui/e-cert-selector.c:235 ../src/smime/gui/smime-ui.ui.h:17
 msgid "_Cancel"
 msgstr "_Otkaži"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:15
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3505
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3508
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:3
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:719
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:749
 #: ../src/calendar/calendar.error.xml.h:47
-#: ../src/calendar/gui/e-comp-editor.c:2115
-#: ../src/composer/e-composer-actions.c:230
-#: ../src/composer/e-composer-actions.c:350
-#: ../src/e-util/e-attachment-store.c:833
+#: ../src/calendar/gui/e-comp-editor.c:2158
+#: ../src/composer/e-composer-actions.c:228
+#: ../src/composer/e-composer-actions.c:340
+#: ../src/e-util/e-attachment-store.c:848
+#: ../src/e-util/e-attachment-store.c:855
 #: ../src/e-util/e-mail-signature-script-dialog.c:370
-#: ../src/e-util/e-webdav-browser.c:2467 ../src/e-util/e-web-view.c:4134
+#: ../src/e-util/e-webdav-browser.c:2476 ../src/e-util/e-web-view.c:4347
 #: ../src/e-util/gal-view-instance-save-as-dialog.c:268
-#: ../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
+#: ../src/shell/e-shell-content.c:642 ../src/shell/e-shell-utils.c:133
+#: ../src/smime/gui/certificate-manager.c:651
+#: ../src/smime/gui/certificate-manager.c:724
 msgid "_Save"
 msgstr "_Sačuvaj"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:16
-#: ../src/calendar/gui/e-comp-editor.c:2012
-#: ../src/calendar/gui/e-comp-editor.c:2084
+#: ../src/calendar/gui/e-comp-editor.c:2055
+#: ../src/calendar/gui/e-comp-editor.c:2127
 #: ../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:994
+#: ../src/shell/e-shell.c:1474 ../src/shell/e-shell-window-actions.c:1019
 msgid "_Help"
 msgstr "Po_moć"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:17
-#: ../src/e-util/e-misc-utils.c:3493
+#: ../src/e-util/e-misc-utils.c:3573
 msgid "Image"
 msgstr "Slika"
 
@@ -3717,8 +4179,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:762
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1181
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:835
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1291
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:6
 msgid "Email"
 msgstr "E-pošta"
@@ -3749,8 +4211,8 @@ msgid "_Home Page:"
 msgstr "_Lična strana:"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:30
-#: ../src/calendar/gui/e-comp-editor-event.c:725
-#: ../src/modules/itip-formatter/itip-view.c:2048
+#: ../src/calendar/gui/e-comp-editor-event.c:870
+#: ../src/modules/itip-formatter/itip-view.c:2071
 msgid "_Calendar:"
 msgstr "_Kalendar:"
 
@@ -3838,20 +4300,22 @@ msgid "_Anniversary:"
 msgstr "_Godišnjica:"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:52
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:893
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1001
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:47
-#: ../src/calendar/gui/e-calendar-view.c:2056
+#: ../src/calendar/gui/e-calendar-view.c:2098
 msgid "Anniversary"
 msgstr "Godišnjica"
 
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:53
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:892
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1000
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:46
-#: ../src/calendar/gui/e-calendar-view.c:2055
+#: ../src/calendar/gui/e-calendar-view.c:2097
 msgid "Birthday"
 msgstr "Rođendan"
 
+#. Other options
 #: ../src/addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../src/mail/e-mail-config-defaults-page.c:887
 #: ../src/modules/addressbook/autocompletion-config.c:127
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:46
 msgid "Miscellaneous"
@@ -3894,16 +4358,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:860
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:969
 #: ../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:525
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:927
-#: ../src/calendar/gui/e-cal-model.c:3805
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:526
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1035
+#: ../src/calendar/gui/e-cal-model.c:3792
 msgid "Other"
 msgstr "Drugo"
 
@@ -3927,20 +4391,20 @@ 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:1375
-#: ../src/e-util/e-attachment-view.c:356 ../src/e-util/e-filter-rule.c:409
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1541
+#: ../src/e-util/e-attachment-view.c:355 ../src/e-util/e-filter-rule.c:409
 #: ../src/e-util/e-mail-signature-manager.c:368
-#: ../src/e-util/e-name-selector-dialog.c:1037
+#: ../src/e-util/e-name-selector-dialog.c:1033
 #: ../src/e-util/filter.error.xml.h:18 ../src/e-util/filter.ui.h:27
-#: ../src/mail/e-mail-config-identity-page.c:871
+#: ../src/mail/e-mail-config-identity-page.c:872
 #: ../src/mail/e-mail-label-manager.c:389 ../src/mail/em-filter-rule.c:678
-#: ../src/mail/em-folder-properties.c:1037
-#: ../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/mail/em-folder-properties.c:1336
+#: ../src/mail/em-vfolder-editor-rule.c:642 ../src/mail/mail-config.ui.h:64
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:554
+#: ../src/plugins/email-custom-header/email-custom-header.c:849
 #: ../src/plugins/publish-calendar/publish-calendar.c:790
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:35
-#: ../src/plugins/templates/templates.c:473
+#: ../src/plugins/templates/templates.c:474
 msgid "_Remove"
 msgstr "_Ukloni"
 
@@ -3953,125 +4417,128 @@ 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:318
+#: ../src/modules/addressbook/e-book-shell-backend.c:325
 msgid "Certificates"
 msgstr "Uverenja"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:260
-#: ../src/calendar/gui/e-comp-editor.c:2047
-#: ../src/e-util/e-html-editor-actions.c:913
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:261
+#: ../src/calendar/gui/e-comp-editor.c:2090
+#: ../src/e-util/e-html-editor-actions.c:945
 msgid "_Undo"
 msgstr "O_pozovi"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:262
-#: ../src/calendar/gui/e-comp-editor.c:2049 ../src/e-util/e-focus-tracker.c:120
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:263
+#: ../src/calendar/gui/e-comp-editor.c:2092 ../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:2054
-#: ../src/e-util/e-html-editor-actions.c:899
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:268
+#: ../src/calendar/gui/e-comp-editor.c:2097
+#: ../src/e-util/e-html-editor-actions.c:931
 msgid "_Redo"
 msgstr "Po_novi"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:269
-#: ../src/calendar/gui/e-comp-editor.c:2056 ../src/e-util/e-focus-tracker.c:136
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../src/calendar/gui/e-comp-editor.c:2099 ../src/e-util/e-focus-tracker.c:136
 msgid "Redo"
 msgstr "Ponovi"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:301
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:302
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:501
 msgid "Error adding contact"
 msgstr "Greška pri dodavanju kontakta"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:321
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:322
 msgid "Error modifying contact"
 msgstr "Greška pri izmeni kontakta"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:341
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:342
 msgid "Error removing contact"
 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
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:740
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3109
 #, c-format
 msgid "Contact Editor — %s"
 msgstr "Uređivač za kontakte — %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3238
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3245
 msgid "X.509 certificates"
 msgstr "X.509 uverenja"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3243
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3250
 msgid "PGP keys"
 msgstr "PGP ključevi"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3249
-#: ../src/smime/gui/certificate-manager.c:689
-#: ../src/smime/gui/certificate-manager.c:978
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3256
+#: ../src/smime/gui/certificate-manager.c:672
+#: ../src/smime/gui/certificate-manager.c:961
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3269
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3276
 msgid "Open PGP key"
 msgstr "Otvoreni PGP ključ"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3269
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3276
 msgid "Open X.509 certificate"
 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: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
-#: ../src/shell/e-shell-utils.c:71 ../src/smime/gui/certificate-manager.c:967
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3278
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4340
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4347
+#: ../src/e-util/e-attachment-store.c:666 ../src/e-util/e-category-editor.c:177
+#: ../src/e-util/e-html-editor-actions.c:304
+#: ../src/e-util/e-html-editor-actions.c:348
+#: ../src/e-util/e-html-editor-actions.c:430
+#: ../src/e-util/e-image-chooser-dialog.c:182 ../src/plugins/face/face.c:298
+#: ../src/shell/e-shell-utils.c:69 ../src/smime/gui/certificate-manager.c:951
 msgid "_Open"
 msgstr "_Otvori"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3289
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3520
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3293
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3521
 msgid "Chosen file is not a local file."
 msgstr "Izabrana datoteka nije na lokalnom računaru."
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3302
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3306
 #, c-format
 msgid "Failed to load certificate: %s"
 msgstr "Ne mogu da uvezem uverenje: %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3331
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3335
 msgctxt "cert-kind"
 msgid "X.509"
 msgstr "X.509"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3331
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3335
 msgctxt "cert-kind"
 msgid "PGP"
 msgstr "PGP"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3506
 msgid "Save PGP key"
 msgstr "Sačuvaj PGP ključ"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3502
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3506
 msgid "Save X.509 certificate"
 msgstr "Sačuvaj X.506 uverenje"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3532
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:3533
 #, c-format
 msgid "Failed to save certificate: %s"
 msgstr "Ne mogu da uvezem uverenje: %s"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4316
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4337
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4343
 msgid "Please select an image for this contact"
 msgstr "Izaberite sliku za ovaj kontakt"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4321
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4348
 msgid "_No image"
 msgstr "_Bez slike"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4670
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4708
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -4079,28 +4546,28 @@ msgstr ""
 "Podaci o kontaktu nisu ispravni:\n"
 "\n"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4676
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4714
 #, c-format
 msgid "“%s” has an invalid format"
 msgstr "„%s“ ima neispravan format"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4684
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4722
 #, c-format
 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
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4730
 #, c-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
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4743
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4757
 #, c-format
 msgid "%s“%s” is empty"
 msgstr "%s„%s“ je prazan"
 
-#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4734
+#: ../src/addressbook/gui/contact-editor/e-contact-editor.c:4772
 msgid "Invalid contact."
 msgstr "Neispravan kontakt."
 
@@ -4108,29 +4575,29 @@ msgstr "Neispravan kontakt."
 #: ../src/addressbook/gui/contact-editor/e-contact-quick-add.c:454
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:13
 #: ../src/addressbook/gui/widgets/eab-gui-util.c:317
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:302
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:305
 #: ../src/e-util/e-attachment-dialog.c:311
-#: ../src/e-util/e-categories-dialog.c:81 ../src/e-util/e-category-editor.c:212
+#: ../src/e-util/e-categories-dialog.c:81 ../src/e-util/e-category-editor.c:258
 #: ../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
-#: ../src/e-util/e-html-editor-link-dialog.c:255
-#: ../src/e-util/e-passwords.c:469 ../src/e-util/e-rule-context.c:814
+#: ../src/e-util/e-filter-datespec.c:301
+#: ../src/e-util/e-html-editor-link-dialog.c:243
+#: ../src/e-util/e-passwords.c:469 ../src/e-util/e-rule-context.c:817
 #: ../src/e-util/e-rule-editor.c:188 ../src/e-util/e-rule-editor.c:299
-#: ../src/e-util/e-rule-editor.c:931 ../src/e-util/e-send-options.ui.h:17
+#: ../src/e-util/e-rule-editor.c:934 ../src/e-util/e-send-options.ui.h:17
 #: ../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:335 ../src/mail/e-mail-tag-editor.c:169
+#: ../src/mail/e-mail-config-window.c:335 ../src/mail/e-mail-tag-editor.c:162
 #: ../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-dialogs.ui.h:23 ../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:641 ../src/shell/e-shell-content.c:747
-#: ../src/shell/main.c:177 ../src/smime/gui/certificate-manager.c:1349
+#: ../src/shell/e-shell-content.c:643 ../src/shell/e-shell-content.c:749
+#: ../src/shell/main.c:177 ../src/smime/gui/certificate-manager.c:1333
 #: ../src/smime/gui/e-cert-selector.c:236 ../src/smime/gui/smime-ui.ui.h:18
 msgid "_OK"
 msgstr "U _redu"
@@ -4157,15 +4624,15 @@ msgstr "_Izaberi imenik"
 
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:1
 msgid "Mr."
-msgstr "G-din"
+msgstr "G."
 
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:2
 msgid "Mrs."
-msgstr "G-đa"
+msgstr "Gđica"
 
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:3
 msgid "Ms."
-msgstr "G-din"
+msgstr "Gđa"
 
 #: ../src/addressbook/gui/contact-editor/fullname.ui.h:4
 msgid "Miss"
@@ -4228,7 +4695,7 @@ msgstr "_Sufiks:"
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
 #: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:815
 msgid "Contact List Editor"
-msgstr "Uređivač kontakt liste"
+msgstr "Uređivač spiska kontakta"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:4
 msgid "_List name:"
@@ -4268,12 +4735,12 @@ msgid "_Top"
 msgstr "_Vrh"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
-#: ../src/e-util/e-source-selector.c:3469 ../src/e-util/filter.ui.h:29
+#: ../src/e-util/e-source-selector.c:3475 ../src/e-util/filter.ui.h:29
 msgid "_Up"
 msgstr "_Gore"
 
 #: ../src/addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
-#: ../src/e-util/e-source-selector.c:3470 ../src/e-util/filter.ui.h:30
+#: ../src/e-util/e-source-selector.c:3476 ../src/e-util/filter.ui.h:30
 msgid "_Down"
 msgstr "Do_le"
 
@@ -4284,7 +4751,7 @@ msgstr "D_no"
 
 #: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:940
 msgid "Contact List Members"
-msgstr "Članovi kontakt liste"
+msgstr "Članovi spiska kontakt"
 
 #: ../src/addressbook/gui/contact-list-editor/e-contact-list-editor.c:1499
 msgid "_Members"
@@ -4303,12 +4770,12 @@ 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:1225
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1309
 msgid "Name contains"
 msgstr "Naziv sadrži"
 
 #: ../src/addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1218
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1302
 msgid "Email begins with"
 msgstr "E-pošta počinje sa"
 
@@ -4316,10 +4783,10 @@ 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: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
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1295
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1692
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:807
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1015
 msgid "Any field contains"
 msgstr "Polje koje sadrži"
 
@@ -4335,29 +4802,29 @@ msgstr "Polje koje sadrži"
 #: ../src/addressbook/gui/widgets/ea-addressbook-view.c:101
 #: ../src/addressbook/gui/widgets/ea-minicard-view.c:223
 msgid "evolution address book"
-msgstr "Imenik Evolucije"
+msgstr "adresar evolucije"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:185
 msgid "Copy _Email Address"
 msgstr "Kopiraj elektronsku _adresu"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:187
-#: ../src/e-util/e-web-view.c:370
+#: ../src/e-util/e-web-view.c:428
 msgid "Copy the email address to the clipboard"
 msgstr "Kopira adrese u spisak isečaka"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:192
-#: ../src/e-util/e-web-view.c:382
-msgid "_Send New Message To..."
-msgstr "_Pošalji poruku za..."
+#: ../src/e-util/e-web-view.c:440
+msgid "_Send New Message To…"
+msgstr "_Pošalji poruku za…"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:194
-#: ../src/e-util/e-web-view.c:384
+#: ../src/e-util/e-web-view.c:442
 msgid "Send a mail message to this address"
 msgstr "Šalje poruku na ovu adresu"
 
 #: ../src/addressbook/gui/widgets/eab-contact-display.c:321
-#: ../src/e-util/e-web-view.c:1374
+#: ../src/e-util/e-web-view.c:1446
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite da pošaljete %s"
@@ -4371,125 +4838,121 @@ msgstr "Kliknite da otvorite kartu za %s"
 msgid "Open map"
 msgstr "Otvorite kartu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:450
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:451
 msgid "SIP"
 msgstr "SIP"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:694
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:690
 msgid "List Members:"
 msgstr "Članovi liste:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:766
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:769
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:956
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:997
+msgid "Phone"
+msgstr "Telefon"
+
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:875
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:5
 msgid "Nickname"
 msgstr "Nadimak"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:767
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:876
 msgid "AIM"
 msgstr "AIM"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:768
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:877
 msgid "GroupWise"
 msgstr "GroupVajz"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:769
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:878
 msgid "ICQ"
 msgstr "ICKu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:770
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:879
 msgid "Jabber"
 msgstr "Džaber"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:771
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:880
 msgid "MSN"
 msgstr "MSN"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:772
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:881
 msgid "Yahoo"
 msgstr "Jahu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:773
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:882
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:774
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:883
 msgid "Skype"
 msgstr "Skajp"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:775
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:884
 msgid "Twitter"
 msgstr "Tviter"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:837
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:946
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:34
 msgid "Company"
 msgstr "Preduzeće"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:838
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:947
 msgid "Department"
 msgstr "Odeljenje"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:839
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:948
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:36
 msgid "Office"
 msgstr "Kancelarija"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:840
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:949
 msgid "Profession"
 msgstr "Zanimanje"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:841
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:950
 msgid "Position"
 msgstr "Položaj"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:842
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:951
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:39
 msgid "Manager"
 msgstr "Rukovodilac"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:843
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:952
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:40
 msgid "Assistant"
 msgstr "Pomoćnik"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:844
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:953
 msgid "Video Chat"
 msgstr "Video razgovor"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:846
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:955
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Slobodno/zauzeto"
 
-#: ../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:848
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:957
 msgid "Fax"
 msgstr "Faks"
 
-#: ../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
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:959
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:999
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1025
 msgid "Address"
 msgstr "Adresa"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:886
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:995
 msgid "Home Page"
 msgstr "Matična stranica"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:887
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:996
 msgid "Web Log"
 msgstr "Veb log"
 
-#: ../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:894
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1002
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:44
 msgid "Spouse"
 msgstr "Supružnik"
@@ -4497,56 +4960,50 @@ msgstr "Supružnik"
 # Create the default Person calendar
 # Create the default Person task list
 # orange
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:904
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1012
 msgid "Personal"
 msgstr "Lično"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:949
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1057
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:45
 msgid "Note"
 msgstr "Napomena"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1145
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1253
 msgid "List Members"
 msgstr "Članovi liste"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1166
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1276
 msgid "Job Title"
 msgstr "Zvanje na poslu"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1207
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1317
 msgid "Home page"
 msgstr "Matična stranica"
 
-#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1217
+#: ../src/addressbook/gui/widgets/eab-contact-formatter.c:1327
 msgid "Blog"
 msgstr "Blog"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:259
-#: ../src/calendar/gui/e-cal-component-preview.c:308
-#: ../src/calendar/gui/e-cal-model-tasks.c:314
-#: ../src/calendar/gui/e-cal-model-tasks.c:556
-#: ../src/calendar/gui/e-task-table.c:210
-#: ../src/calendar/gui/e-task-table.c:225
-#: ../src/calendar/gui/e-task-table.c:635 ../src/calendar/gui/print.c:3586
-#: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:1086
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:299
+#: ../src/calendar/gui/tasktypes.xml.in.h:14 ../src/mail/mail-send-recv.c:1146
 msgid "Cancelled"
 msgstr "Otkazano"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:455
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:489
 msgid "Merge Contact"
 msgstr "Pripoji kontakt"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:473
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:722
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:511
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:752
 msgid "_Merge"
 msgstr "_Stopi"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:711
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:741
 msgid "Duplicate Contact Detected"
 msgstr "Otkriven dupli kontakt"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:769
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:799
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to save the changes anyway?"
@@ -4554,7 +5011,7 @@ msgstr ""
 "Naziv ili adresa e-pošte ovog kontakta već postoji u\n"
 "ovoj fascikli. Da li ipak želite da sačuvate izmene?"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:772
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:802
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to add it anyway?"
@@ -4562,19 +5019,19 @@ msgstr ""
 "Naziv ili adresa e-pošte ovog kontakta već postoji\n"
 "u ovoj fascikli. Da li ipak želite da ga dodate?"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:787
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:817
 msgid "Changed Contact:"
 msgstr "Izmenjen kontakt:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:789
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:819
 msgid "New Contact:"
 msgstr "Novi kontakt:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:828
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:858
 msgid "Conflicting Contact:"
 msgstr "Sporan kontakt:"
 
-#: ../src/addressbook/gui/widgets/eab-contact-merging.c:830
+#: ../src/addressbook/gui/widgets/eab-contact-merging.c:860
 msgid "Old Contact:"
 msgstr "Stari kontakt:"
 
@@ -4715,71 +5172,71 @@ msgstr "Pretraga je prekinuta"
 msgid "Error modifying card"
 msgstr "Greška pri izmeni karte"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:680
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:678
 msgid "Cut selected contacts to the clipboard"
 msgstr "Seče označene kontakte u spisak isečaka"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:686
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:684
 msgid "Copy selected contacts to the clipboard"
 msgstr "Kopira označene kontakte u spisak isečaka"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:692
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:690
 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:1021
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:696
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1101
 msgid "Delete selected contacts"
 msgstr "Briše izabrane kontakte"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:704
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:702
 msgid "Select all visible contacts"
 msgstr "Označava sve vidljive kontakte"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1328
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1289
 msgid "Are you sure you want to delete these contact lists?"
-msgstr "Sigurno želite da obrišete ove liste kontakta?"
+msgstr "Sigurno želite da obrišete ove spiskove kontakata?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1332
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1293
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Sigurno želite da obrišete ovaj spisak kontakta?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1336
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1297
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Sigurno želite da obrišete ovaj spisak kontakta (%s)?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1342
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1303
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Sigurno želite da obrišete ove kontakte?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1346
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1307
 msgid "Are you sure you want to delete this contact?"
 msgstr "Sigurno želite da obrišete ovaj kontakt?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1350
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1311
 #, c-format
 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:2005
-#: ../src/e-util/e-accounts-window.c:1714 ../src/e-util/e-focus-tracker.c:783
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1322
+#: ../src/calendar/gui/e-comp-editor.c:2048
+#: ../src/e-util/e-accounts-window.c:1753 ../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: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:1678
-#: ../src/shell/e-shell-window-actions.c:852
-#: ../src/smime/gui/certificate-manager.c:1672 ../src/smime/gui/smime-ui.ui.h:8
+#: ../src/e-util/e-webdav-browser.c:2697
+#: ../src/mail/e-mail-account-manager.c:739
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1173
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1499
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:697
+#: ../src/modules/calendar/e-task-shell-view-actions.c:851
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1628
+#: ../src/shell/e-shell-window-actions.c:877
+#: ../src/smime/gui/certificate-manager.c:1656 ../src/smime/gui/smime-ui.ui.h:8
 msgid "_Delete"
 msgstr "_Obriši"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1508
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1470
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -4800,11 +5257,11 @@ msgstr[3] ""
 "Otvaranje jednog kontakta će takođe otvoriti jedan novi prozor.\n"
 "Da li zaista želite da prikažete sve ove kontakte?"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1516
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1478
 msgid "_Don’t Display"
 msgstr "_Ne prikazuj"
 
-#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1517
+#: ../src/addressbook/gui/widgets/e-addressbook-view.c:1479
 msgid "Display _All Contacts"
 msgstr "Prikaži _sve kontakte"
 
@@ -4872,6 +5329,10 @@ msgstr "Kućni faks"
 msgid "ISDN Phone"
 msgstr "ISDN telefon"
 
+#: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Mobile Phone"
+msgstr "Mobilni telefon"
+
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Other Phone"
 msgstr "Drugi telefon"
@@ -4915,7 +5376,7 @@ msgid "Title"
 msgstr "Titula"
 
 #: ../src/addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../src/calendar/gui/e-meeting-list-view.c:658
+#: ../src/calendar/gui/e-meeting-list-view.c:664
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Uloga"
@@ -4958,7 +5419,7 @@ msgstr "Novi kontakt"
 
 #: ../src/addressbook/gui/widgets/ea-minicard-view.c:34
 msgid "New Contact List"
-msgstr "Nova kontakt lista"
+msgstr "Nova spisak kontakta"
 
 #: ../src/addressbook/gui/widgets/ea-minicard-view.c:206
 #, c-format
@@ -4980,15 +5441,15 @@ msgstr "U_većaj"
 
 #. Zoom-out button
 #: ../src/addressbook/gui/widgets/e-contact-map-window.c:417
-#: ../src/mail/e-mail-reader.c:2500
+#: ../src/mail/e-mail-reader.c:2862
 msgid "Zoom _Out"
 msgstr "U_manji"
 
 #. Search button
 #: ../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:929
+#: ../src/e-util/e-html-editor-actions.c:2015
+#: ../src/e-util/e-html-editor-find-dialog.c:244
+#: ../src/shell/e-shell-window-actions.c:947
 msgid "_Find"
 msgstr "_Nađi"
 
@@ -4996,11 +5457,11 @@ msgstr "_Nađi"
 msgid ""
 "\n"
 "\n"
-"Searching for the Contacts..."
+"Searching for the Contacts…"
 msgstr ""
 "\n"
 "\n"
-"Tražim kontakte..."
+"Tražim kontakte…"
 
 #: ../src/addressbook/gui/widgets/e-minicard-view.c:189
 msgid ""
@@ -5050,41 +5511,40 @@ msgstr ""
 "\n"
 "Nema stavki za prikazivanje."
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:745
+#: ../src/addressbook/importers/evolution-csv-importer.c:796
 #: ../src/addressbook/importers/evolution-ldif-importer.c:547
 #: ../src/addressbook/importers/evolution-vcard-importer.c:247
-#: ../src/calendar/importers/icalendar-importer.c:479
-#: ../src/calendar/importers/icalendar-importer.c:972
-#: ../src/calendar/importers/icalendar-importer.c:1012
-#: ../src/shell/shell.error.xml.h:1
-msgid "Importing..."
-msgstr "Uvozim..."
+#: ../src/calendar/importers/icalendar-importer.c:499
+#: ../src/calendar/importers/icalendar-importer.c:1003
+#: ../src/calendar/importers/icalendar-importer.c:1043
+msgid "Importing…"
+msgstr "Uvozim…"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:927
+#: ../src/addressbook/importers/evolution-csv-importer.c:978
 msgid "Can’t open .csv file"
 msgstr "Ne mogu da otvorim „.csv“ datoteku"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1096
+#: ../src/addressbook/importers/evolution-csv-importer.c:1151
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Autluk kontakti CSV ili Tab (.csv, .tab)"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1097
+#: ../src/addressbook/importers/evolution-csv-importer.c:1152
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Autlukov uvoznik CSV i Tab kontakata"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1105
+#: ../src/addressbook/importers/evolution-csv-importer.c:1160
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozila kontakti CSV ili Tab (.csv, .tab)"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1106
+#: ../src/addressbook/importers/evolution-csv-importer.c:1161
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozilin uvoznik CSV i Tab kontakata"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1114
+#: ../src/addressbook/importers/evolution-csv-importer.c:1169
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolucija kontakti CSV ili Tab (.csv, .tab)"
 
-#: ../src/addressbook/importers/evolution-csv-importer.c:1115
+#: ../src/addressbook/importers/evolution-csv-importer.c:1170
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolucijin uvoznik CSV i Tab kontakata"
 
@@ -5233,226 +5693,6 @@ msgctxt "addressbook-label"
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:105
-msgid "minute"
-msgid_plural "minutes"
-msgstr[0] "minut"
-msgstr[1] "minuta"
-msgstr[2] "minuta"
-msgstr[3] "minut"
-
-#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:118
-msgid "hour"
-msgid_plural "hours"
-msgstr[0] "sat"
-msgstr[1] "sata"
-msgstr[2] "sati"
-msgstr[3] "sat"
-
-#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:131
-msgid "day"
-msgid_plural "days"
-msgstr[0] "dan"
-msgstr[1] "dana"
-msgstr[2] "dana"
-msgstr[3] "dan"
-
-#: ../src/calendar/alarm-notify/alarm-notify-dialog.c:373
-msgid "Start time"
-msgstr "Vreme početka"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:1
-#: ../src/calendar/alarm-notify/alarm-queue.c:2002
-msgid "Appointments"
-msgstr "Zakazivanja"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:2
-msgid "Dismiss _All"
-msgstr "Zanemari _sve"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:3
-msgid "_Snooze"
-msgstr "_Dremanje"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:4
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1367
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2222
-#: ../src/calendar/gui/e-comp-editor.c:2070
-#: ../src/e-util/e-accounts-window.c:1706
-#: ../src/e-util/e-html-editor-actions.c:922
-#: ../src/e-util/e-mail-signature-manager.c:358
-#: ../src/e-util/e-webdav-browser.c:2681 ../src/e-util/filter.ui.h:26
-#: ../src/mail/e-mail-account-manager.c:728 ../src/mail/e-mail-browser.c:172
-#: ../src/mail/e-mail-label-manager.c:380
-#: ../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:34
-#: ../src/plugins/templates/templates.c:468
-#: ../src/shell/e-shell-window-actions.c:980 ../src/smime/gui/smime-ui.ui.h:11
-msgid "_Edit"
-msgstr "_Uređivanje"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:5
-msgid "_Print"
-msgstr "_Štampaj"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:6
-#: ../src/e-util/e-alert-dialog.c:162
-msgid "_Dismiss"
-msgstr "_Zanemari"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../src/calendar/alarm-notify/alarm-queue.c:1969
-#: ../src/calendar/alarm-notify/alarm-queue.c:1979
-#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:249
-#: ../src/modules/itip-formatter/itip-view.c:1681
-#: ../src/modules/itip-formatter/itip-view.c:1792
-msgid "Location:"
-msgstr "Mesto:"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:8
-msgid "location of appointment"
-msgstr "mesto sastanka"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:9
-msgid "Snooze _time:"
-msgstr "Vreme _dremanja:"
-
-#. Translators: This is the last part of the sentence:
-#. * "Purge events older than <<spin-button>> days"
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:10
-#: ../src/e-util/e-interval-chooser.c:144 ../src/e-util/filter.ui.h:8
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:342
-#: ../src/plugins/publish-calendar/publish-calendar.ui.h:7
-msgid "days"
-msgstr "dana"
-
-#: ../src/calendar/alarm-notify/alarm-notify.ui.h:11
-#: ../src/e-util/e-interval-chooser.c:142 ../src/e-util/filter.ui.h:7
-msgid "hours"
-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:579
-msgid "minutes"
-msgstr "minuta"
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:1770
-#: ../src/calendar/alarm-notify/alarm-queue.c:1950
-msgid "No summary available."
-msgstr "Nema dostupnog sažetka."
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:1779
-#: ../src/calendar/alarm-notify/alarm-queue.c:1781
-msgid "No description available."
-msgstr "Nema dostupnog opisa."
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:1789
-msgid "No location information available."
-msgstr "Nema dostupnog podatka o lokaciji."
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:1794
-#: ../src/calendar/alarm-notify/alarm-queue.c:1941
-#: ../src/calendar/alarm-notify/alarm-queue.c:2292
-msgid "Evolution Reminders"
-msgstr "Podsetnici Evolucije"
-
-# bug(slobo): plural-forms. Report this one to bugzilla.gnome.org
-#: ../src/calendar/alarm-notify/alarm-queue.c:1837
-#, c-format
-msgid "You have %d reminder"
-msgid_plural "You have %d reminders"
-msgstr[0] "Imate %d potsetnik"
-msgstr[1] "Imate %d potsetnika"
-msgstr[2] "Imate %d potsetnika"
-msgstr[3] "Imate jedan potsetnik"
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:2110
-msgid "Warning"
-msgstr "Upozorenje"
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:2111
-#: ../src/mail/mail-dialogs.ui.h:20
-msgid "_No"
-msgstr "_Ne"
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:2112
-msgid "_Yes"
-msgstr "_Da"
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:2116
-#, c-format
-msgid ""
-"An Evolution Calendar reminder is about to trigger. This reminder is "
-"configured to run the following program:\n"
-"\n"
-"        %s\n"
-"\n"
-"Are you sure you want to run this program?"
-msgstr ""
-"Podsetnik kalendara Evolucije će biti pokrenut. Ovaj podsetnik je podešen da "
-"pokrene sledeći program:\n"
-"\n"
-"        %s\n"
-"\n"
-"Da li ste sigurni da želite da pokrenete ovaj program?"
-
-#: ../src/calendar/alarm-notify/alarm-queue.c:2131
-msgid "Do not ask me about this program again."
-msgstr "Ne pitaj me ponovo za ovaj program."
-
-#: ../src/calendar/alarm-notify/util.c:65
-msgid "invalid time"
-msgstr "neispravno vreme"
-
-#. Translator: Entire string is like "Pop up an alert %d days before start"
-#: ../src/calendar/alarm-notify/util.c:91
-#: ../src/calendar/gui/e-alarm-list.c:368 ../src/calendar/gui/misc.c:95
-#, c-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d dan"
-msgstr[1] "%d dana"
-msgstr[2] "%d dana"
-msgstr[3] "%d dan"
-
-#. Translator: Entire string is like "Pop up an alert %d hours before start"
-#: ../src/calendar/alarm-notify/util.c:97
-#: ../src/calendar/gui/e-alarm-list.c:380 ../src/calendar/gui/misc.c:101
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d sat"
-msgstr[1] "%d sata"
-msgstr[2] "%d sati"
-msgstr[3] "Jedan sat"
-
-#. Translator: Entire string is like "Pop up an alert %d minutes before start"
-#: ../src/calendar/alarm-notify/util.c:103
-#: ../src/calendar/gui/e-alarm-list.c:386 ../src/calendar/gui/misc.c:107
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minut"
-msgstr[1] "%d minuta"
-msgstr[2] "%d minuta"
-msgstr[3] "Jedan minut"
-
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#. Translator: Entire string is like "Pop up an alert %d seconds before start"
-#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../src/calendar/alarm-notify/util.c:107
-#: ../src/calendar/gui/e-alarm-list.c:392 ../src/calendar/gui/misc.c:111
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d sekunda"
-msgstr[1] "%d sekunde"
-msgstr[2] "%d sekundi"
-msgstr[3] "Jedna sekunda"
-
 # calendar:prompt-cancel-task primary
 #: ../src/calendar/calendar.error.xml.h:1
 msgid "Would you like to send all the participants a cancelation notice?"
@@ -5475,7 +5715,7 @@ msgid "_Send Notice"
 msgstr "Pošalji po_dsetnik"
 
 #: ../src/calendar/calendar.error.xml.h:5
-#: ../src/calendar/gui/e-cal-dialogs.c:507
+#: ../src/calendar/gui/e-cal-dialogs.c:504
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Sigurno želite da obrišete ovaj sastanak?"
@@ -5495,7 +5735,7 @@ msgstr ""
 "znati da je zadatak obrisan."
 
 #: ../src/calendar/calendar.error.xml.h:9
-#: ../src/calendar/gui/e-cal-dialogs.c:510
+#: ../src/calendar/gui/e-cal-dialogs.c:507
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Sigurno želite da obrišete ovaj zadatak?"
@@ -5520,7 +5760,7 @@ msgstr ""
 "znati da je beleška obrisana."
 
 #: ../src/calendar/calendar.error.xml.h:13
-#: ../src/calendar/gui/e-cal-dialogs.c:513
+#: ../src/calendar/gui/e-cal-dialogs.c:510
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Sigurno želite da obrišete ovu belešku?"
@@ -5536,18 +5776,18 @@ 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}”?"
-msgstr "Sigurno želite da obrišete zakazivanje nazvano „{0}“?"
+msgstr "Sigurno želite da obrišete sastanak pod nazivom „{0}“?"
 
 # calendar:prompt-delete-appointment secondary
 #: ../src/calendar/calendar.error.xml.h:17
 msgid ""
 "All information on this appointment will be deleted and can not be restored."
 msgstr ""
-"Svi podaci o ovom zakazivanju biće obrisani i neće biti moguć njihov povraćaj."
+"Svi podaci o ovom sastanku biće obrisani i neće biti moguće njihovo vraćanje."
 
 #: ../src/calendar/calendar.error.xml.h:18
 msgid "Are you sure you want to delete this appointment?"
-msgstr "Sigurno želite da obrišete ovo zakazivanje?"
+msgstr "Sigurno želite da obrišete ovaj sastanak?"
 
 #: ../src/calendar/calendar.error.xml.h:19
 msgid "Are you sure you want to delete the “{0}” task?"
@@ -5565,15 +5805,15 @@ msgstr ""
 # bug: plural-forms
 #: ../src/calendar/calendar.error.xml.h:22
 msgid "Are you sure you want to delete these {0} appointments?"
-msgstr "Sigurno želite da obrišete ova {0} zakazivanja?"
+msgstr "Sigurno želite da obrišete ova {0} sastanka?"
 
 #: ../src/calendar/calendar.error.xml.h:23
 msgid ""
 "All information on these appointments will be deleted and can not be "
 "restored."
 msgstr ""
-"Svi podaci o ovim zakazivanjima biće obrisani i neće biti moguć njihov "
-"povraćaj."
+"Svi podaci o ovim sastancima će biti obrisani i neće biti moguć njihovo "
+"vraćanje."
 
 # bug: plural-forms
 #: ../src/calendar/calendar.error.xml.h:24
@@ -5613,11 +5853,11 @@ msgstr "_Odbaci izmene"
 
 #: ../src/calendar/calendar.error.xml.h:32
 msgid "Would you like to save your changes to this appointment?"
-msgstr "Želite li da sačuvate izmene u zakazivanju?"
+msgstr "Želite li da sačuvate izmene u ovom sastanku?"
 
 #: ../src/calendar/calendar.error.xml.h:33
 msgid "You have changed this appointment, but not yet saved it."
-msgstr "Izmenili ste ovo zakazivanje, ali još niste sačuvali."
+msgstr "Izmenili ste ovaj sastanak, ali ga još niste sačuvali."
 
 #: ../src/calendar/calendar.error.xml.h:34
 msgid "Would you like to save your changes to this task?"
@@ -5691,15 +5931,15 @@ msgstr ""
 
 #: ../src/calendar/calendar.error.xml.h:48
 msgid "Download in progress. Do you want to save the appointment?"
-msgstr "Preuzimanje je u toku. Želite li da sačuvate zakazivanje?"
+msgstr "Preuzimanje je u toku. Želite li da sačuvate sastanak?"
 
 #: ../src/calendar/calendar.error.xml.h:49
 msgid ""
 "Some attachments are being downloaded. Saving the appointment would result "
 "in the loss of these attachments."
 msgstr ""
-"Preuzimanje nekoliko priloga je u toku. Ukoliko sada sačuvate zakazivanje ovi "
-"prilozi neće biti sačuvani sa njim."
+"Preuzimanje nekoliko priloga je u toku. Ukoliko sada sačuvate sastanak "
+"prilozi neće biti sačuvani zajedno sa njim."
 
 #: ../src/calendar/calendar.error.xml.h:50
 msgid "Would you like to send updated task information to participants?"
@@ -5803,14 +6043,14 @@ msgstr ""
 
 #: ../src/calendar/calendar.error.xml.h:70
 msgid "Are you sure you want to save the appointment without a summary?"
-msgstr "Sigurno želite da sačuvate zakazivanje bez sažetka?"
+msgstr "Sigurno želite da sačuvate sastanak bez sažetka?"
 
 #: ../src/calendar/calendar.error.xml.h:71
 msgid ""
 "Adding a meaningful summary to your appointment will give you an idea of "
 "what your appointment is about."
 msgstr ""
-"Ako dodate smisaoni sažetak vašem zakazivanju biće vam jasnije u vezi čega je "
+"Ako dodate smisaoni sažetak vašem sastanku biće vam jasnije u vezi čega je "
 "vaš sastanak."
 
 #: ../src/calendar/calendar.error.xml.h:72
@@ -5849,7 +6089,7 @@ msgid ""
 "different calendar that can accept appointments."
 msgstr ""
 "Kalendar „{0}“ je samo za čitanje i ne može biti izmenjen. Izaberite drugi "
-"kalendar koji prihvata zakazivanje."
+"kalendar koji prihvata sastanke."
 
 #: ../src/calendar/calendar.error.xml.h:81
 msgid "Cannot save task"
@@ -5860,8 +6100,7 @@ msgstr "Ne mogu da sačuvam zadatak"
 msgid ""
 "“{0}” does not support assigned tasks, please select a different task list."
 msgstr ""
-"„{0}“ ne podržava dodeljene zadatke, molim izaberite drugačiji spisak "
-"zadataka."
+"„{0}“ ne podržava dodeljene zadatke, izaberite drugačiji spisak zadataka."
 
 #. Translators: {0} is the name of the task list.
 #: ../src/calendar/calendar.error.xml.h:85
@@ -6098,11 +6337,11 @@ msgstr "Nešto je pošlo naopako prilikom prikazivanja događaja"
 msgid ""
 "A WebKitWebProcess crashed when displaying the event. You can try again by "
 "moving to another event and back. If the issue persists, please file a bug "
-"report in the GNOME bugzilla."
+"report in GNOME Gitlab."
 msgstr ""
-"Veb proces VebKita se urušio prilikom prikazivanja događaja. Možete pokišati "
-"ponovo tako što ćete otići na neki drugi događaj i vratiti se nazad. Ako ni "
-"to ne pomaže, popunite izveštaj o grešci na Gnomovoj bubaždaji."
+"Veb proces VebKita se urušio prilikom prikazivanja događaja. Možete ga "
+"pokrenuti ponovo tako što ćete otići na neki drugi događaj i vratiti se "
+"nazad. Ako ni to ne pomaže, popunite izveštaj o grešci na Gnomovom Gitlabu."
 
 #: ../src/calendar/calendar.error.xml.h:175
 msgid "Something has gone wrong when displaying the memo"
@@ -6112,11 +6351,11 @@ msgstr "Nešto je pošlo naopako prilikom prikazivanja beleške"
 msgid ""
 "A WebKitWebProcess crashed when displaying the memo. You can try again by "
 "moving to another memo and back. If the issue persists, please file a bug "
-"report in the GNOME bugzilla."
+"report in GNOME Gitlab."
 msgstr ""
-"Veb proces VebKita se urušio prilikom prikazivanja beleške. Možete pokišati "
-"ponovo tako što ćete otići na neku drugu belešku i vratiti se nazad. Ako ni "
-"to ne pomaže, popunite izveštaj o grešci na Gnomovoj bubaždaji."
+"Veb proces VebKita se urušio prilikom prikazivanja beleške. Možete ga "
+"pokrenuti ponovo tako što ćete otići na neku drugu belešku i vratiti se "
+"nazad. Ako ni to ne pomaže, popunite izveštaj o grešci na Gnomovom gitlabu."
 
 #: ../src/calendar/calendar.error.xml.h:177
 msgid "Something has gone wrong when displaying the task"
@@ -6126,11 +6365,11 @@ msgstr "Nešto je pošlo naopako prilikom prikazivanja zadatka"
 msgid ""
 "A WebKitWebProcess crashed when displaying the task. You can try again by "
 "moving to another task and back. If the issue persists, please file a bug "
-"report in the GNOME bugzilla."
+"report in GNOME Gitlab."
 msgstr ""
-"Veb proces VebKita se urušio prilikom prikazivanja zadatka. Možete pokišati "
-"ponovo tako što ćete otići na neki drugi zadatak i vratiti se nazad. Ako ni "
-"to ne pomaže, popunite izveštaj o grešci na Gnomovoj bubaždaji."
+"Veb proces VebKita se urušio prilikom prikazivanja zadatka. Možete ga "
+"pokrenuti ponovo tako što ćete otići na neki drugi zadatak i vratiti se "
+"nazad. Ako ni to ne pomaže, popunite izveštaj o grešci na Gnomovom Gitlabu."
 
 #: ../src/calendar/gui/caltypes.xml.in.h:1
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:3
@@ -6138,7 +6377,7 @@ msgstr ""
 #: ../src/calendar/gui/e-task-table.etspec.h:4
 #: ../src/calendar/gui/memotypes.xml.in.h:1
 #: ../src/calendar/gui/tasktypes.xml.in.h:1
-#: ../src/plugins/save-calendar/csv-format.c:373
+#: ../src/plugins/save-calendar/csv-format.c:362
 msgid "Summary"
 msgstr "Sažetak"
 
@@ -6161,7 +6400,7 @@ msgstr "ne sadrži"
 #: ../src/calendar/gui/memotypes.xml.in.h:4
 #: ../src/calendar/gui/tasktypes.xml.in.h:4
 #: ../src/e-util/e-attachment-tree-view.c:147
-#: ../src/e-util/e-collection-account-wizard.c:1655
+#: ../src/e-util/e-collection-account-wizard.c:1930
 #: ../src/e-util/e-table-config.ui.h:20
 #: ../src/modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Description"
@@ -6193,23 +6432,23 @@ msgid "is not"
 msgstr "nije"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:9
-#: ../src/calendar/gui/e-cal-list-view.c:238
-#: ../src/calendar/gui/e-cal-model.c:303 ../src/calendar/gui/e-cal-model.c:310
-#: ../src/calendar/gui/e-task-table.c:523
+#: ../src/calendar/gui/e-cal-list-view.c:263
+#: ../src/calendar/gui/e-cal-model.c:296 ../src/calendar/gui/e-cal-model.c:304
+#: ../src/calendar/gui/e-task-table.c:445
 #: ../src/calendar/gui/memotypes.xml.in.h:10
 msgid "Public"
 msgstr "Javno"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:10
-#: ../src/calendar/gui/e-cal-list-view.c:239
-#: ../src/calendar/gui/e-cal-model.c:312 ../src/calendar/gui/e-task-table.c:524
+#: ../src/calendar/gui/e-cal-list-view.c:264
+#: ../src/calendar/gui/e-cal-model.c:306 ../src/calendar/gui/e-task-table.c:446
 #: ../src/calendar/gui/memotypes.xml.in.h:11
 msgid "Private"
 msgstr "Lično"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:11
-#: ../src/calendar/gui/e-cal-list-view.c:240
-#: ../src/calendar/gui/e-cal-model.c:314 ../src/calendar/gui/e-task-table.c:525
+#: ../src/calendar/gui/e-cal-list-view.c:265
+#: ../src/calendar/gui/e-cal-model.c:308 ../src/calendar/gui/e-task-table.c:447
 #: ../src/calendar/gui/memotypes.xml.in.h:12
 #: ../src/e-util/e-html-editor-page-dialog.c:113
 #: ../src/e-util/e-send-options.ui.h:7
@@ -6230,10 +6469,11 @@ msgstr "Učesnik"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:14
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:5
+#: ../src/calendar/gui/e-task-table.etspec.h:13
 #: ../src/mail/message-list.etspec.h:14
 #: ../src/plugins/publish-calendar/publish-calendar.c:861
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:23
-#: ../src/plugins/save-calendar/csv-format.c:387
+#: ../src/plugins/save-calendar/csv-format.c:376
 msgid "Location"
 msgstr "Mesto"
 
@@ -6248,7 +6488,7 @@ msgstr "Kategorija"
 #: ../src/calendar/gui/memotypes.xml.in.h:14
 #: ../src/calendar/gui/tasktypes.xml.in.h:15
 #: ../src/em-format/e-mail-formatter-print.c:51
-#: ../src/em-format/e-mail-formatter-print-headers.c:155
+#: ../src/em-format/e-mail-formatter-print-headers.c:161
 #: ../src/mail/filtertypes.xml.in.h:47 ../src/mail/searchtypes.xml.in.h:49
 #: ../src/mail/vfoldertypes.xml.in.h:50
 msgid "Attachments"
@@ -6271,7 +6511,7 @@ msgid "Do Not Exist"
 msgstr "Ne postoji"
 
 #: ../src/calendar/gui/caltypes.xml.in.h:19
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2002
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2065
 msgid "Recurrence"
 msgstr "Ponavljanje"
 
@@ -6303,8 +6543,8 @@ msgstr "Sažetak sadrži"
 msgid "Description Contains"
 msgstr "Opisi"
 
-#: ../src/calendar/gui/comp-util.c:1490
-#: ../src/modules/itip-formatter/itip-view.c:2365
+#: ../src/calendar/gui/comp-util.c:1544
+#: ../src/modules/itip-formatter/itip-view.c:2391
 #, c-format
 msgid "with one guest"
 msgid_plural "with %d guests"
@@ -6313,14 +6553,70 @@ msgstr[1] "sa %d gosta"
 msgstr[2] "sa %d gostiju"
 msgstr[3] "sa jednim gostom"
 
-#: ../src/calendar/gui/comp-util.c:1546
+#: ../src/calendar/gui/comp-util.c:1603
 #, c-format
 msgid "Comments: %s"
 msgstr "Napomene: %s"
 
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# When "None" is selected we want the field to be cleared.
+# Note that we don't show this here, since by default a 'None' date
+# is not permitted.
+#: ../src/calendar/gui/comp-util.c:1617 ../src/calendar/gui/comp-util.c:1620
+msgctxt "iCalendarStatus"
+msgid "None"
+msgstr "Ništa"
+
+#: ../src/calendar/gui/comp-util.c:1618
+msgctxt "iCalendarStatus"
+msgid "Tentative"
+msgstr "Upitno"
+
+#: ../src/calendar/gui/comp-util.c:1619
+msgctxt "iCalendarStatus"
+msgid "Confirmed"
+msgstr "Potvrđeno"
+
+#: ../src/calendar/gui/comp-util.c:1621
+msgctxt "iCalendarStatus"
+msgid "Draft"
+msgstr "Nacrt"
+
+#: ../src/calendar/gui/comp-util.c:1622
+msgctxt "iCalendarStatus"
+msgid "Final"
+msgstr "Konačno"
+
+#: ../src/calendar/gui/comp-util.c:1623
+msgctxt "iCalendarStatus"
+msgid "Not Started"
+msgstr "Nije započeto"
+
+#: ../src/calendar/gui/comp-util.c:1624
+msgctxt "iCalendarStatus"
+msgid "Needs Action"
+msgstr "Potrebne radnje"
+
+#: ../src/calendar/gui/comp-util.c:1625
+msgctxt "iCalendarStatus"
+msgid "In Progress"
+msgstr "U toku"
+
+# timezone.
+#: ../src/calendar/gui/comp-util.c:1626
+msgctxt "iCalendarStatus"
+msgid "Completed"
+msgstr "Završeno"
+
+#: ../src/calendar/gui/comp-util.c:1627
+msgctxt "iCalendarStatus"
+msgid "Cancelled"
+msgstr "Otkazano"
+
 #: ../src/calendar/gui/ea-cal-view.c:281
 msgid "New Appointment"
-msgstr "Novo zakazivanje"
+msgstr "Novi sastanak"
 
 #: ../src/calendar/gui/ea-cal-view.c:282
 msgid "New All Day Event"
@@ -6350,20 +6646,20 @@ msgstr "Ima ponavljanja."
 msgid "It is a meeting."
 msgstr "To je sastanak."
 
-#: ../src/calendar/gui/ea-cal-view-event.c:245
+#: ../src/calendar/gui/ea-cal-view-event.c:242
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalendarski događaj: sažetak je %s."
 
-#: ../src/calendar/gui/ea-cal-view-event.c:248
+#: ../src/calendar/gui/ea-cal-view-event.c:246
 msgid "Calendar Event: It has no summary."
 msgstr "Kalendarski događaj: nema sažetka."
 
-#: ../src/calendar/gui/ea-cal-view-event.c:271
+#: ../src/calendar/gui/ea-cal-view-event.c:269
 msgid "calendar view event"
 msgstr "događaj pregleda kalendara"
 
-#: ../src/calendar/gui/ea-cal-view-event.c:503
+#: ../src/calendar/gui/ea-cal-view-event.c:501
 msgid "Grab Focus"
 msgstr "Fokusiraj"
 
@@ -6421,52 +6717,42 @@ msgstr "Dugme za preskakanje"
 msgid "Click here, you can find more events."
 msgstr "Kliknite ovde, možete naći još događaja."
 
-#. Translator: Entire string is like "Pop up an alert %d weeks before start"
-#: ../src/calendar/gui/e-alarm-list.c:374
-#, c-format
-msgid "%d week"
-msgid_plural "%d weeks"
-msgstr[0] "%d nedelja"
-msgstr[1] "%d nedelje"
-msgstr[2] "%d nedelja"
-msgstr[3] "%d nedelja"
-
 #. Translators: Part of: [ Play a sound ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-alarm-list.c:419
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1811
+#: ../src/calendar/gui/e-alarm-list.c:387
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2188
 msgctxt "cal-reminders"
 msgid "Play a sound"
 msgstr "Pusti zvuk"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-alarm-list.c:423
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1809
+#: ../src/calendar/gui/e-alarm-list.c:391
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2186
 msgctxt "cal-reminders"
 msgid "Pop up an alert"
 msgstr "Izbaci upozorenje"
 
 #. Translators: Part of: [ Send an email ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-alarm-list.c:427
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1815
+#: ../src/calendar/gui/e-alarm-list.c:395
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2192
 msgctxt "cal-reminders"
 msgid "Send an email"
 msgstr "Pošalji e-poštu"
 
 #. Translators: Part of: [ Run a program ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-alarm-list.c:431
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1813
+#: ../src/calendar/gui/e-alarm-list.c:399
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2190
 msgctxt "cal-reminders"
 msgid "Run a program"
 msgstr "Pokreni program"
 
-#: ../src/calendar/gui/e-alarm-list.c:437
+#: ../src/calendar/gui/e-alarm-list.c:405
 msgctxt "cal-reminders"
 msgid "Unknown action to be performed"
 msgstr "Izvršiće se nepoznata radnja"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../src/calendar/gui/e-alarm-list.c:452
+#: ../src/calendar/gui/e-alarm-list.c:421
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s %s before the start"
@@ -6474,7 +6760,7 @@ msgstr "%s %s pre početka"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../src/calendar/gui/e-alarm-list.c:458
+#: ../src/calendar/gui/e-alarm-list.c:427
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s %s after the start"
@@ -6482,7 +6768,7 @@ msgstr "%s %s nakon početka"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../src/calendar/gui/e-alarm-list.c:465
+#: ../src/calendar/gui/e-alarm-list.c:434
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s at the start"
@@ -6490,7 +6776,7 @@ msgstr "%s na početku"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../src/calendar/gui/e-alarm-list.c:477
+#: ../src/calendar/gui/e-alarm-list.c:447
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s %s before the end"
@@ -6498,7 +6784,7 @@ msgstr "%s %s pre kraja"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s refers to the duration string e.g:"15 minutes"
-#: ../src/calendar/gui/e-alarm-list.c:483
+#: ../src/calendar/gui/e-alarm-list.c:453
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s %s after the end"
@@ -6506,7 +6792,7 @@ msgstr "%s %s nakon završetka"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../src/calendar/gui/e-alarm-list.c:490
+#: ../src/calendar/gui/e-alarm-list.c:460
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s at the end"
@@ -6514,7 +6800,7 @@ msgstr "%s na kraju"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../src/calendar/gui/e-alarm-list.c:514
+#: ../src/calendar/gui/e-alarm-list.c:484
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s at %s"
@@ -6522,7 +6808,7 @@ msgstr "%s u %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../src/calendar/gui/e-alarm-list.c:522
+#: ../src/calendar/gui/e-alarm-list.c:492
 #, c-format
 msgctxt "cal-reminders"
 msgid "%s for an unknown trigger type"
@@ -6546,292 +6832,273 @@ msgstr "pregled kalendara za mesec"
 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:985 ../src/mail/e-mail-config-page.c:124
+#: ../src/calendar/gui/e-cal-component-preview.c:237
+#: ../src/e-util/e-filter-rule.c:986 ../src/mail/e-mail-config-page.c:124
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:222
+#: ../src/calendar/gui/e-cal-component-preview.c:251
 msgid "Categories:"
 msgstr "Kategorije:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:256
-msgid "Summary:"
-msgstr "Sažetak:"
+#: ../src/calendar/gui/e-cal-component-preview.c:288
+#: ../src/modules/cal-config-weather/evolution-cal-config-weather.c:249
+#: ../src/modules/itip-formatter/itip-view.c:1677
+#: ../src/modules/itip-formatter/itip-view.c:1788
+msgid "Location:"
+msgstr "Mesto:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:264
+#: ../src/calendar/gui/e-cal-component-preview.c:295
 msgid "Start Date:"
 msgstr "Datum početka:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:275
+#: ../src/calendar/gui/e-cal-component-preview.c:304
 msgid "End Date:"
 msgstr "Datum završetka:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:286
+#: ../src/calendar/gui/e-cal-component-preview.c:313
 msgid "Due Date:"
 msgstr "Krajnji rok:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:298
-#: ../src/modules/itip-formatter/itip-view.c:1684
-#: ../src/modules/itip-formatter/itip-view.c:1801
+#: ../src/calendar/gui/e-cal-component-preview.c:326
+msgid "Recurs:"
+msgstr "Ponavlja se:"
+
+#: ../src/calendar/gui/e-cal-component-preview.c:338
+#: ../src/modules/itip-formatter/itip-view.c:1680
+#: ../src/modules/itip-formatter/itip-view.c:1797
 msgid "Status:"
 msgstr "Stanje:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:302
-#: ../src/calendar/gui/e-cal-model-tasks.c:310
-#: ../src/calendar/gui/e-cal-model-tasks.c:552
-#: ../src/calendar/gui/e-cal-model-tasks.c:633
-#: ../src/calendar/gui/e-task-table.c:206
-#: ../src/calendar/gui/e-task-table.c:221
-#: ../src/calendar/gui/e-task-table.c:633 ../src/calendar/gui/print.c:3580
-msgid "In Progress"
-msgstr "U toku"
-
-# timezone.
-#: ../src/calendar/gui/e-cal-component-preview.c:305
-#: ../src/calendar/gui/e-cal-model-tasks.c:312
-#: ../src/calendar/gui/e-cal-model-tasks.c:554
-#: ../src/calendar/gui/e-meeting-store.c:202
-#: ../src/calendar/gui/e-meeting-store.c:225
-#: ../src/calendar/gui/e-task-table.c:208
-#: ../src/calendar/gui/e-task-table.c:223
-#: ../src/calendar/gui/e-task-table.c:634 ../src/calendar/gui/print.c:3583
-#: ../src/calendar/gui/tasktypes.xml.in.h:13
-#: ../src/plugins/save-calendar/csv-format.c:377
-msgid "Completed"
-msgstr "Završeno"
-
-#: ../src/calendar/gui/e-cal-component-preview.c:312
-#: ../src/calendar/gui/e-cal-model-tasks.c:308
-#: ../src/calendar/gui/e-cal-model-tasks.c:550
-#: ../src/calendar/gui/e-task-table.c:204
-#: ../src/calendar/gui/e-task-table.c:219
-#: ../src/calendar/gui/e-task-table.c:632 ../src/calendar/gui/print.c:3577
-#: ../src/calendar/gui/tasktypes.xml.in.h:11
-msgid "Not Started"
-msgstr "Nije započet"
-
-#: ../src/calendar/gui/e-cal-component-preview.c:325
-msgid "Priority:"
-msgstr "Važnost:"
-
-#: ../src/calendar/gui/e-cal-component-preview.c:327
-#: ../src/calendar/gui/e-task-table.c:549
+#: ../src/calendar/gui/e-cal-component-preview.c:347
+#: ../src/calendar/gui/e-task-table.c:471
 #: ../src/calendar/gui/tasktypes.xml.in.h:19
-#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:327
+#: ../src/e-util/e-send-options.ui.h:2 ../src/mail/message-list.c:331
 msgid "High"
 msgstr "Visok"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:329
-#: ../src/calendar/gui/e-cal-model.c:1890
-#: ../src/calendar/gui/e-task-table.c:550
+#: ../src/calendar/gui/e-cal-component-preview.c:349
+#: ../src/calendar/gui/e-cal-model.c:1872
+#: ../src/calendar/gui/e-task-table.c:472
 #: ../src/calendar/gui/tasktypes.xml.in.h:20
-#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:326
+#: ../src/e-util/e-send-options.ui.h:5 ../src/mail/message-list.c:330
 msgid "Normal"
 msgstr "Običan"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:331
-#: ../src/calendar/gui/e-task-table.c:551
+#: ../src/calendar/gui/e-cal-component-preview.c:351
+#: ../src/calendar/gui/e-task-table.c:473
 #: ../src/calendar/gui/tasktypes.xml.in.h:21
-#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:325
+#: ../src/e-util/e-send-options.ui.h:4 ../src/mail/message-list.c:329
 msgid "Low"
 msgstr "Nizak"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:350
-#: ../src/mail/e-mail-config-service-page.c:531
+#: ../src/calendar/gui/e-cal-component-preview.c:353
+msgid "Priority:"
+msgstr "Važnost:"
+
+#: ../src/calendar/gui/e-cal-component-preview.c:365
+msgid "Organizer:"
+msgstr "Organizator:"
+
+#: ../src/calendar/gui/e-cal-component-preview.c:406
+msgid "Attendees:"
+msgstr "Prisutni:"
+
+#: ../src/calendar/gui/e-cal-component-preview.c:453
+#: ../src/mail/e-mail-config-service-page.c:533
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../src/calendar/gui/e-cal-component-preview.c:381
+#: ../src/calendar/gui/e-cal-component-preview.c:507
 msgid "Web Page:"
 msgstr "Veb stranica:"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1631
+#: ../src/calendar/gui/e-cal-data-model.c:1753
 #, c-format
 msgid "Creating view for calendar “%s”"
 msgstr "Prikazujem kalendar „%s“"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1635
+#: ../src/calendar/gui/e-cal-data-model.c:1757
 #, c-format
 msgid "Creating view for task list “%s”"
 msgstr "Prikazujem spisak zadataka „%s“"
 
-#: ../src/calendar/gui/e-cal-data-model.c:1639
+#: ../src/calendar/gui/e-cal-data-model.c:1761
 #, c-format
 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:1966
+#: ../src/calendar/gui/e-cal-dialogs.c:217 ../src/calendar/gui/e-cal-ops.c:1964
 msgid "Destination is read only"
 msgstr "Odredište je samo za čitanje"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:299
+#: ../src/calendar/gui/e-cal-dialogs.c:297
 #, c-format
 msgid "Copying events to the calendar “%s”"
 msgstr "Kopiram događaje u kalendar „%s“"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:305
+#: ../src/calendar/gui/e-cal-dialogs.c:303
 #, c-format
 msgid "Copying memos to the memo list “%s”"
 msgstr "Kopiram beleške u spisak beleški „%s“"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:311
+#: ../src/calendar/gui/e-cal-dialogs.c:309
 #, c-format
 msgid "Copying tasks to the task list “%s”"
 msgstr "Kopiram zadatke u spisak zadataka „%s“"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:530
+#: ../src/calendar/gui/e-cal-dialogs.c:527
 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?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:533
+#: ../src/calendar/gui/e-cal-dialogs.c:530
 msgid "_Retract comment"
 msgstr "_Uvuci komentar"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:692
+#: ../src/calendar/gui/e-cal-dialogs.c:687
 msgid "Select Date"
 msgstr "Izaberite datum"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:693
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1288
+#: ../src/calendar/gui/e-cal-dialogs.c:688
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1256
 msgid "Select _Today"
 msgstr "Izaberi _današnji dan"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:712
+#: ../src/calendar/gui/e-cal-dialogs.c:707
 msgid "January"
 msgstr "Januar"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:713
+#: ../src/calendar/gui/e-cal-dialogs.c:708
 msgid "February"
 msgstr "Februar"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:714
+#: ../src/calendar/gui/e-cal-dialogs.c:709
 msgid "March"
 msgstr "Mart"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:715
+#: ../src/calendar/gui/e-cal-dialogs.c:710
 msgid "April"
 msgstr "April"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:716
+#: ../src/calendar/gui/e-cal-dialogs.c:711
 msgid "May"
 msgstr "Maj"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:717
+#: ../src/calendar/gui/e-cal-dialogs.c:712
 msgid "June"
 msgstr "Jun"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:718
+#: ../src/calendar/gui/e-cal-dialogs.c:713
 msgid "July"
 msgstr "Jul"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:719
+#: ../src/calendar/gui/e-cal-dialogs.c:714
 msgid "August"
 msgstr "Avgust"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:720
+#: ../src/calendar/gui/e-cal-dialogs.c:715
 msgid "September"
 msgstr "Septembar"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:721
+#: ../src/calendar/gui/e-cal-dialogs.c:716
 msgid "October"
 msgstr "Oktobar"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:722
+#: ../src/calendar/gui/e-cal-dialogs.c:717
 msgid "November"
 msgstr "Novembar"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:723
+#: ../src/calendar/gui/e-cal-dialogs.c:718
 msgid "December"
 msgstr "Decembar"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:873
+#: ../src/calendar/gui/e-cal-dialogs.c:870
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Menjate povratni događaj. Šta želite da izmenite?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:875
+#: ../src/calendar/gui/e-cal-dialogs.c:872
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Delegirate povratni događaj. Šta želite da delegirate?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:879
+#: ../src/calendar/gui/e-cal-dialogs.c:876
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Menjate povratni zadatak. Šta želite da izmenite?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:883
+#: ../src/calendar/gui/e-cal-dialogs.c:880
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Menjate povratnu belešku. Šta želite da izmenite?"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:909
+#: ../src/calendar/gui/e-cal-dialogs.c:906
 msgid "This Instance Only"
 msgstr "Samo ovaj unos"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:913
+#: ../src/calendar/gui/e-cal-dialogs.c:910
 msgid "This and Prior Instances"
 msgstr "Ovaj i prethodne unose"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:919
+#: ../src/calendar/gui/e-cal-dialogs.c:916
 msgid "This and Future Instances"
 msgstr "Ovaj i buduće unose"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:924
+#: ../src/calendar/gui/e-cal-dialogs.c:921
 msgid "All Instances"
 msgstr "Sve unose"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:1174
-#: ../src/calendar/gui/e-cal-dialogs.c:1256
+#: ../src/calendar/gui/e-cal-dialogs.c:1171
+#: ../src/calendar/gui/e-cal-dialogs.c:1253
 msgid "Send my reminders with this event"
 msgstr "Pošalji moje podsetnike sa ovim događajem"
 
-#: ../src/calendar/gui/e-cal-dialogs.c:1176
-#: ../src/calendar/gui/e-cal-dialogs.c:1258
+#: ../src/calendar/gui/e-cal-dialogs.c:1173
+#: ../src/calendar/gui/e-cal-dialogs.c:1255
 msgid "Notify new attendees _only"
 msgstr "Obavesti _samo nove učesnike"
 
-#: ../src/calendar/gui/e-calendar-view.c:451
+#: ../src/calendar/gui/e-calendar-view.c:478
 msgid "Cut selected events to the clipboard"
 msgstr "Seče izabrane događaje u spisak isečaka"
 
-#: ../src/calendar/gui/e-calendar-view.c:457
+#: ../src/calendar/gui/e-calendar-view.c:484
 msgid "Copy selected events to the clipboard"
 msgstr "Kopira izabrane događaje u spisak isečaka"
 
-#: ../src/calendar/gui/e-calendar-view.c:463
+#: ../src/calendar/gui/e-calendar-view.c:490
 msgid "Paste events from the clipboard"
 msgstr "Ubacuje događaje iz spiska isečaka"
 
-#: ../src/calendar/gui/e-calendar-view.c:469
+#: ../src/calendar/gui/e-calendar-view.c:496
 msgid "Delete selected events"
 msgstr "Briše izabrane događaje"
 
-#: ../src/calendar/gui/e-calendar-view.c:853
+#: ../src/calendar/gui/e-calendar-view.c:906
 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:1556
+#: ../src/calendar/gui/e-calendar-view.c:917
+#: ../src/calendar/gui/e-cal-ops.c:1555
 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:1559
+#: ../src/calendar/gui/e-calendar-view.c:922
+#: ../src/calendar/gui/e-cal-ops.c:1558
 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:1562
+#: ../src/calendar/gui/e-calendar-view.c:927
+#: ../src/calendar/gui/e-cal-ops.c:1561
 msgid "Default task list not found"
 msgstr "Nije pronađen podrazumevani spisak zadataka"
 
-#: ../src/calendar/gui/e-calendar-view.c:963
+#: ../src/calendar/gui/e-calendar-view.c:1019
 msgid "No suitable component found"
 msgstr "Nije pronađena odovarajuća komponenta"
 
-#: ../src/calendar/gui/e-calendar-view.c:1033
+#: ../src/calendar/gui/e-calendar-view.c:1089
 msgid "Pasting iCalendar data"
 msgstr "Ubacujem podatke iz iKalendara"
 
@@ -6840,9 +7107,9 @@ msgstr "Ubacujem podatke iz iKalendara"
 #. * "Organizer: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../src/calendar/gui/e-calendar-view.c:1831
-#: ../src/calendar/gui/e-memo-table.c:493
-#: ../src/calendar/gui/e-task-table.c:819
+#: ../src/calendar/gui/e-calendar-view.c:1889
+#: ../src/calendar/gui/e-memo-table.c:572
+#: ../src/calendar/gui/e-task-table.c:736
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizator: %s <%s>"
@@ -6850,34 +7117,45 @@ msgstr "Organizator: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../src/calendar/gui/e-calendar-view.c:1835
-#: ../src/calendar/gui/e-memo-table.c:498
-#: ../src/calendar/gui/e-task-table.c:823
+#: ../src/calendar/gui/e-calendar-view.c:1892
+#: ../src/calendar/gui/e-memo-table.c:577
+#: ../src/calendar/gui/e-task-table.c:740
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizator: %s"
 
-#. To Translators: It will display "Location: PlaceOfTheMeeting"
+#. 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:2671
-#: ../src/calendar/gui/e-to-do-pane.c:346 ../src/calendar/gui/print.c:3531
+#: ../src/calendar/gui/e-calendar-view.c:1911
+#: ../src/calendar/gui/e-meeting-time-sel.c:2580
+#: ../src/calendar/gui/e-task-table.c:758
+#: ../src/calendar/gui/e-to-do-pane.c:377 ../src/calendar/gui/print.c:3565
 #, 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:443
+#: ../src/calendar/gui/e-calendar-view.c:1970
+#: ../src/calendar/gui/e-to-do-pane.c:480
 #, c-format
 msgid "Time: %s %s"
 msgstr "Vreme: %s %s"
 
-#: ../src/calendar/gui/e-calendar-view.c:2288
-#: ../src/calendar/gui/e-calendar-view.c:2295
-#: ../src/calendar/gui/e-calendar-view.c:2302
-#: ../src/calendar/gui/e-calendar-view.c:2305
+#. Translators: the '%s' stands for a component summary, the '%d' for the years.
+#. The string is used for Birthday & Anniversary events where the first year is
+#. know, constructing a summary which also shows how many years the birthday or
+#. anniversary is for. Example: "Birthday: John Doe (13)"
+#: ../src/calendar/gui/e-calendar-view.c:2117
+#, c-format
+msgctxt "BirthdaySummary"
+msgid "%s (%d)"
+msgstr "%s (%d.)"
+
+#: ../src/calendar/gui/e-calendar-view.c:2318
+#: ../src/calendar/gui/e-calendar-view.c:2321
+#: ../src/calendar/gui/e-calendar-view.c:2324
+#: ../src/calendar/gui/e-calendar-view.c:2325
 msgid "%d %b %Y"
 msgstr "%d. %b %Y."
 
@@ -6890,14 +7168,14 @@ msgstr "%d. %b %Y."
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../src/calendar/gui/e-calendar-view.c:2293
-#: ../src/calendar/gui/e-day-view.c:3104
-#: ../src/calendar/gui/e-day-view-top-item.c:865
+#: ../src/calendar/gui/e-calendar-view.c:2320
+#: ../src/calendar/gui/e-day-view.c:3079
+#: ../src/calendar/gui/e-day-view-top-item.c:858
 #: ../src/calendar/gui/e-week-view-main-item.c:228
 msgid "%d %b"
 msgstr "%d. %b"
 
-#: ../src/calendar/gui/e-calendar-view.c:2315
+#: ../src/calendar/gui/e-calendar-view.c:2331
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y."
 
@@ -6912,16 +7190,16 @@ msgstr "%A, %d. %b %Y."
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../src/calendar/gui/e-calendar-view.c:2319
-#: ../src/calendar/gui/e-day-view.c:3088
-#: ../src/calendar/gui/e-day-view-top-item.c:861
+#: ../src/calendar/gui/e-calendar-view.c:2333
+#: ../src/calendar/gui/e-day-view.c:3063
+#: ../src/calendar/gui/e-day-view-top-item.c:854
 #: ../src/calendar/gui/e-week-view-main-item.c:214
 msgid "%a %d %b"
 msgstr "%a %d. %b"
 
-#: ../src/calendar/gui/e-calendar-view.c:2322
-#: ../src/calendar/gui/e-calendar-view.c:2328
-#: ../src/calendar/gui/e-calendar-view.c:2331
+#: ../src/calendar/gui/e-calendar-view.c:2334
+#: ../src/calendar/gui/e-calendar-view.c:2336
+#: ../src/calendar/gui/e-calendar-view.c:2337
 msgid "%a %d %b %Y"
 msgstr "%a %d. %b %Y."
 
@@ -6936,143 +7214,154 @@ msgstr "Datum završetka"
 
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:7
 #: ../src/calendar/gui/e-memo-table.etspec.h:6
-#: ../src/calendar/gui/e-task-table.etspec.h:13
-#: ../src/plugins/save-calendar/csv-format.c:378
+#: ../src/calendar/gui/e-task-table.etspec.h:14
+#: ../src/plugins/save-calendar/csv-format.c:367
 msgid "Created"
 msgstr "Napravljeno"
 
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:8
 #: ../src/calendar/gui/e-memo-table.etspec.h:7
-#: ../src/calendar/gui/e-task-table.etspec.h:14
+#: ../src/calendar/gui/e-task-table.etspec.h:15
 msgid "Last modified"
 msgstr "Poslednje izmene"
 
 #: ../src/calendar/gui/e-cal-list-view.etspec.h:9
 #: ../src/calendar/gui/e-memo-table.etspec.h:8
-#: ../src/calendar/gui/e-task-table.etspec.h:15
+#: ../src/calendar/gui/e-task-table.etspec.h:16
 #: ../src/em-format/e-mail-formatter-source.c:118
 msgid "Source"
 msgstr "Izvor"
 
-#: ../src/calendar/gui/e-cal-model.c:316
+#. 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-list-view.etspec.h:10
+#: ../src/calendar/gui/e-cal-model.c:3846
+#: ../src/calendar/gui/e-meeting-list-view.c:693
+#: ../src/calendar/gui/e-meeting-time-sel.etspec.h:9
+#: ../src/calendar/gui/e-memo-table.etspec.h:9
+#: ../src/calendar/gui/e-task-table.etspec.h:11
+#: ../src/calendar/gui/tasktypes.xml.in.h:8 ../src/mail/filtertypes.xml.in.h:36
+#: ../src/mail/message-list.etspec.h:1 ../src/mail/searchtypes.xml.in.h:38
+#: ../src/mail/vfoldertypes.xml.in.h:38
+msgid "Status"
+msgstr "Stanje"
+
+#: ../src/calendar/gui/e-cal-list-view.etspec.h:11
+#: ../src/calendar/gui/e-meeting-list-view.c:650
+#: ../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:1443
+#: ../src/e-util/e-attachment-tree-view.c:205
+#: ../src/e-util/e-collection-account-wizard.c:1971
+#: ../src/e-util/e-webdav-browser.c:2390
+#: ../src/mail/e-mail-account-tree-view.c:158
+msgid "Type"
+msgstr "Vrsta"
+
+#: ../src/calendar/gui/e-cal-model.c:310
 #: ../src/calendar/gui/e-meeting-list-view.c:183
 #: ../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/modules/itip-formatter/itip-view.c:3559
-#: ../src/modules/itip-formatter/itip-view.c:6301
+#: ../src/calendar/gui/e-meeting-store.c:135
+#: ../src/calendar/gui/e-meeting-store.c:170
+#: ../src/calendar/gui/e-meeting-store.c:215 ../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:3640
+#: ../src/modules/itip-formatter/itip-view.c:6686
 #: ../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:614
-#: ../src/calendar/gui/e-cal-ops.c:1250
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:388
+#: ../src/calendar/gui/e-cal-model.c:1369 ../src/calendar/gui/e-cal-ops.c:609
+#: ../src/calendar/gui/e-cal-ops.c:1246
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:378
 #, c-format
 msgid "Source with UID “%s” not found"
-msgstr "Nije pronađen izvor sa UID brojem „%s“"
+msgstr ""
+"Nije pronađen izvor sa JIB\n"
+" brojem „%s“"
 
-#: ../src/calendar/gui/e-cal-model.c:1507 ../src/calendar/gui/e-cal-ops.c:186
-#: ../src/calendar/gui/e-cal-ops.c:1367
+#: ../src/calendar/gui/e-cal-model.c:1480 ../src/calendar/gui/e-cal-ops.c:185
+#: ../src/calendar/gui/e-cal-ops.c:1363
 msgid "Creating an event"
 msgstr "Pravim novi događaj"
 
-#: ../src/calendar/gui/e-cal-model.c:1511 ../src/calendar/gui/e-cal-ops.c:190
-#: ../src/calendar/gui/e-cal-ops.c:1371
+#: ../src/calendar/gui/e-cal-model.c:1484 ../src/calendar/gui/e-cal-ops.c:189
+#: ../src/calendar/gui/e-cal-ops.c:1367
 msgid "Creating a memo"
 msgstr "Pravim novu belešku"
 
-#: ../src/calendar/gui/e-cal-model.c:1515 ../src/calendar/gui/e-cal-ops.c:194
-#: ../src/calendar/gui/e-cal-ops.c:1375
+#: ../src/calendar/gui/e-cal-model.c:1488 ../src/calendar/gui/e-cal-ops.c:193
+#: ../src/calendar/gui/e-cal-ops.c:1371
 msgid "Creating a task"
 msgstr "Pravim novi zadatak"
 
-#: ../src/calendar/gui/e-cal-model.c:1892
+#: ../src/calendar/gui/e-cal-model.c:1874
 msgid "Recurring"
 msgstr "Periodičnost"
 
-#: ../src/calendar/gui/e-cal-model.c:1894
+#: ../src/calendar/gui/e-cal-model.c:1876
 msgid "Assigned"
 msgstr "Dodeljeno"
 
-#: ../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
-#: ../src/calendar/gui/e-meeting-store.c:184
-#: ../src/calendar/gui/e-meeting-store.c:1021
+#: ../src/calendar/gui/e-cal-model.c:1879
+#: ../src/calendar/gui/e-cal-model-tasks.c:1096
 msgid "Yes"
 msgstr "Da"
 
-#: ../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
+#: ../src/calendar/gui/e-cal-model.c:1879
+#: ../src/calendar/gui/e-cal-model-tasks.c:1096
 msgid "No"
 msgstr "Ne"
 
-#: ../src/calendar/gui/e-cal-model.c:3800
-#: ../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
-#: ../src/modules/itip-formatter/itip-view.c:6289
+#: ../src/calendar/gui/e-cal-model.c:3787
+#: ../src/calendar/gui/e-meeting-list-view.c:208
+#: ../src/calendar/gui/e-meeting-store.c:179
+#: ../src/calendar/gui/e-meeting-store.c:202
+#: ../src/modules/itip-formatter/itip-view.c:6674
 msgid "Accepted"
 msgstr "Prihvaćeno"
 
-#: ../src/calendar/gui/e-cal-model.c:3801
-#: ../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
-#: ../src/modules/itip-formatter/itip-view.c:6295
+#: ../src/calendar/gui/e-cal-model.c:3788
+#: ../src/calendar/gui/e-meeting-list-view.c:209
+#: ../src/calendar/gui/e-meeting-store.c:181
+#: ../src/calendar/gui/e-meeting-store.c:204
+#: ../src/modules/itip-formatter/itip-view.c:6680
 msgid "Declined"
 msgstr "Odbijeno"
 
-#: ../src/calendar/gui/e-cal-model.c:3802
-#: ../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
+#: ../src/calendar/gui/e-cal-model.c:3789
+#: ../src/calendar/gui/e-meeting-list-view.c:210
+#: ../src/calendar/gui/e-meeting-store.c:183
+#: ../src/calendar/gui/e-meeting-store.c:206
 #: ../src/calendar/gui/e-meeting-time-sel.c:523
 msgid "Tentative"
-msgstr "Sa rezervom"
+msgstr "Upitno"
 
-#: ../src/calendar/gui/e-cal-model.c:3803
-#: ../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
-#: ../src/modules/itip-formatter/itip-view.c:6298
+#: ../src/calendar/gui/e-cal-model.c:3790
+#: ../src/calendar/gui/e-meeting-list-view.c:211
+#: ../src/calendar/gui/e-meeting-store.c:185
+#: ../src/calendar/gui/e-meeting-store.c:208
+#: ../src/modules/itip-formatter/itip-view.c:6683
 msgid "Delegated"
 msgstr "Delegirano"
 
-#: ../src/calendar/gui/e-cal-model.c:3804
+#: ../src/calendar/gui/e-cal-model.c:3791
 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:3859
-#: ../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
-#: ../src/calendar/gui/tasktypes.xml.in.h:8 ../src/mail/filtertypes.xml.in.h:36
-#: ../src/mail/message-list.etspec.h:1 ../src/mail/searchtypes.xml.in.h:38
-#: ../src/mail/vfoldertypes.xml.in.h:38
-msgid "Status"
-msgstr "Stanje"
-
-#: ../src/calendar/gui/e-cal-model-calendar.c:148
-#: ../src/calendar/gui/e-task-table.c:607
+#: ../src/calendar/gui/e-cal-model-calendar.c:91
+#: ../src/calendar/gui/e-task-table.c:529
 msgid "Free"
 msgstr "Slobodno"
 
-#: ../src/calendar/gui/e-cal-model-calendar.c:151
+#: ../src/calendar/gui/e-cal-model-calendar.c:94
 #: ../src/calendar/gui/e-meeting-time-sel.c:524
-#: ../src/calendar/gui/e-task-table.c:608
+#: ../src/calendar/gui/e-task-table.c:530
 msgid "Busy"
 msgstr "Zauzeto"
 
-#: ../src/calendar/gui/e-cal-model-tasks.c:496
+#: ../src/calendar/gui/e-cal-model-tasks.c:456
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -7082,16 +7371,9 @@ msgstr ""
 "\n"
 "45.436845,125.862501"
 
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# When "None" is selected we want the field to be cleared.
-# Note that we don't show this here, since by default a 'None' date
-# is not permitted.
-#. Translators: "None" for task's status
-#: ../src/calendar/gui/e-cal-model-tasks.c:548
-msgctxt "cal-task-status"
-msgid "None"
-msgstr "Ništa"
+#: ../src/calendar/gui/e-cal-model-tasks.c:553
+msgid "In Progress"
+msgstr "U toku"
 
 #: ../src/calendar/gui/e-cal-ops.c:305
 msgid "Modifying an event"
@@ -7106,19 +7388,19 @@ msgstr "Ispravljam belešku"
 msgid "Modifying a task"
 msgstr "Izpravljam zadatak"
 
-#: ../src/calendar/gui/e-cal-ops.c:412 ../src/calendar/gui/e-to-do-pane.c:1923
+#: ../src/calendar/gui/e-cal-ops.c:411 ../src/calendar/gui/e-to-do-pane.c:2074
 msgid "Removing an event"
 msgstr "Uklanjam događaj"
 
-#: ../src/calendar/gui/e-cal-ops.c:416 ../src/calendar/gui/e-to-do-pane.c:1927
+#: ../src/calendar/gui/e-cal-ops.c:415 ../src/calendar/gui/e-to-do-pane.c:2078
 msgid "Removing a memo"
 msgstr "Uklanjam belešku"
 
-#: ../src/calendar/gui/e-cal-ops.c:420 ../src/calendar/gui/e-to-do-pane.c:1931
+#: ../src/calendar/gui/e-cal-ops.c:419 ../src/calendar/gui/e-to-do-pane.c:2082
 msgid "Removing a task"
 msgstr "Uklanjam zadatak"
 
-#: ../src/calendar/gui/e-cal-ops.c:511
+#: ../src/calendar/gui/e-cal-ops.c:507
 #, c-format
 msgid "Deleting an event"
 msgid_plural "Deleting %d events"
@@ -7127,7 +7409,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:515
+#: ../src/calendar/gui/e-cal-ops.c:511
 #, c-format
 msgid "Deleting a memo"
 msgid_plural "Deleting %d memos"
@@ -7136,7 +7418,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:519
+#: ../src/calendar/gui/e-cal-ops.c:515
 #, c-format
 msgid "Deleting a task"
 msgid_plural "Deleting %d tasks"
@@ -7145,7 +7427,7 @@ msgstr[1] "Uklanjam %d zadatka"
 msgstr[2] "Uklanjam %d zadataka"
 msgstr[3] "Uklanjam zadatak"
 
-#: ../src/calendar/gui/e-cal-ops.c:722
+#: ../src/calendar/gui/e-cal-ops.c:721
 #, c-format
 msgid "Pasting an event"
 msgid_plural "Pasting %d events"
@@ -7154,7 +7436,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:737
+#: ../src/calendar/gui/e-cal-ops.c:736
 #, c-format
 msgid "Pasting a memo"
 msgid_plural "Pasting %d memos"
@@ -7163,7 +7445,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:752
+#: ../src/calendar/gui/e-cal-ops.c:751
 #, c-format
 msgid "Pasting a task"
 msgid_plural "Pasting %d tasks"
@@ -7172,65 +7454,65 @@ msgstr[1] "Ubacujem %d zadatka"
 msgstr[2] "Ubacujem %d zadataka"
 msgstr[3] "Ubacujem zadatak"
 
-#: ../src/calendar/gui/e-cal-ops.c:851
+#: ../src/calendar/gui/e-cal-ops.c:847
 msgid "Updating an event"
 msgstr "Ažuriram događaj"
 
-#: ../src/calendar/gui/e-cal-ops.c:855
+#: ../src/calendar/gui/e-cal-ops.c:851
 msgid "Updating a memo"
 msgstr "Ažuriram belešku"
 
-#: ../src/calendar/gui/e-cal-ops.c:859
+#: ../src/calendar/gui/e-cal-ops.c:855
 msgid "Updating a task"
 msgstr "Ažuriram zadatak"
 
-#: ../src/calendar/gui/e-cal-ops.c:967
+#: ../src/calendar/gui/e-cal-ops.c:968
 #, c-format
 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:971
+#: ../src/calendar/gui/e-cal-ops.c:972
 #, c-format
 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:975
+#: ../src/calendar/gui/e-cal-ops.c:976
 #, c-format
 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:1001
+#: ../src/calendar/gui/e-cal-ops.c:1002
 #, c-format
 msgid "Purging events in the calendar “%s”"
 msgstr "Čistim događaje iz kalendara „%s“"
 
-#: ../src/calendar/gui/e-cal-ops.c:1005
+#: ../src/calendar/gui/e-cal-ops.c:1006
 #, c-format
 msgid "Purging memos in the memo list “%s”"
 msgstr "Čistim beleške iz spiska beleški „%s“"
 
-#: ../src/calendar/gui/e-cal-ops.c:1009
+#: ../src/calendar/gui/e-cal-ops.c:1010
 #, c-format
 msgid "Purging tasks in the task list “%s”"
 msgstr "Čistim zadatke iz spiska zadataka „%s“"
 
-#: ../src/calendar/gui/e-cal-ops.c:1109
+#: ../src/calendar/gui/e-cal-ops.c:1105
 msgid "Purging events"
 msgstr "Čistim događaje"
 
-#: ../src/calendar/gui/e-cal-ops.c:1113
+#: ../src/calendar/gui/e-cal-ops.c:1109
 msgid "Purging memos"
 msgstr "Čistim beleške"
 
-#: ../src/calendar/gui/e-cal-ops.c:1117
+#: ../src/calendar/gui/e-cal-ops.c:1113
 msgid "Purging tasks"
 msgstr "Čistim zadatke"
 
-#: ../src/calendar/gui/e-cal-ops.c:1219
+#: ../src/calendar/gui/e-cal-ops.c:1215
 msgid "Expunging completed tasks"
 msgstr "Uklanjam završene zadatke"
 
-#: ../src/calendar/gui/e-cal-ops.c:2060
+#: ../src/calendar/gui/e-cal-ops.c:2057
 #, c-format
 msgid "Moving an event"
 msgid_plural "Moving %d events"
@@ -7239,7 +7521,7 @@ 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:2061
+#: ../src/calendar/gui/e-cal-ops.c:2058
 #, c-format
 msgid "Copying an event"
 msgid_plural "Copying %d events"
@@ -7248,7 +7530,7 @@ msgstr[1] "Kopiram %d događaja"
 msgstr[2] "Kopiram %d događaja"
 msgstr[3] "Kopiram događaj"
 
-#: ../src/calendar/gui/e-cal-ops.c:2067
+#: ../src/calendar/gui/e-cal-ops.c:2064
 #, c-format
 msgid "Moving a memo"
 msgid_plural "Moving %d memos"
@@ -7257,7 +7539,7 @@ 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:2068
+#: ../src/calendar/gui/e-cal-ops.c:2065
 #, c-format
 msgid "Copying a memo"
 msgid_plural "Copying %d memos"
@@ -7266,7 +7548,7 @@ msgstr[1] "Kopiram %d beleške"
 msgstr[2] "Kopiram %d beleški"
 msgstr[3] "Kopiram belešku"
 
-#: ../src/calendar/gui/e-cal-ops.c:2074
+#: ../src/calendar/gui/e-cal-ops.c:2071
 #, c-format
 msgid "Moving a task"
 msgid_plural "Moving %d tasks"
@@ -7275,7 +7557,7 @@ msgstr[1] "Premeštam %d zadatka"
 msgstr[2] "Premeštam %d zadataka"
 msgstr[3] "Premeštam zadatak"
 
-#: ../src/calendar/gui/e-cal-ops.c:2075
+#: ../src/calendar/gui/e-cal-ops.c:2072
 #, c-format
 msgid "Copying a task"
 msgid_plural "Copying %d tasks"
@@ -7289,7 +7571,7 @@ msgstr[3] "Kopiram zadatak"
 # strftime format of a weekday, a date and a
 # time, in 24-hour format.
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../src/calendar/gui/e-cell-date-edit-text.c:163
+#: ../src/calendar/gui/e-cell-date-edit-text.c:177
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d. %m. %Y. %H:%M:%S"
 
@@ -7298,11 +7580,11 @@ msgstr "%a %d. %m. %Y. %H:%M:%S"
 # strftime format of a weekday, a date and a
 # time, in 12-hour format.
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../src/calendar/gui/e-cell-date-edit-text.c:166
+#: ../src/calendar/gui/e-cell-date-edit-text.c:180
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 
-#: ../src/calendar/gui/e-cell-date-edit-text.c:174
+#: ../src/calendar/gui/e-cell-date-edit-text.c:188
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -7311,207 +7593,209 @@ msgstr ""
 "Datum mora biti unet u obliku: \n"
 "%s"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:99
+#: ../src/calendar/gui/e-comp-editor-event.c:100
 msgid "Event’s time is in the past"
 msgstr "Vreme događaja je u prošlosti"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:200
+#: ../src/calendar/gui/e-comp-editor-event.c:208
 msgid ""
 "Event cannot be edited, because the selected calendar could not be opened"
 msgstr ""
 "Događaj se ne može uređivati, pošto se izabrani kalendar ne može otvoriti"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:202
+#: ../src/calendar/gui/e-comp-editor-event.c:210
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr ""
 "Događaj nije moguće uređivati, pošto je izabrani kalendar samo za čitanje"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:204
+#: ../src/calendar/gui/e-comp-editor-event.c:212
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Događaj nije moguće potpuno urediti, pošto niste organizator"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:436
-#: ../src/calendar/gui/e-comp-editor-task.c:522
+#: ../src/calendar/gui/e-comp-editor-event.c:492
+#: ../src/calendar/gui/e-comp-editor-task.c:591
 msgid "Start date is not a valid date"
 msgstr "Datum početka nije ispravan datum"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:438
+#: ../src/calendar/gui/e-comp-editor-event.c:494
 msgid "Start time is not a valid time"
 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-event.c:498
+#: ../src/calendar/gui/e-comp-editor-event.c:514
 #: ../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/e-util/e-misc-utils.c:4136 ../src/e-util/e-misc-utils.c:4148
-#: ../src/e-util/e-misc-utils.c:4162 ../src/mail/e-mail-autoconfig.c:893
-#: ../src/mail/e-mail-display.c:2243 ../src/mail/e-mail-reader-utils.c:806
-#: ../src/mail/mail-send-recv.c:569 ../src/mail/mail-send-recv.c:1422
+#: ../src/e-util/e-misc-utils.c:4257 ../src/e-util/e-misc-utils.c:4269
+#: ../src/e-util/e-misc-utils.c:4283 ../src/mail/e-mail-autoconfig.c:1029
+#: ../src/mail/e-mail-display.c:2295 ../src/mail/e-mail-reader-utils.c:805
+#: ../src/mail/em-composer-utils.c:3841 ../src/mail/em-composer-utils.c:3872
+#: ../src/mail/mail-send-recv.c:598 ../src/mail/mail-send-recv.c:1496
 #: ../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
+#: ../src/plugins/face/face.c:175 ../src/shell/e-shell.c:1235
+#: ../src/shell/e-shell.c:1260 ../src/smime/gui/certificate-manager.c:357
 #, c-format
 msgid "Unknown error"
 msgstr "Nepoznata greška"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:452
+#: ../src/calendar/gui/e-comp-editor-event.c:508
 msgid "End date is not a valid date"
 msgstr "Datum kraja nije ispravan datum"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:454
+#: ../src/calendar/gui/e-comp-editor-event.c:510
 msgid "End time is not a valid time"
 msgstr "Vreme kraja nije ispravno vreme"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:584
-#: ../src/calendar/gui/e-comp-editor-memo.c:126
-#: ../src/calendar/gui/e-comp-editor-task.c:591
+#: ../src/calendar/gui/e-comp-editor-event.c:712
+#: ../src/calendar/gui/e-comp-editor-memo.c:134
+#: ../src/calendar/gui/e-comp-editor-task.c:704
 msgid "_Categories"
 msgstr "_Kategorije"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:586
-#: ../src/calendar/gui/e-comp-editor-memo.c:128
-#: ../src/calendar/gui/e-comp-editor-task.c:593
+#: ../src/calendar/gui/e-comp-editor-event.c:714
+#: ../src/calendar/gui/e-comp-editor-memo.c:136
+#: ../src/calendar/gui/e-comp-editor-task.c:706
 msgid "Toggles whether to display categories"
 msgstr "Prebacuje prikazivanje kategorija"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:592
-#: ../src/calendar/gui/e-comp-editor-task.c:599
+#: ../src/calendar/gui/e-comp-editor-event.c:720
+#: ../src/calendar/gui/e-comp-editor-task.c:712
 msgid "Time _Zone"
 msgstr "Vremenska _zona"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:594
-#: ../src/calendar/gui/e-comp-editor-task.c:601
+#: ../src/calendar/gui/e-comp-editor-event.c:722
+#: ../src/calendar/gui/e-comp-editor-task.c:714
 msgid "Toggles whether the time zone is displayed"
 msgstr "Prebacuje prikazivanje vremenske zone"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:600
+#: ../src/calendar/gui/e-comp-editor-event.c:728
 msgid "All _Day Event"
 msgstr "Celodnevni događa_j"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:602
+#: ../src/calendar/gui/e-comp-editor-event.c:730
 msgid "Toggles whether to have All Day Event"
 msgstr "Bira da li dozvoljava celodnevne događaje"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:608
+#: ../src/calendar/gui/e-comp-editor-event.c:736
 msgid "Show Time as _Busy"
 msgstr "Prikaži vreme kao _zauzeto"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:610
+#: ../src/calendar/gui/e-comp-editor-event.c:738
 msgid "Toggles whether to show time as busy"
 msgstr "Prebacuje prikazivanje vremena kao zauzeto"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:619
+#: ../src/calendar/gui/e-comp-editor-event.c:747
 msgid "Pu_blic"
 msgstr "_Javno"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:621
+#: ../src/calendar/gui/e-comp-editor-event.c:749
 msgid "Classify as public"
 msgstr "Označite kao javno"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:626
+#: ../src/calendar/gui/e-comp-editor-event.c:754
 msgid "_Private"
 msgstr "L_ično"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:628
+#: ../src/calendar/gui/e-comp-editor-event.c:756
 msgid "Classify as private"
 msgstr "Označite kao lično"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:633
+#: ../src/calendar/gui/e-comp-editor-event.c:761
 msgid "_Confidential"
 msgstr "Pove_rljivo"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:635
+#: ../src/calendar/gui/e-comp-editor-event.c:763
 msgid "Classify as confidential"
 msgstr "Označite kao poverljivo"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:736
+#: ../src/calendar/gui/e-comp-editor-event.c:881
 msgctxt "ECompEditor"
 msgid "_Start time:"
 msgstr "Vreme _početka:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:741
+#: ../src/calendar/gui/e-comp-editor-event.c:886
 msgctxt "ECompEditor"
 msgid "_End time:"
 msgstr "Vreme _završetka:"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:751
+#: ../src/calendar/gui/e-comp-editor-event.c:896
 msgctxt "ECompEditor"
 msgid "All da_y event"
 msgstr "Celodnevni _događaj"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:804
-#: ../src/calendar/gui/e-comp-editor-memo.c:213
-#: ../src/calendar/gui/e-comp-editor-task.c:765
+#: ../src/calendar/gui/e-comp-editor-event.c:964
+#: ../src/calendar/gui/e-comp-editor-memo.c:232
+#: ../src/calendar/gui/e-comp-editor-task.c:882
 msgctxt "ECompEditorPage"
 msgid "General"
 msgstr "Opšte"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:807
-#: ../src/calendar/gui/e-comp-editor-task.c:782
+#: ../src/calendar/gui/e-comp-editor-event.c:967
+#: ../src/calendar/gui/e-comp-editor-task.c:905
 msgctxt "ECompEditorPage"
 msgid "Reminders"
 msgstr "Podsetnici"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:810
+#: ../src/calendar/gui/e-comp-editor-event.c:970
+#: ../src/calendar/gui/e-comp-editor-task.c:909
 msgctxt "ECompEditorPage"
 msgid "Recurrence"
 msgstr "Ponavljanje"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:813
-#: ../src/calendar/gui/e-comp-editor-memo.c:216
-#: ../src/calendar/gui/e-comp-editor-task.c:785
+#: ../src/calendar/gui/e-comp-editor-event.c:973
+#: ../src/calendar/gui/e-comp-editor-memo.c:235
+#: ../src/calendar/gui/e-comp-editor-task.c:913
 msgctxt "ECompEditorPage"
 msgid "Attachments"
 msgstr "Prilozi"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:823
+#: ../src/calendar/gui/e-comp-editor-event.c:983
 msgctxt "ECompEditorPage"
 msgid "Schedule"
 msgstr "Planiranje"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:855
+#: ../src/calendar/gui/e-comp-editor-event.c:1018
 #, c-format
 msgid "Meeting — %s"
 msgstr "Sastanak — %s"
 
-#: ../src/calendar/gui/e-comp-editor-event.c:856
+#: ../src/calendar/gui/e-comp-editor-event.c:1019
 #, c-format
 msgid "Appointment — %s"
-msgstr "Zakazivanje — %s"
+msgstr "Sastanak — %s"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:88
+#: ../src/calendar/gui/e-comp-editor-memo.c:96
 msgid ""
 "Memo cannot be edited, because the selected memo list could not be opened"
 msgstr ""
 "Beleška se ne može uređivati, pošto se izabrani spisak beleški ne može "
 "otvoriti"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:90
+#: ../src/calendar/gui/e-comp-editor-memo.c:98
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "Belešku nije moguće uređivati, pošto je izabran spisak samo za čitanje"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:92
+#: ../src/calendar/gui/e-comp-editor-memo.c:100
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Belešku nije moguće potpuno urediti, pošto niste organizator"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:188
-#: ../src/calendar/gui/e-comp-editor-task.c:700
+#: ../src/calendar/gui/e-comp-editor-memo.c:196
+#: ../src/calendar/gui/e-comp-editor-task.c:813
 msgid "_List:"
 msgstr "_Spisak:"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:195
-#: ../src/calendar/gui/e-comp-editor-task.c:707
+#: ../src/calendar/gui/e-comp-editor-memo.c:203
+#: ../src/calendar/gui/e-comp-editor-task.c:823
 msgctxt "ECompEditor"
 msgid "Sta_rt date:"
 msgstr "Datum _početka:"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:247
+#: ../src/calendar/gui/e-comp-editor-memo.c:266
 #, c-format
 msgid "Assigned Memo — %s"
 msgstr "Dodeljena beleška — %s"
 
-#: ../src/calendar/gui/e-comp-editor-memo.c:248
+#: ../src/calendar/gui/e-comp-editor-memo.c:267
 #, c-format
 msgid "Memo — %s"
 msgstr "Beleška — %s"
@@ -7541,63 +7825,63 @@ msgstr "Ne mogu da učitam „%s“"
 msgid "Could not load the attachment"
 msgstr "Ne mogu da učitam prilog"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:422
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:416
 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:452
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:443
 #, c-format
 msgid "Attachment “%s” cannot be found, remove it from the list, please"
 msgstr "Ne mogu da nađem prilog „%s“, uklonite ga sa spiska"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:469
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:460
 #, c-format
 msgid "Attachment “%s” doesn’t have valid URI, remove it from the list, please"
 msgstr "Prilog „%s“ nema ispravnu putanju, uklonite ga sa spiska"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:647
-#: ../src/composer/e-composer-actions.c:322
-msgid "_Attachment..."
-msgstr "_Prilog..."
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:633
+#: ../src/composer/e-composer-actions.c:312
+msgid "_Attachment…"
+msgstr "_Prilog…"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:649
-#: ../src/composer/e-composer-actions.c:324
-#: ../src/e-util/e-attachment-view.c:344
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:635
+#: ../src/composer/e-composer-actions.c:314
+#: ../src/e-util/e-attachment-view.c:343
 msgid "Attach a file"
 msgstr "Priložite datoteku"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:656
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:642
 msgid "_Attachments"
 msgstr "_Prilozi"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:658
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:644
 msgid "Show attachments"
 msgstr "Prikažite priloge"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:811
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:797
 #: ../src/e-util/e-attachment-bar.c:764 ../src/e-util/e-attachment-paned.c:725
 msgid "Icon View"
 msgstr "Pregled ikonicama"
 
-#: ../src/calendar/gui/e-comp-editor-page-attachments.c:813
+#: ../src/calendar/gui/e-comp-editor-page-attachments.c:799
 #: ../src/e-util/e-attachment-bar.c:766 ../src/e-util/e-attachment-paned.c:727
 msgid "List View"
 msgstr "Pregled spiskom"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:311
+#: ../src/calendar/gui/e-comp-editor-page-general.c:392
 #, c-format
 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
+#: ../src/calendar/gui/e-comp-editor-page-general.c:399
 #, c-format
 msgid "Not enough rights to delete attendee “%s”"
 msgstr "Nemate dovoljna ovlašćenja za brisanje učesnika „%s“"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:348
+#: ../src/calendar/gui/e-comp-editor-page-general.c:429
 msgid "Failed to delete selected attendee"
 msgid_plural "Failed to delete selected attendees"
 msgstr[0] "Nisam uspeo da obrišem izabranog učesnika"
@@ -7605,79 +7889,118 @@ msgstr[1] "Nisam uspeo da obrišem izabrane učesnike"
 msgstr[2] "Nisam uspeo da obrišem izabrane učesnike"
 msgstr[3] "Nisam uspeo da obrišem izabranog učesnika"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:434
+#: ../src/calendar/gui/e-comp-editor-page-general.c:543
 msgid "Organizer address is not a valid user mail address"
 msgstr "Adresa e-pošte organizatora nije ispravna e-pošta"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:584
+#: ../src/calendar/gui/e-comp-editor-page-general.c:712
 msgid "A_ttendees"
 msgstr "_Učesnici"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:586
+#: ../src/calendar/gui/e-comp-editor-page-general.c:714
 msgid "Toggles whether the Attendees are displayed"
 msgstr "Okida prikazivanje učesnika"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:595
+#: ../src/calendar/gui/e-comp-editor-page-general.c:723
 msgid "R_ole Field"
 msgstr "Polje _uloge"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:597
+#: ../src/calendar/gui/e-comp-editor-page-general.c:725
 msgid "Toggles whether the Role field is displayed"
 msgstr "Prebacuje prikazivanje polja Uloga"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:603
+#: ../src/calendar/gui/e-comp-editor-page-general.c:731
 msgid "_RSVP"
 msgstr "_Molim odgovorite"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:605
+#: ../src/calendar/gui/e-comp-editor-page-general.c:733
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Prebacuje prikazivanje polja Molim odgovorite"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:611
+#: ../src/calendar/gui/e-comp-editor-page-general.c:739
 msgid "_Status Field"
 msgstr "Polje _stanja"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:613
+#: ../src/calendar/gui/e-comp-editor-page-general.c:741
 msgid "Toggles whether the Status field is displayed"
 msgstr "Prebacuje prikazivanje polja Stanja"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:619
+#: ../src/calendar/gui/e-comp-editor-page-general.c:747
 msgid "_Type Field"
 msgstr "Polje _tipa"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:621
+#: ../src/calendar/gui/e-comp-editor-page-general.c:749
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Prebacuje prikazivanje polja Tipa"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:947
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1064
 msgid "An organizer is required."
 msgstr "Potreban je organizator."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:957
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1088
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1074
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1216
 msgid "At least one attendee is required."
 msgstr "Najmanje jedan učesnik je potreban."
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1211
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1340
 msgid "Or_ganizer:"
 msgstr "Or_ganizator:"
 
-#: ../src/calendar/gui/e-comp-editor-page-general.c:1290
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1435
+msgid ""
+"Override color of the event. If not set, then color of the calendar is used."
+msgstr ""
+"Prepiši boje događaja. Ukoliko nije postavljeno, koristi se boja kalendara."
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1437
+msgid ""
+"Override color of the memo. If not set, then color of the memo list is used."
+msgstr ""
+"Prepiši boje podsetnika. Ukoliko nije postavljeno, koristi se boja liste "
+"podsetnika."
+
+#. E_SOURCE_EXTENSION_TASK_LIST
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1439
+msgid ""
+"Override color of the task. If not set, then color of the task list is used."
+msgstr ""
+"Prepiši boje zadatka. Ukoliko nije postavljeno, koristi se boja spiska "
+"zadatka."
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1450
 msgctxt "ECompEditor"
-msgid "Atte_ndees..."
-msgstr "_Učesnici..."
+msgid "Atte_ndees…"
+msgstr "Uč_esnici…"
+
+#: ../src/calendar/gui/e-comp-editor-page-general.c:1533
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2285
+#: ../src/calendar/gui/e-comp-editor.c:2113
+#: ../src/e-util/e-accounts-window.c:1745
+#: ../src/e-util/e-html-editor-actions.c:954
+#: ../src/e-util/e-mail-signature-manager.c:358
+#: ../src/e-util/e-webdav-browser.c:2690 ../src/e-util/filter.ui.h:26
+#: ../src/mail/e-mail-account-manager.c:730 ../src/mail/e-mail-browser.c:195
+#: ../src/mail/e-mail-label-manager.c:380
+#: ../src/mail/em-folder-properties.c:1333 ../src/mail/mail-config.ui.h:68
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:549
+#: ../src/plugins/email-custom-header/email-custom-header.c:844
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:34
+#: ../src/plugins/templates/templates.c:469
+#: ../src/shell/e-shell-window-actions.c:1005 ../src/smime/gui/smime-ui.ui.h:11
+msgid "_Edit"
+msgstr "_Uređivanje"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:325
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:328
 msgid "Add exception"
 msgstr "Dodaj izuzetak"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:363
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:369
 msgid "Modify exception"
 msgstr "Izmenite izuzetak"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] 
[forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day 
always follows.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:488
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:502
 msgid "on"
 msgstr "u"
 
@@ -7685,7 +8008,7 @@ msgstr "u"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:569
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:583
 msgctxt "ECompEditorPageRecur"
 msgid "first"
 msgstr "prvog"
@@ -7695,7 +8018,7 @@ msgstr "prvog"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:575
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:589
 msgctxt "ECompEditorPageRecur"
 msgid "second"
 msgstr "drugog"
@@ -7704,7 +8027,7 @@ msgstr "drugog"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:580
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:594
 msgctxt "ECompEditorPageRecur"
 msgid "third"
 msgstr "trećeg"
@@ -7713,7 +8036,7 @@ msgstr "trećeg"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:585
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:599
 msgctxt "ECompEditorPageRecur"
 msgid "fourth"
 msgstr "četvrtog"
@@ -7722,7 +8045,7 @@ msgstr "četvrtog"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 
'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:590
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:604
 msgctxt "ECompEditorPageRecur"
 msgid "fifth"
 msgstr "petog"
@@ -7731,14 +8054,14 @@ msgstr "petog"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:595
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:609
 msgctxt "ECompEditorPageRecur"
 msgid "last"
 msgstr "poslednjeg"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] 
[11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:622
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:636
 msgctxt "ECompEditorPageRecur"
 msgid "Other Date"
 msgstr "Drugog datuma"
@@ -7747,68 +8070,68 @@ msgstr "Drugog datuma"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:628
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:642
 msgctxt "ECompEditorPageRecur"
 msgid "1st to 10th"
-msgstr "od prvog do desetog"
+msgstr "od 1. do 10."
 
 #. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:634
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:648
 msgctxt "ECompEditorPageRecur"
 msgid "11th to 20th"
-msgstr "od jedanaestog do dvadesetog"
+msgstr "od 11. do 20."
 
 #. TRANSLATORS: This is a submenu option string to split the date range into three submenus to choose the 
exact day of
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment 
recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:640
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:654
 msgctxt "ECompEditorPageRecur"
 msgid "21st to 31st"
-msgstr "od dvadesetprvog do tridesetprvog"
+msgstr "od 21. do 31."
 
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the 
[first] [day] [forever]'
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' 
or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:666
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:680
 msgctxt "ECompEditorPageRecur"
 msgid "day"
 msgstr "dana"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:667
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:681
 msgctxt "ECompEditorPageRecur"
 msgid "Monday"
 msgstr "ponedeljka"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:668
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:682
 msgctxt "ECompEditorPageRecur"
 msgid "Tuesday"
 msgstr "utorka"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:669
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:683
 msgctxt "ECompEditorPageRecur"
 msgid "Wednesday"
 msgstr "srede"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:670
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:684
 msgctxt "ECompEditorPageRecur"
 msgid "Thursday"
 msgstr "četvrtka"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:671
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:685
 msgctxt "ECompEditorPageRecur"
 msgid "Friday"
 msgstr "petka"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:672
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:686
 msgctxt "ECompEditorPageRecur"
 msgid "Saturday"
 msgstr "subote"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:673
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:687
 msgctxt "ECompEditorPageRecur"
 msgid "Sunday"
 msgstr "nedelje"
@@ -7816,127 +8139,127 @@ msgstr "nedelje"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] 
[Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:802
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:816
 msgctxt "ECompEditorPageRecur"
 msgid "on the"
-msgstr " "
+msgstr "na dan"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:992
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1011
 msgctxt "ECompEditorPageRecur"
 msgid "occurrences"
 msgstr "pojave"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1484
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2014
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1520
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2077
 msgctxt "ECompEditorPageRecur"
 msgid "This appointment rec_urs"
-msgstr "Ovo zakazivanje se _ponavlja"
+msgstr "Ovaj sastanak se _ponavlja"
 
 #. Translators: Entire string is for example:     'This task recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1489
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1525
 msgctxt "ECompEditorPageRecur"
 msgid "This task rec_urs"
 msgstr "Ovaj zadatak se _ponavlja"
 
 #. Translators: Entire string is for example:     'This memo recurs/Every[x][day(s)][for][1]occurrences' 
(combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1494
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1530
 msgctxt "ECompEditorPageRecur"
 msgid "This memo rec_urs"
 msgstr "Ova beleška se _ponavlja"
 
 #. Translators: Entire string is for example:     'This component 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1499
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1535
 msgctxt "ECompEditorPageRecur"
 msgid "This component rec_urs"
 msgstr "Ovaj sastojak se _ponavlja"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1860
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1906
 msgid "Recurrence exception date is invalid"
 msgstr "Datum izuzetka ponavljanja nije ispravan"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1908
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1962
 msgid "End time of the recurrence is before the start"
 msgstr "Vreme završetka ponavljanja je pre početka"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1951
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2005
 msgid "R_ecurrence"
 msgstr "_Ponavljanje"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:1953
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2007
 msgid "Set or unset recurrence"
 msgstr "Podesite ili poništite ponavljanje"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2046
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2109
 msgctxt "ECompEditorPageRecur"
 msgid "Every"
 msgstr "Svakog"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2081
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2144
 msgctxt "ECompEditorPageRecur"
 msgid "day(s)"
 msgstr "dana"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2083
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2146
 msgctxt "ECompEditorPageRecur"
 msgid "week(s)"
 msgstr "nedelje"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2085
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2148
 msgctxt "ECompEditorPageRecur"
 msgid "month(s)"
 msgstr "meseca"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2087
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2150
 msgctxt "ECompEditorPageRecur"
 msgid "year(s)"
 msgstr "godine"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2116
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2179
 msgctxt "ECompEditorPageRecur"
 msgid "for"
 msgstr "za"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2118
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2181
 msgctxt "ECompEditorPageRecur"
 msgid "until"
 msgstr "do"
 
 #. Translators: Entire string is for example:     'This appointment 
recurs/Every[x][day(s)][for][1]occurrences' (combobox options are in [square brackets])
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2120
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2183
 msgctxt "ECompEditorPageRecur"
 msgid "forever"
 msgstr "uvek"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2136
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2199
 msgid "This appointment contains recurrences that Evolution cannot edit."
-msgstr "Ovo zakazivanje sadrži ponavljanja koja Evolucija ne može da uredi."
+msgstr "Ovaj sastanak sadrži ponavljanja koja Evolucija ne može da uredi."
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2149
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2212
 msgid "Exceptions"
 msgstr "Izuzeci"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2214
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1765
-#: ../src/mail/e-mail-config-identity-page.c:853
-#: ../src/mail/mail-config.ui.h:65
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2277
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2142
+#: ../src/mail/e-mail-config-identity-page.c:854
+#: ../src/mail/mail-config.ui.h:67
 msgid "A_dd"
 msgstr "_Dodaj"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2230
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1773
-#: ../src/mail/mail-config.ui.h:67
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2293
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2150
+#: ../src/mail/mail-config.ui.h:69
 msgid "Re_move"
 msgstr "_Ukloni"
 
-#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2238
+#: ../src/calendar/gui/e-comp-editor-page-recurrence.c:2301
 msgid "Preview"
 msgstr "Pregled"
 
@@ -7944,542 +8267,542 @@ msgstr "Pregled"
 msgid "Send To"
 msgstr "Pošalji"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1550
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1566
 msgid "_Reminders"
 msgstr "_Podsetnici"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1552
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1568
 msgid "Set or unset reminders"
 msgstr "Podesite ili poništite podsetnike"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1605
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
-msgid "Reminders"
-msgstr "Podsetnici"
-
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1630
-msgid "_Reminder"
-msgstr "_Podsetnik"
-
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1663
-#, c-format
-msgid "%d day before"
-msgid_plural "%d days before"
-msgstr[0] "%d dan pre"
-msgstr[1] "%d dana pre"
-msgstr[2] "%d dana pre"
-msgstr[3] "%d dan pre"
-
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1670
-#, c-format
-msgid "%d hour before"
-msgid_plural "%d hours before"
-msgstr[0] "%d sat pre"
-msgstr[1] "%d sata pre"
-msgstr[2] "%d sati pre"
-msgstr[3] "%d sat pre"
-
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1677
-#, c-format
-msgid "%d minute before"
-msgid_plural "%d minutes before"
-msgstr[0] "%d minut pre"
-msgstr[1] "%d minuta pre"
-msgstr[2] "%d minuta pre"
-msgstr[3] "%d minut pre"
-
 # add a "None" option to the stores menu
 # Put the "None" and "UTC" entries at the top of the combo's list.
 # When "None" is selected we want the field to be cleared.
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" for "No reminder set"
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1685
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1680
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ništa"
 
-#. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1687
-msgctxt "cal-reminders"
-msgid "15 minutes before"
-msgstr "pre 15 minuta"
-
-#. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1689
+#. Translators: This constructs predefined reminder's description, for example "15 minutes before",
+#. "1 hour before", "1 day before", but, if user has set, also more complicated strings like
+#. "2 days 13 hours 1 minute before".
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1690
+#, c-format
 msgctxt "cal-reminders"
-msgid "1 hour before"
-msgstr "pre %d sat"
+msgid "%s before"
+msgstr "pre %s"
 
-#. Translators: Predefined reminder's description
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1691
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1695
 msgctxt "cal-reminders"
-msgid "1 day before"
-msgstr "pre 1 dana"
+msgid "at the start"
+msgstr "na početku"
 
 #. Translators: "Custom" for "Custom reminder set"
 #: ../src/calendar/gui/e-comp-editor-page-reminders.c:1703
 msgctxt "cal-reminders"
 msgid "Custom"
-msgstr "Proizvoljno"
+msgstr "Proizvoljan"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1849
+msgid "Set a custom predefined time to"
+msgstr "Postavite proizvoljno definisano vreme za"
+
+#. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1862
+msgctxt "cal-reminders"
+msgid "da_ys"
+msgstr "_dan(a)"
+
+#. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1878
+msgctxt "cal-reminders"
+msgid "_hours"
+msgstr "_sat(a)"
+
+#. Translators: this is part of: "Set a custom predefined time to [nnn] days [nnn] hours [nnn] minutes", 
where the text in "[]" means a separate widget
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1894
+msgctxt "cal-reminders"
+msgid "_minutes"
+msgstr "_minut(a)"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1900
+msgid "_Add time"
+msgstr "_Dodaj vreme"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1980
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
+msgid "Reminders"
+msgstr "Podsetnici"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2005
+msgid "_Reminder"
+msgstr "_Podsetnik"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2030
+msgid "Add custom predefined time"
+msgstr "Dodaj proizvoljno definisano vreme"
+
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2038
+msgid "Remove custom predefined times"
+msgstr "Ukloni proizvoljno definisano vreme"
 
 # bug: plural-forms
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1846
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2223
 msgctxt "cal-reminders"
 msgid "minute(s)"
 msgstr "minut(a)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ hour(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1848
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2225
 msgctxt "cal-reminders"
 msgid "hour(s)"
 msgstr "sat(a)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ day(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1850
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2227
 msgctxt "cal-reminders"
 msgid "day(s)"
 msgstr "dan(a)"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1867
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2244
 msgctxt "cal-reminders"
 msgid "before"
 msgstr "pre"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ after ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1869
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2246
 msgctxt "cal-reminders"
 msgid "after"
 msgstr "posle"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ start ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1885
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2262
 msgctxt "cal-reminders"
 msgid "start"
 msgstr "početka"
 
 #. Translators: Part of: [ Pop up an alert ] [ x ] [ minute(s) ] [ before ] [ end ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1887
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2264
 msgctxt "cal-reminders"
 msgid "end"
 msgstr "kraja"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1906
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2283
 msgid "Re_peat the reminder"
 msgstr "_Ponovi podsetnik"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1931
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2308
 msgctxt "cal-reminders"
 msgid "extra times every"
 msgstr "prikaži još na svakih"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ minutes ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1968
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2345
 msgctxt "cal-reminders"
 msgid "minutes"
 msgstr "minuta"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ hours ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1970
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2347
 msgctxt "cal-reminders"
 msgid "hours"
 msgstr "sati"
 
 #. Translators: Part of: Repeat the reminder [ x ] extra times every [ y ] [ days ]
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:1972
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2349
 msgctxt "cal-reminders"
 msgid "days"
 msgstr "dana"
 
 #. page_reminders->priv->custom_email_entry is initialized on demand
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2009
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2166
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2386
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2543
 msgctxt "cal-reminders"
 msgid "Custom _message"
 msgstr "Proizvoljna _poruka"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2053
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2430
 msgctxt "cal-reminders"
 msgid "Custom reminder _sound"
 msgstr "Proizvoljan _zvuk podsetnika"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2064
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2441
 msgid "Select a sound file"
 msgstr "Izaberite zvučnu datoteku"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2092
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2469
 msgid "_Program:"
 msgstr "_Program:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2117
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2494
 msgid "_Arguments:"
 msgstr "_Argumenti:"
 
-#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2149
+#: ../src/calendar/gui/e-comp-editor-page-reminders.c:2526
 msgid "_Send To:"
 msgstr "_Pošalji:"
 
-#: ../src/calendar/gui/e-comp-editor-page-schedule.c:443
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:471
 msgid "_Schedule"
 msgstr "_Zakaži"
 
-#: ../src/calendar/gui/e-comp-editor-page-schedule.c:445
+#: ../src/calendar/gui/e-comp-editor-page-schedule.c:473
 msgid "Query free / busy information for the attendees"
 msgstr "Zatraži podatak za slobodno/zauzeto vreme za ove učesnike"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:79
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:91
 msgctxt "ECompEditor"
 msgid "_Summary:"
 msgstr "_Sažetak:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:323
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:340
 msgctxt "ECompEditor"
 msgid "_Location:"
 msgstr "_Mesto:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:456
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:473
 msgctxt "ECompEditor"
-msgid "_Categories..."
-msgstr "_Kategorije..."
+msgid "_Categories…"
+msgstr "_Kategorije…"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:555
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:572
 msgctxt "ECompEditor"
 msgid "_Description:"
 msgstr "_Opis:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:687
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:704
 msgctxt "ECompEditor"
 msgid "_Web page:"
 msgstr "_Veb stranica:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1058
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1075
 msgctxt "ECompEditor"
 msgid "D_ue date:"
 msgstr "Krajnji _rok:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1148
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1169
 msgctxt "ECompEditor"
 msgid "Date _completed:"
 msgstr "_Datum završetka:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1164
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1185
 msgctxt "ECompEditor"
 msgid "Public"
 msgstr "Javno"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1165
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1186
 msgctxt "ECompEditor"
 msgid "Private"
 msgstr "Lično"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1166
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1187
 msgctxt "ECompEditor"
 msgid "Confidential"
 msgstr "Poverljivo"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1182
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1203
 msgctxt "ECompEditor"
 msgid "C_lassification:"
 msgstr "_Razvrstavanje:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1201
-msgctxt "ECompEditor"
-msgid "Not Started"
-msgstr "Nije započet"
-
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1202
-msgctxt "ECompEditor"
-msgid "In Progress"
-msgstr "U toku"
-
-# timezone.
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1203
-msgctxt "ECompEditor"
-msgid "Completed"
-msgstr "Završeno"
-
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1204
-msgctxt "ECompEditor"
-msgid "Cancelled"
-msgstr "Otkazano"
-
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1213
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1266
 msgctxt "ECompEditor"
 msgid "_Status:"
 msgstr "_Stanje:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1243
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1296
 msgctxt "ECompEditor"
 msgid "Undefined"
 msgstr "Neodređen"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1244
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1297
 msgctxt "ECompEditor"
 msgid "High"
 msgstr "Visok"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1245
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1298
 msgctxt "ECompEditor"
 msgid "Normal"
 msgstr "Običan"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1246
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1299
 msgctxt "ECompEditor"
 msgid "Low"
 msgstr "Nizak"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1255
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1308
 msgctxt "ECompEditor"
 msgid "Priorit_y:"
 msgstr "_Važnost:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1309
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1362
 msgctxt "ECompEditor"
 msgid "Percent complete:"
 msgstr "Procenat završenog:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1390
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1443
 msgctxt "ECompEditor"
 msgid "Time _zone:"
 msgstr "Vremenska _zona:"
 
-#: ../src/calendar/gui/e-comp-editor-property-parts.c:1515
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1539
 msgctxt "ECompEditor"
 msgid "Show time as _busy"
 msgstr "Prikaži vreme kao _zauzeto"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:224
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# When "None" is selected we want the field to be cleared.
+# Note that we don't show this here, since by default a 'None' date
+# is not permitted.
+#. Translators: This 'None' is meant for 'Color' in calendar component editor, like 'None color'
+#: ../src/calendar/gui/e-comp-editor-property-parts.c:1961
+msgctxt "ECompEditor"
+msgid "None"
+msgstr "Ništa"
+
+#: ../src/calendar/gui/e-comp-editor-task.c:281
 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
+#: ../src/calendar/gui/e-comp-editor-task.c:289
 msgid "Task’s due date is in the past"
 msgstr "Rok za završetak zadatka je u prošlosti"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:461
+#: ../src/calendar/gui/e-comp-editor-task.c:530
 msgid ""
 "Task cannot be edited, because the selected task list could not be opened"
 msgstr ""
 "Zadatak se ne može uređivati, pošto se izabrani spisak zadataka ne može "
 "otvoriti"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:463
+#: ../src/calendar/gui/e-comp-editor-task.c:532
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "Zadatak nije moguće uređivati, pošto je izabrani spisak samo za čitanje"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:465
+#: ../src/calendar/gui/e-comp-editor-task.c:534
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "Zadatak nije moguće potpuno urediti, zato što niste organizator"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:533
+#: ../src/calendar/gui/e-comp-editor-task.c:605
+msgid "Start date is required for recurring tasks"
+msgstr "Početni datum je obavezan za ponavljajuće zadatke"
+
+#: ../src/calendar/gui/e-comp-editor-task.c:621
 msgid "Due date is not a valid date"
 msgstr "Datum isteka nije ispravan datum"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:544
+#: ../src/calendar/gui/e-comp-editor-task.c:632
 msgid "Completed date is not a valid date"
 msgstr "Datum završetka nije ispravan datum"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:555
+#: ../src/calendar/gui/e-comp-editor-task.c:643
 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
+#: ../src/calendar/gui/e-comp-editor-task.c:720
 msgid "All _Day Task"
 msgstr "Celodnevni događa_j"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:609
+#: ../src/calendar/gui/e-comp-editor-task.c:722
 msgid "Toggles whether to have All Day Task"
 msgstr "Bira da li dozvoljava celodnevne zadatke"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:818
+#: ../src/calendar/gui/e-comp-editor-task.c:946
 #, c-format
 msgid "Assigned Task — %s"
 msgstr "Dodeljen zadatak — %s"
 
-#: ../src/calendar/gui/e-comp-editor-task.c:819
+#: ../src/calendar/gui/e-comp-editor-task.c:947
 #, c-format
 msgid "Task — %s"
 msgstr "Zadatak — %s"
 
 #: ../src/calendar/gui/e-comp-editor.c:253
-#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:125
+#: ../src/modules/prefer-plain/e-mail-parser-prefer-plain.c:141
 msgid "attachment"
 msgstr "prilog"
 
-#: ../src/calendar/gui/e-comp-editor.c:608
-msgid "Sending notifications to attendees..."
-msgstr "Šaljem obaveštenja učesnicima..."
+#: ../src/calendar/gui/e-comp-editor.c:610
+msgid "Sending notifications to attendees…"
+msgstr "Šaljem obaveštenja učesnicima…"
 
-#: ../src/calendar/gui/e-comp-editor.c:997
-msgid "Saving changes..."
-msgstr "Čuvam izmene..."
+#: ../src/calendar/gui/e-comp-editor.c:985
+#: ../src/e-util/e-webdav-browser.c:1818
+msgid "Saving changes…"
+msgstr "Čuvam izmene…"
 
-#: ../src/calendar/gui/e-comp-editor.c:1257
+#: ../src/calendar/gui/e-comp-editor.c:1245
 msgid "No Summary"
 msgstr "Bez sažetka"
 
 #. == Button box ==
-#: ../src/calendar/gui/e-comp-editor.c:1984
-#: ../src/composer/e-composer-actions.c:329
-#: ../src/e-util/e-accounts-window.c:1730
+#: ../src/calendar/gui/e-comp-editor.c:2027
+#: ../src/composer/e-composer-actions.c:319
+#: ../src/e-util/e-accounts-window.c:1778
 #: ../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:399
 #: ../src/e-util/e-table-field-chooser-dialog.c:205
-#: ../src/mail/e-mail-browser.c:128 ../src/mail/e-mail-notes.c:931
-#: ../src/mail/em-folder-properties.c:1158
-#: ../src/mail/em-subscription-editor.c:1739
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:254
-#: ../src/shell/e-shell-window-actions.c:296
-#: ../src/shell/e-shell-window-actions.c:817
-#: ../src/smime/gui/certificate-manager.c:2212
+#: ../src/mail/e-mail-browser.c:144
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:758
+#: ../src/mail/e-mail-notes.c:964 ../src/mail/em-filter-editor.c:45
+#: ../src/mail/em-folder-properties.c:1458
+#: ../src/mail/em-subscription-editor.c:1741
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:306
+#: ../src/shell/e-shell-window-actions.c:314
+#: ../src/shell/e-shell-window-actions.c:842
+#: ../src/smime/gui/certificate-manager.c:2196
 msgid "_Close"
 msgstr "_Zatvori"
 
-#: ../src/calendar/gui/e-comp-editor.c:1986
+#: ../src/calendar/gui/e-comp-editor.c:2029
 msgid "Close the current window"
 msgstr "Zatvorite trenutni prozor"
 
 #. copy menu item
-#: ../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:2075
-#: ../src/e-util/e-web-view.c:409 ../src/mail/e-mail-browser.c:135
-#: ../src/mail/mail.error.xml.h:146 ../src/shell/e-shell-window-actions.c:838
+#: ../src/calendar/gui/e-comp-editor.c:2034 ../src/e-util/e-focus-tracker.c:773
+#: ../src/e-util/e-html-editor-actions.c:910 ../src/e-util/e-text.c:2080
+#: ../src/e-util/e-web-view.c:467 ../src/mail/e-mail-browser.c:151
+#: ../src/mail/mail.error.xml.h:147 ../src/shell/e-shell-window-actions.c:863
 msgid "_Copy"
 msgstr "_Kopiraj"
 
-#: ../src/calendar/gui/e-comp-editor.c:1993 ../src/e-util/e-focus-tracker.c:173
+#: ../src/calendar/gui/e-comp-editor.c:2036 ../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:411
-#: ../src/e-util/e-web-view.c:2003 ../src/mail/e-mail-browser.c:137
-#: ../src/shell/e-shell-window-actions.c:840
+#: ../src/e-util/e-focus-tracker.c:774 ../src/e-util/e-web-view.c:469
+#: ../src/e-util/e-web-view.c:2080 ../src/mail/e-mail-browser.c:153
+#: ../src/shell/e-shell-window-actions.c:865
 msgid "Copy the selection"
 msgstr "Kopira izabrano"
 
 #. cut menu item
-#: ../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:2061
-#: ../src/mail/e-mail-browser.c:142 ../src/shell/e-shell-window-actions.c:845
+#: ../src/calendar/gui/e-comp-editor.c:2041 ../src/e-util/e-focus-tracker.c:768
+#: ../src/e-util/e-html-editor-actions.c:917 ../src/e-util/e-text.c:2066
+#: ../src/mail/e-mail-browser.c:158 ../src/shell/e-shell-window-actions.c:870
 msgid "Cu_t"
 msgstr "_Iseci"
 
-#: ../src/calendar/gui/e-comp-editor.c:2000 ../src/e-util/e-focus-tracker.c:166
+#: ../src/calendar/gui/e-comp-editor.c:2043 ../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:2012
-#: ../src/mail/e-mail-browser.c:144 ../src/shell/e-shell-window-actions.c:847
+#: ../src/e-util/e-focus-tracker.c:769 ../src/e-util/e-web-view.c:2089
+#: ../src/mail/e-mail-browser.c:160 ../src/shell/e-shell-window-actions.c:872
 msgid "Cut the selection"
 msgstr "Isecite izabrano"
 
-#: ../src/calendar/gui/e-comp-editor.c:2007 ../src/e-util/e-focus-tracker.c:187
+#: ../src/calendar/gui/e-comp-editor.c:2050 ../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:854
+#: ../src/shell/e-shell-window-actions.c:879
 msgid "Delete the selection"
 msgstr "Obrišite izbor"
 
-#: ../src/calendar/gui/e-comp-editor.c:2014
+#: ../src/calendar/gui/e-comp-editor.c:2057
 msgid "View help"
 msgstr "Pogledaj pomoć"
 
 #. paste menu item
-#: ../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:2087
-#: ../src/mail/e-mail-browser.c:149 ../src/shell/e-shell-window-actions.c:873
+#: ../src/calendar/gui/e-comp-editor.c:2062 ../src/e-util/e-focus-tracker.c:778
+#: ../src/e-util/e-html-editor-actions.c:924 ../src/e-util/e-text.c:2092
+#: ../src/mail/e-mail-browser.c:165 ../src/shell/e-shell-window-actions.c:898
 msgid "_Paste"
 msgstr "_Ubaci"
 
-#: ../src/calendar/gui/e-comp-editor.c:2021 ../src/e-util/e-focus-tracker.c:180
+#: ../src/calendar/gui/e-comp-editor.c:2064 ../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:2021
-#: ../src/mail/e-mail-browser.c:151 ../src/shell/e-shell-window-actions.c:875
+#: ../src/e-util/e-focus-tracker.c:779 ../src/e-util/e-web-view.c:2098
+#: ../src/mail/e-mail-browser.c:167 ../src/shell/e-shell-window-actions.c:900
 msgid "Paste the clipboard"
 msgstr "Ubacite iz spiska isečaka"
 
-#: ../src/calendar/gui/e-comp-editor.c:2026
-#: ../src/composer/e-composer-actions.c:383 ../src/mail/e-mail-reader.c:2402
-#: ../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:2033 ../src/mail/e-mail-reader.c:2409
-#: ../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: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:419
-#: ../src/mail/e-mail-browser.c:156 ../src/shell/e-shell-window-actions.c:950
+#: ../src/calendar/gui/e-comp-editor.c:2069
+#: ../src/composer/e-composer-actions.c:373 ../src/mail/e-mail-reader.c:2750
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1319
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1333
+msgid "_Print…"
+msgstr "_Štampaj…"
+
+#: ../src/calendar/gui/e-comp-editor.c:2076 ../src/mail/e-mail-reader.c:2757
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1326
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1723
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:838
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1046
+msgid "Pre_view…"
+msgstr "_Pregled…"
+
+#: ../src/calendar/gui/e-comp-editor.c:2083 ../src/e-util/e-focus-tracker.c:788
+#: ../src/e-util/e-html-editor-actions.c:938 ../src/e-util/e-web-view.c:484
+#: ../src/mail/e-mail-browser.c:172 ../src/shell/e-shell-window-actions.c:968
 msgid "Select _All"
 msgstr "Izaberi _sve"
 
-#: ../src/calendar/gui/e-comp-editor.c:2042 ../src/e-util/e-focus-tracker.c:194
+#: ../src/calendar/gui/e-comp-editor.c:2085 ../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:158 ../src/shell/e-shell-window-actions.c:952
+#: ../src/mail/e-mail-browser.c:174 ../src/shell/e-shell-window-actions.c:970
 msgid "Select all text"
 msgstr "Izaberite sav tekst"
 
-#: ../src/calendar/gui/e-comp-editor.c:2063
+#: ../src/calendar/gui/e-comp-editor.c:2106
 msgid "_Classification"
 msgstr "_Razvrstavanje"
 
-#: ../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:165
-#: ../src/mail/e-mail-notes.c:945 ../src/shell/e-shell-window-actions.c:987
+#: ../src/calendar/gui/e-comp-editor.c:2120
+#: ../src/e-util/e-html-editor-actions.c:961
+#: ../src/e-util/e-mail-signature-editor.c:323 ../src/mail/e-mail-browser.c:188
+#: ../src/mail/e-mail-notes.c:978 ../src/shell/e-shell-window-actions.c:1012
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../src/calendar/gui/e-comp-editor.c:2091
-#: ../src/e-util/e-html-editor-actions.c:950
+#: ../src/calendar/gui/e-comp-editor.c:2134
+#: ../src/e-util/e-html-editor-actions.c:982
 msgid "_Insert"
 msgstr "_Umetni"
 
-#: ../src/calendar/gui/e-comp-editor.c:2098
-#: ../src/composer/e-composer-actions.c:373
+#: ../src/calendar/gui/e-comp-editor.c:2141
+#: ../src/composer/e-composer-actions.c:363
 msgid "_Options"
 msgstr "_Mogućnosti"
 
-#: ../src/calendar/gui/e-comp-editor.c:2105
-#: ../src/e-util/e-html-editor-actions.c:971 ../src/mail/e-mail-browser.c:179
-#: ../src/shell/e-shell-window-actions.c:1030
-#: ../src/smime/gui/certificate-manager.c:1662 ../src/smime/gui/smime-ui.ui.h:3
+#: ../src/calendar/gui/e-comp-editor.c:2148
+#: ../src/e-util/e-html-editor-actions.c:1003 ../src/mail/e-mail-browser.c:202
+#: ../src/shell/e-shell-window-actions.c:1055
+#: ../src/smime/gui/certificate-manager.c:1646 ../src/smime/gui/smime-ui.ui.h:3
 msgid "_View"
 msgstr "P_regled"
 
-#: ../src/calendar/gui/e-comp-editor.c:2117
+#: ../src/calendar/gui/e-comp-editor.c:2160
 msgid "Save current changes"
 msgstr "Sačuvajte tekuće izmene"
 
-#: ../src/calendar/gui/e-comp-editor.c:2122
-#: ../src/e-util/e-mail-signature-editor.c:318 ../src/mail/e-mail-notes.c:940
+#: ../src/calendar/gui/e-comp-editor.c:2165
+#: ../src/e-util/e-mail-signature-editor.c:318 ../src/mail/e-mail-notes.c:973
 msgid "Save and Close"
 msgstr "Sačuvaj i zatvori"
 
-#: ../src/calendar/gui/e-comp-editor.c:2124
+#: ../src/calendar/gui/e-comp-editor.c:2167
 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:2156 ../src/calendar/gui/e-to-do-pane.c:241
-#: ../src/calendar/gui/e-week-view.c:1781 ../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:2152 ../src/calendar/gui/e-to-do-pane.c:245
+#: ../src/calendar/gui/e-week-view.c:1756 ../src/calendar/gui/print.c:1076
+#: ../src/calendar/gui/print.c:1095 ../src/calendar/gui/print.c:2647
+#: ../src/calendar/gui/print.c:2667
 msgid "am"
 msgstr "prp"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../src/calendar/gui/e-day-view.c:2159 ../src/calendar/gui/e-to-do-pane.c:245
-#: ../src/calendar/gui/e-week-view.c:1784 ../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:2155 ../src/calendar/gui/e-to-do-pane.c:249
+#: ../src/calendar/gui/e-week-view.c:1759 ../src/calendar/gui/print.c:1081
+#: ../src/calendar/gui/print.c:1097 ../src/calendar/gui/print.c:2652
+#: ../src/calendar/gui/print.c:2669
 msgid "pm"
 msgstr "pop"
 
@@ -8494,15 +8817,15 @@ msgstr "pop"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../src/calendar/gui/e-day-view.c:3071
-#: ../src/calendar/gui/e-day-view-top-item.c:857
+#: ../src/calendar/gui/e-day-view.c:3046
+#: ../src/calendar/gui/e-day-view-top-item.c:850
 #: ../src/calendar/gui/e-week-view-main-item.c:205
-#: ../src/calendar/gui/print.c:2093
+#: ../src/calendar/gui/print.c:2109
 msgid "%A %d %B"
 msgstr "%A %d. %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../src/calendar/gui/e-day-view.c:3792
+#: ../src/calendar/gui/e-day-view.c:3787
 #, c-format
 msgid "Week %d"
 msgstr "%d. nedelja"
@@ -8513,12 +8836,12 @@ msgstr "%d. nedelja"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../src/calendar/gui/e-day-view-time-item.c:804
+#: ../src/calendar/gui/e-day-view-time-item.c:811
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutni razmaci"
 
-#: ../src/calendar/gui/e-day-view-time-item.c:829
+#: ../src/calendar/gui/e-day-view-time-item.c:836
 msgid "Show the second time zone"
 msgstr "Prikaži drugu vremensku zonu"
 
@@ -8528,19 +8851,19 @@ msgstr "Prikaži drugu vremensku zonu"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../src/calendar/gui/e-day-view-time-item.c:846
-#: ../src/modules/calendar/e-calendar-preferences.c:313
-#: ../src/modules/calendar/e-calendar-preferences.c:365
+#: ../src/calendar/gui/e-day-view-time-item.c:853
+#: ../src/modules/calendar/e-calendar-preferences.c:310
+#: ../src/modules/calendar/e-calendar-preferences.c:362
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ništa"
 
-#: ../src/calendar/gui/e-day-view-time-item.c:880
-#: ../src/calendar/gui/e-timezone-entry.c:322
-#: ../src/modules/calendar/e-calendar-preferences.c:396
-msgid "Select..."
-msgstr "Izaberi..."
+#: ../src/calendar/gui/e-day-view-time-item.c:887
+#: ../src/calendar/gui/e-timezone-entry.c:346
+#: ../src/modules/calendar/e-calendar-preferences.c:393
+msgid "Select…"
+msgstr "Izaberi…"
 
 #: ../src/calendar/gui/e-meeting-list-view.c:62
 msgid "Chair Persons"
@@ -8563,104 +8886,100 @@ msgid "Attendees"
 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:110
+#: ../src/calendar/gui/e-meeting-store.c:127
+#: ../src/calendar/gui/e-meeting-store.c:1072 ../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:112
+#: ../src/calendar/gui/e-meeting-store.c:129 ../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:114
+#: ../src/calendar/gui/e-meeting-store.c:131 ../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:116
+#: ../src/calendar/gui/e-meeting-store.c:133 ../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:145
+#: ../src/calendar/gui/e-meeting-store.c:162 ../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:147
+#: ../src/calendar/gui/e-meeting-store.c:164
+#: ../src/calendar/gui/e-meeting-store.c:1073 ../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:149
+#: ../src/calendar/gui/e-meeting-store.c:166 ../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:151
+#: ../src/calendar/gui/e-meeting-store.c:168 ../src/calendar/gui/print.c:1273
 msgid "Non-Participant"
 msgstr "Ne-učesnik"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:218
-#: ../src/calendar/gui/e-meeting-store.c:192
-#: ../src/calendar/gui/e-meeting-store.c:215
-#: ../src/calendar/gui/e-meeting-store.c:1028
+#: ../src/calendar/gui/e-meeting-list-view.c:207
+#: ../src/calendar/gui/e-meeting-store.c:177
+#: ../src/calendar/gui/e-meeting-store.c:200
+#: ../src/calendar/gui/e-meeting-store.c:1079
 msgid "Needs Action"
 msgstr "Potrebna radnja"
 
-#: ../src/calendar/gui/e-meeting-list-view.c:618
+#: ../src/calendar/gui/e-meeting-list-view.c:624
 msgid "Attendee                          "
 msgstr "Učesnik                          "
 
-#: ../src/calendar/gui/e-meeting-list-view.c:644
-#: ../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:1407
-#: ../src/e-util/e-attachment-tree-view.c:205
-#: ../src/e-util/e-collection-account-wizard.c:1696
-#: ../src/e-util/e-webdav-browser.c:2381
-#: ../src/mail/e-mail-account-tree-view.c:158
-msgid "Type"
-msgstr "Vrsta"
-
 #. To translators: RSVP means "please reply"
-#: ../src/calendar/gui/e-meeting-list-view.c:673
+#: ../src/calendar/gui/e-meeting-list-view.c:679
 #: ../src/calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "MVOM"
 
-#: ../src/calendar/gui/e-meeting-store.c:204
-#: ../src/calendar/gui/e-meeting-store.c:227
+# timezone.
+#: ../src/calendar/gui/e-meeting-store.c:187
+#: ../src/calendar/gui/e-meeting-store.c:210
+#: ../src/calendar/gui/tasktypes.xml.in.h:13
+#: ../src/plugins/save-calendar/csv-format.c:366
+msgid "Completed"
+msgstr "Završeno"
+
+#: ../src/calendar/gui/e-meeting-store.c:189
+#: ../src/calendar/gui/e-meeting-store.c:212
 msgid "In Process"
 msgstr "U toku"
 
-#: ../src/calendar/gui/e-meeting-store.c:1899
+#: ../src/calendar/gui/e-meeting-store.c:2003
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 "Unesite lozinku da pristupite podacima „slobodan/zauzet“ na serveru „%s“ kao "
 "korisnik „%s“"
 
-#: ../src/calendar/gui/e-meeting-store.c:1909
+#: ../src/calendar/gui/e-meeting-store.c:2013
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Razlog neuspeha: %s"
 
-#: ../src/calendar/gui/e-meeting-store.c:1914
-#: ../src/e-util/e-collection-account-wizard.c:268
+#: ../src/calendar/gui/e-meeting-store.c:2018
+#: ../src/e-util/e-collection-account-wizard.c:493
 #: ../src/plugins/publish-calendar/publish-calendar.c:350
 #: ../src/smime/gui/component.c:61
 msgid "Enter password"
@@ -8675,8 +8994,8 @@ msgid "No Information"
 msgstr "Nema podatka"
 
 #: ../src/calendar/gui/e-meeting-time-sel.c:543
-msgid "Atte_ndees..."
-msgstr "Uč_esnici..."
+msgid "Atte_ndees…"
+msgstr "Uč_esnici…"
 
 #: ../src/calendar/gui/e-meeting-time-sel.c:562
 msgid "O_ptions"
@@ -8730,7 +9049,7 @@ msgstr "_Vreme početka:"
 msgid "_End time:"
 msgstr "Vreme _završetka:"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:2667
+#: ../src/calendar/gui/e-meeting-time-sel.c:2576
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -8739,8 +9058,8 @@ msgstr ""
 "Sažetak: %s\n"
 "Mesto: %s"
 
-#: ../src/calendar/gui/e-meeting-time-sel.c:2669
-#: ../src/calendar/gui/print.c:3520
+#: ../src/calendar/gui/e-meeting-time-sel.c:2578
+#: ../src/calendar/gui/print.c:3554
 #, c-format
 msgid "Summary: %s"
 msgstr "Sažetak: %s"
@@ -8769,41 +9088,41 @@ msgstr "Zajedničko ime"
 msgid "Language"
 msgstr "Jezik"
 
-#: ../src/calendar/gui/e-memo-table.c:455
-#: ../src/calendar/gui/e-task-table.c:782
+#: ../src/calendar/gui/e-memo-table.c:535
+#: ../src/calendar/gui/e-task-table.c:700
 msgid "* No Summary *"
 msgstr "* Bez sažetka *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../src/calendar/gui/e-memo-table.c:540
-#: ../src/calendar/gui/e-task-table.c:864
+#: ../src/calendar/gui/e-memo-table.c:622
+#: ../src/calendar/gui/e-task-table.c:801
 msgid "Start: "
 msgstr "Početak: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../src/calendar/gui/e-memo-table.c:560
-#: ../src/calendar/gui/e-task-table.c:883
+#: ../src/calendar/gui/e-memo-table.c:642
+#: ../src/calendar/gui/e-task-table.c:834
 msgid "Due: "
 msgstr "Rok: "
 
-#: ../src/calendar/gui/e-memo-table.c:745
+#: ../src/calendar/gui/e-memo-table.c:850
 msgid "Cut selected memos to the clipboard"
 msgstr "Seče izabrane beleške u spisak isečaka"
 
-#: ../src/calendar/gui/e-memo-table.c:751
+#: ../src/calendar/gui/e-memo-table.c:856
 msgid "Copy selected memos to the clipboard"
 msgstr "Kopira izabrane beleške u spisak isečaka"
 
-#: ../src/calendar/gui/e-memo-table.c:757
+#: ../src/calendar/gui/e-memo-table.c:862
 msgid "Paste memos from the clipboard"
 msgstr "Ubacuje beleške iz spiska isečaka"
 
-#: ../src/calendar/gui/e-memo-table.c:763
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:558
+#: ../src/calendar/gui/e-memo-table.c:868
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:572
 msgid "Delete selected memos"
 msgstr "Briše izabrane beleške"
 
-#: ../src/calendar/gui/e-memo-table.c:769
+#: ../src/calendar/gui/e-memo-table.c:874
 msgid "Select all visible memos"
 msgstr "Bira sve vidljive beleške"
 
@@ -8811,7 +9130,7 @@ msgstr "Bira sve vidljive beleške"
 msgid "Click to add a memo"
 msgstr "Kliknite da dodate belešku"
 
-#: ../src/calendar/gui/e-task-table.c:552
+#: ../src/calendar/gui/e-task-table.c:474
 #: ../src/calendar/gui/tasktypes.xml.in.h:22
 #: ../src/e-util/e-send-options.ui.h:1
 msgid "Undefined"
@@ -8825,29 +9144,29 @@ msgstr "Neodređen"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../src/calendar/gui/e-task-table.c:580
+#: ../src/calendar/gui/e-task-table.c:502
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../src/calendar/gui/e-task-table.c:1096
+#: ../src/calendar/gui/e-task-table.c:1072
 msgid "Cut selected tasks to the clipboard"
 msgstr "Seče izabrane zadatke u spisak isečaka"
 
-#: ../src/calendar/gui/e-task-table.c:1102
+#: ../src/calendar/gui/e-task-table.c:1078
 msgid "Copy selected tasks to the clipboard"
 msgstr "Kopira izabrane zadatke u spisak isečaka"
 
-#: ../src/calendar/gui/e-task-table.c:1108
+#: ../src/calendar/gui/e-task-table.c:1084
 msgid "Paste tasks from the clipboard"
 msgstr "Ubacuje zadatke iz spiska isečaka"
 
-#: ../src/calendar/gui/e-task-table.c:1114
-#: ../src/modules/calendar/e-task-shell-view-actions.c:684
+#: ../src/calendar/gui/e-task-table.c:1090
+#: ../src/modules/calendar/e-task-shell-view-actions.c:698
 msgid "Delete selected tasks"
 msgstr "Briše izabrane zadatke"
 
-#: ../src/calendar/gui/e-task-table.c:1120
+#: ../src/calendar/gui/e-task-table.c:1096
 msgid "Select all visible tasks"
 msgstr "Bira sve vidljive zadatke"
 
@@ -8864,7 +9183,7 @@ msgid "Completion date"
 msgstr "Datum završetka"
 
 #: ../src/calendar/gui/e-task-table.etspec.h:6
-#: ../src/mail/mail-send-recv.c:1088
+#: ../src/mail/mail-send-recv.c:1148
 msgid "Complete"
 msgstr "Završeno"
 
@@ -8879,129 +9198,150 @@ msgstr "% je završeno"
 
 #: ../src/calendar/gui/e-task-table.etspec.h:10
 #: ../src/calendar/gui/tasktypes.xml.in.h:18
-#: ../src/plugins/save-calendar/csv-format.c:384
+#: ../src/plugins/save-calendar/csv-format.c:373
 msgid "Priority"
 msgstr "Važnost"
 
-#: ../src/calendar/gui/e-timezone-entry.c:333
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# When "None" is selected we want the field to be cleared.
+# Note that we don't show this here, since by default a 'None' date
+# is not permitted.
+#. Translators: 'None' for a time zone, like 'No time zone being set'
+#: ../src/calendar/gui/e-timezone-entry.c:92
+#: ../src/e-util/e-timezone-dialog.c:55
+msgctxt "timezone"
+msgid "None"
+msgstr "Nije izabrana"
+
+#: ../src/calendar/gui/e-timezone-entry.c:357
 msgid "Select Timezone"
 msgstr "Izaberi vremensku zonu"
 
 #. Translators: It will display "Start: StartDateAndTime"
-#: ../src/calendar/gui/e-to-do-pane.c:370
+#: ../src/calendar/gui/e-to-do-pane.c:406
 #, c-format
 msgid "Start: %s"
 msgstr "Početak: %s"
 
 #. Translators: It will display "Due: DueDateAndTime"
-#: ../src/calendar/gui/e-to-do-pane.c:390
+#: ../src/calendar/gui/e-to-do-pane.c:428
 #, c-format
 msgid "Due: %s"
 msgstr "Rok: %s"
 
 #. Translators: It will display "Completed: DateAndTimeWhenCompleted"
-#: ../src/calendar/gui/e-to-do-pane.c:404
+#: ../src/calendar/gui/e-to-do-pane.c:442
 #, 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:1429 ../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/calendar/gui/e-to-do-pane.c:1576 ../src/e-util/e-cell-date-edit.c:328
+#: ../src/e-util/e-datetime-format.c:207
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1821
 #: ../src/modules/itip-formatter/itip-view.c:254
 msgid "Today"
 msgstr "Danas"
 
 #. strftime format of a weekday and a date.
-#: ../src/calendar/gui/e-to-do-pane.c:1431
-#: ../src/e-util/e-datetime-format.c:217
+#: ../src/calendar/gui/e-to-do-pane.c:1578
+#: ../src/e-util/e-datetime-format.c:218
 #: ../src/modules/itip-formatter/itip-view.c:282
 msgid "Tomorrow"
 msgstr "Sutra"
 
-#: ../src/calendar/gui/e-to-do-pane.c:1441
+#: ../src/calendar/gui/e-to-do-pane.c:1588
 msgid "Tasks without Due date"
 msgstr "Zadaci bez roka"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2014
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1449
-msgid "New _Appointment..."
-msgstr "Novo _zakazivanje..."
+#: ../src/calendar/gui/e-to-do-pane.c:2165
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1424
+msgid "New _Appointment…"
+msgstr "Novo _sastanak…"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2022
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1435
-msgid "New _Meeting..."
-msgstr "Novi _sastanak..."
+#: ../src/calendar/gui/e-to-do-pane.c:2173
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1410
+msgid "New _Meeting…"
+msgstr "Novi _sastanak…"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2030
-msgid "New _Task..."
-msgstr "Novi zad_atak..."
+#: ../src/calendar/gui/e-to-do-pane.c:2181
+msgid "New _Task…"
+msgstr "Novi z_adatak…"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2038
-msgid "_New Assigned Task..."
-msgstr "Dodeljen_i zadatak..."
+#: ../src/calendar/gui/e-to-do-pane.c:2189
+msgid "_New Assigned Task…"
+msgstr "Novi dodeljen_i zadatak…"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2051
-msgid "_Open..."
-msgstr "_Otvori..."
+#: ../src/calendar/gui/e-to-do-pane.c:2202
+msgid "_Open…"
+msgstr "_Otvori…"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2065
-msgid "_Delete This Instance..."
-msgstr "Obriši ovu _pojavu..."
+#: ../src/calendar/gui/e-to-do-pane.c:2216
+msgid "_Delete This Instance…"
+msgstr "Obriši ovu _pojavu…"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2073
-msgid "D_elete All Instances..."
-msgstr "Obriši sve _unose..."
+#: ../src/calendar/gui/e-to-do-pane.c:2224
+msgid "D_elete All Instances…"
+msgstr "Obriši sve p_ojave…"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2081
-msgid "_Delete..."
-msgstr "_Obriši..."
+#: ../src/calendar/gui/e-to-do-pane.c:2232
+msgid "_Delete…"
+msgstr "_Obriši…"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2098
+#: ../src/calendar/gui/e-to-do-pane.c:2249
 msgid "_Show Tasks without Due date"
 msgstr "_Prikaži zadatke bez roka"
 
-#: ../src/calendar/gui/e-to-do-pane.c:2364
+#: ../src/calendar/gui/e-to-do-pane.c:2515
 msgid "To Do"
 msgstr "Za uradi_ti"
 
+#. Translators: the first '%s' is replaced with a component summary;
+#. the second '%s' is replaced with an event location.
+#. Example: "Meet John Doe (Central Park)"
+#: ../src/calendar/gui/e-week-view.c:3705
+#, c-format
+msgctxt "SummaryWithLocation"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 # 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:2088
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../src/calendar/gui/itip-utils.c:785 ../src/calendar/gui/itip-utils.c:847
-#: ../src/calendar/gui/itip-utils.c:981
+#: ../src/calendar/gui/itip-utils.c:795 ../src/calendar/gui/itip-utils.c:861
+#: ../src/calendar/gui/itip-utils.c:1010
 msgid "An organizer must be set."
 msgstr "Organizator mora biti određen."
 
-#: ../src/calendar/gui/itip-utils.c:838
+#: ../src/calendar/gui/itip-utils.c:851
 msgid "At least one attendee is necessary"
 msgstr "Najmanje jedan učesnik je neophodan"
 
-#: ../src/calendar/gui/itip-utils.c:1069 ../src/calendar/gui/itip-utils.c:1230
+#: ../src/calendar/gui/itip-utils.c:1108 ../src/calendar/gui/itip-utils.c:1274
 msgid "Event information"
 msgstr "Podaci o događaju"
 
-#: ../src/calendar/gui/itip-utils.c:1072 ../src/calendar/gui/itip-utils.c:1233
+#: ../src/calendar/gui/itip-utils.c:1111 ../src/calendar/gui/itip-utils.c:1277
 msgid "Task information"
 msgstr "Podaci o zadatku"
 
-#: ../src/calendar/gui/itip-utils.c:1075 ../src/calendar/gui/itip-utils.c:1236
+#: ../src/calendar/gui/itip-utils.c:1114 ../src/calendar/gui/itip-utils.c:1280
 msgid "Memo information"
 msgstr "Podaci o belešci"
 
-#: ../src/calendar/gui/itip-utils.c:1078 ../src/calendar/gui/itip-utils.c:1254
+#: ../src/calendar/gui/itip-utils.c:1117 ../src/calendar/gui/itip-utils.c:1298
 msgid "Free/Busy information"
 msgstr "Podaci slobodno/zauzeto"
 
-#: ../src/calendar/gui/itip-utils.c:1081
+#: ../src/calendar/gui/itip-utils.c:1120
 msgid "Calendar information"
 msgstr "Podaci o kalendaru"
 
@@ -9009,7 +9349,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:1118
+#: ../src/calendar/gui/itip-utils.c:1160
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Prihvaćeno"
@@ -9018,10 +9358,10 @@ 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:1125
+#: ../src/calendar/gui/itip-utils.c:1167
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
-msgstr "Prihvaćeno s rezervom"
+msgstr "Prihvaćeno, ali upitno"
 
 #. Translators: This is part of the subject
 #. * line of a meeting request or update email.
@@ -9030,7 +9370,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:1132 ../src/calendar/gui/itip-utils.c:1180
+#: ../src/calendar/gui/itip-utils.c:1174 ../src/calendar/gui/itip-utils.c:1222
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Odbijeno"
@@ -9039,7 +9379,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:1139
+#: ../src/calendar/gui/itip-utils.c:1181
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegirano"
@@ -9047,7 +9387,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:1152
+#: ../src/calendar/gui/itip-utils.c:1194
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Osveženo"
@@ -9055,7 +9395,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:1159
+#: ../src/calendar/gui/itip-utils.c:1201
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Otkaži"
@@ -9063,7 +9403,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:1166
+#: ../src/calendar/gui/itip-utils.c:1208
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Osveži"
@@ -9071,160 +9411,207 @@ 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:1173
+#: ../src/calendar/gui/itip-utils.c:1215
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Protiv-predlog"
 
-#: ../src/calendar/gui/itip-utils.c:1251
+#: ../src/calendar/gui/itip-utils.c:1295
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Podaci slobodno/zauzeto (%s do %s)"
 
-#: ../src/calendar/gui/itip-utils.c:1259
+#: ../src/calendar/gui/itip-utils.c:1303
 msgid "iCalendar information"
 msgstr "Podaci iKalendara"
 
-#: ../src/calendar/gui/itip-utils.c:1288
+#: ../src/calendar/gui/itip-utils.c:1332
 #, 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:1293
+#: ../src/calendar/gui/itip-utils.c:1337
 msgid "Unable to book a resource, error: "
 msgstr "Ne mogu da sačuvam unos, greška: "
 
-#: ../src/calendar/gui/itip-utils.c:1464
+#: ../src/calendar/gui/itip-utils.c:1530
 msgid "You must be an attendee of the event."
 msgstr "Morate biti učesnik događaja."
 
-#: ../src/calendar/gui/itip-utils.c:2209
+#: ../src/calendar/gui/itip-utils.c:2311
 msgid "Sending an event"
 msgstr "Šaljem događaj"
 
-#: ../src/calendar/gui/itip-utils.c:2213
+#: ../src/calendar/gui/itip-utils.c:2315
 msgid "Sending a memo"
 msgstr "Šaljem belešku"
 
-#: ../src/calendar/gui/itip-utils.c:2217
-msgid "Sending a task"
-msgstr "Šaljem zadatak"
+#: ../src/calendar/gui/itip-utils.c:2319
+msgid "Sending a task"
+msgstr "Šaljem zadatak"
+
+#. Translator: This is used as a placeholder when an event doesn't have set a location
+#: ../src/calendar/gui/itip-utils.c:2571
+msgctxt "Location"
+msgid "Unspecified"
+msgstr "Nije određena"
+
+#: ../src/calendar/gui/misc.c:95
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d dan"
+msgstr[1] "%d dana"
+msgstr[2] "%d dana"
+msgstr[3] "%d dan"
+
+#: ../src/calendar/gui/misc.c:101
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d sat"
+msgstr[1] "%d sata"
+msgstr[2] "%d sati"
+msgstr[3] "Jedan sat"
+
+#: ../src/calendar/gui/misc.c:107
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minut"
+msgstr[1] "%d minuta"
+msgstr[2] "%d minuta"
+msgstr[3] "Jedan minut"
+
+#. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
+#: ../src/calendar/gui/misc.c:111
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d sekunda"
+msgstr[1] "%d sekunde"
+msgstr[2] "%d sekundi"
+msgstr[3] "Jedna sekunda"
 
 #. G_DATE_BAD_WEEKDAY
 #. Translators: These are workday abbreviations,
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_MONDAY
-#: ../src/calendar/gui/print.c:721
+#: ../src/calendar/gui/print.c:730
 msgid "Mo"
 msgstr "Po"
 
 #. G_DATE_TUESDAY
-#: ../src/calendar/gui/print.c:722
+#: ../src/calendar/gui/print.c:731
 msgid "Tu"
 msgstr "Ut"
 
 #. G_DATE_WEDNESDAY
-#: ../src/calendar/gui/print.c:723
+#: ../src/calendar/gui/print.c:732
 msgid "We"
 msgstr "Sr"
 
 #. G_DATE_THURSDAY
-#: ../src/calendar/gui/print.c:724
+#: ../src/calendar/gui/print.c:733
 msgid "Th"
 msgstr "Če"
 
 #. G_DATE_FRIDAY
-#: ../src/calendar/gui/print.c:725
+#: ../src/calendar/gui/print.c:734
 msgid "Fr"
 msgstr "Pe"
 
 #. G_DATE_SATURDAY
-#: ../src/calendar/gui/print.c:726
+#: ../src/calendar/gui/print.c:735
 msgid "Sa"
 msgstr "Su"
 
 #. G_DATE_SUNDAY
-#: ../src/calendar/gui/print.c:727
+#: ../src/calendar/gui/print.c:736
 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:3346
 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:3356
 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:3362
 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:3372
 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:3379
 msgid "Due "
 msgstr "Rok "
 
-#: ../src/calendar/gui/print.c:3490
+#: ../src/calendar/gui/print.c:3524
 msgid "Appointment"
-msgstr "Zakazivanje"
+msgstr "Sastanak"
 
-#: ../src/calendar/gui/print.c:3492 ../src/e-util/e-send-options.c:551
+#: ../src/calendar/gui/print.c:3526 ../src/e-util/e-send-options.c:551
 msgid "Task"
 msgstr "Zadatak"
 
-#: ../src/calendar/gui/print.c:3494
+#: ../src/calendar/gui/print.c:3528
 msgid "Memo"
 msgstr "Beleška"
 
-#: ../src/calendar/gui/print.c:3550
+#: ../src/calendar/gui/print.c:3585
 msgid "Attendees: "
 msgstr "Prisutni: "
 
-#: ../src/calendar/gui/print.c:3594
+#: ../src/calendar/gui/print.c:3614
 #, c-format
 msgid "Status: %s"
 msgstr "Stanje: %s"
 
-#: ../src/calendar/gui/print.c:3610
+#: ../src/calendar/gui/print.c:3630
 #, c-format
 msgid "Priority: %s"
 msgstr "Važnost: %s"
 
-#: ../src/calendar/gui/print.c:3628
+#: ../src/calendar/gui/print.c:3645
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Postotak završenog: %i"
 
-#: ../src/calendar/gui/print.c:3642
+#: ../src/calendar/gui/print.c:3660
 #, c-format
 msgid "URL: %s"
 msgstr "Adresa: %s"
 
-#: ../src/calendar/gui/print.c:3656
+#: ../src/calendar/gui/print.c:3676
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
-#: ../src/calendar/gui/print.c:3667
+#: ../src/calendar/gui/print.c:3688
 msgid "Contacts: "
 msgstr "Kontakti: "
 
+#: ../src/calendar/gui/tasktypes.xml.in.h:11
+msgid "Not Started"
+msgstr "Nije započet"
+
 #: ../src/calendar/gui/tasktypes.xml.in.h:12
 msgid "In progress"
 msgstr "U toku"
@@ -9248,210 +9635,211 @@ msgstr "je manje od"
 
 #: ../src/calendar/importers/icalendar-importer.c:76
 msgid "Appointments and Meetings"
-msgstr "Zakazivanje i sastanci"
+msgstr "Sastanci i skupovi"
 
-#: ../src/calendar/importers/icalendar-importer.c:306
+#: ../src/calendar/importers/icalendar-importer.c:327
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:480
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:76
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:280
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:178
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:88
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:267
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:180
 msgid "New Calendar"
 msgstr "Novi kalendar"
 
-#: ../src/calendar/importers/icalendar-importer.c:309
+#: ../src/calendar/importers/icalendar-importer.c:330
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:488
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:288
-#: ../src/modules/calendar/e-task-shell-view-actions.c:202
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:275
+#: ../src/modules/calendar/e-task-shell-view-actions.c:204
 msgid "New Task List"
 msgstr "Novi spisak zadataka"
 
-#: ../src/calendar/importers/icalendar-importer.c:351
+#: ../src/calendar/importers/icalendar-importer.c:372
 msgid "Cre_ate new calendar"
 msgstr "Napravi _novi kalendar"
 
-#: ../src/calendar/importers/icalendar-importer.c:355
+#: ../src/calendar/importers/icalendar-importer.c:376
 msgid "Cre_ate new task list"
 msgstr "_Napravi novi spisak zadataka"
 
-#: ../src/calendar/importers/icalendar-importer.c:501
-#: ../src/calendar/importers/icalendar-importer.c:940
+#: ../src/calendar/importers/icalendar-importer.c:521
+#: ../src/calendar/importers/icalendar-importer.c:971
 msgid "Opening calendar"
 msgstr "Otvaranje kalendara"
 
-#: ../src/calendar/importers/icalendar-importer.c:648
+#: ../src/calendar/importers/icalendar-importer.c:668
 msgid "iCalendar files (.ics)"
 msgstr "Datoteke iKalendara (.ics)"
 
-#: ../src/calendar/importers/icalendar-importer.c:649
+#: ../src/calendar/importers/icalendar-importer.c:669
 msgid "Evolution iCalendar importer"
 msgstr "Uvoznik iKalendara Evolucije"
 
-#: ../src/calendar/importers/icalendar-importer.c:741
+#: ../src/calendar/importers/icalendar-importer.c:764
 msgid "Reminder!"
 msgstr "Podsetnik!"
 
-#: ../src/calendar/importers/icalendar-importer.c:826
+#: ../src/calendar/importers/icalendar-importer.c:859
 msgid "vCalendar files (.vcs)"
 msgstr "Datoteke vKalendara (.vcs)"
 
-#: ../src/calendar/importers/icalendar-importer.c:827
+#: ../src/calendar/importers/icalendar-importer.c:860
 msgid "Evolution vCalendar importer"
 msgstr "Uvoznik vKalendara Evolucije"
 
-#: ../src/calendar/importers/icalendar-importer.c:1103
+#: ../src/calendar/importers/icalendar-importer.c:1134
 msgid "Calendar Events"
 msgstr "Događaji kalendara"
 
-#: ../src/calendar/importers/icalendar-importer.c:1146
+#: ../src/calendar/importers/icalendar-importer.c:1177
 msgid "GNOME Calendar"
 msgstr "Gnomov kalendar"
 
-#: ../src/calendar/importers/icalendar-importer.c:1147
+#: ../src/calendar/importers/icalendar-importer.c:1178
 msgid "Evolution Calendar intelligent importer"
 msgstr "Inteligentni uvoznik kalendara Evolucije"
 
-#: ../src/calendar/importers/icalendar-importer.c:1218
-#: ../src/calendar/importers/icalendar-importer.c:1532
+#: ../src/calendar/importers/icalendar-importer.c:1254
+#: ../src/calendar/importers/icalendar-importer.c:1582
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Sastanak"
 
-#: ../src/calendar/importers/icalendar-importer.c:1218
-#: ../src/calendar/importers/icalendar-importer.c:1532
+#: ../src/calendar/importers/icalendar-importer.c:1254
+#: ../src/calendar/importers/icalendar-importer.c:1582
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Događaj"
 
-#: ../src/calendar/importers/icalendar-importer.c:1221
-#: ../src/calendar/importers/icalendar-importer.c:1533
+#: ../src/calendar/importers/icalendar-importer.c:1257
+#: ../src/calendar/importers/icalendar-importer.c:1583
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Zadatak"
 
-#: ../src/calendar/importers/icalendar-importer.c:1224
-#: ../src/calendar/importers/icalendar-importer.c:1534
+#: ../src/calendar/importers/icalendar-importer.c:1260
+#: ../src/calendar/importers/icalendar-importer.c:1584
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Beleška"
 
-#: ../src/calendar/importers/icalendar-importer.c:1233
+#. have ? NULL :
+#: ../src/calendar/importers/icalendar-importer.c:1269
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "ima ponavljanja"
 
-#: ../src/calendar/importers/icalendar-importer.c:1238
+#: ../src/calendar/importers/icalendar-importer.c:1274
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "je primerak"
 
-#: ../src/calendar/importers/icalendar-importer.c:1243
+#: ../src/calendar/importers/icalendar-importer.c:1279
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "ima podsetnike"
 
-#: ../src/calendar/importers/icalendar-importer.c:1248
+#: ../src/calendar/importers/icalendar-importer.c:1284
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "ima priloge"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1261
+#: ../src/calendar/importers/icalendar-importer.c:1296
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Javno"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1264
+#: ../src/calendar/importers/icalendar-importer.c:1299
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Lično"
 
 #. Translators: Appointment's classification
-#: ../src/calendar/importers/icalendar-importer.c:1267
+#: ../src/calendar/importers/icalendar-importer.c:1302
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Poverljivo"
 
 #. Translators: Appointment's classification section name
-#: ../src/calendar/importers/icalendar-importer.c:1271
+#: ../src/calendar/importers/icalendar-importer.c:1306
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Razvrstavanje"
 
 #. Translators: Appointment's summary
 #. Translators: Column header for a component summary
-#: ../src/calendar/importers/icalendar-importer.c:1276
-#: ../src/calendar/importers/icalendar-importer.c:1576
+#: ../src/calendar/importers/icalendar-importer.c:1311
+#: ../src/calendar/importers/icalendar-importer.c:1627
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Sažetak"
 
 #. Translators: Appointment's location
-#: ../src/calendar/importers/icalendar-importer.c:1282
+#: ../src/calendar/importers/icalendar-importer.c:1318
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Mesto"
 
 #. Translators: Appointment's start time
 #. Translators: Column header for a component start date/time
-#: ../src/calendar/importers/icalendar-importer.c:1290
-#: ../src/calendar/importers/icalendar-importer.c:1571
+#: ../src/calendar/importers/icalendar-importer.c:1326
+#: ../src/calendar/importers/icalendar-importer.c:1622
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Početak"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../src/calendar/importers/icalendar-importer.c:1301
+#: ../src/calendar/importers/icalendar-importer.c:1336
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Rok"
 
 #. Translators: Appointment's end time
-#: ../src/calendar/importers/icalendar-importer.c:1313
+#: ../src/calendar/importers/icalendar-importer.c:1347
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Kraj"
 
 #. Translators: Appointment's categories
-#: ../src/calendar/importers/icalendar-importer.c:1323
+#: ../src/calendar/importers/icalendar-importer.c:1356
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Kategorije"
 
 # timezone.
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../src/calendar/importers/icalendar-importer.c:1347
+#: ../src/calendar/importers/icalendar-importer.c:1381
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Završeno"
 
 #. Translators: Appointment's URL
-#: ../src/calendar/importers/icalendar-importer.c:1355
+#: ../src/calendar/importers/icalendar-importer.c:1388
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "Adresa"
 
 #. Translators: Appointment's organizer
-#: ../src/calendar/importers/icalendar-importer.c:1366
-#: ../src/calendar/importers/icalendar-importer.c:1369
+#: ../src/calendar/importers/icalendar-importer.c:1405
+#: ../src/calendar/importers/icalendar-importer.c:1408
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organizator"
 
 #. Translators: Appointment's attendees
-#: ../src/calendar/importers/icalendar-importer.c:1389
-#: ../src/calendar/importers/icalendar-importer.c:1392
+#: ../src/calendar/importers/icalendar-importer.c:1437
+#: ../src/calendar/importers/icalendar-importer.c:1440
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Učesnici"
 
-#: ../src/calendar/importers/icalendar-importer.c:1406
+#: ../src/calendar/importers/icalendar-importer.c:1456
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Opis"
 
 #. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../src/calendar/importers/icalendar-importer.c:1566
+#: ../src/calendar/importers/icalendar-importer.c:1617
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Vrsta"
@@ -11005,145 +11393,145 @@ msgstr "Pacifik/Volis"
 msgid "Pacific/Yap"
 msgstr "Pacifik/Jap"
 
-#: ../src/composer/e-composer-actions.c:227
-msgid "Save as..."
-msgstr "Sačuvaj kao..."
+#: ../src/composer/e-composer-actions.c:226
+msgid "Save as…"
+msgstr "Sačuvaj kao…"
 
-#: ../src/composer/e-composer-actions.c:331
+#: ../src/composer/e-composer-actions.c:321
 msgid "Close the current file"
 msgstr "Zatvorite trenutnu datoteku"
 
-#: ../src/composer/e-composer-actions.c:336
+#: ../src/composer/e-composer-actions.c:326
 msgid "New _Message"
 msgstr "Nova _poruka"
 
-#: ../src/composer/e-composer-actions.c:338
+#: ../src/composer/e-composer-actions.c:328
 msgid "Open New Message window"
 msgstr "Otvara prozor za novu poruku"
 
-#: ../src/composer/e-composer-actions.c:343 ../src/shell/e-shell.c:1302
-#: ../src/shell/e-shell-window-actions.c:887
+#: ../src/composer/e-composer-actions.c:333 ../src/shell/e-shell.c:1469
+#: ../src/shell/e-shell-window-actions.c:912
 msgid "_Preferences"
 msgstr "_Postavke"
 
-#: ../src/composer/e-composer-actions.c:345
-#: ../src/shell/e-shell-window-actions.c:889
+#: ../src/composer/e-composer-actions.c:335
+#: ../src/shell/e-shell-window-actions.c:914
 msgid "Configure Evolution"
 msgstr "Podesi Evoluciju"
 
-#: ../src/composer/e-composer-actions.c:352
+#: ../src/composer/e-composer-actions.c:342
 msgid "Save the current file"
 msgstr "Sačuvajte trenutnu datoteku"
 
-#: ../src/composer/e-composer-actions.c:357
-msgid "Save _As..."
-msgstr "Sačuvaj _kao..."
+#: ../src/composer/e-composer-actions.c:347
+msgid "Save _As…"
+msgstr "Sačuvaj _kao…"
 
-#: ../src/composer/e-composer-actions.c:359
+#: ../src/composer/e-composer-actions.c:349
 msgid "Save the current file with a different name"
 msgstr "Sačuvajte trenutnu datoteku pod drugim imenom"
 
-#: ../src/composer/e-composer-actions.c:366
+#: ../src/composer/e-composer-actions.c:356
 msgid "Character _Encoding"
 msgstr "Ko_dna strana"
 
-#: ../src/composer/e-composer-actions.c:390
+#: ../src/composer/e-composer-actions.c:380
 msgid "Print Pre_view"
 msgstr "Pregled pred _štampu"
 
-#: ../src/composer/e-composer-actions.c:397
+#: ../src/composer/e-composer-actions.c:387
 msgid "Save as _Draft"
 msgstr "Sačuvaj kao _nacrt"
 
-#: ../src/composer/e-composer-actions.c:399
+#: ../src/composer/e-composer-actions.c:389
 msgid "Save as draft"
 msgstr "Sačuvajte kao nacrt"
 
-#: ../src/composer/e-composer-actions.c:404
+#: ../src/composer/e-composer-actions.c:394
 msgid "S_end"
 msgstr "Poš_alji"
 
-#: ../src/composer/e-composer-actions.c:406
+#: ../src/composer/e-composer-actions.c:396
 msgid "Send this message"
 msgstr "Pošaljite ovu poruku"
 
-#: ../src/composer/e-composer-actions.c:414
+#: ../src/composer/e-composer-actions.c:404
 msgid "PGP _Encrypt"
 msgstr "PGP _šifruj"
 
-#: ../src/composer/e-composer-actions.c:416
+#: ../src/composer/e-composer-actions.c:406
 msgid "Encrypt this message with PGP"
 msgstr "Šifrujte ovu poruku pomoću PGP-a"
 
-#: ../src/composer/e-composer-actions.c:422
+#: ../src/composer/e-composer-actions.c:412
 msgid "PGP _Sign"
 msgstr "PGP _potpiši"
 
-#: ../src/composer/e-composer-actions.c:424
+#: ../src/composer/e-composer-actions.c:414
 msgid "Sign this message with your PGP key"
 msgstr "Potpišite ovu poruku pomoću PGP ključa"
 
-#: ../src/composer/e-composer-actions.c:430
+#: ../src/composer/e-composer-actions.c:420
 msgid "_Picture Gallery"
 msgstr "Galerija _slika"
 
-#: ../src/composer/e-composer-actions.c:432
+#: ../src/composer/e-composer-actions.c:422
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Prikazuje zbirku slika koje možete da prevučete u vašu poruku"
 
-#: ../src/composer/e-composer-actions.c:438
+#: ../src/composer/e-composer-actions.c:428
 msgid "_Prioritize Message"
 msgstr "V_ažnost poruke"
 
-#: ../src/composer/e-composer-actions.c:440
+#: ../src/composer/e-composer-actions.c:430
 msgid "Set the message priority to high"
 msgstr "Postavlja važnost poruke na visoko"
 
-#: ../src/composer/e-composer-actions.c:446
+#: ../src/composer/e-composer-actions.c:436
 msgid "Re_quest Read Receipt"
 msgstr "T_raži povratnicu"
 
-#: ../src/composer/e-composer-actions.c:448
+#: ../src/composer/e-composer-actions.c:438
 msgid "Get delivery notification when your message is read"
 msgstr "Prima izveštaj o dostavi kada je poruka pročitana"
 
-#: ../src/composer/e-composer-actions.c:454
+#: ../src/composer/e-composer-actions.c:444
 msgid "S/MIME En_crypt"
 msgstr "S/MIME _šifruj"
 
-#: ../src/composer/e-composer-actions.c:456
+#: ../src/composer/e-composer-actions.c:446
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Šifruje ovu poruku pomoću S/MIME uverenja za šifrovanje"
 
-#: ../src/composer/e-composer-actions.c:462
+#: ../src/composer/e-composer-actions.c:452
 msgid "S/MIME Sig_n"
 msgstr "S/MIME _potpiši"
 
-#: ../src/composer/e-composer-actions.c:464
+#: ../src/composer/e-composer-actions.c:454
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Potpisuje ovu poruku S/MIME uverenjem"
 
-#: ../src/composer/e-composer-actions.c:518
+#: ../src/composer/e-composer-actions.c:508
 msgid "_Bcc Field"
-msgstr "_Bcc polje"
+msgstr "Polje _Slepa kopija"
 
-#: ../src/composer/e-composer-actions.c:520
+#: ../src/composer/e-composer-actions.c:510
 msgid "Toggles whether the BCC field is displayed"
-msgstr "Bira da li je polje Bcc prikazano"
+msgstr "Određuje da li je polje za Slepu kopiju prikazano"
 
-#: ../src/composer/e-composer-actions.c:526
+#: ../src/composer/e-composer-actions.c:516
 msgid "_Cc Field"
-msgstr "_Cc polje"
+msgstr "Polje _Kopija"
 
-#: ../src/composer/e-composer-actions.c:528
+#: ../src/composer/e-composer-actions.c:518
 msgid "Toggles whether the CC field is displayed"
-msgstr "Bira da li je polje CC prikazano"
+msgstr "Određuje da li je polje za Kopiju prikazano"
 
-#: ../src/composer/e-composer-actions.c:534
+#: ../src/composer/e-composer-actions.c:524
 msgid "_From Override Field"
 msgstr "Prikaži polje _Šalje kao ime"
 
-#: ../src/composer/e-composer-actions.c:536
+#: ../src/composer/e-composer-actions.c:526
 msgid ""
 "Toggles whether the From override field to change name or email address is "
 "displayed"
@@ -11151,32 +11539,32 @@ msgstr ""
 "Određuje da li se prikazuje ime osobe ili adrese elektronske pošte u polju "
 "„Šalje“"
 
-#: ../src/composer/e-composer-actions.c:542
+#: ../src/composer/e-composer-actions.c:532
 msgid "_Reply-To Field"
-msgstr "Polje Odgo_vor-za"
+msgstr "Polje Odgo_vori na"
 
-#: ../src/composer/e-composer-actions.c:544
+#: ../src/composer/e-composer-actions.c:534
 msgid "Toggles whether the Reply-To field is displayed"
-msgstr "Bira da li je polje Odgovor-za prikazano"
+msgstr "Određuje da li je polje Odgovori na prikazano"
 
-#: ../src/composer/e-composer-actions.c:550
+#: ../src/composer/e-composer-actions.c:540
 msgid "Visually _Wrap Long Lines"
 msgstr "Vidno p_relomi dugačke linije"
 
-#: ../src/composer/e-composer-actions.c:607
+#: ../src/composer/e-composer-actions.c:597
 msgid "Attach"
 msgstr "Priloži"
 
-#: ../src/composer/e-composer-actions.c:613
+#: ../src/composer/e-composer-actions.c:603
 msgid "Save Draft"
 msgstr "Sačuvaj nacrt"
 
 #: ../src/composer/e-composer-from-header.c:108
-#: ../src/e-util/e-collection-account-wizard.c:1728
+#: ../src/e-util/e-collection-account-wizard.c:2003
 #: ../src/e-util/e-mail-signature-script-dialog.c:416
-#: ../src/e-util/e-webdav-browser.c:2408
+#: ../src/e-util/e-webdav-browser.c:2417
 #: ../src/e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../src/mail/e-mail-config-identity-page.c:550
+#: ../src/mail/e-mail-config-identity-page.c:551
 #: ../src/mail/e-mail-config-summary-page.c:332
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:297
 msgid "_Name:"
@@ -11188,7 +11576,7 @@ msgstr "Unesite primaoce poruke"
 
 #: ../src/composer/e-composer-header-table.c:38
 msgid "Enter the addresses that will receive a carbon copy of the message"
-msgstr "Unesite adrese koje će primiti grafitnu kopiju (CC) poruke"
+msgstr "Unesite adrese koje će primiti Kopiju poruke"
 
 #: ../src/composer/e-composer-header-table.c:41
 msgid ""
@@ -11208,7 +11596,7 @@ msgstr "Š_alje:"
 # * expects the reply_to fields to be initialized.
 #: ../src/composer/e-composer-header-table.c:847
 msgid "_Reply-To:"
-msgstr "_Odgovor prima:"
+msgstr "_Odgovori na:"
 
 #: ../src/composer/e-composer-header-table.c:852
 msgid "_To:"
@@ -11216,11 +11604,11 @@ msgstr "_Prima:"
 
 #: ../src/composer/e-composer-header-table.c:858
 msgid "_Cc:"
-msgstr "_Cc:"
+msgstr "_Kopija:"
 
 #: ../src/composer/e-composer-header-table.c:864
 msgid "_Bcc:"
-msgstr "_Bcc:"
+msgstr "_Slepa kopija:"
 
 #: ../src/composer/e-composer-header-table.c:869
 msgid "_Post To:"
@@ -11231,7 +11619,7 @@ msgid "S_ubject:"
 msgstr "Na_slov:"
 
 #: ../src/composer/e-composer-header-table.c:883
-#: ../src/mail/e-mail-config-identity-page.c:743
+#: ../src/mail/e-mail-config-identity-page.c:744
 msgid "Si_gnature:"
 msgstr "Potp_is:"
 
@@ -11243,7 +11631,7 @@ msgstr "Kliknite ovde za imenik"
 msgid "Click here to select folders to post to"
 msgstr "Kliknite ovde da izaberete fascikle za slanje"
 
-#: ../src/composer/e-msg-composer.c:861
+#: ../src/composer/e-msg-composer.c:1003
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -11251,7 +11639,7 @@ msgstr ""
 "Nije moguće potpisivanje odlazeće poruke: nije postavljeno uverenje za "
 "potpisivanje za ovaj nalog"
 
-#: ../src/composer/e-msg-composer.c:870
+#: ../src/composer/e-msg-composer.c:1012
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -11260,11 +11648,11 @@ msgstr ""
 "Nije moguće šifrovanje odlazeće poruke: nije postavljeno uverenje za šifrovanje "
 "za ovaj nalog"
 
-#: ../src/composer/e-msg-composer.c:1639 ../src/composer/e-msg-composer.c:2311
+#: ../src/composer/e-msg-composer.c:1802 ../src/composer/e-msg-composer.c:2476
 msgid "Compose Message"
 msgstr "Sastavi poruku"
 
-#: ../src/composer/e-msg-composer.c:4696
+#: ../src/composer/e-msg-composer.c:5006
 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."
 
@@ -11407,7 +11795,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:32
-#: ../src/mail/mail.error.xml.h:177
+#: ../src/mail/mail.error.xml.h:178
 msgid "The reported error was “{0}”."
 msgstr "Prijavljena greška bejaše „{0}“."
 
@@ -11416,7 +11804,7 @@ msgid "_Save to Outbox"
 msgstr "Sačuvaj _u „Za slanje“"
 
 #: ../src/composer/mail-composer.error.xml.h:34
-#: ../src/e-util/e-collection-account-wizard.c:440
+#: ../src/e-util/e-collection-account-wizard.c:675
 msgid "_Try Again"
 msgstr "_Pokušaj opet"
 
@@ -11538,11 +11926,15 @@ msgstr "Nešto je pošlo naopako prilikom uređivanja poruke"
 msgid ""
 "A WebKitWebProcess crashed when editing the message. You can try again by "
 "closing the composer window and opening a new one. If the issue persists, "
-"please file a bug report in the GNOME bugzilla."
+"please file a bug report in GNOME Gitlab."
 msgstr ""
-"Veb proces VebKita se urušio prilikom uređivanja poruke. Možete pokišati "
-"ponovo tako što ćete zatvoriti prozor uređivača i otvoriti novi. Ako ni to "
-"ne pomaže, popunite izveštaj o grešci na Gnomovoj bubaždaji."
+"Veb proces VebKita se urušio prilikom uređivanja poruke. Možete ga ponovo "
+"pokrenuti tako što ćete zatvoriti prozor uređivača i otvoriti novi. Ako ni "
+"to ne pomaže, popunite izveštaj o grešci na Gnomovom Gitlabu."
+
+#: ../src/composer/mail-composer.error.xml.h:58
+msgid "An error occurred while creating message composer."
+msgstr "Došlo je do greške prilikom stvaranja uređivača poruke."
 
 #: ../src/em-format/e-mail-formatter-attachment.c:335
 msgid "Display as attachment"
@@ -11556,43 +11948,43 @@ msgstr "Zvučni uređaj"
 msgid "Play the attachment in embedded audio player"
 msgstr "Pusti prilog u ugrađenom programu"
 
-#: ../src/em-format/e-mail-formatter-headers.c:107
+#: ../src/em-format/e-mail-formatter-headers.c:108
 #: ../src/em-format/e-mail-part-headers.c:46
-#: ../src/mail/e-mail-tag-editor.c:203 ../src/mail/message-list.etspec.h:5
+#: ../src/mail/e-mail-tag-editor.c:196 ../src/mail/message-list.etspec.h:5
 #: ../src/modules/mail/em-mailer-prefs.c:60
 msgid "From"
 msgstr "Šalje"
 
-#: ../src/em-format/e-mail-formatter-headers.c:132
+#: ../src/em-format/e-mail-formatter-headers.c:133
 msgid "(no subject)"
 msgstr "(bez naslova)"
 
 #. Translators: This message suggests to the receipients
 #. * that the sender of the mail is different from the one
 #. * listed in From field.
-#: ../src/em-format/e-mail-formatter-headers.c:339
+#: ../src/em-format/e-mail-formatter-headers.c:344
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Poruku šalje „%s“ na ime „%s“"
 
-#: ../src/em-format/e-mail-formatter-image.c:178
+#: ../src/em-format/e-mail-formatter-image.c:158
 msgid "Regular Image"
 msgstr "Obična slika"
 
-#: ../src/em-format/e-mail-formatter-image.c:179
+#: ../src/em-format/e-mail-formatter-image.c:159
 msgid "Display part as an image"
 msgstr "Prikazuje delove kao sliku"
 
-#: ../src/em-format/e-mail-formatter-message-rfc822.c:249
+#: ../src/em-format/e-mail-formatter-message-rfc822.c:253
 msgid "RFC822 message"
 msgstr "RFC822 poruka"
 
-#: ../src/em-format/e-mail-formatter-message-rfc822.c:250
+#: ../src/em-format/e-mail-formatter-message-rfc822.c:254
 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/e-webdav-browser.c:2361
 #: ../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
@@ -11605,20 +11997,22 @@ msgstr "Naziv"
 msgid "Size"
 msgstr "Veličina"
 
-#: ../src/em-format/e-mail-formatter-quote-headers.c:178
+#: ../src/em-format/e-mail-formatter-quote-headers.c:181
 #: ../src/em-format/e-mail-part-headers.c:51
-#: ../src/mail/e-mail-tag-editor.c:208 ../src/mail/filtertypes.xml.in.h:16
+#: ../src/mail/e-mail-tag-editor.c:201 ../src/mail/filtertypes.xml.in.h:16
 #: ../src/mail/message-list.etspec.h:6 ../src/mail/searchtypes.xml.in.h:17
 #: ../src/mail/vfoldertypes.xml.in.h:17
 #: ../src/modules/mail/em-mailer-prefs.c:65
-#: ../src/smime/gui/certificate-manager.c:1643
+#: ../src/smime/gui/certificate-manager.c:1627
 msgid "Subject"
 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:1500
+#: ../src/em-format/e-mail-formatter-quote-headers.c:200
+#: ../src/em-format/e-mail-formatter-utils.c:360
+#: ../src/modules/mail/em-mailer-prefs.c:686
+#: ../src/modules/mail/em-mailer-prefs.c:1619
+#: ../src/modules/mail/em-mailer-prefs.c:1668
 msgid "Mailer"
 msgstr "Pošiljalac"
 
@@ -11644,7 +12038,7 @@ msgstr "Oblikuje deo kao HTML"
 
 #: ../src/em-format/e-mail-formatter-quote-text-plain.c:121
 #: ../src/em-format/e-mail-formatter-text-plain.c:196
-#: ../src/e-util/e-html-editor-actions.c:1314
+#: ../src/e-util/e-html-editor-actions.c:1346
 msgid "Plain Text"
 msgstr "Običan tekst"
 
@@ -11773,8 +12167,8 @@ msgstr ""
 msgid "Display source of a MIME part"
 msgstr "Prikazuje izvoe kao MIME deo"
 
-#: ../src/em-format/e-mail-formatter-utils.c:200
-#: ../src/em-format/e-mail-formatter-utils.c:217
+#: ../src/em-format/e-mail-formatter-utils.c:212
+#: ../src/em-format/e-mail-formatter-utils.c:237
 #: ../src/em-format/e-mail-part-headers.c:48
 #: ../src/mail/message-list.etspec.h:9 ../src/mail/searchtypes.xml.in.h:11
 #: ../src/mail/vfoldertypes.xml.in.h:11
@@ -11782,40 +12176,56 @@ msgstr "Prikazuje izvoe kao MIME deo"
 msgid "To"
 msgstr "Prima"
 
-#: ../src/em-format/e-mail-formatter-utils.c:201
-#: ../src/em-format/e-mail-formatter-utils.c:218
+#: ../src/em-format/e-mail-formatter-utils.c:213
+#: ../src/em-format/e-mail-formatter-utils.c:238
 #: ../src/em-format/e-mail-part-headers.c:49
 #: ../src/modules/mail/em-mailer-prefs.c:63
 msgid "Cc"
-msgstr "Cc"
+msgstr "Kopija"
 
-#: ../src/em-format/e-mail-formatter-utils.c:202
-#: ../src/em-format/e-mail-formatter-utils.c:219
+#: ../src/em-format/e-mail-formatter-utils.c:214
+#: ../src/em-format/e-mail-formatter-utils.c:239
 #: ../src/em-format/e-mail-part-headers.c:50
 #: ../src/modules/mail/em-mailer-prefs.c:64
 msgid "Bcc"
-msgstr "Bcc"
+msgstr "Slepa kopija"
 
-#: ../src/em-format/e-mail-formatter-utils.c:582
+#: ../src/em-format/e-mail-formatter-utils.c:577
 msgid "GPG signed"
 msgstr "GPG potpisano"
 
-#: ../src/em-format/e-mail-formatter-utils.c:588
+#: ../src/em-format/e-mail-formatter-utils.c:577
+msgid "partially GPG signed"
+msgstr "delimično, GPG potpis"
+
+#: ../src/em-format/e-mail-formatter-utils.c:578
 msgid "GPG encrypted"
 msgstr "GPG šifrovano"
 
-#: ../src/em-format/e-mail-formatter-utils.c:594
+#: ../src/em-format/e-mail-formatter-utils.c:578
+msgid "partially GPG encrypted"
+msgstr "delimično, GPG šifrovanje"
+
+#: ../src/em-format/e-mail-formatter-utils.c:579
 msgid "S/MIME signed"
 msgstr "S/MIME potpisano"
 
-#: ../src/em-format/e-mail-formatter-utils.c:600
+#: ../src/em-format/e-mail-formatter-utils.c:579
+msgid "partially S/MIME signed"
+msgstr "delimično S/MIME potpis"
+
+#: ../src/em-format/e-mail-formatter-utils.c:580
 msgid "S/MIME encrypted"
 msgstr "S/MIME šifrovano"
 
-#: ../src/em-format/e-mail-formatter-utils.c:609
-#: ../src/mail/e-mail-config-security-page.c:718
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:272
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:215
+#: ../src/em-format/e-mail-formatter-utils.c:580
+msgid "partially S/MIME encrypted"
+msgstr "delimično, S/MIME šifrovanje"
+
+#: ../src/em-format/e-mail-formatter-utils.c:693
+#: ../src/mail/e-mail-config-security-page.c:856
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:273
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:216
 msgid "Security"
 msgstr "Bezbednost"
 
@@ -11824,18 +12234,18 @@ msgstr "Bezbednost"
 msgid "Error parsing MBOX part: %s"
 msgstr "Greška obrade MBOKS dela: %s"
 
-#: ../src/em-format/e-mail-parser-application-smime.c:81
+#: ../src/em-format/e-mail-parser-application-smime.c:113
 #, c-format
 msgid "Could not parse S/MIME message: %s"
 msgstr "Ne mogu da obradim S/MIME poruku: %s"
 
-#: ../src/em-format/e-mail-parser-inlinepgp-encrypted.c:75
+#: ../src/em-format/e-mail-parser-inlinepgp-encrypted.c:76
 #, c-format
 msgid "Could not parse PGP message: %s"
 msgstr "Ne mogu da obradim PGP poruku: %s"
 
-#: ../src/em-format/e-mail-parser-inlinepgp-signed.c:78
-#: ../src/em-format/e-mail-parser-multipart-signed.c:133
+#: ../src/em-format/e-mail-parser-inlinepgp-signed.c:79
+#: ../src/em-format/e-mail-parser-multipart-signed.c:163
 #, c-format
 msgid "Error verifying signature: %s"
 msgstr "Greška provere potpisa: %s"
@@ -11869,28 +12279,28 @@ msgstr "Pokazivač na udaljeni podatak (%s)"
 msgid "Pointer to unknown external data (“%s” type)"
 msgstr "Pokazivač na nepoznati spoljni podatak (tipa „%s“)"
 
-#: ../src/em-format/e-mail-parser-multipart-encrypted.c:64
-#: ../src/em-format/e-mail-parser-multipart-signed.c:81
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:74
+#: ../src/em-format/e-mail-parser-multipart-signed.c:109
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Ne mogu da obradim MIME poruku. Prikazivanje izvora."
 
-#: ../src/em-format/e-mail-parser-multipart-encrypted.c:79
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:89
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Nepodržani tip šifre za višedelni/šifrovan (multipart/encrypted)"
 
-#: ../src/em-format/e-mail-parser-multipart-encrypted.c:98
+#: ../src/em-format/e-mail-parser-multipart-encrypted.c:108
 #, c-format
 msgid "Could not parse PGP/MIME message: %s"
 msgstr "Ne mogu da obradim PGP/MIME poruku: %s"
 
-#: ../src/em-format/e-mail-parser-multipart-signed.c:119
+#: ../src/em-format/e-mail-parser-multipart-signed.c:149
 msgid "Unsupported signature format"
 msgstr "Nepodržan oblik potpisa"
 
 #: ../src/em-format/e-mail-part-headers.c:47
 #: ../src/modules/mail/em-mailer-prefs.c:61
 msgid "Reply-To"
-msgstr "Odgovor"
+msgstr "Odgovori na"
 
 #: ../src/em-format/e-mail-part-headers.c:52 ../src/e-util/e-dateedit.c:550
 #: ../src/e-util/e-dateedit.c:573 ../src/mail/message-list.etspec.h:7
@@ -11927,7 +12337,7 @@ msgstr "_Uvezi uverenje"
 msgid "This certificate is not viewable"
 msgstr "Ovo uverenje nije čitljivo"
 
-#: ../src/em-format/e-mail-part-utils.c:556
+#: ../src/em-format/e-mail-part-utils.c:634
 #, c-format
 msgid "%s attachment"
 msgstr "%s prilog"
@@ -11945,77 +12355,92 @@ msgstr "Kalendar: od %s do %s"
 msgid "evolution calendar item"
 msgstr "stavka kalendara evolucije"
 
-#: ../src/e-util/e-accounts-window.c:523 ../src/e-util/e-accounts-window.c:640
-#: ../src/e-util/e-accounts-window.c:860
-#: ../src/modules/mail/e-mail-shell-backend.c:852
+#: ../src/e-util/e-accounts-window.c:557 ../src/e-util/e-accounts-window.c:674
+#: ../src/e-util/e-accounts-window.c:894
+#: ../src/modules/mail/e-mail-shell-backend.c:910
 msgid "Mail Accounts"
 msgstr "Poštanski nalozi"
 
-#: ../src/e-util/e-accounts-window.c:530 ../src/e-util/e-accounts-window.c:669
-#: ../src/e-util/e-accounts-window.c:874
+#: ../src/e-util/e-accounts-window.c:564 ../src/e-util/e-accounts-window.c:703
+#: ../src/e-util/e-accounts-window.c:908
 msgid "Address Books"
 msgstr "Imenici"
 
-#: ../src/e-util/e-accounts-window.c:536 ../src/e-util/e-accounts-window.c:670
-#: ../src/e-util/e-accounts-window.c:875
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:84
+#: ../src/e-util/e-accounts-window.c:570 ../src/e-util/e-accounts-window.c:704
+#: ../src/e-util/e-accounts-window.c:909
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:86
 msgid "Calendars"
 msgstr "Kalendari"
 
-#: ../src/e-util/e-accounts-window.c:542 ../src/e-util/e-accounts-window.c:671
-#: ../src/e-util/e-accounts-window.c:876
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
+#: ../src/e-util/e-accounts-window.c:576 ../src/e-util/e-accounts-window.c:705
+#: ../src/e-util/e-accounts-window.c:910
 msgid "Memo Lists"
 msgstr "Spisak beleški"
 
-#: ../src/e-util/e-accounts-window.c:548 ../src/e-util/e-accounts-window.c:672
-#: ../src/e-util/e-accounts-window.c:877
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:86
+#: ../src/e-util/e-accounts-window.c:582 ../src/e-util/e-accounts-window.c:706
+#: ../src/e-util/e-accounts-window.c:911
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
 msgid "Task Lists"
 msgstr "Spisak zadataka"
 
 # has "activatable" set.
-#: ../src/e-util/e-accounts-window.c:1363 ../src/e-util/filter.ui.h:23
+#: ../src/e-util/e-accounts-window.c:1399 ../src/e-util/filter.ui.h:23
 #: ../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/modules/mail/em-composer-prefs.c:1306
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:407
+#: ../src/plugins/mail-notification/mail-notification.c:1124
 #: ../src/plugins/publish-calendar/publish-calendar.c:854
 msgid "Enabled"
 msgstr "Uključen"
 
-#: ../src/e-util/e-accounts-window.c:1379
+#: ../src/e-util/e-accounts-window.c:1415
 #: ../src/mail/e-mail-account-tree-view.c:108
+#: ../src/plugins/mail-notification/mail-notification.c:1140
 msgid "Account Name"
 msgstr "Naziv naloga"
 
-#: ../src/e-util/e-accounts-window.c:1446
+#: ../src/e-util/e-accounts-window.c:1482
 msgid "Collection _Account"
 msgstr "Zbirni n_alog"
 
-#: ../src/e-util/e-accounts-window.c:1447
+#: ../src/e-util/e-accounts-window.c:1483
 msgid "_Mail Account"
 msgstr "Poštanski nalog"
 
-#: ../src/e-util/e-accounts-window.c:1448
+#: ../src/e-util/e-accounts-window.c:1484
 msgid "Address _Book"
 msgstr "_Imenik"
 
-#: ../src/e-util/e-accounts-window.c:1449
+#: ../src/e-util/e-accounts-window.c:1485
 msgid "_Calendar"
 msgstr "_Kalendar"
 
-#: ../src/e-util/e-accounts-window.c:1450
+#: ../src/e-util/e-accounts-window.c:1486
 msgid "M_emo List"
 msgstr "Spisak beleški"
 
-#: ../src/e-util/e-accounts-window.c:1451
+#: ../src/e-util/e-accounts-window.c:1487
 msgid "_Task List"
 msgstr "Spisak zadataka"
 
-#: ../src/e-util/e-accounts-window.c:1646
+#: ../src/e-util/e-accounts-window.c:1684
 msgid "Evolution Accounts"
 msgstr "Nalozi Evolucije"
 
+#. 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-accounts-window.c:1761 ../src/e-util/e-webdav-browser.c:2708
+#: ../src/mail/em-subscription-editor.c:1952
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1600
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1678
+msgid "_Refresh"
+msgstr "_Osveži"
+
+#: ../src/e-util/e-accounts-window.c:1762
+msgid "Initiates refresh of account sources"
+msgstr "Pokreni osvežavanje izvora naloga"
+
 #. Translators: This is a cancelled activity.
 #: ../src/e-util/e-activity.c:256
 #, c-format
@@ -12050,13 +12475,14 @@ msgstr "%s"
 #. *              percent complete is known.
 #. Translators: This is a running activity whose percent complete is known.
 #: ../src/e-util/e-activity.c:273
-#: ../src/modules/calendar/e-cal-base-shell-content.c:142
+#: ../src/modules/addressbook/e-book-shell-view-private.c:334
+#: ../src/modules/calendar/e-cal-base-shell-content.c:143
 #, c-format
 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:1849
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1790
 msgid "Cancel"
 msgstr "Otkaži"
 
@@ -12065,6 +12491,10 @@ msgstr "Otkaži"
 msgid "Close this message (Escape)"
 msgstr "Zatvorite ovu poruku (Napusti)"
 
+#: ../src/e-util/e-alert-dialog.c:162
+msgid "_Dismiss"
+msgstr "_Zanemari"
+
 # bug: plural-forms
 #: ../src/e-util/e-alert-sink.c:244
 msgid "Failed to create a thread: "
@@ -12078,21 +12508,21 @@ msgstr "Ne mogu da započnem raspravu: "
 msgid "Attached message"
 msgstr "Priložena poruka"
 
-#: ../src/e-util/e-attachment.c:2085 ../src/e-util/e-attachment.c:3147
+#: ../src/e-util/e-attachment.c:2085 ../src/e-util/e-attachment.c:3146
 msgid "Operation was cancelled"
 msgstr "Radnja je otkazana"
 
 #. Translators: Default attachment filename.
 #: ../src/e-util/e-attachment.c:2270 ../src/e-util/e-attachment.c:2990
-#: ../src/e-util/e-attachment.c:3437 ../src/e-util/e-attachment-store.c:887
+#: ../src/e-util/e-attachment.c:3442 ../src/e-util/e-attachment-store.c:914
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../src/e-util/e-attachment.c:2352 ../src/e-util/e-attachment.c:3497
+#: ../src/e-util/e-attachment.c:2352 ../src/e-util/e-attachment.c:3502
 msgid "A load operation is already in progress"
 msgstr "Operacija učitavanja je već u toku"
 
-#: ../src/e-util/e-attachment.c:2360 ../src/e-util/e-attachment.c:3505
+#: ../src/e-util/e-attachment.c:2360 ../src/e-util/e-attachment.c:3510
 msgid "A save operation is already in progress"
 msgstr "Operacija čuvanja je već u toku"
 
@@ -12106,17 +12536,17 @@ msgstr "Ne mogu da otvorim „%s“"
 msgid "Could not open the attachment"
 msgstr "Ne mogu da otvorim prilog"
 
-#: ../src/e-util/e-attachment.c:3514
+#: ../src/e-util/e-attachment.c:3519
 msgid "Attachment contents not loaded"
 msgstr "Sadržaj priloga nije učitan"
 
 # * found, so just bail completely.
-#: ../src/e-util/e-attachment.c:3605
+#: ../src/e-util/e-attachment.c:3610
 #, c-format
 msgid "Could not save “%s”"
 msgstr "Ne mogu da sačuvam „%s“"
 
-#: ../src/e-util/e-attachment.c:3608
+#: ../src/e-util/e-attachment.c:3613
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Ne mogu da sačuvam prilog"
@@ -12126,14 +12556,14 @@ msgid "Attachment Properties"
 msgstr "Osobine priloga"
 
 #: ../src/e-util/e-attachment-dialog.c:337
-#: ../src/e-util/e-import-assistant.c:276
+#: ../src/e-util/e-import-assistant.c:277
 msgid "F_ilename:"
 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
+#: ../src/e-util/e-html-editor-image-dialog.c:513
+#: ../src/e-util/e-html-editor-link-dialog.c:229
+#: ../src/e-util/e-webdav-browser.c:2456
 msgid "_Description:"
 msgstr "_Opis:"
 
@@ -12142,7 +12572,7 @@ msgid "MIME Type:"
 msgstr "MIME vrsta:"
 
 #: ../src/e-util/e-attachment-dialog.c:380
-#: ../src/e-util/e-attachment-store.c:694
+#: ../src/e-util/e-attachment-store.c:700
 msgid "_Suggest automatic display of attachment"
 msgstr "_Predloži automatski prikaz priloga"
 
@@ -12173,20 +12603,22 @@ msgstr "Sakrij liniju pri_loga"
 msgid "Show Attachment _Bar"
 msgstr "Prikaži liniju p_riloga"
 
-#: ../src/e-util/e-attachment-store.c:659
+#: ../src/e-util/e-attachment-store.c:656
+#: ../src/e-util/e-attachment-store.c:663
 msgid "Add Attachment"
 msgstr "Dodaj prilog"
 
-#: ../src/e-util/e-attachment-store.c:666
-#: ../src/e-util/e-attachment-store.c:668
+#: ../src/e-util/e-attachment-store.c:658
+#: ../src/e-util/e-attachment-store.c:670
+#: ../src/e-util/e-attachment-store.c:672
 msgid "A_ttach"
 msgstr "Pri_loži"
 
-#: ../src/e-util/e-attachment-store.c:715
+#: ../src/e-util/e-attachment-store.c:721
 msgid "Archive selected directories using this format:"
 msgstr "Ariviraj izabrane direktorijume u ovom formatu:"
 
-#: ../src/e-util/e-attachment-store.c:823
+#: ../src/e-util/e-attachment-store.c:838
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Sačuvaj prilog"
@@ -12194,61 +12626,69 @@ msgstr[1] "Sačuvaj priloge"
 msgstr[2] "Sačuvaj priloge"
 msgstr[3] "Sačuvaj prilog"
 
-#: ../src/e-util/e-attachment-store.c:850
+#: ../src/e-util/e-attachment-store.c:876
 msgid "Do _not extract files from the attachment"
 msgstr "Ne _raspakuj datoteke iz priloga"
 
-#: ../src/e-util/e-attachment-store.c:855
+#: ../src/e-util/e-attachment-store.c:881
 msgid "Save extracted files _only"
 msgstr "Sačuvaj _samo izvučene datoteke"
 
-#: ../src/e-util/e-attachment-store.c:860
+#: ../src/e-util/e-attachment-store.c:886
 msgid "Save extracted files and the original _archive"
 msgstr "Sačuvaj izvučene datoteke i originalne _arhive"
 
-#: ../src/e-util/e-attachment-view.c:309
-msgid "Open With Other Application..."
-msgstr "Otvori drugim programom..."
+#: ../src/e-util/e-attachment-view.c:308
+msgid "Open With Other Application…"
+msgstr "Otvori drugim programom…"
 
-#: ../src/e-util/e-attachment-view.c:316
+#: ../src/e-util/e-attachment-view.c:315
 msgid "S_ave All"
 msgstr "Sač_uvaj sve"
 
-#: ../src/e-util/e-attachment-view.c:323
+#: ../src/e-util/e-attachment-view.c:322
 msgid "Sa_ve As"
 msgstr "Sačuvaj _kao"
 
-#: ../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
+#: ../src/e-util/e-attachment-view.c:331
+#: ../src/plugins/save-calendar/save-calendar.c:348
+#: ../src/plugins/save-calendar/save-calendar.c:387
+#: ../src/plugins/save-calendar/save-calendar.c:426
 msgid "Save _As"
 msgstr "Sačuvaj _kao"
 
-#: ../src/e-util/e-attachment-view.c:342
-msgid "A_dd Attachment..."
-msgstr "Do_daj prilog..."
+#: ../src/e-util/e-attachment-view.c:341
+msgid "A_dd Attachment…"
+msgstr "Dodaj prilog…"
 
-#: ../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:1643
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1714
+#: ../src/e-util/e-attachment-view.c:348
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1181
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1284
+#: ../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:1593
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1671
 msgid "_Properties"
 msgstr "_Svojstva"
 
-#: ../src/e-util/e-attachment-view.c:778
+#: ../src/e-util/e-attachment-view.c:786
 #, c-format
 msgid "Open With “%s”"
 msgstr "Otvori programom „%s“"
 
-#: ../src/e-util/e-attachment-view.c:781
+#: ../src/e-util/e-attachment-view.c:787
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Otvori ovaj prilog u „%s“"
 
+#: ../src/e-util/e-attachment-view.c:789
+msgid "Open With Default Application"
+msgstr "Otvori podrazumevanim programom"
+
+#: ../src/e-util/e-attachment-view.c:790
+msgid "Open this attachment in default application"
+msgstr "Otvori ovaj prilog u podrazumevanom programu"
+
 #: ../src/e-util/e-book-source-config.c:98
 msgid "Mark as default address book"
 msgstr "Označava kao podrazumevan imenik"
@@ -12266,40 +12706,40 @@ msgstr "Kopira sadržaj knjige lokalno za rad van mreže"
 msgid "Ctrl-click to open a link"
 msgstr "Pritisnite taster Ctrl i kliknite da otvorite vezu"
 
-#: ../src/e-util/e-calendar.c:267
+#: ../src/e-util/e-calendar.c:310
 msgid "Previous month"
 msgstr "Prethodni mesec"
 
-#: ../src/e-util/e-calendar.c:286
+#: ../src/e-util/e-calendar.c:329
 msgid "Next month"
 msgstr "Sledeći mesec"
 
-#: ../src/e-util/e-calendar.c:306
+#: ../src/e-util/e-calendar.c:349
 msgid "Previous year"
 msgstr "Prethodna godina"
 
-#: ../src/e-util/e-calendar.c:325
+#: ../src/e-util/e-calendar.c:368
 msgid "Next year"
 msgstr "Sledeća godina"
 
-#: ../src/e-util/e-calendar.c:349
+#: ../src/e-util/e-calendar.c:392
 msgid "Month Calendar"
 msgstr "Mesečni kalendar"
 
 #. This is a strftime() format. %B = Month name.
-#: ../src/e-util/e-calendar-item.c:1333 ../src/e-util/e-calendar-item.c:2216
+#: ../src/e-util/e-calendar-item.c:1357 ../src/e-util/e-calendar-item.c:2240
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../src/e-util/e-calendar-item.c:1335
+#: ../src/e-util/e-calendar-item.c:1359
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../src/e-util/e-calendar-item.c:1372
+#: ../src/e-util/e-calendar-item.c:1396
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y."
@@ -12332,25 +12772,25 @@ msgstr "Kopira sadržaj spiska zadataka lokalno za rad van mreže"
 msgid "Copy memo list contents locally for offline operation"
 msgstr "Kopira sadržaj spiska beleški lokalno za rad van mreže"
 
-#: ../src/e-util/e-categories-editor.c:246
+#: ../src/e-util/e-categories-editor.c:251
 msgid "Currently _used categories:"
 msgstr "Trenutno _korišćene kategorije:"
 
-#: ../src/e-util/e-categories-editor.c:257
+#: ../src/e-util/e-categories-editor.c:262
 msgid "_Available Categories:"
 msgstr "_Dostupne kategorije:"
 
-#: ../src/e-util/e-categories-editor.c:297
+#: ../src/e-util/e-categories-editor.c:302
 msgctxt "category"
 msgid "_New"
 msgstr "_Nova"
 
-#: ../src/e-util/e-categories-editor.c:301
+#: ../src/e-util/e-categories-editor.c:306
 msgctxt "category"
 msgid "_Edit"
 msgstr "_Uređivanje"
 
-#: ../src/e-util/e-categories-editor.c:305
+#: ../src/e-util/e-categories-editor.c:310
 msgctxt "category"
 msgid "_Delete"
 msgstr "_Obriši"
@@ -12364,40 +12804,44 @@ msgstr "Ikonica"
 msgid "Create category “%s”"
 msgstr "Izrada kategorije „%s“"
 
-#: ../src/e-util/e-category-editor.c:138
+#: ../src/e-util/e-category-editor.c:167 ../src/e-util/e-category-editor.c:232
 msgid "Category Icon"
 msgstr "Ikonica kategorije"
 
-#: ../src/e-util/e-category-editor.c:142
+#: ../src/e-util/e-category-editor.c:171
 msgid "_No Image"
 msgstr "_Bez slike"
 
-#: ../src/e-util/e-category-editor.c:175
+#: ../src/e-util/e-category-editor.c:205
 msgid "Category _Name"
 msgstr "_Naziv kategorije"
 
-#: ../src/e-util/e-category-editor.c:188
+#: ../src/e-util/e-category-editor.c:218
 msgid "Category _Icon"
 msgstr "_Ikonica kategorije"
 
-#: ../src/e-util/e-category-editor.c:214
+# shell:noshell-reason title
+#: ../src/e-util/e-category-editor.c:234
+msgid "_Unset icon"
+msgstr "Raspostavi ikonic_u"
+
+#: ../src/e-util/e-category-editor.c:260
 msgid "Category Properties"
 msgstr "Osobine kategorije"
 
-#: ../src/e-util/e-category-editor.c:275
+#: ../src/e-util/e-category-editor.c:321
 #, c-format
 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. Izaberite drugi naziv"
 
 #: ../src/e-util/e-cell-combo.c:183
 msgid "popup list"
 msgstr "iskačuća lista"
 
 #: ../src/e-util/e-cell-date.c:49 ../src/e-util/e-cell-date.c:137
-#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2109
+#: ../src/e-util/e-cell-date.c:157 ../src/mail/message-list.c:2143
 msgid "?"
 msgstr "?"
 
@@ -12516,38 +12960,65 @@ msgstr "Kodna strana"
 msgid "Enter the character set to use"
 msgstr "Izaberite kodnu stranu za korišćenje"
 
-#: ../src/e-util/e-charset-combo-box.c:363
-msgid "Other..."
-msgstr "Drugo..."
+#: ../src/e-util/e-charset-combo-box.c:364
+msgid "Other…"
+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”"
 msgstr "Ne mogu da napravim predmet programa iz naziva proširenja „%s“"
 
-#: ../src/e-util/e-collection-account-wizard.c:214
+#: ../src/e-util/e-collection-account-wizard.c:107
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:83
+msgid "_Finish"
+msgstr "_Završi"
+
+#: ../src/e-util/e-collection-account-wizard.c:110
+msgid "_Look Up"
+msgstr "Po_traži"
+
+#: ../src/e-util/e-collection-account-wizard.c:112
+#: ../src/e-util/e-collection-account-wizard.c:273
+#: ../src/e-util/e-search-bar.c:677
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:85
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:244
+msgid "_Next"
+msgstr "_Sledeće"
+
+#: ../src/e-util/e-collection-account-wizard.c:184
+msgid "New Collection Account"
+msgstr "Novi zbirni nalog"
+
+#: ../src/e-util/e-collection-account-wizard.c:258
+#: ../src/e-util/e-search-bar.c:665
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:78
+msgid "_Previous"
+msgstr "_Prethodno"
+
+#: ../src/e-util/e-collection-account-wizard.c:439
 msgid "Looking up details, please wait…"
 msgstr "Potražujem pojedinosti, sačekajte…"
 
 #. Translators: The %s is replaced with a clickable text "Enter password", thus it'll be "Requires password 
to continue. Enter password." at the end.
-#: ../src/e-util/e-collection-account-wizard.c:271
+#: ../src/e-util/e-collection-account-wizard.c:496
 #, c-format
 msgid "Requires password to continue. %s."
 msgstr "Potrebna je lozinka za nastavak. %s."
 
-#: ../src/e-util/e-collection-account-wizard.c:284
+#: ../src/e-util/e-collection-account-wizard.c:509
 msgid "View certificate"
 msgstr "Pogledaj uverenje"
 
 #. Translators: The first %s is replaced with actual error message about site certificate invalidity,
 #. like "The signing certificate authority is not known.", the second %s is replaced with a link "View 
certificate".
-#: ../src/e-util/e-collection-account-wizard.c:288
+#: ../src/e-util/e-collection-account-wizard.c:513
 #, c-format
 msgctxt "collection-account-wizard"
 msgid "%s %s."
 msgstr "%s %s."
 
-#: ../src/e-util/e-collection-account-wizard.c:326
+#: ../src/e-util/e-collection-account-wizard.c:551
 msgid ""
 "Found no candidates. It can also mean that the server doesn’t provide any "
 "information about its configuration using the selected lookup methods. Enter "
@@ -12557,7 +13028,7 @@ msgstr ""
 "podatke o njegovom podešavanju korišćenjem izabranog načina potraživanja "
 "podataka. Unesite nalog ručno ili izmenite podešavanja iznad."
 
-#: ../src/e-util/e-collection-account-wizard.c:328
+#: ../src/e-util/e-collection-account-wizard.c:553
 #, c-format
 msgid "Found one candidate"
 msgid_plural "Found %d candidates"
@@ -12566,73 +13037,73 @@ msgstr[1] "Našao sam %d kandidata"
 msgstr[2] "Našao sam %d kandidata"
 msgstr[3] "Našao sam jednog kandidata"
 
-#: ../src/e-util/e-collection-account-wizard.c:423
+#: ../src/e-util/e-collection-account-wizard.c:657
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:30
-#: ../src/smime/gui/certificate-manager.c:785
+#: ../src/smime/gui/certificate-manager.c:766
 msgid "_Password:"
 msgstr "_Lozinka:"
 
-#: ../src/e-util/e-collection-account-wizard.c:434
+#: ../src/e-util/e-collection-account-wizard.c:669
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:31
 msgid "_Remember password"
 msgstr "_Zapamti lozinku"
 
-#: ../src/e-util/e-collection-account-wizard.c:555
-#: ../src/e-util/e-webdav-browser.c:473
+#: ../src/e-util/e-collection-account-wizard.c:812
+#: ../src/e-util/e-webdav-browser.c:474
 msgid "Collection"
 msgstr "Zbirka"
 
-#: ../src/e-util/e-collection-account-wizard.c:556
+#: ../src/e-util/e-collection-account-wizard.c:813
 msgid "Mail Receive"
 msgstr "Primanje pošte"
 
-#: ../src/e-util/e-collection-account-wizard.c:557
+#: ../src/e-util/e-collection-account-wizard.c:814
 msgid "Mail Send"
 msgstr "Slanje pošte"
 
-#: ../src/e-util/e-collection-account-wizard.c:558
+#: ../src/e-util/e-collection-account-wizard.c:815
 #: ../src/e-util/e-name-selector-dialog.c:445
 #: ../src/mail/importers/pine-importer.c:430
 msgid "Address Book"
 msgstr "Imenik"
 
-#: ../src/e-util/e-collection-account-wizard.c:560
+#: ../src/e-util/e-collection-account-wizard.c:817
 msgid "Memo List"
 msgstr "Spisak beleški"
 
-#: ../src/e-util/e-collection-account-wizard.c:561
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
+#: ../src/e-util/e-collection-account-wizard.c:818
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Task List"
 msgstr "Spisak zadataka"
 
-#: ../src/e-util/e-collection-account-wizard.c:896
+#: ../src/e-util/e-collection-account-wizard.c:1154
 msgid "Looking up LDAP server’s search base…"
 msgstr "Potražujem podatke iz pretraživačke baze LDAP servera…"
 
-#: ../src/e-util/e-collection-account-wizard.c:1193
+#: ../src/e-util/e-collection-account-wizard.c:1461
 msgid "Saving account settings, please wait…"
 msgstr "Čuvam podešavanja naloga, sačekajte…"
 
-#: ../src/e-util/e-collection-account-wizard.c:1337
+#: ../src/e-util/e-collection-account-wizard.c:1612
 msgid "User details"
 msgstr "Pojedinosti korisnika"
 
-#: ../src/e-util/e-collection-account-wizard.c:1350
+#: ../src/e-util/e-collection-account-wizard.c:1625
 msgid "_Email Address or User name:"
 msgstr "Adresa e-pošte ili korisničko ime:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1380
+#: ../src/e-util/e-collection-account-wizard.c:1656
 msgid "_Advanced Options"
 msgstr "N_apredne opcije"
 
-#: ../src/e-util/e-collection-account-wizard.c:1385
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:216
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:172
+#: ../src/e-util/e-collection-account-wizard.c:1661
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:217
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:173
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:25
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1403
+#: ../src/e-util/e-collection-account-wizard.c:1680
 msgid ""
 "Semicolon (“;”) separated list of servers to look up information for, in "
 "addition to the domain of the e-mail address."
@@ -12640,12 +13111,12 @@ msgstr ""
 "Spisak servera odvojenih tačka-zapetama („;“) koje ćemo koristiti za "
 "potraživanje podataka uz domen adrese e-pošte."
 
-#: ../src/e-util/e-collection-account-wizard.c:1595
+#: ../src/e-util/e-collection-account-wizard.c:1870
 msgid "Select which parts should be configured:"
 msgstr "Izaberite koje delove treba podesiti:"
 
-#: ../src/e-util/e-collection-account-wizard.c:1719
-#: ../src/mail/e-mail-config-identity-page.c:541
+#: ../src/e-util/e-collection-account-wizard.c:1994
+#: ../src/mail/e-mail-config-identity-page.c:542
 #: ../src/mail/e-mail-config-summary-page.c:323
 msgid "Account Information"
 msgstr "Podaci o nalogu"
@@ -12654,174 +13125,174 @@ msgstr "Podaci o nalogu"
 msgid "Choose custom color"
 msgstr "Izbor proizvoljne boje"
 
-#: ../src/e-util/e-color-combo.c:79
+#: ../src/e-util/e-color-combo.c:76
 msgid "black"
 msgstr "crna"
 
-#: ../src/e-util/e-color-combo.c:80
+#: ../src/e-util/e-color-combo.c:77
 msgid "light brown"
 msgstr "svetlobraon"
 
-#: ../src/e-util/e-color-combo.c:81
+#: ../src/e-util/e-color-combo.c:78
 msgid "brown gold"
 msgstr "zlatno-braon"
 
-#: ../src/e-util/e-color-combo.c:82
+#: ../src/e-util/e-color-combo.c:79
 msgid "dark green #2"
 msgstr "tamnozelena #2"
 
-#: ../src/e-util/e-color-combo.c:83
+#: ../src/e-util/e-color-combo.c:80
 msgid "navy"
 msgstr "mornarska"
 
-#: ../src/e-util/e-color-combo.c:84
+#: ../src/e-util/e-color-combo.c:81
 msgid "dark blue"
 msgstr "tamnoplava"
 
-#: ../src/e-util/e-color-combo.c:85
+#: ../src/e-util/e-color-combo.c:82
 msgid "purple #2"
 msgstr "ljubičasta #2"
 
-#: ../src/e-util/e-color-combo.c:86
+#: ../src/e-util/e-color-combo.c:83
 msgid "very dark gray"
 msgstr "veoma tamnobraon"
 
-#: ../src/e-util/e-color-combo.c:88
+#: ../src/e-util/e-color-combo.c:85
 msgid "dark red"
 msgstr "tamnocrvena"
 
-#: ../src/e-util/e-color-combo.c:89
+#: ../src/e-util/e-color-combo.c:86
 msgid "red-orange"
 msgstr "crveno-narandžasta"
 
-#: ../src/e-util/e-color-combo.c:90
+#: ../src/e-util/e-color-combo.c:87
 msgid "gold"
 msgstr "zlatna"
 
-#: ../src/e-util/e-color-combo.c:91
+#: ../src/e-util/e-color-combo.c:88
 msgid "dark green"
 msgstr "tamnozelena"
 
-#: ../src/e-util/e-color-combo.c:92
+#: ../src/e-util/e-color-combo.c:89
 msgid "dull blue"
 msgstr "bledoplava"
 
-#: ../src/e-util/e-color-combo.c:93
+#: ../src/e-util/e-color-combo.c:90
 msgid "blue"
 msgstr "plava"
 
-#: ../src/e-util/e-color-combo.c:94
+#: ../src/e-util/e-color-combo.c:91
 msgid "dull purple"
 msgstr "bledoljubičasta"
 
-#: ../src/e-util/e-color-combo.c:95
+#: ../src/e-util/e-color-combo.c:92
 msgid "dark grey"
 msgstr "tamnosiva"
 
-#: ../src/e-util/e-color-combo.c:97
+#: ../src/e-util/e-color-combo.c:94
 msgid "red"
 msgstr "crvena"
 
-#: ../src/e-util/e-color-combo.c:98
+#: ../src/e-util/e-color-combo.c:95
 msgid "orange"
 msgstr "narandžasta"
 
-#: ../src/e-util/e-color-combo.c:99
+#: ../src/e-util/e-color-combo.c:96
 msgid "lime"
 msgstr "žuto-zelena"
 
-#: ../src/e-util/e-color-combo.c:100
+#: ../src/e-util/e-color-combo.c:97
 msgid "dull green"
 msgstr "bledo-zelena"
 
-#: ../src/e-util/e-color-combo.c:101
+#: ../src/e-util/e-color-combo.c:98
 msgid "dull blue #2"
 msgstr "bledoplava #2"
 
-#: ../src/e-util/e-color-combo.c:102
+#: ../src/e-util/e-color-combo.c:99
 msgid "sky blue #2"
 msgstr "neboplava #2"
 
-#: ../src/e-util/e-color-combo.c:103
+#: ../src/e-util/e-color-combo.c:100
 msgid "purple"
 msgstr "ljubičasta"
 
-#: ../src/e-util/e-color-combo.c:104
+#: ../src/e-util/e-color-combo.c:101
 msgid "gray"
 msgstr "siva"
 
-#: ../src/e-util/e-color-combo.c:106
+#: ../src/e-util/e-color-combo.c:103
 msgid "magenta"
 msgstr "magneta"
 
-#: ../src/e-util/e-color-combo.c:107
+#: ../src/e-util/e-color-combo.c:104
 msgid "bright orange"
 msgstr "svetlonarandžasta"
 
-#: ../src/e-util/e-color-combo.c:108
+#: ../src/e-util/e-color-combo.c:105
 msgid "yellow"
 msgstr "žuta"
 
-#: ../src/e-util/e-color-combo.c:109
+#: ../src/e-util/e-color-combo.c:106
 msgid "green"
 msgstr "zelena"
 
-#: ../src/e-util/e-color-combo.c:110
+#: ../src/e-util/e-color-combo.c:107
 msgid "cyan"
 msgstr "cijan"
 
-#: ../src/e-util/e-color-combo.c:111
+#: ../src/e-util/e-color-combo.c:108
 msgid "bright blue"
 msgstr "svetloplava"
 
-#: ../src/e-util/e-color-combo.c:112
+#: ../src/e-util/e-color-combo.c:109
 msgid "red purple"
 msgstr "crveno-ljubičasta"
 
-#: ../src/e-util/e-color-combo.c:113
+#: ../src/e-util/e-color-combo.c:110
 msgid "light grey"
 msgstr "svetlosiva"
 
-#: ../src/e-util/e-color-combo.c:115
+#: ../src/e-util/e-color-combo.c:112
 msgid "pink"
 msgstr "roze"
 
-#: ../src/e-util/e-color-combo.c:116
+#: ../src/e-util/e-color-combo.c:113
 msgid "light orange"
 msgstr "svetlonarandžasta"
 
-#: ../src/e-util/e-color-combo.c:117
+#: ../src/e-util/e-color-combo.c:114
 msgid "light yellow"
 msgstr "svetložuta"
 
-#: ../src/e-util/e-color-combo.c:118
+#: ../src/e-util/e-color-combo.c:115
 msgid "light green"
 msgstr "svetlozelena"
 
-#: ../src/e-util/e-color-combo.c:119
+#: ../src/e-util/e-color-combo.c:116
 msgid "light cyan"
 msgstr "svetlocijan"
 
-#: ../src/e-util/e-color-combo.c:120
+#: ../src/e-util/e-color-combo.c:117
 msgid "light blue"
 msgstr "svetloplava"
 
-#: ../src/e-util/e-color-combo.c:121
+#: ../src/e-util/e-color-combo.c:118
 msgid "light purple"
 msgstr "svetloljubičasta"
 
-#: ../src/e-util/e-color-combo.c:122
+#: ../src/e-util/e-color-combo.c:119
 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:4138 ../src/mail/mail-config.ui.h:76
+#: ../src/e-util/e-color-combo.c:539 ../src/mail/e-mail-account-tree-view.c:135
+#: ../src/mail/e-mail-config-security-page.c:544
+#: ../src/mail/e-mail-config-security-page.c:708
+#: ../src/mail/e-mail-reader.c:4849 ../src/mail/mail-config.ui.h:78
 msgid "Default"
 msgstr "Osnovno"
 
-#: ../src/e-util/e-config-lookup.c:817
+#: ../src/e-util/e-config-lookup.c:821
 msgid "Running…"
 msgstr "Pokrećem…"
 
@@ -12873,7 +13344,7 @@ 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:1877 ../src/e-util/e-dateedit.c:2125
+#: ../src/e-util/e-dateedit.c:1877 ../src/e-util/e-dateedit.c:2131
 msgctxt "date"
 msgid "None"
 msgstr "Ništa"
@@ -12886,14 +13357,14 @@ msgstr "Neispravan datum"
 msgid "Invalid Time Value"
 msgstr "Neispravno vreme"
 
-#: ../src/e-util/e-datetime-format.c:219
+#: ../src/e-util/e-datetime-format.c:220
 msgid "Yesterday"
 msgstr "Juče"
 
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:227
+#: ../src/e-util/e-datetime-format.c:228
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "Sledećeg %a"
@@ -12901,7 +13372,7 @@ msgstr "Sledećeg %a"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:233
+#: ../src/e-util/e-datetime-format.c:234
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "Sledećeg %a"
@@ -12909,7 +13380,7 @@ msgstr "Sledećeg %a"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:239
+#: ../src/e-util/e-datetime-format.c:240
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "Sledeće %a"
@@ -12917,7 +13388,7 @@ msgstr "Sledeće %a"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:245
+#: ../src/e-util/e-datetime-format.c:246
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "Sledećeg %a"
@@ -12925,7 +13396,7 @@ msgstr "Sledećeg %a"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:251
+#: ../src/e-util/e-datetime-format.c:252
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "Sledećeg %a"
@@ -12933,7 +13404,7 @@ msgstr "Sledećeg %a"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:257
+#: ../src/e-util/e-datetime-format.c:258
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "Sledeće %a"
@@ -12941,17 +13412,17 @@ msgstr "Sledeće %a"
 #. Translators: This is used for abbreviated days in the future.
 #. *         You can use strftime modifiers here too, like "Next %a", to avoid
 #. * repeated translation of the abbreviated day name.
-#: ../src/e-util/e-datetime-format.c:263
+#: ../src/e-util/e-datetime-format.c:264
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Sledeće %a"
 
-#: ../src/e-util/e-datetime-format.c:349 ../src/e-util/e-datetime-format.c:359
-#: ../src/e-util/e-datetime-format.c:368
+#: ../src/e-util/e-datetime-format.c:367 ../src/e-util/e-datetime-format.c:377
+#: ../src/e-util/e-datetime-format.c:386
 msgid "Use locale default"
 msgstr "Koristi podrazumevani lokalitet"
 
-#: ../src/e-util/e-datetime-format.c:592
+#: ../src/e-util/e-datetime-format.c:610
 msgid "Format:"
 msgstr "Oblik:"
 
@@ -12984,6 +13455,12 @@ msgstr "godine"
 msgid "Do not synchronize locally mails older than"
 msgstr "Ne usklađuj lokalnu poštu stariju od"
 
+#. Translators: The %s is replaced with a spin button; always keep it in the string at the right position
+#: ../src/e-util/e-dialog-widgets.c:437
+#, c-format
+msgid "Mark messages as read after %s seconds"
+msgstr "Označi poruke kao pročitane posle %s sekundi"
+
 #. Translators: :-)
 #: ../src/e-util/e-emoticon-chooser.c:38
 msgid "_Smile"
@@ -13235,20 +13712,22 @@ msgstr[2] "za %d godina"
 msgstr[3] "za %d godinu"
 
 #: ../src/e-util/e-filter-datespec.c:127
+#, c-format
 msgid "<click here to select a date>"
 msgstr "<kliknite ovde da izaberete datum>"
 
-#: ../src/e-util/e-filter-datespec.c:130 ../src/e-util/e-filter-datespec.c:141
-#: ../src/e-util/e-filter-datespec.c:152
+#: ../src/e-util/e-filter-datespec.c:132 ../src/e-util/e-filter-datespec.c:143
+#: ../src/e-util/e-filter-datespec.c:154
+#, c-format
 msgid "now"
 msgstr "sada"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../src/e-util/e-filter-datespec.c:137
+#: ../src/e-util/e-filter-datespec.c:139
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y."
 
-#: ../src/e-util/e-filter-datespec.c:286
+#: ../src/e-util/e-filter-datespec.c:297
 msgid "Select a time to compare against"
 msgstr "Izaberite vreme za poređenje"
 
@@ -13256,23 +13735,23 @@ msgstr "Izaberite vreme za poređenje"
 msgid "Choose a File"
 msgstr "Izaberite datoteku"
 
-#: ../src/e-util/e-filter-rule.c:978
+#: ../src/e-util/e-filter-rule.c:979
 msgid "R_ule name:"
 msgstr "Naziv _pravila:"
 
-#: ../src/e-util/e-filter-rule.c:1034
+#: ../src/e-util/e-filter-rule.c:1035
 msgid "all the following conditions"
 msgstr "svim sledećim uslovima"
 
-#: ../src/e-util/e-filter-rule.c:1035
+#: ../src/e-util/e-filter-rule.c:1036
 msgid "any of the following conditions"
 msgstr "bilo kom od sledećih uslova"
 
-#: ../src/e-util/e-filter-rule.c:1041
+#: ../src/e-util/e-filter-rule.c:1042
 msgid "_Find items which match:"
 msgstr "_Pronađi stavke koje odgovaraju:"
 
-#: ../src/e-util/e-filter-rule.c:1064
+#: ../src/e-util/e-filter-rule.c:1065
 msgid "Find items that meet the following conditions"
 msgstr "Pronađite stavke koje zadovoljavaju sledeće uslove"
 
@@ -13285,47 +13764,47 @@ msgstr "Pronađite stavke koje zadovoljavaju sledeće uslove"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../src/e-util/e-filter-rule.c:1079
+#: ../src/e-util/e-filter-rule.c:1080
 #: ../src/e-util/e-html-editor-page-dialog.c:59
 #: ../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:29
-#: ../src/mail/e-mail-autoconfig.c:658
+#: ../src/mail/e-mail-autoconfig.c:766
 #: ../src/mail/e-mail-config-summary-page.c:141
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:680
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid "None"
 msgstr "Ništa"
 
-#: ../src/e-util/e-filter-rule.c:1080
+#: ../src/e-util/e-filter-rule.c:1081
 msgid "All related"
 msgstr "Sve povezano"
 
-#: ../src/e-util/e-filter-rule.c:1081 ../src/e-util/e-send-options.ui.h:24
+#: ../src/e-util/e-filter-rule.c:1082 ../src/e-util/e-send-options.ui.h:24
 msgid "Replies"
 msgstr "Odgovori"
 
-#: ../src/e-util/e-filter-rule.c:1082
+#: ../src/e-util/e-filter-rule.c:1083
 msgid "Replies and parents"
 msgstr "Odgovori i nadređeno"
 
-#: ../src/e-util/e-filter-rule.c:1083
+#: ../src/e-util/e-filter-rule.c:1084
 msgid "No reply or parent"
 msgstr "Nema odgovora ili roditelja"
 
-#: ../src/e-util/e-filter-rule.c:1086
+#: ../src/e-util/e-filter-rule.c:1087
 msgid "I_nclude threads:"
 msgstr "Uključi _niti:"
 
-#: ../src/e-util/e-filter-rule.c:1164
+#: ../src/e-util/e-filter-rule.c:1165
 msgid "A_dd Condition"
 msgstr "Dodaj _uslov"
 
-#: ../src/e-util/e-filter-rule.c:1478 ../src/e-util/filter.ui.h:1
+#: ../src/e-util/e-filter-rule.c:1485 ../src/e-util/filter.ui.h:1
 #: ../src/mail/em-filter-rule.c:1043 ../src/mail/em-utils.c:166
 msgid "Incoming"
 msgstr "Dolazno"
 
-#: ../src/e-util/e-filter-rule.c:1478 ../src/mail/em-filter-rule.c:1044
+#: ../src/e-util/e-filter-rule.c:1485 ../src/mail/em-filter-rule.c:1044
 #: ../src/mail/em-utils.c:167
 msgid "Outgoing"
 msgstr "Odlazno"
@@ -13338,509 +13817,514 @@ msgstr "Ne mogu da umetnem HTML datoteku."
 msgid "Failed to insert text file."
 msgstr "Ne mogu da umetnem tekstualnu datoteku."
 
-#: ../src/e-util/e-html-editor-actions.c:319
+#: ../src/e-util/e-html-editor-actions.c:302
 msgid "Insert HTML File"
 msgstr "Umetni HTML datoteku"
 
-#: ../src/e-util/e-html-editor-actions.c:325
+#: ../src/e-util/e-html-editor-actions.c:307
 msgid "HTML file"
 msgstr "HTML datoteka"
 
+#: ../src/e-util/e-html-editor-actions.c:345
 #: ../src/e-util/e-html-editor-actions.c:355
 msgctxt "dialog-title"
 msgid "Insert Image"
 msgstr "Umetni sliku"
 
-#: ../src/e-util/e-html-editor-actions.c:413
+#: ../src/e-util/e-html-editor-actions.c:352
+msgid "Image file"
+msgstr "Slika"
+
+#: ../src/e-util/e-html-editor-actions.c:428
 msgid "Insert text file"
 msgstr "Umetni tekstualnu datoteku"
 
-#: ../src/e-util/e-html-editor-actions.c:419
+#: ../src/e-util/e-html-editor-actions.c:433
 msgid "Text file"
 msgstr "Tekstualna datoteka"
 
-#: ../src/e-util/e-html-editor-actions.c:880
+#: ../src/e-util/e-html-editor-actions.c:912
 msgid "Copy selected text to the clipboard"
 msgstr "Kopira izabrani tekst u spisak isečaka"
 
-#: ../src/e-util/e-html-editor-actions.c:887
+#: ../src/e-util/e-html-editor-actions.c:919
 msgid "Cut selected text to the clipboard"
 msgstr "Seče izabrani tekst u spisak isečaka"
 
 #. Widgets are treating Ctrl + v shortcut themselves
-#: ../src/e-util/e-html-editor-actions.c:894
+#: ../src/e-util/e-html-editor-actions.c:926
 msgid "Paste text from the clipboard"
 msgstr "Ubacuje tekst iz spiska isečaka"
 
-#: ../src/e-util/e-html-editor-actions.c:901
+#: ../src/e-util/e-html-editor-actions.c:933
 msgid "Redo the last undone action"
 msgstr "Ponavlja poslednju opozvanu radnju"
 
-#: ../src/e-util/e-html-editor-actions.c:915
+#: ../src/e-util/e-html-editor-actions.c:947
 msgid "Undo the last action"
 msgstr "Vraća poslednju radnju"
 
-#: ../src/e-util/e-html-editor-actions.c:936
+#: ../src/e-util/e-html-editor-actions.c:968
 msgid "For_mat"
 msgstr "_Format"
 
-#: ../src/e-util/e-html-editor-actions.c:943
+#: ../src/e-util/e-html-editor-actions.c:975
 msgid "_Paragraph Style"
 msgstr "Stil _pasusa"
 
-#: ../src/e-util/e-html-editor-actions.c:957
-#: ../src/e-util/e-html-editor-image-dialog.c:585
+#: ../src/e-util/e-html-editor-actions.c:989
+#: ../src/e-util/e-html-editor-image-dialog.c:590
 msgid "_Alignment"
 msgstr "Po_ravnanje"
 
-#: ../src/e-util/e-html-editor-actions.c:964
+#: ../src/e-util/e-html-editor-actions.c:996
 msgid "Current _Languages"
 msgstr "Trenutni _jezici"
 
-#: ../src/e-util/e-html-editor-actions.c:981
+#: ../src/e-util/e-html-editor-actions.c:1013
 msgid "_Increase Indent"
 msgstr "_Veće uvlačenje"
 
-#: ../src/e-util/e-html-editor-actions.c:983
+#: ../src/e-util/e-html-editor-actions.c:1015
 msgid "Increase Indent"
 msgstr "Veće uvlačenje"
 
-#: ../src/e-util/e-html-editor-actions.c:988
-msgid "_HTML File..."
-msgstr "_HTML datoteka..."
+#: ../src/e-util/e-html-editor-actions.c:1020
+msgid "_HTML File…"
+msgstr "_HTML datoteka…"
 
-#: ../src/e-util/e-html-editor-actions.c:995
-msgid "Te_xt File..."
-msgstr "_Tekstualna datoteka..."
+#: ../src/e-util/e-html-editor-actions.c:1027
+msgid "Te_xt File…"
+msgstr "_Tekstualna datoteka…"
 
-#: ../src/e-util/e-html-editor-actions.c:1002
+#: ../src/e-util/e-html-editor-actions.c:1034
 msgid "Paste _Quotation"
 msgstr "Umetni _citat"
 
-#: ../src/e-util/e-html-editor-actions.c:1009
-msgid "_Find..."
-msgstr "_Nađi..."
+#: ../src/e-util/e-html-editor-actions.c:1041
+msgid "_Find…"
+msgstr "_Nađi…"
 
-#: ../src/e-util/e-html-editor-actions.c:1011
+#: ../src/e-util/e-html-editor-actions.c:1043
 msgid "Search for text"
 msgstr "Tekst za pretragu"
 
-#: ../src/e-util/e-html-editor-actions.c:1016
+#: ../src/e-util/e-html-editor-actions.c:1048
 msgid "Find A_gain"
 msgstr "N_ađi naredno"
 
-#: ../src/e-util/e-html-editor-actions.c:1023
-msgid "Re_place..."
-msgstr "_Zameni..."
+#: ../src/e-util/e-html-editor-actions.c:1055
+msgid "Re_place…"
+msgstr "_Zameni…"
 
-#: ../src/e-util/e-html-editor-actions.c:1025
+#: ../src/e-util/e-html-editor-actions.c:1057
 msgid "Search for and replace text"
 msgstr "Traži željeni tekst i menja ga drugim"
 
-#: ../src/e-util/e-html-editor-actions.c:1030
-msgid "Check _Spelling..."
-msgstr "_Proveri pisanje..."
+#: ../src/e-util/e-html-editor-actions.c:1062
+msgid "Check _Spelling…"
+msgstr "_Proveri pisanje…"
 
-#: ../src/e-util/e-html-editor-actions.c:1037
+#: ../src/e-util/e-html-editor-actions.c:1069
 msgid "_Decrease Indent"
 msgstr "_Manje uvlačenje"
 
-#: ../src/e-util/e-html-editor-actions.c:1039
+#: ../src/e-util/e-html-editor-actions.c:1071
 msgid "Decrease Indent"
 msgstr "Manje uvlačenje"
 
-#: ../src/e-util/e-html-editor-actions.c:1044
+#: ../src/e-util/e-html-editor-actions.c:1076
 msgid "_Wrap Lines"
 msgstr "P_relom linija"
 
 #. Center
-#: ../src/e-util/e-html-editor-actions.c:1054
+#: ../src/e-util/e-html-editor-actions.c:1086
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:108
 msgid "_Center"
 msgstr "_Sredina"
 
-#: ../src/e-util/e-html-editor-actions.c:1056
+#: ../src/e-util/e-html-editor-actions.c:1088
 msgid "Center Alignment"
 msgstr "Središnje poravnanje"
 
 #. Left
-#: ../src/e-util/e-html-editor-actions.c:1061
+#: ../src/e-util/e-html-editor-actions.c:1093
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:99
 msgid "_Left"
 msgstr "_Levo"
 
-#: ../src/e-util/e-html-editor-actions.c:1063
+#: ../src/e-util/e-html-editor-actions.c:1095
 msgid "Left Alignment"
 msgstr "Poravnanje po levoj strani"
 
 #. Right
-#: ../src/e-util/e-html-editor-actions.c:1068
+#: ../src/e-util/e-html-editor-actions.c:1100
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:117
 msgid "_Right"
 msgstr "_Desno"
 
-#: ../src/e-util/e-html-editor-actions.c:1070
+#: ../src/e-util/e-html-editor-actions.c:1102
 msgid "Right Alignment"
 msgstr "Poravnanje po desnoj strani"
 
-#: ../src/e-util/e-html-editor-actions.c:1078
+#: ../src/e-util/e-html-editor-actions.c:1110
 #: ../src/modules/text-highlight/languages.c:70
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../src/e-util/e-html-editor-actions.c:1080
+#: ../src/e-util/e-html-editor-actions.c:1112
 msgid "HTML editing mode"
 msgstr "Režim za uređivanje HTML poruke"
 
-#: ../src/e-util/e-html-editor-actions.c:1085
+#: ../src/e-util/e-html-editor-actions.c:1117
 msgid "Plain _Text"
 msgstr "Običan _tekst"
 
-#: ../src/e-util/e-html-editor-actions.c:1087
+#: ../src/e-util/e-html-editor-actions.c:1119
 msgid "Plain text editing mode"
 msgstr "Režim uređivanja za običan tekst"
 
-#: ../src/e-util/e-html-editor-actions.c:1095
+#: ../src/e-util/e-html-editor-actions.c:1127
 msgid "_Normal"
 msgstr "_Obično"
 
-#: ../src/e-util/e-html-editor-actions.c:1102
+#: ../src/e-util/e-html-editor-actions.c:1134
 msgid "Heading _1"
 msgstr "Naslov _1"
 
-#: ../src/e-util/e-html-editor-actions.c:1109
+#: ../src/e-util/e-html-editor-actions.c:1141
 msgid "Heading _2"
 msgstr "Naslov _2"
 
-#: ../src/e-util/e-html-editor-actions.c:1116
+#: ../src/e-util/e-html-editor-actions.c:1148
 msgid "Heading _3"
 msgstr "Naslov _3"
 
-#: ../src/e-util/e-html-editor-actions.c:1123
+#: ../src/e-util/e-html-editor-actions.c:1155
 msgid "Heading _4"
 msgstr "Naslov _4"
 
-#: ../src/e-util/e-html-editor-actions.c:1130
+#: ../src/e-util/e-html-editor-actions.c:1162
 msgid "Heading _5"
 msgstr "Naslov _5"
 
-#: ../src/e-util/e-html-editor-actions.c:1137
+#: ../src/e-util/e-html-editor-actions.c:1169
 msgid "Heading _6"
 msgstr "Naslov _6"
 
-#: ../src/e-util/e-html-editor-actions.c:1144
+#: ../src/e-util/e-html-editor-actions.c:1176
 msgid "_Preformatted"
 msgstr "Pr_edodređeno"
 
-#: ../src/e-util/e-html-editor-actions.c:1151
+#: ../src/e-util/e-html-editor-actions.c:1183
 msgid "A_ddress"
 msgstr "A_dresa"
 
-#: ../src/e-util/e-html-editor-actions.c:1158
+#: ../src/e-util/e-html-editor-actions.c:1190
 msgid "_Bulleted List"
 msgstr "Nabrajanje _simbolima"
 
-#: ../src/e-util/e-html-editor-actions.c:1165
+#: ../src/e-util/e-html-editor-actions.c:1197
 msgid "_Roman Numeral List"
 msgstr "Nabrajanje _rimskim brojevima"
 
-#: ../src/e-util/e-html-editor-actions.c:1172
+#: ../src/e-util/e-html-editor-actions.c:1204
 msgid "Numbered _List"
 msgstr "Nabrajanje _brojevima"
 
-#: ../src/e-util/e-html-editor-actions.c:1179
+#: ../src/e-util/e-html-editor-actions.c:1211
 msgid "_Alphabetical List"
 msgstr "Narajanje s_lovima"
 
-#: ../src/e-util/e-html-editor-actions.c:1195
-#: ../src/e-util/e-html-editor-actions.c:1233
-msgid "_Image..."
-msgstr "_Slika..."
+#: ../src/e-util/e-html-editor-actions.c:1227
+#: ../src/e-util/e-html-editor-actions.c:1265
+msgid "_Image…"
+msgstr "_Slika…"
 
 #. Translators: This is an action tooltip
-#: ../src/e-util/e-html-editor-actions.c:1198
+#: ../src/e-util/e-html-editor-actions.c:1230
 msgid "Insert Image"
 msgstr "Umeće sliku"
 
-#: ../src/e-util/e-html-editor-actions.c:1203
-#: ../src/e-util/e-html-editor-actions.c:1240
-msgid "_Link..."
-msgstr "_Veza..."
+#: ../src/e-util/e-html-editor-actions.c:1235
+#: ../src/e-util/e-html-editor-actions.c:1272
+msgid "_Link…"
+msgstr "_Veza…"
 
-#: ../src/e-util/e-html-editor-actions.c:1205
+#: ../src/e-util/e-html-editor-actions.c:1237
 msgid "Insert Link"
 msgstr "Umeće vezu"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1211
-#: ../src/e-util/e-html-editor-actions.c:1255
-msgid "_Rule..."
-msgstr "Pravi_lo..."
+#: ../src/e-util/e-html-editor-actions.c:1243
+#: ../src/e-util/e-html-editor-actions.c:1287
+msgid "_Rule…"
+msgstr "_Pravilo…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1214
+#: ../src/e-util/e-html-editor-actions.c:1246
 msgid "Insert Rule"
 msgstr "Umeće pravilo"
 
-#: ../src/e-util/e-html-editor-actions.c:1219
-#: ../src/e-util/e-html-editor-actions.c:1262
-msgid "_Table..."
-msgstr "_Tabela..."
+#: ../src/e-util/e-html-editor-actions.c:1251
+#: ../src/e-util/e-html-editor-actions.c:1294
+msgid "_Table…"
+msgstr "_Tabela…"
 
-#: ../src/e-util/e-html-editor-actions.c:1221
+#: ../src/e-util/e-html-editor-actions.c:1253
 msgid "Insert Table"
 msgstr "Umeće tabelu"
 
-#: ../src/e-util/e-html-editor-actions.c:1226
-msgid "_Cell..."
-msgstr "_Ćelija..."
+#: ../src/e-util/e-html-editor-actions.c:1258
+msgid "_Cell…"
+msgstr "_Ćelija…"
 
-#: ../src/e-util/e-html-editor-actions.c:1247
-msgid "Pa_ge..."
-msgstr "St_ranica..."
+#: ../src/e-util/e-html-editor-actions.c:1279
+msgid "Pa_ge…"
+msgstr "St_ranica…"
 
-#: ../src/e-util/e-html-editor-actions.c:1271
+#: ../src/e-util/e-html-editor-actions.c:1303
 msgid "Font _Size"
 msgstr "Veličina _fonta"
 
-#: ../src/e-util/e-html-editor-actions.c:1278
+#: ../src/e-util/e-html-editor-actions.c:1310
 msgid "_Font Style"
 msgstr "Vrsta fo_nta"
 
-#: ../src/e-util/e-html-editor-actions.c:1285
+#: ../src/e-util/e-html-editor-actions.c:1317
 msgid "Paste As _Text"
 msgstr "Umetni _kao tekst"
 
-#: ../src/e-util/e-html-editor-actions.c:1296
+#: ../src/e-util/e-html-editor-actions.c:1328
 #: ../src/e-util/e-html-editor-text-dialog.c:201
 msgid "_Bold"
 msgstr "_Podebljano"
 
-#: ../src/e-util/e-html-editor-actions.c:1298
+#: ../src/e-util/e-html-editor-actions.c:1330
 msgid "Bold"
 msgstr "Podebljano"
 
-#: ../src/e-util/e-html-editor-actions.c:1304
+#: ../src/e-util/e-html-editor-actions.c:1336
 #: ../src/e-util/e-html-editor-text-dialog.c:212
 msgid "_Italic"
 msgstr "_Iskošeno"
 
-#: ../src/e-util/e-html-editor-actions.c:1306
+#: ../src/e-util/e-html-editor-actions.c:1338
 msgid "Italic"
 msgstr "Iskošeno"
 
-#: ../src/e-util/e-html-editor-actions.c:1312
+#: ../src/e-util/e-html-editor-actions.c:1344
 msgid "_Plain Text"
 msgstr "O_bičan tekst"
 
-#: ../src/e-util/e-html-editor-actions.c:1320
+#: ../src/e-util/e-html-editor-actions.c:1352
 #: ../src/e-util/e-html-editor-text-dialog.c:233
 msgid "_Strikethrough"
 msgstr "Pre_crtano"
 
-#: ../src/e-util/e-html-editor-actions.c:1322
+#: ../src/e-util/e-html-editor-actions.c:1354
 msgid "Strikethrough"
 msgstr "Precrtano"
 
-#: ../src/e-util/e-html-editor-actions.c:1328
+#: ../src/e-util/e-html-editor-actions.c:1360
 #: ../src/e-util/e-html-editor-text-dialog.c:223
 msgid "_Underline"
 msgstr "Podv_učeno"
 
-#: ../src/e-util/e-html-editor-actions.c:1330
+#: ../src/e-util/e-html-editor-actions.c:1362
 msgid "Underline"
 msgstr "Podvučeni tekst"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1340
+#: ../src/e-util/e-html-editor-actions.c:1372
 msgid "-2"
 msgstr "-2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1348
+#: ../src/e-util/e-html-editor-actions.c:1380
 msgid "-1"
 msgstr "-1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1356
+#: ../src/e-util/e-html-editor-actions.c:1388
 msgid "+0"
 msgstr "+0"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1364
+#: ../src/e-util/e-html-editor-actions.c:1396
 msgid "+1"
 msgstr "+1"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1372
+#: ../src/e-util/e-html-editor-actions.c:1404
 msgid "+2"
 msgstr "+2"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1380
+#: ../src/e-util/e-html-editor-actions.c:1412
 msgid "+3"
 msgstr "+3"
 
 #. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
-#: ../src/e-util/e-html-editor-actions.c:1388
+#: ../src/e-util/e-html-editor-actions.c:1420
 msgid "+4"
 msgstr "+4"
 
-#: ../src/e-util/e-html-editor-actions.c:1407
+#: ../src/e-util/e-html-editor-actions.c:1439
 msgid "Cell Contents"
 msgstr "Sadržaj ćelije"
 
-#: ../src/e-util/e-html-editor-actions.c:1414
+#: ../src/e-util/e-html-editor-actions.c:1446
 msgid "Column"
 msgstr "Kolona"
 
-#: ../src/e-util/e-html-editor-actions.c:1421
+#: ../src/e-util/e-html-editor-actions.c:1453
 msgid "Row"
 msgstr "Red"
 
-#: ../src/e-util/e-html-editor-actions.c:1428
+#: ../src/e-util/e-html-editor-actions.c:1460
 msgid "Table"
 msgstr "Tabela"
 
 #. Translators: Popup menu item caption, containing all the Delete options for a table
-#: ../src/e-util/e-html-editor-actions.c:1438
+#: ../src/e-util/e-html-editor-actions.c:1470
 msgid "Table Delete"
 msgstr "Brisanje tabele"
 
 #. Translators: Popup menu item caption, containing all the Insert options for a table
-#: ../src/e-util/e-html-editor-actions.c:1446
+#: ../src/e-util/e-html-editor-actions.c:1478
 msgid "Table Insert"
 msgstr "Umetanje tabele"
 
-#: ../src/e-util/e-html-editor-actions.c:1453
+#: ../src/e-util/e-html-editor-actions.c:1485
 msgid "Properties"
 msgstr "Osobine"
 
-#: ../src/e-util/e-html-editor-actions.c:1471
+#: ../src/e-util/e-html-editor-actions.c:1503
 msgid "Column After"
 msgstr "Kolona nakon"
 
-#: ../src/e-util/e-html-editor-actions.c:1478
+#: ../src/e-util/e-html-editor-actions.c:1510
 msgid "Column Before"
 msgstr "Kolona pre"
 
-#: ../src/e-util/e-html-editor-actions.c:1485
+#: ../src/e-util/e-html-editor-actions.c:1517
 msgid "Insert _Link"
 msgstr "Umetni _vezu"
 
-#: ../src/e-util/e-html-editor-actions.c:1492
+#: ../src/e-util/e-html-editor-actions.c:1524
 msgid "Row Above"
 msgstr "Red iznad"
 
-#: ../src/e-util/e-html-editor-actions.c:1499
+#: ../src/e-util/e-html-editor-actions.c:1531
 msgid "Row Below"
 msgstr "Red ispod"
 
-#: ../src/e-util/e-html-editor-actions.c:1506
-msgid "Cell..."
-msgstr "Ćelija..."
+#: ../src/e-util/e-html-editor-actions.c:1538
+msgid "Cell…"
+msgstr "Ćelija…"
 
-#: ../src/e-util/e-html-editor-actions.c:1513
-msgid "Image..."
-msgstr "Slika..."
+#: ../src/e-util/e-html-editor-actions.c:1545
+msgid "Image…"
+msgstr "Slika…"
 
-#: ../src/e-util/e-html-editor-actions.c:1520
-msgid "Link..."
-msgstr "Veza..."
+#: ../src/e-util/e-html-editor-actions.c:1552
+msgid "Link…"
+msgstr "_Veza…"
 
-#: ../src/e-util/e-html-editor-actions.c:1527
-msgid "Page..."
-msgstr "Stranica..."
+#: ../src/e-util/e-html-editor-actions.c:1559
+msgid "Page…"
+msgstr "Stranica…"
 
-#: ../src/e-util/e-html-editor-actions.c:1534
-msgid "Paragraph..."
-msgstr "Pasus..."
+#: ../src/e-util/e-html-editor-actions.c:1566
+msgid "Paragraph…"
+msgstr "Pasus…"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1542
-msgid "Rule..."
-msgstr "Pravilo..."
+#: ../src/e-util/e-html-editor-actions.c:1574
+msgid "Rule…"
+msgstr "Pravilo…"
 
-#: ../src/e-util/e-html-editor-actions.c:1549
-msgid "Table..."
-msgstr "Tabele..."
+#: ../src/e-util/e-html-editor-actions.c:1581
+msgid "Table…"
+msgstr "Tabela…"
 
-#: ../src/e-util/e-html-editor-actions.c:1556
-msgid "Text..."
-msgstr "Tekst..."
+#: ../src/e-util/e-html-editor-actions.c:1588
+msgid "Text…"
+msgstr "Tekst…"
 
-#: ../src/e-util/e-html-editor-actions.c:1563
+#: ../src/e-util/e-html-editor-actions.c:1595
 msgid "Remove Link"
 msgstr "Ukloni vezu"
 
-#: ../src/e-util/e-html-editor-actions.c:1580
+#: ../src/e-util/e-html-editor-actions.c:1612
 msgid "Add Word to Dictionary"
 msgstr "Dodaj reč u rečnik"
 
-#: ../src/e-util/e-html-editor-actions.c:1587
+#: ../src/e-util/e-html-editor-actions.c:1619
 msgid "Ignore Misspelled Word"
 msgstr "Zanemari pogrešno napisane reči"
 
-#: ../src/e-util/e-html-editor-actions.c:1594
+#: ../src/e-util/e-html-editor-actions.c:1626
 msgid "Add Word To"
 msgstr "Dodaj reč u"
 
-#: ../src/e-util/e-html-editor-actions.c:1603
+#: ../src/e-util/e-html-editor-actions.c:1635
 msgid "More Suggestions"
 msgstr "Još predloga"
 
 #. Translators: %s will be replaced with the actual dictionary
 #. * name, where a user can add a word to. This is part of an
 #. * "Add Word To" submenu.
-#: ../src/e-util/e-html-editor-actions.c:1727
+#: ../src/e-util/e-html-editor-actions.c:1870
 #, c-format
 msgid "%s Dictionary"
 msgstr "%s rečnik"
 
-#: ../src/e-util/e-html-editor-actions.c:1806
+#: ../src/e-util/e-html-editor-actions.c:1949
 msgid "_Emoticon"
 msgstr "_Smajlić"
 
 # shell:noshell-reason title
-#: ../src/e-util/e-html-editor-actions.c:1807
+#: ../src/e-util/e-html-editor-actions.c:1950
 msgid "Insert Emoticon"
 msgstr "Umetni smajlić"
 
-#: ../src/e-util/e-html-editor-actions.c:1875
+#: ../src/e-util/e-html-editor-actions.c:2018
 msgid "Re_place"
 msgstr "_Zameni"
 
-#: ../src/e-util/e-html-editor-actions.c:1878
+#: ../src/e-util/e-html-editor-actions.c:2021
 msgid "_Image"
 msgstr "_Slika"
 
-#: ../src/e-util/e-html-editor-actions.c:1881
+#: ../src/e-util/e-html-editor-actions.c:2024
 msgid "_Link"
 msgstr "_Veza"
 
 #. Translators: 'Rule' here means a horizontal line in an HTML text
-#: ../src/e-util/e-html-editor-actions.c:1885
+#: ../src/e-util/e-html-editor-actions.c:2028
 msgid "_Rule"
 msgstr "_Pravilo"
 
-#: ../src/e-util/e-html-editor-actions.c:1888
+#: ../src/e-util/e-html-editor-actions.c:2031
 #: ../src/e-util/e-html-editor-cell-dialog.c:448
 msgid "_Table"
 msgstr "_Tabela"
 
-#: ../src/e-util/e-html-editor.c:742
+#: ../src/e-util/e-html-editor.c:743
 msgid "Paragraph Style"
 msgstr "Stil pasusa"
 
-#: ../src/e-util/e-html-editor.c:756
+#: ../src/e-util/e-html-editor.c:757
 msgid "Editing Mode"
 msgstr "Režim za uređivanje"
 
-#: ../src/e-util/e-html-editor.c:768
+#: ../src/e-util/e-html-editor.c:769
 msgid "Font Color"
 msgstr "Boja fonta"
 
-#: ../src/e-util/e-html-editor.c:778
+#: ../src/e-util/e-html-editor.c:779
 msgid "Font Size"
 msgstr "Veličina fonta"
 
@@ -13866,19 +14350,19 @@ msgstr "<b>Poravnanje i ponašanje</b>"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:484
 #: ../src/e-util/e-html-editor-hrule-dialog.c:328
-#: ../src/e-util/e-html-editor-table-dialog.c:649
+#: ../src/e-util/e-html-editor-table-dialog.c:648
 msgid "Left"
 msgstr "Levo"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:485
 #: ../src/e-util/e-html-editor-hrule-dialog.c:330
-#: ../src/e-util/e-html-editor-table-dialog.c:650
+#: ../src/e-util/e-html-editor-table-dialog.c:649
 msgid "Center"
 msgstr "Sredina"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:486
 #: ../src/e-util/e-html-editor-hrule-dialog.c:332
-#: ../src/e-util/e-html-editor-table-dialog.c:651
+#: ../src/e-util/e-html-editor-table-dialog.c:650
 msgid "Right"
 msgstr "Desno"
 
@@ -13889,17 +14373,17 @@ msgid "_Horizontal:"
 msgstr "_Vodoravno:"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:502
-#: ../src/e-util/e-html-editor-image-dialog.c:575
+#: ../src/e-util/e-html-editor-image-dialog.c:580
 msgid "Top"
 msgstr "Vrh"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:503
-#: ../src/e-util/e-html-editor-image-dialog.c:576
+#: ../src/e-util/e-html-editor-image-dialog.c:581
 msgid "Middle"
 msgstr "Sredina"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:504
-#: ../src/e-util/e-html-editor-image-dialog.c:577
+#: ../src/e-util/e-html-editor-image-dialog.c:582
 msgid "Bottom"
 msgstr "Dno"
 
@@ -13918,8 +14402,8 @@ msgid "_Header Style"
 msgstr "Vrsta _zaglavlja"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:540
-#: ../src/e-util/e-html-editor-image-dialog.c:515
-#: ../src/e-util/e-html-editor-table-dialog.c:561
+#: ../src/e-util/e-html-editor-image-dialog.c:520
+#: ../src/e-util/e-html-editor-table-dialog.c:560
 msgid "<b>Layout</b>"
 msgstr "<b>Raspored</b>"
 
@@ -13937,12 +14421,12 @@ msgid "Co_lumn Span:"
 msgstr "R_aspon kolone:"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:612
-#: ../src/e-util/e-html-editor-table-dialog.c:665
+#: ../src/e-util/e-html-editor-table-dialog.c:664
 msgid "<b>Background</b>"
 msgstr "<b>Pozadina</b>"
 
 #: ../src/e-util/e-html-editor-cell-dialog.c:625
-#: ../src/e-util/e-html-editor-table-dialog.c:678
+#: ../src/e-util/e-html-editor-table-dialog.c:677
 msgid "Transparent"
 msgstr "Providna"
 
@@ -13950,29 +14434,32 @@ msgstr "Providna"
 msgid "C_olor:"
 msgstr "_Boja:"
 
-#: ../src/e-util/e-html-editor-cell-dialog.c:641
-#: ../src/e-util/e-html-editor-image-dialog.c:477
-#: ../src/e-util/e-html-editor-table-dialog.c:694
-msgid "Choose Background Image"
-msgstr "Izaberite boju pozadine"
-
-#: ../src/e-util/e-html-editor-cell-dialog.c:646
-#: ../src/e-util/e-html-editor-image-dialog.c:483
-#: ../src/e-util/e-html-editor-table-dialog.c:699
+#: ../src/e-util/e-html-editor-cell-dialog.c:640
+#: ../src/e-util/e-html-editor-image-dialog.c:476
+#: ../src/e-util/e-html-editor-table-dialog.c:692
 msgid "Images"
 msgstr "Slike"
 
-#: ../src/e-util/e-html-editor-cell-dialog.c:659
+#: ../src/e-util/e-html-editor-cell-dialog.c:645
+#: ../src/e-util/e-html-editor-cell-dialog.c:648
+#: ../src/e-util/e-html-editor-image-dialog.c:481
+#: ../src/e-util/e-html-editor-image-dialog.c:484
+#: ../src/e-util/e-html-editor-table-dialog.c:697
+#: ../src/e-util/e-html-editor-table-dialog.c:702
+msgid "Choose Background Image"
+msgstr "Izaberite boju pozadine"
+
+#: ../src/e-util/e-html-editor-cell-dialog.c:662
 msgid "_Image:"
 msgstr "_Slika:"
 
-#: ../src/e-util/e-html-editor-cell-dialog.c:666
+#: ../src/e-util/e-html-editor-cell-dialog.c:669
 #: ../src/e-util/e-html-editor-page-dialog.c:495
-#: ../src/e-util/e-html-editor-table-dialog.c:719
+#: ../src/e-util/e-html-editor-table-dialog.c:723
 msgid "_Remove image"
 msgstr "U_kloni sliku"
 
-#: ../src/e-util/e-html-editor-cell-dialog.c:686
+#: ../src/e-util/e-html-editor-cell-dialog.c:689
 msgid "Cell Properties"
 msgstr "Osobine ćelije"
 
@@ -13994,7 +14481,7 @@ msgstr "_Razlikuj velika slova"
 msgid "_Wrap Search"
 msgstr "Pre_lamaj"
 
-#: ../src/e-util/e-html-editor-find-dialog.c:268
+#: ../src/e-util/e-html-editor-find-dialog.c:262
 msgid "Find"
 msgstr "Nađi"
 
@@ -14004,8 +14491,8 @@ msgstr "<b>Veličina</b>"
 
 #. Width
 #: ../src/e-util/e-html-editor-hrule-dialog.c:283
-#: ../src/e-util/e-html-editor-image-dialog.c:533
-#: ../src/e-util/e-html-editor-table-dialog.c:572
+#: ../src/e-util/e-html-editor-image-dialog.c:538
+#: ../src/e-util/e-html-editor-table-dialog.c:571
 msgid "_Width:"
 msgstr "_Širina:"
 
@@ -14018,7 +14505,7 @@ msgid "<b>Style</b>"
 msgstr "<b>Stil</b>"
 
 #: ../src/e-util/e-html-editor-hrule-dialog.c:340
-#: ../src/e-util/e-html-editor-table-dialog.c:658
+#: ../src/e-util/e-html-editor-table-dialog.c:657
 msgid "_Alignment:"
 msgstr "Po_ravnanje:"
 
@@ -14033,54 +14520,53 @@ msgstr "Osobine pravila"
 
 #: ../src/e-util/e-html-editor-image-dialog.c:465
 #: ../src/e-util/e-html-editor-paragraph-dialog.c:64
-#: ../src/e-util/e-html-editor-table-dialog.c:515
+#: ../src/e-util/e-html-editor-table-dialog.c:514
 msgid "<b>General</b>"
 msgstr "<b>Opšte</b>"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:494
+#: ../src/e-util/e-html-editor-image-dialog.c:499
 msgid "_Source:"
 msgstr "I_zvor:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:557
+#: ../src/e-util/e-html-editor-image-dialog.c:562
 msgid "_Height:"
 msgstr "_Visina:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:598
+#: ../src/e-util/e-html-editor-image-dialog.c:603
 msgid "_X-Padding:"
 msgstr "X-_popuna:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:614
+#: ../src/e-util/e-html-editor-image-dialog.c:619
 msgid "_Y-Padding:"
 msgstr "Y-p_opuna:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:630
-#: ../src/e-util/e-html-editor-table-dialog.c:639
+#: ../src/e-util/e-html-editor-image-dialog.c:635
+#: ../src/e-util/e-html-editor-table-dialog.c:638
 msgid "_Border:"
 msgstr "_Ivica:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:640
+#: ../src/e-util/e-html-editor-image-dialog.c:645
 msgid "<b>Link</b>"
 msgstr "<b>Veza</b>"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:658
-#: ../src/e-util/e-html-editor-link-dialog.c:219
+#: ../src/e-util/e-html-editor-image-dialog.c:663
+#: ../src/e-util/e-html-editor-link-dialog.c:213
 msgid "_URL:"
 msgstr "_URL:"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:663
-#: ../src/e-util/e-html-editor-link-dialog.c:224
-msgid "_Test URL..."
-msgstr "_Testiraj adresu..."
+#: ../src/e-util/e-html-editor-image-dialog.c:668
+msgid "_Test URL…"
+msgstr "_Proveri adresu…"
 
-#: ../src/e-util/e-html-editor-image-dialog.c:680
+#: ../src/e-util/e-html-editor-image-dialog.c:685
 msgid "Image Properties"
 msgstr "Osobine slike"
 
-#: ../src/e-util/e-html-editor-link-dialog.c:248
+#: ../src/e-util/e-html-editor-link-dialog.c:236
 msgid "_Remove Link"
 msgstr "_Ukloni vezu"
 
-#: ../src/e-util/e-html-editor-link-dialog.c:273
+#: ../src/e-util/e-html-editor-link-dialog.c:261
 msgid "Link Properties"
 msgstr "Osobine veze"
 
@@ -14139,12 +14625,12 @@ msgid "<b>Background Image</b>"
 msgstr "<b>Pozadinska slika</b>"
 
 #: ../src/e-util/e-html-editor-page-dialog.c:473
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:89
 msgid "_Template:"
 msgstr "_Šablon:"
 
 #: ../src/e-util/e-html-editor-page-dialog.c:481
-#: ../src/e-util/e-import-assistant.c:286
+#: ../src/e-util/e-import-assistant.c:287
 msgid "Select a file"
 msgstr "Izaberite datoteku"
 
@@ -14216,77 +14702,77 @@ msgstr "Zameni"
 msgid "<b>Suggestions for “%s”</b>"
 msgstr "<b>Predlog za „%s“</b>"
 
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:388
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:387
 msgid "<b>Suggestions</b>"
 msgstr "<b>Predlozi</b>"
 
 #. Replace
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:423
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:422
 msgid "Replace"
 msgstr "Zameni"
 
 #. Replace All
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:432
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:431
 msgid "Replace All"
 msgstr "Zameni sve"
 
 #. Ignore
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:441
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:440
 #: ../src/mail/mail.error.xml.h:116
 msgid "Ignore"
 msgstr "Zanemari"
 
 #. Skip
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:450
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:449
 msgid "Skip"
 msgstr "Preskoči"
 
 #. Back
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:459
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:458
 msgid "Back"
 msgstr "Nazad"
 
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:468
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:467
 msgid "<b>Dictionary</b>"
 msgstr "<b>Rečnik</b>"
 
 #. Add Word button
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:488
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:487
 msgid "Add word"
 msgstr "Dodaj reč"
 
-#: ../src/e-util/e-html-editor-spell-check-dialog.c:505
-#: ../src/mail/mail-config.ui.h:40
+#: ../src/e-util/e-html-editor-spell-check-dialog.c:504
+#: ../src/mail/mail-config.ui.h:42
 msgid "Spell Checking"
 msgstr "Provera pravopisa"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:537
+#: ../src/e-util/e-html-editor-table-dialog.c:536
 msgid "_Rows:"
 msgstr "_Redovi:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:554
+#: ../src/e-util/e-html-editor-table-dialog.c:553
 msgid "C_olumns:"
 msgstr "_Kolone:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:605
+#: ../src/e-util/e-html-editor-table-dialog.c:604
 msgid "_Spacing:"
 msgstr "_Razmak:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:622
+#: ../src/e-util/e-html-editor-table-dialog.c:621
 msgid "_Padding:"
 msgstr "_Okvir:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:686
+#: ../src/e-util/e-html-editor-table-dialog.c:685
 #: ../src/e-util/e-html-editor-text-dialog.c:248
-#: ../src/e-util/e-webdav-browser.c:2418
+#: ../src/e-util/e-webdav-browser.c:2427
 msgid "_Color:"
 msgstr "_Boja:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:712
+#: ../src/e-util/e-html-editor-table-dialog.c:716
 msgid "Image:"
 msgstr "Slika:"
 
-#: ../src/e-util/e-html-editor-table-dialog.c:739
+#: ../src/e-util/e-html-editor-table-dialog.c:743
 msgid "Table Properties"
 msgstr "Osobine tabele"
 
@@ -14306,34 +14792,34 @@ msgstr ""
 "Izaberite datoteku koju želite da uvezete u Evoluciju i iz liste izaberite "
 "kojeg je tipa ta datoteka."
 
-#: ../src/e-util/e-import-assistant.c:300
-#: ../src/e-util/e-import-assistant.c:475
+#: ../src/e-util/e-import-assistant.c:301
+#: ../src/e-util/e-import-assistant.c:480
 msgid "File _type:"
 msgstr "_Vrsta datoteke:"
 
-#: ../src/e-util/e-import-assistant.c:343
-#: ../src/e-util/e-import-assistant.c:948
+#: ../src/e-util/e-import-assistant.c:344
+#: ../src/e-util/e-import-assistant.c:962
 msgid "Choose the destination for this import"
 msgstr "Izaberite odredište za ovaj uvoz"
 
-#: ../src/e-util/e-import-assistant.c:368
+#: ../src/e-util/e-import-assistant.c:370
 msgid "Choose the type of importer to run:"
 msgstr "Izaberite vrstu uvoznika:"
 
-#: ../src/e-util/e-import-assistant.c:376
+#: ../src/e-util/e-import-assistant.c:379
 msgid "Import data and settings from _older programs"
 msgstr "Uvezi podatke i podešavanja iz _starijih programa"
 
-#: ../src/e-util/e-import-assistant.c:384
+#: ../src/e-util/e-import-assistant.c:387
 msgid "Import a _single file"
 msgstr "Uvezi _jednu datoteku"
 
-#: ../src/e-util/e-import-assistant.c:406
+#: ../src/e-util/e-import-assistant.c:409
 #: ../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
+#: ../src/e-util/e-import-assistant.c:541
 msgid ""
 "Evolution checked for settings to import from the following applications: "
 "Pine, Netscape, Elm, iCalendar, KMail. No importable settings found. If you "
@@ -14343,44 +14829,44 @@ msgstr ""
 "Elm, iKalendar, K-pošta. Nema podešavanja za uvoz. Ukoliko želite da pokušate "
 "ponovo, kliknite na dugme „Nazad“."
 
-#: ../src/e-util/e-import-assistant.c:562
+#: ../src/e-util/e-import-assistant.c:568
 #: ../src/modules/startup-wizard/e-mail-config-import-page.c:238
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
 
 #. Install a custom "Cancel Import" button.
-#: ../src/e-util/e-import-assistant.c:808
+#: ../src/e-util/e-import-assistant.c:814
 msgid "_Cancel Import"
 msgstr "_Otkaži uvoženje"
 
-#: ../src/e-util/e-import-assistant.c:947
+#: ../src/e-util/e-import-assistant.c:961
 msgid "Preview data to be imported"
 msgstr "Pregledaj podatke koji se uvoze"
 
-#: ../src/e-util/e-import-assistant.c:953
-#: ../src/e-util/e-import-assistant.c:966
-#: ../src/e-util/e-import-assistant.c:1319
-#: ../src/e-util/e-import-assistant.c:1395
-#: ../src/e-util/e-import-assistant.c:1404
+#: ../src/e-util/e-import-assistant.c:967
+#: ../src/e-util/e-import-assistant.c:980
+#: ../src/e-util/e-import-assistant.c:1333
+#: ../src/e-util/e-import-assistant.c:1410
+#: ../src/e-util/e-import-assistant.c:1419
 msgid "Import Data"
 msgstr "Uvezi podatke"
 
-#: ../src/e-util/e-import-assistant.c:961
+#: ../src/e-util/e-import-assistant.c:975
 msgid "Select what type of file you want to import from the list."
 msgstr "Izaberite sa spiska koje vrste datoteka želite da uvezete."
 
-#: ../src/e-util/e-import-assistant.c:1309
-#: ../src/e-util/e-import-assistant.c:1344
+#: ../src/e-util/e-import-assistant.c:1323
+#: ../src/e-util/e-import-assistant.c:1359
 msgid "Evolution Import Assistant"
 msgstr "Pomoćnik Evolucije za uvoz"
 
-#: ../src/e-util/e-import-assistant.c:1326
-#: ../src/e-util/e-import-assistant.c:1382
+#: ../src/e-util/e-import-assistant.c:1340
+#: ../src/e-util/e-import-assistant.c:1397
 msgid "Import Location"
 msgstr "Uvezi lokaciju"
 
-#: ../src/e-util/e-import-assistant.c:1337
+#: ../src/e-util/e-import-assistant.c:1352
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -14390,31 +14876,48 @@ msgstr ""
 "Ovaj pomoćnik će vas provesti kroz postupak uvoza spoljnih datoteka u "
 "Evoluciju."
 
-#: ../src/e-util/e-import-assistant.c:1354
+#: ../src/e-util/e-import-assistant.c:1369
 msgid "Importer Type"
 msgstr "Vrsta uvoznika"
 
-#: ../src/e-util/e-import-assistant.c:1364
+#: ../src/e-util/e-import-assistant.c:1379
 msgid "Select Information to Import"
 msgstr "Izaberite informaciju za uvoz"
 
-#: ../src/e-util/e-import-assistant.c:1373
+#: ../src/e-util/e-import-assistant.c:1388
 msgid "Select a File"
 msgstr "Izaberite datoteku"
 
-#: ../src/e-util/e-import-assistant.c:1390
+#: ../src/e-util/e-import-assistant.c:1405
 msgid "Click “Apply” to begin importing the file into Evolution."
 msgstr "Kliknite na „Primeni“ da započnete uvoz datoteke u Evoluciju."
 
+#: ../src/e-util/e-interval-chooser.c:140 ../src/e-util/filter.ui.h:6
+#: ../src/mail/e-mail-config-provider-page.c:580
+msgid "minutes"
+msgstr "minuta"
+
+#: ../src/e-util/e-interval-chooser.c:142 ../src/e-util/filter.ui.h:7
+msgid "hours"
+msgstr "sati"
+
+#. Translators: This is the last part of the sentence:
+#. * "Purge events older than <<spin-button>> days"
+#: ../src/e-util/e-interval-chooser.c:144 ../src/e-util/filter.ui.h:8
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:344
+#: ../src/plugins/publish-calendar/publish-calendar.ui.h:7
+msgid "days"
+msgstr "dana"
+
 #: ../src/e-util/e-mail-signature-combo-box.c:431
 msgid "Autogenerated"
 msgstr "Automatski sastavljeno"
 
-#: ../src/e-util/e-mail-signature-editor.c:311 ../src/mail/e-mail-notes.c:933
+#: ../src/e-util/e-mail-signature-editor.c:311 ../src/mail/e-mail-notes.c:966
 msgid "Close"
 msgstr "Zatvori"
 
-#: ../src/e-util/e-mail-signature-editor.c:316 ../src/mail/e-mail-notes.c:938
+#: ../src/e-util/e-mail-signature-editor.c:316 ../src/mail/e-mail-notes.c:971
 msgid "_Save and Close"
 msgstr "_Sačuvaj i zatvori"
 
@@ -14472,40 +14975,40 @@ msgstr ""
 "Alat za izbor vremenske zone pomoću miša. Tastaturom se izbor vremenske zone "
 "vrši iz donjeg okvira."
 
-#: ../src/e-util/e-misc-utils.c:260
+#: ../src/e-util/e-misc-utils.c:278
 msgid "Could not open the link."
 msgstr "Ne mogu da otvorim vezu."
 
-#: ../src/e-util/e-misc-utils.c:343
+#: ../src/e-util/e-misc-utils.c:362
 msgid "Could not display help for Evolution."
 msgstr "Ne mogu da prikažem pomoć za Evoluciju."
 
-#: ../src/e-util/e-misc-utils.c:2508
+#: ../src/e-util/e-misc-utils.c:2561
 #, c-format
 msgid "Opening calendar “%s”"
 msgstr "Otvaram kalendar „%s“"
 
-#: ../src/e-util/e-misc-utils.c:2511
+#: ../src/e-util/e-misc-utils.c:2564
 #, c-format
 msgid "Opening memo list “%s”"
 msgstr "Otvaram spisak beleški „%s“"
 
-#: ../src/e-util/e-misc-utils.c:2514
+#: ../src/e-util/e-misc-utils.c:2567
 #, c-format
 msgid "Opening task list “%s”"
 msgstr "Otvaram spisak zadataka „%s“"
 
-#: ../src/e-util/e-misc-utils.c:2517
+#: ../src/e-util/e-misc-utils.c:2570
 #, c-format
 msgid "Opening address book “%s”"
 msgstr "Otvaram imenik „%s“"
 
-#: ../src/e-util/e-misc-utils.c:3297
+#: ../src/e-util/e-misc-utils.c:3350
 #: ../src/modules/mailto-handler/evolution-mailto-handler.c:146
 msgid "_Do not show this message again"
 msgstr "_Ne prikazuj više ovu poruku"
 
-#: ../src/e-util/e-misc-utils.c:4123
+#: ../src/e-util/e-misc-utils.c:4244
 msgid ""
 "This address book server might be unreachable or the server name may be "
 "misspelled or your network connection could be down."
@@ -14513,17 +15016,17 @@ msgstr ""
 "Server ovog imenika je ili nedostupan ili je njegovo ime pogrešno uneto ili "
 "je mreža nedostupna."
 
-#: ../src/e-util/e-misc-utils.c:4135
+#: ../src/e-util/e-misc-utils.c:4256
 #, c-format
 msgid "Failed to set protocol version to LDAPv3 (%d): %s"
 msgstr "Ne mogu da podesim verziju protokola na LDAPv3 (%d): %s"
 
-#: ../src/e-util/e-misc-utils.c:4147
+#: ../src/e-util/e-misc-utils.c:4268
 #, c-format
 msgid "Failed to authenticate with LDAP server (%d): %s"
 msgstr "Ne mogu da potvrdim identitet na LDAP servera (%d): %s"
 
-#: ../src/e-util/e-misc-utils.c:4161
+#: ../src/e-util/e-misc-utils.c:4282
 #, c-format
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
@@ -14538,7 +15041,7 @@ msgstr ""
 "\n"
 "Detaljna greška (%d): %s"
 
-#: ../src/e-util/e-misc-utils.c:4172
+#: ../src/e-util/e-misc-utils.c:4293
 msgid ""
 "This LDAP server may use an older version of LDAP, which does not support "
 "this functionality or it may be misconfigured. Ask your administrator for "
@@ -14548,10 +15051,25 @@ msgstr ""
 "mogućnost, ili je loše podešen. Pitajte administratora za podržane osnove "
 "pretrage."
 
-#: ../src/e-util/e-misc-utils.c:4205
+#: ../src/e-util/e-misc-utils.c:4326
 msgid "Evolution had not been compiled with LDAP support"
 msgstr "Evolucija nije izgrađena sa podrškom za LDAP"
 
+#. Translators: %s is the language ISO code.
+#: ../src/e-util/e-misc-utils.c:4640
+#, c-format
+msgctxt "language"
+msgid "Unknown (%s)"
+msgstr "Nepoznato (%s)"
+
+#. Translators: The first %s is the language name, and the
+#. * second is the country name. Example: "French (France)"
+#: ../src/e-util/e-misc-utils.c:4649
+#, c-format
+msgctxt "language"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #: ../src/e-util/e-name-selector-dialog.c:274
 msgid "Show Contacts"
 msgstr "Prikaži kontakte"
@@ -14569,11 +15087,11 @@ msgid "_Search:"
 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: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
+#: ../src/e-util/e-name-selector-dialog.c:1325
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1271
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1654
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:783
+#: ../src/modules/calendar/e-task-shell-view-actions.c:956
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
 
@@ -14591,25 +15109,25 @@ msgid "Select Contacts from Address Book"
 msgstr "Izaberite kontakte iz imenika"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../src/e-util/e-name-selector-entry.c:3237
+#: ../src/e-util/e-name-selector-entry.c:3234
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "_Raširi %s unutar"
 
 #. Copy Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3253
+#: ../src/e-util/e-name-selector-entry.c:3250
 #, c-format
 msgid "Cop_y %s"
 msgstr "_Kopiraj %s"
 
 #. Cut Contact Item
-#: ../src/e-util/e-name-selector-entry.c:3264
+#: ../src/e-util/e-name-selector-entry.c:3261
 #, c-format
 msgid "C_ut %s"
 msgstr "_Iseci %s"
 
 #. Edit Contact item
-#: ../src/e-util/e-name-selector-entry.c:3282
+#: ../src/e-util/e-name-selector-entry.c:3279
 #, c-format
 msgid "_Edit %s"
 msgstr "_Uredi %s"
@@ -14641,19 +15159,19 @@ msgstr "Ključ priveska nije upotrebljiv: nema korisnika niti domaćina"
 msgid "You have the Caps Lock key on."
 msgstr "Uključili ste velika slova."
 
-#: ../src/e-util/e-passwords.c:576
+#: ../src/e-util/e-passwords.c:577
 msgid "_Remember this passphrase"
 msgstr "_Zapamti ovu lozinku"
 
-#: ../src/e-util/e-passwords.c:577
+#: ../src/e-util/e-passwords.c:578
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_Zapamti ovu lozinku do kraja ove sesije"
 
-#: ../src/e-util/e-passwords.c:582
+#: ../src/e-util/e-passwords.c:583
 msgid "_Remember this password"
 msgstr "_Zapamti ovu lozinku"
 
-#: ../src/e-util/e-passwords.c:583
+#: ../src/e-util/e-passwords.c:584
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamti ovu lozinku do kraja ove sesije"
 
@@ -14768,46 +15286,35 @@ msgstr "Uredi pravilo"
 msgid "Matches: %u"
 msgstr "Poklapanja: %u"
 
-#: ../src/e-util/e-search-bar.c:609
+#: ../src/e-util/e-search-bar.c:621
 msgid "Close the find bar"
 msgstr "Zatvori traku pretrage"
 
-#: ../src/e-util/e-search-bar.c:617
+#: ../src/e-util/e-search-bar.c:629
 msgid "Fin_d:"
 msgstr "Pro_nađi:"
 
-#: ../src/e-util/e-search-bar.c:629
+#: ../src/e-util/e-search-bar.c:641
 msgid "Clear the search"
 msgstr "Očisti pretragu"
 
-#: ../src/e-util/e-search-bar.c:653
-#: ../src/modules/accounts-window/e-collection-wizard-page.c:73
-msgid "_Previous"
-msgstr "_Prethodno"
-
-#: ../src/e-util/e-search-bar.c:656
+#: ../src/e-util/e-search-bar.c:668
 msgid "Find the previous occurrence of the phrase"
 msgstr "Nađi prethodno pojavljivanje izraza"
 
-#: ../src/e-util/e-search-bar.c:665
-#: ../src/modules/accounts-window/e-collection-wizard-page.c:80
-#: ../src/modules/accounts-window/e-collection-wizard-page.c:224
-msgid "_Next"
-msgstr "_Sledeće"
-
-#: ../src/e-util/e-search-bar.c:668
+#: ../src/e-util/e-search-bar.c:680
 msgid "Find the next occurrence of the phrase"
 msgstr "Nađi sledeće pojavljivanje izraza"
 
-#: ../src/e-util/e-search-bar.c:677
+#: ../src/e-util/e-search-bar.c:689
 msgid "Mat_ch case"
 msgstr "_Uporedi veličinu slova"
 
-#: ../src/e-util/e-search-bar.c:705
+#: ../src/e-util/e-search-bar.c:717
 msgid "Reached bottom of page, continued from top"
 msgstr "Stigao sam do dna stranice, nastavljam sa vrha"
 
-#: ../src/e-util/e-search-bar.c:727
+#: ../src/e-util/e-search-bar.c:739
 msgid "Reached top of page, continued from bottom"
 msgstr "Stigao sam do vrha stranice, nastavljam sa dna"
 
@@ -14965,58 +15472,58 @@ msgstr "Povratno obaveštenje"
 msgid "Sta_tus Tracking"
 msgstr "Praćenje sta_tusa"
 
-#: ../src/e-util/e-source-config.c:691 ../src/e-util/e-source-config.c:695
+#: ../src/e-util/e-source-config.c:724 ../src/e-util/e-source-config.c:728
 msgid "Type:"
 msgstr "Vrsta:"
 
-#: ../src/e-util/e-source-config.c:703 ../src/e-util/e-source-config.c:707
+#: ../src/e-util/e-source-config.c:738 ../src/e-util/e-source-config.c:742
 msgid "Name:"
 msgstr "Ime:"
 
-#: ../src/e-util/e-source-config.c:814 ../src/e-util/e-webdav-browser.c:1748
+#: ../src/e-util/e-source-config.c:849 ../src/e-util/e-webdav-browser.c:1752
 msgid "Name cannot be empty"
 msgstr "Ime ne može biti prazno"
 
 #. Translators: This is the first of a sequence of widgets:
 #. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../src/e-util/e-source-config.c:1359
+#: ../src/e-util/e-source-config.c:1416
 msgid "Refresh every"
 msgstr "Osveži na svakih"
 
-#: ../src/e-util/e-source-config.c:1389 ../src/e-util/e-source-config.c:1459
+#: ../src/e-util/e-source-config.c:1446 ../src/e-util/e-source-config.c:1520
 msgid "Use a secure connection"
 msgstr "Koristi bezbednu vezu"
 
-#: ../src/e-util/e-source-config.c:1485
+#: ../src/e-util/e-source-config.c:1547
 msgid "Unset _trust for SSL/TLS certificate"
 msgstr "Odznači _poverenje za SSL/TLS uverenje"
 
-#: ../src/e-util/e-source-config.c:1521
+#: ../src/e-util/e-source-config.c:1583
 msgid "User:"
 msgstr "Korisnik:"
 
-#: ../src/e-util/e-source-selector.c:3212
+#: ../src/e-util/e-source-selector.c:3219
 msgid "Show"
 msgstr "Prikaži"
 
-#: ../src/e-util/e-source-selector.c:3219
+#: ../src/e-util/e-source-selector.c:3225
 msgid "Group name"
 msgstr "Naziv grupe"
 
-#: ../src/e-util/e-source-selector.c:3374 ../src/mail/e-mail-display.c:793
+#: ../src/e-util/e-source-selector.c:3380 ../src/mail/e-mail-display.c:805
 msgid "_Hide"
 msgstr "_Sakrij"
 
-#: ../src/e-util/e-source-selector.c:3374
-#: ../src/e-util/e-source-selector.c:3473
+#: ../src/e-util/e-source-selector.c:3380
+#: ../src/e-util/e-source-selector.c:3478
 msgid "_Show"
 msgstr "_Prikaži"
 
-#: ../src/e-util/e-source-selector.c:3426
+#: ../src/e-util/e-source-selector.c:3432
 msgid "Manage Groups"
 msgstr "Upravljajte grupama"
 
-#: ../src/e-util/e-source-selector.c:3438
+#: ../src/e-util/e-source-selector.c:3444
 msgid "Available Groups:"
 msgstr "Dostupne grupe:"
 
@@ -15028,30 +15535,14 @@ msgstr "_Odredište"
 msgid "Select destination"
 msgstr "Izaberite odredište"
 
-#. Translators: %s is the language ISO code.
-#: ../src/e-util/e-spell-dictionary.c:266
-#, c-format
-msgctxt "language"
-msgid "Unknown (%s)"
-msgstr "Nepoznato (%s)"
-
-#. Translators: The first %s is the language name, and the
-#. * second is the country name. Example: "French (France)"
-#: ../src/e-util/e-spell-dictionary.c:281
-#: ../src/e-util/e-spell-dictionary.c:286
-#, c-format
-msgctxt "language"
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
 #. no suggestions. Put something in the menu anyway...
 #: ../src/e-util/e-spell-entry.c:479
 msgid "(no suggestions)"
 msgstr "(nema predloga)"
 
 #: ../src/e-util/e-spell-entry.c:503
-msgid "More..."
-msgstr "Dalje..."
+msgid "More…"
+msgstr "Još…"
 
 #. + Add to Dictionary
 #: ../src/e-util/e-spell-entry.c:588
@@ -15168,12 +15659,12 @@ msgstr "Nešto je pošlo naopako"
 #: ../src/e-util/e-system.error.xml.h:24
 msgid ""
 "A WebKitWebProcess crashed when displaying the content. You can try again by "
-"reopening the window. If the issue persists, please file a bug report in the "
-"GNOME bugzilla."
+"reopening the window. If the issue persists, please file a bug report in "
+"GNOME Gitlab."
 msgstr ""
-"Veb proces VebKita se urušio prilikom prikazivanja sadržaja. Možete pokišati "
-"ponovo tako što ćete ponovo otvoriti prozor. Ako ni to ne pomaže, popunite "
-"izveštaj o grešci na Gnomovoj bubaždaji."
+"Veb proces VebKita se urušio prilikom prikazivanja sadržaja. Možete ga "
+"pokrenuti ponovo tako što ćete ponovo otvoriti prozor. Ako ni to ne pomaže, "
+"popunite izveštaj o grešci na Gnomovom Gitlabu."
 
 #: ../src/e-util/e-system.error.xml.h:25
 msgid "Are you sure you want to delete remote collection “{0}”?"
@@ -15187,7 +15678,11 @@ 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/e-system.error.xml.h:29
+msgid "Failed to refresh list of account sources"
+msgstr "Nisam uspeo da osvežim spisak izvora naloga"
+
+#: ../src/e-util/e-table-click-to-add.c:688
 #: ../src/e-util/gal-a11y-e-table-click-to-add.c:59
 #: ../src/e-util/gal-a11y-e-table-click-to-add.c:140
 msgid "click to add"
@@ -15245,11 +15740,11 @@ msgstr "Očisti _sve"
 msgid "_Show field in View"
 msgstr "_Prikaži polje u pregledu"
 
-#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1779
+#: ../src/e-util/e-table-config.ui.h:6 ../src/e-util/e-table-header-item.c:1782
 msgid "Ascending"
 msgstr "Rastuće"
 
-#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1779
+#: ../src/e-util/e-table-config.ui.h:7 ../src/e-util/e-table-header-item.c:1782
 msgid "Descending"
 msgstr "Opadajuće"
 
@@ -15344,77 +15839,77 @@ msgstr[1] "%s (%d stavke)"
 msgstr[2] "%s (%d stavki)"
 msgstr[3] "%s (jedna stavka)"
 
-#: ../src/e-util/e-table-header-item.c:1606
+#: ../src/e-util/e-table-header-item.c:1609
 msgid "Customize Current View"
 msgstr "Prilagodite trenutni pregled"
 
-#: ../src/e-util/e-table-header-item.c:1629
+#: ../src/e-util/e-table-header-item.c:1632
 msgid "Sort _Ascending"
 msgstr "Razvrstaj _rastuće"
 
-#: ../src/e-util/e-table-header-item.c:1632
+#: ../src/e-util/e-table-header-item.c:1635
 msgid "Sort _Descending"
 msgstr "Razvrstaj _opadajuće"
 
-#: ../src/e-util/e-table-header-item.c:1635
+#: ../src/e-util/e-table-header-item.c:1638
 msgid "_Reset sort"
 msgstr "_Povrati redosled"
 
-#: ../src/e-util/e-table-header-item.c:1638
+#: ../src/e-util/e-table-header-item.c:1641
 msgid "Group By This _Field"
 msgstr "Grupiši po ovome _polju"
 
-#: ../src/e-util/e-table-header-item.c:1641
+#: ../src/e-util/e-table-header-item.c:1644
 msgid "Group By _Box"
 msgstr "Grupiši po _okviru"
 
-#: ../src/e-util/e-table-header-item.c:1645
+#: ../src/e-util/e-table-header-item.c:1648
 msgid "Remove This _Column"
 msgstr "Ukloni ovu _kolonu"
 
-#: ../src/e-util/e-table-header-item.c:1648
-msgid "Add a C_olumn..."
-msgstr "Dodaj ko_lonu..."
+#: ../src/e-util/e-table-header-item.c:1651
+msgid "Add a C_olumn…"
+msgstr "Dodaj _kolonu…"
 
-#: ../src/e-util/e-table-header-item.c:1652
+#: ../src/e-util/e-table-header-item.c:1655
 msgid "A_lignment"
 msgstr "Po_ravnanje"
 
-#: ../src/e-util/e-table-header-item.c:1655
+#: ../src/e-util/e-table-header-item.c:1658
 msgid "B_est Fit"
 msgstr "Na_jbolje uklapanje"
 
-#: ../src/e-util/e-table-header-item.c:1658
-msgid "Format Column_s..."
-msgstr "Oblikuj kolo_ne..."
+#: ../src/e-util/e-table-header-item.c:1661
+msgid "Format Column_s…"
+msgstr "Format kolo_ne…"
 
-#: ../src/e-util/e-table-header-item.c:1662
-msgid "Custo_mize Current View..."
-msgstr "Prila_godi trenutni pregled..."
+#: ../src/e-util/e-table-header-item.c:1665
+msgid "Custo_mize Current View…"
+msgstr "Prilagodi trenutni prikaz…"
 
-#: ../src/e-util/e-table-header-item.c:1729
+#: ../src/e-util/e-table-header-item.c:1732
 msgid "_Sort By"
 msgstr "_Poređaj po"
 
 #. Custom
-#: ../src/e-util/e-table-header-item.c:1752
+#: ../src/e-util/e-table-header-item.c:1755
 msgid "_Custom"
 msgstr "_Proizvoljno"
 
-#: ../src/e-util/e-text.c:2100
+#: ../src/e-util/e-text.c:2105
 msgid "Select All"
 msgstr "Izaberi sve"
 
-#: ../src/e-util/e-text.c:2113
+#: ../src/e-util/e-text.c:2118
 msgid "Input Methods"
 msgstr "Načini unosa"
 
 # Univerzalno vreme, ili UT
 # Valjda UV?
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../src/e-util/e-timezone-dialog.c:268 ../src/e-util/e-timezone-dialog.c:508
-#: ../src/e-util/e-timezone-dialog.c:512 ../src/e-util/e-timezone-dialog.c:516
-#: ../src/e-util/e-timezone-dialog.c:899
+#: ../src/e-util/e-timezone-dialog.c:280 ../src/e-util/e-timezone-dialog.c:520
+#: ../src/e-util/e-timezone-dialog.c:524 ../src/e-util/e-timezone-dialog.c:528
+#: ../src/e-util/e-timezone-dialog.c:1015
 msgid "UTC"
 msgstr "KUV"
 
@@ -15443,11 +15938,11 @@ msgstr "_Izbor"
 msgid "Timezone drop-down combination box"
 msgstr "Prozorče za podešavanje vremenske zone"
 
-#: ../src/e-util/e-url-entry.c:106
+#: ../src/e-util/e-url-entry.c:102
 msgid "Click here to open the URL"
 msgstr "Kliknite ovde da otvorite adresu"
 
-#: ../src/e-util/e-url-entry.c:108
+#: ../src/e-util/e-url-entry.c:104
 msgid "Enter a URL here"
 msgstr "Ovde unesite adresu"
 
@@ -15465,232 +15960,229 @@ msgid "Flags"
 msgstr "Opcije"
 
 #: ../src/e-util/evolution-source-viewer.c:729
-#: ../src/mail/e-mail-config-identity-page.c:1230
+#: ../src/mail/e-mail-config-identity-page.c:1231
 msgid "Identity"
 msgstr "Identitet"
 
-#: ../src/e-util/e-webdav-browser.c:447
+#: ../src/e-util/e-webdav-browser.c:448
 msgid "Address book"
 msgstr "Imenik"
 
-#: ../src/e-util/e-webdav-browser.c:458
+#: ../src/e-util/e-webdav-browser.c:459
 msgid "Events"
 msgstr "Događaji"
 
-#: ../src/e-util/e-webdav-browser.c:514
+#: ../src/e-util/e-webdav-browser.c:515 ../src/mail/em-folder-tree-model.c:1553
+#: ../src/mail/em-folder-tree-model.c:1930
 msgid "Loading…"
 msgstr "Učitavam…"
 
-#: ../src/e-util/e-webdav-browser.c:1383
+#: ../src/e-util/e-webdav-browser.c:1387
 msgid "Searching collection children…"
 msgstr "Pretražujem decu zbirke…"
 
-#: ../src/e-util/e-webdav-browser.c:1385
+#: ../src/e-util/e-webdav-browser.c:1389
 msgid "Failed to search for collection children"
 msgstr "Nisam uspeo da pretražim decu zbirke"
 
-#: ../src/e-util/e-webdav-browser.c:1419
+#: ../src/e-util/e-webdav-browser.c:1423
 msgid "Searching for user home, please wait…"
 msgstr "Tražim ličnu fasciklu korisnika, sačekajte…"
 
-#: ../src/e-util/e-webdav-browser.c:1421
+#: ../src/e-util/e-webdav-browser.c:1425
 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
+#: ../src/e-util/e-webdav-browser.c:1768
 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
+#: ../src/e-util/e-webdav-browser.c:1787
 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
+#: ../src/e-util/e-webdav-browser.c:1819
 msgid "Failed to save changes"
 msgstr "Nisam uspeo da sačuvam izmene"
 
-#: ../src/e-util/e-webdav-browser.c:1815
+#: ../src/e-util/e-webdav-browser.c:1821
 msgid "Creating new book…"
 msgstr "Pravim novu knjigu…"
 
 # bug: plural-forms
-#: ../src/e-util/e-webdav-browser.c:1816
+#: ../src/e-util/e-webdav-browser.c:1822
 msgid "Failed to create new book"
 msgstr "Ne mogu da napravim novu knjigu"
 
-#: ../src/e-util/e-webdav-browser.c:1818
+#: ../src/e-util/e-webdav-browser.c:1824
 msgid "Creating new calendar…"
 msgstr "Pravim novi kalendar…"
 
-#: ../src/e-util/e-webdav-browser.c:1819
+#: ../src/e-util/e-webdav-browser.c:1825
 msgid "Failed to create new calendar"
 msgstr "Nisam uspeo da napravim novi kalendar"
 
-#: ../src/e-util/e-webdav-browser.c:1821
+#: ../src/e-util/e-webdav-browser.c:1827
 msgid "Creating new collection…"
 msgstr "Pravim novu zbirku…"
 
 # bug: plural-forms
-#: ../src/e-util/e-webdav-browser.c:1822
+#: ../src/e-util/e-webdav-browser.c:1828
 msgid "Failed to create new collection"
 msgstr "Ne mogu da napravim zbirku"
 
-#: ../src/e-util/e-webdav-browser.c:1961
+#: ../src/e-util/e-webdav-browser.c:1967
 msgid "It is not allowed to create book under another book or calendar"
-msgstr "Nije dozvoljeno pravljenje knjige u drugoj knjizi ili kalendaru."
+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
+#: ../src/e-util/e-webdav-browser.c:1969
 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
+#: ../src/e-util/e-webdav-browser.c:2198
 msgid "Deleting book…"
 msgstr "Brišem knjigu…"
 
-#: ../src/e-util/e-webdav-browser.c:2190
+#: ../src/e-util/e-webdav-browser.c:2199
 msgid "Failed to delete book"
 msgstr "Ne mogu da obrišem knjigu"
 
-#: ../src/e-util/e-webdav-browser.c:2193
+#: ../src/e-util/e-webdav-browser.c:2202
 msgid "Deleting calendar…"
 msgstr "Brišem kalendar…"
 
-#: ../src/e-util/e-webdav-browser.c:2194
+#: ../src/e-util/e-webdav-browser.c:2203
 msgid "Failed to delete calendar"
 msgstr "Nisam uspeo da obrišem kalendar"
 
-#: ../src/e-util/e-webdav-browser.c:2197
+#: ../src/e-util/e-webdav-browser.c:2206
 msgid "Deleting collection…"
 msgstr "Brišem zbirku…"
 
-#: ../src/e-util/e-webdav-browser.c:2198
+#: ../src/e-util/e-webdav-browser.c:2207
 msgid "Failed to delete collection"
 msgstr "Nisam uspeo da obrišem zbirku"
 
-#: ../src/e-util/e-webdav-browser.c:2429
+#: ../src/e-util/e-webdav-browser.c:2438
 msgid "For Components:"
 msgstr "Za delove:"
 
-#: ../src/e-util/e-webdav-browser.c:2435
+#: ../src/e-util/e-webdav-browser.c:2444
 msgid "_Events"
 msgstr "_Događaji"
 
-#: ../src/e-util/e-webdav-browser.c:2625
+#: ../src/e-util/e-webdav-browser.c:2634
 msgid "WebDAV server:"
 msgstr "WebDAV server:"
 
-#: ../src/e-util/e-webdav-browser.c:2660
+#: ../src/e-util/e-webdav-browser.c:2669
 msgid "Create _Book"
 msgstr "Napravi belešk_u"
 
-#: ../src/e-util/e-webdav-browser.c:2667
+#: ../src/e-util/e-webdav-browser.c:2676
 msgid "Create _Calendar"
 msgstr "_Napravi kalendar"
 
-#: ../src/e-util/e-webdav-browser.c:2674
+#: ../src/e-util/e-webdav-browser.c:2683
 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:1950
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1650
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1721
-msgid "_Refresh"
-msgstr "_Osveži"
-
-#: ../src/e-util/e-web-view.c:348
+#: ../src/e-util/e-web-view.c:406
 msgid "_Copy Link Location"
 msgstr "_Kopiraj mesto veze"
 
-#: ../src/e-util/e-web-view.c:350
+#: ../src/e-util/e-web-view.c:408
 msgid "Copy the link to the clipboard"
 msgstr "Kopira vezu u spisak isečaka"
 
-#: ../src/e-util/e-web-view.c:358
+#: ../src/e-util/e-web-view.c:416
 msgid "_Open Link in Browser"
 msgstr "_Otvori vezu u pregledniku"
 
-#: ../src/e-util/e-web-view.c:360
+#: ../src/e-util/e-web-view.c:418
 msgid "Open the link in a web browser"
 msgstr "Otvori vezu u veb pretraživaču"
 
-#: ../src/e-util/e-web-view.c:368
+#: ../src/e-util/e-web-view.c:426
 msgid "_Copy Email Address"
 msgstr "_Kopiraj e-adresu"
 
-#: ../src/e-util/e-web-view.c:375
+#: ../src/e-util/e-web-view.c:433
 msgid "Copy _Raw Email Address"
 msgstr "Kopiraj sa_mo e-adresu"
 
-#: ../src/e-util/e-web-view.c:377
+#: ../src/e-util/e-web-view.c:435
 msgid "Copy the raw email address to the clipboard"
 msgstr "Kopira samo čistu adresu elektronske pošte u spisak isečaka"
 
-#: ../src/e-util/e-web-view.c:392
+#: ../src/e-util/e-web-view.c:450
 msgid "_Copy Image"
 msgstr "_Kopiraj sliku"
 
-#: ../src/e-util/e-web-view.c:394
+#: ../src/e-util/e-web-view.c:452
 msgid "Copy the image to the clipboard"
 msgstr "Kopira sliku u ostavu"
 
-#: ../src/e-util/e-web-view.c:399
-msgid "Save _Image..."
-msgstr "Sačuvaj _sliku..."
+#: ../src/e-util/e-web-view.c:457
+msgid "Save _Image…"
+msgstr "Sačuvaj sliku…"
 
-#: ../src/e-util/e-web-view.c:401
+#: ../src/e-util/e-web-view.c:459
 msgid "Save the image to a file"
 msgstr "Sačuvajte sliku u datoteku"
 
-#: ../src/e-util/e-web-view.c:421 ../src/e-util/e-web-view.c:2025
+#: ../src/e-util/e-web-view.c:474 ../src/mail/e-mail-browser.c:179
+#: ../src/mail/e-mail-reader.c:2820
+msgid "Search _Web…"
+msgstr "Pretraži _veb…"
+
+#: ../src/e-util/e-web-view.c:476 ../src/mail/e-mail-browser.c:181
+#: ../src/mail/e-mail-reader.c:2822
+msgid "Search the Web with the selected text"
+msgstr "Pretraži na vebu izabrani tekst"
+
+#: ../src/e-util/e-web-view.c:486 ../src/e-util/e-web-view.c:2102
 msgid "Select all text and images"
 msgstr "Izaberi sav tekst i slike"
 
-#: ../src/e-util/e-web-view.c:1379
+#: ../src/e-util/e-web-view.c:1451
 #, c-format
 msgid "Click to call %s"
 msgstr "Kliknite da pozovete %s"
 
-#: ../src/e-util/e-web-view.c:1381
+#: ../src/e-util/e-web-view.c:1453
 msgid "Click to hide/unhide addresses"
 msgstr "Kliknite da sakrijete/otkrijete adrese"
 
-#: ../src/e-util/e-web-view.c:1392
+#: ../src/e-util/e-web-view.c:1464
 #, 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:1394
+#: ../src/e-util/e-web-view.c:1466
 msgid "Go to the beginning of the message"
 msgstr "Idi na početak poruke"
 
-#: ../src/e-util/e-web-view.c:1398
+#: ../src/e-util/e-web-view.c:1470
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknite da otvorite %s"
 
-#: ../src/e-util/e-web-view.c:3943
+#: ../src/e-util/e-web-view.c:4157
 msgid "Copying image to clipboard"
 msgstr "Kopiram sliku u ostavu"
 
-#: ../src/e-util/e-web-view.c:4131
+#: ../src/e-util/e-web-view.c:4345
 msgid "Save Image"
 msgstr "Sačuvaj sliku"
 
-#: ../src/e-util/e-web-view.c:4172
+#: ../src/e-util/e-web-view.c:4382
 #, c-format
 msgid "Saving image to “%s”"
 msgstr "Čuvam sliku u „%s“"
 
-#: ../src/e-util/e-web-view.c:4267
+#: ../src/e-util/e-web-view.c:4529
 #, c-format
 msgid "Cannot get URI “%s”, do not know how to download it."
 msgstr "Ne mogu da dobavim putanju „%s“, ne znam kako da je preuzmem."
@@ -15763,7 +16255,7 @@ msgstr "Nedostaje uslov."
 
 #: ../src/e-util/filter.error.xml.h:13
 msgid "Filter should have at least one condition."
-msgstr "Propusnik treba da ima barem jedan uslov."
+msgstr "Filter treba da ima barem jedan uslov."
 
 #: ../src/e-util/filter.error.xml.h:14
 msgid "Missing value."
@@ -15794,7 +16286,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:93
+#: ../src/e-util/filter.ui.h:5 ../src/mail/mail-config.ui.h:95
 msgid "seconds"
 msgstr "sekunde"
 
@@ -15850,9 +16342,9 @@ msgstr ""
 
 #: ../src/e-util/filter.ui.h:21
 msgid "Show filters for mail:"
-msgstr "Prikaži propusnike pošte:"
+msgstr "Prikaži filter pošte:"
 
-#: ../src/e-util/filter.ui.h:22 ../src/mail/em-filter-editor.c:163
+#: ../src/e-util/filter.ui.h:22 ../src/mail/em-filter-editor.c:401
 msgid "_Filter Rules"
 msgstr "Pr_avila filtera"
 
@@ -15893,7 +16385,7 @@ msgstr "skuplja red u Establo koje sadrži ovu ćeliju"
 msgid "click"
 msgstr "klik"
 
-#: ../src/e-util/gal-a11y-e-table-column-header.c:160
+#: ../src/e-util/gal-a11y-e-table-column-header.c:161
 msgid "sort"
 msgstr "razvrstavanje"
 
@@ -15909,7 +16401,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:203
+#: ../src/e-util/widgets.error.xml.h:1 ../src/mail/mail.error.xml.h:204
 msgid "Do you wish to save your changes?"
 msgstr "Da li želite da sačuvate izmene?"
 
@@ -15917,7 +16409,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:205
+#: ../src/e-util/widgets.error.xml.h:3 ../src/mail/mail.error.xml.h:206
 msgid "_Discard changes"
 msgstr "_Odbaci izmene"
 
@@ -15945,6 +16437,10 @@ msgstr "Ne mogu da učitam potpis."
 msgid "Could not save signature."
 msgstr "Ne mogu da sačuvam potpis."
 
+#: ../src/e-util/widgets.error.xml.h:10
+msgid "Could not get selected text."
+msgstr "Ne mogu da dobavim izabrani tekst."
+
 #: ../src/libemail-engine/e-mail-folder-utils.c:106
 #, c-format
 msgid "Saving message to folder “%s”"
@@ -16001,72 +16497,80 @@ msgid "Invalid folder URI “%s”"
 msgstr "Neispravna putanja fascikle „%s“"
 
 #. Some local folders
-#: ../src/libemail-engine/e-mail-session.c:121
-#: ../src/mail/em-folder-properties.c:1150
-#: ../src/mail/em-folder-tree-model.c:1237
-#: ../src/mail/importers/kmail-libs.c:139
-#: ../src/modules/mail/e-mail-shell-view-private.c:1035
-#: ../src/modules/mail/e-mail-shell-view-private.c:1046
+#: ../src/libemail-engine/e-mail-session.c:120
+#: ../src/mail/em-folder-properties.c:1444
+#: ../src/mail/em-folder-tree-model.c:1501
+#: ../src/mail/importers/kmail-libs.c:138
+#: ../src/modules/mail/e-mail-shell-view-private.c:1032
+#: ../src/modules/mail/e-mail-shell-view-private.c:1043
 msgid "Inbox"
 msgstr "Sanduče"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../src/libemail-engine/e-mail-session.c:122
-#: ../src/mail/em-folder-tree-model.c:1230
-#: ../src/mail/importers/kmail-libs.c:145
-#: ../src/modules/mail/e-mail-shell-view-private.c:1033
+#: ../src/libemail-engine/e-mail-session.c:121
+#: ../src/mail/em-folder-tree-model.c:1495
+#: ../src/mail/importers/kmail-libs.c:144
+#: ../src/modules/mail/e-mail-shell-view-private.c:1030
 msgid "Drafts"
 msgstr "Nacrti"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../src/libemail-engine/e-mail-session.c:123
-#: ../src/mail/em-folder-tree-model.c:1241
-#: ../src/mail/importers/kmail-libs.c:141
-#: ../src/modules/mail/e-mail-shell-view-private.c:1037
+#: ../src/libemail-engine/e-mail-session.c:122
+#: ../src/mail/em-folder-tree-model.c:1505
+#: ../src/mail/importers/kmail-libs.c:140
+#: ../src/modules/mail/e-mail-shell-view-private.c:1034
 msgid "Outbox"
 msgstr "Za slanje"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../src/libemail-engine/e-mail-session.c:124
-#: ../src/mail/em-folder-tree-model.c:1245
-#: ../src/mail/importers/kmail-libs.c:143
-#: ../src/modules/mail/e-mail-shell-view-private.c:1039
+#: ../src/libemail-engine/e-mail-session.c:123
+#: ../src/mail/em-folder-tree-model.c:1509
+#: ../src/mail/importers/kmail-libs.c:142
+#: ../src/modules/mail/e-mail-shell-view-private.c:1036
 msgid "Sent"
 msgstr "Poslato"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../src/libemail-engine/e-mail-session.c:125
-#: ../src/mail/em-folder-tree-model.c:1233
-#: ../src/mail/importers/kmail-libs.c:147
-#: ../src/modules/mail/e-mail-shell-view-private.c:1041
-#: ../src/plugins/templates/e-templates-store.c:2212
+#: ../src/libemail-engine/e-mail-session.c:124
+#: ../src/mail/e-mail-templates-store.c:2211
+#: ../src/mail/em-folder-tree-model.c:1497
+#: ../src/mail/importers/kmail-libs.c:146
+#: ../src/modules/mail/e-mail-shell-view-private.c:1038
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:1
 msgid "Templates"
 msgstr "Šabloni"
 
-#: ../src/libemail-engine/e-mail-session.c:1297
+#: ../src/libemail-engine/e-mail-session.c:1519
 #, c-format
 msgid "User cancelled operation"
 msgstr "Korisnik je otkazao radnju"
 
-#: ../src/libemail-engine/e-mail-session.c:1354
+#: ../src/libemail-engine/e-mail-session.c:1580
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "Nije dostavljena odredišna adresa, prosleđivanje poruke je otkazano."
 
-#: ../src/libemail-engine/e-mail-session.c:1367
+#: ../src/libemail-engine/e-mail-session.c:1593
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "Nije pronađen identitet za korišćenje, prosleđivanje poruke je otkazano."
 
-#: ../src/libemail-engine/e-mail-session.c:1519
+#: ../src/libemail-engine/e-mail-session.c:1794
 #, c-format
 msgid "Corresponding source for service with UID “%s” not found"
-msgstr "Nije pronađen odgovarajući izvor sa UID brojem „%s“"
+msgstr "Nije pronađen odgovarajući izvor sa JIB brojem „%s“"
+
+#: ../src/libemail-engine/e-mail-session.c:1914
+msgid "Looking up recipient S/MIME certificates in address books…"
+msgstr "Tražim S/MIME uverenja za primaoce unutar adresara…"
 
-#: ../src/libemail-engine/e-mail-session.c:2460
+#: ../src/libemail-engine/e-mail-session.c:1916
+msgid "Looking up recipient PGP keys in address books…"
+msgstr "Tražim PGP ključeve za primaoce unutar adresara…"
+
+#: ../src/libemail-engine/e-mail-session.c:2963
 #, c-format
 msgid "Waiting for “%s”"
 msgstr "Čekam na „%s“"
@@ -16075,27 +16579,27 @@ msgstr "Čekam na „%s“"
 msgid "No mail transport service available"
 msgstr "Nema dostupne usluge prenosa pošte"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:616
-#: ../src/libemail-engine/mail-ops.c:708
+#: ../src/libemail-engine/e-mail-session-utils.c:613
+#: ../src/libemail-engine/mail-ops.c:707
 #, c-format
 msgid "Posting message to “%s”"
 msgstr "Kačim poruku na „%s“"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:653
-#: ../src/libemail-engine/mail-ops.c:744
+#: ../src/libemail-engine/e-mail-session-utils.c:650
+#: ../src/libemail-engine/mail-ops.c:743
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
-msgstr "Neuspela primena odlaznih propusnika: %s"
+msgstr "Nije uspela primena odlaznih filtera: %s"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:686
-#: ../src/libemail-engine/e-mail-session-utils.c:721
-#: ../src/libemail-engine/mail-ops.c:772 ../src/libemail-engine/mail-ops.c:807
+#: ../src/libemail-engine/e-mail-session-utils.c:683
+#: ../src/libemail-engine/e-mail-session-utils.c:718
+#: ../src/libemail-engine/mail-ops.c:771 ../src/libemail-engine/mail-ops.c:806
 #, c-format
 msgid "Storing sent message to “%s”"
 msgstr "Čuvam poslatu poruku u „%s“"
 
-#: ../src/libemail-engine/e-mail-session-utils.c:710
-#: ../src/libemail-engine/mail-ops.c:796
+#: ../src/libemail-engine/e-mail-session-utils.c:707
+#: ../src/libemail-engine/mail-ops.c:795
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -16104,15 +16608,15 @@ 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:740
-#: ../src/libemail-engine/mail-ops.c:824
+#: ../src/libemail-engine/e-mail-session-utils.c:737
+#: ../src/libemail-engine/mail-ops.c:823
 #, c-format
 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:928
-#: ../src/libemail-engine/mail-ops.c:985 ../src/libemail-engine/mail-ops.c:1098
-#: ../src/mail/mail-send-recv.c:636
+#: ../src/libemail-engine/e-mail-session-utils.c:929
+#: ../src/libemail-engine/mail-ops.c:1019
+#: ../src/libemail-engine/mail-ops.c:1134 ../src/mail/mail-send-recv.c:665
 msgid "Sending message"
 msgstr "Slanje poruke"
 
@@ -16122,20 +16626,22 @@ msgid "Disconnecting from “%s”"
 msgstr "Prekidanje veze sa „%s“"
 
 #: ../src/libemail-engine/e-mail-store-utils.c:264
+#: ../src/mail/e-mail-backend.c:1048
 #, c-format
 msgid "Reconnecting to “%s”"
 msgstr "Ponovno povezivanje na „%s“"
 
 #: ../src/libemail-engine/e-mail-store-utils.c:349
+#: ../src/mail/mail-send-recv.c:1089
 #, c-format
 msgid "Preparing account “%s” for offline"
 msgstr "Pripremam nalog „%s“ za rad van mreže"
 
-#: ../src/libemail-engine/mail-ops.c:88
+#: ../src/libemail-engine/mail-ops.c:87
 msgid "Filtering Selected Messages"
 msgstr "Filtriranje izabranih poruka"
 
-#: ../src/libemail-engine/mail-ops.c:146
+#: ../src/libemail-engine/mail-ops.c:145
 #, c-format
 msgid ""
 "Failed to filter selected messages. One reason can be that folder location "
@@ -16148,12 +16654,12 @@ msgstr ""
 "filtere u izborniku „Uređivanje—>Filteri poruka“.\n"
 "Izvorna greška beše: %s"
 
-#: ../src/libemail-engine/mail-ops.c:226
+#: ../src/libemail-engine/mail-ops.c:225
 #, c-format
 msgid "Fetching mail from “%s”"
 msgstr "Preuzimam poštu sa „%s“"
 
-#: ../src/libemail-engine/mail-ops.c:738
+#: ../src/libemail-engine/mail-ops.c:737
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -16166,7 +16672,7 @@ msgstr ""
 "filtere u izborniku „Uređivanje—>Filteri poruka“.\n"
 "Izvorna greška beše: %s"
 
-#: ../src/libemail-engine/mail-ops.c:996
+#: ../src/libemail-engine/mail-ops.c:1030
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Šaljem poruku %d od %d"
@@ -16175,7 +16681,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:1054
+#: ../src/libemail-engine/mail-ops.c:1088
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
@@ -16184,45 +16690,45 @@ 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:1060
+#: ../src/libemail-engine/mail-ops.c:1094
 msgid "Cancelled."
 msgstr "Otkazano."
 
-#: ../src/libemail-engine/mail-ops.c:1062
+#: ../src/libemail-engine/mail-ops.c:1096
 msgid "Complete."
 msgstr "Završeno."
 
-#: ../src/libemail-engine/mail-ops.c:1184
+#: ../src/libemail-engine/mail-ops.c:1220
 #, c-format
 msgid "Moving messages to “%s”"
 msgstr "Premeštam poruke u „%s“"
 
-#: ../src/libemail-engine/mail-ops.c:1185
+#: ../src/libemail-engine/mail-ops.c:1221
 #, c-format
 msgid "Copying messages to “%s”"
 msgstr "Kopiram poruke u „%s“"
 
-#: ../src/libemail-engine/mail-ops.c:1304
+#: ../src/libemail-engine/mail-ops.c:1340
 #, c-format
 msgid "Storing folder “%s”"
 msgstr "Smeštam fasciklu „%s“"
 
-#: ../src/libemail-engine/mail-ops.c:1432
+#: ../src/libemail-engine/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account “%s”"
 msgstr "Praznim i smeštam nalog „%s“"
 
-#: ../src/libemail-engine/mail-ops.c:1433
+#: ../src/libemail-engine/mail-ops.c:1469
 #, c-format
 msgid "Storing account “%s”"
 msgstr "Smeštam nalog „%s“"
 
-#: ../src/libemail-engine/mail-ops.c:1508
+#: ../src/libemail-engine/mail-ops.c:1544
 #, c-format
 msgid "Emptying trash in “%s”"
 msgstr "Izbacujem smeće u „%s“"
 
-#: ../src/libemail-engine/mail-ops.c:1600
+#: ../src/libemail-engine/mail-ops.c:1636
 #, c-format
 msgid "Processing folder changes in “%s”"
 msgstr "Obrađujem izmene fascikle u „%s“"
@@ -16240,14 +16746,14 @@ msgstr "Pokušavam da premestim poštu iz ne-mboks izvora „%s“"
 #. 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:198
 #, c-format
-msgid "[Fwd: %s]"
+msgid "Fwd: %s"
 msgstr "[Pro: %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:208
 msgid "No Subject"
-msgstr "Bez imena primaoca"
+msgstr "Bez naslova"
 
 #: ../src/libemail-engine/mail-tools.c:283
 #, c-format
@@ -16297,91 +16803,96 @@ msgstr[3] ""
 
 # bug: requires a comment on usage
 #: ../src/mail/e-mail-account-manager.c:118
-#: ../src/mail/e-mail-account-manager.c:205
+#: ../src/mail/e-mail-account-manager.c:206
 msgid "Open _Online Accounts"
 msgstr "Otvori naloge na _mreži"
 
 #: ../src/mail/e-mail-account-manager.c:144
-#: ../src/mail/e-mail-account-manager.c:231
+#: ../src/mail/e-mail-account-manager.c:232
 msgid "This account was created through the Online Accounts service."
 msgstr "Ovaj nalog je napravljen putem usluge naloga na mreži."
 
-#: ../src/mail/e-mail-account-manager.c:690
+#: ../src/mail/e-mail-account-manager.c:692
 msgid "_Reset Order"
 msgstr "_Ponovo postavi redosled"
 
-#: ../src/mail/e-mail-account-manager.c:703
+#: ../src/mail/e-mail-account-manager.c:705
 msgid "You can drag and drop account names to reorder them."
 msgstr "Možete da prevučete i ubacite nazive naloga da ih ponovo poređate."
 
-#: ../src/mail/e-mail-account-manager.c:746
+#: ../src/mail/e-mail-account-manager.c:748
 msgid "De_fault"
 msgstr "Pod_razumevano"
 
-#: ../src/mail/e-mail-autoconfig.c:648
+#: ../src/mail/e-mail-autoconfig.c:436
+#, c-format
+msgid "Invalid URI: “%s”"
+msgstr "Neispravan URI: „%s“"
+
+#: ../src/mail/e-mail-autoconfig.c:756
 #, c-format
 msgid "Host: %s:%d"
 msgstr "Domaćin: %s:%d"
 
-#: ../src/mail/e-mail-autoconfig.c:652
+#: ../src/mail/e-mail-autoconfig.c:760
 #, c-format
 msgid "User: %s"
 msgstr "Korisnik: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:656
+#: ../src/mail/e-mail-autoconfig.c:764
 #, c-format
 msgid "Security method: %s"
 msgstr "Metoda bezbednosti: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:657
+#: ../src/mail/e-mail-autoconfig.c:765
 #: ../src/mail/e-mail-config-summary-page.c:144
 msgid "TLS"
 msgstr "TLS"
 
-#: ../src/mail/e-mail-autoconfig.c:658
+#: ../src/mail/e-mail-autoconfig.c:766
 #: ../src/mail/e-mail-config-summary-page.c:147
 msgid "STARTTLS"
 msgstr "STARTTLS"
 
-#: ../src/mail/e-mail-autoconfig.c:662
+#: ../src/mail/e-mail-autoconfig.c:770
 #, c-format
 msgid "Authentication mechanism: %s"
 msgstr "Mehanizam za identifikovanje: %s"
 
-#: ../src/mail/e-mail-autoconfig.c:821
+#: ../src/mail/e-mail-autoconfig.c:950
 msgid "No email address provided"
 msgstr "Nije dostavljena adresa e-pošte"
 
-#: ../src/mail/e-mail-autoconfig.c:830
+#: ../src/mail/e-mail-autoconfig.c:959
 msgid "Missing domain in email address"
 msgstr "Nedostaje domen u adresi e-pošte"
 
-#: ../src/mail/e-mail-autoconfig.c:1169
+#: ../src/mail/e-mail-autoconfig.c:1309
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:82
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:83
 msgid "IMAP server"
 msgstr "IMAP server"
 
-#: ../src/mail/e-mail-autoconfig.c:1176
+#: ../src/mail/e-mail-autoconfig.c:1316
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:84
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:85
 msgid "POP3 server"
 msgstr "POP3 server"
 
-#: ../src/mail/e-mail-autoconfig.c:1183
+#: ../src/mail/e-mail-autoconfig.c:1323
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:86
 msgid "SMTP server"
-msgstr "SMTP server:"
+msgstr "SMTP server"
 
-#: ../src/mail/e-mail-browser.c:130 ../src/shell/e-shell-window-actions.c:812
-#: ../src/shell/e-shell-window-actions.c:819
-#: ../src/shell/e-shell-window-actions.c:826
+#: ../src/mail/e-mail-browser.c:146 ../src/shell/e-shell-window-actions.c:837
+#: ../src/shell/e-shell-window-actions.c:844
+#: ../src/shell/e-shell-window-actions.c:851
 msgid "Close this window"
 msgstr "Zatvorite ovaj prozor"
 
-#: ../src/mail/e-mail-browser.c:288
+#: ../src/mail/e-mail-browser.c:314
 msgid "(No Subject)"
-msgstr "(Bez subjekta)"
+msgstr "(bez naslova)"
 
 #. GtkAssistant's back button label.
 #: ../src/mail/e-mail-config-assistant.c:48
@@ -16401,91 +16912,105 @@ msgstr "Pomoćnik naloga Evolucije"
 msgid "_Revise Details"
 msgstr "_Obnovi pojedinosti"
 
-#: ../src/mail/e-mail-config-auth-check.c:180
-msgid "Querying authentication types..."
-msgstr "Propitujem vrste potvrđivanja identiteta..."
+#: ../src/mail/e-mail-config-auth-check.c:217
+msgid "Querying authentication types…"
+msgstr "Upit načina za proveru identiteta…"
 
-#: ../src/mail/e-mail-config-auth-check.c:393
+#: ../src/mail/e-mail-config-auth-check.c:430
 msgid "Check for Supported Types"
-msgstr "Proverite za podržanim vrstama"
+msgstr "Zatraži podržane načine"
 
-#: ../src/mail/e-mail-config-composing-page.c:116
+#: ../src/mail/e-mail-config-composing-page.c:117
 msgctxt "ReplyForward"
 msgid "Use global setting"
 msgstr "Koristi opšta podešavanja"
 
-#: ../src/mail/e-mail-config-composing-page.c:118
-#: ../src/mail/mail-config.ui.h:27
+#: ../src/mail/e-mail-config-composing-page.c:119
+#: ../src/mail/mail-config.ui.h:29
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Priloži"
 
-#: ../src/mail/e-mail-config-composing-page.c:120
-#: ../src/mail/mail-config.ui.h:28
+#: ../src/mail/e-mail-config-composing-page.c:121
+#: ../src/mail/mail-config.ui.h:30
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "Unutar (Autluk stil)"
 
-#: ../src/mail/e-mail-config-composing-page.c:122
-#: ../src/mail/mail-config.ui.h:29
+#: ../src/mail/e-mail-config-composing-page.c:123
+#: ../src/mail/mail-config.ui.h:31
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Citirano"
 
-#: ../src/mail/e-mail-config-composing-page.c:124
-#: ../src/mail/mail-config.ui.h:30
+#: ../src/mail/e-mail-config-composing-page.c:125
+#: ../src/mail/mail-config.ui.h:32
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Ne citiraj"
 
-#: ../src/mail/e-mail-config-composing-page.c:397
-#: ../src/mail/e-mail-config-composing-page.c:606
+#: ../src/mail/e-mail-config-composing-page.c:157
+msgid "Use global setting"
+msgstr "Koristi opšte podešavanje"
+
+#: ../src/mail/e-mail-config-composing-page.c:408
+#: ../src/mail/e-mail-config-composing-page.c:642
 msgid "Composing Messages"
 msgstr "Sastavljanje poruka"
 
-#: ../src/mail/e-mail-config-composing-page.c:406
+#: ../src/mail/e-mail-config-composing-page.c:417
 msgid "Alway_s carbon-copy (cc) to:"
-msgstr "Uvek pošalji _grafitnu kopiju (Cc):"
+msgstr "Uvek pošalji _Kopiju na:"
 
-#: ../src/mail/e-mail-config-composing-page.c:431
+#: ../src/mail/e-mail-config-composing-page.c:442
 msgid "Always _blind carbon-copy (bcc) to:"
-msgstr "Uvek pošalji _nevidljivu grafitnu kopiju (Bcc):"
+msgstr "Uvek pošalji _Slepu kopiju na:"
 
-#: ../src/mail/e-mail-config-composing-page.c:462
+#: ../src/mail/e-mail-config-composing-page.c:467
 msgid "Re_ply style:"
 msgstr "_Stil odgovora:"
 
-#: ../src/mail/e-mail-config-composing-page.c:488
-#: ../src/mail/mail-config.ui.h:20
+#: ../src/mail/e-mail-config-composing-page.c:495
+msgid "Lang_uage:"
+msgstr "Je_zik:"
+
+#: ../src/mail/e-mail-config-composing-page.c:498
+#: ../src/mail/e-mail-config-composing-page.c:508
+#: ../src/mail/mail-config.ui.h:21
+msgid "Language for Reply and Forward attribution text"
+msgstr "Jezik u priloženom tekstu uz odgovore i prosleđene poruke"
+
+#: ../src/mail/e-mail-config-composing-page.c:524
+#: ../src/mail/em-composer-utils.c:4145 ../src/mail/mail-config.ui.h:22
 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
+#: ../src/mail/e-mail-config-composing-page.c:531
+#: ../src/mail/mail-config.ui.h:23
 msgid "_Keep signature above the original message"
 msgstr "Zadrži potpis _iznad originalne poruke"
 
-#: ../src/mail/e-mail-config-composing-page.c:512
+#: ../src/mail/e-mail-config-composing-page.c:548
 msgid "Message Receipts"
 msgstr "Priznanice poruke"
 
-#: ../src/mail/e-mail-config-composing-page.c:521
+#: ../src/mail/e-mail-config-composing-page.c:557
 msgid "S_end message receipts:"
 msgstr "_Pošalji povratnice:"
 
-#: ../src/mail/e-mail-config-composing-page.c:546
+#: ../src/mail/e-mail-config-composing-page.c:582
 msgid "Never"
 msgstr "Nikada"
 
-#: ../src/mail/e-mail-config-composing-page.c:552
+#: ../src/mail/e-mail-config-composing-page.c:588
 msgid "Always"
 msgstr "Uvek"
 
-#: ../src/mail/e-mail-config-composing-page.c:558
+#: ../src/mail/e-mail-config-composing-page.c:594
 msgid "Ask for each message"
 msgstr "Pitaj za svaku poruku"
 
-#: ../src/mail/e-mail-config-confirm-page.c:154
+#: ../src/mail/e-mail-config-confirm-page.c:155
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -16499,13 +17024,13 @@ msgstr ""
 "\n"
 "Kliknite „Primeni“ da sačuvate postavke."
 
-#: ../src/mail/e-mail-config-confirm-page.c:166
+#: ../src/mail/e-mail-config-confirm-page.c:167
 msgid "Done"
 msgstr "Urađeno"
 
 #: ../src/mail/e-mail-config-defaults-page.c:314
-msgid "Checking server settings..."
-msgstr "Proveravam podešavanja servera..."
+msgid "Checking server settings…"
+msgstr "Proveravam podešavanja servera…"
 
 #: ../src/mail/e-mail-config-defaults-page.c:663
 msgid "Special Folders"
@@ -16536,7 +17061,7 @@ msgid "Archi_ve Folder:"
 msgstr "Fascikla _arhive:"
 
 #: ../src/mail/e-mail-config-defaults-page.c:785
-#: ../src/modules/mail/em-mailer-prefs.c:1413
+#: ../src/modules/mail/em-mailer-prefs.c:1517
 msgid "Choose a folder to archive messages to."
 msgstr "Izaberite fascikle za arhiviranje poruke."
 
@@ -16572,7 +17097,7 @@ msgstr "Koristi stvarnu fasciklu za _đubre:"
 msgid "Choose a folder for junk messages."
 msgstr "Izaberite fasciklu za nepoželjne poruke."
 
-#: ../src/mail/e-mail-config-defaults-page.c:981
+#: ../src/mail/e-mail-config-defaults-page.c:995
 msgid "Defaults"
 msgstr "Osnovno"
 
@@ -16585,7 +17110,7 @@ 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:579
+#: ../src/mail/e-mail-config-identity-page.c:580
 #: ../src/mail/e-mail-config-summary-page.c:353
 msgid ""
 "The above name will be used to identify this account.\n"
@@ -16594,83 +17119,83 @@ msgstr ""
 "Ovo ime će biti korisno za prepoznavanje naloga.\n"
 "Na primer, „Poslovni“ ili „Lični“."
 
-#: ../src/mail/e-mail-config-identity-page.c:596
+#: ../src/mail/e-mail-config-identity-page.c:597
 msgid "Required Information"
 msgstr "Obavezni podaci"
 
-#: ../src/mail/e-mail-config-identity-page.c:605
+#: ../src/mail/e-mail-config-identity-page.c:606
 msgid "Full Nam_e:"
 msgstr "_Ime i prezime:"
 
-#: ../src/mail/e-mail-config-identity-page.c:634
+#: ../src/mail/e-mail-config-identity-page.c:635
 msgid "Email _Address:"
 msgstr "Adresa _e-pošte:"
 
-#: ../src/mail/e-mail-config-identity-page.c:683
+#: ../src/mail/e-mail-config-identity-page.c:684
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:27
 msgid "Optional Information"
 msgstr "Dodatni podaci"
 
-#: ../src/mail/e-mail-config-identity-page.c:692
+#: ../src/mail/e-mail-config-identity-page.c:693
 msgid "Re_ply-To:"
-msgstr "Od_govor:"
+msgstr "Od_govori na:"
 
-#: ../src/mail/e-mail-config-identity-page.c:721
+#: ../src/mail/e-mail-config-identity-page.c:722
 msgid "Or_ganization:"
 msgstr "Or_ganizacija:"
 
-#: ../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:777
+msgid "Add Ne_w Signature…"
+msgstr "Dodaj no_vi potpis…"
 
-#: ../src/mail/e-mail-config-identity-page.c:790
+#: ../src/mail/e-mail-config-identity-page.c:791
 msgid "A_liases:"
 msgstr "_Alijasi:"
 
-#: ../src/mail/e-mail-config-identity-page.c:862
+#: ../src/mail/e-mail-config-identity-page.c:863
 msgid "Edi_t"
 msgstr "_Uredi"
 
-#: ../src/mail/e-mail-config-identity-page.c:885
+#: ../src/mail/e-mail-config-identity-page.c:886
 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"
 
 #. This is only a warning, not a blocker
 #. complete = complete && correct;
-#: ../src/mail/e-mail-config-identity-page.c:934
+#: ../src/mail/e-mail-config-identity-page.c:935
 msgid "Full Name should not be empty"
 msgstr "Ime i prezime ne može biti prazno"
 
-#: ../src/mail/e-mail-config-identity-page.c:941
+#: ../src/mail/e-mail-config-identity-page.c:942
 msgid "Email Address cannot be empty"
 msgstr "Adresa e-pošte ne može biti prazna"
 
-#: ../src/mail/e-mail-config-identity-page.c:946
+#: ../src/mail/e-mail-config-identity-page.c:947
 msgid "Email Address is not a valid email"
 msgstr "Adresa e-pošte nije ispravna e-pošta"
 
-#: ../src/mail/e-mail-config-identity-page.c:958
+#: ../src/mail/e-mail-config-identity-page.c:959
 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-identity-page.c:970
 #: ../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:65
-msgid "Looking up account details..."
-msgstr "Tražim pojedinosti naloga..."
+msgid "Looking up account details…"
+msgstr "Tražim podatke o nalogu…"
 
-#: ../src/mail/e-mail-config-provider-page.c:537
+#: ../src/mail/e-mail-config-provider-page.c:538
 msgid "Checking for New Mail"
 msgstr "Vršim proveru za novom poštom"
 
-#: ../src/mail/e-mail-config-provider-page.c:553
+#: ../src/mail/e-mail-config-provider-page.c:554
 msgid "Check for _new messages every"
 msgstr "Proveri za _novu poštu svakih"
 
-#: ../src/mail/e-mail-config-provider-page.c:763
+#: ../src/mail/e-mail-config-provider-page.c:764
 msgid "Receiving Options"
 msgstr "Opcije za primanje"
 
@@ -16680,119 +17205,119 @@ msgstr "Primanje pošte"
 
 #. Translators: This string is to describe a PGP key in a combo box in mail account's preferences.
 #. The first '%s' is a key ID, the second '%s' is a display name of the key.
-#: ../src/mail/e-mail-config-security-page.c:233
+#: ../src/mail/e-mail-config-security-page.c:379
 #, c-format
 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:32
+#: ../src/mail/e-mail-config-security-page.c:460
+#: ../src/mail/em-folder-properties.c:1367 ../src/mail/mail-config.ui.h:34
 #: ../src/modules/addressbook/autocompletion-config.c:115
-#: ../src/modules/calendar/e-calendar-preferences.c:643
+#: ../src/modules/calendar/e-calendar-preferences.c:621
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:48
-#: ../src/modules/mail/e-mail-shell-backend.c:753
+#: ../src/modules/mail/e-mail-shell-backend.c:802
 #: ../src/plugins/publish-calendar/publish-calendar.ui.h:17
 msgid "General"
 msgstr "Opšte"
 
-#: ../src/mail/e-mail-config-security-page.c:329
+#: ../src/mail/e-mail-config-security-page.c:469
 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:491
 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:500
 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:531
 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:77
+#: ../src/mail/e-mail-config-security-page.c:547
+#: ../src/mail/e-mail-config-security-page.c:711
+#: ../src/mail/mail-config.ui.h:79
 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:78
+#: ../src/mail/e-mail-config-security-page.c:550
+#: ../src/mail/e-mail-config-security-page.c:714
+#: ../src/mail/mail-config.ui.h:80
 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:79
+#: ../src/mail/e-mail-config-security-page.c:553
+#: ../src/mail/e-mail-config-security-page.c:717
+#: ../src/mail/mail-config.ui.h:81
 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:80
+#: ../src/mail/e-mail-config-security-page.c:556
+#: ../src/mail/e-mail-config-security-page.c:720
+#: ../src/mail/mail-config.ui.h:82
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../src/mail/e-mail-config-security-page.c:434
+#: ../src/mail/e-mail-config-security-page.c:572
 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:584
 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:596
 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:608
 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:620
 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:644
 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:653
 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:677
+#: ../src/mail/e-mail-config-security-page.c:775
 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:915
+#: ../src/mail/e-mail-config-security-page.c:686
+#: ../src/mail/e-mail-config-security-page.c:784
+#: ../src/shell/e-shell-window-actions.c:933
 msgid "_Clear"
 msgstr "_Očisti"
 
-#: ../src/mail/e-mail-config-security-page.c:557
+#: ../src/mail/e-mail-config-security-page.c:695
 msgid "Signing _algorithm:"
 msgstr "Algoritam p_otpisa:"
 
-#: ../src/mail/e-mail-config-security-page.c:598
+#: ../src/mail/e-mail-config-security-page.c:736
 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:751
 msgid "Encryption certificate:"
 msgstr "Uverenje za šifrovanje:"
 
-#: ../src/mail/e-mail-config-security-page.c:655
+#: ../src/mail/e-mail-config-security-page.c:793
 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:805
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "Uvek meni samom šifruj pri slanju šifrovane pošte"
 
@@ -16800,7 +17325,7 @@ 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:499
+#: ../src/mail/e-mail-config-service-page.c:501
 msgid "Server _Type:"
 msgstr "_Vrsta servera:"
 
@@ -16835,12 +17360,12 @@ msgid "Server Type:"
 msgstr "Vrsta servera:"
 
 #: ../src/mail/e-mail-config-summary-page.c:452
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:657
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:661
 msgid "Server:"
 msgstr "Server:"
 
 #: ../src/mail/e-mail-config-summary-page.c:473
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:755
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:779
 msgid "Username:"
 msgstr "Korisničko ime:"
 
@@ -16856,7 +17381,7 @@ msgstr "Delovi za slanje i primanje ne mogu u isto vreme biti podešeni na Ništ
 msgid "Account Summary"
 msgstr "Sažetak naloga"
 
-#: ../src/mail/e-mail-config-welcome-page.c:161
+#: ../src/mail/e-mail-config-welcome-page.c:162
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -16866,8 +17391,8 @@ msgstr ""
 "\n"
 "Kliknite „Nastavi“ da započnete."
 
-#: ../src/mail/e-mail-config-welcome-page.c:171
-#: ../src/modules/startup-wizard/e-startup-assistant.c:154
+#: ../src/mail/e-mail-config-welcome-page.c:172
+#: ../src/modules/startup-wizard/e-startup-assistant.c:182
 msgid "Welcome"
 msgstr "Dobrodošli"
 
@@ -16876,8 +17401,8 @@ msgid "Account Editor"
 msgstr "Uređivač naloga"
 
 #: ../src/mail/e-mail-display.c:126
-msgid "_Add to Address Book..."
-msgstr "_Dodaj u imenik..."
+msgid "_Add to Address Book…"
+msgstr "_Dodaj u imenik…"
 
 #: ../src/mail/e-mail-display.c:133
 msgid "_To This Address"
@@ -16888,8 +17413,8 @@ msgid "_From This Address"
 msgstr "_Sa ove adrese"
 
 #: ../src/mail/e-mail-display.c:147
-msgid "Send _Reply To..."
-msgstr "_Pošalji odgovor..."
+msgid "Send _Reply To…"
+msgstr "Pošalji _Odgovor na…"
 
 #: ../src/mail/e-mail-display.c:149
 msgid "Send a reply message to this address"
@@ -16899,31 +17424,31 @@ msgstr "Pošaljite poruku odgovora na ovu adresu"
 msgid "Create Search _Folder"
 msgstr "Napravi fasciklu _pretrage"
 
-#: ../src/mail/e-mail-display.c:800
+#: ../src/mail/e-mail-display.c:812
 msgid "Hid_e All"
 msgstr "Sak_rij sve"
 
-#: ../src/mail/e-mail-display.c:807
+#: ../src/mail/e-mail-display.c:819
 msgid "_View Inline"
 msgstr "Pre_gledaj unutar"
 
-#: ../src/mail/e-mail-display.c:814
+#: ../src/mail/e-mail-display.c:826
 msgid "Vie_w All Inline"
 msgstr "Pre_gledaj sve unutar"
 
-#: ../src/mail/e-mail-display.c:821
+#: ../src/mail/e-mail-display.c:833
 msgid "_Zoom to 100%"
 msgstr "Uvećaj na _100%"
 
-#: ../src/mail/e-mail-display.c:823
+#: ../src/mail/e-mail-display.c:835
 msgid "Zoom the image to its natural size"
 msgstr "Postavlja uvećanje slike na njenu originalnu veličinu"
 
-#: ../src/mail/e-mail-display.c:828
+#: ../src/mail/e-mail-display.c:840
 msgid "_Zoom to window"
 msgstr "U_klopi u prozor"
 
-#: ../src/mail/e-mail-display.c:830
+#: ../src/mail/e-mail-display.c:842
 msgid "Zoom large images to not be wider than the window width"
 msgstr "Umanjuje velike slike tako da se uklope u širinu prozora"
 
@@ -16943,6 +17468,28 @@ msgstr "_Napravi"
 msgid "Folder _name:"
 msgstr "Naziv _fascikle:"
 
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:694
+msgid "Folder Sort Order"
+msgstr "Redosled fascikli"
+
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:735
+msgid "Reset c_urrent level"
+msgstr "_Vrati redosled"
+
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:736
+msgid "Reset sort order in the current level to the defaults"
+msgstr "Poništava redosled ređanja trenutnog nivoa na podrazumevane vrednosti"
+
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:746
+msgid "Reset _all levels"
+msgstr "_Svuda vrati redosled"
+
+#: ../src/mail/e-mail-folder-sort-order-dialog.c:747
+msgid "Reset sort order in all levels to their defaults"
+msgstr ""
+"Poništava redosled ređanja za sve nivoe prikaza na njihove podrazumevane "
+"vrednosti"
+
 #. 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:231
@@ -16975,12 +17522,12 @@ msgctxt "ffe"
 msgid "Attachment"
 msgstr "Prilog"
 
-#: ../src/mail/e-mail-free-form-exp.c:484
+#: ../src/mail/e-mail-free-form-exp.c:489
 msgctxt "ffe"
 msgid "no"
 msgstr "ne"
 
-#: ../src/mail/e-mail-free-form-exp.c:485
+#: ../src/mail/e-mail-free-form-exp.c:490
 msgctxt "ffe"
 msgid "false"
 msgstr "netačno"
@@ -17020,14 +17567,13 @@ msgstr "Za uradi_ti"
 msgid "_Later"
 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:1243
+#: ../src/mail/e-mail-label-manager.c:169 ../src/mail/e-mail-reader.c:906
+#: ../src/mail/em-folder-properties.c:1141
 msgid "Add Label"
 msgstr "Dodajte natpis"
 
 #: ../src/mail/e-mail-label-manager.c:220
-#: ../src/mail/em-folder-properties.c:869
+#: ../src/mail/em-folder-properties.c:1168
 msgid "Edit Label"
 msgstr "Uredite natpis"
 
@@ -17043,25 +17589,25 @@ msgstr ""
 msgid "Color"
 msgstr "Boja"
 
-#: ../src/mail/e-mail-notes.c:319 ../src/mail/e-mail-notes.c:719
+#: ../src/mail/e-mail-notes.c:319 ../src/mail/e-mail-notes.c:740
 msgid "Message Note"
 msgstr "Napomena poruke"
 
-#: ../src/mail/e-mail-notes.c:639
+#: ../src/mail/e-mail-notes.c:660
 msgid "Cannot find message in its folder summary"
 msgstr "Ne mogu da nađem poruku u njenom sažetku fascikle"
 
-#: ../src/mail/e-mail-notes.c:842
-msgid "Storing changes..."
-msgstr "Smeštam izmene..."
+#: ../src/mail/e-mail-notes.c:863
+msgid "Storing changes…"
+msgstr "Čuvam izmene…"
 
-#: ../src/mail/e-mail-notes.c:968
+#: ../src/mail/e-mail-notes.c:1001
 msgid "Edit Message Note"
 msgstr "Uredite napomenu poruke"
 
-#: ../src/mail/e-mail-notes.c:1122
-msgid "Retrieving message..."
-msgstr "Preuzimam poruku..."
+#: ../src/mail/e-mail-notes.c:1157
+msgid "Retrieving message…"
+msgstr "Preuzimam poruku…"
 
 #: ../src/mail/e-mail-print-config-headers.c:166
 msgid "Move selected headers to top"
@@ -17091,646 +17637,691 @@ msgstr "Naziv zaglavlja"
 msgid "Header Value"
 msgstr "Vrednost zaglavlja"
 
-#: ../src/mail/e-mail-printer.c:100 ../src/mail/mail-config.ui.h:128
+#: ../src/mail/e-mail-printer.c:103 ../src/mail/mail-config.ui.h:132
 msgid "Headers"
 msgstr "Zaglavlja"
 
-#: ../src/mail/e-mail-printer.c:142
+#: ../src/mail/e-mail-printer.c:145
 #, c-format
 msgid "Page %d of %d"
 msgstr "Stranica %d od %d"
 
-#: ../src/mail/e-mail-reader.c:350 ../src/mail/filtertypes.xml.in.h:65
+#: ../src/mail/e-mail-reader.c:358 ../src/mail/filtertypes.xml.in.h:65
 msgid "Move to Folder"
 msgstr "Premesti u fasciklu"
 
-#: ../src/mail/e-mail-reader.c:350 ../src/mail/filtertypes.xml.in.h:66
+#: ../src/mail/e-mail-reader.c:358 ../src/mail/filtertypes.xml.in.h:66
 msgid "Copy to Folder"
 msgstr "Kopiraj u fasciklu"
 
-#: ../src/mail/e-mail-reader.c:354 ../src/mail/em-folder-utils.c:568
-#: ../src/mail/mail.error.xml.h:152
+#: ../src/mail/e-mail-reader.c:362 ../src/mail/em-folder-utils.c:568
+#: ../src/mail/mail.error.xml.h:153
 msgid "_Move"
 msgstr "Pre_mesti"
 
-#: ../src/mail/e-mail-reader.c:354 ../src/mail/em-folder-utils.c:568
+#: ../src/mail/e-mail-reader.c:362 ../src/mail/em-folder-utils.c:568
 msgid "C_opy"
 msgstr "_Kopiraj"
 
-#: ../src/mail/e-mail-reader.c:529
-msgid "Deleting message note..."
-msgstr "Brišem napomenu poruke..."
+#: ../src/mail/e-mail-reader.c:610
+msgid "Deleting message note…"
+msgstr "Brišem napomenu poruke…"
 
-#: ../src/mail/e-mail-reader.c:1386 ../src/mail/e-mail-reader.c:1598
-#: ../src/mail/e-mail-reader.c:1638
+#: ../src/mail/e-mail-reader.c:1610 ../src/mail/e-mail-reader.c:1901
+#: ../src/mail/e-mail-reader.c:1941
 msgid "_Do not ask me again."
 msgstr "_Ne pitaj me ponovo."
 
-#: ../src/mail/e-mail-reader.c:1644
+#: ../src/mail/e-mail-reader.c:1947
 msgid "_Always ignore Reply-To: for mailing lists."
-msgstr "_Uvek zanemari „Odgovor-za:“ za dopisne liste."
+msgstr "_Uvek zanemari „Odgovori na:“ za dopisne liste."
 
-#: ../src/mail/e-mail-reader.c:1847
+#: ../src/mail/e-mail-reader.c:2151
 msgid "Failed to retrieve message:"
 msgstr "Ne mogu da dovučem poruku:"
 
-#: ../src/mail/e-mail-reader.c:1892 ../src/mail/e-mail-reader.c:3251
+#: ../src/mail/e-mail-reader.c:2197 ../src/mail/e-mail-reader.c:3674
 #, c-format
 msgid "Retrieving message “%s”"
 msgstr "Preuzimam poruku „%s“"
 
-#: ../src/mail/e-mail-reader.c:2080
+#: ../src/mail/e-mail-reader.c:2398
 msgid "A_dd Sender to Address Book"
 msgstr "Do_daj pošiljaoca u imenik"
 
-#: ../src/mail/e-mail-reader.c:2082
+#: ../src/mail/e-mail-reader.c:2400
 msgid "Add sender to address book"
 msgstr "Dodaj pošiljaoca u imenik"
 
-#: ../src/mail/e-mail-reader.c:2087
-msgid "_Archive..."
-msgstr "_Arhiva..."
+#: ../src/mail/e-mail-reader.c:2405
+msgid "_Archive…"
+msgstr "_Arhiva…"
 
-#: ../src/mail/e-mail-reader.c:2089
+#: ../src/mail/e-mail-reader.c:2407
 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:2094
+#: ../src/mail/e-mail-reader.c:2412
 msgid "Check for _Junk"
 msgstr "Proveri da li ima _đubreta"
 
-#: ../src/mail/e-mail-reader.c:2096
+#: ../src/mail/e-mail-reader.c:2414
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrira da li među izabranim porukama ima đubreta"
 
-#: ../src/mail/e-mail-reader.c:2101
-msgid "_Copy to Folder..."
-msgstr "_Kopiraj u fasciklu..."
+#: ../src/mail/e-mail-reader.c:2419
+msgid "Assign C_olor…"
+msgstr "_Dodeli boju…"
+
+#: ../src/mail/e-mail-reader.c:2421
+msgid "Assign color for the selected messages"
+msgstr "Dodeli boju izabranoj poruci"
+
+#: ../src/mail/e-mail-reader.c:2426
+msgid "Unse_t Color"
+msgstr "_Ukloni boju"
 
-#: ../src/mail/e-mail-reader.c:2103
+#: ../src/mail/e-mail-reader.c:2428
+msgid "Unset color for the selected messages"
+msgstr "Vraća podrazumevanu boju izabrane poruke"
+
+#: ../src/mail/e-mail-reader.c:2433
+msgid "_Copy to Folder…"
+msgstr "Kopiraj u fasciklu…"
+
+#: ../src/mail/e-mail-reader.c:2435
 msgid "Copy selected messages to another folder"
 msgstr "Kopira izabrane poruke u drugu fasciklu"
 
-#: ../src/mail/e-mail-reader.c:2108
+#: ../src/mail/e-mail-reader.c:2440
 msgid "_Delete Message"
 msgstr "_Obriši poruku"
 
-#: ../src/mail/e-mail-reader.c:2110
+#: ../src/mail/e-mail-reader.c:2442
 msgid "Mark the selected messages for deletion"
 msgstr "Označite izabranu(e) poruku(e) za brisanje"
 
-#: ../src/mail/e-mail-reader.c:2115
-msgid "_Add note..."
-msgstr "_Dodaj belešku..."
+#: ../src/mail/e-mail-reader.c:2447
+msgid "_Add note…"
+msgstr "_Dodaj belešku…"
 
-#: ../src/mail/e-mail-reader.c:2117
+#: ../src/mail/e-mail-reader.c:2449
 msgid "Add a note for the selected message"
 msgstr "Dodajte belešku za izabranu poruku"
 
-#: ../src/mail/e-mail-reader.c:2122
+#: ../src/mail/e-mail-reader.c:2454
 msgid "Delete no_te"
 msgstr "Obriši _belešku"
 
-#: ../src/mail/e-mail-reader.c:2124
+#: ../src/mail/e-mail-reader.c:2456
 msgid "Delete the note for the selected message"
 msgstr "Obrišite belešku za izabranu poruku"
 
-#: ../src/mail/e-mail-reader.c:2129
-msgid "_Edit note..."
-msgstr "_Uredi belešku..."
+#: ../src/mail/e-mail-reader.c:2461
+msgid "_Edit note…"
+msgstr "_Uredi belešku…"
 
-#: ../src/mail/e-mail-reader.c:2131
+#: ../src/mail/e-mail-reader.c:2463
 msgid "Edit a note for the selected message"
 msgstr "Uredite belešku za izabranu poruku"
 
-#: ../src/mail/e-mail-reader.c:2136
-msgid "Create a Filter Rule for Mailing _List..."
-msgstr "Napravi pravilo propusnika za dopisnu _listu..."
+#: ../src/mail/e-mail-reader.c:2468
+msgid "Create a Filter Rule for Mailing _List…"
+msgstr "Napravi pravilo filtera za dopisnu _listu…"
 
-#: ../src/mail/e-mail-reader.c:2138
+#: ../src/mail/e-mail-reader.c:2470
 msgid "Create a rule to filter messages to this mailing list"
-msgstr "Naravite pravilo za propuštanje poruka na ovu dopisnu listu"
+msgstr "Naravite pravilo za filtriranje poruka za ovu dopisnu listu"
 
-#: ../src/mail/e-mail-reader.c:2143
-msgid "Create a Filter Rule for _Recipients..."
-msgstr "Napravi pravilo propusnika za _primaoce..."
+#: ../src/mail/e-mail-reader.c:2475
+msgid "Create a Filter Rule for _Recipients…"
+msgstr "Napravi pravilo filtera za _primaoce…"
 
-#: ../src/mail/e-mail-reader.c:2145
+#: ../src/mail/e-mail-reader.c:2477
 msgid "Create a rule to filter messages to these recipients"
-msgstr "Napravite pravilo za propuštanje poruka ovim primaocima"
+msgstr "Napravite pravilo za filtriranje poruka za ove primaoce"
 
-#: ../src/mail/e-mail-reader.c:2150
-msgid "Create a Filter Rule for Se_nder..."
-msgstr "Napravi pravilo propusnika za _pošiljaoca..."
+#: ../src/mail/e-mail-reader.c:2482
+msgid "Create a Filter Rule for Se_nder…"
+msgstr "Napravi pravilo filtera za _pošiljaoca…"
 
-#: ../src/mail/e-mail-reader.c:2152
+#: ../src/mail/e-mail-reader.c:2484
 msgid "Create a rule to filter messages from this sender"
-msgstr "Napravite pravilo za propuštanje poruka sa ovog pošiljaoca"
+msgstr "Napravite pravilo za filtriranje poruka od ovog pošiljaoca"
 
-#: ../src/mail/e-mail-reader.c:2157
-msgid "Create a Filter Rule for _Subject..."
-msgstr "Napravi pravilo propusnika za _naslov..."
+#: ../src/mail/e-mail-reader.c:2489
+msgid "Create a Filter Rule for _Subject…"
+msgstr "Napravi pravilo filtera za _naslov…"
 
-#: ../src/mail/e-mail-reader.c:2159
+#: ../src/mail/e-mail-reader.c:2491
 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:2164
+#: ../src/mail/e-mail-reader.c:2496
 msgid "A_pply Filters"
-msgstr "Pri_meni propusnike"
+msgstr "Pri_meni filtere"
 
-#: ../src/mail/e-mail-reader.c:2166
+#: ../src/mail/e-mail-reader.c:2498
 msgid "Apply filter rules to the selected messages"
-msgstr "Primenite pravila propuštanja na izabrane poruke"
+msgstr "Primenite pravila filtriranja za izabrane poruke"
 
-#: ../src/mail/e-mail-reader.c:2171
-msgid "_Find in Message..."
-msgstr "P_ronađi u poruci..."
+#: ../src/mail/e-mail-reader.c:2503
+msgid "_Find in Message…"
+msgstr "P_ronađi u poruci…"
 
-#: ../src/mail/e-mail-reader.c:2173
+#: ../src/mail/e-mail-reader.c:2505
 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:2178
+#: ../src/mail/e-mail-reader.c:2510
 msgid "_Clear Flag"
 msgstr "Sklo_ni oznaku"
 
-#: ../src/mail/e-mail-reader.c:2180
+#: ../src/mail/e-mail-reader.c:2512
 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:2185
+#: ../src/mail/e-mail-reader.c:2517
 msgid "_Flag Completed"
 msgstr "Označ_i kao završeno"
 
-#: ../src/mail/e-mail-reader.c:2187
+#: ../src/mail/e-mail-reader.c:2519
 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:2192
-msgid "Follow _Up..."
-msgstr "Sle_di..."
+#: ../src/mail/e-mail-reader.c:2524
+msgid "Follow _Up…"
+msgstr "S_ledi…"
 
-#: ../src/mail/e-mail-reader.c:2194
+#: ../src/mail/e-mail-reader.c:2526
 msgid "Flag the selected messages for follow-up"
 msgstr "Označite izabrane poruke za praćenje"
 
-#: ../src/mail/e-mail-reader.c:2199
+#: ../src/mail/e-mail-reader.c:2531
 #: ../src/modules/mail/e-mail-attachment-handler.c:431
 msgid "_Attached"
 msgstr "Pri_loženo"
 
-#: ../src/mail/e-mail-reader.c:2201 ../src/mail/e-mail-reader.c:2208
+#: ../src/mail/e-mail-reader.c:2533 ../src/mail/e-mail-reader.c:2540
 #: ../src/modules/mail/e-mail-attachment-handler.c:433
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Prosledite izabranu poruku nekome kao prilog"
 
-#: ../src/mail/e-mail-reader.c:2206
+#: ../src/mail/e-mail-reader.c:2538
 msgid "Forward As _Attached"
 msgstr "Prosledi kao _prilog"
 
-#: ../src/mail/e-mail-reader.c:2213
+#: ../src/mail/e-mail-reader.c:2545
 #: ../src/modules/mail/e-mail-attachment-handler.c:438
 msgid "_Inline"
 msgstr "Unut_ar"
 
-#: ../src/mail/e-mail-reader.c:2215 ../src/mail/e-mail-reader.c:2222
+#: ../src/mail/e-mail-reader.c:2547 ../src/mail/e-mail-reader.c:2554
 #: ../src/modules/mail/e-mail-attachment-handler.c:440
 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:2220
+#: ../src/mail/e-mail-reader.c:2552
 msgid "Forward As _Inline"
 msgstr "Prosledi kao _unutar poruke"
 
-#: ../src/mail/e-mail-reader.c:2227
+#: ../src/mail/e-mail-reader.c:2559
 #: ../src/modules/mail/e-mail-attachment-handler.c:445
 msgid "_Quoted"
 msgstr "_Citirano"
 
-#: ../src/mail/e-mail-reader.c:2229 ../src/mail/e-mail-reader.c:2236
+#: ../src/mail/e-mail-reader.c:2561 ../src/mail/e-mail-reader.c:2568
 #: ../src/modules/mail/e-mail-attachment-handler.c:447
 msgid "Forward the selected message quoted like a reply"
 msgstr "Prosledite izabranu poruku citiranu kao odgovor"
 
-#: ../src/mail/e-mail-reader.c:2234
+#: ../src/mail/e-mail-reader.c:2566
 msgid "Forward As _Quoted"
 msgstr "Prosledi kao _citat"
 
-#: ../src/mail/e-mail-reader.c:2241
+#: ../src/mail/e-mail-reader.c:2573
+msgid "_New Label"
+msgstr "_Nova oznaka"
+
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# When "None" is selected we want the field to be cleared.
+# Note that we don't show this here, since by default a 'None' date
+# is not permitted.
+#. Translators: "None" is used in the message label context menu.
+#. *              It removes all labels from the selected messages.
+#: ../src/mail/e-mail-reader.c:2582
+msgid "N_one"
+msgstr "N_išta"
+
+#: ../src/mail/e-mail-reader.c:2589
 msgid "_Load Images"
 msgstr "_Učitaj slike"
 
-#: ../src/mail/e-mail-reader.c:2243
+#: ../src/mail/e-mail-reader.c:2591
 msgid "Force images in HTML mail to be loaded"
 msgstr "Prisilite učitavanje slika u HTML porukama"
 
-#: ../src/mail/e-mail-reader.c:2248 ../src/mail/e-mail-reader.c:2638
+#: ../src/mail/e-mail-reader.c:2596 ../src/mail/e-mail-reader.c:3015
 msgid "_Ignore Subthread"
 msgstr "Za_nemari podraspravu"
 
-#: ../src/mail/e-mail-reader.c:2250
+#: ../src/mail/e-mail-reader.c:2598
 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:2255 ../src/mail/e-mail-reader.c:2642
+#: ../src/mail/e-mail-reader.c:2603 ../src/mail/e-mail-reader.c:3019
 msgid "_Ignore Thread"
 msgstr "_Zanemari raspravu"
 
-#: ../src/mail/e-mail-reader.c:2257
+#: ../src/mail/e-mail-reader.c:2605
 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:2262
+#: ../src/mail/e-mail-reader.c:2610
 msgid "_Important"
 msgstr "_Važno"
 
-#: ../src/mail/e-mail-reader.c:2264
+#: ../src/mail/e-mail-reader.c:2612
 msgid "Mark the selected messages as important"
 msgstr "Označava izabranu poruku kao važnu"
 
-#: ../src/mail/e-mail-reader.c:2269
+#: ../src/mail/e-mail-reader.c:2617
 msgid "_Junk"
 msgstr "_Đubre"
 
-#: ../src/mail/e-mail-reader.c:2271
+#: ../src/mail/e-mail-reader.c:2619
 msgid "Mark the selected messages as junk"
 msgstr "Označava izabranu poruku kao neželjenu poštu"
 
-#: ../src/mail/e-mail-reader.c:2276
+#: ../src/mail/e-mail-reader.c:2624
 msgid "_Not Junk"
 msgstr "Ni_je đubre"
 
-#: ../src/mail/e-mail-reader.c:2278
+#: ../src/mail/e-mail-reader.c:2626
 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:2283
+#: ../src/mail/e-mail-reader.c:2631
 msgid "_Read"
 msgstr "Pro_čitano"
 
-#: ../src/mail/e-mail-reader.c:2285
+#: ../src/mail/e-mail-reader.c:2633
 msgid "Mark the selected messages as having been read"
 msgstr "Označava izabranu poruku kao pročitanu"
 
-#: ../src/mail/e-mail-reader.c:2290 ../src/mail/e-mail-reader.c:2662
+#: ../src/mail/e-mail-reader.c:2638 ../src/mail/e-mail-reader.c:3039
 msgid "Do not _Ignore Subthread"
 msgstr "Ne zanema_ruj podrasprave"
 
-#: ../src/mail/e-mail-reader.c:2292
+#: ../src/mail/e-mail-reader.c:2640
 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:2297 ../src/mail/e-mail-reader.c:2666
+#: ../src/mail/e-mail-reader.c:2645 ../src/mail/e-mail-reader.c:3043
 msgid "Do not _Ignore Thread"
 msgstr "Ne zanemar_uj rasprave"
 
-#: ../src/mail/e-mail-reader.c:2299
+#: ../src/mail/e-mail-reader.c:2647
 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:2304
+#: ../src/mail/e-mail-reader.c:2652
 msgid "Uni_mportant"
 msgstr "Ne_važno"
 
-#: ../src/mail/e-mail-reader.c:2306
+#: ../src/mail/e-mail-reader.c:2654
 msgid "Mark the selected messages as unimportant"
 msgstr "Označite izabranu(e) poruku(e) kao nevažno"
 
-#: ../src/mail/e-mail-reader.c:2311
+#: ../src/mail/e-mail-reader.c:2659
 msgid "_Unread"
 msgstr "_Nepročitano"
 
-#: ../src/mail/e-mail-reader.c:2313
+#: ../src/mail/e-mail-reader.c:2661
 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:2318
+#: ../src/mail/e-mail-reader.c:2666
 #: ../src/modules/mail/e-mail-attachment-handler.c:417
-msgid "_Edit as New Message..."
-msgstr "_Uredi kao novu poruku..."
+msgid "_Edit as New Message…"
+msgstr "_Uredi kao novu poruku…"
 
-#: ../src/mail/e-mail-reader.c:2320
+#: ../src/mail/e-mail-reader.c:2668
 #: ../src/modules/mail/e-mail-attachment-handler.c:419
 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:2325
+#: ../src/mail/e-mail-reader.c:2673
 msgid "Compose _New Message"
 msgstr "Sastavi _novu poruku"
 
-#: ../src/mail/e-mail-reader.c:2327
+#: ../src/mail/e-mail-reader.c:2675
 msgid "Open a window for composing a mail message"
 msgstr "Otvorite prozor za sastavljanje poruke"
 
-#: ../src/mail/e-mail-reader.c:2332
+#: ../src/mail/e-mail-reader.c:2680
 msgid "_Open in New Window"
 msgstr "_Otvori u novom prozoru"
 
-#: ../src/mail/e-mail-reader.c:2334
+#: ../src/mail/e-mail-reader.c:2682
 msgid "Open the selected messages in a new window"
 msgstr "Otvorite izabrane poruke u novom prozoru"
 
-#: ../src/mail/e-mail-reader.c:2339
-msgid "_Move to Folder..."
-msgstr "_Premesti u fasciklu..."
+#: ../src/mail/e-mail-reader.c:2687
+msgid "_Move to Folder…"
+msgstr "Premesti u fasciklu…"
 
-#: ../src/mail/e-mail-reader.c:2341
+#: ../src/mail/e-mail-reader.c:2689
 msgid "Move selected messages to another folder"
 msgstr "Premestite izabranu(e) poruku(e) u drugu fasciklu"
 
-#: ../src/mail/e-mail-reader.c:2346
+#: ../src/mail/e-mail-reader.c:2694
 msgid "_Next Message"
 msgstr "_Sledeća poruka"
 
-#: ../src/mail/e-mail-reader.c:2348
+#: ../src/mail/e-mail-reader.c:2696
 msgid "Display the next message"
 msgstr "Prikažite sledeću poruku"
 
-#: ../src/mail/e-mail-reader.c:2353
+#: ../src/mail/e-mail-reader.c:2701
 msgid "Next _Important Message"
 msgstr "Sledeća _važna poruka"
 
-#: ../src/mail/e-mail-reader.c:2355
+#: ../src/mail/e-mail-reader.c:2703
 msgid "Display the next important message"
 msgstr "Prikažite sledeću važnu poruku"
 
-#: ../src/mail/e-mail-reader.c:2360
+#: ../src/mail/e-mail-reader.c:2708
 msgid "Next _Thread"
 msgstr "_Sledeća rasprava"
 
-#: ../src/mail/e-mail-reader.c:2362
+#: ../src/mail/e-mail-reader.c:2710
 msgid "Display the next thread"
 msgstr "Prikažite sledeću raspravu"
 
-#: ../src/mail/e-mail-reader.c:2367
+#: ../src/mail/e-mail-reader.c:2715
 msgid "Next _Unread Message"
 msgstr "Sledeća _nepročitana poruka"
 
-#: ../src/mail/e-mail-reader.c:2369
+#: ../src/mail/e-mail-reader.c:2717
 msgid "Display the next unread message"
 msgstr "Prikažite sledeću nepročitanu poruku"
 
-#: ../src/mail/e-mail-reader.c:2374
+#: ../src/mail/e-mail-reader.c:2722
 msgid "_Previous Message"
 msgstr "_Prethodna poruka"
 
-#: ../src/mail/e-mail-reader.c:2376
+#: ../src/mail/e-mail-reader.c:2724
 msgid "Display the previous message"
 msgstr "Prikažite prethodnu poruku"
 
-#: ../src/mail/e-mail-reader.c:2381
+#: ../src/mail/e-mail-reader.c:2729
 msgid "Pr_evious Important Message"
 msgstr "Pr_ethodna važna poruka"
 
-#: ../src/mail/e-mail-reader.c:2383
+#: ../src/mail/e-mail-reader.c:2731
 msgid "Display the previous important message"
 msgstr "Prikažite prethodnu važnu poruku"
 
-#: ../src/mail/e-mail-reader.c:2388
+#: ../src/mail/e-mail-reader.c:2736
 msgid "Previous T_hread"
 msgstr "_Prethodna tema"
 
-#: ../src/mail/e-mail-reader.c:2390
+#: ../src/mail/e-mail-reader.c:2738
 msgid "Display the previous thread"
 msgstr "Prikažite prethodnu temu"
 
-#: ../src/mail/e-mail-reader.c:2395
+#: ../src/mail/e-mail-reader.c:2743
 msgid "P_revious Unread Message"
 msgstr "P_rethodna nepročitana poruka"
 
-#: ../src/mail/e-mail-reader.c:2397
+#: ../src/mail/e-mail-reader.c:2745
 msgid "Display the previous unread message"
 msgstr "Prikažite prethodnu nepročitanu poruku"
 
-#: ../src/mail/e-mail-reader.c:2404
+#: ../src/mail/e-mail-reader.c:2752
 msgid "Print this message"
 msgstr "Štampajte ovu poruku"
 
-#: ../src/mail/e-mail-reader.c:2411
+#: ../src/mail/e-mail-reader.c:2759
 msgid "Preview the message to be printed"
 msgstr "Pregledajte poruku pred štampu"
 
-#: ../src/mail/e-mail-reader.c:2416
+#: ../src/mail/e-mail-reader.c:2764
 #: ../src/modules/mail/e-mail-attachment-handler.c:452
 msgid "Re_direct"
 msgstr "Preu_smeri"
 
-#: ../src/mail/e-mail-reader.c:2418
+#: ../src/mail/e-mail-reader.c:2766
 #: ../src/modules/mail/e-mail-attachment-handler.c:454
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Preusmerite (bez čitanja) izabranu poruku nekome"
 
-#: ../src/mail/e-mail-reader.c:2423
+#: ../src/mail/e-mail-reader.c:2771
 msgid "Remo_ve Attachments"
 msgstr "_Ukloni priloge"
 
-#: ../src/mail/e-mail-reader.c:2425
+#: ../src/mail/e-mail-reader.c:2773
 msgid "Remove attachments"
 msgstr "Uklonite priloge"
 
-#: ../src/mail/e-mail-reader.c:2430
+#: ../src/mail/e-mail-reader.c:2778
 msgid "Remove Du_plicate Messages"
 msgstr "Ukloni _duplirane poruke"
 
-#: ../src/mail/e-mail-reader.c:2432
+#: ../src/mail/e-mail-reader.c:2780
 msgid "Checks selected messages for duplicates"
 msgstr "Proverite izabrane poruke za duplikate"
 
-#: ../src/mail/e-mail-reader.c:2437 ../src/mail/mail.error.xml.h:28
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../src/mail/e-mail-reader.c:2785 ../src/mail/em-composer-utils.c:4099
+#: ../src/mail/mail.error.xml.h:28
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1452
 #: ../src/modules/mail/e-mail-attachment-handler.c:396
 msgid "Reply to _All"
 msgstr "Odgovori _svima"
 
-#: ../src/mail/e-mail-reader.c:2439
+#: ../src/mail/e-mail-reader.c:2787
 #: ../src/modules/mail/e-mail-attachment-handler.c:398
 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:2444 ../src/mail/mail.error.xml.h:26
+#: ../src/mail/e-mail-reader.c:2792
+msgid "Al_ternative Reply…"
+msgstr "Al_ternativni odgovor…"
+
+#: ../src/mail/e-mail-reader.c:2794
+msgid "Choose reply options for the selected message"
+msgstr "Izaberite opcije za odgovor na izabrane poruke"
+
+#: ../src/mail/e-mail-reader.c:2799 ../src/mail/em-composer-utils.c:4094
+#: ../src/mail/mail.error.xml.h:26
 #: ../src/modules/mail/e-mail-attachment-handler.c:403
 msgid "Reply to _List"
 msgstr "Odgovori na _listu"
 
-#: ../src/mail/e-mail-reader.c:2446
+#: ../src/mail/e-mail-reader.c:2801
 #: ../src/modules/mail/e-mail-attachment-handler.c:405
 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:2451
+#: ../src/mail/e-mail-reader.c:2806
 #: ../src/modules/mail/e-mail-attachment-handler.c:410
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljaocu"
 
-#: ../src/mail/e-mail-reader.c:2453
+#: ../src/mail/e-mail-reader.c:2808
 #: ../src/modules/mail/e-mail-attachment-handler.c:412
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Sastavite odgovor pošiljaocu izabrane poruke"
 
-#: ../src/mail/e-mail-reader.c:2458
-msgid "_Save as mbox..."
-msgstr "_Sačuvaj kao mboks..."
+#: ../src/mail/e-mail-reader.c:2813
+msgid "_Save as mbox…"
+msgstr "_Sačuvaj kao mboks…"
 
-#: ../src/mail/e-mail-reader.c:2460
+#: ../src/mail/e-mail-reader.c:2815
 msgid "Save selected messages as an mbox file"
 msgstr "Sačuvajte izabrane poruke kao „mbox“ datoteku"
 
-#: ../src/mail/e-mail-reader.c:2465
+#: ../src/mail/e-mail-reader.c:2827
 msgid "_Message Source"
 msgstr "Izvo_rni kod poruke"
 
-#: ../src/mail/e-mail-reader.c:2467
+#: ../src/mail/e-mail-reader.c:2829
 msgid "Show the raw email source of the message"
 msgstr "Prikažite izvorni kod elektronske poruke"
 
-#: ../src/mail/e-mail-reader.c:2479
+#: ../src/mail/e-mail-reader.c:2841
 msgid "_Undelete Message"
 msgstr "P_ovrati poruku"
 
-#: ../src/mail/e-mail-reader.c:2481
+#: ../src/mail/e-mail-reader.c:2843
 msgid "Undelete the selected messages"
 msgstr "Povratite izabrane poruke"
 
-#: ../src/mail/e-mail-reader.c:2486
+#: ../src/mail/e-mail-reader.c:2848
 msgid "_Normal Size"
 msgstr "_Uobičajena veličina"
 
-#: ../src/mail/e-mail-reader.c:2488
+#: ../src/mail/e-mail-reader.c:2850
 msgid "Reset the text to its original size"
 msgstr "Vratite tekst na originalnu veličinu"
 
-#: ../src/mail/e-mail-reader.c:2493
+#: ../src/mail/e-mail-reader.c:2855
 msgid "_Zoom In"
 msgstr "U_većaj"
 
-#: ../src/mail/e-mail-reader.c:2495
+#: ../src/mail/e-mail-reader.c:2857
 msgid "Increase the text size"
 msgstr "Uvećajte veličinu teksta"
 
-#: ../src/mail/e-mail-reader.c:2502
+#: ../src/mail/e-mail-reader.c:2864
 msgid "Decrease the text size"
 msgstr "Umanjite veličinu teksta"
 
-#: ../src/mail/e-mail-reader.c:2509
+#: ../src/mail/e-mail-reader.c:2871
 msgid "Cre_ate"
 msgstr "_Napravi"
 
-#: ../src/mail/e-mail-reader.c:2516
+#: ../src/mail/e-mail-reader.c:2878
 msgid "Ch_aracter Encoding"
 msgstr "Kodna st_rana"
 
-#: ../src/mail/e-mail-reader.c:2523
+#: ../src/mail/e-mail-reader.c:2885
 #: ../src/modules/mail/e-mail-attachment-handler.c:424
 msgid "F_orward As"
 msgstr "_Prosledi kao"
 
-#: ../src/mail/e-mail-reader.c:2530
+#: ../src/mail/e-mail-reader.c:2892
+msgid "_Label"
+msgstr "_Natpis"
+
+#: ../src/mail/e-mail-reader.c:2899
 msgid "_Group Reply"
 msgstr "O_dgovori grupi"
 
-#: ../src/mail/e-mail-reader.c:2537
+#: ../src/mail/e-mail-reader.c:2906
 msgid "_Go To"
 msgstr "_Idi na"
 
-#: ../src/mail/e-mail-reader.c:2544
+#: ../src/mail/e-mail-reader.c:2913
 msgid "Mar_k As"
 msgstr "O_znači kao"
 
-#: ../src/mail/e-mail-reader.c:2551
+#: ../src/mail/e-mail-reader.c:2920
 msgid "_Message"
 msgstr "_Poruka"
 
-#: ../src/mail/e-mail-reader.c:2558
+#: ../src/mail/e-mail-reader.c:2927
 msgid "_Zoom"
 msgstr "Uv_ećaj"
 
-#: ../src/mail/e-mail-reader.c:2568
-msgid "Create a Search Folder from Mailing _List..."
-msgstr "Napravi fasciklu pretrage sa dopisne _liste..."
+#: ../src/mail/e-mail-reader.c:2937
+msgid "Create a Search Folder from Mailing _List…"
+msgstr "Napravi fasciklu pretrage sa dopisne _liste…"
 
-#: ../src/mail/e-mail-reader.c:2570
+#: ../src/mail/e-mail-reader.c:2939
 msgid "Create a search folder for this mailing list"
 msgstr "Napravite fasciklu pretrage za ovu dopisnu listu"
 
-#: ../src/mail/e-mail-reader.c:2575
-msgid "Create a Search Folder from Recipien_ts..."
-msgstr "Napravi fasciklu pretrage od pri_malaca..."
+#: ../src/mail/e-mail-reader.c:2944
+msgid "Create a Search Folder from Recipien_ts…"
+msgstr "Napravi fasciklu pretrage od pri_malaca…"
 
-#: ../src/mail/e-mail-reader.c:2577
+#: ../src/mail/e-mail-reader.c:2946
 msgid "Create a search folder for these recipients"
 msgstr "Napravite fasciklu pretrage za ove primaoce"
 
-#: ../src/mail/e-mail-reader.c:2582
-msgid "Create a Search Folder from Sen_der..."
-msgstr "Napravi fasciklu pretrage od po_šiljaoca..."
+#: ../src/mail/e-mail-reader.c:2951
+msgid "Create a Search Folder from Sen_der…"
+msgstr "Napravi fasciklu pretrage od po_šiljaoca…"
 
-#: ../src/mail/e-mail-reader.c:2584
+#: ../src/mail/e-mail-reader.c:2953
 msgid "Create a search folder for this sender"
 msgstr "Napravite fasciklu pretrage za ovog pošiljaoca"
 
-#: ../src/mail/e-mail-reader.c:2589
-msgid "Create a Search Folder from S_ubject..."
-msgstr "Napravi fasciklu pretrage iz _naslova..."
+#: ../src/mail/e-mail-reader.c:2958
+msgid "Create a Search Folder from S_ubject…"
+msgstr "Napravi fasciklu pretrage iz _naslova…"
 
-#: ../src/mail/e-mail-reader.c:2591
+#: ../src/mail/e-mail-reader.c:2960
 msgid "Create a search folder for this subject"
 msgstr "Napravite fasciklu pretrage za ovaj naslov"
 
-#: ../src/mail/e-mail-reader.c:2630
-msgid "Mark for Follo_w Up..."
-msgstr "Obeleži za _praćenje..."
+#: ../src/mail/e-mail-reader.c:3007
+msgid "Mark for Follo_w Up…"
+msgstr "Obeleži za _praćenje…"
 
-#: ../src/mail/e-mail-reader.c:2646
+#: ../src/mail/e-mail-reader.c:3023
 msgid "Mark as _Important"
 msgstr "Onači kao _važno"
 
-#: ../src/mail/e-mail-reader.c:2650
+#: ../src/mail/e-mail-reader.c:3027
 msgid "Mark as _Junk"
 msgstr "Označi kao _đubre"
 
-#: ../src/mail/e-mail-reader.c:2654
+#: ../src/mail/e-mail-reader.c:3031
 msgid "Mark as _Not Junk"
 msgstr "Označi da _nije đubre"
 
-#: ../src/mail/e-mail-reader.c:2658
+#: ../src/mail/e-mail-reader.c:3035
 msgid "Mar_k as Read"
 msgstr "O_znači kao pročitano"
 
-#: ../src/mail/e-mail-reader.c:2670
+#: ../src/mail/e-mail-reader.c:3047
 msgid "Mark as Uni_mportant"
 msgstr "Označi kao _nevažno"
 
-#: ../src/mail/e-mail-reader.c:2674
+#: ../src/mail/e-mail-reader.c:3051
 msgid "Mark as _Unread"
 msgstr "Označi kao _nepročitano"
 
-#: ../src/mail/e-mail-reader.c:2718
+#: ../src/mail/e-mail-reader.c:3099
 msgid "_Caret Mode"
 msgstr "Metod u_metanja"
 
-#: ../src/mail/e-mail-reader.c:2720
+#: ../src/mail/e-mail-reader.c:3101
 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:2726
+#: ../src/mail/e-mail-reader.c:3107
 msgid "All Message _Headers"
 msgstr "Sva _zaglavlja poruke"
 
-#: ../src/mail/e-mail-reader.c:2728
+#: ../src/mail/e-mail-reader.c:3109
 msgid "Show messages with all email headers"
 msgstr "Prikažite poruku sa svim zaglavljima e-pošte"
 
-#: ../src/mail/e-mail-reader.c:3257
+#: ../src/mail/e-mail-reader.c:3680
 msgid "Retrieving message"
 msgstr "Preuzimam poruku"
 
-#: ../src/mail/e-mail-reader.c:4327
+#: ../src/mail/e-mail-reader.c:5041
 #: ../src/modules/mail/e-mail-attachment-handler.c:389
 msgid "_Forward"
 msgstr "Prosl_edi"
 
-#: ../src/mail/e-mail-reader.c:4328
+#: ../src/mail/e-mail-reader.c:5042
 #: ../src/modules/mail/e-mail-attachment-handler.c:391
 msgid "Forward the selected message to someone"
 msgstr "Prosleđuje izabranu poruku nekome"
@@ -17739,52 +18330,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:4347
+#: ../src/mail/e-mail-reader.c:5061
 msgid "Group Reply"
 msgstr "Odgovor grupi"
 
-#: ../src/mail/e-mail-reader.c:4348
+#: ../src/mail/e-mail-reader.c:5062
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Odgovorite dopisnoj listi ili svim primaocima"
 
-#: ../src/mail/e-mail-reader.c:4414 ../src/mail/filtertypes.xml.in.h:67
+#: ../src/mail/e-mail-reader.c:5128 ../src/mail/filtertypes.xml.in.h:67
 msgid "Delete"
 msgstr "Obriši"
 
-#: ../src/mail/e-mail-reader.c:4426
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1281
+#: ../src/mail/e-mail-reader.c:5140
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1249
 msgid "Next"
 msgstr "Sledeće"
 
-#: ../src/mail/e-mail-reader.c:4430
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1274
+#: ../src/mail/e-mail-reader.c:5144
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1242
 msgid "Previous"
 msgstr "Prethodno"
 
-#: ../src/mail/e-mail-reader.c:4439 ../src/mail/mail-dialogs.ui.h:9
+#: ../src/mail/e-mail-reader.c:5153 ../src/mail/mail-dialogs.ui.h:9
 msgid "Reply"
 msgstr "Odgovori"
 
-#: ../src/mail/e-mail-reader.c:5517
+#: ../src/mail/e-mail-reader.c:6308
 #, c-format
 msgid "Allow remote content for anyone from %s"
 msgstr "Dozvoli udaljeni sadržaj svima sa %s"
 
-#: ../src/mail/e-mail-reader.c:5519
+#: ../src/mail/e-mail-reader.c:6310
 #, c-format
 msgid "Allow remote content for %s"
 msgstr "Dozvoli udaljeni sadržaj za %s"
 
-#: ../src/mail/e-mail-reader.c:5536
+#: ../src/mail/e-mail-reader.c:6327
 #, c-format
 msgid "Allow remote content from %s"
 msgstr "Dozvoli udaljeni sadržaj svima od %s"
 
-#: ../src/mail/e-mail-reader.c:5553
+#: ../src/mail/e-mail-reader.c:6344
 msgid "Do not show this message again"
 msgstr "Ne prikazuj više ovu poruku"
 
-#: ../src/mail/e-mail-reader.c:5605
+#: ../src/mail/e-mail-reader.c:6396
 msgid "Load remote content"
 msgstr "Učitaj udaljeni sadržaj"
 
@@ -17792,39 +18383,39 @@ msgstr "Učitaj udaljeni sadržaj"
 msgid "Do not warn me again"
 msgstr "Ne upozoravaj me ponovo"
 
-#: ../src/mail/e-mail-reader-utils.c:633
+#: ../src/mail/e-mail-reader-utils.c:632
 #, 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
+#: ../src/mail/e-mail-reader-utils.c:727
 #, c-format
 msgid "Refreshing folder “%s”"
 msgstr "Osvežavam fasciklu „%s“"
 
-#: ../src/mail/e-mail-reader-utils.c:1335
+#: ../src/mail/e-mail-reader-utils.c:1334
 msgid "Marking thread to be ignored"
 msgstr "Označavam raspravu kao zanemarenu"
 
-#: ../src/mail/e-mail-reader-utils.c:1339
+#: ../src/mail/e-mail-reader-utils.c:1338
 msgid "Unmarking thread from being ignored"
 msgstr "Označavam raspravi kao da nije zanemarena"
 
-#: ../src/mail/e-mail-reader-utils.c:1343
+#: ../src/mail/e-mail-reader-utils.c:1342
 msgid "Marking subthread to be ignored"
 msgstr "Označavam podraspravu kao zanemarenu"
 
-#: ../src/mail/e-mail-reader-utils.c:1347
+#: ../src/mail/e-mail-reader-utils.c:1346
 msgid "Unmarking subthread from being ignored"
 msgstr "Označavam podraspravu kao da nije zanemarena"
 
-#: ../src/mail/e-mail-reader-utils.c:1599
+#: ../src/mail/e-mail-reader-utils.c:1602
 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:1836
+#: ../src/mail/e-mail-reader-utils.c:1839
 #, c-format
 msgid ""
 "Folder “%s” contains %u duplicate message. Are you sure you want to delete "
@@ -17845,7 +18436,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:2854
+#: ../src/mail/e-mail-reader-utils.c:2925
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Sačuvaj poruku"
@@ -17858,7 +18449,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:2875
+#: ../src/mail/e-mail-reader-utils.c:2946
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Poruka"
@@ -17866,18 +18457,26 @@ msgstr[1] "Poruke"
 msgstr[2] "Poruke"
 msgstr[3] "Poruka"
 
-#: ../src/mail/e-mail-reader-utils.c:3271
+#: ../src/mail/e-mail-reader-utils.c:3360
 msgid "Parsing message"
 msgstr "Obrađujem poruku"
 
-#: ../src/mail/e-mail-request.c:270
+#: ../src/mail/e-mail-request.c:288
 msgid "The message has no text content."
 msgstr "Poruka ne sadrži tekst."
 
-#: ../src/mail/e-mail-tag-editor.c:163
+#: ../src/mail/e-mail-tag-editor.c:155
 msgid "Flag to Follow Up"
 msgstr "Označi za praćenje"
 
+#: ../src/mail/e-mail-tag-editor.c:161
+msgid "Cl_ear"
+msgstr "Očist_i"
+
+#: ../src/mail/e-mail-templates-store.c:115
+msgid "No Title"
+msgstr "Bez zvanja"
+
 #: ../src/mail/e-mail-ui-session.c:820
 #, c-format
 msgid "%s authentication failed"
@@ -17890,18 +18489,18 @@ msgstr "Nije pronađen izvor podataka za JIB „%s“"
 
 # mail:ask-send-only-bcc primary
 #. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
-#: ../src/mail/em-composer-utils.c:388
+#: ../src/mail/em-composer-utils.c:395
 #, c-format
 msgid "Are you sure you want to send a message with %d To and CC recipients?"
 msgid_plural ""
 "Are you sure you want to send a message with %d To and CC recipients?"
-msgstr[0] "Sigurno želite da pošaljete poruku sa %d Za i CC primaoca?"
-msgstr[1] "Sigurno želite da pošaljete poruku sa %d Za i CC primaoca?"
-msgstr[2] "Sigurno želite da pošaljete poruku sa %d Za i CC primaoca?"
-msgstr[3] "Sigurno želite da pošaljete poruku sa %d Za i CC primaoca?"
+msgstr[0] "Sigurno želite da pošaljete poruku za %d primaoca?"
+msgstr[1] "Sigurno želite da pošaljete poruku za %d primaoca?"
+msgstr[2] "Sigurno želite da pošaljete poruku za %d primaoca?"
+msgstr[3] "Sigurno želite da pošaljete poruku za %d primaoca?"
 
 #. Translators: The %d is replaced with the actual count of recipients, which is always more than one.
-#: ../src/mail/em-composer-utils.c:394
+#: ../src/mail/em-composer-utils.c:401
 #, c-format
 msgid ""
 "You are trying to send a message to %d recipients in To and CC fields. This "
@@ -17916,35 +18515,35 @@ msgid_plural ""
 "other or if privacy is a concern. Consider adding recipients to the BCC "
 "field instead."
 msgstr[0] ""
-"Pokušavate da pošaljete poruku na %d primaoca koji su navedenu unutar polja Za "
-"i CC. Ovo će omogućiti svim primaocima da vide adrese e-pošte ostalih. "
-"Ponekad primaoci neće biti zadovoljni time, pogotovu ukoliko se međusobno ne "
-"poznaju ili ukoliko im na taj način ugrožavate privatnost. Da bi ovo izbegli "
-"možete da dodate primaoce u polje BCC."
+"Pokušavate da pošaljete poruku na %d primaoca koji su navedenu unutar polja "
+"Prima i Kopija. Ovo će omogućiti svim primaocima da vide adrese e-pošte "
+"ostalih. Ponekad primaoci neće biti zadovoljni time, pogotovu ukoliko se "
+"međusobno ne poznaju ili ukoliko im na taj način ugrožavate privatnost. Da "
+"bi ovo izbegli možete da dodate primaoce u polje Slepa popija."
 msgstr[1] ""
-"Pokušavate da pošaljete poruku na %d primaoca koji su navedenu unutar polja Za "
-"i CC. Ovo će omogućiti svim primaocima da vide adrese e-pošte ostalih. "
-"Ponekad primaoci neće biti zadovoljni time, pogotovu ukoliko se međusobno ne "
-"poznaju ili ukoliko im na taj način ugrožavate privatnost. Da bi ovo izbegli "
-"možete da dodate primaoce u polje BCC."
+"Pokušavate da pošaljete poruku na %d primaoca koji su navedenu unutar polja "
+"Prima i Kopija. Ovo će omogućiti svim primaocima da vide adrese e-pošte "
+"ostalih. Ponekad primaoci neće biti zadovoljni time, pogotovu ukoliko se "
+"međusobno ne poznaju ili ukoliko im na taj način ugrožavate privatnost. Da "
+"bi ovo izbegli možete da dodate primaoce u polje Slep kopija."
 msgstr[2] ""
-"Pokušavate da pošaljete poruku na %d primaoca koji su navedenu unutar polja Za "
-"i CC. Ovo će omogućiti svim primaocima da vide adrese e-pošte ostalih. "
-"Ponekad primaoci neće biti zadovoljni time, pogotovu ukoliko se međusobno ne "
-"poznaju ili ukoliko im na taj način ugrožavate privatnost. Da bi ovo izbegli "
-"možete da dodate primaoce u polje BCC."
+"Pokušavate da pošaljete poruku na %d primaoca koji su navedenu unutar polja "
+"Prima i Kopija. Ovo će omogućiti svim primaocima da vide adrese e-pošte "
+"ostalih. Ponekad primaoci neće biti zadovoljni time, pogotovu ukoliko se "
+"međusobno ne poznaju ili ukoliko im na taj način ugrožavate privatnost. Da "
+"bi ovo izbegli možete da dodate primaoce u polje Slepa kopija."
 msgstr[3] ""
-"Pokušavate da pošaljete poruku na %d primaoca koji su navedenu unutar polja Za "
-"i CC. Ovo će omogućiti svim primaocima da vide adrese e-pošte ostalih. "
-"Ponekad primaoci neće biti zadovoljni time, pogotovu ukoliko se međusobno ne "
-"poznaju ili ukoliko im na taj način ugrožavate privatnost. Da bi ovo izbegli "
-"možete da dodate primaoce u polje BCC."
+"Pokušavate da pošaljete poruku na %d primaoca koji su navedenu unutar polja "
+"Prima i Kopija. Ovo će omogućiti svim primaocima da vide adrese e-pošte "
+"ostalih. Ponekad primaoci neće biti zadovoljni time, pogotovu ukoliko se "
+"međusobno ne poznaju ili ukoliko im na taj način ugrožavate privatnost. Da "
+"bi ovo izbegli možete da dodate primaoce u polje Slepa kopija."
 
 #. 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:800
-msgid "Waiting for attachments to load..."
-msgstr "Čekam da se učitaju prilozi..."
+#: ../src/mail/em-composer-utils.c:829
+msgid "Waiting for attachments to load…"
+msgstr "Čekam da se učitaju prilozi…"
 
 # * each ${Variable} gets replaced with a value. To see a full list of available
 # * variables, see em-composer-utils.c:1514
@@ -17952,7 +18551,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:1991
+#: ../src/mail/em-composer-utils.c:2027
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -17960,34 +18559,142 @@ msgstr ""
 "U ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. u ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} piše:"
 
-#: ../src/mail/em-composer-utils.c:1997
+#: ../src/mail/em-composer-utils.c:2033
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Prosleđena poruka --------"
 
-#: ../src/mail/em-composer-utils.c:2002
+#: ../src/mail/em-composer-utils.c:2038
 msgid "-----Original Message-----"
 msgstr "-----Originalna poruka-----"
 
 #. Translators: This is a reply attribution in the message reply subject. The %s is replaced with the 
subject of the original message. Both 'Re'-s in the 'reply-attribution' translation context should translate 
into the same string, the same as the ':' separator.
-#: ../src/mail/em-composer-utils.c:2711
+#: ../src/mail/em-composer-utils.c:2799
 #, c-format
 msgctxt "reply-attribution"
 msgid "Re: %s"
 msgstr "Odg: %s"
 
-#: ../src/mail/em-composer-utils.c:3257
+#: ../src/mail/em-composer-utils.c:3417
 msgid "an unknown sender"
 msgstr "nepoznati pošiljalac"
 
+#: ../src/mail/em-composer-utils.c:4045
+msgid "Alternative Reply"
+msgstr "Alternativni odgovor"
+
+#: ../src/mail/em-composer-utils.c:4048
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1445
+msgid "_Reply"
+msgstr "_Odgovori"
+
+#: ../src/mail/em-composer-utils.c:4061
+msgid "Recipients:"
+msgstr "Primaoci:"
+
+#: ../src/mail/em-composer-utils.c:4089
+msgid "Reply to _Sender"
+msgstr "_Odgovori pošiljaocu"
+
+#: ../src/mail/em-composer-utils.c:4111
+msgid "Reply style:"
+msgstr "Stil odgovora:"
+
+#: ../src/mail/em-composer-utils.c:4119
+msgid "_Default"
+msgstr "Po_drazumevano"
+
+#: ../src/mail/em-composer-utils.c:4123
+msgid "Attach_ment"
+msgstr "Prilo_g"
+
+#: ../src/mail/em-composer-utils.c:4127
+msgid "Inline (_Outlook style)"
+msgstr "Unutar (Au_tluk stil)"
+
+#: ../src/mail/em-composer-utils.c:4131
+msgid "_Quote"
+msgstr "_Citiraj"
+
+#: ../src/mail/em-composer-utils.c:4135
+msgid "Do _Not Quote"
+msgstr "_Ne citiraj"
+
+#: ../src/mail/em-composer-utils.c:4142
+msgid "_Format message in HTML"
+msgstr "Oblikuj poruke u HTM_L"
+
+#: ../src/mail/em-composer-utils.c:4152
+msgid "Apply t_emplate"
+msgstr "Prim_eni šablon"
+
+#: ../src/mail/em-composer-utils.c:4164
+msgid "Preserve original message S_ubject"
+msgstr "Sač_uvaj izvorni naslov poruke"
+
+# bug(slobo): verovatno izveštaj o dostavi
+#: ../src/mail/em-composer-utils.c:4230
+#, c-format
+msgid "one recipient"
+msgid_plural "%d recipients"
+msgstr[0] "%d primalac"
+msgstr[1] "%d primalaca"
+msgstr[2] "%d primalaca"
+msgstr[3] "jedan primalac"
+
 #. FIXME GTK_WINDOW (composer)
-#: ../src/mail/em-composer-utils.c:3741
+#: ../src/mail/em-composer-utils.c:4639
 msgid "Posting destination"
 msgstr "Odredišna pošta"
 
-#: ../src/mail/em-composer-utils.c:3746
+#: ../src/mail/em-composer-utils.c:4644
 msgid "Choose folders to post the message to."
 msgstr "Izaberite fascikle za slanje poruke."
 
+#: ../src/mail/em-filter-editor.c:43
+msgid "Description of Filters"
+msgstr "Opis filtera"
+
+#. Translators: The first '%s' is replaced with the rule name;
+#. the second '%s' with 'enabled' or 'disabled' word;
+#. the third '%s' is replaced with the account name
+#: ../src/mail/em-filter-editor.c:167
+#, c-format
+msgid "%s (%s, for account %s)"
+msgstr "%s (%s, za nalog %s)"
+
+# has "activatable" set.
+#: ../src/mail/em-filter-editor.c:167 ../src/mail/em-filter-editor.c:171
+msgid "enabled"
+msgstr "omogućeno"
+
+#: ../src/mail/em-filter-editor.c:167 ../src/mail/em-filter-editor.c:171
+msgid "disabled"
+msgstr "onemogućeno"
+
+#. Translators: The first '%s' is replaced with the rule name;
+#. the second '%s' with 'enabled' or 'disabled' word
+#: ../src/mail/em-filter-editor.c:171
+#, c-format
+msgid "%s (%s, for any account)"
+msgstr "%s (%s, za bilo koji nalog)"
+
+#: ../src/mail/em-filter-editor.c:183
+msgid "If all the following conditions are met"
+msgstr "Ako su svi navedeni uslovi ispunjeni"
+
+#: ../src/mail/em-filter-editor.c:186
+msgid "If any of the following conditions are met"
+msgstr "Ako je bilo koji od navedenih uslova ispunjen"
+
+#. and now for the action area
+#: ../src/mail/em-filter-editor.c:203 ../src/mail/em-filter-rule.c:1068
+msgid "Then"
+msgstr "Potom"
+
+#: ../src/mail/em-filter-editor.c:408
+msgid "De_scribe Filters…"
+msgstr "Opiši filtere…"
+
 #: ../src/mail/em-filter-editor-folder-element.c:154
 msgid "Select Folder"
 msgstr "Izaberi fasciklu"
@@ -18006,17 +18713,24 @@ msgstr "_Vrsta pravila:"
 msgid "_For Account:"
 msgstr "_Za nalog:"
 
-#. and now for the action area
-#: ../src/mail/em-filter-rule.c:1068
-msgid "Then"
-msgstr "Potom"
-
 #: ../src/mail/em-filter-rule.c:1141
 msgid "Add Ac_tion"
 msgstr "Dodaj ra_dnju"
 
+#: ../src/mail/em-folder-properties.c:170
+msgid "Select Custom Icon"
+msgstr "Izaberi proizvoljnu ikonicu"
+
+#: ../src/mail/em-folder-properties.c:219
+msgid "_Use custom icon"
+msgstr "_Koristi proizvoljnu ikonicu"
+
+#: ../src/mail/em-folder-properties.c:312
+msgid "Use te_xt color"
+msgstr "Koristi tekst u _boji"
+
 # bug: no need for plural-forms
-#: ../src/mail/em-folder-properties.c:240
+#: ../src/mail/em-folder-properties.c:494
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Nepročitanih poruka:"
@@ -18025,7 +18739,7 @@ msgstr[2] "Nepročitanih poruka:"
 msgstr[3] "Nepročitanih poruka:"
 
 # bug: no need for plural-forms here, since text is in front of number
-#: ../src/mail/em-folder-properties.c:251
+#: ../src/mail/em-folder-properties.c:505
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Ukupno poruka:"
@@ -18034,94 +18748,99 @@ msgstr[2] "Ukupno poruka:"
 msgstr[3] "Ukupno poruka:"
 
 # bug: no need for plural-forms here, since text is in front of number
-#: ../src/mail/em-folder-properties.c:272
+#: ../src/mail/em-folder-properties.c:526
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Iskorišćenost kvote (%s):"
 
 # bug: no need for plural-forms here, since text is in front of number
-#: ../src/mail/em-folder-properties.c:274
+#: ../src/mail/em-folder-properties.c:528
 #, c-format
 msgid "Quota usage"
 msgstr "Iskorišćenost kvote"
 
 #. Translators: Label of a combo with a list of configured accounts where a user can
 #. choose which account to use as the sender when composing a message in this folder
-#: ../src/mail/em-folder-properties.c:398
+#: ../src/mail/em-folder-properties.c:672
 msgid "_Send Account Override:"
 msgstr "_Prepiši nalog slanja:"
 
-#: ../src/mail/em-folder-properties.c:605
-msgid "_Archive this folder using these settings:"
-msgstr "_Arhiviraj ovu fasciklu koristeći sledeća podešavanja:"
+#: ../src/mail/em-folder-properties.c:912
+msgid "Archive this folder using these settings:"
+msgstr "Arhiviraj ovu fasciklu koristeći sledeća podešavanja:"
 
-#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:614
+#. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
+#: ../src/mail/em-folder-properties.c:924
 msgctxt "autoarchive"
-msgid "_Cleanup messages older than"
-msgstr "O_čisti poruke starije od"
+msgid "Auto-_cleanup messages older than"
+msgstr "Sam o_čisti poruke starije od"
 
-#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:630
+#. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
+#: ../src/mail/em-folder-properties.c:937
 msgctxt "autoarchive"
 msgid "days"
 msgstr "dana"
 
-#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:632
+#. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
+#: ../src/mail/em-folder-properties.c:939
 msgctxt "autoarchive"
 msgid "weeks"
 msgstr "nedelja"
 
-#. Translators: This text is part of "Cleanup messages older than [X] [days/weeks/months]"
-#: ../src/mail/em-folder-properties.c:634
+#. Translators: This text is part of "Auto-cleanup messages older than [X] [days/weeks/months]"
+#: ../src/mail/em-folder-properties.c:941
 msgctxt "autoarchive"
 msgid "months"
 msgstr "meseci"
 
-#: ../src/mail/em-folder-properties.c:640
-msgid "Move old messages to the default archive _folder"
-msgstr "Premesti stare poruke među _arhivirane"
+#: ../src/mail/em-folder-properties.c:947
+msgid "Move messages to the default archive _folder"
+msgstr "Premesti poruke u podrazumevanu _fasciklu za arhivu"
 
-#: ../src/mail/em-folder-properties.c:651
-msgid "_Move old messages to:"
-msgstr "_Premesti stare poruke u:"
+#: ../src/mail/em-folder-properties.c:954
+msgid "_Move messages to:"
+msgstr "_Premesti poruke u:"
 
-#: ../src/mail/em-folder-properties.c:655
-msgid "AutoArchive folder"
-msgstr "Fascikla AutoArhive"
+#: ../src/mail/em-folder-properties.c:958
+msgid "Archive folder"
+msgstr "Arhiviraj fasciklu"
 
-#: ../src/mail/em-folder-properties.c:655
-msgid "Select folder to use for AutoArchive"
-msgstr "Izaberite fasciklu za AutoArhivu"
+#: ../src/mail/em-folder-properties.c:958
+msgid "Select folder to use for Archive"
+msgstr "Izaberite fasciklu za arhivu"
 
-#: ../src/mail/em-folder-properties.c:661
-msgid "_Delete old messages"
-msgstr "_Obriši stare poruke"
+#: ../src/mail/em-folder-properties.c:962
+msgid "_Delete messages"
+msgstr "_Obriši poruke"
 
-#: ../src/mail/em-folder-properties.c:1018
+#: ../src/mail/em-folder-properties.c:1317
 msgid "Server Tag"
 msgstr "Oznaka servera"
 
-#: ../src/mail/em-folder-properties.c:1022 ../src/mail/filtertypes.xml.in.h:29
+#: ../src/mail/em-folder-properties.c:1321 ../src/mail/filtertypes.xml.in.h:29
 #: ../src/mail/searchtypes.xml.in.h:31 ../src/mail/vfoldertypes.xml.in.h:31
 msgid "Label"
 msgstr "Natpis"
 
-#: ../src/mail/em-folder-properties.c:1073
-msgid "AutoArchive"
-msgstr "AutoArhiva"
+#: ../src/mail/em-folder-properties.c:1370
+msgid "Appearance"
+msgstr "Izgled"
 
-#: ../src/mail/em-folder-properties.c:1076 ../src/mail/mail-config.ui.h:121
+#. Translators: "Archive" is a noun (This is a tab heading in the mail folder properties)
+#: ../src/mail/em-folder-properties.c:1374
+msgid "Archive"
+msgstr "Arhiva"
+
+#: ../src/mail/em-folder-properties.c:1377 ../src/mail/mail-config.ui.h:123
 #: ../src/mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Oznake"
 
-#: ../src/mail/em-folder-properties.c:1155
+#: ../src/mail/em-folder-properties.c:1455
 msgid "Folder Properties"
 msgstr "Osobine fascikle"
 
-#: ../src/mail/em-folder-properties.c:1394
+#: ../src/mail/em-folder-properties.c:1694
 msgid "Gathering folder properties"
 msgstr "Prikupljam svojstva fascikle"
 
@@ -18133,7 +18852,7 @@ msgstr "<kliknite ovde da izaberete fasciklu>"
 msgid "Create a new folder"
 msgstr "Napravite novu fasciklu"
 
-#: ../src/mail/em-folder-tree.c:682
+#: ../src/mail/em-folder-tree.c:685
 msgid "Folder names cannot contain “/”"
 msgstr "Nazivi fascikli ne mogu da sadrže „/“"
 
@@ -18155,52 +18874,47 @@ msgstr "Nazivi fascikli ne mogu da sadrže „/“"
 #. * Do not translate the "folder-display|" part. Remove it
 #. * from your translation.
 #.
-#: ../src/mail/em-folder-tree.c:876
+#: ../src/mail/em-folder-tree.c:879
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../src/mail/em-folder-tree.c:1731
+#: ../src/mail/em-folder-tree.c:1741
 msgid "Mail Folder Tree"
 msgstr "Stablo fascikle za poštu"
 
-#: ../src/mail/em-folder-tree.c:2279
+#: ../src/mail/em-folder-tree.c:2290
 #, c-format
 msgid "Moving folder %s"
 msgstr "Premeštam fasciklu „%s“"
 
-#: ../src/mail/em-folder-tree.c:2282
+#: ../src/mail/em-folder-tree.c:2293
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopiram fasciklu „%s“"
 
-#: ../src/mail/em-folder-tree.c:2289 ../src/mail/message-list.c:2595
+#: ../src/mail/em-folder-tree.c:2300 ../src/mail/message-list.c:2629
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Premeštam poruke u fasciklu „%s“"
 
-#: ../src/mail/em-folder-tree.c:2293 ../src/mail/message-list.c:2597
+#: ../src/mail/em-folder-tree.c:2304 ../src/mail/message-list.c:2631
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopiram poruke u fasciklu „%s“"
 
-#: ../src/mail/em-folder-tree.c:2312
+#: ../src/mail/em-folder-tree.c:2323
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ne mogu da ubacim poruku(e) u ostavu na najvišem nivou"
 
 #. UNMATCHED is always last.
-#: ../src/mail/em-folder-tree-model.c:445
-#: ../src/mail/em-folder-tree-model.c:447
+#: ../src/mail/em-folder-tree-model.c:460
+#: ../src/mail/em-folder-tree-model.c:462
 msgid "UNMATCHED"
 msgstr "NEODGOVARA"
 
-#: ../src/mail/em-folder-tree-model.c:1326
-#: ../src/mail/em-folder-tree-model.c:1703
-msgid "Loading..."
-msgstr "Učitavam..."
-
 #: ../src/mail/em-folder-utils.c:111
 #, c-format
 msgid "Moving folder “%s”"
@@ -18242,8 +18956,8 @@ msgid "Subscribe To _All"
 msgstr "Prijavi se _na sve"
 
 #: ../src/mail/em-subscription-editor.c:936
-#: ../src/mail/em-subscription-editor.c:1888 ../src/mail/mail.error.xml.h:73
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1749
+#: ../src/mail/em-subscription-editor.c:1890 ../src/mail/mail.error.xml.h:73
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1706
 msgid "_Unsubscribe"
 msgstr "_Odjavi se"
 
@@ -18255,10 +18969,10 @@ msgstr "O_djavi se sa skrivenih"
 msgid "Unsubscribe From _All"
 msgstr "Odja_vi se sa svih"
 
-#: ../src/mail/em-subscription-editor.c:1313
-#: ../src/modules/mail/e-mail-shell-view-private.c:936
-#: ../src/modules/mail/e-mail-shell-view-private.c:968
-#: ../src/modules/mail/e-mail-shell-view-private.c:1012
+#: ../src/mail/em-subscription-editor.c:1315
+#: ../src/modules/mail/e-mail-shell-view-private.c:933
+#: ../src/modules/mail/e-mail-shell-view-private.c:965
+#: ../src/modules/mail/e-mail-shell-view-private.c:1009
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -18267,8 +18981,8 @@ msgstr[1] "%d nepročitane, "
 msgstr[2] "%d nepročitanih, "
 msgstr[3] "%d nepročitana, "
 
-#: ../src/mail/em-subscription-editor.c:1317
-#: ../src/modules/mail/e-mail-shell-view-private.c:1022
+#: ../src/mail/em-subscription-editor.c:1319
+#: ../src/modules/mail/e-mail-shell-view-private.c:1019
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -18277,61 +18991,61 @@ msgstr[1] "%d ukupno"
 msgstr[2] "%d ukupno"
 msgstr[3] "%d ukupno"
 
-#: ../src/mail/em-subscription-editor.c:1729
+#: ../src/mail/em-subscription-editor.c:1731
 msgid "Folder Subscriptions"
 msgstr "Prijave na fascikle"
 
-#: ../src/mail/em-subscription-editor.c:1764
+#: ../src/mail/em-subscription-editor.c:1766
 msgid "_Account:"
 msgstr "_Nalog:"
 
-#: ../src/mail/em-subscription-editor.c:1777
+#: ../src/mail/em-subscription-editor.c:1779
 msgid "Clear Search"
 msgstr "Očisti pretragu"
 
-#: ../src/mail/em-subscription-editor.c:1794
+#: ../src/mail/em-subscription-editor.c:1796
 msgid "Sho_w items that contain:"
 msgstr "_Prikaži stavke koje sadrže:"
 
-#: ../src/mail/em-subscription-editor.c:1841
+#: ../src/mail/em-subscription-editor.c:1843
 msgid "Subscribe to the selected folder"
 msgstr "Prijavite se na izabranu fasciklu"
 
-#: ../src/mail/em-subscription-editor.c:1842
+#: ../src/mail/em-subscription-editor.c:1844
 msgid "Su_bscribe"
 msgstr "P_rijavi se"
 
-#: ../src/mail/em-subscription-editor.c:1887
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1751
+#: ../src/mail/em-subscription-editor.c:1889
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1708
 msgid "Unsubscribe from the selected folder"
 msgstr "Odjavite se sa izabrane fascikle"
 
-#: ../src/mail/em-subscription-editor.c:1927
+#: ../src/mail/em-subscription-editor.c:1929
 msgid "Collapse all folders"
 msgstr "Skupite sve fascikle"
 
-#: ../src/mail/em-subscription-editor.c:1928
+#: ../src/mail/em-subscription-editor.c:1930
 msgid "C_ollapse All"
 msgstr "_Skupi sve"
 
-#: ../src/mail/em-subscription-editor.c:1938
+#: ../src/mail/em-subscription-editor.c:1940
 msgid "Expand all folders"
 msgstr "Razgranajte sve fascikle"
 
-#: ../src/mail/em-subscription-editor.c:1939
+#: ../src/mail/em-subscription-editor.c:1941
 msgid "E_xpand All"
 msgstr "_Razgranaj sve"
 
-#: ../src/mail/em-subscription-editor.c:1949
+#: ../src/mail/em-subscription-editor.c:1951
 msgid "Refresh the folder list"
 msgstr "Osvežite spisak fascikli"
 
-#: ../src/mail/em-subscription-editor.c:1961
+#: ../src/mail/em-subscription-editor.c:1963
 msgid "Stop the current operation"
 msgstr "Zaustavite trenutnu operaciju"
 
-#: ../src/mail/em-subscription-editor.c:1962
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1005
+#: ../src/mail/em-subscription-editor.c:1964
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1085
 msgid "_Stop"
 msgstr "_Zaustavi"
 
@@ -18350,26 +19064,26 @@ msgstr[3] "Sigurno želite da otvorite ovu jednu poruku?"
 
 #: ../src/mail/em-utils.c:178
 msgid "Message Filters"
-msgstr "Propusnici poruka"
+msgstr "Filteri poruka"
 
-#: ../src/mail/em-utils.c:1004
+#: ../src/mail/em-utils.c:1014
 #, c-format
 msgid "Messages from %s"
 msgstr "Poruke koje je poslao %s"
 
 #. Translators: This is a reply attribution in the message reply subject. Both 'Re'-s in the 
'reply-attribution' translation context should translate into the same string.
-#: ../src/mail/em-utils.c:1557
+#: ../src/mail/em-utils.c:1575
 msgctxt "reply-attribution"
 msgid "Re"
 msgstr "Odg"
 
 #. Translators: This is a reply attribution separator in the message reply subject. This should match the 
':' in 'Re: %s' in the 'reply-attribution' translation context.
-#: ../src/mail/em-utils.c:1560
+#: ../src/mail/em-utils.c:1578
 msgctxt "reply-attribution"
 msgid ":"
 msgstr ":"
 
-#: ../src/mail/em-utils.c:1846
+#: ../src/mail/em-utils.c:1878
 msgid "Deleting old messages"
 msgstr "Brišem stare poruke"
 
@@ -18377,35 +19091,35 @@ msgstr "Brišem stare poruke"
 msgid "Search _Folders"
 msgstr "Fas_cikle pretrage"
 
-#: ../src/mail/em-vfolder-editor-rule.c:393
+#: ../src/mail/em-vfolder-editor-rule.c:404
 msgid "Add Folder"
 msgstr "Dodaj fasciklu"
 
-#: ../src/mail/em-vfolder-editor-rule.c:522
+#: ../src/mail/em-vfolder-editor-rule.c:533
 msgid "Search Folder Sources"
 msgstr "Izvor fascikle pretrage"
 
-#: ../src/mail/em-vfolder-editor-rule.c:554
+#: ../src/mail/em-vfolder-editor-rule.c:565
 msgid "Automatically update on any _source folder change"
 msgstr "Sam osveži pri _svakoj izmeni izvorne fascikle"
 
-#: ../src/mail/em-vfolder-editor-rule.c:566
+#: ../src/mail/em-vfolder-editor-rule.c:577
 msgid "All local folders"
 msgstr "Sve lokalne fascikle"
 
-#: ../src/mail/em-vfolder-editor-rule.c:567
+#: ../src/mail/em-vfolder-editor-rule.c:578
 msgid "All active remote folders"
 msgstr "Sve aktivne mrežne fascikle"
 
-#: ../src/mail/em-vfolder-editor-rule.c:568
+#: ../src/mail/em-vfolder-editor-rule.c:579
 msgid "All local and active remote folders"
 msgstr "Sve lokalne i aktivne mrežne fascikle"
 
-#: ../src/mail/em-vfolder-editor-rule.c:569
+#: ../src/mail/em-vfolder-editor-rule.c:580
 msgid "Specific folders"
 msgstr "Određene fascikle"
 
-#: ../src/mail/em-vfolder-editor-rule.c:607
+#: ../src/mail/em-vfolder-editor-rule.c:618
 msgid "include subfolders"
 msgstr "uključi podfascikle"
 
@@ -18452,12 +19166,12 @@ msgstr "Primaoci"
 #: ../src/mail/filtertypes.xml.in.h:13 ../src/mail/searchtypes.xml.in.h:14
 #: ../src/mail/vfoldertypes.xml.in.h:14
 msgid "CC"
-msgstr "CC"
+msgstr "Kopija"
 
 #: ../src/mail/filtertypes.xml.in.h:14 ../src/mail/searchtypes.xml.in.h:15
 #: ../src/mail/vfoldertypes.xml.in.h:15
 msgid "BCC"
-msgstr "BCC"
+msgstr "Slepa kopija"
 
 # bug(slobo): verovatno izveštaj o dostavi
 #: ../src/mail/filtertypes.xml.in.h:15 ../src/mail/searchtypes.xml.in.h:16
@@ -18561,7 +19275,7 @@ msgstr "Važno"
 msgid "Read"
 msgstr "Čitaj"
 
-#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:135
+#: ../src/mail/filtertypes.xml.in.h:41 ../src/mail/mail-config.ui.h:139
 #: ../src/mail/vfoldertypes.xml.in.h:44
 msgid "Junk"
 msgstr "Đubre"
@@ -18749,7 +19463,7 @@ msgid "From"
 msgstr "Šalje"
 
 #: ../src/mail/importers/evolution-mbox-importer.c:569
-#: ../src/shell/e-shell-utils.c:176
+#: ../src/shell/e-shell-utils.c:166
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkli poštansko sanduče (mbox)"
 
@@ -18774,8 +19488,8 @@ msgstr "Evolucijin uvoz K-pošte"
 msgid "Import mail and contacts from KMail."
 msgstr "Uvozi poštu i kontakte iz K-pošte."
 
-#: ../src/mail/importers/kmail-libs.c:150
-#: ../src/modules/mail/e-mail-shell-view-private.c:1043
+#: ../src/mail/importers/kmail-libs.c:149
+#: ../src/modules/mail/e-mail-shell-view-private.c:1040
 msgid "Trash"
 msgstr "Smeće"
 
@@ -18788,15 +19502,15 @@ msgid "Importing mail and contacts from KMail"
 msgstr "Uvozim poštu i kontakte iz K-pošte"
 
 #. Destination folder, was set in our widget
-#: ../src/mail/importers/mail-importer.c:187
-#: ../src/mail/importers/mail-importer.c:312
-#: ../src/plugins/dbx-import/dbx-importer.c:605
+#: ../src/mail/importers/mail-importer.c:190
+#: ../src/mail/importers/mail-importer.c:315
+#: ../src/plugins/dbx-import/dbx-importer.c:612
 #: ../src/plugins/pst-import/pst-importer.c:756
 #, c-format
 msgid "Importing “%s”"
 msgstr "Uvozim „%s“"
 
-#: ../src/mail/importers/mail-importer.c:556
+#: ../src/mail/importers/mail-importer.c:559
 #, c-format
 msgid "Scanning %s"
 msgstr "Pretražujem „%s“"
@@ -18818,22 +19532,22 @@ msgstr "Uvozi poštu iz programa Pine."
 msgid "Mail to %s"
 msgstr "Pošta za %s"
 
-#: ../src/mail/mail-autofilter.c:220 ../src/mail/mail-autofilter.c:267
+#: ../src/mail/mail-autofilter.c:220 ../src/mail/mail-autofilter.c:268
 #, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: ../src/mail/mail-autofilter.c:250
+#: ../src/mail/mail-autofilter.c:251
 #, c-format
 msgid "Subject is %s"
 msgstr "Naslov je %s"
 
-#: ../src/mail/mail-autofilter.c:290
+#: ../src/mail/mail-autofilter.c:291
 #, c-format
 msgid "%s mailing list"
 msgstr "%s dopisna lista"
 
-#: ../src/mail/mail-autofilter.c:400
+#: ../src/mail/mail-autofilter.c:401
 msgid "Add Filter Rule"
 msgstr "Dodaj pravilo filtriranja"
 
@@ -18842,7 +19556,7 @@ msgstr "Dodaj pravilo filtriranja"
 #. * folder. For more than one filter rule is each of
 #. * them on a separate line, with four spaces in front
 #. * of its name, without quotes.
-#: ../src/mail/mail-autofilter.c:551
+#: ../src/mail/mail-autofilter.c:552
 #, c-format
 msgid ""
 "The filter rule “%s” has been modified to account for the deleted folder\n"
@@ -18864,7 +19578,7 @@ msgstr[3] ""
 "Pravilo filtera „%s“ je izmenjeno u nalogu za obrisanu fasciklu \n"
 "„%s“."
 
-#: ../src/mail/mail-autofilter.c:559
+#: ../src/mail/mail-autofilter.c:560
 msgid "Open Message Filters"
 msgstr "Otvori filtere poruka"
 
@@ -18936,61 +19650,65 @@ msgstr "_Stil odgovora:"
 msgid "_Forward style:"
 msgstr "Stil _prosleđivanja:"
 
-#: ../src/mail/mail-config.ui.h:22
+#: ../src/mail/mail-config.ui.h:20
+msgid "_Language:"
+msgstr "_Jezik:"
+
+#: ../src/mail/mail-config.ui.h:24
 msgid "Include si_gnature in new messages only"
-msgstr "Stavi _potpis samo u nove poruke."
+msgstr "Stavi _potpis samo u novim porukama"
 
-#: ../src/mail/mail-config.ui.h:23
+#: ../src/mail/mail-config.ui.h:25
 msgid "Ig_nore Reply-To: for mailing lists"
-msgstr "_Zanemari „Odgovor-za:“ za dopisne liste"
+msgstr "_Zanemari „Odgovori na:“ za dopisne liste"
 
-#: ../src/mail/mail-config.ui.h:24
+#: ../src/mail/mail-config.ui.h:26
 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:25
+#: ../src/mail/mail-config.ui.h:27
 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:26
+#: ../src/mail/mail-config.ui.h:28
 msgid "_Wrap quoted text in replies"
 msgstr "_Prelomi citirani tekst u odgovorima"
 
-#: ../src/mail/mail-config.ui.h:31
+#: ../src/mail/mail-config.ui.h:33
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "Unutar"
 
-#: ../src/mail/mail-config.ui.h:33
+#: ../src/mail/mail-config.ui.h:35
 msgid "Sig_natures"
 msgstr "Pot_pisi"
 
-#: ../src/mail/mail-config.ui.h:34
+#: ../src/mail/mail-config.ui.h:36
 msgid "Signatures"
 msgstr "Potpisi"
 
-#: ../src/mail/mail-config.ui.h:35
+#: ../src/mail/mail-config.ui.h:37
 msgid "_Languages"
 msgstr "_Jezici"
 
-#: ../src/mail/mail-config.ui.h:36
+#: ../src/mail/mail-config.ui.h:38
 msgid "Languages Table"
 msgstr "Tabela jezika"
 
-#: ../src/mail/mail-config.ui.h:37
+#: ../src/mail/mail-config.ui.h:39
 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:39
+#: ../src/mail/mail-config.ui.h:41
 msgid "Check spelling while I _type"
 msgstr "Proveri pravopis dok _kucam"
 
-#: ../src/mail/mail-config.ui.h:41
+#: ../src/mail/mail-config.ui.h:43
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -18999,76 +19717,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:43
+#: ../src/mail/mail-config.ui.h:45
 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:45
+#: ../src/mail/mail-config.ui.h:47
 msgid "Sending a message with only _Bcc recipients defined"
-msgstr "Slanja poruke koja sadrži određene samo _Bcc primaoce"
+msgstr "Slanja poruke koja sadrži samo primaoce _Slepe kopije"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:47
+#: ../src/mail/mail-config.ui.h:49
 msgid "Sending a message to many _To and CC recipients"
-msgstr "Slanja poruke za mnogo _Za i CC primaoca"
+msgstr "Slanja poruke na mnogo _primaoca (Prima i Kopija)"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../src/mail/mail-config.ui.h:49
+#: ../src/mail/mail-config.ui.h:51
 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:51
+#: ../src/mail/mail-config.ui.h:53
 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:53
+#: ../src/mail/mail-config.ui.h:55
 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:55
+#: ../src/mail/mail-config.ui.h:57
 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:57
+#: ../src/mail/mail-config.ui.h:59
 msgid "Sending a message using _key accelerator (Ctrl+Enter)"
 msgstr "Slanja poruke pomoću pre_čice (Ctrl+Enter)"
 
 #. Translators:
-#: ../src/mail/mail-config.ui.h:59
+#: ../src/mail/mail-config.ui.h:61
 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:60
+#: ../src/mail/mail-config.ui.h:62
 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:64
+#: ../src/mail/mail-config.ui.h:66
 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:69
+#: ../src/mail/mail-config.ui.h:71
 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:71 ../src/modules/mail/em-composer-prefs.c:875
+#: ../src/mail/mail-config.ui.h:73 ../src/modules/mail/em-composer-prefs.c:876
 msgid "Account"
 msgstr "Nalog"
 
-#: ../src/mail/mail-config.ui.h:72
+#: ../src/mail/mail-config.ui.h:74
 msgid "Send account overrides"
 msgstr "Prepisivanja naloga slanja"
 
-#: ../src/mail/mail-config.ui.h:73
+#: ../src/mail/mail-config.ui.h:75
 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 "
@@ -19080,231 +19798,239 @@ 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:74
+#: ../src/mail/mail-config.ui.h:76
 msgid "_Folder override has precedence over Recipient override"
 msgstr "Prepisivanje _fascikle ima prednost nad prepisivanjem primaoca"
 
-#: ../src/mail/mail-config.ui.h:75
+#: ../src/mail/mail-config.ui.h:77
 msgid "Send Account"
 msgstr "Nalog slanja"
 
-#: ../src/mail/mail-config.ui.h:81 ../src/smime/gui/smime-ui.ui.h:27
+#: ../src/mail/mail-config.ui.h:83 ../src/smime/gui/smime-ui.ui.h:27
 msgid "a"
 msgstr "a"
 
-#: ../src/mail/mail-config.ui.h:82 ../src/smime/gui/smime-ui.ui.h:28
+#: ../src/mail/mail-config.ui.h:84 ../src/smime/gui/smime-ui.ui.h:28
 msgid "b"
 msgstr "b"
 
-#: ../src/mail/mail-config.ui.h:83
+#: ../src/mail/mail-config.ui.h:85
 msgid "Start up"
 msgstr "Pokretanje"
 
-#: ../src/mail/mail-config.ui.h:84
+#: ../src/mail/mail-config.ui.h:86
 msgid "Check for new _messages on start"
 msgstr "Proveri nove _poruke prilikom pokretanja"
 
-#: ../src/mail/mail-config.ui.h:85
+#: ../src/mail/mail-config.ui.h:87
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Proveri nove _poruke u svim aktivnim nalozima"
 
-#: ../src/mail/mail-config.ui.h:86
+#: ../src/mail/mail-config.ui.h:88
 msgid "Message Display"
 msgstr "Prikaz poruke"
 
-#: ../src/mail/mail-config.ui.h:87
+#: ../src/mail/mail-config.ui.h:89
 msgid "_Use the same fonts as other applications"
 msgstr "_Koristi iste fontove kao drugi programi"
 
-#: ../src/mail/mail-config.ui.h:88
+#: ../src/mail/mail-config.ui.h:90
 msgid "S_tandard Font:"
 msgstr "_Standardni font:"
 
-#: ../src/mail/mail-config.ui.h:89
+#: ../src/mail/mail-config.ui.h:91
 msgid "Select HTML fixed width font"
 msgstr "Izaberite HTML font stalne veličine"
 
-#: ../src/mail/mail-config.ui.h:90
+#: ../src/mail/mail-config.ui.h:92
 msgid "Select HTML variable width font"
 msgstr "Izaberite HTML font promenljive veličine"
 
-#: ../src/mail/mail-config.ui.h:91
+#: ../src/mail/mail-config.ui.h:93
 msgid "Fix_ed Width Font:"
 msgstr "Font _stalne širine:"
 
-#: ../src/mail/mail-config.ui.h:92
+#: ../src/mail/mail-config.ui.h:94
 msgid "_Mark messages as read after"
 msgstr "_Označi poruke kao pročitane posle"
 
-#: ../src/mail/mail-config.ui.h:94
+#: ../src/mail/mail-config.ui.h:96
 msgid "Highlight _quotations with"
 msgstr "Naglasi _citate sa"
 
-#: ../src/mail/mail-config.ui.h:95
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:63
+#: ../src/mail/mail-config.ui.h:97
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
 msgid "Pick a color"
 msgstr "Izaberite boju"
 
-#: ../src/mail/mail-config.ui.h:96
+#: ../src/mail/mail-config.ui.h:98
 msgid "color"
 msgstr "boja"
 
-#: ../src/mail/mail-config.ui.h:97
+#: ../src/mail/mail-config.ui.h:99
 msgid "Default character e_ncoding:"
 msgstr "Podrazumevana _kodna strana:"
 
-#: ../src/mail/mail-config.ui.h:98
+#: ../src/mail/mail-config.ui.h:100
 msgid "Apply the same _view settings to all folders"
 msgstr "Primeni ista podešavanja _pregleda na svim fasciklama"
 
-#: ../src/mail/mail-config.ui.h:99
+#: ../src/mail/mail-config.ui.h:101
 msgid "F_all back to threading messages by subject"
 msgstr "Vra_ti se na nizanje poruka po naslovu"
 
-#: ../src/mail/mail-config.ui.h:100
+#: ../src/mail/mail-config.ui.h:102
 msgid "Delete Mail"
 msgstr "Obriši poštu"
 
-#: ../src/mail/mail-config.ui.h:101
+#: ../src/mail/mail-config.ui.h:103
 msgid "Empty _trash folders"
 msgstr "Isprazni fascikle _smeća"
 
-#: ../src/mail/mail-config.ui.h:102
+#: ../src/mail/mail-config.ui.h:104
 msgid "Confirm _when expunging a folder"
 msgstr "_Potvrdi kada prazniš fasciklu"
 
-#: ../src/mail/mail-config.ui.h:103
+#: ../src/mail/mail-config.ui.h:105
 msgid "Confirm when emptying a _Junk folder"
 msgstr "_Potvrdi kada prazniš fasciklu sa đubretom"
 
-#: ../src/mail/mail-config.ui.h:104
+#: ../src/mail/mail-config.ui.h:106
 msgid "Go to the previ_ous message after message deletion"
 msgstr "Idi na _prethodnu poruku nakon brisanja poruke"
 
-#: ../src/mail/mail-config.ui.h:105
+#: ../src/mail/mail-config.ui.h:107
 msgid "Archive Mail"
 msgstr "Arhiviraj poruku"
 
-#: ../src/mail/mail-config.ui.h:106
+#: ../src/mail/mail-config.ui.h:108
 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:107
+#: ../src/mail/mail-config.ui.h:109
 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:109
+#: ../src/mail/mail-config.ui.h:111
 msgid "_Show animated images"
 msgstr "Prikaži _animirane slike"
 
-#: ../src/mail/mail-config.ui.h:110
+#: ../src/mail/mail-config.ui.h:112
 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:111
+#: ../src/mail/mail-config.ui.h:113
 msgid "Loading Remote Content"
 msgstr "Učitavam udaljeni sadržaj"
 
-#: ../src/mail/mail-config.ui.h:112
+#: ../src/mail/mail-config.ui.h:114
 msgid "_Never load remote content from the Internet"
 msgstr "_Nikada ne učitavaj udaljeni sadržaj sa Interneta"
 
-#: ../src/mail/mail-config.ui.h:113
+#: ../src/mail/mail-config.ui.h:115
 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:114
+#: ../src/mail/mail-config.ui.h:116
 msgid "_Always load remote content from the Internet"
 msgstr "_Uvek učitaj udaljeni sadržaj sa Interneta"
 
-#: ../src/mail/mail-config.ui.h:115
+#: ../src/mail/mail-config.ui.h:117
 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:116
+#: ../src/mail/mail-config.ui.h:118
 msgid "Add"
 msgstr "Dodaj"
 
-#: ../src/mail/mail-config.ui.h:117
+#: ../src/mail/mail-config.ui.h:119
 msgid "Remove"
 msgstr "Ukloni"
 
-#: ../src/mail/mail-config.ui.h:118
+#: ../src/mail/mail-config.ui.h:120
 msgid "Allow for sites:"
 msgstr "Dozvoli za sajtove:"
 
-#: ../src/mail/mail-config.ui.h:119
+#: ../src/mail/mail-config.ui.h:121
 msgid "Allow for senders:"
 msgstr "Dozvoli za pošiljaoce:"
 
-#: ../src/mail/mail-config.ui.h:120
+#: ../src/mail/mail-config.ui.h:122
 msgid "HTML Messages"
 msgstr "HTML poruke"
 
-#: ../src/mail/mail-config.ui.h:122
+#: ../src/mail/mail-config.ui.h:124
 msgid "Sender Photograph"
 msgstr "Fotografija pošiljaoca"
 
-#: ../src/mail/mail-config.ui.h:123
+#: ../src/mail/mail-config.ui.h:125
 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:124
+#: ../src/mail/mail-config.ui.h:126
 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:125
+#: ../src/mail/mail-config.ui.h:127
 msgid "Displayed Message Headers"
 msgstr "Prikazana zaglavlja poruka"
 
-#: ../src/mail/mail-config.ui.h:126
+#: ../src/mail/mail-config.ui.h:128
+msgid "Show _full mail addresses in message preview"
+msgstr "Prikaži punu adresu e-pošte u pregledu poruka"
+
+#: ../src/mail/mail-config.ui.h:129
 msgid "Mail Headers Table"
 msgstr "Tabela zaglavlja pošte"
 
-#: ../src/mail/mail-config.ui.h:127
+#: ../src/mail/mail-config.ui.h:130
+msgid "Re_set"
+msgstr "Ponovo po_stavi"
+
+#: ../src/mail/mail-config.ui.h:131
 #: ../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:129
+#: ../src/mail/mail-config.ui.h:133
 msgid "Check incoming _messages for junk"
 msgstr "Proveri ima li đubreta u do_laznoj pošti"
 
-#: ../src/mail/mail-config.ui.h:130
+#: ../src/mail/mail-config.ui.h:134
 msgid "_Delete junk messages"
 msgstr "_Obriši poruke đubra"
 
-#: ../src/mail/mail-config.ui.h:131
+#: ../src/mail/mail-config.ui.h:135
 msgid "Junk Test Options"
 msgstr "Opcije za testiranje đubreta"
 
-#: ../src/mail/mail-config.ui.h:132
+#: ../src/mail/mail-config.ui.h:136
 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 imeniku"
 
-#: ../src/mail/mail-config.ui.h:133
+#: ../src/mail/mail-config.ui.h:137
 msgid "_Lookup in local address book only"
 msgstr "_Potraži samo u lokalnom imeniku"
 
-#: ../src/mail/mail-config.ui.h:134
+#: ../src/mail/mail-config.ui.h:138
 msgid "Check cu_stom headers for junk"
 msgstr "Proveri ima li đubreta u _prilagođenim zaglavljima"
 
-#: ../src/mail/mail-config.ui.h:136
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:302
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:245
+#: ../src/mail/mail-config.ui.h:140
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:303
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:246
 msgid "No encryption"
 msgstr "Bez šifrovanja"
 
-#: ../src/mail/mail-config.ui.h:137
+#: ../src/mail/mail-config.ui.h:141
 msgid "TLS encryption"
 msgstr "TLS šifrovanje"
 
-#: ../src/mail/mail-config.ui.h:138
+#: ../src/mail/mail-config.ui.h:142
 msgid "SSL encryption"
 msgstr "SSL šifrovanje"
 
@@ -19358,31 +20084,35 @@ msgstr "_Rok:"
 
 # timezone.
 #. Translators: Flag Completed
-#: ../src/mail/mail-dialogs.ui.h:18
+#: ../src/mail/mail-dialogs.ui.h:17
 msgid "Co_mpleted"
 msgstr "Za_vršeno"
 
-#: ../src/mail/mail-dialogs.ui.h:19
+#: ../src/mail/mail-dialogs.ui.h:18
 msgid "License Agreement"
 msgstr "Ugovor o korišćenju"
 
-#: ../src/mail/mail-dialogs.ui.h:21
+#: ../src/mail/mail-dialogs.ui.h:19
+msgid "_No"
+msgstr "_Ne"
+
+#: ../src/mail/mail-dialogs.ui.h:20
 msgid "_Accept License"
 msgstr "_Prihvati licencu"
 
-#: ../src/mail/mail-dialogs.ui.h:22
+#: ../src/mail/mail-dialogs.ui.h:21
 msgid "_Tick this to accept the license agreement"
 msgstr "Oz_načite ovo da prihvatite ugovor o licenci"
 
-#: ../src/mail/mail-dialogs.ui.h:23
+#: ../src/mail/mail-dialogs.ui.h:22
 msgid "Security Information"
 msgstr "Podaci bezbednosti"
 
-#: ../src/mail/mail-dialogs.ui.h:25
+#: ../src/mail/mail-dialogs.ui.h:24
 msgid "Digital Signature"
 msgstr "Digitalni potpis"
 
-#: ../src/mail/mail-dialogs.ui.h:26
+#: ../src/mail/mail-dialogs.ui.h:25
 msgid "Encryption"
 msgstr "Šifrovanje"
 
@@ -19438,7 +20168,8 @@ msgstr ""
 # mail:ask-send-only-bcc primary
 #: ../src/mail/mail.error.xml.h:11
 msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Sigurno želite da pošaljete poruku samo sa BCC primaocima?"
+msgstr ""
+"Sigurno želite da pošaljete poruku gde će svi primaoci dobiti Slepe kopije?"
 
 #: ../src/mail/mail.error.xml.h:12
 msgid ""
@@ -19449,11 +20180,12 @@ msgid ""
 "your message. To avoid this, you should add at least one To: or CC: "
 "recipient. "
 msgstr ""
-"Kontakat lista kojoj šaljete je podešena da skriva primaoce liste.\n"
+"Spisak kontakta na koji šaljete je podešen da skriva primaoce liste.\n"
 "\n"
-"Mnogi sistemi e-pošte dodaju porukama zaglavlje „Prividno-ka“ koje ima samo "
-"BCC primaoce. Ovo će zaglavlje, ako je dodato, izlistati sve primaoce poruke. "
-"Da izbegnete ovo, dodajte barem jednog „Prima:“ ili „CC:“ primaoca. "
+"Mnogi sistemi e-pošte dodaju porukama zaglavlje „Prividno-ka“ koje kao "
+"primaoce ima samo Slepe kopije. Ovo zaglavlje će izlistati sve primaoce "
+"poruke. Da izbegnete ovo, dodajte barem jednog primaoca u „Prima:“ ili "
+"„Kopija:“. "
 
 #: ../src/mail/mail.error.xml.h:15
 msgid ""
@@ -19462,10 +20194,10 @@ msgid ""
 "your message anyway. To avoid this, you should add at least one To: or CC: "
 "recipient."
 msgstr ""
-"Mnogi sistemi e-pošte dodaju porukama zaglavlje „Prividno-ka“ koje imaju samo "
-"BCC primaoce. Ovo će zaglavlje, ako je dodato, u svakom slučaju izlistati sve "
-"primaoce poruke. Da izbegnete ovo, dodajte barem jednog „Prima:“ ili „CC:“ "
-"primaoca."
+"Mnogi sistemi e-pošte dodaju porukama zaglavlje „Prividno-ka“ koje kao "
+"primaoce ima samo Slepe kopije. Ovo zaglavlje će izlistati sve primaoce "
+"poruke. Da izbegnete ovo, dodajte barem jednog primaoca u „Prima:“ ili "
+"„Kopija:“."
 
 # mail:ask-send-only-bcc primary
 #: ../src/mail/mail.error.xml.h:17
@@ -19591,7 +20323,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:1629
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1579
 msgid "_Empty Trash"
 msgstr "_Izbaci smeće"
 
@@ -19858,7 +20590,7 @@ msgstr "Fascikle pretrage su automatski ažurirane."
 
 #: ../src/mail/mail.error.xml.h:104
 msgid "Mail filters automatically updated."
-msgstr "Propusnici pošte su automatski ažurirani."
+msgstr "Filteri pošte su automatski ažurirani."
 
 #: ../src/mail/mail.error.xml.h:105
 msgid "Missing folder."
@@ -20021,76 +20753,81 @@ msgstr "U trenutnoj fascikli i _podfasciklama"
 msgid "In Current _Folder Only"
 msgstr "Samo u trenutnoj _fascikli"
 
+# bug: requires a comment on usage
 #: ../src/mail/mail.error.xml.h:141
+msgid "_Always In Current Folder Only"
+msgstr "_Uvek samo u trenutnoj fascikli"
+
+#: ../src/mail/mail.error.xml.h:142
 msgid "Should Evolution close this window when replying or forwarding?"
 msgstr ""
 "Treba li Evolucija da zatvori ovaj prozor kada odgovara ili prosleđuje?"
 
-#: ../src/mail/mail.error.xml.h:142
+#: ../src/mail/mail.error.xml.h:143
 msgid "_Yes, Always"
 msgstr "_Da, uvek"
 
-#: ../src/mail/mail.error.xml.h:143
+#: ../src/mail/mail.error.xml.h:144
 msgid "_No, Never"
 msgstr "_Ne, nikada"
 
-#: ../src/mail/mail.error.xml.h:144
+#: ../src/mail/mail.error.xml.h:145
 msgid "Copy folder in folder tree."
 msgstr "Kopiram fasciklu u stablo fascikli."
 
-#: ../src/mail/mail.error.xml.h:145
+#: ../src/mail/mail.error.xml.h:146
 msgid "Are you sure you want to copy folder “{0}” to folder “{1}”?"
 msgstr ""
 "Da li ste sigurni da želite da kopirate fasciklu „{0}“ u fasciklu „{1}“?"
 
-#: ../src/mail/mail.error.xml.h:147
+#: ../src/mail/mail.error.xml.h:148
 msgid "Do _not copy"
 msgstr "N_e kopiraj"
 
-#: ../src/mail/mail.error.xml.h:148
+#: ../src/mail/mail.error.xml.h:149
 msgid "_Always copy"
 msgstr "_Uvek kopiraj"
 
-#: ../src/mail/mail.error.xml.h:149
+#: ../src/mail/mail.error.xml.h:150
 msgid "N_ever copy"
 msgstr "_Nikad ne kopiraj"
 
-#: ../src/mail/mail.error.xml.h:150
+#: ../src/mail/mail.error.xml.h:151
 msgid "Move folder in folder tree."
 msgstr "Premestite fasciklu u stablo fascikli."
 
-#: ../src/mail/mail.error.xml.h:151
+#: ../src/mail/mail.error.xml.h:152
 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}“?"
 
-#: ../src/mail/mail.error.xml.h:153
+#: ../src/mail/mail.error.xml.h:154
 msgid "Do _not move"
 msgstr "N_e premeštaj"
 
-#: ../src/mail/mail.error.xml.h:154
+#: ../src/mail/mail.error.xml.h:155
 msgid "_Always move"
 msgstr "_Uvek premesti"
 
-#: ../src/mail/mail.error.xml.h:155
+#: ../src/mail/mail.error.xml.h:156
 msgid "N_ever move"
 msgstr "_Nikad ne premeštaj"
 
-#: ../src/mail/mail.error.xml.h:156
+#: ../src/mail/mail.error.xml.h:157
 msgid ""
 "This message cannot be sent because the account you chose to send with is "
 "not enabled"
 msgstr "Ova poruka se ne može poslati pošto je isključen nalog sa kojeg šaljete"
 
-#: ../src/mail/mail.error.xml.h:157
+#: ../src/mail/mail.error.xml.h:158
 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
+#: ../src/mail/mail.error.xml.h:159
 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
+#: ../src/mail/mail.error.xml.h:160
 msgid ""
 "There had not been found any active mail account to send the message. Create "
 "or enable one first, please."
@@ -20098,64 +20835,64 @@ 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
+#: ../src/mail/mail.error.xml.h:161
 msgid "Mail Deletion Failed"
 msgstr "Neuspešno brisanje pošte"
 
-#: ../src/mail/mail.error.xml.h:161
+#: ../src/mail/mail.error.xml.h:162
 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:162
+#: ../src/mail/mail.error.xml.h:163
 msgid "“Check Junk” Failed"
 msgstr "Provera đubreta nije uspela"
 
-#: ../src/mail/mail.error.xml.h:163
+#: ../src/mail/mail.error.xml.h:164
 msgid "“Report Junk” Failed"
 msgstr "Izveštaj za đubre nije uspeo"
 
-#: ../src/mail/mail.error.xml.h:164
+#: ../src/mail/mail.error.xml.h:165
 msgid "“Report Not Junk” Failed"
 msgstr "Izveštavanje da nije đubre nije uspelo"
 
-#: ../src/mail/mail.error.xml.h:165
+#: ../src/mail/mail.error.xml.h:166
 msgid "Remove duplicate messages?"
 msgstr "Da uklonim duplirane poruke?"
 
-#: ../src/mail/mail.error.xml.h:166
+#: ../src/mail/mail.error.xml.h:167
 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:168
+#: ../src/mail/mail.error.xml.h:169
 msgid "Folder “{0}” doesn’t contain any duplicate message."
 msgstr "Fascikla „{0}“ ne sadrži nikakve duple poruke."
 
-#: ../src/mail/mail.error.xml.h:169
+#: ../src/mail/mail.error.xml.h:170
 msgid "Failed to connect account “{0}”."
 msgstr "Ne mogu da se povežem na nalog „{0}“."
 
-#: ../src/mail/mail.error.xml.h:170
+#: ../src/mail/mail.error.xml.h:171
 msgid "Failed to disconnect account “{0}”."
 msgstr "Ne mogu da prekinem vezu sa nalogom „{0}“."
 
-#: ../src/mail/mail.error.xml.h:171
+#: ../src/mail/mail.error.xml.h:172
 msgid "Failed to unsubscribe from folder “{0}”."
 msgstr "Ne mogu da se odjavim sa fascikle „{0}“."
 
-#: ../src/mail/mail.error.xml.h:172
+#: ../src/mail/mail.error.xml.h:173
 msgid "Unable to retrieve message."
 msgstr "Ne mogu da dovučem poruku."
 
-#: ../src/mail/mail.error.xml.h:173
+#: ../src/mail/mail.error.xml.h:174
 msgid "{0}"
 msgstr "{0}"
 
-#: ../src/mail/mail.error.xml.h:174
+#: ../src/mail/mail.error.xml.h:175
 msgid "Message is not available in offline mode."
 msgstr "Poruka nije dostupna u režimu van mreže."
 
-#: ../src/mail/mail.error.xml.h:175
+#: ../src/mail/mail.error.xml.h:176
 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 "
@@ -20169,42 +20906,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:176
+#: ../src/mail/mail.error.xml.h:177
 msgid "Failed to open folder."
 msgstr "Ne mogu da otvorim fasciklu."
 
 # bug: plural-forms
-#: ../src/mail/mail.error.xml.h:178
+#: ../src/mail/mail.error.xml.h:179
 msgid "Failed to find duplicate messages."
 msgstr "Ne mogu da pronađem duplirane poruke."
 
-#: ../src/mail/mail.error.xml.h:179
+#: ../src/mail/mail.error.xml.h:180
 msgid "Failed to retrieve messages."
 msgstr "Ne mogu da dovučem poruke."
 
 # bug: plural-forms
-#: ../src/mail/mail.error.xml.h:180
+#: ../src/mail/mail.error.xml.h:181
 msgid "Failed to mark messages as read."
 msgstr "Ne mogu da označim poruke pročitanim."
 
-#: ../src/mail/mail.error.xml.h:181
+#: ../src/mail/mail.error.xml.h:182
 msgid "Failed to remove attachments from messages."
 msgstr "Ne mogu da uklonim priloge iz poruka."
 
-#: ../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."
+#: ../src/mail/mail.error.xml.h:183
+msgid "Failed to download messages for offline viewing for account “{0}”."
+msgstr "Ne mogu da preuzmem poruke za pregledanje van mreže sa naloga „{0}“."
 
 # bug: plural-forms
-#: ../src/mail/mail.error.xml.h:183
+#: ../src/mail/mail.error.xml.h:184
 msgid "Failed to save messages to disk."
 msgstr "Ne mogu da sačuvam poruke na disk."
 
-#: ../src/mail/mail.error.xml.h:184
+#: ../src/mail/mail.error.xml.h:185
 msgid "Hidden file is attached."
 msgstr "Skrivena datoteka je priložena."
 
-#: ../src/mail/mail.error.xml.h:185
+#: ../src/mail/mail.error.xml.h:186
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -20212,47 +20949,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:186
+#: ../src/mail/mail.error.xml.h:187
 msgid "Printing failed."
 msgstr "Štampanje nije uspelo."
 
-#: ../src/mail/mail.error.xml.h:187
+#: ../src/mail/mail.error.xml.h:188
 msgid "The printer replied “{0}”."
 msgstr "Štampač je odgovorio „{0}“."
 
-#: ../src/mail/mail.error.xml.h:188
+#: ../src/mail/mail.error.xml.h:189
 msgid "Could not perform this operation on {0}."
 msgstr "Ne mogu da izvršim ovu radnju nad „{0}“."
 
-#: ../src/mail/mail.error.xml.h:189
+#: ../src/mail/mail.error.xml.h:190
 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:190
+#: ../src/mail/mail.error.xml.h:191
 msgid "Message from “{0}” account:"
 msgstr "Poruka sa „{0}“ naloga:"
 
-#: ../src/mail/mail.error.xml.h:191
+#: ../src/mail/mail.error.xml.h:192
 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:192
+#: ../src/mail/mail.error.xml.h:193
 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:193
+#: ../src/mail/mail.error.xml.h:194
 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:194
+#: ../src/mail/mail.error.xml.h:195
 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:195
+#: ../src/mail/mail.error.xml.h:196
 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:196
+#: ../src/mail/mail.error.xml.h:197
 msgid ""
 "You can download remote content manually, or set to remember to download "
 "remote content for this sender or used sites."
@@ -20261,67 +20998,67 @@ 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:198
+#: ../src/mail/mail.error.xml.h:199
 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:200
+#: ../src/mail/mail.error.xml.h:201
 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:202
+#: ../src/mail/mail.error.xml.h:203
 msgid "Overdue: {0} by {1}"
 msgstr "Završen: {0} do {1}"
 
-#: ../src/mail/mail.error.xml.h:204
+#: ../src/mail/mail.error.xml.h:205
 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:207
+#: ../src/mail/mail.error.xml.h:208
 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:209
+#: ../src/mail/mail.error.xml.h:210
 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:210
+#: ../src/mail/mail.error.xml.h:211
 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:211
+#: ../src/mail/mail.error.xml.h:212
 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 "
-"report in the GNOME bugzilla."
+"report in GNOME Gitlab."
 msgstr ""
-"Veb proces VebKita se urušio prilikom prikazivanja poruke. Možete pokišati "
-"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."
+"Veb proces VebKita se urušio prilikom prikazivanja poruke. Možete ga ponovo "
+"pokrenuti 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 Gnomovom Gitlabu."
 
-#: ../src/mail/mail.error.xml.h:212
+#: ../src/mail/mail.error.xml.h:213
 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:213
+#: ../src/mail/mail.error.xml.h:214
 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 "
-"a bug report in the GNOME bugzilla."
+"a bug report in GNOME Gitlab."
 msgstr ""
-"Veb proces VebKita se urušio prilikom prikazivanja potpisa. Možete pokišati "
-"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."
+"Veb proces VebKita se urušio prilikom prikazivanja potpisa. Možete ga ponovo "
+"pokrenuti 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 Gnomovom Gitlabu."
 
-#: ../src/mail/mail.error.xml.h:214
+#: ../src/mail/mail.error.xml.h:215
 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
+#: ../src/mail/mail.error.xml.h:216
 msgid ""
 "These messages will be shown in the Trash folder, where they can be "
 "permanently deleted later."
@@ -20329,58 +21066,58 @@ msgstr ""
 "Ove poruke će biti prikazane u fascikli sa smećem, odakle se kasnije mogu "
 "zauvek obrisati."
 
-#: ../src/mail/mail.error.xml.h:216
+#: ../src/mail/mail.error.xml.h:217
 msgid "_Empty Junk"
 msgstr "Isprazni _đubre"
 
-#: ../src/mail/mail.error.xml.h:217
+#: ../src/mail/mail.error.xml.h:218
 msgid "Failed to empty Junk folder “{0}”"
 msgstr "Ne mogu da ispraznim fasciklu sa đubretom „{0}“"
 
 #: ../src/mail/mail-send-recv.c:193
-msgid "Canceling..."
-msgstr "Otkazujem..."
+msgid "Canceling…"
+msgstr "Otkazujem…"
 
-#: ../src/mail/mail-send-recv.c:581
+#: ../src/mail/mail-send-recv.c:610
 msgid "Edit Message"
 msgstr "Uredi poruku"
 
-#: ../src/mail/mail-send-recv.c:586
+#: ../src/mail/mail-send-recv.c:615
 msgid "Open Outbox Folder"
 msgstr "Otvori fasciklu Poslato"
 
-#: ../src/mail/mail-send-recv.c:760
+#: ../src/mail/mail-send-recv.c:768
 msgid "Send & Receive Mail"
 msgstr "Slanje i primanje pošte"
 
-#: ../src/mail/mail-send-recv.c:774
+#: ../src/mail/mail-send-recv.c:782
 msgid "Cancel _All"
 msgstr "Otkaži _sve"
 
-#: ../src/mail/mail-send-recv.c:864 ../src/mail/mail-send-recv.c:1396
-msgid "Updating..."
-msgstr "Osvežavam..."
+#: ../src/mail/mail-send-recv.c:871 ../src/mail/mail-send-recv.c:1470
+msgid "Updating…"
+msgstr "Osvežavam…"
 
-#: ../src/mail/mail-send-recv.c:864 ../src/mail/mail-send-recv.c:946
-msgid "Waiting..."
-msgstr "Čekam..."
+#: ../src/mail/mail-send-recv.c:871 ../src/mail/mail-send-recv.c:952
+msgid "Waiting…"
+msgstr "Čekam…"
 
-#: ../src/mail/mail-send-recv.c:1362
+#: ../src/mail/mail-send-recv.c:1436
 #, c-format
 msgid "Checking for new mail at “%s”"
 msgstr "Vršim proveru za novom poštom na „%s“"
 
-#: ../src/mail/mail-send-recv.c:1589
+#: ../src/mail/mail-send-recv.c:1663
 #, c-format
 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:1591
+#: ../src/mail/mail-send-recv.c:1665
 #, c-format
 msgid "Deleting junk at “%s”"
 msgstr "Brišem đubre iz „%s“"
 
-#: ../src/mail/mail-send-recv.c:1593
+#: ../src/mail/mail-send-recv.c:1667
 #, c-format
 msgid "Expunging trash at “%s”"
 msgstr "Izbacujem smeće iz „%s“"
@@ -20397,87 +21134,87 @@ msgstr "Uredi fasciklu pretrage"
 msgid "New Search Folder"
 msgstr "Nova fascikla pretrage"
 
-#: ../src/mail/message-list.c:305
+#: ../src/mail/message-list.c:309
 msgid "Unseen"
 msgstr "Neviđeno"
 
-#: ../src/mail/message-list.c:306
+#: ../src/mail/message-list.c:310
 msgid "Seen"
 msgstr "Viđeno"
 
-#: ../src/mail/message-list.c:307
+#: ../src/mail/message-list.c:311
 msgid "Answered"
 msgstr "Odgovoreno"
 
-#: ../src/mail/message-list.c:308
+#: ../src/mail/message-list.c:312
 msgid "Forwarded"
 msgstr "Prosleđeno"
 
-#: ../src/mail/message-list.c:309
+#: ../src/mail/message-list.c:313
 msgid "Multiple Unseen Messages"
 msgstr "Višestruke neviđene poruke"
 
-#: ../src/mail/message-list.c:310
+#: ../src/mail/message-list.c:314
 msgid "Multiple Messages"
 msgstr "Višestruke poruke"
 
-#: ../src/mail/message-list.c:323
+#: ../src/mail/message-list.c:327
 msgid "Lowest"
 msgstr "Najniže"
 
-#: ../src/mail/message-list.c:324
+#: ../src/mail/message-list.c:328
 msgid "Lower"
 msgstr "Niže"
 
-#: ../src/mail/message-list.c:328
+#: ../src/mail/message-list.c:332
 msgid "Higher"
 msgstr "Više"
 
-#: ../src/mail/message-list.c:329
+#: ../src/mail/message-list.c:333
 msgid "Highest"
 msgstr "Najviše"
 
-#: ../src/mail/message-list.c:478 ../src/mail/message-list.c:6508
+#: ../src/mail/message-list.c:482
 msgid "Generating message list"
 msgstr "Pravljenje liste poruka"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../src/mail/message-list.c:2117
+#: ../src/mail/message-list.c:2151
 #: ../src/modules/itip-formatter/itip-view.c:268
 msgid "Today %l:%M %p"
 msgstr "Danas u %l:%M %p"
 
-#: ../src/mail/message-list.c:2126
+#: ../src/mail/message-list.c:2160
 msgid "Yesterday %l:%M %p"
 msgstr "Juče u %l:%M %p"
 
-#: ../src/mail/message-list.c:2138
+#: ../src/mail/message-list.c:2172
 msgid "%a %l:%M %p"
 msgstr "%a u %l:%M %p"
 
-#: ../src/mail/message-list.c:2146
+#: ../src/mail/message-list.c:2180
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b u %l:%M %p"
 
-#: ../src/mail/message-list.c:2148
+#: ../src/mail/message-list.c:2182
 msgid "%b %d %Y"
 msgstr "%d. %b %Y."
 
-#: ../src/mail/message-list.c:3178
+#: ../src/mail/message-list.c:3267
 msgid "Select all visible messages"
 msgstr "Izaberi sve vidljive poruke"
 
-#: ../src/mail/message-list.c:3923 ../src/mail/message-list.etspec.h:17
+#: ../src/mail/message-list.c:4022 ../src/mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Poruke"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../src/mail/message-list.c:5387
+#: ../src/mail/message-list.c:5591
 msgid "Follow-up"
 msgstr "Sledi"
 
-#: ../src/mail/message-list.c:6447
+#: ../src/mail/message-list.c:6654
 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 "
@@ -20485,14 +21222,18 @@ msgid ""
 "changing the query above."
 msgstr ""
 "Nijedna poruka ne zadovoljava vaše uslove pretrage. Izmenite uslov pretrage "
-"birajući novi propusnik za prikazivanje poruka iz padajućeg spiska ili "
-"pokrenite novu pretragu bilo čišćenjem iste pomoću stavke izbornika "
-"„Pretraga→Očisti“ ili izmenivši gornji upit."
+"birajući novi filter za prikazivanje poruka iz padajućeg spiska ili pokrenite "
+"novu pretragu bilo čišćenjem iste pomoću stavke izbornika „Pretraga→Očisti“ "
+"ili izmenivši gornji upit."
 
-#: ../src/mail/message-list.c:6455
+#: ../src/mail/message-list.c:6662
 msgid "There are no messages in this folder."
 msgstr "Nema poruka u ovoj fascikli."
 
+#: ../src/mail/message-list.c:6738
+msgid "Generating message list…"
+msgstr "Pravim listu poruka…"
+
 #: ../src/mail/message-list.etspec.h:2
 msgid "Flagged"
 msgstr "Označeno"
@@ -20522,7 +21263,7 @@ msgid "Subject — Trimmed"
 msgstr "Naslov — skraćeno"
 
 #: ../src/mail/message-list.etspec.h:21
-#: ../src/plugins/save-calendar/csv-format.c:372
+#: ../src/plugins/save-calendar/csv-format.c:361
 msgid "UID"
 msgstr "JIB"
 
@@ -20543,32 +21284,32 @@ 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:2177
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2111
 msgid "Recipients contain"
 msgstr "Primaoci sadrže"
 
 #: ../src/mail/searchtypes.xml.in.h:59
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2170
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2104
 msgid "Message contains"
 msgstr "Poruka sadrži"
 
 #: ../src/mail/searchtypes.xml.in.h:60
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2191
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2125
 msgid "Subject contains"
 msgstr "Naslov sadrži"
 
 #: ../src/mail/searchtypes.xml.in.h:61
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2184
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2118
 msgid "Sender contains"
 msgstr "Pošiljalac sadrži"
 
 #: ../src/mail/searchtypes.xml.in.h:62
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2156
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2090
 msgid "Body contains"
 msgstr "Telo sadrži"
 
 #: ../src/mail/searchtypes.xml.in.h:63
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2163
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2097
 msgid "Free form expression"
 msgstr "Izraz u slobodnoj formi"
 
@@ -20590,47 +21331,43 @@ msgid "C_alendar"
 msgstr "_Kalendar"
 
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:476
-#: ../src/modules/addressbook/e-book-shell-backend.c:262
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:137
+#: ../src/modules/addressbook/e-book-shell-backend.c:269
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:139
 msgid "New Address Book"
 msgstr "Novi imenik"
 
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:484
-#: ../src/modules/calendar/e-cal-base-shell-backend.c:284
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:178
+#: ../src/modules/calendar/e-cal-base-shell-backend.c:271
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:180
 msgid "New Memo List"
 msgstr "Novi spisak beleške"
 
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:532
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:210
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:212
 msgid "Address Book Properties"
 msgstr "Postavke imenika"
 
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:536
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:283
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:285
 msgid "Calendar Properties"
 msgstr "Osobine kalendara"
 
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:540
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:250
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:252
 msgid "Memo List Properties"
 msgstr "Osobine spiska zadataka"
 
 #: ../src/modules/accounts-window/e-accounts-window-editors.c:544
-#: ../src/modules/calendar/e-task-shell-view-actions.c:274
+#: ../src/modules/calendar/e-task-shell-view-actions.c:276
 msgid "Task List Properties"
 msgstr "Osobine spiska zadataka"
 
-#: ../src/modules/accounts-window/e-collection-wizard-page.c:75
-#: ../src/modules/accounts-window/e-collection-wizard-page.c:209
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:80
+#: ../src/modules/accounts-window/e-collection-wizard-page.c:229
 #: ../src/modules/accounts-window/e-webdav-browser-page.c:174
 msgid "_Back"
 msgstr "_Nazad"
 
-#: ../src/modules/accounts-window/e-collection-wizard-page.c:78
-msgid "_Finish"
-msgstr "_Završi"
-
 #: ../src/modules/accounts-window/e-webdav-browser-page.c:195
 msgid "_Browse"
 msgstr "_Pregledaj"
@@ -20640,12 +21377,12 @@ 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 imenike, kalendare, beleške ili rokovnik."
+"Pretražuje VebDAV (KalDAV ili KardDAV) server i pravite, uređuje ili briše "
+"imenike, 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:124
-#: ../src/modules/mail/em-mailer-prefs.c:1568
+#: ../src/modules/mail/em-mailer-prefs.c:1696
 msgid "_Table column:"
 msgstr "Kolona _tabele:"
 
@@ -20699,310 +21436,319 @@ 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:271
+#: ../src/modules/addressbook/e-book-shell-backend.c:278
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:273
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1049
+#: ../src/modules/addressbook/e-book-shell-backend.c:280
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1129
 msgid "Create a new contact"
 msgstr "Napravite novi kontakt"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:278
+#: ../src/modules/addressbook/e-book-shell-backend.c:285
 msgctxt "New"
 msgid "Contact _List"
-msgstr "Li_sta kontakta"
+msgstr "_Spisak kontakta"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:280
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1056
+#: ../src/modules/addressbook/e-book-shell-backend.c:287
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1136
 msgid "Create a new contact list"
 msgstr "Napravite novi spisak kontakta"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:288
+#: ../src/modules/addressbook/e-book-shell-backend.c:295
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Imenik"
 
-#: ../src/modules/addressbook/e-book-shell-backend.c:290
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:972
+#: ../src/modules/addressbook/e-book-shell-backend.c:297
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1045
 msgid "Create a new address book"
 msgstr "Napravite novi imenik"
 
 #. Translators: This is a save dialog title
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:534
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:835
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:607
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:908
 msgid "Save as vCard"
 msgstr "Sačuvajte kao vKartu"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:942
-msgid "Co_py All Contacts To..."
-msgstr "Kopiraj _sve kontakte u..."
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1015
+msgid "Co_py All Contacts To…"
+msgstr "Kopiraj _sve kontakte u…"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:944
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1017
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Kopira kontakte izabranog imenika u drugi"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:949
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1022
 msgid "D_elete Address Book"
 msgstr "O_briši imenik"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:951
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1024
 msgid "Delete the selected address book"
 msgstr "Briše izabrani imenik"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:956
-msgid "_Manage Address Book groups..."
-msgstr "_Upravljaj grupama imenika..."
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1029
+msgid "_Manage Address Book groups…"
+msgstr "_Upravljaj grupama imenika…"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:958
-#: ../src/modules/calendar/e-task-shell-view-actions.c:719
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1031
+#: ../src/modules/calendar/e-task-shell-view-actions.c:733
 msgid "Manage task list groups order and visibility"
 msgstr "Upravlja redosledom i vidljivošću grupa spiskova zadataka"
 
-#: ../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:1036
+msgid "Mo_ve All Contacts To…"
+msgstr "Premesti _sve kontakte u…"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:965
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1038
 msgid "Move the contacts of the selected address book to another"
 msgstr "Premešta kontakte izabranog imenika u drugi"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:970
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1043
 msgid "_New Address Book"
 msgstr "_Novi imenik"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:977
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1050
 msgid "Address _Book Properties"
 msgstr "Podešavanja _imenika"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:979
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1052
 msgid "Show properties of the selected address book"
 msgstr "Prikazuje svojstva izabranog imenika"
 
-#: ../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
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1057
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1298
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:626
+#: ../src/modules/calendar/e-task-shell-view-actions.c:752
 msgid "Re_fresh"
 msgstr "O_sveži"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:986
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1059
 msgid "Refresh the selected address book"
 msgstr "Osvežava izabrani imenik"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:991
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1064
+msgid "Re_fresh list of account address books"
+msgstr "Os_veži spisak adresara sa naloga"
+
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1071
 msgid "Address Book _Map"
 msgstr "_Karta imenika"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:993
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1073
 msgid "Show map with all contacts from selected address book"
 msgstr "Prikazuje kartu sa svim kontaktima iz izabranih imenika"
 
-#: ../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:1728
-msgid "_Rename..."
-msgstr "_Preimenuj..."
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1078
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1312
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:640
+#: ../src/modules/calendar/e-task-shell-view-actions.c:766
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1685
+msgid "_Rename…"
+msgstr "_Preimenuj…"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1000
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1080
 msgid "Rename the selected address book"
 msgstr "Preimenuje izabrani imenik"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1007
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1087
 msgid "Stop loading"
 msgstr "Prekini učitavanje"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1012
-msgid "_Copy Contact To..."
-msgstr "_Kopiraj kontakt u..."
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1092
+msgid "_Copy Contact To…"
+msgstr "_Kopiraj kontakt u…"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1014
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1094
 msgid "Copy selected contacts to another address book"
 msgstr "Kopira izabrane kontakte u drugi imenik"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1019
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1099
 msgid "_Delete Contact"
 msgstr "_Ukloni Kontakt"
 
-#: ../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:1106
+msgid "_Find in Contact…"
+msgstr "_Pronađi unutar kontakta…"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1028
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1108
 msgid "Search for text in the displayed contact"
 msgstr "Pretražite tekst u prikazanom kontaktu"
 
-#: ../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:1113
+msgid "_Forward Contact…"
+msgstr "Prosle_di kontakt…"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1115
 msgid "Send selected contacts to another person"
 msgstr "Šalje izabrane kontakte drugoj osobi"
 
-#: ../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:1120
+msgid "_Move Contact To…"
+msgstr "_Premesti kontakt u…"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1042
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1122
 msgid "Move selected contacts to another address book"
 msgstr "Premešta izabrane kontakte u drugi imenik"
 
-#: ../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:1127
+msgid "_New Contact…"
+msgstr "Novi kontakt…"
 
-#: ../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:1134
+msgid "New Contact _List…"
+msgstr "Novi _spisak kontakta…"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1061
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1141
 msgid "_Open Contact"
 msgstr "_Otvori kontakt"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1063
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1143
 msgid "View the current contact"
 msgstr "Pregledajte tekući kontakt"
 
-#: ../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:1148
+msgid "_Send Message to Contact…"
+msgstr "_Pošalji poruku kontaktu…"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1070
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1150
 msgid "Send a message to the selected contacts"
 msgstr "Šalje poruku izabranim kontaktima"
 
-#: ../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
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1157
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1482
+#: ../src/modules/calendar/e-task-shell-view-actions.c:831
 msgid "_Actions"
 msgstr "_Radnje"
 
-#: ../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:1900
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1164
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:684
+#: ../src/modules/calendar/e-task-shell-view-actions.c:838
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1834
 msgid "_Preview"
 msgstr "_Pregled"
 
-#: ../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:1177
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:701
+#: ../src/modules/calendar/e-task-shell-view-actions.c:855
+msgid "_Manage groups…"
+msgstr "_Upravljaj grupama…"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1109
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1193
 msgid "Address Book Map"
 msgstr "Karta imenika"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1141
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1225
 msgid "Contact _Preview"
 msgstr "Pre_gled kontakta"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1143
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1227
 msgid "Show contact preview window"
 msgstr "Prikazuje prozor za pregled kontakta"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1149
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1233
 msgid "Show _Maps"
 msgstr "Prikaži _karte"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1151
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1235
 msgid "Show maps in contact preview window"
 msgstr "Prikazuje karte u prozoru za pregled kontakata"
 
-#: ../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:2058
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1254
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:766
+#: ../src/modules/calendar/e-task-shell-view-actions.c:932
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1992
 msgid "_Classic View"
 msgstr "_Klasični prikaz"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1172
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1256
 msgid "Show contact preview below the contact list"
-msgstr "Prikažite pregled kontakta ispod kontakt liste"
+msgstr "Prikazuje pregled kontakta ispod spiska kontakta"
 
-#: ../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:2065
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1261
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:773
+#: ../src/modules/calendar/e-task-shell-view-actions.c:939
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1999
 msgid "_Vertical View"
 msgstr "_Uspravni pregled"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1179
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1263
 msgid "Show contact preview alongside the contact list"
-msgstr "Prikazuje pregled kontakta pored kontakt liste"
+msgstr "Prikazuje pregled kontakta pored spiska kontakta"
 
-#: ../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
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1278
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1675
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:790
+#: ../src/modules/calendar/e-task-shell-view-actions.c:998
 msgid "Unmatched"
 msgstr "Ne odgovara"
 
-#: ../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:2149
-#: ../src/shell/e-shell-content.c:637
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1288
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1685
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:800
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1008
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2083
+#: ../src/shell/e-shell-content.c:639
 msgid "Advanced Search"
 msgstr "Napredna pretraga"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1237
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1321
 msgid "Print all shown contacts"
 msgstr "Štampaj sve prikazane kontakte"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1244
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1328
 msgid "Preview the contacts to be printed"
 msgstr "Pregled kontakata pred štampu"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1251
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1335
 msgid "Print selected contacts"
 msgstr "Štampa izabrane kontakte"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1266
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1350
 msgid "S_ave Address Book as vCard"
 msgstr "_Sačuvaj imenik kao vKartu"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1268
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1352
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Čuva kontakte izabranog imenika kao vKartu"
 
 #. Translators: This is an action label
-#: ../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:1358
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1368
+msgid "_Save as vCard…"
+msgstr "_Sačuvajte kao vKartu…"
 
-#: ../src/modules/addressbook/e-book-shell-view-actions.c:1276
+#: ../src/modules/addressbook/e-book-shell-view-actions.c:1360
 msgid "Save selected contacts as a vCard"
 msgstr "Čuva izabrane kontakte kao VKartu"
 
-#: ../src/modules/addressbook/e-book-shell-view.c:311
+#: ../src/modules/addressbook/e-book-shell-view.c:351
 msgid "_Forward Contacts"
 msgstr "Prosledi kont_akte"
 
-#: ../src/modules/addressbook/e-book-shell-view.c:313
+#: ../src/modules/addressbook/e-book-shell-view.c:353
 msgid "_Forward Contact"
 msgstr "Prosle_di kontakt"
 
-#: ../src/modules/addressbook/e-book-shell-view.c:344
+#: ../src/modules/addressbook/e-book-shell-view.c:384
 msgid "_Send Message to Contacts"
 msgstr "_Pošalji poruku kontaktima"
 
-#: ../src/modules/addressbook/e-book-shell-view.c:346
+#: ../src/modules/addressbook/e-book-shell-view.c:386
 msgid "_Send Message to List"
 msgstr "_Pošalji poruku na listu"
 
-#: ../src/modules/addressbook/e-book-shell-view.c:348
+#: ../src/modules/addressbook/e-book-shell-view.c:388
 msgid "_Send Message to Contact"
 msgstr "_Pošalji poruku kontaktu"
 
+#: ../src/modules/alarm-notify/alarm-notify.c:171
+#, c-format
+msgid "Failed to launch command “%s”:"
+msgstr "Ne mogu da pokrenem naredbu „%s“:"
+
 #: ../src/modules/backup-restore/e-mail-config-restore-page.c:162
 msgid ""
 "You can restore Evolution from a backup file.\n"
@@ -21011,58 +21757,58 @@ msgid ""
 msgstr ""
 "Evoluciju možete povratiti iz datoteke rezervne.\n"
 "\n"
-"To će povratiti sve vaše lične podatke, podešavanja propusnika pošte, itd."
+"To će povratiti sve vaše lične podatke, podešavanja filtera pošte, itd."
 
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:177
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:178
 msgid "_Restore from a backup file:"
 msgstr "_Vrati iz datoteke rezerve:"
 
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:188
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:189
 msgid "Choose a backup file to restore"
 msgstr "Izaberite datoteku rezerve za povraćaj"
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../src/modules/backup-restore/e-mail-config-restore-page.c:291
+#: ../src/modules/backup-restore/e-mail-config-restore-page.c:292
 #: ../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:304
+#: ../src/modules/backup-restore/evolution-backup-restore.c:306
 msgid "Select name of the Evolution backup file"
 msgstr "Izaberite naziv za datoteku rezerve Evolucije"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:349
+#: ../src/modules/backup-restore/evolution-backup-restore.c:351
 msgid "_Restart Evolution after backup"
 msgstr "_Ponovo pokreni Evoluciju nakon pravljenja rezerve"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:384
+#: ../src/modules/backup-restore/evolution-backup-restore.c:386
 msgid "Re_start Evolution after restore"
 msgstr "_Ponovo pokreni Evoluciju nakon povraćaja"
 
-#: ../src/modules/backup-restore/evolution-backup-restore.c:426
+#: ../src/modules/backup-restore/evolution-backup-restore.c:428
 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:435
+#: ../src/modules/backup-restore/evolution-backup-restore.c:437
 #, c-format
-msgid "Checking content of backup file “%s”, please wait..."
-msgstr "Proveravam sadržaj rezervne datoteke „%s“..."
-
-#: ../src/modules/backup-restore/evolution-backup-restore.c:456
-msgid "_Back up Evolution Data..."
-msgstr "Napravi _rezervu podataka Evolucije..."
+msgid "Checking content of backup file “%s”, please wait…"
+msgstr "Proveravam sadržaj rezervne datoteke „%s“, sačekajte…"
 
 #: ../src/modules/backup-restore/evolution-backup-restore.c:458
+msgid "_Back up Evolution Data…"
+msgstr "Nap_ravi rezervu podataka Evolucije…"
+
+#: ../src/modules/backup-restore/evolution-backup-restore.c:460
 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:463
-msgid "R_estore Evolution Data..."
-msgstr "_Vrati podatke Evolucije..."
-
 #: ../src/modules/backup-restore/evolution-backup-restore.c:465
+msgid "R_estore Evolution Data…"
+msgstr "_Vrati rezervne podatke Evolucije…"
+
+#: ../src/modules/backup-restore/evolution-backup-restore.c:467
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Vratite podatke i postavke Evolucije iz arhive"
 
@@ -21256,12 +22002,39 @@ msgstr "Bogofilter"
 msgid "Junk filter using Bogofilter"
 msgstr "Bogo-filter nepoželjnih poruka"
 
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:93
+msgid "Choose an Address Book"
+msgstr "Izaberite imenik"
+
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:264
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:277
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:313
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:334
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:147
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:168
+msgid "URL:"
+msgstr "Adresa:"
+
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:288
+msgid "Find Address Books"
+msgstr "Nađite imenik"
+
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:299
+msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
+msgstr "Izbegavaj ako-poklapa (potrebno na Apaču < 2.2.8)"
+
+#: ../src/modules/book-config-carddav/evolution-book-config-carddav.c:352
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:453
+#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:233
+msgid "URL is not a valid http:// nor https:// URL"
+msgstr "Adresa nije ispravna „http://“ ili „https://“ adresa"
+
 #: ../src/modules/book-config-google/evolution-book-config-google.c:93
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1045
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1069
 #: ../src/modules/cal-config-google/e-cal-config-google.c:190
 #: ../src/modules/cal-config-google/e-cal-config-gtasks.c:115
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:434
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:469
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:444
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:479
 msgid "User name cannot be empty"
 msgstr "Korisničko ime ne može biti prazno"
 
@@ -21274,7 +22047,7 @@ msgid "Standard LDAP Port"
 msgstr "Standardni LDAP port"
 
 #: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:500
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:683
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:687
 msgid "LDAP over SSL/TLS (deprecated)"
 msgstr "LDAP ili SSL/TLS (prevaziđeno)"
 
@@ -21287,95 +22060,102 @@ msgid "Microsoft Global Catalog over SSL/TLS"
 msgstr "Majkrosoftov opšti katalog preko SSL/TLS-a"
 
 #. Page 1
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:619
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:623
 msgid "Connecting to LDAP"
 msgstr "Povezujem se na LDAP"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:636
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:640
 msgid "Server Information"
 msgstr "Podaci servera"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:663
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:667
 msgid "Port:"
 msgstr "Port:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:671
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:246
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:201
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:675
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:247
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:202
 msgid "Port number is not valid"
 msgstr "Broj priključnika nije ispravan"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:686
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:690
 msgid "StartTLS (recommended)"
 msgstr "PočetniTLS (preporučeno)"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:688
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:692
 msgid "Encryption:"
 msgstr "Šifrovanje:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:712
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:323
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:266
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:716
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:324
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:267
 msgid "Authentication"
 msgstr "Potvrđivanje identiteta"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:735
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:748
 msgid "Anonymous"
 msgstr "Anonimno"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:738
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:749
+msgid "Username can be left empty"
+msgstr "Korisničko ime ne može biti prazno"
+
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:755
 msgid "Using email address"
 msgstr "Koristi adresu e-pošte"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:741
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:756
+msgid "requires anonymous access to your LDAP server"
+msgstr "zahteva anonimni pristup vašem LDAP serveru"
+
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:762
 msgid "Using distinguished name (DN)"
 msgstr "Koristi poseban naziv (DN)"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:743
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:763
+msgid "for example: uid=user,dc=example,dc=com"
+msgstr "na primer: uid=user,dc=example,dc=com"
+
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:771
 msgid "Method:"
 msgstr "Način:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:748
-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."
-msgstr ""
-"Ovo je način koji će Evolucija da koristi da vam potvrdi identitet.  Znajte "
-"da će ovo ako postavite na „Koristi adresu e-pošte“ zahtevati anonimni "
-"pristup na vaš LDAP server."
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:775
+msgid "This is the method Evolution will use to authenticate you."
+msgstr "Određuje način kojim će vas Evolucija prijaviti na udaljeni računar."
 
 #. Page 2
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:763
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:787
 msgid "Using LDAP"
 msgstr "Koristi LDAP"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:780
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:804
 #: ../src/modules/mail/e-mail-shell-view.c:118
+#: ../src/modules/mail/e-mail-shell-view.c:200
 msgid "Searching"
 msgstr "Pretražujem"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:802
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:826
 msgid "Search Base:"
 msgstr "Osnova pretrage:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:806
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:830
 msgid "Find Possible Search Bases"
 msgstr "Nađi moguće baze za pretragu"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:828
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:852
 msgid "One Level"
 msgstr "Jedan nivo"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:830
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:854
 msgid "Subtree"
 msgstr "Podstablo"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:832
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:856
 msgid "Search Scope:"
 msgstr "Obim pretrage:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:837
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:861
 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 "
@@ -21387,88 +22167,64 @@ msgstr ""
 "za pretragu.  Obim pretrage „Jedan nivo“ će uključiti samo unose jedan nivo "
 "ispod vaše baze pretrage."
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:846
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:870
 msgid "Search Filter:"
 msgstr "Filter pretrage:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:858
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:882
 msgid "Downloading"
 msgstr "Preuzimam"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:879
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:903
 msgid "Limit:"
 msgstr "Ograničenje:"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:890
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:914
 msgid "contacts"
 msgstr "kontakti"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:895
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:919
 msgid "Browse until limit is reached"
 msgstr "Razgledaj sve dok se ne dostigne ograničenje"
 
-#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1030
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:415
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:451
+#: ../src/modules/book-config-ldap/evolution-book-config-ldap.c:1054
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:425
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:461
 msgid "Server address cannot be empty"
 msgstr "Adresa servera može biti prazna"
 
-#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:93
-msgid "Choose an Address Book"
-msgstr "Izaberite imenik"
-
-#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:241
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:297
-#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:128
-msgid "URL:"
-msgstr "Adresa:"
-
-#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:250
-msgid "Find Address Books"
-msgstr "Nađite imenik"
-
-#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:260
-msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
-msgstr "Izbegavaj ako-poklapa (potrebno na Apaču < 2.2.8)"
-
-#: ../src/modules/book-config-webdav/evolution-book-config-webdav.c:309
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:413
-#: ../src/modules/cal-config-webcal/evolution-cal-config-webcal.c:185
-msgid "URL is not a valid http:// nor https:// URL"
-msgstr "Adresa nije ispravna „http://“ ili „https://“ adresa"
-
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:110
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:112
 #: ../src/modules/cal-config-google/e-google-chooser-button.c:226
 msgid "Choose a Calendar"
 msgstr "Izaberite kalendar"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:114
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:116
 #: ../src/modules/cal-config-google/e-google-chooser-button.c:230
 msgid "Choose a Memo List"
 msgstr "Izaberite spisak beleški"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:118
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:120
 #: ../src/modules/cal-config-google/e-google-chooser-button.c:234
 msgid "Choose a Task List"
 msgstr "Izaberite spisak sadataka"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:311
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:349
 msgid "Find Calendars"
 msgstr "Pronađite kalendare"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:314
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:352
 msgid "Find Memo Lists"
 msgstr "Pronađite spiskove beleški"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:317
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:355
 msgid "Find Task Lists"
 msgstr "Pronađite spiskove zadataka"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:335
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:374
 msgid "Email:"
 msgstr "E-pošta:"
 
-#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:340
+#: ../src/modules/cal-config-caldav/evolution-cal-config-caldav.c:380
 msgid "Server handles meeting invitations"
 msgstr "Server upravlja pozivima na sastanak"
 
@@ -21544,124 +22300,124 @@ msgstr "Jedinice:"
 msgid "Location cannot be empty"
 msgstr "Mesto ne može biti prazno"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:285
+#: ../src/modules/calendar/e-cal-attachment-handler.c:283
 #: ../src/smime/gui/smime-ui.ui.h:7
 msgid "I_mport"
 msgstr "U_vezi"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:335
+#: ../src/modules/calendar/e-cal-attachment-handler.c:333
 msgid "Importing an event"
 msgstr "Uvozim događaj"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:339
+#: ../src/modules/calendar/e-cal-attachment-handler.c:337
 msgid "Importing a memo"
 msgstr "Uvozim belešku"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:343
+#: ../src/modules/calendar/e-cal-attachment-handler.c:341
 msgid "Importing a task"
 msgstr "Uvozim zadatak"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:401
+#: ../src/modules/calendar/e-cal-attachment-handler.c:399
 msgid "Select a Calendar"
 msgstr "Izaberite kalendar"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:408
+#: ../src/modules/calendar/e-cal-attachment-handler.c:406
 msgid "Select a Memo List"
 msgstr "Izaberite spisak beleški"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:415
+#: ../src/modules/calendar/e-cal-attachment-handler.c:413
 msgid "Select a Task List"
 msgstr "Izaberite spisak zadataka"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:422
+#: ../src/modules/calendar/e-cal-attachment-handler.c:420
 msgid "I_mport to Calendar"
 msgstr "U_vezi u kalendar"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:429
+#: ../src/modules/calendar/e-cal-attachment-handler.c:427
 msgid "I_mport to Memo List"
 msgstr "U_vezi u spisak beleški"
 
-#: ../src/modules/calendar/e-cal-attachment-handler.c:436
+#: ../src/modules/calendar/e-cal-attachment-handler.c:434
 msgid "I_mport to Task List"
 msgstr "U_vezi u spisak zadataka"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:563
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:566
 #, c-format
 msgid "Copying an event into the calendar “%s”"
 msgstr "Kopiram događaj u kalendar „%s“"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:564
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:567
 #, c-format
 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
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:572
 #, c-format
 msgid "Copying a memo into the memo list “%s”"
 msgstr "Kopiram belešku u spisak beleški „%s“"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:570
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:573
 #, c-format
 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
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:578
 #, c-format
 msgid "Copying a task into the task list “%s”"
 msgstr "Kopiram zadatak u spisak zadataka „%s“"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:576
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:579
 #, c-format
 msgid "Moving a task into the task list “%s”"
 msgstr "Premeštam zadatak u spisak zadataka „%s“"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:693
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:694
 msgid "Calendar Selector"
 msgstr "Izbornik kalendara"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:699
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:700
 msgid "Memo List Selector"
 msgstr "Izbornik spiskova beleški"
 
-#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:704
+#: ../src/modules/calendar/e-cal-base-shell-sidebar.c:705
 msgid "Task List Selector"
 msgstr "Izbornik spiska zadataka"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:524
+#: ../src/modules/calendar/e-calendar-preferences.c:521
 msgid "Selected Calendars for Notifications of Reminders"
 msgstr "Izabrani kalendari za obaveštenja podsetnika"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:531
-msgid "Selected Memo Lists for Notifications of Reminders"
-msgstr "Izabrani spiskovi beleški za obaveštenja podsetnika"
-
-#: ../src/modules/calendar/e-calendar-preferences.c:538
+#: ../src/modules/calendar/e-calendar-preferences.c:528
 msgid "Selected Task Lists for Notifications of Reminders"
 msgstr "Izabrani spiskovi zadataka za obaveštenja podsetnika"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:634
+#: ../src/modules/calendar/e-calendar-preferences.c:612
 msgid "Meeting Invitations"
 msgstr "Pozivnice za sastanak"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:660
+#: ../src/modules/calendar/e-calendar-preferences.c:638
 msgid "_Delete message after acting"
 msgstr "_Obriši poruku nakon radnje"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:674
-#: ../src/modules/calendar/e-calendar-preferences.c:705
+#: ../src/modules/calendar/e-calendar-preferences.c:645
+msgid "_Preserve existing reminder by default"
+msgstr "Podrazumevano _čuvaj podsetnike"
+
+#: ../src/modules/calendar/e-calendar-preferences.c:659
+#: ../src/modules/calendar/e-calendar-preferences.c:690
 msgid "Conflict Search"
 msgstr "Pretraga preklapanja"
 
 #. Source selector
-#: ../src/modules/calendar/e-calendar-preferences.c:689
+#: ../src/modules/calendar/e-calendar-preferences.c:674
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Bira kalendare za pretragu preklapanja u sastancima"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1115
+#: ../src/modules/calendar/e-calendar-preferences.c:1113
 msgid "Ti_me and date:"
 msgstr "_Vreme i datum:"
 
-#: ../src/modules/calendar/e-calendar-preferences.c:1116
+#: ../src/modules/calendar/e-calendar-preferences.c:1114
 msgid "_Date only:"
 msgstr "Samo _datum:"
 
@@ -21726,7 +22482,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:1658
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1637
 msgid "Work Week"
 msgstr "Radna nedelja"
 
@@ -21824,7 +22580,7 @@ msgstr "Podele _vremena:"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:51
 msgid "_Show appointment end times in week and month view"
-msgstr "_Prikaži zakazana vremena završetka u nedeljnim i mesečnim pregledima"
+msgstr "_Prikaži kraj sastanka u nedeljnim i mesečnim pregledima"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:52
 msgid "Show appointment _icons in the month view"
@@ -21852,141 +22608,157 @@ msgid "Order days in Week View from _left to right"
 msgstr "Poređaj dane u nedeljnom pregledu s leva na desno"
 
 #: ../src/modules/calendar/e-calendar-preferences.ui.h:58
+msgid "Allo_w direct edit of event Summary"
+msgstr "Do_zvoli direktno uređivanje sažetka događaja"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:59
+msgid "Hi_de cancelled events"
+msgstr "_Sakrij otkazane događaje"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Alerts"
 msgstr "Upozorenja"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:59
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:61
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Traži potvrdu za brisanje stavki"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:60
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
 msgid "Display"
 msgstr "Prikaz"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:62
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
 msgid "Highlight t_asks due today"
 msgstr "Istakni _zadatke u toku dana"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:64
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Highlight _overdue tasks"
 msgstr "Istakni _neispunjene zadatke"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:65
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:67
 msgid "_Hide completed tasks after"
 msgstr "_Sakrij završene zadatke posle"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:66
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:68
+msgid "Hid_e cancelled tasks"
+msgstr "Sa_krij otkazane zadatke"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:69
 msgid "To Do bar"
 msgstr "Traka sa zadacima"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:67
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
 msgid "Show Tasks without _Due date"
 msgstr "Prikaži zadatke bez roka"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:70
-msgid "Display reminders in _notification area only"
-msgstr "Prikaži podsetnike samo u _obaveštajnoj zoni"
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:73
+msgid "Display Reminders window with _notifications"
+msgstr "Prikaži prozor podsetnika sa _obaveštenjem"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:71
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:74
 msgid "Keep reminder notification _window always on top"
 msgstr "Drži _prozor obaveštenja podsetnika uvek na vrhu"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:72
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:75
 msgid "Display reminders for completed _tasks"
 msgstr "Prikaži podsetnike za za_vršene zadatke"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:73
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:76
 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:75
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:78
 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:77
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:80
 msgid "before every new appointment"
-msgstr "pre svakog novog zakazivanja"
+msgstr "pre svakog novog sastanka"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:79
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:82
 msgid "Show a _reminder"
 msgstr "Prikaži _podsetnik"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:81
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:84
 msgid "before every anniversary/birthday"
 msgstr "pre svake godišnjice/rođendana"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:82
-msgid "Default _snooze time (in minutes)"
-msgstr "Podrazumevano vreme odla_ganja podsetnika (u minutima)"
-
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:83
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:85
 msgid "Select the sources for reminder notification:"
 msgstr "Izaberite izvore za obaveštenje podsetnika:"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:87
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:88
 msgid "Default Free/Busy Server"
 msgstr "Podrazumevani server slobodnog/zauzetog vremena"
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:90
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:91
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr "%u i %d će biti zamenjeni korisnikom i domenom iz elektronske adrese."
 
-#: ../src/modules/calendar/e-calendar-preferences.ui.h:91
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:92
+msgid ""
+"Specify login user name as part of the URL in case the server requires "
+"authentication, like: https://USER example com/"
+msgstr ""
+"Odredite korisničko ime za prijavu kao deo adrese u slučaju da server "
+"zahteva prijavu, kao što je: https://KORISNIK primer com/"
+
+#: ../src/modules/calendar/e-calendar-preferences.ui.h:93
 msgid "Publishing Information"
 msgstr "Podaci o objavljivanju"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:113
+#: ../src/modules/calendar/e-cal-shell-backend.c:118
 msgctxt "New"
 msgid "_Appointment"
-msgstr "_Zakazivanje"
+msgstr "_Sastanak"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:115
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1451
+#: ../src/modules/calendar/e-cal-shell-backend.c:120
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1426
 msgid "Create a new appointment"
-msgstr "Pravi novo zakazivanje"
+msgstr "Zakazuje novi sastanak"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:120
+#: ../src/modules/calendar/e-cal-shell-backend.c:125
 msgctxt "New"
 msgid "All Day A_ppointment"
-msgstr "Celodnevno za_kazivanje"
+msgstr "_Celodnevni sastanak"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:122
+#: ../src/modules/calendar/e-cal-shell-backend.c:127
 msgid "Create a new all-day appointment"
-msgstr "Pravi novo celodnevno zakazivanje"
+msgstr "Zakazuje novi sastanak koji će trajati tokom celog dana"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:127
+#: ../src/modules/calendar/e-cal-shell-backend.c:132
 msgctxt "New"
 msgid "M_eeting"
-msgstr "S_astanak"
+msgstr "_Sastanak sa drugima"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:129
+#: ../src/modules/calendar/e-cal-shell-backend.c:134
 msgid "Create a new meeting request"
-msgstr "Pravi novi zahtev za sastankom"
+msgstr "Zakazuje novi sastanak sa drugim osobama"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:137
+#: ../src/modules/calendar/e-cal-shell-backend.c:142
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_ndar"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:139
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1311
+#: ../src/modules/calendar/e-cal-shell-backend.c:144
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1279
 msgid "Create a new calendar"
 msgstr "Pravi novi kalendar"
 
-#: ../src/modules/calendar/e-cal-shell-backend.c:256
+#: ../src/modules/calendar/e-cal-shell-backend.c:261
 msgid "Calendar and Tasks"
 msgstr "Kalendar i zadaci"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:197
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:199
 msgid "Print"
 msgstr "Štampaj"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:312
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:314
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -21997,363 +22769,363 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:329
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:331
 msgid "Purge events older than"
 msgstr "Izbaci događaje starije od"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:924
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:919
 msgid "Making an occurrence movable"
 msgstr "Neka ova pojava bude pokretna"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1124
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1112
 msgid "event"
 msgstr "događaj"
 
-#: ../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
-#: ../src/modules/calendar/e-task-shell-view-actions.c:615
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1114
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:204
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:278
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:510
+#: ../src/modules/calendar/e-task-shell-view-actions.c:629
 msgid "Save as iCalendar"
 msgstr "Sačuvaj kao iKalendar"
 
-#: ../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..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1228
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:591
+#: ../src/modules/calendar/e-task-shell-view-actions.c:717
+msgid "_Copy…"
 msgstr "_Kopiraj…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1267
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1235
 msgid "D_elete Calendar"
 msgstr "Ob_riši kalendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1269
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1237
 msgid "Delete the selected calendar"
 msgstr "Obrišite izabrani kalendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1276
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1244
 msgid "Go Back"
 msgstr "Idi nazad"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1283
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1251
 msgid "Go Forward"
 msgstr "Idi napred"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1290
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1258
 msgid "Select today"
 msgstr "Izaberi današnji dan"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1295
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1263
 msgid "Select _Date"
 msgstr "Izaberi _datum"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1297
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1265
 msgid "Select a specific date"
 msgstr "Izaberite određeni datum"
 
-#: ../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:1270
+msgid "_Manage Calendar groups…"
+msgstr "_Upravljaj grupama kalendara…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1304
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1272
 msgid "Manage Calendar groups order and visibility"
 msgstr "Upravljajte redosledom i vidljivošću grupa kalendara"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1309
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1277
 msgid "_New Calendar"
 msgstr "Novi _kalendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1323
-#: ../src/modules/calendar/e-task-shell-view-actions.c:801
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1291
+#: ../src/modules/calendar/e-task-shell-view-actions.c:822
 msgid "Purg_e"
 msgstr "Izba_ci"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1325
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1293
 msgid "Purge old appointments and meetings"
 msgstr "Izbacite stara zakazivanja i sastanke"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1332
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1300
 msgid "Refresh the selected calendar"
 msgstr "Osvežite izabrani kalendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1339
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1305
+msgid "Re_fresh list of account calendars"
+msgstr "_Osveži spisak kalendara sa naloga"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1314
 msgid "Rename the selected calendar"
 msgstr "Preimenujte izabrani kalendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1344
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Find _Next"
 msgstr "Nađi _sledeće"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1346
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1321
 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:1351
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "Find _Previous"
 msgstr "Nađi _prethodno"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1353
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1328
 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:1358
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1333
 msgid "Stop _Running Search"
 msgstr "Zaustavi _tekuću pretragu"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1360
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1335
 msgid "Stop currently running search"
 msgstr "Zaustavite trenutno pokrenutu pretragu"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1340
 msgid "Sho_w All Calendars"
 msgstr "Prikaži _sve kalendare"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1347
 msgid "Show _Only This Calendar"
 msgstr "Prikaži _samo ovaj kalendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1379
-msgid "Cop_y to Calendar..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1354
+msgid "Cop_y to Calendar…"
 msgstr "_Kopiraj u kalendar…"
 
-#: ../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:1361
+msgid "_Delegate Meeting…"
+msgstr "_Delegiraj sastanak…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1368
 msgid "_Delete Appointment"
 msgstr "_Obriši zakazano"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1395
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1370
 msgid "Delete selected appointments"
 msgstr "Obrišite izabrana zakazivanja"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1400
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "Delete This _Occurrence"
 msgstr "Obriši ovu _pojavu"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1402
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1377
 msgid "Delete this occurrence"
 msgstr "Obrišite ovu pojavu"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1407
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1382
 msgid "Delete All Occ_urrences"
 msgstr "Obriši sve po_jave"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "Delete all occurrences"
 msgstr "Obrišite sve pojave"
 
-#: ../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:1389
+msgid "Edit as Ne_w…"
+msgstr "_Uredi kao novu…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1416
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1391
 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:1396
+msgid "New All Day _Event…"
+msgstr "Novi _celodnevni događaj…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "Create a new all day event"
 msgstr "Napravite novi celodnevni događaj"
 
-#: ../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
-#: ../src/modules/calendar/e-task-shell-view-actions.c:696
-msgid "_Forward as iCalendar..."
-msgstr "_Prosledi kao iKalendar..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1403
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:238
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:318
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:584
+#: ../src/modules/calendar/e-task-shell-view-actions.c:710
+msgid "_Forward as iCalendar…"
+msgstr "_Prosledi kao iKalendar…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1437
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1412
 msgid "Create a new meeting"
 msgstr "Napravite novi sastanak"
 
-#: ../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:1417
+msgid "Mo_ve to Calendar…"
+msgstr "Pre_mesti u kalendar…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1456
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1431
 msgid "Make this Occurrence _Movable"
 msgstr "Neka ova pojava bude _pokretna"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1463
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1438
 msgid "_Open Appointment"
 msgstr "_Otvori sastanak"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1465
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1440
 msgid "View the current appointment"
 msgstr "Pregledajte tekuće zakazivanje"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1470
-msgid "_Reply"
-msgstr "_Odgovori"
-
-#: ../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:1459
+msgid "_Schedule Meeting…"
+msgstr "_Zakaži sastanak…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1461
 msgid "Converts an appointment to a meeting"
 msgstr "Pretvorite zakazano u sastanak"
 
-#: ../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:1466
+msgid "Conv_ert to Appointment…"
+msgstr "Pre_tvori u zakazano…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1493
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1468
 msgid "Converts a meeting to an appointment"
 msgstr "Pretvorite sastanak u zakazano"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1498
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1473
 msgid "Quit"
 msgstr "Izađi"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1630
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1609
 msgid "Day"
 msgstr "Dan"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1632
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1611
 msgid "Show one day"
 msgstr "Prikaži jedan dan"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1637
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1616
 msgid "List"
 msgstr "Spisak"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1639
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1618
 msgid "Show as list"
 msgstr "Prikaži kao spisak"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1644
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1623
 msgid "Month"
 msgstr "Mesec"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1646
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1625
 msgid "Show one month"
 msgstr "Prikaži jedan mesec"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1651
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1630
 msgid "Week"
 msgstr "Nedelja"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1653
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1632
 msgid "Show one week"
 msgstr "Prikaži jednu nedelju"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1660
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1639
 msgid "Show one work week"
 msgstr "Prikaži jednu radnu nedelju"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1668
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1647
 msgid "Active Appointments"
 msgstr "Aktivna zakazivanja"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1682
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1661
 msgid "Next 7 Days’ Appointments"
 msgstr "Zakazano za sledeću nedelju"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1689
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1668
 msgid "Occurs Less Than 5 Times"
 msgstr "Dešava se manje od 5 puta"
 
-#: ../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
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1699
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:814
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1022
 msgid "Description contains"
 msgstr "Opis sadrži"
 
-#: ../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
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1706
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:821
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1029
 msgid "Summary contains"
 msgstr "Sažetak sadrži"
 
-#: ../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
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:820
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1007
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1021
-msgid "Print..."
-msgstr "Štampaj..."
-
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1739
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1716
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1730
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:269
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:363
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:831
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:845
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1039
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1053
+msgid "Print…"
+msgstr "Štampaj…"
+
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1718
 msgid "Print this calendar"
 msgstr "Štampa ovaj kalendar"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1746
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1725
 msgid "Preview the calendar to be printed"
 msgstr "Pregled kalendara pred štampu"
 
-#: ../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
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1038
-msgid "_Save as iCalendar..."
-msgstr "_Sačuvaj kao iKalendar..."
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1747
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:279
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:373
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:862
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1070
+msgid "_Save as iCalendar…"
+msgstr "_Sačuvaj kao iKalendar…"
 
-#: ../src/modules/calendar/e-cal-shell-view-actions.c:1845
+#: ../src/modules/calendar/e-cal-shell-view-actions.c:1824
 msgid "Go To"
 msgstr "Idi na"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:205
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:494
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:202
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:508
 msgid "memo"
 msgstr "beleška"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:248
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:640
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:245
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:661
 msgid "New _Memo"
 msgstr "Nova _beleška"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:250
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:247
 #: ../src/modules/calendar/e-memo-shell-backend.c:79
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:642
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:663
 msgid "Create a new memo"
 msgstr "Napravite jednu novu belešku"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:255
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:647
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:252
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:668
 msgid "_Open Memo"
 msgstr "_Otvori belešku"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:257
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:649
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:254
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:670
 msgid "View the selected memo"
 msgstr "Pogledajte izabranu belešku"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:262
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:350
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:654
-#: ../src/modules/calendar/e-task-shell-view-actions.c:794
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:259
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:353
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:675
+#: ../src/modules/calendar/e-task-shell-view-actions.c:815
 msgid "Open _Web Page"
 msgstr "Otvori _Veb stranicu"
 
-#: ../src/modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:822
+#: ../src/modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:847
 msgid "Print the selected memo"
 msgstr "Štampajte izabranu belešku"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:811
+#: ../src/modules/calendar/e-cal-shell-view-private.c:911
 msgid "Searching next matching event"
 msgstr "Tražim sledeći odgovarajući događaj"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:812
+#: ../src/modules/calendar/e-cal-shell-view-private.c:912
 msgid "Searching previous matching event"
 msgstr "Tražim prethodni odgovarajući događaj"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:833
+#: ../src/modules/calendar/e-cal-shell-view-private.c:933
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
@@ -22362,7 +23134,7 @@ msgstr[1] "Ne mogu da pronađem odgovarajući događaj u sledeće %d godine"
 msgstr[2] "Ne mogu da pronađem odgovarajući događaj u sledećih %d godina"
 msgstr[3] "Ne mogu da pronađem odgovarajući događaj u sledećoj %d godini"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:837
+#: ../src/modules/calendar/e-cal-shell-view-private.c:937
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
@@ -22371,7 +23143,7 @@ msgstr[1] "Ne mogu da pronađem odgovarajući događaj u prethodne %d godini"
 msgstr[2] "Ne mogu da pronađem odgovarajući događaj u prethodnih %d godini"
 msgstr[3] "Ne mogu da pronađem odgovarajući događaj u prethodnoj %d godini"
 
-#: ../src/modules/calendar/e-cal-shell-view-private.c:860
+#: ../src/modules/calendar/e-cal-shell-view-private.c:960
 msgid "Cannot search with no active calendar"
 msgstr "Ne mogu da tražim ako nema aktivnog kalendara"
 
@@ -22379,58 +23151,58 @@ msgstr "Ne mogu da tražim ako nema aktivnog kalendara"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:273
-#: ../src/modules/calendar/e-task-shell-view-actions.c:613
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:276
+#: ../src/modules/calendar/e-task-shell-view-actions.c:627
 msgid "task"
 msgstr "zadatak"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:308
-#: ../src/modules/calendar/e-task-shell-view-actions.c:675
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:311
+#: ../src/modules/calendar/e-task-shell-view-actions.c:689
 msgid "_Assign Task"
 msgstr "_Dodeli zadatak"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:322
-#: ../src/modules/calendar/e-task-shell-view-actions.c:766
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:325
+#: ../src/modules/calendar/e-task-shell-view-actions.c:787
 msgid "_Mark as Complete"
 msgstr "_Označi kao završeno"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:324
-#: ../src/modules/calendar/e-task-shell-view-actions.c:768
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:327
+#: ../src/modules/calendar/e-task-shell-view-actions.c:789
 msgid "Mark selected tasks as complete"
 msgstr "Obeležite izabrane zadatke kao završene"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:329
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:332
 msgid "_Mark as Incomplete"
 msgstr "_Označi kao nezavršeno"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:331
-#: ../src/modules/calendar/e-task-shell-view-actions.c:775
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:334
+#: ../src/modules/calendar/e-task-shell-view-actions.c:796
 msgid "Mark selected tasks as incomplete"
 msgstr "Obeležite izabrane zadatke kao nezavršene"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:336
-#: ../src/modules/calendar/e-task-shell-view-actions.c:780
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:339
+#: ../src/modules/calendar/e-task-shell-view-actions.c:801
 msgid "New _Task"
 msgstr "Novi zad_atak"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:338
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:341
 #: ../src/modules/calendar/e-task-shell-backend.c:77
-#: ../src/modules/calendar/e-task-shell-view-actions.c:782
+#: ../src/modules/calendar/e-task-shell-view-actions.c:803
 msgid "Create a new task"
 msgstr "Napravite novi zadatak"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:343
-#: ../src/modules/calendar/e-task-shell-view-actions.c:787
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:346
+#: ../src/modules/calendar/e-task-shell-view-actions.c:808
 msgid "_Open Task"
 msgstr "_Otvori zadatak"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../src/modules/calendar/e-task-shell-view-actions.c:789
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:348
+#: ../src/modules/calendar/e-task-shell-view-actions.c:810
 msgid "View the selected task"
 msgstr "Pregledajte izabrani zadatak"
 
-#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:362
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1023
+#: ../src/modules/calendar/e-cal-shell-view-taskpad.c:365
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1055
 msgid "Print the selected task"
 msgstr "Štampa izabrani zadatak"
 
@@ -22454,96 +23226,100 @@ msgid "Memo Li_st"
 msgstr "Spi_sak beleški"
 
 #: ../src/modules/calendar/e-memo-shell-backend.c:96
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:600
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:614
 msgid "Create a new memo list"
 msgstr "Sastavite novi spisak beleški"
 
-#: ../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-actions.c:196
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:211
 msgid "Print Memos"
 msgstr "Štampaj beleške"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:556
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:570
 msgid "_Delete Memo"
 msgstr "_Obriši belešku"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:563
-msgid "_Find in Memo..."
-msgstr "P_ronađi u belešci..."
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:577
+msgid "_Find in Memo…"
+msgstr "P_ronađi u belešci…"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:565
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:579
 msgid "Search for text in the displayed memo"
 msgstr "Pretražite tekst u prikazanoj belešci"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:584
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:598
 msgid "D_elete Memo List"
 msgstr "Ob_riši spisak beleški"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:586
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:600
 msgid "Delete the selected memo list"
 msgstr "Obrišite izabrani spisak beleški"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:591
-msgid "_Manage Memo List groups..."
-msgstr "_Upravljaj grupama spiskova beleški..."
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:605
+msgid "_Manage Memo List groups…"
+msgstr "_Upravljaj grupama spiskova beleški…"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:593
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:607
 msgid "Manage Memo List groups order and visibility"
 msgstr "Upravljajte redosledom i vidljivošću grupa spiskova beleški"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:598
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:612
 msgid "_New Memo List"
 msgstr "_Novi spisak beleški"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:614
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:628
 msgid "Refresh the selected memo list"
 msgstr "Osvežite izabrani spisak beleški"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:621
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:633
+msgid "Re_fresh list of account memo lists"
+msgstr "_Osveži spisak beleški sa naloga"
+
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:642
 msgid "Rename the selected memo list"
 msgstr "Preimenujte izabrani spisak beleški"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:626
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:647
 msgid "Show _Only This Memo List"
 msgstr "Prikaži _samo ovaj spisak beleški"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:633
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:654
 msgid "Sho_w All Memo Lists"
 msgstr "Prikaži _sve spiskove beleški"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:720
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:745
 msgid "Memo _Preview"
 msgstr "_Pregled beleški"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:722
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:747
 msgid "Show memo preview pane"
 msgstr "Prikažite pregled beleški"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:743
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:768
 msgid "Show memo preview below the memo list"
 msgstr "Prikažite pregled beleški ispod spiska beleški"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:750
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:775
 msgid "Show memo preview alongside the memo list"
 msgstr "Prikažite pregled beleški pored spiska beleški"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:808
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:833
 msgid "Print the list of memos"
 msgstr "Štampajte spisak beleški"
 
-#: ../src/modules/calendar/e-memo-shell-view-actions.c:815
+#: ../src/modules/calendar/e-memo-shell-view-actions.c:840
 msgid "Preview the list of memos to be printed"
 msgstr "Pregledajte spisak beleški za štampu"
 
-#: ../src/modules/calendar/e-memo-shell-view.c:217
+#: ../src/modules/calendar/e-memo-shell-view.c:227
 msgid "Delete Memos"
 msgstr "Obriši beleške"
 
-#: ../src/modules/calendar/e-memo-shell-view.c:219
+#: ../src/modules/calendar/e-memo-shell-view.c:229
 msgid "Delete Memo"
 msgstr "Obriši belešku"
 
-#: ../src/modules/calendar/e-memo-shell-view-private.c:367
+#: ../src/modules/calendar/e-memo-shell-view-private.c:361
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -22552,8 +23328,8 @@ msgstr[1] "%d beleške"
 msgstr[2] "%d beleški"
 msgstr[3] "%d beleška"
 
-#: ../src/modules/calendar/e-memo-shell-view-private.c:371
-#: ../src/modules/calendar/e-task-shell-view-private.c:548
+#: ../src/modules/calendar/e-memo-shell-view-private.c:365
+#: ../src/modules/calendar/e-task-shell-view-private.c:577
 #, c-format
 msgid "%d selected"
 msgstr "izabranih — %d"
@@ -22578,16 +23354,16 @@ msgid "Tas_k List"
 msgstr "Spisak za_dataka"
 
 #: ../src/modules/calendar/e-task-shell-backend.c:94
-#: ../src/modules/calendar/e-task-shell-view-actions.c:726
+#: ../src/modules/calendar/e-task-shell-view-actions.c:740
 msgid "Create a new task list"
 msgstr "Napravite novi spisak zadataka"
 
-#: ../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-actions.c:220
+#: ../src/modules/calendar/e-task-shell-view-actions.c:235
 msgid "Print Tasks"
 msgstr "Štampaj zadatke"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:557
+#: ../src/modules/calendar/e-task-shell-view-actions.c:571
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -22599,115 +23375,123 @@ msgstr ""
 "\n"
 "Da obrišem ove zadatke?"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:564
+#: ../src/modules/calendar/e-task-shell-view-actions.c:578
 msgid "Do not ask me again"
 msgstr "Ne pitaj me ponovo"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:682
+#: ../src/modules/calendar/e-task-shell-view-actions.c:696
 msgid "_Delete Task"
 msgstr "_Obriši zadatak"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:689
-msgid "_Find in Task..."
-msgstr "_Pronađi u zadatku..."
+#: ../src/modules/calendar/e-task-shell-view-actions.c:703
+msgid "_Find in Task…"
+msgstr "_Pronađi u zadatku…"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:691
+#: ../src/modules/calendar/e-task-shell-view-actions.c:705
 msgid "Search for text in the displayed task"
 msgstr "Pretraži tekst u prikazanom zadatku"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:710
+#: ../src/modules/calendar/e-task-shell-view-actions.c:724
 msgid "D_elete Task List"
 msgstr "O_briši spisak zadataka"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:712
+#: ../src/modules/calendar/e-task-shell-view-actions.c:726
 msgid "Delete the selected task list"
 msgstr "Obrišite izabrani spisak zadataka"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:717
-msgid "_Manage Task List groups..."
-msgstr "_Upravljaj grupama spiskova zadataka..."
+#: ../src/modules/calendar/e-task-shell-view-actions.c:731
+msgid "_Manage Task List groups…"
+msgstr "_Upravljaj grupama spiskova zadataka…"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:724
+#: ../src/modules/calendar/e-task-shell-view-actions.c:738
 msgid "_New Task List"
 msgstr "No_vi spisak zadataka"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:740
+#: ../src/modules/calendar/e-task-shell-view-actions.c:754
 msgid "Refresh the selected task list"
 msgstr "Osvežite izabrani spisak zadataka"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:747
+#: ../src/modules/calendar/e-task-shell-view-actions.c:759
+msgid "Re_fresh list of account task lists"
+msgstr "_Osveži spisak zadataka sa naloga"
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:768
 msgid "Rename the selected task list"
 msgstr "Preimenujte izabrani spisak zadataka"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:752
+#: ../src/modules/calendar/e-task-shell-view-actions.c:773
 msgid "Sho_w All Task Lists"
 msgstr "Prikaži _sve spiskove zadataka"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:759
+#: ../src/modules/calendar/e-task-shell-view-actions.c:780
 msgid "Show _Only This Task List"
 msgstr "Prikaži _samo ovaj spisak zadataka"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:773
+#: ../src/modules/calendar/e-task-shell-view-actions.c:794
 msgid "Mar_k as Incomplete"
 msgstr "O_znači kao nezavršeno"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:803
+#: ../src/modules/calendar/e-task-shell-view-actions.c:824
 msgid "Delete completed tasks"
 msgstr "Obrišite završene zadatke"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:886
+#: ../src/modules/calendar/e-task-shell-view-actions.c:911
 msgid "Task _Preview"
 msgstr "Pregled za_dataka"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:888
+#: ../src/modules/calendar/e-task-shell-view-actions.c:913
 msgid "Show task preview pane"
 msgstr "Prikažite pregled zadataka"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:909
+#: ../src/modules/calendar/e-task-shell-view-actions.c:934
 msgid "Show task preview below the task list"
 msgstr "Prikažite pregled ispod spiska zadataka"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:916
+#: ../src/modules/calendar/e-task-shell-view-actions.c:941
 msgid "Show task preview alongside the task list"
 msgstr "Prikažite pregled pored spiska zadataka"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:924
+#: ../src/modules/calendar/e-task-shell-view-actions.c:949
 msgid "Active Tasks"
 msgstr "Aktivni zadaci"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:938
+#: ../src/modules/calendar/e-task-shell-view-actions.c:963
+msgid "Cancelled Tasks"
+msgstr "Otkazani zadaci"
+
+#: ../src/modules/calendar/e-task-shell-view-actions.c:970
 msgid "Completed Tasks"
 msgstr "Završeni zadaci"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:945
+#: ../src/modules/calendar/e-task-shell-view-actions.c:977
 msgid "Next 7 Days’ Tasks"
 msgstr "Zadaci za sledeću nedelju"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:952
+#: ../src/modules/calendar/e-task-shell-view-actions.c:984
 msgid "Overdue Tasks"
 msgstr "Prekoračeni zadaci"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:959
+#: ../src/modules/calendar/e-task-shell-view-actions.c:991
 msgid "Tasks with Attachments"
 msgstr "Zadaci sa prilozima"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1009
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1041
 msgid "Print the list of tasks"
 msgstr "Štampajte spisak zadataka"
 
-#: ../src/modules/calendar/e-task-shell-view-actions.c:1016
+#: ../src/modules/calendar/e-task-shell-view-actions.c:1048
 msgid "Preview the list of tasks to be printed"
 msgstr "Pregledajte spisak zadataka pred štampu"
 
-#: ../src/modules/calendar/e-task-shell-view.c:321
+#: ../src/modules/calendar/e-task-shell-view.c:346
 msgid "Delete Tasks"
 msgstr "Obriši zadatke"
 
-#: ../src/modules/calendar/e-task-shell-view.c:323
+#: ../src/modules/calendar/e-task-shell-view.c:348
 msgid "Delete Task"
 msgstr "Obriši zadatak"
 
-#: ../src/modules/calendar/e-task-shell-view-private.c:544
+#: ../src/modules/calendar/e-task-shell-view-private.c:573
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -22716,39 +23500,39 @@ msgstr[1] "%d zadataka"
 msgstr[2] "%d zadataka"
 msgstr[3] "%d zadatak"
 
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:324
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:326
 msgid "Convert to M_eeting"
 msgstr "Pretvori u _sastanak"
 
-#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:326
+#: ../src/modules/composer-to-meeting/e-composer-to-meeting.c:328
 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
+#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:365
 msgid "Convert to M_essage"
 msgstr "Pretvori u _poruku"
 
-#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:359
+#: ../src/modules/composer-to-meeting/e-meeting-to-composer.c:367
 msgid "Convert to the mail message"
 msgstr "Pretvorite u poruku pošte"
 
 #: ../src/modules/config-lookup/e-gnome-config-lookup.c:67
-msgid "Look up e-mail domain on the GNOME server"
-msgstr "Potraži domen adrese e-pošte na Gnomovom serveru"
+msgid "Look up configuration with e-mail domain"
+msgstr "Zatraži podešavanja na osnovu domena e-pošte"
 
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:82
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:83
 msgid "Looking up IMAP server…"
-msgstr "Potražujem IMAP server…"
+msgstr "Tražim od IMAP servera…"
 
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:84
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:85
 msgid "Looking up POP3 server…"
-msgstr "Potražujem POP3 server…"
+msgstr "Tražim od POP3 servera…"
 
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:86
 msgid "Looking up SMTP server…"
-msgstr "Potražujem SMTP server…"
+msgstr "Tražim od SMTP servera…"
 
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:87
 #: ../src/modules/config-lookup/e-srv-config-lookup.c:88
@@ -22782,7 +23566,7 @@ msgstr "LDAP server"
 msgid "Looking up LDAP server…"
 msgstr "Potražujem LDAP server…"
 
-#: ../src/modules/config-lookup/e-srv-config-lookup.c:234
+#: ../src/modules/config-lookup/e-srv-config-lookup.c:279
 msgid "Look up in SRV records"
 msgstr "Potraži unutar SRV zapisa"
 
@@ -22804,11 +23588,11 @@ msgstr "CalDav i CardDaV server"
 msgid "Look up for a CalDAV/CardDAV server"
 msgstr "Potraži na CalDAV/CardDav serveru"
 
-#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:162
+#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:165
 msgid "ITIP"
 msgstr "ITIP"
 
-#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:163
+#: ../src/modules/itip-formatter/e-mail-formatter-itip.c:166
 msgid "Display part as an invitation"
 msgstr "Prikazuje delove kao pozivnicu"
 
@@ -23191,7 +23975,7 @@ msgid "Start day:"
 msgstr "Početak dana:"
 
 #: ../src/modules/itip-formatter/itip-view.c:864
-#: ../src/modules/itip-formatter/itip-view.c:1682
+#: ../src/modules/itip-formatter/itip-view.c:1678
 msgid "Start time:"
 msgstr "Vreme početka:"
 
@@ -23200,7 +23984,7 @@ msgid "End day:"
 msgstr "Kraj dana:"
 
 #: ../src/modules/itip-formatter/itip-view.c:873
-#: ../src/modules/itip-formatter/itip-view.c:1683
+#: ../src/modules/itip-formatter/itip-view.c:1679
 msgid "End time:"
 msgstr "Vreme završetka:"
 
@@ -23218,11 +24002,11 @@ msgstr "_Odbij"
 
 #: ../src/modules/itip-formatter/itip-view.c:1222
 msgid "_Tentative all"
-msgstr "Sve sa re_zervom"
+msgstr "Sve kao _upitno"
 
 #: ../src/modules/itip-formatter/itip-view.c:1225
 msgid "_Tentative"
-msgstr "Sa _rezervom"
+msgstr "_Upitno"
 
 #: ../src/modules/itip-formatter/itip-view.c:1228
 msgid "Acce_pt all"
@@ -23241,218 +24025,331 @@ msgid "_Update Attendee Status"
 msgstr "Ažuriraj stanje učesni_ka"
 
 #: ../src/modules/itip-formatter/itip-view.c:1240
-#: ../src/smime/gui/certificate-manager.c:1677
+#: ../src/smime/gui/certificate-manager.c:1661
 msgid "_Update"
 msgstr "_Osveži"
 
-#: ../src/modules/itip-formatter/itip-view.c:1685
-#: ../src/modules/itip-formatter/itip-view.c:1733
-#: ../src/modules/itip-formatter/itip-view.c:1804
+#: ../src/modules/itip-formatter/itip-view.c:1681
+#: ../src/modules/itip-formatter/itip-view.c:1729
+#: ../src/modules/itip-formatter/itip-view.c:1800
 msgid "Comment:"
 msgstr "Napomena:"
 
 #. RSVP area
-#: ../src/modules/itip-formatter/itip-view.c:1721
+#: ../src/modules/itip-formatter/itip-view.c:1717
 msgid "Send reply to sender"
 msgstr "Odgovori pošiljaocu"
 
 #. Updates
-#: ../src/modules/itip-formatter/itip-view.c:1736
+#: ../src/modules/itip-formatter/itip-view.c:1732
 msgid "Send _updates to attendees"
 msgstr "Pošalji _ažurirane podatke učesnicima"
 
 #. The recurrence check button
-#: ../src/modules/itip-formatter/itip-view.c:1739
+#: ../src/modules/itip-formatter/itip-view.c:1735
 msgid "_Apply to all instances"
 msgstr "Pri_meni na sve nivoe"
 
-#: ../src/modules/itip-formatter/itip-view.c:1740
+#: ../src/modules/itip-formatter/itip-view.c:1736
 msgid "Show time as _free"
 msgstr "Prikaži vreme kao _slobodno"
 
-#: ../src/modules/itip-formatter/itip-view.c:1741
+#: ../src/modules/itip-formatter/itip-view.c:1737
 msgid "_Preserve my reminder"
 msgstr "_Očuvaj moj podsetnik"
 
-#: ../src/modules/itip-formatter/itip-view.c:1742
+#: ../src/modules/itip-formatter/itip-view.c:1738
 msgid "_Inherit reminder"
 msgstr "_Nasledi podsetnik"
 
-#: ../src/modules/itip-formatter/itip-view.c:2051
+#: ../src/modules/itip-formatter/itip-view.c:2074
 msgid "_Tasks:"
 msgstr "_Zadaci:"
 
-#: ../src/modules/itip-formatter/itip-view.c:2054
+#: ../src/modules/itip-formatter/itip-view.c:2077
 msgid "_Memos:"
 msgstr "_Beleške:"
 
-#: ../src/modules/itip-formatter/itip-view.c:3111
+#: ../src/modules/itip-formatter/itip-view.c:3151
 msgid "Sa_ve"
 msgstr "Sa_čuvaj"
 
-#: ../src/modules/itip-formatter/itip-view.c:3633
-#: ../src/modules/itip-formatter/itip-view.c:5189
+#: ../src/modules/itip-formatter/itip-view.c:3715
+#: ../src/modules/itip-formatter/itip-view.c:5468
 msgid "Attendee status updated"
 msgstr "Status učesnika je ažuriran"
 
-#: ../src/modules/itip-formatter/itip-view.c:3848
+#: ../src/modules/itip-formatter/itip-view.c:3925
 #, c-format
 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:3854
+#: ../src/modules/itip-formatter/itip-view.c:3932
+#, c-format
+msgid "A task “%s” in the task list “%s” conflicts with this task"
+msgstr "Zadatak „%s“ sa spiska zadataka „%s“ je zakazana kad i ovaj zadatak"
+
+#: ../src/modules/itip-formatter/itip-view.c:3939
+#, c-format
+msgid "A memo “%s” in the memo list “%s” conflicts with this memo"
+msgstr "Beleška „%s“ u sa spiska beleški „%s“ je zakazana kad i ova beleška"
+
+#: ../src/modules/itip-formatter/itip-view.c:3950
 #, c-format
 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"
+"Kalendar „%s“ sadrži %d zakazivanje koje je zakazano kad i ovaj sastanak"
+msgstr[1] ""
+"Kalendar „%s“ sadrži %d zakazivanja koja su zakazana kad i ovaj sastanak"
+msgstr[2] ""
+"Kalendar „%s“ sadrži %d zakazivanja koja su zakazana kad i ovaj sastanak"
+msgstr[3] ""
+"Kalendar „%s“ sadrži zakazivanje koje je zakazano kad i ovaj sastanak"
+
+#: ../src/modules/itip-formatter/itip-view.c:3959
+#, c-format
+msgid "The task list “%s” contains a task which conflicts with this task"
+msgid_plural ""
+"The task list “%s” contains %d tasks which conflict with this task"
+msgstr[0] ""
+"Spisak zadataka „%s“ sadrži %d zadatak koji je zakazan kao i ovaj zadatak"
+msgstr[1] ""
+"Spisak zadataka „%s“ sadrži %d zadatka koju su zakazani kao i ovaj zadatak"
+msgstr[2] ""
+"Spisak zadataka „%s“ sadrži %d zadataka koji su zakazani kao i ovaj zadatak"
+msgstr[3] ""
+"Spisak zadataka „%s“ sadrži zadatak koji je zakazan kao i ovaj zadatak"
+
+#: ../src/modules/itip-formatter/itip-view.c:3968
+#, c-format
+msgid "The memo list “%s” contains a memo which conflicts with this memo"
+msgid_plural ""
+"The memo list “%s” contains %d memos which conflict with this memo"
+msgstr[0] ""
+"Spisak beleški „%s“ sadrži %d belešku koja je zakazana kad i ova beleška"
 msgstr[1] ""
-"Kalendar „%s“ sadrži %d zakazivanja koja se sukobljavaju sa ovim sastankom"
+"Spisak beleški „%s“ sadrži %d beleške koje su zakazane kad i ova beleška"
 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"
+"Spisak beleški „%s“ sadrži %d beleški koje su zakazane kad i ova beleška"
+msgstr[3] ""
+"Spisak beleški „%s“ sadrži belešku koja je zakazana kad i ova beleška"
 
-#: ../src/modules/itip-formatter/itip-view.c:3887
+#: ../src/modules/itip-formatter/itip-view.c:4006
 #, c-format
 msgid "Found the appointment in the calendar “%s”"
-msgstr "Pronašao sam zakazivanje u kalendaru „%s“"
+msgstr "Pronašao sam sastanak u kalendaru „%s“"
+
+#: ../src/modules/itip-formatter/itip-view.c:4011
+#, c-format
+msgid "Found the task in the task list “%s”"
+msgstr "Pronašao sam zadatak u spisku „%s“"
+
+#: ../src/modules/itip-formatter/itip-view.c:4016
+#, c-format
+msgid "Found the memo in the memo list “%s”"
+msgstr "Pronašao sam belešku u spisku „%s“"
 
-#: ../src/modules/itip-formatter/itip-view.c:3896
+#: ../src/modules/itip-formatter/itip-view.c:4027
 msgid "This meeting invitation is obsolete. It had been updated."
 msgstr "Ovaj poziv na sastanak je zastareo. Stoga je osvežen."
 
-#: ../src/modules/itip-formatter/itip-view.c:4038
+#: ../src/modules/itip-formatter/itip-view.c:4169
 msgid "Unable to find any calendars"
-msgstr "Ne mogu da pronađem nijedan kalendar"
+msgstr "Ne mogu da pronađem kalendare"
 
-#: ../src/modules/itip-formatter/itip-view.c:4046
+#: ../src/modules/itip-formatter/itip-view.c:4177
 msgid "Unable to find this meeting in any calendar"
-msgstr "Ne mogu da pronađem ovaj sastanak ni u jednom kalendaru"
+msgstr "Ne mogu da pronađem ovaj sastanak u kalendarima"
 
-#: ../src/modules/itip-formatter/itip-view.c:4051
+#: ../src/modules/itip-formatter/itip-view.c:4182
 msgid "Unable to find this task in any task list"
-msgstr "Ne mogu da pronađem ovaj zadatak ni u jednom spisku zadataka"
+msgstr "Ne mogu da pronađem ovaj zadatak u spisku"
 
-#: ../src/modules/itip-formatter/itip-view.c:4056
+#: ../src/modules/itip-formatter/itip-view.c:4187
 msgid "Unable to find this memo in any memo list"
-msgstr "Nijedan spisak beleški ne sadrži ovu belešku"
-
-#: ../src/modules/itip-formatter/itip-view.c:4397
-msgid "Opening the calendar. Please wait..."
-msgstr "Otvaram kalendar. Molim sačekajte..."
+msgstr "Ne mogu da pronađem ovu belešku u spisku"
 
-#: ../src/modules/itip-formatter/itip-view.c:4402
+#: ../src/modules/itip-formatter/itip-view.c:4481
 msgid "Searching for an existing version of this appointment"
-msgstr "Pretraga za jednom postojećom verzijom ovog zakazivanja je u toku"
+msgstr "Tražim postojeću verziju ovog sastanka"
 
-#: ../src/modules/itip-formatter/itip-view.c:4801
+#: ../src/modules/itip-formatter/itip-view.c:4485
+msgid "Searching for an existing version of this task"
+msgstr "Tražim postojeću verziju ovog zadatka"
+
+#: ../src/modules/itip-formatter/itip-view.c:4489
+msgid "Searching for an existing version of this memo"
+msgstr "Tražim postojeću verziju ove beleške"
+
+#: ../src/modules/itip-formatter/itip-view.c:4547
+msgid "Opening the calendar. Please wait…"
+msgstr "Otvaram kalendar. Sačekajte…"
+
+#: ../src/modules/itip-formatter/itip-view.c:4964
+#, c-format
+msgid "Unable to send item to calendar “%s”. %s"
+msgstr "Ne mogu da pošaljem stavke u kalendar „%s“. %s"
+
+#: ../src/modules/itip-formatter/itip-view.c:4972
+#, c-format
+msgid "Unable to send item to task list “%s”. %s"
+msgstr "Ne mogu da pošaljem stavku u spisak zadataka „%s“. %s"
+
+#: ../src/modules/itip-formatter/itip-view.c:4980
 #, c-format
-msgid "Unable to send item to calendar “%s”.  %s"
-msgstr "Ne mogu da pošaljem stavke kalendaru „%s“.  %s"
+msgid "Unable to send item to memo list “%s”. %s"
+msgstr "Ne mogu da pošaljem stavke u spisak beleški „%s“. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:4816
+#: ../src/modules/itip-formatter/itip-view.c:5000
 #, c-format
 msgid "Sent to calendar “%s” as accepted"
 msgstr "Poslato kalendaru „%s“ kao prihvaćeno"
 
-#: ../src/modules/itip-formatter/itip-view.c:4821
+#: ../src/modules/itip-formatter/itip-view.c:5005
+#, c-format
+msgid "Sent to task list “%s” as accepted"
+msgstr "Poslato u spisak zadataka „%s“ kao prihvaćeno"
+
+#: ../src/modules/itip-formatter/itip-view.c:5010
+#, c-format
+msgid "Sent to memo list “%s” as accepted"
+msgstr "Poslato u spisak beleški „%s“ kao prihvaćeno"
+
+#: ../src/modules/itip-formatter/itip-view.c:5020
 #, c-format
 msgid "Sent to calendar “%s” as tentative"
-msgstr "Poslato kalendaru „%s“ kao pokušaj"
+msgstr "Poslato u kalendar „%s“ kao upitno"
+
+#: ../src/modules/itip-formatter/itip-view.c:5025
+#, c-format
+msgid "Sent to task list “%s” as tentative"
+msgstr "Poslato u spisak zadataka „%s“ kao upitno"
+
+#: ../src/modules/itip-formatter/itip-view.c:5030
+#, c-format
+msgid "Sent to memo list “%s” as tentative"
+msgstr "Poslato u spisak beleški „%s“ kao upitno"
 
-#: ../src/modules/itip-formatter/itip-view.c:4827
+#: ../src/modules/itip-formatter/itip-view.c:5040
 #, c-format
 msgid "Sent to calendar “%s” as declined"
 msgstr "Poslato kalendaru „%s“ kao odbijeno"
 
-#: ../src/modules/itip-formatter/itip-view.c:4833
+#: ../src/modules/itip-formatter/itip-view.c:5045
+#, c-format
+msgid "Sent to task list “%s” as declined"
+msgstr "Poslato u spisak zadataka „%s“ kao odbijeno"
+
+#: ../src/modules/itip-formatter/itip-view.c:5050
+#, c-format
+msgid "Sent to memo list “%s” as declined"
+msgstr "Poslato u spisak beleški „%s“ kao odbijeno"
+
+#: ../src/modules/itip-formatter/itip-view.c:5060
 #, c-format
 msgid "Sent to calendar “%s” as cancelled"
 msgstr "Poslato kalendaru „%s“ kao otkazano"
 
-#: ../src/modules/itip-formatter/itip-view.c:4869
-#: ../src/modules/itip-formatter/itip-view.c:5326
-#: ../src/modules/itip-formatter/itip-view.c:5429
-msgid "Saving changes to the calendar. Please wait..."
-msgstr "Čuvam izmene u kalendar. Molim sačekajte..."
+#: ../src/modules/itip-formatter/itip-view.c:5065
+#, c-format
+msgid "Sent to task list “%s” as cancelled"
+msgstr "Poslato u spisak zadataka „%s“ kao otkazano"
+
+#: ../src/modules/itip-formatter/itip-view.c:5070
+#, c-format
+msgid "Sent to memo list “%s” as cancelled"
+msgstr "Poslato u spisak beležki „%s“ kao otkazano"
+
+#: ../src/modules/itip-formatter/itip-view.c:5088
+msgid "Saving changes to the calendar. Please wait…"
+msgstr "Čuvam izmene u kalendar. Sačekajte…"
+
+#: ../src/modules/itip-formatter/itip-view.c:5091
+msgid "Saving changes to the task list. Please wait…"
+msgstr "Čuvam izmene u spisku zadataka. Sačekajte…"
 
-#: ../src/modules/itip-formatter/itip-view.c:4921
+#: ../src/modules/itip-formatter/itip-view.c:5094
+msgid "Saving changes to the memo list. Please wait…"
+msgstr "Čuvam izmene u spisku beleški. Sačekajte…"
+
+#: ../src/modules/itip-formatter/itip-view.c:5185
 msgid "Unable to parse item"
 msgstr "Ne mogu da obradim stavku"
 
-#: ../src/modules/itip-formatter/itip-view.c:5113
+#: ../src/modules/itip-formatter/itip-view.c:5393
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizator je uklonio delegata „%s“ "
 
-#: ../src/modules/itip-formatter/itip-view.c:5130
+#: ../src/modules/itip-formatter/itip-view.c:5410
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Delegatu je poslato obaveštenje o otkazivanju"
 
-#: ../src/modules/itip-formatter/itip-view.c:5134
+#: ../src/modules/itip-formatter/itip-view.c:5414
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Ne mogu delegatu da pošaljem obaveštenje o otkazivanju"
 
-#: ../src/modules/itip-formatter/itip-view.c:5181
+#: ../src/modules/itip-formatter/itip-view.c:5460
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Ne mogu da ažuriram učesnika. %s"
 
-#: ../src/modules/itip-formatter/itip-view.c:5216
+#: ../src/modules/itip-formatter/itip-view.c:5493
 msgid "The meeting is invalid and cannot be updated"
 msgstr "Sastanak nije ispravan i ne može biti ažuriran"
 
-#: ../src/modules/itip-formatter/itip-view.c:5291
+#: ../src/modules/itip-formatter/itip-view.c:5578
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Status učesnika nije ažuriran zbog neispravnog stanja"
 
-#: ../src/modules/itip-formatter/itip-view.c:5362
-#: ../src/modules/itip-formatter/itip-view.c:5400
+#: ../src/modules/itip-formatter/itip-view.c:5653
+#: ../src/modules/itip-formatter/itip-view.c:5691
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Status učesnika nije osvežen jer stavka više ne postoji"
 
-#: ../src/modules/itip-formatter/itip-view.c:5461
+#: ../src/modules/itip-formatter/itip-view.c:5752
 msgid "Meeting information sent"
 msgstr "Podatak o sastanku je poslat"
 
-#: ../src/modules/itip-formatter/itip-view.c:5466
+#: ../src/modules/itip-formatter/itip-view.c:5757
 msgid "Task information sent"
 msgstr "Podatak o zadatku je poslat"
 
-#: ../src/modules/itip-formatter/itip-view.c:5471
+#: ../src/modules/itip-formatter/itip-view.c:5762
 msgid "Memo information sent"
 msgstr "Podatak o belešci je poslat"
 
-#: ../src/modules/itip-formatter/itip-view.c:5482
+#: ../src/modules/itip-formatter/itip-view.c:5773
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Ne mogu da pošaljem podatak o sastanku, sastanak ne postoji"
 
-#: ../src/modules/itip-formatter/itip-view.c:5487
+#: ../src/modules/itip-formatter/itip-view.c:5778
 msgid "Unable to send task information, the task does not exist"
 msgstr "Ne mogu da pošaljem podatak o zadatku, zaduženje ne postoji"
 
-#: ../src/modules/itip-formatter/itip-view.c:5492
+#: ../src/modules/itip-formatter/itip-view.c:5783
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Ne mogu da pošaljem podatak o belešci, beleška ne postoji"
 
 #. Translators: This is a default filename for a calendar.
-#: ../src/modules/itip-formatter/itip-view.c:5557
+#: ../src/modules/itip-formatter/itip-view.c:5828
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../src/modules/itip-formatter/itip-view.c:5562
+#: ../src/modules/itip-formatter/itip-view.c:5833
 msgid "Save Calendar"
 msgstr "Sačuvaj kalendar"
 
-#: ../src/modules/itip-formatter/itip-view.c:5611
-#: ../src/modules/itip-formatter/itip-view.c:5624
+#: ../src/modules/itip-formatter/itip-view.c:5881
+#: ../src/modules/itip-formatter/itip-view.c:5894
 msgid "The calendar attached is not valid"
 msgstr "Priložen kalendar nije ispravan"
 
-#: ../src/modules/itip-formatter/itip-view.c:5612
-#: ../src/modules/itip-formatter/itip-view.c:5625
+#: ../src/modules/itip-formatter/itip-view.c:5882
+#: ../src/modules/itip-formatter/itip-view.c:5895
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -23460,15 +24357,15 @@ msgstr ""
 "Poruka prijavljuje da sadrži kalendar, ali taj kalendar nije ispravan "
 "iKalendar."
 
-#: ../src/modules/itip-formatter/itip-view.c:5667
-#: ../src/modules/itip-formatter/itip-view.c:5748
-#: ../src/modules/itip-formatter/itip-view.c:5844
+#: ../src/modules/itip-formatter/itip-view.c:5977
+#: ../src/modules/itip-formatter/itip-view.c:6061
+#: ../src/modules/itip-formatter/itip-view.c:6165
 msgid "The item in the calendar is not valid"
 msgstr "Stavka u kalendaru nije ispravna"
 
-#: ../src/modules/itip-formatter/itip-view.c:5668
-#: ../src/modules/itip-formatter/itip-view.c:5749
-#: ../src/modules/itip-formatter/itip-view.c:5845
+#: ../src/modules/itip-formatter/itip-view.c:5978
+#: ../src/modules/itip-formatter/itip-view.c:6062
+#: ../src/modules/itip-formatter/itip-view.c:6166
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -23476,11 +24373,11 @@ msgstr ""
 "Poruka sadrži kalendar, ali on ne sadrži događaje, zadatke ili podatke "
 "slobodno/zauzeto"
 
-#: ../src/modules/itip-formatter/itip-view.c:5758
+#: ../src/modules/itip-formatter/itip-view.c:6071
 msgid "The calendar attached contains multiple items"
 msgstr "Kalendar u prilogu sadrži više stavki"
 
-#: ../src/modules/itip-formatter/itip-view.c:5759
+#: ../src/modules/itip-formatter/itip-view.c:6072
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -23492,26 +24389,14 @@ msgstr ""
 # When "None" is selected we want the field to be cleared.
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
-#: ../src/modules/itip-formatter/itip-view.c:6276
+#: ../src/modules/itip-formatter/itip-view.c:6659
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ništa"
 
-#: ../src/modules/itip-formatter/itip-view.c:6292
+#: ../src/modules/itip-formatter/itip-view.c:6677
 msgid "Tentatively Accepted"
-msgstr "Prihvaćeno s rezervom"
-
-#: ../src/modules/itip-formatter/itip-view.c:6460
-msgid "This meeting recurs"
-msgstr "Ovaj sastanak se ponavlja"
-
-#: ../src/modules/itip-formatter/itip-view.c:6463
-msgid "This task recurs"
-msgstr "Ovaj zadatak se ponavlja"
-
-#: ../src/modules/itip-formatter/itip-view.c:6466
-msgid "This memo recurs"
-msgstr "Ova beleška se ponavlja"
+msgstr "Prihvaćeno, ali upitno"
 
 #: ../src/modules/itip-formatter/org-gnome-itip-formatter.error.xml.h:1
 msgid ""
@@ -23617,41 +24502,42 @@ msgstr "Izaberite direktorijum mboks pripreme"
 msgid "Mbox spool directory cannot be empty"
 msgstr "Direktorijum pripreme Msandučeta ne može biti prazan"
 
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:198
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:199
 #: ../src/modules/mail-config/e-mail-config-sendmail-backend.c:59
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:154
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:156
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:155
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:193
+#: ../src/plugins/mail-notification/mail-notification.c:1220
 msgid "Configuration"
 msgstr "Podešavanje"
 
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:230
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:185
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:231
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:186
 msgid "_Port:"
 msgstr "_Port:"
 
 #. do not reference
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:251
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:313
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:252
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:314
 msgid "User_name:"
 msgstr "Korisničko_ime:"
 
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:265
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:327
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:266
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:328
 msgid "_Forget password"
 msgstr "_Zaboravi lozinku"
 
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:291
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:234
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:292
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:235
 msgid "Encryption _method:"
 msgstr "Način _šifrovanja:"
 
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:306
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:249
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:307
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:250
 msgid "STARTTLS after connecting"
 msgstr "STARTTLS nakon povezivanja"
 
-#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:310
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:253
+#: ../src/modules/mail-config/e-mail-config-remote-accounts.c:311
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:254
 msgid "TLS on a dedicated port"
 msgstr "TLS na dodeljenom priključniku"
 
@@ -23690,11 +24576,11 @@ msgid "Custom binary cannot be empty"
 msgstr "Proizvoljni izvršni ne može biti prazan"
 
 #. do not reference
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:206
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:207
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver traži potvrđivanje identiteta"
 
-#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:295
+#: ../src/modules/mail-config/e-mail-config-smtp-backend.c:296
 msgid "T_ype:"
 msgstr "_Vrsta:"
 
@@ -23744,51 +24630,58 @@ 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:733
+#: ../src/modules/mail/e-mail-shell-backend.c:782
 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:736
+#: ../src/modules/mail/e-mail-shell-backend.c:785
 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:739
+#: ../src/modules/mail/e-mail-shell-backend.c:788
 msgctxt "NetworkMonitor"
 msgid "networkmanager"
 msgstr "upravnik veze"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:769
+#: ../src/modules/mail/e-mail-shell-backend.c:818
 msgctxt "NetworkMonitor"
 msgid "Method to detect _online state:"
 msgstr "Način za _otkrivanje stanja na mreži:"
 
+#. Translators: The '%s' is replaced with the actual name of the GNetworkMonitor implementation
+#: ../src/modules/mail/e-mail-shell-backend.c:829
+#, c-format
+msgctxt "NetworkMonitor"
+msgid "Default (%s)"
+msgstr "Podrazumevano (%s)"
+
 #. Always as the first
-#: ../src/modules/mail/e-mail-shell-backend.c:778
+#: ../src/modules/mail/e-mail-shell-backend.c:833
 msgctxt "NetworkMonitor"
 msgid "Default"
 msgstr "Osnovno"
 
 #. Always as the last
-#: ../src/modules/mail/e-mail-shell-backend.c:792
+#: ../src/modules/mail/e-mail-shell-backend.c:850
 msgctxt "NetworkMonitor"
 msgid "Always Online"
 msgstr "Uvek na mreži"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:861
+#: ../src/modules/mail/e-mail-shell-backend.c:919
 msgid "Mail Preferences"
 msgstr "Postavke pošte"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:870
+#: ../src/modules/mail/e-mail-shell-backend.c:928
 msgid "Composer Preferences"
 msgstr "Postavke sastavljača"
 
-#: ../src/modules/mail/e-mail-shell-backend.c:879
+#: ../src/modules/mail/e-mail-shell-backend.c:937
 msgid "Network Preferences"
 msgstr "Postavke mreže"
 
@@ -23799,396 +24692,393 @@ 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:1240
+#: ../src/modules/mail/e-mail-shell-backend.c:1298
 msgctxt "label"
 msgid "None"
 msgstr "Ništa"
 
-#: ../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:853
+msgid "Marking messages as read…"
+msgstr "Označavam da su poruke pročitane…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1140
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1258
 msgid "Go to Folder"
 msgstr "Idi u fasciklu"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1144
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1262
 msgid "_Select"
 msgstr "_Izaberi"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1622
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1572
 msgid "_Disable Account"
 msgstr "_Onemogući nalog"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1624
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1574
 msgid "Disable this account"
 msgstr "Isključite ovaj nalog"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1631
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1581
 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:1636
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1586
 msgid "Empty _Junk"
 msgstr "Isprazni _đubre"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1638
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1588
 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:1645
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1595
 msgid "Edit properties of this account"
 msgstr "Izmenite osobine ovog naloga"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1652
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1602
 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:1657
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1607
 msgid "_Download Messages for Offline Usage"
 msgstr "_Preuzmi poruke za rad van mreže"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1659
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1609
 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:1664
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1614
 msgid "Fl_ush Outbox"
 msgstr "Is_prazni „Za slanje“"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1671
-msgid "_Copy Folder To..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1621
+msgid "_Copy Folder To…"
 msgstr "_Kopiraj fasciklu u…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1623
 msgid "Copy the selected folder into another folder"
 msgstr "Kopira izabranu fasciklu u drugu fasciklu"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1680
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1630
 msgid "Permanently remove this folder"
 msgstr "Trajno uklonite ovu fasciklu"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1685
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1635
+msgid "Edit Sort _Order…"
+msgstr "Izmeni _redosled prikaza…"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1637
+msgid "Change sort order of the folders in the folder tree"
+msgstr "Promeni redosled ređanja fascikli unutar stabla"
+
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1642
 msgid "E_xpunge"
 msgstr "Izba_ci"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1687
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1644
 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:1692
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1800
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1649
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1741
 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:1694
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1802
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1651
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1743
 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:1699
-msgid "_Move Folder To..."
-msgstr "_Premesti fasciklu u…"
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1656
+msgid "_Move Folder To…"
+msgstr "Pre_mesti fasciklu u…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1658
 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:1707
-msgid "_New..."
-msgstr "_Novo…"
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1664
+msgid "_New…"
+msgstr "_Nova…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1709
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1666
 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:1716
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1673
 msgid "Change the properties of this folder"
 msgstr "Izmenite osobine ove fascikle"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1723
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1680
 msgid "Refresh the folder"
 msgstr "Osvežite fasciklu"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1730
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1687
 msgid "Change the name of this folder"
 msgstr "Promenite naziv ove fascikle"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1735
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1692
 msgid "Select Message _Thread"
 msgstr "Izaberi _raspravu"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1737
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1694
 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:1742
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1699
 msgid "Select Message S_ubthread"
 msgstr "Izaberi p_odniz poruke"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1744
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1701
 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:1756
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1713
 msgid "Empty _Trash"
 msgstr "Izbaci _smeće"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1758
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1715
 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:1763
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1720
 msgid "Go to _Folder"
 msgstr "Idi u _fasciklu"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1765
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1722
 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:1770
-msgid "_New Label"
-msgstr "_Nova oznaka"
-
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# When "None" is selected we want the field to be cleared.
-# Note that we don't show this here, since by default a 'None' date
-# is not permitted.
-#. Translators: "None" 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:1779
-msgid "N_one"
-msgstr "N_išta"
-
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1793
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1734
 msgid "_Manage Subscriptions"
 msgstr "_Upravljaj prijavama"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1795
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1879
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1736
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1820
 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:1807
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1828
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1748
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1769
 msgid "Send / _Receive"
 msgstr "Slanje / p_rimanje"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1809
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1750
 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:1814
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1755
 msgid "R_eceive All"
 msgstr "P_rimi sve"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1816
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1757
 msgid "Receive new items from all accounts"
 msgstr "Primite nove stavke sa svih naloga"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1821
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1762
 msgid "_Send All"
 msgstr "P_ošalji sve"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1823
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1764
 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:1851
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1792
 msgid "Cancel the current mail operation"
 msgstr "Otkažite trenutnu operaciju sa poštom"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1856
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1797
 msgid "Collapse All _Threads"
 msgstr "Skupi sve _rasprave"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1858
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1799
 msgid "Collapse all message threads"
 msgstr "Skupite celokupno grananje rasprava"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1863
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1804
 msgid "E_xpand All Threads"
 msgstr "Razgranaj sve ra_sprave"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1865
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1806
 msgid "Expand all message threads"
 msgstr "Razgranajte sve poruke u raspravama"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1870
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1811
 msgid "_Message Filters"
-msgstr "_Propusnici poruka"
+msgstr "_Filteri poruka"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1872
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1813
 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:1877
-msgid "_Subscriptions..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1818
+msgid "_Subscriptions…"
 msgstr "_Prijave…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1886
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1827
 msgid "F_older"
 msgstr "_Fascikla"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1893
-msgid "_Label"
-msgstr "_Natpis"
-
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1910
-msgid "C_reate Search Folder From Search..."
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1844
+msgid "C_reate Search Folder From Search…"
 msgstr "Napravi _fasciklu pretrage iz pretrage…"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1917
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1851
 msgid "Search F_olders"
 msgstr "Fas_cikle pretrage"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1919
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1853
 msgid "Create or edit search folder definitions"
 msgstr "Napravite ili uredite definicije fascikle pretrage"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1962
-msgid "_New Folder..."
-msgstr "_Nova fascikla…"
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1896
+msgid "_New Folder…"
+msgstr "_Nova fascikla "
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1990
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1924
 msgid "Show Message _Preview"
 msgstr "Prika_ži pregled poruke"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1992
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1926
 msgid "Show message preview pane"
 msgstr "Prikažite pregled poruke"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:1998
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1932
 msgid "Show _Attachment Bar"
 msgstr "Prikaži traku _priloga"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2000
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1934
 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:2006
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1940
 msgid "Show _Deleted Messages"
 msgstr "Prikaži o_brisane poruke"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2008
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1942
 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:2014
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1948
 msgid "Show _Junk Messages"
 msgstr "Prikaži _nepoželjne poruke"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2016
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1950
 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:2022
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1956
 msgid "_Group By Threads"
 msgstr "Grupiši po _raspravama"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2024
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1958
 msgid "Threaded message list"
 msgstr "Spisak poruka po temama"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2030
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1964
 msgid "Show To _Do Bar"
 msgstr "Prikaži traku sa _zadacima"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2032
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1966
 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:2038
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1972
 msgid "_Unmatched Folder Enabled"
 msgstr "Uključena _nepoklopljena fascikla"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2040
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1974
 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:2060
+#: ../src/modules/mail/e-mail-shell-view-actions.c:1994
 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:2067
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2001
 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:2075
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2009
 msgid "All Messages"
 msgstr "Sve poruke"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2082
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2016
 msgid "Important Messages"
 msgstr "Važne poruke"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2089
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2023
 msgid "Last 5 Days’ Messages"
 msgstr "Poruke u proteklih 5 dana"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2096
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2030
 msgid "Messages Not Junk"
 msgstr "Poruke nisu đubre"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2103
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2037
 msgid "Messages with Attachments"
 msgstr "Poruke sa prilozima"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2110
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2044
 msgid "Messages with Notes"
 msgstr "Poruke sa beleškama"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2117
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2051
 msgid "No Label"
 msgstr "Bez oznake"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2124
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2058
 msgid "Read Messages"
 msgstr "Pročitane poruke"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2131
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2065
 msgid "Unread Messages"
 msgstr "Nepročitane poruke"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2138
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2072
 msgid "Message Thread"
 msgstr "Tema poruke"
 
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2198
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2132
 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:2208
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2142
 msgid "All Accounts"
 msgstr "svim nalozima"
 
 # bug: requires a comment on usage
-#: ../src/modules/mail/e-mail-shell-view-actions.c:2215
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2149
 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:2222
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2156
 msgid "Current Folder"
 msgstr "tekućoj fascikli"
 
-#: ../src/modules/mail/e-mail-shell-view.c:777
+#: ../src/modules/mail/e-mail-shell-view-actions.c:2163
+msgid "Current Folder and Subfolders"
+msgstr "U trenutnoj fascikli i podfasciklama"
+
+#: ../src/modules/mail/e-mail-shell-view.c:895
+msgid "Current Folder and Subfolders Search"
+msgstr "U trenutnoj fascikli i podfasciklama pretrage"
+
+#: ../src/modules/mail/e-mail-shell-view.c:1017
 msgid "All Account Search"
 msgstr "Pretraga svih naloga"
 
-#: ../src/modules/mail/e-mail-shell-view.c:885
+#: ../src/modules/mail/e-mail-shell-view.c:1127
 msgid "Account Search"
 msgstr "Pretraga naloga"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:929
+#: ../src/modules/mail/e-mail-shell-view-private.c:926
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -24197,8 +25087,8 @@ msgstr[1] "%d izabrane, "
 msgstr[2] "%d izabranih, "
 msgstr[3] "%d izabrana, "
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:944
-#: ../src/modules/mail/e-mail-shell-view-private.c:961
+#: ../src/modules/mail/e-mail-shell-view-private.c:941
+#: ../src/modules/mail/e-mail-shell-view-private.c:958
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -24207,8 +25097,8 @@ msgstr[1] "%d obrisane"
 msgstr[2] "%d obrisanih"
 msgstr[3] "%d obrisana"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:975
-#: ../src/modules/mail/e-mail-shell-view-private.c:981
+#: ../src/modules/mail/e-mail-shell-view-private.c:972
+#: ../src/modules/mail/e-mail-shell-view-private.c:978
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -24217,7 +25107,7 @@ msgstr[1] "%d nepoželjne"
 msgstr[2] "%d nepoželjnih"
 msgstr[3] "%d nepoželjna"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:988
+#: ../src/modules/mail/e-mail-shell-view-private.c:985
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -24226,7 +25116,7 @@ msgstr[1] "%d nacrta"
 msgstr[2] "%d nacrta"
 msgstr[3] "%d nacrt"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:994
+#: ../src/modules/mail/e-mail-shell-view-private.c:991
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -24235,7 +25125,7 @@ msgstr[1] "%d neposlate"
 msgstr[2] "%d neposlatih"
 msgstr[3] "%d neposlata"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:1000
+#: ../src/modules/mail/e-mail-shell-view-private.c:997
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -24244,7 +25134,7 @@ msgstr[1] "%d poslate"
 msgstr[2] "%d poslatih"
 msgstr[3] "%d poslata"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:1017
+#: ../src/modules/mail/e-mail-shell-view-private.c:1014
 #, c-format
 msgid "%d unread"
 msgid_plural "%d unread"
@@ -24253,38 +25143,42 @@ msgstr[1] "%d nepročitane"
 msgstr[2] "%d nepročitanih"
 msgstr[3] "%d nepročitana"
 
-#: ../src/modules/mail/e-mail-shell-view-private.c:1535
+#: ../src/modules/mail/e-mail-shell-view-private.c:1532
 msgid "Send / Receive"
 msgstr "Pošalji / Primi"
 
-#: ../src/modules/mail/em-composer-prefs.c:419
+#: ../src/modules/mail/em-composer-prefs.c:420
 msgid "Select Folder to Add"
 msgstr "Izaberite fasciklu za dodavanje"
 
-#: ../src/modules/mail/em-composer-prefs.c:895
+#: ../src/modules/mail/em-composer-prefs.c:896
 msgid "Folder"
 msgstr "Fascikla"
 
-#: ../src/modules/mail/em-composer-prefs.c:931
+#: ../src/modules/mail/em-composer-prefs.c:932
 msgid "Recipient"
 msgstr "Primalac"
 
-#: ../src/modules/mail/em-composer-prefs.c:1222
+#: ../src/modules/mail/em-composer-prefs.c:1223
 msgid "Keep in Outbox"
 msgstr "Zadrži u „Za slanje“"
 
-#: ../src/modules/mail/em-composer-prefs.c:1223
+#: ../src/modules/mail/em-composer-prefs.c:1224
 msgid "Send immediately"
 msgstr "Odmah pošalji"
 
-#: ../src/modules/mail/em-composer-prefs.c:1224
+#: ../src/modules/mail/em-composer-prefs.c:1225
 msgid "Send after 5 minutes"
 msgstr "Pošalji nakon 5 minuta"
 
-#: ../src/modules/mail/em-composer-prefs.c:1309
+#: ../src/modules/mail/em-composer-prefs.c:1310
 msgid "Language(s)"
 msgstr "Jezik(ci)"
 
+#: ../src/modules/mail/em-composer-prefs.c:1340
+msgid "Same as user interface"
+msgstr "Kao u korisničkom okruženju"
+
 # bug: requires a comment on usage
 # slično kao za mesece i nedelje
 #: ../src/modules/mail/em-mailer-prefs.c:77
@@ -24310,20 +25204,20 @@ msgstr "Jednom tokom meseca"
 msgid "Immediately, on folder leave"
 msgstr "Odmah, pri napuštanju fascikle"
 
-#: ../src/modules/mail/em-mailer-prefs.c:418
+#: ../src/modules/mail/em-mailer-prefs.c:436
 msgid "Header"
 msgstr "Zaglavlje"
 
-#: ../src/modules/mail/em-mailer-prefs.c:422
+#: ../src/modules/mail/em-mailer-prefs.c:440
 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:1570
+#: ../src/modules/mail/em-mailer-prefs.c:1698
 msgid "_Date header:"
 msgstr "Zaglavlje _datuma:"
 
-#: ../src/modules/mail/em-mailer-prefs.c:1571
+#: ../src/modules/mail/em-mailer-prefs.c:1699
 msgid "Show _original header value"
 msgstr "Prikaži _originalnu vrednost zaglavlja"
 
@@ -24394,28 +25288,28 @@ msgstr ""
 msgid "Author(s)"
 msgstr "Autor(i)"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:251
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:303
 msgid "Plugin Manager"
 msgstr "Upravnik priključaka"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:266
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:318
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Napomena: neke izmene neće biti uključene pre ponovnog pokretanja"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:294
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:346
 msgid "Overview"
 msgstr "Pregled"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:363
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:446
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:415
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:498
 msgid "Plugin"
 msgstr "Priključak"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:484
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:536
 msgid "_Plugins"
 msgstr "_Priključci"
 
-#: ../src/modules/plugin-manager/evolution-plugin-manager.c:485
+#: ../src/modules/plugin-manager/evolution-plugin-manager.c:537
 msgid "Enable and disable plugins"
 msgstr "Uključuje i isključuje dodatke"
 
@@ -24508,7 +25402,7 @@ msgstr "Pregleda poruke kao običan tekst, čak i ako sadrže HTML."
 #: ../src/modules/spamassassin/evolution-spamassassin.c:188
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
-msgstr "Ne mogu da izrodim Ubicu spama (%s): "
+msgstr "Ne mogu da pokrenem Ubicu spama (%s): "
 
 #: ../src/modules/spamassassin/evolution-spamassassin.c:211
 msgid "Failed to stream mail message content to SpamAssassin: "
@@ -24564,7 +25458,7 @@ msgstr "Uvoženje je otkazano."
 msgid "Import complete."
 msgstr "Uvoženje je završeno."
 
-#: ../src/modules/startup-wizard/e-startup-assistant.c:158
+#: ../src/modules/startup-wizard/e-startup-assistant.c:186
 msgid ""
 "Welcome to Evolution.\n"
 "\n"
@@ -24576,27 +25470,40 @@ 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/e-startup-assistant.c:165
+#: ../src/modules/startup-wizard/e-startup-assistant.c:193
 msgid "Do not _show this wizard again"
 msgstr "Ne pr_ikazuj više ovog čarobnjaka"
 
+#. Translators: This is part of "Alternatively, you can %s (email, contacts and calendaring) instead." 
sentence from the same translation context.
+#: ../src/modules/startup-wizard/e-startup-assistant.c:206
+msgctxt "wizard-ca-note"
+msgid "create a collection account"
+msgstr "napravi zbirni nalog"
+
+#. Translators: The '%s' is replaced with "create a collection account" from the same translation context.
+#: ../src/modules/startup-wizard/e-startup-assistant.c:208
+#, c-format
+msgctxt "wizard-ca-note"
+msgid "Alternatively, you can %s (email, contacts and calendaring) instead."
+msgstr "Umesto ovoga možete %s (e-pošta, kontakt i kalendar)."
+
 #: ../src/modules/startup-wizard/evolution-startup-wizard.c:212
-msgid "Loading accounts..."
+msgid "Loading accounts…"
 msgstr "Učitavam naloge…"
 
 #: ../src/modules/text-highlight/e-mail-display-popup-text-highlight.c:93
-msgid "_Format as..."
-msgstr "Oblikuj _kao…"
+msgid "_Format as…"
+msgstr "_Formatiraj 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:453
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:493
 msgid "Text Highlight"
 msgstr "Isticanje teksta"
 
-#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:454
+#: ../src/modules/text-highlight/e-mail-formatter-text-highlight.c:494
 msgid "Syntax highlighting of mail parts"
 msgstr "Isticanje sadržaja delova pošte"
 
@@ -24850,8 +25757,8 @@ msgstr "Prikažite delove kao kontakt imenika"
 msgid "_Do not show this message again."
 msgstr "_Ne prikazuj ponovo ovu poruku."
 
-#: ../src/plugins/attachment-reminder/attachment-reminder.c:570
-#: ../src/plugins/templates/templates.c:488
+#: ../src/plugins/attachment-reminder/attachment-reminder.c:571
+#: ../src/plugins/templates/templates.c:489
 msgid "Keywords"
 msgstr "Ključne reči"
 
@@ -24883,35 +25790,40 @@ msgstr "Podsetnik priloga"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "Podseća kada zaboravite da dodate prilog u poruku."
 
-#: ../src/plugins/bbdb/bbdb.c:735 ../src/plugins/bbdb/bbdb.c:846
+#: ../src/plugins/bbdb/bbdb.c:756 ../src/plugins/bbdb/bbdb.c:879
 #: ../src/plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatski kontakti"
 
 #. Enable BBDB checkbox
-#: ../src/plugins/bbdb/bbdb.c:750
+#: ../src/plugins/bbdb/bbdb.c:771
 msgid "Create _address book entries when sending mails"
 msgstr "Napravi unose u _imenik pri slanju pošte"
 
-#: ../src/plugins/bbdb/bbdb.c:760
+#. File Under setting
+#: ../src/plugins/bbdb/bbdb.c:782
+msgid "Set File _under as “First Last”, instead of “Last, First”"
+msgstr "Postavi _Smesti pod kao „Prvi Poslednji“, umesto „Prvi, Poslednji“."
+
+#: ../src/plugins/bbdb/bbdb.c:793
 msgid "Select Address book for Automatic Contacts"
 msgstr "Izaberi imenik za Automatske kontakte"
 
-#: ../src/plugins/bbdb/bbdb.c:780
+#: ../src/plugins/bbdb/bbdb.c:813
 msgid "Instant Messaging Contacts"
 msgstr "Kontakti trenutnih poruka"
 
 #. Enable Gaim Checkbox
-#: ../src/plugins/bbdb/bbdb.c:795
+#: ../src/plugins/bbdb/bbdb.c:828
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "_Usklađuje slike i podatke kontakta sa listom drugara iz Pidžina"
 
-#: ../src/plugins/bbdb/bbdb.c:805
+#: ../src/plugins/bbdb/bbdb.c:838
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Bira imenik za listu prijatelja Pidžina"
 
 #. Synchronize now button.
-#: ../src/plugins/bbdb/bbdb.c:821
+#: ../src/plugins/bbdb/bbdb.c:854
 msgid "Synchronize with _buddy list now"
 msgstr "Uskladi sa _listom drugara sada"
 
@@ -24949,7 +25861,7 @@ msgstr "Lične fascikle Autluk Ekspresa 5/6 (.pst)"
 msgid "Import Outlook Express messages from DBX file"
 msgstr "Uvozi poruke Autluk Ekspresa iz DBH datoteke"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:291
+#: ../src/plugins/email-custom-header/email-custom-header.c:292
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Sigurnost:"
@@ -24957,32 +25869,32 @@ msgstr "Sigurnost:"
 # Create the default Person calendar
 # Create the default Person task list
 # orange
-#: ../src/plugins/email-custom-header/email-custom-header.c:295
+#: ../src/plugins/email-custom-header/email-custom-header.c:296
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "Lično"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:296
+#: ../src/plugins/email-custom-header/email-custom-header.c:297
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "Nerazvrstano"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:297
+#: ../src/plugins/email-custom-header/email-custom-header.c:298
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "Zaštićeno"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:298
+#: ../src/plugins/email-custom-header/email-custom-header.c:299
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "Poverljivo"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:299
+#: ../src/plugins/email-custom-header/email-custom-header.c:300
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Tajno"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:300
+#: ../src/plugins/email-custom-header/email-custom-header.c:301
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Strogo poverljivo"
@@ -24994,17 +25906,17 @@ msgstr "Strogo poverljivo"
 # is not permitted.
 #. Translators: "None" as an email custom header option in a dialog invoked by Insert->Custom Header from 
Composer,
 #. * indicating the header will not be added to a mail message
-#: ../src/plugins/email-custom-header/email-custom-header.c:360
+#: ../src/plugins/email-custom-header/email-custom-header.c:361
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "Ništa"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:537
+#: ../src/plugins/email-custom-header/email-custom-header.c:538
 msgid "_Custom Header"
 msgstr "_Prilagođeno zaglavlje"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the 
format of the key values
-#: ../src/plugins/email-custom-header/email-custom-header.c:807
+#: ../src/plugins/email-custom-header/email-custom-header.c:808
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by “;”."
@@ -25012,12 +25924,12 @@ msgstr ""
 "Format za navođenje ključa prilagođenog zaglavlja je:\n"
 "Vrednosti naziv ključa prilagođenog zaglavlja su razdvojeni sa „;“."
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:860
+#: ../src/plugins/email-custom-header/email-custom-header.c:862
 msgid "Key"
 msgstr "Ključ"
 
-#: ../src/plugins/email-custom-header/email-custom-header.c:877
-#: ../src/plugins/templates/templates.c:497
+#: ../src/plugins/email-custom-header/email-custom-header.c:879
+#: ../src/plugins/templates/templates.c:498
 msgid "Values"
 msgstr "Vrednosti"
 
@@ -25099,27 +26011,27 @@ msgstr ""
 "Pokrenut je spoljni uređivač. Prozor sastavljača poruke nije moguće zatvoriti "
 "dok je aktivan uređivač."
 
-#: ../src/plugins/face/face.c:292
+#: ../src/plugins/face/face.c:295
 msgid "Select a Face Picture"
 msgstr "Izaberite sliku lica"
 
-#: ../src/plugins/face/face.c:302
+#: ../src/plugins/face/face.c:301
 msgid "Image files"
 msgstr "Datoteke slika"
 
-#: ../src/plugins/face/face.c:390
+#: ../src/plugins/face/face.c:389
 msgid "_Insert Face picture by default"
 msgstr "_Unapred umetni sliku kontakta"
 
-#: ../src/plugins/face/face.c:403
+#: ../src/plugins/face/face.c:402
 msgid "Load new _Face picture"
 msgstr "Učitaj novu _sliku kontakta"
 
-#: ../src/plugins/face/face.c:447
+#: ../src/plugins/face/face.c:446
 msgid "Change Face Image"
 msgstr "Menja postojeću sliku kontakta"
 
-#: ../src/plugins/face/face.c:535
+#: ../src/plugins/face/face.c:534
 msgid "Include _Face"
 msgstr "Uključi _sliku"
 
@@ -25194,7 +26106,7 @@ msgstr "Pribavlja podatke o korišćenju liste kojoj ova poruka pripada"
 
 #: ../src/plugins/mailing-list-actions/mailing-list-actions.c:438
 msgid "Contact List _Owner"
-msgstr "_Vlasnik kontakt liste"
+msgstr "_Vlasnik spiska kontakta"
 
 #: ../src/plugins/mailing-list-actions/mailing-list-actions.c:440
 msgid "Contact the owner of the mailing list this message belongs to"
@@ -25314,8 +26226,7 @@ msgstr ""
 "Zaglavlje: {0}"
 
 #. Translators: '%d' is the count of mails received.
-#: ../src/plugins/mail-notification/mail-notification.c:401
-#: ../src/plugins/mail-notification/mail-notification.c:437
+#: ../src/plugins/mail-notification/mail-notification.c:462
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -25326,91 +26237,111 @@ 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:412
+#: ../src/plugins/mail-notification/mail-notification.c:471
 #, 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:426
+#: ../src/plugins/mail-notification/mail-notification.c:485
 #, c-format
 msgid "Subject: %s"
 msgstr "Naslov: %s"
 
+#. Translators: %d is the count of mails received in addition
+#. * to the one displayed in this notification.
+#: ../src/plugins/mail-notification/mail-notification.c:501
+#, c-format
+msgid "(and %d more)"
+msgid_plural "(and %d more)"
+msgstr[0] "(i još %d)"
+msgstr[1] "(i još %d)"
+msgstr[2] "(i još %d)"
+msgstr[3] "(i još %d)"
+
 # shell:noshell-reason title
-#: ../src/plugins/mail-notification/mail-notification.c:443
+#: ../src/plugins/mail-notification/mail-notification.c:513
 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:483
+#: ../src/plugins/mail-notification/mail-notification.c:553
 #, c-format
 msgid "Show %s"
 msgstr "Prikaži %s"
 
-#: ../src/plugins/mail-notification/mail-notification.c:687
+#: ../src/plugins/mail-notification/mail-notification.c:792
 msgid "_Play sound when a new message arrives"
 msgstr "Zvučno _obavesti kada stigne nova poruka"
 
-#: ../src/plugins/mail-notification/mail-notification.c:719
+#: ../src/plugins/mail-notification/mail-notification.c:824
 msgid "_Beep"
 msgstr "_Zapišti"
 
-#: ../src/plugins/mail-notification/mail-notification.c:732
+#: ../src/plugins/mail-notification/mail-notification.c:837
 msgid "Use sound _theme"
 msgstr "Koristi zvuk _teme"
 
-#: ../src/plugins/mail-notification/mail-notification.c:751
+#: ../src/plugins/mail-notification/mail-notification.c:856
 msgid "Play _file:"
 msgstr "Pusti zvučnu _datoteku:"
 
-#: ../src/plugins/mail-notification/mail-notification.c:760
+#: ../src/plugins/mail-notification/mail-notification.c:865
 msgid "Select sound file"
 msgstr "Izaberite zvučnu datoteku"
 
-#: ../src/plugins/mail-notification/mail-notification.c:837
+#: ../src/plugins/mail-notification/mail-notification.c:1014
+msgid "Select _accounts for which enable notifications:"
+msgstr "Izaberite _naloge sa kojih se prikazuju obaveštenja:"
+
+#: ../src/plugins/mail-notification/mail-notification.c:1176
+#: ../src/plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
+msgid "Mail Notification"
+msgstr "Obaveštenje o pošti"
+
+#: ../src/plugins/mail-notification/mail-notification.c:1190
 msgid "Notify new messages for _Inbox only"
 msgstr "Obavesti o novim porukama samo za _Sanduče"
 
-#: ../src/plugins/mail-notification/mail-notification.c:853
+#: ../src/plugins/mail-notification/mail-notification.c:1206
 msgid "Show _notification when a new message arrives"
 msgstr "Prikaži _obaveštenje kada pristigne nova poruka"
 
-#: ../src/plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:1
-msgid "Mail Notification"
-msgstr "Obaveštenje o pošti"
+#: ../src/plugins/mail-notification/mail-notification.c:1224
+msgid "Accounts"
+msgstr "Nalozi"
 
 #: ../src/plugins/mail-notification/org-gnome-mail-notification.eplug.xml.h:2
 msgid "Notifies you when new mail messages arrive."
 msgstr "Obaveštava vas kada stigne nova poruka."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../src/plugins/mail-to-task/mail-to-task.c:200
+#: ../src/plugins/mail-to-task/mail-to-task.c:198
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Sačinjeno iz poruke koju šalje %s"
 
 #. Translators: Dialog button to Cancel edit of an existing event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:605
+#: ../src/plugins/mail-to-task/mail-to-task.c:600
 msgctxt "mail-to-task"
 msgid "_Cancel"
 msgstr "_Otkaži"
 
 #. Translators: Dialog button to Edit an existing event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:607
+#: ../src/plugins/mail-to-task/mail-to-task.c:602
 msgctxt "mail-to-task"
 msgid "_Edit"
 msgstr "_Uređivanje"
 
 #. Translators: Dialog button to create a New event/memo/task
-#: ../src/plugins/mail-to-task/mail-to-task.c:609
+#: ../src/plugins/mail-to-task/mail-to-task.c:604
 msgctxt "mail-to-task"
 msgid "_New"
 msgstr "_Novi"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:627
+#: ../src/plugins/mail-to-task/mail-to-task.c:622
 #, c-format
 msgid ""
 "Selected calendar contains event “%s” already. Would you like to edit the "
@@ -25419,7 +26350,7 @@ msgstr ""
 "Izabrani kalendar već sadrži događaj „%s“. Želite li da uredite stari "
 "događaj?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:630
+#: ../src/plugins/mail-to-task/mail-to-task.c:625
 #, c-format
 msgid ""
 "Selected task list contains task “%s” already. Would you like to edit the "
@@ -25427,7 +26358,7 @@ msgid ""
 msgstr ""
 "Izabrani spisak već sadrži zadatak „%s“. Želite li da uredite stari zadatak?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:633
+#: ../src/plugins/mail-to-task/mail-to-task.c:628
 #, c-format
 msgid ""
 "Selected memo list contains memo “%s” already. Would you like to edit the "
@@ -25436,7 +26367,7 @@ msgstr ""
 "Izabrani spisak već sadrži belešku „%s“. Želite li da uredite staru belešku?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:653
+#: ../src/plugins/mail-to-task/mail-to-task.c:648
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -25458,7 +26389,7 @@ msgstr[3] ""
 "dodate?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:660
+#: ../src/plugins/mail-to-task/mail-to-task.c:655
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -25480,7 +26411,7 @@ msgstr[3] ""
 "dodate?"
 
 #. Translators: Note there are always more than 10 mails selected
-#: ../src/plugins/mail-to-task/mail-to-task.c:667
+#: ../src/plugins/mail-to-task/mail-to-task.c:662
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -25501,29 +26432,29 @@ msgstr[3] ""
 "Izabrali ste %d pošta da prevedete u beleške. Da li zaista želite sve da ih "
 "dodate?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:688
+#: ../src/plugins/mail-to-task/mail-to-task.c:683
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Da li želite da nastavite sa prevođenjem preostalih pošta?"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:764
+#: ../src/plugins/mail-to-task/mail-to-task.c:759
 msgid "[No Summary]"
 msgstr "[Bez sažetka]"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:777
+#: ../src/plugins/mail-to-task/mail-to-task.c:772
 msgid "Invalid object returned from a server"
 msgstr "Neispravan objekat vraćen sa servera"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:831
+#: ../src/plugins/mail-to-task/mail-to-task.c:826
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Došlo je do greške u obradi: %s"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:869
+#: ../src/plugins/mail-to-task/mail-to-task.c:864
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Ne mogu da otvorim kalendar. %s"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:873
+#: ../src/plugins/mail-to-task/mail-to-task.c:868
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -25531,7 +26462,7 @@ msgstr ""
 "Izabrani kalendar je samo za čitanje, stoga ne možete napraviti događaj. "
 "Izaberite drugi kalendar."
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:876
+#: ../src/plugins/mail-to-task/mail-to-task.c:871
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
@@ -25539,7 +26470,7 @@ msgstr ""
 "Izabrani spisak zadataka je samo za čitanje, stoga ne možete napraviti "
 "zadatak. Izaberite drugi spisak zadataka."
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:879
+#: ../src/plugins/mail-to-task/mail-to-task.c:874
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
@@ -25547,39 +26478,43 @@ msgstr ""
 "Izabrani spisak beleški je samo za čitanje, stoga ne možete napraviti "
 "belešku. Izaberite drugi spisak beleški."
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1301
+#: ../src/plugins/mail-to-task/mail-to-task.c:1299
 msgid "Create an _Appointment"
 msgstr "Napravi _zakazivanje"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1303
+#: ../src/plugins/mail-to-task/mail-to-task.c:1301
 msgid "Create a new event from the selected message"
 msgstr "Pravi novi događaj od izabrane poruke"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1308
+#: ../src/plugins/mail-to-task/mail-to-task.c:1306
 msgid "Create a Mem_o"
 msgstr "Napravi belešk_u"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1310
+#: ../src/plugins/mail-to-task/mail-to-task.c:1308
 msgid "Create a new memo from the selected message"
 msgstr "Pravi novu belešku od izabrane poruke"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1315
+#: ../src/plugins/mail-to-task/mail-to-task.c:1313
 msgid "Create a _Task"
 msgstr "Napravi _zadatak"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1317
+#: ../src/plugins/mail-to-task/mail-to-task.c:1315
 msgid "Create a new task from the selected message"
 msgstr "Pravi novi zadatak od izabrane poruke"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1325
+#: ../src/plugins/mail-to-task/mail-to-task.c:1323
 msgid "Create a _Meeting"
 msgstr "Napravi _sastanak"
 
-#: ../src/plugins/mail-to-task/mail-to-task.c:1327
+#: ../src/plugins/mail-to-task/mail-to-task.c:1325
 msgid "Create a new meeting from the selected message"
 msgstr "Pravi novi sastanak od izabrane poruke"
 
 #: ../src/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:1
+msgid "Mail-to-Task"
+msgstr "Poruka u zadatak"
+
+#: ../src/plugins/mail-to-task/org-gnome-mail-to-task.eplug.xml.h:2
 msgid "Convert a mail message to a task."
 msgstr "Pretvara poruku u zadatak."
 
@@ -25768,80 +26703,80 @@ msgstr "Izmenite mesto"
 #. Translators: the %F %T is the third argument for a
 #. * strftime function.  It lets you define the formatting
 #. * of the date in the csv-file.
-#: ../src/plugins/save-calendar/csv-format.c:158
+#: ../src/plugins/save-calendar/csv-format.c:154
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../src/plugins/save-calendar/csv-format.c:374
+#: ../src/plugins/save-calendar/csv-format.c:363
 msgid "Description List"
 msgstr "Spisak opisa"
 
-#: ../src/plugins/save-calendar/csv-format.c:375
+#: ../src/plugins/save-calendar/csv-format.c:364
 msgid "Categories List"
 msgstr "Spisak kategorija"
 
-#: ../src/plugins/save-calendar/csv-format.c:376
+#: ../src/plugins/save-calendar/csv-format.c:365
 msgid "Comment List"
 msgstr "Spisak komentara"
 
-#: ../src/plugins/save-calendar/csv-format.c:379
+#: ../src/plugins/save-calendar/csv-format.c:368
 msgid "Contact List"
 msgstr "Spisak kontakata"
 
-#: ../src/plugins/save-calendar/csv-format.c:380
+#: ../src/plugins/save-calendar/csv-format.c:369
 msgid "Start"
 msgstr "Početak"
 
-#: ../src/plugins/save-calendar/csv-format.c:381
+#: ../src/plugins/save-calendar/csv-format.c:370
 msgid "End"
 msgstr "Kraj"
 
-#: ../src/plugins/save-calendar/csv-format.c:382
+#: ../src/plugins/save-calendar/csv-format.c:371
 msgid "Due"
 msgstr "Rok"
 
-#: ../src/plugins/save-calendar/csv-format.c:383
+#: ../src/plugins/save-calendar/csv-format.c:372
 msgid "percent Done"
 msgstr "postotak završenog"
 
-#: ../src/plugins/save-calendar/csv-format.c:385
+#: ../src/plugins/save-calendar/csv-format.c:374
 msgid "URL"
 msgstr "Adresa"
 
-#: ../src/plugins/save-calendar/csv-format.c:386
+#: ../src/plugins/save-calendar/csv-format.c:375
 msgid "Attendees List"
 msgstr "Spisak učesnika"
 
-#: ../src/plugins/save-calendar/csv-format.c:388
+#: ../src/plugins/save-calendar/csv-format.c:377
 msgid "Modified"
 msgstr "Izmenjeno"
 
-#: ../src/plugins/save-calendar/csv-format.c:561
+#: ../src/plugins/save-calendar/csv-format.c:537
 msgid "A_dvanced options for the CSV format"
 msgstr "Na_predne opcije za CVS format"
 
-#: ../src/plugins/save-calendar/csv-format.c:569
+#: ../src/plugins/save-calendar/csv-format.c:545
 msgid "Prepend a _header"
 msgstr "Prvo uključi _zaglavlje"
 
-#: ../src/plugins/save-calendar/csv-format.c:578
+#: ../src/plugins/save-calendar/csv-format.c:554
 msgid "_Value delimiter:"
 msgstr "Graničnik _vrednosti:"
 
-#: ../src/plugins/save-calendar/csv-format.c:589
+#: ../src/plugins/save-calendar/csv-format.c:565
 msgid "_Record delimiter:"
 msgstr "Graničnik _zapisa:"
 
-#: ../src/plugins/save-calendar/csv-format.c:600
+#: ../src/plugins/save-calendar/csv-format.c:576
 msgid "_Encapsulate values with:"
 msgstr "_Obavij vrednosti sa:"
 
-#: ../src/plugins/save-calendar/csv-format.c:626
+#: ../src/plugins/save-calendar/csv-format.c:602
 msgid "Comma separated values (.csv)"
 msgstr "Vrednosti razdvojene zarezom (.csv)"
 
 #: ../src/plugins/save-calendar/ical-format.c:181
-#: ../src/shell/e-shell-utils.c:182
+#: ../src/shell/e-shell-utils.c:172
 msgid "iCalendar (.ics)"
 msgstr "iKalendar (.ics)"
 
@@ -25862,15 +26797,15 @@ msgstr "Čuva kalendar ili spisak zadataka na disk."
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../src/plugins/save-calendar/rdf-format.c:383
+#: ../src/plugins/save-calendar/rdf-format.c:373
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../src/plugins/save-calendar/save-calendar.c:117
+#: ../src/plugins/save-calendar/save-calendar.c:116
 msgid "_Format:"
 msgstr "_Format:"
 
-#: ../src/plugins/save-calendar/save-calendar.c:182
+#: ../src/plugins/save-calendar/save-calendar.c:183
 msgid "Select destination file"
 msgstr "Izaberite odredišnu datoteku"
 
@@ -25878,89 +26813,82 @@ msgstr "Izaberite odredišnu datoteku"
 msgid "_Save As"
 msgstr "_Sačuvaj kao"
 
-#: ../src/plugins/save-calendar/save-calendar.c:349
+#: ../src/plugins/save-calendar/save-calendar.c:346
 msgid "Save the selected calendar to disk"
 msgstr "Sačuvaj izabrani kalendar na disk"
 
-#: ../src/plugins/save-calendar/save-calendar.c:380
+#: ../src/plugins/save-calendar/save-calendar.c:385
 msgid "Save the selected memo list to disk"
 msgstr "Sačuvaj izabranu belešku na disk"
 
-#: ../src/plugins/save-calendar/save-calendar.c:411
+#: ../src/plugins/save-calendar/save-calendar.c:424
 msgid "Save the selected task list to disk"
 msgstr "Sačuvaj izabrani spisak zadataka na disk"
 
-#: ../src/plugins/templates/e-templates-store.c:115
-msgid "No Title"
-msgstr "Bez zvanja"
-
 #: ../src/plugins/templates/org-gnome-templates.eplug.xml.h:2
 msgid ""
 "Drafts based template plugin. You can use variables like $ORIG[subject], "
-"$ORIG[from], $ORIG[to] or $ORIG[body], which will be replaced by values from "
-"an email you are replying to."
+"$ORIG[from], $ORIG[to], $ORIG[body], $ORIG[quoted-body] or $ORIG[reply-"
+"credits], which will be replaced by values from an email you are replying to."
 msgstr ""
 "Priključak za obrazac nacrta. Možete da koristite promenljive kao što su "
-"$ORIG[tema], $ORIG[šalje], $ORIG[prima] or $ORIG[poruka], koje će biti "
-"zamenjene vrednostima iz e-pošte na koju odgovarate."
+"$ORIG[naslov], $ORIG[šalje], $ORIG[prima] or $ORIG[poruka], $ORIG[citirana "
+"poruka] or $ORIG[zasluge za odgovor], koje će biti zamenjene vrednostima iz e-"
+"pošte na koju odgovarate."
 
-#: ../src/plugins/templates/templates.c:1299
+#: ../src/plugins/templates/templates.c:878
 msgid "Saving message template"
 msgstr "Čuvam šablon poruke"
 
-#: ../src/plugins/templates/templates.c:1320
+#: ../src/plugins/templates/templates.c:899
 msgid "Save as _Template"
 msgstr "Sačuvaj kao _šablon"
 
-#: ../src/plugins/templates/templates.c:1322
+#: ../src/plugins/templates/templates.c:901
 msgid "Save as Template"
 msgstr "Čuva kao šablon"
 
 #: ../src/shell/e-shell.c:379
-msgid "Preparing to go offline..."
-msgstr "Pripremam se za rad van mreže..."
+msgid "Preparing to go offline…"
+msgstr "Pripremam se za rad van mreže…"
 
 #: ../src/shell/e-shell.c:408
-msgid "Preparing to go online..."
-msgstr "Pripremam se za rad na mreži..."
+msgid "Preparing to go online…"
+msgstr "Pripremam se za rad na mreži…"
 
 #: ../src/shell/e-shell.c:519
 msgid "Preparing to quit"
 msgstr "Pripremam se da izađem"
 
 #: ../src/shell/e-shell.c:525
-msgid "Preparing to quit..."
-msgstr "Pripremam se da izađem..."
+msgid "Preparing to quit…"
+msgstr "Pripremam se da izađem…"
 
-#: ../src/shell/e-shell.c:926
+#: ../src/shell/e-shell.c:1088
 msgid "Open _Settings"
 msgstr "_Otvori podešavanja"
 
-#: ../src/shell/e-shell.c:1127
+#: ../src/shell/e-shell.c:1297
 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:866
+#: ../src/shell/e-shell.c:1464 ../src/shell/e-shell-window-actions.c:891
 msgid "New _Window"
 msgstr "Novi _prozor"
 
-#: ../src/shell/e-shell.c:1308
-msgid "Quick _Reference"
-msgstr "Kratak _podsetnik"
-
-#: ../src/shell/e-shell.c:1310 ../src/shell/e-shell-window-actions.c:796
+#: ../src/shell/e-shell.c:1475 ../src/shell/e-shell-window-actions.c:821
 msgid "_About"
 msgstr "_O programu"
 
-#: ../src/shell/e-shell.c:1311 ../src/shell/e-shell-window-actions.c:901
+#: ../src/shell/e-shell.c:1476 ../src/shell/e-shell-window-actions.c:919
 msgid "_Quit"
 msgstr "_Izađi"
 
-#: ../src/shell/e-shell-content.c:700 ../src/shell/e-shell-content.c:701
+#: ../src/shell/e-shell-content.c:702 ../src/shell/e-shell-content.c:703
 msgid "Searches"
 msgstr "Pretrage"
 
-#: ../src/shell/e-shell-content.c:744
+#: ../src/shell/e-shell-content.c:746
 msgid "Save Search"
 msgstr "Sačuvaj pretragu"
 
@@ -25974,28 +26902,28 @@ msgstr "Prika_ži:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../src/shell/e-shell-searchbar.c:950
+#: ../src/shell/e-shell-searchbar.c:951
 msgid "Sear_ch:"
 msgstr "P_retraži:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../src/shell/e-shell-searchbar.c:1018
+#: ../src/shell/e-shell-searchbar.c:1019
 msgid "i_n"
-msgstr " _u "
+msgstr "_u"
 
-#: ../src/shell/e-shell-utils.c:179
+#: ../src/shell/e-shell-utils.c:169
 msgid "vCard (.vcf)"
 msgstr "vKarta (.vcf)"
 
-#: ../src/shell/e-shell-utils.c:205
+#: ../src/shell/e-shell-utils.c:195
 msgid "All Files (*)"
 msgstr "Sve datoteke (*)"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../src/shell/e-shell-utils.c:419
+#: ../src/shell/e-shell-utils.c:343
 msgid "translator-credits"
 msgstr ""
 "Igor Nestorović <igor prevod org>\n"
@@ -26007,300 +26935,308 @@ msgstr ""
 "\n"
 "http://prevod.org — prevod na srpski jezik."
 
-#: ../src/shell/e-shell-utils.c:430
-msgid "Evolution Website"
-msgstr "Veb stranica Evolucije"
+#: ../src/shell/e-shell-utils.c:354
+msgid "Website"
+msgstr "Veb stranica"
 
-#: ../src/shell/e-shell-view.c:290
+#: ../src/shell/e-shell-view.c:295
 msgid "Saving user interface state"
 msgstr "Čuvam stanje korisničkog sučelja"
 
-#: ../src/shell/e-shell-window-actions.c:293
+#: ../src/shell/e-shell-window-actions.c:311
 msgid "Categories Editor"
 msgstr "Uređivač kategorija"
 
-#: ../src/shell/e-shell-window-actions.c:612
+#: ../src/shell/e-shell-window-actions.c:614
 msgid "Bug Buddy is not installed."
 msgstr "Bubaždajin pomoćnik nije instaliran."
 
-#: ../src/shell/e-shell-window-actions.c:613
+#: ../src/shell/e-shell-window-actions.c:615
 msgid "Bug Buddy could not be run."
 msgstr "Bubaždajin pomoćnik ne može biti pokrenut."
 
-#: ../src/shell/e-shell-window-actions.c:798
+#: ../src/shell/e-shell-window-actions.c:811
+msgid "Collect_ion Account"
+msgstr "Z_birni nalog"
+
+#: ../src/shell/e-shell-window-actions.c:813
+msgid "Create a new collection account"
+msgstr "Napravite novi zbirni nalog"
+
+#: ../src/shell/e-shell-window-actions.c:823
 msgid "Show information about Evolution"
 msgstr "Prikazuje podatke o Evoluciji"
 
-#: ../src/shell/e-shell-window-actions.c:803
+#: ../src/shell/e-shell-window-actions.c:828
 msgid "_Accounts"
 msgstr "_Nalozi"
 
-#: ../src/shell/e-shell-window-actions.c:805
+#: ../src/shell/e-shell-window-actions.c:830
 msgid "Configure Evolution Accounts"
 msgstr "Podesi naloge Evolucije"
 
-#: ../src/shell/e-shell-window-actions.c:810
-#: ../src/shell/e-shell-window-actions.c:824
+#: ../src/shell/e-shell-window-actions.c:835
+#: ../src/shell/e-shell-window-actions.c:849
 msgid "_Close Window"
 msgstr "_Zatvori prozor"
 
-#: ../src/shell/e-shell-window-actions.c:831
+#: ../src/shell/e-shell-window-actions.c:856
 msgid "_Contents"
 msgstr "_Sadržaj"
 
-#: ../src/shell/e-shell-window-actions.c:833
+#: ../src/shell/e-shell-window-actions.c:858
 msgid "Open the Evolution User Guide"
 msgstr "Otvorite korisničko uputstvo Evolucije"
 
-#: ../src/shell/e-shell-window-actions.c:859
-msgid "I_mport..."
-msgstr "_Uvezi..."
+#: ../src/shell/e-shell-window-actions.c:884
+msgid "I_mport…"
+msgstr "U_vezi…"
 
-#: ../src/shell/e-shell-window-actions.c:861
+#: ../src/shell/e-shell-window-actions.c:886
 msgid "Import data from other programs"
 msgstr "Uvezite podatke iz drugih programa"
 
-#: ../src/shell/e-shell-window-actions.c:868
+#: ../src/shell/e-shell-window-actions.c:893
 msgid "Create a new window displaying this view"
 msgstr "Otvorite nov prozor za prikaz ovog pregleda"
 
-#: ../src/shell/e-shell-window-actions.c:880
+#: ../src/shell/e-shell-window-actions.c:905
 msgid "Available Cate_gories"
 msgstr "Dostupne _kategorije"
 
-#: ../src/shell/e-shell-window-actions.c:882
+#: ../src/shell/e-shell-window-actions.c:907
 msgid "Manage available categories"
 msgstr "Upravljajte dostupnim kategorijama"
 
-#: ../src/shell/e-shell-window-actions.c:894
-msgid "_Quick Reference"
-msgstr "_Kratak podsetnik"
-
-#: ../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:903
+#: ../src/shell/e-shell-window-actions.c:921
 msgid "Exit the program"
 msgstr "Izađite iz programa"
 
-#: ../src/shell/e-shell-window-actions.c:908
-msgid "_Advanced Search..."
-msgstr "_Napredna pretraga..."
+#: ../src/shell/e-shell-window-actions.c:926
+msgid "_Advanced Search…"
+msgstr "_Napredna pretraga…"
 
-#: ../src/shell/e-shell-window-actions.c:910
+#: ../src/shell/e-shell-window-actions.c:928
 msgid "Construct a more advanced search"
 msgstr "Obrazujte napredniju pretragu"
 
-#: ../src/shell/e-shell-window-actions.c:917
+#: ../src/shell/e-shell-window-actions.c:935
 msgid "Clear the current search parameters"
 msgstr "Očistite parametre trenutne pretrage"
 
-#: ../src/shell/e-shell-window-actions.c:922
-msgid "_Edit Saved Searches..."
-msgstr "_Uredi sačuvane pretrage..."
+#: ../src/shell/e-shell-window-actions.c:940
+msgid "_Edit Saved Searches…"
+msgstr "_Uredi sačuvane pretrage…"
 
-#: ../src/shell/e-shell-window-actions.c:924
+#: ../src/shell/e-shell-window-actions.c:942
 msgid "Manage your saved searches"
 msgstr "Upravljajte vašim sačuvanim pretragama"
 
-#: ../src/shell/e-shell-window-actions.c:931
+#: ../src/shell/e-shell-window-actions.c:949
 msgid "Click here to change the search type"
 msgstr "Kliknite ovde da promenite vrstu pretrage"
 
-#: ../src/shell/e-shell-window-actions.c:936
+#: ../src/shell/e-shell-window-actions.c:954
 msgid "_Find Now"
 msgstr "Pro_nađi sada"
 
-#: ../src/shell/e-shell-window-actions.c:938
+#: ../src/shell/e-shell-window-actions.c:956
 msgid "Execute the current search parameters"
 msgstr "Izvršite parametre trenutne pretrage"
 
-#: ../src/shell/e-shell-window-actions.c:943
-msgid "_Save Search..."
-msgstr "_Sačuvaj pretragu..."
+#: ../src/shell/e-shell-window-actions.c:961
+msgid "_Save Search…"
+msgstr "Sa_čuvaj pretragu…"
 
-#: ../src/shell/e-shell-window-actions.c:945
+#: ../src/shell/e-shell-window-actions.c:963
 msgid "Save the current search parameters"
 msgstr "Sačuvajte parametre trenutne pretrage"
 
-#: ../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:975
+msgid "_Keyboard Shortcuts"
+msgstr "_Prečice tastature"
+
+#: ../src/shell/e-shell-window-actions.c:977
+msgid "Show keyboard shortcuts"
+msgstr "Prikaži prečice tastature"
+
+#: ../src/shell/e-shell-window-actions.c:982
+msgid "Submit _Bug Report…"
+msgstr "Pošalji izveštaj o _grešci…"
 
-#: ../src/shell/e-shell-window-actions.c:959
+#: ../src/shell/e-shell-window-actions.c:984
 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:964
+#: ../src/shell/e-shell-window-actions.c:989
 msgid "_Work Offline"
 msgstr "Rad _van mreže"
 
-#: ../src/shell/e-shell-window-actions.c:966
+#: ../src/shell/e-shell-window-actions.c:991
 msgid "Put Evolution into offline mode"
 msgstr "Postavite Evoluciju u rad van mreže"
 
-#: ../src/shell/e-shell-window-actions.c:971
+#: ../src/shell/e-shell-window-actions.c:996
 msgid "_Work Online"
 msgstr "_Rad na mreži"
 
-#: ../src/shell/e-shell-window-actions.c:973
+#: ../src/shell/e-shell-window-actions.c:998
 msgid "Put Evolution into online mode"
 msgstr "Postavite Evoluciju u rad na mreži"
 
-#: ../src/shell/e-shell-window-actions.c:1001
+#: ../src/shell/e-shell-window-actions.c:1026
 msgid "Lay_out"
 msgstr "_Raspored"
 
 #. Translators: This is a New menu item caption, under File->New
-#: ../src/shell/e-shell-window-actions.c:1009
+#: ../src/shell/e-shell-window-actions.c:1034
 msgid "_New"
 msgstr "_Novo"
 
-#: ../src/shell/e-shell-window-actions.c:1016
+#: ../src/shell/e-shell-window-actions.c:1041
 msgid "_Search"
 msgstr "Pre_traži"
 
-#: ../src/shell/e-shell-window-actions.c:1023
+#: ../src/shell/e-shell-window-actions.c:1048
 msgid "_Switcher Appearance"
 msgstr "_Izgled prebacivača"
 
-#: ../src/shell/e-shell-window-actions.c:1037
+#: ../src/shell/e-shell-window-actions.c:1062
 msgid "_Window"
 msgstr "Pro_zor"
 
-#: ../src/shell/e-shell-window-actions.c:1066
+#: ../src/shell/e-shell-window-actions.c:1091
 msgid "Show _Menu Bar"
 msgstr "Prikaži traku _izbornika"
 
-#: ../src/shell/e-shell-window-actions.c:1068
+#: ../src/shell/e-shell-window-actions.c:1093
 msgid "Show the menu bar"
 msgstr "Prikažite traku izbornika"
 
-#: ../src/shell/e-shell-window-actions.c:1074
+#: ../src/shell/e-shell-window-actions.c:1099
 msgid "Show Side _Bar"
 msgstr "Prikaži _bočnu površ"
 
-#: ../src/shell/e-shell-window-actions.c:1076
+#: ../src/shell/e-shell-window-actions.c:1101
 msgid "Show the side bar"
 msgstr "Prikažite bočnu površ"
 
-#: ../src/shell/e-shell-window-actions.c:1082
+#: ../src/shell/e-shell-window-actions.c:1107
 msgid "Show _Buttons"
 msgstr "Prikaži _dugmad"
 
-#: ../src/shell/e-shell-window-actions.c:1084
+#: ../src/shell/e-shell-window-actions.c:1109
 msgid "Show the switcher buttons"
 msgstr "Prikažite dugmad prebacivača"
 
-#: ../src/shell/e-shell-window-actions.c:1090
+#: ../src/shell/e-shell-window-actions.c:1115
 msgid "Show _Status Bar"
 msgstr "Prikaži traku _stanja"
 
-#: ../src/shell/e-shell-window-actions.c:1092
+#: ../src/shell/e-shell-window-actions.c:1117
 msgid "Show the status bar"
 msgstr "Prikažite traku stanja"
 
-#: ../src/shell/e-shell-window-actions.c:1098
+#: ../src/shell/e-shell-window-actions.c:1123
 msgid "Show _Tool Bar"
 msgstr "Prikaži traku _alata"
 
-#: ../src/shell/e-shell-window-actions.c:1100
+#: ../src/shell/e-shell-window-actions.c:1125
 msgid "Show the tool bar"
 msgstr "Prikažite traku alata"
 
-#: ../src/shell/e-shell-window-actions.c:1122
+#: ../src/shell/e-shell-window-actions.c:1147
 msgid "_Icons Only"
 msgstr "Samo _ikonice"
 
-#: ../src/shell/e-shell-window-actions.c:1124
+#: ../src/shell/e-shell-window-actions.c:1149
 msgid "Display window buttons with icons only"
 msgstr "Prikažite dugmad prozora samo sa ikonicama"
 
-#: ../src/shell/e-shell-window-actions.c:1129
+#: ../src/shell/e-shell-window-actions.c:1154
 msgid "_Text Only"
 msgstr "Samo _tekst"
 
-#: ../src/shell/e-shell-window-actions.c:1131
+#: ../src/shell/e-shell-window-actions.c:1156
 msgid "Display window buttons with text only"
 msgstr "Prikažite dugmad prozora samo sa tekstom"
 
-#: ../src/shell/e-shell-window-actions.c:1136
+#: ../src/shell/e-shell-window-actions.c:1161
 msgid "Icons _and Text"
 msgstr "Ikonice _i tekst"
 
-#: ../src/shell/e-shell-window-actions.c:1138
+#: ../src/shell/e-shell-window-actions.c:1163
 msgid "Display window buttons with icons and text"
 msgstr "Prikažite dugmad prozora sa ikonicama i tekstom"
 
-#: ../src/shell/e-shell-window-actions.c:1143
+#: ../src/shell/e-shell-window-actions.c:1168
 msgid "Tool_bar Style"
 msgstr "Stil tra_ke alata"
 
-#: ../src/shell/e-shell-window-actions.c:1145
+#: ../src/shell/e-shell-window-actions.c:1170
 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:1153
+#: ../src/shell/e-shell-window-actions.c:1178
 msgid "Delete Current View"
 msgstr "Obriši trenutni pregled"
 
-#: ../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:1185
+msgid "Save Custom View…"
+msgstr "Sačuvaj prilagođen pregled…"
 
-#: ../src/shell/e-shell-window-actions.c:1162
+#: ../src/shell/e-shell-window-actions.c:1187
 msgid "Save current custom view"
 msgstr "Sačuvajte trenutni korisnički pregled"
 
-#: ../src/shell/e-shell-window-actions.c:1169
+#: ../src/shell/e-shell-window-actions.c:1194
 msgid "C_urrent View"
 msgstr "T_renutni pregled"
 
-#: ../src/shell/e-shell-window-actions.c:1179
+#: ../src/shell/e-shell-window-actions.c:1204
 msgid "Custom View"
 msgstr "Prilagođen pregled"
 
-#: ../src/shell/e-shell-window-actions.c:1181
+#: ../src/shell/e-shell-window-actions.c:1206
 msgid "Current view is a customized view"
 msgstr "Trenutan pregled je podesio korisnik"
 
-#: ../src/shell/e-shell-window-actions.c:1189
-msgid "Page Set_up..."
-msgstr "Podešavanje _stranice..."
+#: ../src/shell/e-shell-window-actions.c:1214
+msgid "Page Set_up…"
+msgstr "Podešavanje _stranice…"
 
-#: ../src/shell/e-shell-window-actions.c:1191
+#: ../src/shell/e-shell-window-actions.c:1216
 msgid "Change the page settings for your current printer"
 msgstr "Izmenite postavke stranice za trenutni štampač"
 
-#: ../src/shell/e-shell-window-actions.c:1560
+#: ../src/shell/e-shell-window-actions.c:1586
 #, c-format
 msgid "Switch to %s"
 msgstr "Pređi na %s"
 
-#: ../src/shell/e-shell-window-actions.c:1683
+#: ../src/shell/e-shell-window-actions.c:1709
 #, c-format
 msgid "Select view: %s"
 msgstr "Izaberi pregled: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1700
+#: ../src/shell/e-shell-window-actions.c:1726
 #, c-format
 msgid "Delete view: %s"
 msgstr "Obriši pregled: %s"
 
-#: ../src/shell/e-shell-window-actions.c:1804
+#: ../src/shell/e-shell-window-actions.c:1830
 msgid "Execute these search parameters"
 msgstr "Izvršite ove parametre pretrage"
 
 #. Translators: a 'New' toolbar button caption which is context sensitive and
 #. runs one of the actions under File->New menu
-#: ../src/shell/e-shell-window.c:563
+#: ../src/shell/e-shell-window.c:514
 msgctxt "toolbar-button"
 msgid "New"
 msgstr "Nova"
 
 #. Translators: This is used for the main window title.
-#: ../src/shell/e-shell-window-private.c:756
+#: ../src/shell/e-shell-window-private.c:787
 #, c-format
 msgid "%s — Evolution"
 msgstr "%s — Evolucija"
@@ -26318,7 +27254,8 @@ msgid ""
 "If you want a stable version of Evolution, we urge you to uninstall\n"
 "this version, and install version %s instead.\n"
 "\n"
-"If you find bugs, please report them to us at bugzilla.gnome.org.\n"
+"If you find bugs, please report them at\n"
+"https://gitlab.gnome.org/GNOME/evolution/issues/.\n";
 "This product comes with no warranty and is not intended for\n"
 "individuals prone to violent fits of anger.\n"
 "\n"
@@ -26334,14 +27271,15 @@ msgstr ""
 "Ukoliko želite stabilno izdanje Evolucije, uklonite ovo izdanje,\n"
 "i instalirajte izdanje %s.\n"
 "\n"
-"Ukoliko pronađete greške, prijavite nam ih na „bugzilla.gnome.org“.\n"
+"Ukoliko pronađete greške, prijavite nam ih na adresu\n"
+"„https://gitlab.gnome.org/GNOME/evolution/issues/“.\n";
 "Ovaj proizvod dolazi bez jemstva i nije namenjen pojedincima koji\n"
 "su skloni nasilnom ponašanju ili besu.\n"
 "\n"
 "Nadamo se da ćete uživati u plodovima našeg napornog rada, i \n"
 "željno iščekujemo vaš doprinos!\n"
 
-#: ../src/shell/main.c:216
+#: ../src/shell/main.c:217
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -26349,54 +27287,54 @@ msgstr ""
 "Hvala\n"
 "Tim Evolucije\n"
 
-#: ../src/shell/main.c:222
+#: ../src/shell/main.c:223
 msgid "Do not tell me again"
 msgstr "Nemoj mi ponovo reći"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../src/shell/main.c:311
+#: ../src/shell/main.c:325
 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 delove. Dostupne opcije su: „mail“, "
+"„calendar“, „contacts“, „tasks“ i „memos“"
 
-#: ../src/shell/main.c:315
+#: ../src/shell/main.c:329
 msgid "Apply the given geometry to the main window"
 msgstr "Primeni datu geometriju na glavni prozor"
 
-#: ../src/shell/main.c:319
+#: ../src/shell/main.c:333
 msgid "Start in online mode"
 msgstr "Počni rad na mreži"
 
-#: ../src/shell/main.c:321
+#: ../src/shell/main.c:335
 msgid "Ignore network availability"
 msgstr "Zanemari dostupnost mreže"
 
-#: ../src/shell/main.c:324
+#: ../src/shell/main.c:338
 msgid "Forcibly shut down Evolution"
 msgstr "Silom ugasi Evoluciju"
 
-#: ../src/shell/main.c:327
+#: ../src/shell/main.c:341
 msgid "Disable loading of any plugins."
 msgstr "Isključi učitavanje svih dodataka."
 
-#: ../src/shell/main.c:329
+#: ../src/shell/main.c:343
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Isključi okno za pregled pošte, kontakta i zadataka."
 
-#: ../src/shell/main.c:333
+#: ../src/shell/main.c:347
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Uvozi adrese datoteka datih kao ostatak argumenata."
 
 # shell:noshell-reason title
-#: ../src/shell/main.c:335
+#: ../src/shell/main.c:349
 msgid "Request a running Evolution process to quit"
 msgstr "Zahteva kraj pokrenutog procesa Evolucije"
 
-#: ../src/shell/main.c:417
+#: ../src/shell/main.c:431
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
@@ -26405,11 +27343,11 @@ msgstr ""
 "Ne mogu da pokrenem Evoluciju.  Drugi primerak Evolucije možda ne odgovara. "
 "Greška sistema: %s"
 
-#: ../src/shell/main.c:473 ../src/shell/main.c:478
+#: ../src/shell/main.c:490 ../src/shell/main.c:495
 msgid "— The Evolution PIM and Email Client"
 msgstr "— Evolucija rukovodilac ličnim podatacima i klijent e-pošte"
 
-#: ../src/shell/main.c:540
+#: ../src/shell/main.c:551
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -26418,7 +27356,7 @@ msgstr ""
 "%s: „--online“ i „--offline“ se ne mogu koristiti zajedno.\n"
 "  Pokrenite „%s --help“ za više podataka.\n"
 
-#: ../src/shell/main.c:546
+#: ../src/shell/main.c:557
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -26427,6 +27365,10 @@ msgstr ""
 "%s: „--force-online“ i „--offline“ se ne mogu koristiti zajedno.\n"
 "  Pokrenite „%s --help“ za više podataka.\n"
 
+#: ../src/shell/shell.error.xml.h:1
+msgid "Importing..."
+msgstr "Uvozim..."
+
 #: ../src/shell/shell.error.xml.h:2
 msgid "Upgrade from previous version failed:"
 msgstr "Neuspela nadogradnja sa prethodnog izdanja:"
@@ -26560,6 +27502,19 @@ msgstr "SSL uverenje za spisak beleški „{0}“ nije od poverenja."
 msgid "SSL certificate for task list “{0}” is not trusted."
 msgstr "SSL uverenje za spisak zadataka „{0}“ nije od poverenja."
 
+#: ../src/shell/shell.error.xml.h:34
+msgid "Menu Bar is hidden"
+msgstr "Traka izbornika je sakrivena"
+
+#: ../src/shell/shell.error.xml.h:35
+msgid "Press the “Alt” key to access the Menu Bar again."
+msgstr ""
+"Pritisnite taster „Alt“ da biste pristupili traci sa izbornikom ponovo."
+
+#: ../src/shell/shell.error.xml.h:36
+msgid "_Show Menu Bar"
+msgstr "Prikaži traku _izbornika"
+
 #: ../src/smime/gui/ca-trust-dialog.c:104
 #, c-format
 msgid ""
@@ -26646,40 +27601,40 @@ msgstr "MD5 Otisak"
 msgid "Email Address"
 msgstr "Adresa e-pošte"
 
-#: ../src/smime/gui/certificate-manager.c:663
-msgid "Select a file to backup your key and certificate..."
-msgstr "Izaberite datoteku za rezervnu kopiju ključeva i uverenja..."
+#: ../src/smime/gui/certificate-manager.c:648
+msgid "Select a file to backup your key and certificate…"
+msgstr "Izaberite datoteku za rezervnu kopiju ključeva i uverenja…"
 
 #. To Translators:
 #. * %s-backup.p12 is the default file name suggested by the file selection dialog,
 #. * when a user wants to backup one of her/his private keys/certificates.
 #. * For example: gnomedev-backup.p12
 #.
-#: ../src/smime/gui/certificate-manager.c:675
+#: ../src/smime/gui/certificate-manager.c:658
 #, c-format
 msgid "%s-backup.p12"
 msgstr "%s-rezervna-kopija.p12"
 
-#: ../src/smime/gui/certificate-manager.c:741
+#: ../src/smime/gui/certificate-manager.c:721
 msgid "Backup Certificate"
 msgstr "Rezervna kopija uverenja"
 
 #. filename selection
-#: ../src/smime/gui/certificate-manager.c:755
+#: ../src/smime/gui/certificate-manager.c:736
 msgid "_File name:"
 msgstr "_Naziv datoteke:"
 
 #. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
-#: ../src/smime/gui/certificate-manager.c:760
-msgid "Please select a file..."
-msgstr "Izaberite datoteku..."
+#: ../src/smime/gui/certificate-manager.c:741
+msgid "Please select a file…"
+msgstr "Izaberite datoteku…"
 
-#: ../src/smime/gui/certificate-manager.c:774
+#: ../src/smime/gui/certificate-manager.c:755
 msgid "_Include certificate chain in the backup"
 msgstr "_Uključi lanac uverenja u rezervu"
 
 #. To Translators: this text was copied from Firefox
-#: ../src/smime/gui/certificate-manager.c:780
+#: ../src/smime/gui/certificate-manager.c:761
 msgid ""
 "The certificate backup password you set here protects the backup file that "
 "you are about to create.\n"
@@ -26688,16 +27643,16 @@ msgstr ""
 "Lozinka za rezervnu kopiju uverenja koju ovde postavite služi da je zaštiti.\n"
 "Morate da postavite lozinku kako bi nastavili sa pravljenjem rezerve."
 
-#: ../src/smime/gui/certificate-manager.c:799
+#: ../src/smime/gui/certificate-manager.c:780
 msgid "_Repeat Password:"
 msgstr "Ponovite _lozinku:"
 
-#: ../src/smime/gui/certificate-manager.c:818
+#: ../src/smime/gui/certificate-manager.c:799
 msgid "Passwords do not match"
 msgstr "Lozinke koje ste uneli nisu iste"
 
 #. To Translators: this text was copied from Firefox
-#: ../src/smime/gui/certificate-manager.c:826
+#: ../src/smime/gui/certificate-manager.c:807
 msgid ""
 "Important:\n"
 "If you forget your certificate backup password, you will not be able to "
@@ -26709,92 +27664,92 @@ msgstr ""
 "rezervnu kopiju.\n"
 "Zapišite je negde na sigurno mesto."
 
-#: ../src/smime/gui/certificate-manager.c:871
+#: ../src/smime/gui/certificate-manager.c:852
 msgid "No file name provided"
 msgstr "Nije dat naziv datoteke"
 
-#: ../src/smime/gui/certificate-manager.c:875
+#: ../src/smime/gui/certificate-manager.c:856
 msgid "Failed to backup key and certificate"
 msgstr "Ne mogu da napravim rezervnu kopiju ključa i uverenja"
 
-#: ../src/smime/gui/certificate-manager.c:964
-msgid "Select a certificate to import..."
-msgstr "Izaberite uverenje za uvoz..."
+#: ../src/smime/gui/certificate-manager.c:948
+msgid "Select a certificate to import…"
+msgstr "Izaberite uverenje za uvoz…"
 
-#: ../src/smime/gui/certificate-manager.c:1014
+#: ../src/smime/gui/certificate-manager.c:997
 msgid "Failed to import certificate"
 msgstr "Ne mogu da uvezem uverenje"
 
-#: ../src/smime/gui/certificate-manager.c:1130
+#: ../src/smime/gui/certificate-manager.c:1114
 msgctxt "CamelTrust"
 msgid "Ask when used"
 msgstr "Pitaj prilikom upotrebe"
 
-#: ../src/smime/gui/certificate-manager.c:1132
+#: ../src/smime/gui/certificate-manager.c:1116
 msgctxt "CamelTrust"
 msgid "Never"
 msgstr "Nikada"
 
-#: ../src/smime/gui/certificate-manager.c:1134
+#: ../src/smime/gui/certificate-manager.c:1118
 msgctxt "CamelTrust"
 msgid "Marginally"
 msgstr "Ponekad"
 
-#: ../src/smime/gui/certificate-manager.c:1136
+#: ../src/smime/gui/certificate-manager.c:1120
 msgctxt "CamelTrust"
 msgid "Fully"
 msgstr "Uvek"
 
-#: ../src/smime/gui/certificate-manager.c:1138
+#: ../src/smime/gui/certificate-manager.c:1122
 msgctxt "CamelTrust"
 msgid "Ultimately"
 msgstr "Ultimativno"
 
-#: ../src/smime/gui/certificate-manager.c:1140
+#: ../src/smime/gui/certificate-manager.c:1124
 msgctxt "CamelTrust"
 msgid "Temporarily"
 msgstr "Privremeno"
 
-#: ../src/smime/gui/certificate-manager.c:1346
+#: ../src/smime/gui/certificate-manager.c:1330
 msgid "Change certificate trust"
 msgstr "Izmena poverenja za uverenje"
 
-#: ../src/smime/gui/certificate-manager.c:1358
+#: ../src/smime/gui/certificate-manager.c:1342
 #, c-format
 msgid "Change trust for the host “%s”:"
 msgstr "Izmena poverenja za udaljeni računar „%s“:"
 
-#: ../src/smime/gui/certificate-manager.c:1382
+#: ../src/smime/gui/certificate-manager.c:1366
 msgctxt "CamelTrust"
 msgid "_Ask when used"
 msgstr "P_itaj prilikom korišćenja"
 
-#: ../src/smime/gui/certificate-manager.c:1383
+#: ../src/smime/gui/certificate-manager.c:1367
 msgctxt "CamelTrust"
 msgid "_Never trust this certificate"
 msgstr "_Nikada ne veruj ovom uverenju"
 
-#: ../src/smime/gui/certificate-manager.c:1384
+#: ../src/smime/gui/certificate-manager.c:1368
 msgctxt "CamelTrust"
 msgid "_Temporarily trusted (this session only)"
 msgstr "P_rivremeno poverenje (samo tokom sesije)"
 
-#: ../src/smime/gui/certificate-manager.c:1385
+#: ../src/smime/gui/certificate-manager.c:1369
 msgctxt "CamelTrust"
 msgid "_Marginally trusted"
 msgstr "_Delimično poverenje"
 
-#: ../src/smime/gui/certificate-manager.c:1386
+#: ../src/smime/gui/certificate-manager.c:1370
 msgctxt "CamelTrust"
 msgid "_Fully trusted"
 msgstr "_Potpuno poverenje"
 
-#: ../src/smime/gui/certificate-manager.c:1387
+#: ../src/smime/gui/certificate-manager.c:1371
 msgctxt "CamelTrust"
 msgid "_Ultimately trusted"
 msgstr "_Neograničeno poverenje"
 
-#: ../src/smime/gui/certificate-manager.c:1391
+#: ../src/smime/gui/certificate-manager.c:1375
 msgid ""
 "Before trusting this site, you should examine its certificate and its policy "
 "and procedures (if available)."
@@ -26802,43 +27757,43 @@ msgstr ""
 "Pre verovanja ovom sajtu pregledajte njegovo uverenje, politiku i procedure "
 "(ako su dostupni)."
 
-#: ../src/smime/gui/certificate-manager.c:1406
+#: ../src/smime/gui/certificate-manager.c:1390
 msgid "_Display certificate"
 msgstr "Prikaži _uverenje"
 
-#: ../src/smime/gui/certificate-manager.c:1611
+#: ../src/smime/gui/certificate-manager.c:1595
 msgid "You have certificates on file that identify these mail servers:"
 msgstr "Posedujete uverenja u datoteci koja određuju ove servere e-pošte:"
 
-#: ../src/smime/gui/certificate-manager.c:1642
+#: ../src/smime/gui/certificate-manager.c:1626
 msgid "Host name"
 msgstr "Ime udaljenog računara"
 
-#: ../src/smime/gui/certificate-manager.c:1644
+#: ../src/smime/gui/certificate-manager.c:1628
 msgid "Issuer"
 msgstr "Izdavač"
 
-#: ../src/smime/gui/certificate-manager.c:1645
+#: ../src/smime/gui/certificate-manager.c:1629
 msgid "Fingerprint"
 msgstr "Otisak prsta"
 
-#: ../src/smime/gui/certificate-manager.c:1646
+#: ../src/smime/gui/certificate-manager.c:1630
 msgid "Trust"
 msgstr "Poverenje"
 
-#: ../src/smime/gui/certificate-manager.c:1667
+#: ../src/smime/gui/certificate-manager.c:1651
 msgid "_Edit Trust"
 msgstr "_Uredi poverenje"
 
-#: ../src/smime/gui/certificate-manager.c:2121
+#: ../src/smime/gui/certificate-manager.c:2105
 msgid "All PKCS12 files"
 msgstr "Sve PKCS12 datoteke"
 
-#: ../src/smime/gui/certificate-manager.c:2138
+#: ../src/smime/gui/certificate-manager.c:2122
 msgid "All email certificate files"
 msgstr "Sve datoteke uverenja pošte"
 
-#: ../src/smime/gui/certificate-manager.c:2155
+#: ../src/smime/gui/certificate-manager.c:2139
 msgid "All CA certificate files"
 msgstr "Sve datoteke CA uverenja"
 
@@ -26965,16 +27920,12 @@ msgstr "Ne veruj u verodostojnost ovog uverenja"
 msgid "C_ertificate:"
 msgstr "U_verenje:"
 
-#: ../src/smime/lib/e-cert.c:235 ../src/smime/lib/e-cert.c:247
-msgid "%d/%m/%Y"
-msgstr "%d. %m. %Y."
-
 #. x509 certificate usage types
-#: ../src/smime/lib/e-cert.c:403
+#: ../src/smime/lib/e-cert.c:402
 msgid "Sign"
 msgstr "Potpiši"
 
-#: ../src/smime/lib/e-cert.c:404
+#: ../src/smime/lib/e-cert.c:403
 msgid "Encrypt"
 msgstr "Šifruj"
 
@@ -27019,6 +27970,435 @@ msgstr "Ne mogu upišem i sačuvam na disk, kod greške: %i"
 msgid "Imported Certificate"
 msgstr "Uveženo uverenje"
 
+#~ msgid "%d week"
+#~ msgid_plural "%d weeks"
+#~ msgstr[0] "%d nedelja"
+#~ msgstr[1] "%d nedelje"
+#~ msgstr[2] "%d nedelja"
+#~ msgstr[3] "%d nedelja"
+
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# When "None" is selected we want the field to be cleared.
+# Note that we don't show this here, since by default a 'None' date
+# is not permitted.
+#~ msgctxt "cal-task-status"
+#~ msgid "None"
+#~ msgstr "Ništa"
+
+#~ msgid "_Attachment..."
+#~ msgstr "_Prilog..."
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Atte_ndees..."
+#~ msgstr "_Učesnici..."
+
+#~ msgid "%d day before"
+#~ msgid_plural "%d days before"
+#~ msgstr[0] "%d dan pre"
+#~ msgstr[1] "%d dana pre"
+#~ msgstr[2] "%d dana pre"
+#~ msgstr[3] "%d dan pre"
+
+#~ msgid "%d hour before"
+#~ msgid_plural "%d hours before"
+#~ msgstr[0] "%d sat pre"
+#~ msgstr[1] "%d sata pre"
+#~ msgstr[2] "%d sati pre"
+#~ msgstr[3] "%d sat pre"
+
+#~ msgid "%d minute before"
+#~ msgid_plural "%d minutes before"
+#~ msgstr[0] "%d minut pre"
+#~ msgstr[1] "%d minuta pre"
+#~ msgstr[2] "%d minuta pre"
+#~ msgstr[3] "%d minut pre"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "15 minutes before"
+#~ msgstr "pre 15 minuta"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "1 hour before"
+#~ msgstr "pre %d sat"
+
+#~ msgctxt "cal-reminders"
+#~ msgid "1 day before"
+#~ msgstr "pre 1 dana"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "_Categories..."
+#~ msgstr "_Kategorije..."
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Not Started"
+#~ msgstr "Nije započet"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "In Progress"
+#~ msgstr "U toku"
+
+# timezone.
+#~ msgctxt "ECompEditor"
+#~ msgid "Completed"
+#~ msgstr "Završeno"
+
+#~ msgctxt "ECompEditor"
+#~ msgid "Cancelled"
+#~ msgstr "Otkazano"
+
+#~ msgid "Saving changes..."
+#~ msgstr "Čuvam izmene..."
+
+#~ msgid "_Print..."
+#~ msgstr "_Štampaj..."
+
+#~ msgid "Pre_view..."
+#~ msgstr "_Pregled..."
+
+#~ msgid "Select..."
+#~ msgstr "Izaberi..."
+
+#~ msgid "Atte_ndees..."
+#~ msgstr "Uč_esnici..."
+
+#~ msgid "New _Appointment..."
+#~ msgstr "Novo _zakazivanje..."
+
+#~ msgid "New _Meeting..."
+#~ msgstr "Novi _sastanak..."
+
+#~ msgid "New _Task..."
+#~ msgstr "Novi zad_atak..."
+
+#~ msgid "_Open..."
+#~ msgstr "_Otvori..."
+
+#~ msgid "_Delete..."
+#~ msgstr "_Obriši..."
+
+#~ msgid "Save _As..."
+#~ msgstr "Sačuvaj _kao..."
+
+#~ msgid "A_dd Attachment..."
+#~ msgstr "Do_daj prilog..."
+
+#~ msgid "Other..."
+#~ msgstr "Drugo..."
+
+#~ msgid "_Find..."
+#~ msgstr "_Nađi..."
+
+#~ msgid "Re_place..."
+#~ msgstr "_Zameni..."
+
+#~ msgid "_Image..."
+#~ msgstr "_Slika..."
+
+#~ msgid "_Link..."
+#~ msgstr "_Veza..."
+
+#~ msgid "_Rule..."
+#~ msgstr "Pravi_lo..."
+
+#~ msgid "_Table..."
+#~ msgstr "_Tabela..."
+
+#~ msgid "Cell..."
+#~ msgstr "Ćelija..."
+
+#~ msgid "Image..."
+#~ msgstr "Slika..."
+
+#~ msgid "Link..."
+#~ msgstr "Veza..."
+
+#~ msgid "Page..."
+#~ msgstr "Stranica..."
+
+#~ msgid "Rule..."
+#~ msgstr "Pravilo..."
+
+#~ msgid "Table..."
+#~ msgstr "Tabele..."
+
+#~ msgid "Text..."
+#~ msgstr "Tekst..."
+
+#~ msgid "More..."
+#~ msgstr "Dalje..."
+
+#~ msgid "Add a C_olumn..."
+#~ msgstr "Dodaj ko_lonu..."
+
+#~ msgid "Custo_mize Current View..."
+#~ msgstr "Prila_godi trenutni pregled..."
+
+#~ msgid "Save _Image..."
+#~ msgstr "Sačuvaj _sliku..."
+
+#~ msgid "Storing changes..."
+#~ msgstr "Smeštam izmene..."
+
+#~ msgid "Retrieving message..."
+#~ msgstr "Preuzimam poruku..."
+
+#~ msgid "_Archive..."
+#~ msgstr "_Arhiva..."
+
+#~ msgid "_Copy to Folder..."
+#~ msgstr "_Kopiraj u fasciklu..."
+
+#~ msgid "Follow _Up..."
+#~ msgstr "Sle_di..."
+
+#~ msgid "_Move to Folder..."
+#~ msgstr "_Premesti u fasciklu..."
+
+#~ msgid "Loading..."
+#~ msgstr "Učitavam..."
+
+#~ msgid "_Forward Contact..."
+#~ msgstr "_Prosledi kontakt..."
+
+#~ msgid "_New Contact..."
+#~ msgstr "Novi kon_takt..."
+
+#~ msgid "New Contact _List..."
+#~ msgstr "Nova _lista kontakta..."
+
+#~ msgid "_Send Message to Contact..."
+#~ msgstr "_Pošalji poruku kontaktu..."
+
+#~ msgid "_Save as vCard..."
+#~ msgstr "_Sačuvaj kao vKartu..."
+
+#~ msgid "Selected Memo Lists for Notifications of Reminders"
+#~ msgstr "Izabrani spiskovi beleški za obaveštenja podsetnika"
+
+#~ msgid "_Copy..."
+#~ msgstr "_Kopiraj…"
+
+#~ msgid "New All Day _Event..."
+#~ msgstr "Novi celodnevni _događaj..."
+
+#~ msgid "Print..."
+#~ msgstr "Štampaj..."
+
+#~ msgid "_Save as iCalendar..."
+#~ msgstr "_Sačuvaj kao iKalendar..."
+
+#~ msgid "_Copy Folder To..."
+#~ msgstr "_Kopiraj fasciklu u…"
+
+#~ msgid "_Move Folder To..."
+#~ msgstr "_Premesti fasciklu u…"
+
+#~ msgid "_New..."
+#~ msgstr "_Novo…"
+
+#~ msgid "Preparing to quit..."
+#~ msgstr "Pripremam se da izađem..."
+
+#~ msgid "Evolution Website"
+#~ msgstr "Veb stranica Evolucije"
+
+#~ msgid "I_mport..."
+#~ msgstr "_Uvezi..."
+
+#~ msgid "_Advanced Search..."
+#~ msgstr "_Napredna pretraga..."
+
+#~ msgid "_Save Search..."
+#~ msgstr "_Sačuvaj pretragu..."
+
+#~ msgid ""
+#~ "Default reminder snooze interval, in minutes, to be filled in the "
+#~ "reminder notification dialog"
+#~ msgstr ""
+#~ "Podrazumevano vreme za odlaganje podsetnika u minutima, koje se unosi u "
+#~ "prozorče sa obeveštenjima podsetnika"
+
+#~ msgid "Allow past reminders"
+#~ msgstr "Dopušta prošle podsetnike"
+
+#~ msgid ""
+#~ "Whether can show reminders for events/tasks/memos which already happened"
+#~ msgstr ""
+#~ "Da li može da pokaže podsetnike za događaje/zadatke/beleške koji su se "
+#~ "već dogodili"
+
+#~ msgid "Reminder programs"
+#~ msgstr "Programi podsetnika"
+
+#~ msgid "Programs that are allowed to be run by reminders"
+#~ msgstr "Programi koji mogu biti pokrenuti podsetnicima"
+
+#~ msgid "Show display reminders in notification tray"
+#~ msgstr "Prikazuje podsetnike u obaveštajnoj zoni"
+
+#~ msgid "Whether or not to use the notification tray for display reminders"
+#~ msgstr "Da li da koristi obaveštajnu zonu za prikazivanje podsetnika"
+
+#~ msgid "Show reminder notification dialog always on top"
+#~ msgstr "Prikazuje prozorče obaveštenja podsetnika uvek na vrhu"
+
+#~ msgid ""
+#~ "Whether or not to show reminder notification dialog always on top. Note "
+#~ "this works only as a hint for the window manager, which may or may not "
+#~ "obey it."
+#~ msgstr ""
+#~ "Da li da prikazuje prozorče obaveštenja podsetnika uvek na vrhu. Znajte da "
+#~ "ovo radi samo kao savet za upravnika prozora, koji može a i ne mora ovo "
+#~ "da odradi."
+
+#~ msgid "Show reminders for completed tasks"
+#~ msgstr "Prikaži podsetnike za završene zadatke"
+
+#~ msgid ""
+#~ "Whether to show reminders for completed tasks. When set to false, "
+#~ "reminders for completed tasks are suppressed."
+#~ msgstr ""
+#~ "Da li da prikaže podsetnike za završene zadatke. Kada nije postavljeno, "
+#~ "neće se prikazivati podsetnici za završene zadatke."
+
+#~ msgid "Evolution Alarm Notify"
+#~ msgstr "Obaveštenje alarma Evolucije"
+
+#~ msgid "Calendar event notifications"
+#~ msgstr "Obaveštenja o događajima kalendara"
+
+#~ msgid "minute"
+#~ msgid_plural "minutes"
+#~ msgstr[0] "minut"
+#~ msgstr[1] "minuta"
+#~ msgstr[2] "minuta"
+#~ msgstr[3] "minut"
+
+#~ msgid "hour"
+#~ msgid_plural "hours"
+#~ msgstr[0] "sat"
+#~ msgstr[1] "sata"
+#~ msgstr[2] "sati"
+#~ msgstr[3] "sat"
+
+#~ msgid "day"
+#~ msgid_plural "days"
+#~ msgstr[0] "dan"
+#~ msgstr[1] "dana"
+#~ msgstr[2] "dana"
+#~ msgstr[3] "dan"
+
+#~ msgid "Start time"
+#~ msgstr "Vreme početka"
+
+#~ msgid "Appointments"
+#~ msgstr "Zakazivanja"
+
+#~ msgid "Dismiss _All"
+#~ msgstr "Zanemari _sve"
+
+#~ msgid "_Snooze"
+#~ msgstr "_Dremanje"
+
+#~ msgid "location of appointment"
+#~ msgstr "mesto sastanka"
+
+#~ msgid "Snooze _time:"
+#~ msgstr "Vreme _dremanja:"
+
+#~ msgid "No summary available."
+#~ msgstr "Nema dostupnog sažetka."
+
+#~ msgid "No description available."
+#~ msgstr "Nema dostupnog opisa."
+
+#~ msgid "No location information available."
+#~ msgstr "Nema dostupnog podatka o lokaciji."
+
+#~ msgid "Evolution Reminders"
+#~ msgstr "Podsetnici Evolucije"
+
+# bug(slobo): plural-forms. Report this one to bugzilla.gnome.org
+#~ msgid "You have %d reminder"
+#~ msgid_plural "You have %d reminders"
+#~ msgstr[0] "Imate %d potsetnik"
+#~ msgstr[1] "Imate %d potsetnika"
+#~ msgstr[2] "Imate %d potsetnika"
+#~ msgstr[3] "Imate jedan potsetnik"
+
+#~ msgid "Warning"
+#~ msgstr "Upozorenje"
+
+#~ msgid "_Yes"
+#~ msgstr "_Da"
+
+#~ msgid ""
+#~ "An Evolution Calendar reminder is about to trigger. This reminder is "
+#~ "configured to run the following program:\n"
+#~ "\n"
+#~ "        %s\n"
+#~ "\n"
+#~ "Are you sure you want to run this program?"
+#~ msgstr ""
+#~ "Podsetnik kalendara Evolucije će biti pokrenut. Ovaj podsetnik je podešen "
+#~ "da pokrene sledeći program:\n"
+#~ "\n"
+#~ "        %s\n"
+#~ "\n"
+#~ "Da li ste sigurni da želite da pokrenete ovaj program?"
+
+#~ msgid "Do not ask me about this program again."
+#~ msgstr "Ne pitaj me ponovo za ovaj program."
+
+#~ msgid "invalid time"
+#~ msgstr "neispravno vreme"
+
+#~ msgid "Summary:"
+#~ msgstr "Sažetak:"
+
+#~ msgid "_Delete old messages"
+#~ msgstr "_Obriši stare poruke"
+
+#~ msgid "AutoArchive"
+#~ msgstr "AutoArhiva"
+
+#~ 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."
+#~ msgstr ""
+#~ "Ovo je način koji će Evolucija da koristi da vam potvrdi identitet.  "
+#~ "Znajte da će ovo ako postavite na „Koristi adresu e-pošte“ zahtevati "
+#~ "anonimni pristup na vaš LDAP server."
+
+#~ msgid "Default _snooze time (in minutes)"
+#~ msgstr "Podrazumevano vreme odla_ganja podsetnika (u minutima)"
+
+#~ msgid "Look up e-mail domain on the GNOME server"
+#~ msgstr "Potraži domen adrese e-pošte na Gnomovom serveru"
+
+#~ msgid "This meeting recurs"
+#~ msgstr "Ovaj sastanak se ponavlja"
+
+#~ msgid "This task recurs"
+#~ msgstr "Ovaj zadatak se ponavlja"
+
+#~ msgid "This memo recurs"
+#~ msgstr "Ova beleška se ponavlja"
+
+#~ msgid "Quick _Reference"
+#~ msgstr "Kratak _podsetnik"
+
+#~ msgid "_Quick Reference"
+#~ msgstr "_Kratak podsetnik"
+
+#~ msgid "Show Evolution’s shortcut keys"
+#~ msgstr "Prikažite prečice tastature Evolucije"
+
+#~ msgid "%d/%m/%Y"
+#~ msgstr "%d. %m. %Y."
+
 #~ msgid "1st"
 #~ msgstr "1."
 
@@ -27257,9 +28637,6 @@ msgstr "Uveženo uverenje"
 #~ msgid "Whether editor changed"
 #~ msgstr "Da li je uređivač promenio"
 
-#~ msgid "_Unsort"
-#~ msgstr "_Ne razvrstavaj"
-
 #~ msgid "Canceled."
 #~ msgstr "Otkazano."
 
@@ -27394,9 +28771,6 @@ msgstr "Uveženo uverenje"
 #~ msgid "_Delegatees"
 #~ msgstr "Delegat_i"
 
-#~ msgid "Atte_ndees"
-#~ msgstr "Uč_esnici"
-
 #~ msgctxt "eventpage"
 #~ msgid "15 minutes before appointment"
 #~ msgstr "15 minuta pre zakazanog sastanka"
@@ -27434,9 +28808,6 @@ msgstr "Uveženo uverenje"
 #~ msgid "Could not get a selection to modify."
 #~ msgstr "Ne mogu da nađem izbor radi menjanja."
 
-#~ msgid "Could not get a selection to delete."
-#~ msgstr "Ne mogu da nađem izbor radi brisanja."
-
 #~ msgid "Date/Time"
 #~ msgstr "Datum/vreme"
 


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