Updated Serbian translation

author: Мирослав Николић <miroslavnikolic@rocketmail.com> 2013-01-26 16:15:01 +0800
committer: Мирослав Николић <miroslavnikolic@rocketmail.com> 2013-01-26 16:15:01 +0800
commit: 8da8f425c2aff866a1b31dc68bfaf33330cea29c (patch)
tree: 889510233e7a8da32307db0afb640345ab92b590 /po
parent: 3fa4dfc54dd08d75076d4881207bdc45c3ee29ee (diff)
download: gsoc2013-evolution-8da8f425c2aff866a1b31dc68bfaf33330cea29c.tar
gsoc2013-evolution-8da8f425c2aff866a1b31dc68bfaf33330cea29c.tar.gz
gsoc2013-evolution-8da8f425c2aff866a1b31dc68bfaf33330cea29c.tar.bz2
gsoc2013-evolution-8da8f425c2aff866a1b31dc68bfaf33330cea29c.tar.lz
gsoc2013-evolution-8da8f425c2aff866a1b31dc68bfaf33330cea29c.tar.xz
gsoc2013-evolution-8da8f425c2aff866a1b31dc68bfaf33330cea29c.tar.zst
gsoc2013-evolution-8da8f425c2aff866a1b31dc68bfaf33330cea29c.zip
2 files changed, 9622 insertions, 10072 deletions
diff --git a/po/sr.po b/po/sr.po
index 45955a625d..797924c693 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -4,15 +4,15 @@
 # Maintainer: Игор Несторовић <jung@one.ekof.bg.ac.yu>
 # Reviewed on 2005-08-22 by Игор Несторовић <igor@prevod.org>
 # Милош Поповић <gpopac@gmail.com>, 2010.
-# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011, 2012.
-#: ../shell/main.c:555
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011, 2012, 2013.
+#: ../shell/main.c:573
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolut"
 "ion&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2012-08-24 22:06+0000\n"
-"PO-Revision-Date: 2012-09-06 22:41+0200\n"
+"POT-Creation-Date: 2013-01-24 17:15+0000\n"
+"PO-Revision-Date: 2013-01-26 09:09+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
 "Language: sr\n"
@@ -198,8 +198,8 @@ msgstr ""
 "Контакт са овом адресом већ постоји. Желите ли ипак да додате нову карту са "
 "истом адресом?"
 
-#: ../addressbook/addressbook.error.xml.h:36
-#: ../mail/em-vfolder-editor-rule.c:391 ../widgets/table/e-table-config.ui.h:6
+#: ../addressbook/addressbook.error.xml.h:36 ../e-util/e-table-config.ui.h:6
+#: ../e-util/e-name-selector-dialog.c:966 ../mail/em-vfolder-editor-rule.c:397
 msgid "_Add"
 msgstr "_Додај"
 
@@ -236,7 +236,7 @@ msgstr ""
 "желите да га додате?"
 
 #: ../addressbook/addressbook.error.xml.h:43
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1264
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1258
 msgid "Failed to delete contact"
 msgstr "Нисам успео да обришем контакт"
 
@@ -258,9 +258,9 @@ msgstr ""
 "адресар са бочне траке у прегледу Контакти."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:625
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:647
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2935
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:618
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:640
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2932
 msgid "Contact Editor"
 msgstr "Уређивач за контакте"
 
@@ -298,10 +298,10 @@ msgstr "_Жели да прима ХТМЛ пошту"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
 #: ../addressbook/gui/merging/eab-contact-merging.c:396
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:611
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:973
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../smime/lib/e-cert.c:810
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:606
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:971
+#: ../smime/lib/e-asn1-object.c:395
 msgid "Email"
 msgstr "Ел. пошта"
 
@@ -314,7 +314,7 @@ msgid "Instant Messaging"
 msgstr "Тренутне поруке"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/importers/evolution-vcard-importer.c:1002
+#: ../addressbook/importers/evolution-vcard-importer.c:1004
 msgid "Contact"
 msgstr "Контакт"
 
@@ -323,9 +323,9 @@ msgid "_Home Page:"
 msgstr "_Лична страна:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
-#: ../calendar/gui/dialogs/event-page.c:722
+#: ../calendar/gui/dialogs/event-page.c:709
 #: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../modules/itip-formatter/itip-view.c:1842
+#: ../modules/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_Календар:"
 
@@ -342,7 +342,7 @@ msgid "Home Page:"
 msgstr "Матична страна:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../modules/cal-config-google/evolution-cal-config-google.c:98
+#: ../modules/cal-config-google/evolution-cal-config-google.c:97
 msgid "Calendar:"
 msgstr "Календар:"
 
@@ -376,7 +376,8 @@ msgid "_Profession:"
 msgstr "_Занимање:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+#| msgid "_Title:"
+msgctxt "Job"
 msgid "_Title:"
 msgstr "_Звање:"
 
@@ -417,8 +418,8 @@ msgid "_Anniversary:"
 msgstr "_Годишњица:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:706
-#: ../calendar/gui/e-calendar-view.c:2150
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
+#: ../calendar/gui/e-calendar-view.c:2193
 msgid "Anniversary"
 msgstr "Годишњица"
 
@@ -428,8 +429,8 @@ msgstr "Годишњица"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:705
-#: ../calendar/gui/e-calendar-view.c:2149 ../shell/main.c:129
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:702
+#: ../calendar/gui/e-calendar-view.c:2192 ../shell/main.c:127
 msgid "Birthday"
 msgstr "Рођендан"
 
@@ -467,27 +468,27 @@ msgid "_Address:"
 msgstr "_Адреса:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
-#: ../addressbook/gui/widgets/eab-contact-display.c:399
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:75
-#: ../widgets/misc/e-contact-map.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/widgets/e-contact-map.c:308
+#: ../addressbook/gui/widgets/eab-contact-display.c:389
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:69
 msgid "Home"
 msgstr "Кућа"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-display.c:396
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:74
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:687
-#: ../widgets/misc/e-contact-map.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/e-contact-map.c:316
+#: ../addressbook/gui/widgets/eab-contact-display.c:386
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:68
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:684
 msgid "Work"
 msgstr "Посао"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:76
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:384
-#: ../calendar/gui/e-cal-model.c:3570
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:70
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:379
+#: ../calendar/gui/e-cal-model.c:3550
 msgid "Other"
 msgstr "Друго"
 
@@ -499,79 +500,79 @@ msgstr "Адреса становања"
 msgid "Notes"
 msgstr "Напомене"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:614
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:165
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:609
 msgid "AIM"
 msgstr "АИМ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:617
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:166
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:612
 msgid "Jabber"
 msgstr "Џабер"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:619
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:167
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:614
 msgid "Yahoo"
 msgstr "Јаху"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:620
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:615
 msgid "Gadu-Gadu"
 msgstr "Гаду-Гаду"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:618
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:613
 msgid "MSN"
 msgstr "МСН"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:616
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:611
 msgid "ICQ"
 msgstr "ИЦКу"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:615
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:610
 msgid "GroupWise"
 msgstr "ГроупВајз"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:621
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:616
 msgid "Skype"
 msgstr "Скајп"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:622
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:617
 msgid "Twitter"
 msgstr "Твитер"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:217
-#: ../addressbook/gui/widgets/eab-gui-util.c:497
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:210
+#: ../addressbook/gui/widgets/eab-gui-util.c:493
 msgid "Error adding contact"
 msgstr "Грешка при додавању контакта"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:225
 msgid "Error modifying contact"
 msgstr "Грешка при измени контакта"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:240
 msgid "Error removing contact"
 msgstr "Грешка при уклањању контакта"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:641
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2929
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:634
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2926
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Уређивач за контакте — %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3411
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3447
 msgid "Please select an image for this contact"
 msgstr "Изаберите слику за овај контакт"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3412
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3448
 msgid "_No image"
 msgstr "_Без слике"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3745
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3781
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -579,48 +580,48 @@ msgstr ""
 "Подаци о контакту нису исправни:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3751
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3787
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "„%s“ има неисправан формат"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3758
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3795
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "„%s“ не може бити будући датум"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3766
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3803
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s„%s“ има неисправан формат"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3779
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3793
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3816
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3830
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s„%s“ је празан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3808
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3845
 msgid "Invalid contact."
 msgstr "Неисправан контакт."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:438
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:435
 msgid "Contact Quick-Add"
 msgstr "Брзо додавање контакта"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:438
 msgid "_Edit Full"
 msgstr "_Уреди потпуно"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:491
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:488
 msgid "_Full name"
 msgstr "_Име и презиме"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:502
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:501
 msgid "E_mail"
 msgstr "Е-_пошта"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:513
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:514
 msgid "_Select Address Book"
 msgstr "_Изабери адресар"
 
@@ -677,6 +678,12 @@ msgstr "Име и презиме"
 msgid "_First:"
 msgstr "_Име:"
 
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+#| msgid "_Title:"
+msgctxt "FullName"
+msgid "_Title:"
+msgstr "_Звање:"
+
 #: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_Middle:"
 msgstr "_Средње:"
@@ -690,7 +697,7 @@ msgid "_Suffix:"
 msgstr "_Суфикс:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:764
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:794
 msgid "Contact List Editor"
 msgstr "Уређивач контакт листе"
 
@@ -726,23 +733,23 @@ msgstr "Уметните адресе ел. поште из адресара"
 msgid "_Select..."
 msgstr "_Изабери..."
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:887
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:917
 msgid "Contact List Members"
 msgstr "Чланови контакт листе"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1412
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1443
 msgid "_Members"
 msgstr "_Чланови"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1531
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1562
 msgid "Error adding list"
 msgstr "Грешка при додавању листе"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1546
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1577
 msgid "Error modifying list"
 msgstr "Грешка при измени листе"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1561
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1592
 msgid "Error removing list"
 msgstr "Грешка при уклањању листе"
 
@@ -794,296 +801,25 @@ msgid "Merge Contact"
 msgstr "Припоји контакт"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1072
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
 msgid "Name contains"
 msgstr "Назив садржи"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1065
+#: ../modules/addressbook/e-book-shell-view-actions.c:1059
 msgid "Email begins with"
 msgstr "Е-пошта почиње са"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1058
-#: ../modules/calendar/e-cal-shell-view-actions.c:1798
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/addressbook/e-book-shell-view-actions.c:1052
+#: ../modules/calendar/e-cal-shell-view-actions.c:1797
+#: ../modules/calendar/e-memo-shell-view-actions.c:812
+#: ../modules/calendar/e-task-shell-view-actions.c:1011
 msgid "Any field contains"
 msgstr "Поље које садржи"
 
-# note(slobo): message thread, низ --> бољи превод је расправа
-# note(slobo): понегде сам за summary користио --> „у кратким цртама“
-# note(slobo): за memo сам користио --> белешке
-# note(slobo): upgrading memo: допуна белешке је боље од надоградња белешке
-# note(slobo): set alarm, постави аларм ... проба на пар места --> „навиј сат“
-# note(slobo): filter, филтер -->  пропусник, проба на пар места
-# note(slobo): address book, адресар --> именик на пар места проба
-# note(slobo): spam , Ђубре --> Нежељена пошта
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:93
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:102
-#: ../addressbook/gui/widgets/ea-minicard-view.c:189
-msgid "evolution address book"
-msgstr "Адресар Еволуције"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:162
-msgid "Copy _Email Address"
-msgstr "Умножи електронску _адресу"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:164
-#: ../widgets/misc/e-web-view.c:296 ../widgets/misc/e-web-view-gtkhtml.c:429
-msgid "Copy the email address to the clipboard"
-msgstr "Умножава адресе у списак исечака"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:169
-#: ../widgets/misc/e-web-view.c:301 ../widgets/misc/e-web-view-gtkhtml.c:434
-msgid "_Send New Message To..."
-msgstr "_Пошаљи поруку за..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:171
-#: ../widgets/misc/e-web-view.c:303 ../widgets/misc/e-web-view-gtkhtml.c:436
-msgid "Send a mail message to this address"
-msgstr "Шаље поруку на ову адресу"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:333
-#: ../widgets/misc/e-web-view.c:1102 ../widgets/misc/e-web-view-gtkhtml.c:973
-#, c-format
-msgid "Click to mail %s"
-msgstr "Кликните да пошаљете %s"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:154
-msgid "Open map"
-msgstr "Отворите мапу"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:549
-msgid "List Members:"
-msgstr "Чланови листе:"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:613
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Nickname"
-msgstr "Надимак"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Company"
-msgstr "Предузеће"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:667
-msgid "Department"
-msgstr "Одељење"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:668
-msgid "Profession"
-msgstr "Занимање"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:669
-msgid "Position"
-msgstr "Положај"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:670
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Manager"
-msgstr "Руководилац"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:671
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-msgid "Assistant"
-msgstr "Помоћник"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:672
-msgid "Video Chat"
-msgstr "Видео разговор"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:673
-#: ../modules/calendar/e-cal-shell-view-actions.c:217
-#: ../modules/calendar/e-cal-shell-view-actions.c:246
-#: ../modules/calendar/e-cal-shell-view.c:548
-#: ../plugins/publish-calendar/publish-calendar.ui.h:21
-#: ../widgets/misc/e-send-options.c:546
-msgid "Calendar"
-msgstr "Календар"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:674
-#: ../calendar/gui/dialogs/event-editor.c:127
-#: ../calendar/gui/dialogs/event-editor.c:354
-#: ../plugins/publish-calendar/publish-calendar.ui.h:2
-msgid "Free/Busy"
-msgstr "Слободно/заузето"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:675
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:702
-msgid "Phone"
-msgstr "Телефон"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:676
-msgid "Fax"
-msgstr "Факс"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:677
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:704
-msgid "Address"
-msgstr "Адреса"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:700
-msgid "Home Page"
-msgstr "Матична страница"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:701
-msgid "Web Log"
-msgstr "Веб лог"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "Mobile Phone"
-msgstr "Мобилни телефон"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:707
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-msgid "Spouse"
-msgstr "Супружник"
-
-# Create the default Person calendar
-# Create the default Person task list
-# orange
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:717
-msgid "Personal"
-msgstr "Лично"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:741
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-msgid "Note"
-msgstr "Напомена"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:937
-msgid "List Members"
-msgstr "Чланови листе"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:958
-msgid "Job Title"
-msgstr "Звање на послу"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:999
-msgid "Home page"
-msgstr "Матична страница:"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1009
-msgid "Blog"
-msgstr "Блог"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
-msgid ""
-"This address book cannot be opened. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents."
-msgstr ""
-"Не могу да отворим овај адресар. То значи да он или није означен за "
-"коришћење ван мреже или да још није преузет за рад ван мреже. Учитајте "
-"адресар када се повежете ради преузимања његовог садржаја."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:143
-#, c-format
-msgid ""
-"This address book cannot be opened.  Please check that the path %s exists "
-"and that permissions are set to access it."
-msgstr ""
-"Не могу да отворим овај адресар.  Проверите да ли постоји путања %s и да ли "
-"имате права приступа."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:156
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  To "
-"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
-msgstr ""
-"Ово издање Еволуције нема у себи подршку за ЛДАП.  Уколико желите да "
-"користите ЛДАП у Еволуцији, морате да инсталирате пакет Еволуције са "
-"подршком за ЛДАП."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:165
-msgid ""
-"This address book cannot be opened.  This either means that an incorrect URI "
-"was entered, or the server is unreachable."
-msgstr ""
-"Не могу да отворим овај адресар.  То значи да сте или унели погрешну адресу, "
-"или је сервер недоступан."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:173
-msgid "Detailed error message:"
-msgstr "Детаљи грешке:"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:210
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this address book."
-msgstr ""
-"Број карти које одговарају упиту је већи од броја на који је сервер \n"
-"подешен да одговори или који је Еволуција подешена да прикаже.\n"
-"Прецизније обликујте упит или повећајте ограничење\n"
-"броја резултата у поставкама адресара за сервер директоријума."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"configured for this address book.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this address book."
-msgstr ""
-"Време за извршавање овог упита је преко ограничења сервера или\n"
-"ограничења које сте подесили за овај адресар. Прецизније обликујте\n"
-"упит или повећајте временско ограничење у поставкама сервера\n"
-"директоријума за овај адресар."
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:225
-#, c-format
-msgid "The backend for this address book was unable to parse this query. %s"
-msgstr "Основни процес овог адресара није могао да обради упит. %s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:230
-#, c-format
-msgid "The backend for this address book refused to perform this query. %s"
-msgstr "Основни процес овог адресара је одбио да обави овај упит. %s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:236
-#: ../addressbook/gui/widgets/eab-gui-util.c:242
-#, c-format
-msgid "This query did not complete successfully. %s"
-msgstr "Овај упит није успешно завршен. %s"
-
-#. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:264
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:315
-msgid "Select Address Book"
-msgstr "Изабери адресар"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:397
-msgid "list"
-msgstr "списак"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:586
-msgid "Move contact to"
-msgstr "Премести контакт у"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:588
-msgid "Copy contact to"
-msgstr "Умножи контакт у"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:591
-msgid "Move contacts to"
-msgstr "Премести контакте у"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:593
-msgid "Copy contacts to"
-msgstr "Умножи контакте у"
-
 #: ../addressbook/gui/widgets/e-addressbook-model.c:164
 msgid "No contacts"
 msgstr "Нема контакта"
@@ -1101,63 +837,63 @@ msgstr[3] "један контакт"
 msgid "Error getting book view"
 msgstr "Грешка при учитавању прегледа књиге"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:805
+#: ../addressbook/gui/widgets/e-addressbook-model.c:812
 msgid "Search Interrupted"
 msgstr "Претрага је прекинута"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:160
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:161
 msgid "Error modifying card"
 msgstr "Грешка при измени карте"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:644
+#: ../addressbook/gui/widgets/e-addressbook-view.c:635
 msgid "Cut selected contacts to the clipboard"
 msgstr "Сече означене контакте у списак исечака"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:650
+#: ../addressbook/gui/widgets/e-addressbook-view.c:641
 msgid "Copy selected contacts to the clipboard"
 msgstr "Умножава означене контакте у списак исечака"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:656
+#: ../addressbook/gui/widgets/e-addressbook-view.c:647
 msgid "Paste contacts from the clipboard"
 msgstr "Убацује контакте из списка исечака"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:662
-#: ../modules/addressbook/e-book-shell-view-actions.c:876
+#: ../addressbook/gui/widgets/e-addressbook-view.c:653
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
 msgid "Delete selected contacts"
 msgstr "Брише изабране контакте"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:668
+#: ../addressbook/gui/widgets/e-addressbook-view.c:659
 msgid "Select all visible contacts"
 msgstr "Означава све видљиве контакте"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Сигурно желите да обришете ове листе контакта?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1310
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Сигурно желите да обришете овај списак контакта?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1314
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
-msgstr "Сигурно желите да обришете овај списак контакта (%s) ?"
+msgstr "Сигурно желите да обришете овај списак контакта (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1326
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Сигурно желите да обришете ове контакте?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1324
 msgid "Are you sure you want to delete this contact?"
 msgstr "Сигурно желите да обришете овај контакт?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1334
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1328
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
-msgstr "Сигурно желите да обришете овај контакт (%s) ?"
+msgstr "Сигурно желите да обришете овај контакт (%s)?"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1490
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1178,11 +914,11 @@ msgstr[3] ""
 "Отварање једног контакта ће такође отворити један нови прозор.\n"
 "Да ли заиста желите да прикажете све ове контакте?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1498
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1492
 msgid "_Don't Display"
 msgstr "_Не приказуј"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1499
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1493
 msgid "Display _All Contacts"
 msgstr "Прикажи _све контакте"
 
@@ -1198,6 +934,11 @@ msgstr "Дато име"
 msgid "Family Name"
 msgstr "Презиме"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:608
+msgid "Nickname"
+msgstr "Надимак"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Email 2"
 msgstr "2. електронска адреса"
@@ -1250,6 +991,11 @@ msgstr "Кућни факс"
 msgid "ISDN Phone"
 msgstr "ИСДН телефон"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:700
+msgid "Mobile Phone"
+msgstr "Мобилни телефон"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Other Phone"
 msgstr "Други телефон"
@@ -1284,6 +1030,11 @@ msgstr "Телекс"
 msgid "TTYTDD"
 msgstr "ТТУТДД"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:663
+msgid "Company"
+msgstr "Предузеће"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Unit"
 msgstr "Јединица"
@@ -1297,11 +1048,21 @@ msgid "Title"
 msgstr "Титула"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:657
+#: ../calendar/gui/e-meeting-list-view.c:663
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Улога"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:667
+msgid "Manager"
+msgstr "Руководилац"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:668
+msgid "Assistant"
+msgstr "Помоћник"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
 msgstr "Веб страница"
@@ -1314,57 +1075,25 @@ msgstr "Дневник"
 #: ../calendar/gui/dialogs/event-page.ui.h:20
 #: ../calendar/gui/e-calendar-table.etspec.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:6
-#: ../calendar/gui/e-memo-table.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../e-util/e-categories-dialog.c:89
 msgid "Categories"
 msgstr "Категорије"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:34
-msgid "Open"
-msgstr "Отвори"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:156
-msgid "Contact List: "
-msgstr "Списак контакта: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:157
-msgid "Contact: "
-msgstr "Контакт: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:183
-msgid "evolution minicard"
-msgstr "миникарта еволуције"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
-msgid "New Contact"
-msgstr "Нови контакт"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:37
-msgid "New Contact List"
-msgstr "Нова контакт листа"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:172
-#, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "тренутна фасцикла адресара %s има %d карту"
-msgstr[1] "тренутна фасцикла адресара %s има %d карте"
-msgstr[2] "тренутна фасцикла адресара %s има %d карти"
-msgstr[3] "тренутна фасцикла адресара %s има једну карту"
-
-#: ../addressbook/gui/widgets/e-minicard.c:93
-msgid "Work Email"
-msgstr "Пословна ел. пошта"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:704
+msgid "Spouse"
+msgstr "Супружник"
 
-#: ../addressbook/gui/widgets/e-minicard.c:94
-msgid "Home Email"
-msgstr "Кућна ел. пошта"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:738
+msgid "Note"
+msgstr "Напомена"
 
-#: ../addressbook/gui/widgets/e-minicard.c:95
-#: ../addressbook/gui/widgets/e-minicard.c:775
-msgid "Other Email"
-msgstr "Друга ел. пошта"
+#: ../addressbook/gui/widgets/e-contact-map-window.c:364
+msgid "Contacts Map"
+msgstr "Карта контаката"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -1374,7 +1103,7 @@ msgstr ""
 "\n"
 "Тражим контакте..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:194
 msgid ""
 "\n"
 "\n"
@@ -1388,7 +1117,7 @@ msgstr ""
 "\n"
 "или кликните двапут овде да направите нови контакт."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:194
+#: ../addressbook/gui/widgets/e-minicard-view.c:197
 msgid ""
 "\n"
 "\n"
@@ -1402,7 +1131,7 @@ msgstr ""
 "\n"
 "Кликните двапут да направите нов контакт."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:198
+#: ../addressbook/gui/widgets/e-minicard-view.c:201
 msgid ""
 "\n"
 "\n"
@@ -1412,7 +1141,7 @@ msgstr ""
 "\n"
 "Претрага за контактима."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:200
+#: ../addressbook/gui/widgets/e-minicard-view.c:203
 msgid ""
 "\n"
 "\n"
@@ -1422,48 +1151,330 @@ msgstr ""
 "\n"
 "Нема ставки за приказивање."
 
+#: ../addressbook/gui/widgets/e-minicard.c:93
+msgid "Work Email"
+msgstr "Пословна ел. пошта"
+
+#: ../addressbook/gui/widgets/e-minicard.c:94
+msgid "Home Email"
+msgstr "Кућна ел. пошта"
+
+#: ../addressbook/gui/widgets/e-minicard.c:95
+#: ../addressbook/gui/widgets/e-minicard.c:828
+msgid "Other Email"
+msgstr "Друга ел. пошта"
+
+# note(slobo): message thread, низ --> бољи превод је расправа
+# note(slobo): понегде сам за summary користио --> „у кратким цртама“
+# note(slobo): за memo сам користио --> белешке
+# note(slobo): upgrading memo: допуна белешке је боље од надоградња белешке
+# note(slobo): set alarm, постави аларм ... проба на пар места --> „навиј сат“
+# note(slobo): filter, филтер -->  пропусник, проба на пар места
+# note(slobo): address book, адресар --> именик на пар места проба
+# note(slobo): spam , Ђубре --> Нежељена пошта
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
+#: ../addressbook/gui/widgets/ea-minicard-view.c:194
+msgid "evolution address book"
+msgstr "Адресар Еволуције"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+msgid "New Contact"
+msgstr "Нови контакт"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:37
+msgid "New Contact List"
+msgstr "Нова контакт листа"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:177
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "тренутна фасцикла адресара %s има %d карту"
+msgstr[1] "тренутна фасцикла адресара %s има %d карте"
+msgstr[2] "тренутна фасцикла адресара %s има %d карти"
+msgstr[3] "тренутна фасцикла адресара %s има једну карту"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:34
+msgid "Open"
+msgstr "Отвори"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:160
+msgid "Contact List: "
+msgstr "Списак контакта: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:161
+msgid "Contact: "
+msgstr "Контакт: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:188
+msgid "evolution minicard"
+msgstr "миникарта еволуције"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:152
+msgid "Copy _Email Address"
+msgstr "Умножи електронску _адресу"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:154
+#: ../e-util/e-web-view-gtkhtml.c:428 ../e-util/e-web-view.c:295
+msgid "Copy the email address to the clipboard"
+msgstr "Умножава адресе у списак исечака"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:159
+#: ../e-util/e-web-view-gtkhtml.c:433 ../e-util/e-web-view.c:300
+msgid "_Send New Message To..."
+msgstr "_Пошаљи поруку за..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:161
+#: ../e-util/e-web-view-gtkhtml.c:435 ../e-util/e-web-view.c:302
+msgid "Send a mail message to this address"
+msgstr "Шаље поруку на ову адресу"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:323
+#: ../e-util/e-web-view-gtkhtml.c:972 ../e-util/e-web-view.c:1084
+#, c-format
+msgid "Click to mail %s"
+msgstr "Кликните да пошаљете %s"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:148
+msgid "Open map"
+msgstr "Отворите мапу"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:544
+msgid "List Members:"
+msgstr "Чланови листе:"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:664
+msgid "Department"
+msgstr "Одељење"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:665
+msgid "Profession"
+msgstr "Занимање"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
+msgid "Position"
+msgstr "Положај"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:669
+msgid "Video Chat"
+msgstr "Видео разговор"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:670
+#: ../e-util/e-send-options.c:546
+#: ../modules/calendar/e-cal-shell-view-actions.c:216
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
+#: ../modules/calendar/e-cal-shell-view.c:548
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Calendar"
+msgstr "Календар"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:671
+#: ../calendar/gui/dialogs/event-editor.c:122
+#: ../calendar/gui/dialogs/event-editor.c:349
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Free/Busy"
+msgstr "Слободно/заузето"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:672
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:699
+msgid "Phone"
+msgstr "Телефон"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:673
+msgid "Fax"
+msgstr "Факс"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:674
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:701
+msgid "Address"
+msgstr "Адреса"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:697
+msgid "Home Page"
+msgstr "Матична страница"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:698
+msgid "Web Log"
+msgstr "Веб лог"
+
+# Create the default Person calendar
+# Create the default Person task list
+# orange
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:714
+msgid "Personal"
+msgstr "Лично"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:935
+msgid "List Members"
+msgstr "Чланови листе"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:956
+msgid "Job Title"
+msgstr "Звање на послу"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:997
+msgid "Home page"
+msgstr "Матична страница"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1007
+msgid "Blog"
+msgstr "Блог"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:118
+msgid ""
+"This address book cannot be opened. This either means this book is not "
+"marked for offline usage or not yet downloaded for offline usage. Please "
+"load the address book once in online mode to download its contents."
+msgstr ""
+"Не могу да отворим овај адресар. То значи да он или није означен за "
+"коришћење ван мреже или да још није преузет за рад ван мреже. Учитајте "
+"адресар када се повежете ради преузимања његовог садржаја."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
+#, c-format
+msgid ""
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
+msgstr ""
+"Не могу да отворим овај адресар.  Проверите да ли постоји путања %s и да ли "
+"имате права приступа."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:150
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
+msgstr ""
+"Ово издање Еволуције нема у себи подршку за ЛДАП.  Уколико желите да "
+"користите ЛДАП у Еволуцији, морате да инсталирате пакет Еволуције са "
+"подршком за ЛДАП."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
+msgid ""
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
+msgstr ""
+"Не могу да отворим овај адресар.  То значи да сте или унели погрешну адресу, "
+"или је сервер недоступан."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
+msgid "Detailed error message:"
+msgstr "Детаљи грешке:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:204
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this address book."
+msgstr ""
+"Број карти које одговарају упиту је већи од броја на који је сервер \n"
+"подешен да одговори или који је Еволуција подешена да прикаже.\n"
+"Прецизније обликујте упит или повећајте ограничење\n"
+"броја резултата у поставкама адресара за сервер директоријума."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"configured for this address book.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this address book."
+msgstr ""
+"Време за извршавање овог упита је преко ограничења сервера или\n"
+"ограничења које сте подесили за овај адресар. Прецизније обликујте\n"
+"упит или повећајте временско ограничење у поставкама сервера\n"
+"директоријума за овај адресар."
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:219
+#, c-format
+msgid "The backend for this address book was unable to parse this query. %s"
+msgstr "Основни процес овог адресара није могао да обради упит. %s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#, c-format
+msgid "The backend for this address book refused to perform this query. %s"
+msgstr "Основни процес овог адресара је одбио да обави овај упит. %s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:230
+#: ../addressbook/gui/widgets/eab-gui-util.c:236
+#, c-format
+msgid "This query did not complete successfully. %s"
+msgstr "Овај упит није успешно завршен. %s"
+
+#. This is a filename. Translators take note.
+#: ../addressbook/gui/widgets/eab-gui-util.c:258
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:309
+msgid "Select Address Book"
+msgstr "Изабери адресар"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:391
+msgid "list"
+msgstr "списак"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:582
+msgid "Move contact to"
+msgstr "Премести контакт у"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:584
+msgid "Copy contact to"
+msgstr "Умножи контакт у"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:587
+msgid "Move contacts to"
+msgstr "Премести контакте у"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:589
+msgid "Copy contacts to"
+msgstr "Умножи контакте у"
+
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:38
 msgid "Card View"
 msgstr "Преглед карте"
 
-#: ../addressbook/importers/evolution-csv-importer.c:746
-#: ../addressbook/importers/evolution-ldif-importer.c:544
+#: ../addressbook/importers/evolution-csv-importer.c:744
+#: ../addressbook/importers/evolution-ldif-importer.c:543
 #: ../addressbook/importers/evolution-vcard-importer.c:279
-#: ../calendar/importers/icalendar-importer.c:446
-#: ../calendar/importers/icalendar-importer.c:939
-#: ../calendar/importers/icalendar-importer.c:978 ../shell/shell.error.xml.h:1
+#: ../calendar/importers/icalendar-importer.c:441
+#: ../calendar/importers/icalendar-importer.c:936
+#: ../calendar/importers/icalendar-importer.c:975 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Увозим..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1084
+#: ../addressbook/importers/evolution-csv-importer.c:1082
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Аутлук контакти ЦСВ или Таб (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1085
+#: ../addressbook/importers/evolution-csv-importer.c:1083
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Аутлуков увозник ЦСВ и Таб контаката"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1093
+#: ../addressbook/importers/evolution-csv-importer.c:1091
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Мозила контакти ЦСВ или Таб (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1094
+#: ../addressbook/importers/evolution-csv-importer.c:1092
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Мозилин увозник ЦСВ и Таб контаката"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1102
+#: ../addressbook/importers/evolution-csv-importer.c:1100
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Еволуција контакти ЦСВ или Таб (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1103
+#: ../addressbook/importers/evolution-csv-importer.c:1101
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Еволуцијин увозник ЦСВ и Таб контаката"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:805
+#: ../addressbook/importers/evolution-ldif-importer.c:804
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "ЛДАП облик размене података (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:806
+#: ../addressbook/importers/evolution-ldif-importer.c:805
 msgid "Evolution LDIF importer"
 msgstr "Еволуцијин ЛДИФ увозник"
 
@@ -1477,7 +1488,7 @@ msgstr "Еволуцијин вКарт увозник"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:717
+#: ../addressbook/printing/e-contact-print.c:764
 #, c-format
 msgid "Page %d"
 msgstr "%d. страница"
@@ -1552,7 +1563,7 @@ msgstr "Не могу да отворим датотеку"
 msgid "Failed to open client '%s': %s"
 msgstr "Нисам успео да отворим „%s“: %s"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:108
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:106
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минут"
@@ -1560,7 +1571,7 @@ msgstr[1] "минута"
 msgstr[2] "минута"
 msgstr[3] "минут"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:121
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:119
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "сат"
@@ -1571,8 +1582,8 @@ msgstr[3] "сат"
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:134
-#: ../calendar/gui/dialogs/recurrence-page.c:1195
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:132
+#: ../calendar/gui/dialogs/recurrence-page.c:1204
 msgid "day"
 msgid_plural "days"
 msgstr[0] "дан"
@@ -1580,7 +1591,7 @@ msgstr[1] "дана"
 msgstr[2] "дана"
 msgstr[3] "дан"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:330
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:329
 msgid "Start time"
 msgstr "Време почетка"
 
@@ -1596,17 +1607,16 @@ msgstr "Занемари _све"
 msgid "_Snooze"
 msgstr "_Дремање"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4
-#: ../libevolution-utils/e-alert-dialog.c:162
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../e-util/e-alert-dialog.c:162
 msgid "_Dismiss"
 msgstr "_Занемари"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#: ../calendar/alarm-notify/alarm-queue.c:1755
-#: ../calendar/alarm-notify/alarm-queue.c:1765
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:191
-#: ../modules/itip-formatter/itip-view.c:1460
-#: ../modules/itip-formatter/itip-view.c:1569
+#: ../calendar/alarm-notify/alarm-queue.c:1766
+#: ../calendar/alarm-notify/alarm-queue.c:1776
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:190
+#: ../modules/itip-formatter/itip-view.c:1464
+#: ../modules/itip-formatter/itip-view.c:1575
 msgid "Location:"
 msgstr "Место:"
 
@@ -1621,46 +1631,51 @@ msgstr "Време _дремања:"
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../filter/filter.ui.h:8
-#: ../modules/calendar/e-cal-shell-view-actions.c:353
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../e-util/filter.ui.h:8
+#: ../e-util/e-interval-chooser.c:143
+#: ../modules/calendar/e-cal-shell-view-actions.c:352
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
-#: ../widgets/misc/e-interval-chooser.c:143
 msgid "days"
 msgstr "дана"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:18 ../filter/filter.ui.h:7
-#: ../widgets/misc/e-interval-chooser.c:141
+#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/filter.ui.h:7
+#: ../e-util/e-interval-chooser.c:141
 msgid "hours"
 msgstr "сати"
 
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:19 ../filter/filter.ui.h:6
+#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/filter.ui.h:6
+#: ../e-util/e-interval-chooser.c:139
 #: ../mail/e-mail-config-provider-page.c:527
-#: ../modules/addressbook/ldap-config.ui.h:29
-#: ../widgets/misc/e-interval-chooser.c:139
 msgid "minutes"
 msgstr "минута"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1604
-#: ../calendar/alarm-notify/alarm-queue.c:1736
+#: ../calendar/alarm-notify/alarm-queue.c:1612
+#: ../calendar/alarm-notify/alarm-queue.c:1746
 msgid "No summary available."
 msgstr "Нема доступног сажетка."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1613
-#: ../calendar/alarm-notify/alarm-queue.c:1615
+#: ../calendar/alarm-notify/alarm-queue.c:1621
+#: ../calendar/alarm-notify/alarm-queue.c:1623
 msgid "No description available."
 msgstr "Нема доступног описа."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1623
+#: ../calendar/alarm-notify/alarm-queue.c:1631
 msgid "No location information available."
 msgstr "Нема доступног податка о локацији."
 
+#: ../calendar/alarm-notify/alarm-queue.c:1636
+#: ../calendar/alarm-notify/alarm-queue.c:1737
+#: ../calendar/alarm-notify/alarm-queue.c:2099
+#| msgid "Evolution Restore"
+msgid "Evolution Reminders"
+msgstr "Подсетници Еволуције"
+
 # bug(slobo): plural-forms. Report this one to bugzilla.gnome.org
-#: ../calendar/alarm-notify/alarm-queue.c:1669
+#: ../calendar/alarm-notify/alarm-queue.c:1679
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
@@ -1669,12 +1684,12 @@ msgstr[1] "Имате %d потсетника"
 msgstr[2] "Имате %d потсетника"
 msgstr[3] "Имате један потсетник"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1865
-#: ../calendar/alarm-notify/alarm-queue.c:1900
+#: ../calendar/alarm-notify/alarm-queue.c:1884
+#: ../calendar/alarm-notify/alarm-queue.c:1919
 msgid "Warning"
 msgstr "Упозорење"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1869
+#: ../calendar/alarm-notify/alarm-queue.c:1888
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -1686,7 +1701,7 @@ msgstr ""
 "је подешен да пошаље поруку.  Еволуција ће\n"
 "уместо тога приказати нормално прозорче."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1906
+#: ../calendar/alarm-notify/alarm-queue.c:1925
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1703,7 +1718,7 @@ msgstr ""
 "\n"
 "Да ли сте сигурни да желите да покренете овај програм?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1921
+#: ../calendar/alarm-notify/alarm-queue.c:1940
 msgid "Do not ask me about this program again."
 msgstr "Не питај ме поново за овај програм."
 
@@ -1768,7 +1783,7 @@ msgid "_Send Notice"
 msgstr "Пошаљи по_дсетник"
 
 #: ../calendar/calendar.error.xml.h:5
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/gui/dialogs/delete-comp.c:193
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Сигурно желите да обришете овај састанак?"
@@ -1788,7 +1803,7 @@ msgstr ""
 "знати да је задатак обрисан."
 
 #: ../calendar/calendar.error.xml.h:9
-#: ../calendar/gui/dialogs/delete-comp.c:192
+#: ../calendar/gui/dialogs/delete-comp.c:196
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Сигурно желите да обришете овај задатак?"
@@ -1813,7 +1828,7 @@ msgstr ""
 "знати да је белешка обрисана."
 
 #: ../calendar/calendar.error.xml.h:13
-#: ../calendar/gui/dialogs/delete-comp.c:195
+#: ../calendar/gui/dialogs/delete-comp.c:199
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Сигурно желите да обришете ову белешку?"
@@ -1982,8 +1997,7 @@ msgstr ""
 "Преузимање неколико прилога је у току. Уколико сада сачувате задатак ови "
 "прилози неће бити сачувани са њим."
 
-#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:316
-#: ../modules/itip-formatter/itip-view.c:3078
+#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:315
 msgid "_Save"
 msgstr "_Сачувај"
 
@@ -2068,40 +2082,49 @@ msgid "This memo list will be removed permanently."
 msgstr "Овај списак белешки ће бити трајно уклоњен."
 
 #: ../calendar/calendar.error.xml.h:66
-msgid "Delete remote calendar &quot;{0}&quot;?"
+#| msgid "Delete calendar '{0}'?"
+msgid "Delete remote calendar '{0}'?"
 msgstr "Да обришем удаљени календар „{0}“?"
 
 #: ../calendar/calendar.error.xml.h:67
+#| msgid ""
+#| "This will permanently remove the calendar &quot;{0}&quot; from the "
+#| "server. Are you sure you want to proceed?"
 msgid ""
-"This will permanently remove the calendar &quot;{0}&quot; from the server. "
-"Are you sure you want to proceed?"
+"This will permanently remove the calendar '{0}' from the server. Are you "
+"sure you want to proceed?"
 msgstr ""
 "Ово ће трајно уклонити календар „{0}“ са сервера. Да ли сте сигурни да "
 "желите да наставите?"
 
 #: ../calendar/calendar.error.xml.h:69
-msgid "Delete remote task list &quot;{0}&quot;?"
+#| msgid "Delete task list '{0}'?"
+msgid "Delete remote task list '{0}'?"
 msgstr "Да обришем удаљени списак задатака „{0}“?"
 
 #: ../calendar/calendar.error.xml.h:70
+#| msgid ""
+#| "This will permanently remove the task list &quot;{0}&quot; from the "
+#| "server. Are you sure you want to proceed?"
 msgid ""
-"This will permanently remove the task list &quot;{0}&quot; from the server. "
-"Are you sure you want to proceed?"
+"This will permanently remove the task list '{0}' from the server. Are you "
+"sure you want to proceed?"
 msgstr ""
 "Ово ће трајно уклонити списак задатака „{0}“ са сервера. Да ли сте сигурни "
 "да желите да наставите?"
 
 #: ../calendar/calendar.error.xml.h:71
-msgid "Delete remote memo list &quot;{0}&quot;?"
+#| msgid "Delete memo list '{0}'?"
+msgid "Delete remote memo list '{0}'?"
 msgstr "Да обришем удаљени списак белешки „{0}“?"
 
 #: ../calendar/calendar.error.xml.h:72
 #| msgid ""
-#| "This will permanently remote the memo list &quot;{0}&quot; from the "
+#| "This will permanently remove the memo list &quot;{0}&quot; from the "
 #| "server. Are you sure you want to proceed?"
 msgid ""
-"This will permanently remove the memo list &quot;{0}&quot; from the server. "
-"Are you sure you want to proceed?"
+"This will permanently remove the memo list '{0}' from the server. Are you "
+"sure you want to proceed?"
 msgstr ""
 "Ово ће трајно уклонити списак белешки „{0}“ са сервера. Да ли сте сигурни да "
 "желите да наставите?"
@@ -2134,33 +2157,23 @@ msgstr ""
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "Сигурно желите да сачувате белешку без сажетка?"
 
-#: ../calendar/calendar.error.xml.h:78
-msgid "Error loading calendar"
-msgstr "Грешка при учитавању календара"
+#. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
+#. {1} is replaced with a calendar/task/memo list name, where the error happened
+#: ../calendar/calendar.error.xml.h:80
+#| msgid "Error loading calendar"
+msgid "Error loading calendar '{0}: {1}'"
+msgstr "Грешка учитавања календара „{0}: {1}“"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:81
 msgid "The calendar is not marked for offline usage."
 msgstr "Овај календар није означен за коришћење ван мреже."
 
-#: ../calendar/calendar.error.xml.h:80
-msgid "Cannot create a new event"
-msgstr "Не могу да направим нови догађај"
-
-#. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:82
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar from the side bar in the Calendar view."
-msgstr ""
-"Календар „{0}“ је само за читање и није подложан изменама. Изаберите други "
-"календар са бочне траке у прегледу календара."
-
-#: ../calendar/calendar.error.xml.h:83
 msgid "Cannot save event"
 msgstr "Не могу да сачувам догађај"
 
-#. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:85
+#. Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:84
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
@@ -2168,45 +2181,55 @@ msgstr ""
 "Календар „{0}“ је само за читање и не може бити измењен. Изаберите други "
 "календар који прихвата заказивање."
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:85
 msgid "Cannot save task"
 msgstr "Не могу да сачувам задатак"
 
-#. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:88
+#. Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:87
 msgid ""
 "'{0}' does not support assigned tasks, please select a different task list."
 msgstr ""
 "„{0}“ не подржава додељене задатке, молим изаберите другачији списак "
 "задатака."
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "Error loading task list"
-msgstr "Грешка при учитавању списка задатака"
-
+#. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
+#. {1} is replaced with a calendar/task/memo list name, where the error happened
 #: ../calendar/calendar.error.xml.h:90
+#| msgid "Error loading task list"
+msgid "Error loading task list '{0}: {1}'"
+msgstr "Грешка учитавања списка задатака „{0}: {1}“"
+
+#: ../calendar/calendar.error.xml.h:91
 msgid "The task list is not marked for offline usage."
 msgstr "Списак задатака није означен за коришћење ван мреже."
 
-#: ../calendar/calendar.error.xml.h:91
-msgid "Error loading memo list"
-msgstr "Грешка при учитавању списка белешки"
+#. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
+#. {1} is replaced with a calendar/task/memo list name, where the error happened
+#: ../calendar/calendar.error.xml.h:94
+#| msgid "Error loading memo list"
+msgid "Error loading memo list '{0}: {1}'"
+msgstr "Грешка учитавања списка белешки „{0}: {1}“"
 
-#: ../calendar/calendar.error.xml.h:92
+#: ../calendar/calendar.error.xml.h:95
 msgid "The memo list is not marked for offline usage."
 msgstr "Списак белешки није означен за коришћење ван мреже."
 
 #. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
 #. {1} is replaced with a calendar/task/memo list name, where the error happened
-#: ../calendar/calendar.error.xml.h:95
-msgid "Error on {0}: {1}"
-msgstr "Грешка {0}а: {1}"
+#: ../calendar/calendar.error.xml.h:98
+#| msgid "Error on {0}: {1}"
+msgid "Error on '{0}: {1}'"
+msgstr "Грешка на „{0}: {1}“"
 
-#: ../calendar/calendar.error.xml.h:96
-msgid "Could not perform this operation."
-msgstr "Не могу да извршим радњу."
+#. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
+#. {1} is replaced with a calendar/task/memo list name, where the error happened
+#: ../calendar/calendar.error.xml.h:101
+#| msgid "Could not perform this operation on {0}."
+msgid "Could not perform this operation on '{0}: {1}'."
+msgstr "Не могу да извршим ову радњу над „{0}: {1}“."
 
-#: ../calendar/calendar.error.xml.h:97 ../mail/mail.error.xml.h:167
+#: ../calendar/calendar.error.xml.h:102 ../mail/mail.error.xml.h:167
 msgid "You must be working online to complete this operation."
 msgstr "Морате да будете на мрежи да бисте завршили ову радњу."
 
@@ -2235,20 +2258,19 @@ msgid "Summary"
 msgstr "Сажетак"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:11
 msgid "contains"
 msgstr "садржи"
 
 #: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:17
 msgid "does not contain"
 msgstr "не садржи"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/plugin-manager/evolution-plugin-manager.c:70
-#: ../widgets/misc/e-attachment-tree-view.c:528
-#: ../widgets/table/e-table-config.ui.h:24
+#: ../e-util/e-table-config.ui.h:24 ../e-util/e-attachment-tree-view.c:528
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
 msgid "Description"
 msgstr "Опис"
 
@@ -2262,30 +2284,30 @@ msgid "Classification"
 msgstr "Разврставање"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:8
-#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:33
+#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:34
 msgid "is"
 msgstr "је"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:39
+#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:40
 msgid "is not"
 msgstr "није"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:829 ../calendar/gui/e-cal-model.c:836
-#: ../calendar/gui/e-task-table.c:555 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:234
+#: ../calendar/gui/e-cal-model.c:841 ../calendar/gui/e-cal-model.c:848
+#: ../calendar/gui/e-task-table.c:545 ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "Јавно"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:838 ../calendar/gui/e-task-table.c:556
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:235
+#: ../calendar/gui/e-cal-model.c:850 ../calendar/gui/e-task-table.c:546
 #: ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "Лично"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:840 ../calendar/gui/e-task-table.c:557
-#: ../calendar/gui/memotypes.xml.h:12 ../widgets/misc/e-send-options.ui.h:7
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:236
+#: ../calendar/gui/e-cal-model.c:852 ../calendar/gui/e-task-table.c:547
+#: ../calendar/gui/memotypes.xml.h:12 ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Поверљиво"
 
@@ -2302,37 +2324,37 @@ msgstr "Учесник"
 
 #: ../calendar/gui/caltypes.xml.h:14
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
-#: ../plugins/publish-calendar/publish-calendar.c:870
+#: ../plugins/publish-calendar/publish-calendar.c:883
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
 #: ../plugins/save-calendar/csv-format.c:386
 msgid "Location"
 msgstr "Место"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:328
 msgid "Category"
 msgstr "Категорија"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
-#: ../em-format/e-mail-formatter-print-headers.c:198
-#: ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:56
+#: ../em-format/e-mail-formatter-print-headers.c:187
+#: ../mail/em-filter-i18n.h:6
 msgid "Attachments"
 msgstr "Прилози"
 
 #: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:26
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:27
 msgid "Exist"
 msgstr "Постоји"
 
 #: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:23
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:24
 msgid "Do Not Exist"
 msgstr "Не постоји"
 
 #: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/dialogs/event-editor.c:321
-#: ../calendar/gui/dialogs/event-editor.c:342
+#: ../calendar/gui/dialogs/event-editor.c:316
+#: ../calendar/gui/dialogs/event-editor.c:337
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:15
 msgid "Recurrence"
 msgstr "Понављање"
@@ -2363,26 +2385,26 @@ msgstr "Сажетак садржи"
 msgid "Description Contains"
 msgstr "Описи"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:632
+#: ../calendar/gui/dialogs/alarm-dialog.c:631
 msgid "Edit Reminder"
 msgstr "Уреди подсетник"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:823
+#: ../calendar/gui/dialogs/alarm-dialog.c:822
 #: ../calendar/gui/e-alarm-list.c:412
 msgid "Pop up an alert"
 msgstr "Искачуће упозорење"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:824
+#: ../calendar/gui/dialogs/alarm-dialog.c:823
 #: ../calendar/gui/e-alarm-list.c:408
 msgid "Play a sound"
 msgstr "Пушта звук"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:825
+#: ../calendar/gui/dialogs/alarm-dialog.c:824
 #: ../calendar/gui/e-alarm-list.c:420
 msgid "Run a program"
 msgstr "Покреће програм"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:826
+#: ../calendar/gui/dialogs/alarm-dialog.c:825
 #: ../calendar/gui/e-alarm-list.c:416
 msgid "Send an email"
 msgstr "Шаље електронску поруку"
@@ -2421,7 +2443,7 @@ msgid "Add Reminder"
 msgstr "Додај подсетник"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-#: ../calendar/gui/dialogs/event-editor.c:364
+#: ../calendar/gui/dialogs/event-editor.c:359
 msgid "Reminder"
 msgstr "Подсетник"
 
@@ -2500,309 +2522,305 @@ msgstr "Овај задатак је обрисан."
 msgid "This memo has been deleted."
 msgstr "Ова белешка је обрисана."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Начинили сте измене. Да занемарим те измене и да затворим уређивач?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:80
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Нисте начинили измене, да затворим уређивач?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:85
 msgid "This event has been changed."
 msgstr "Овај догађај је измењен."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:89
 msgid "This task has been changed."
 msgstr "Овај задатак је измењен."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:93
 msgid "This memo has been changed."
 msgstr "Ова белешка је измењена."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Начинили сте измене. Да занемарим те измене и да освежим уређивач?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:105
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Нисте начинили измене, да освежим уређивач?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:278
+#: ../calendar/gui/dialogs/comp-editor.c:269
 msgid "Could not save attachments"
 msgstr "Не могу да сачувам прилоге"
 
-#: ../calendar/gui/dialogs/comp-editor.c:629
+#: ../calendar/gui/dialogs/comp-editor.c:621
 msgid "Could not update object"
 msgstr "Не могу да освежим објекат"
 
-#: ../calendar/gui/dialogs/comp-editor.c:763
+#: ../calendar/gui/dialogs/comp-editor.c:755
 msgid "Edit Appointment"
 msgstr "Уреди заказивање"
 
-#: ../calendar/gui/dialogs/comp-editor.c:770
+#: ../calendar/gui/dialogs/comp-editor.c:762
 #, c-format
 msgid "Meeting - %s"
 msgstr "Састанак — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:772
+#: ../calendar/gui/dialogs/comp-editor.c:764
 #, c-format
 msgid "Appointment - %s"
 msgstr "Заказивање — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:778
+#: ../calendar/gui/dialogs/comp-editor.c:770
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Додељен задатак — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:780
+#: ../calendar/gui/dialogs/comp-editor.c:772
 #, c-format
 msgid "Task - %s"
 msgstr "Задатак — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:785
+#: ../calendar/gui/dialogs/comp-editor.c:777
 #, c-format
 msgid "Memo - %s"
 msgstr "Белешка — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:801
+#: ../calendar/gui/dialogs/comp-editor.c:793
 msgid "No Summary"
 msgstr "Без сажетка"
 
-#: ../calendar/gui/dialogs/comp-editor.c:922
+#: ../calendar/gui/dialogs/comp-editor.c:914
 msgid "Keep original item?"
 msgstr "Задржати оригиналну ставку?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1157
+#: ../calendar/gui/dialogs/comp-editor.c:1151
 msgid "Close the current window"
 msgstr "Затворите тренутни прозор"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1164 ../mail/e-mail-browser.c:134
-#: ../shell/e-shell-window-actions.c:1446
-#: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:558
-#: ../widgets/misc/e-web-view.c:323 ../widgets/misc/e-web-view.c:1428
-#: ../widgets/misc/e-web-view-gtkhtml.c:456
-#: ../widgets/misc/e-web-view-gtkhtml.c:1299
+#: ../calendar/gui/dialogs/comp-editor.c:1158 ../e-util/e-focus-tracker.c:121
+#: ../e-util/e-focus-tracker.c:558 ../e-util/e-web-view-gtkhtml.c:455
+#: ../e-util/e-web-view-gtkhtml.c:1298 ../e-util/e-web-view.c:322
+#: ../e-util/e-web-view.c:1407 ../mail/e-mail-browser.c:130
+#: ../shell/e-shell-window-actions.c:876
 msgid "Copy the selection"
 msgstr "Умножите изабрано"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1171 ../mail/e-mail-browser.c:141
-#: ../shell/e-shell-window-actions.c:1453
-#: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:553
-#: ../widgets/misc/e-web-view.c:1422 ../widgets/misc/e-web-view-gtkhtml.c:1293
+#: ../calendar/gui/dialogs/comp-editor.c:1165 ../e-util/e-focus-tracker.c:114
+#: ../e-util/e-focus-tracker.c:553 ../e-util/e-web-view-gtkhtml.c:1292
+#: ../e-util/e-web-view.c:1401 ../mail/e-mail-browser.c:137
+#: ../shell/e-shell-window-actions.c:883
 msgid "Cut the selection"
 msgstr "Исеците изабрано"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1178
-#: ../shell/e-shell-window-actions.c:1460
-#: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:568
+#: ../calendar/gui/dialogs/comp-editor.c:1172 ../e-util/e-focus-tracker.c:135
+#: ../e-util/e-focus-tracker.c:568 ../shell/e-shell-window-actions.c:890
 msgid "Delete the selection"
 msgstr "Обришите избор"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1185
+#: ../calendar/gui/dialogs/comp-editor.c:1179
 msgid "View help"
 msgstr "Погледај помоћ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1192 ../mail/e-mail-browser.c:148
-#: ../shell/e-shell-window-actions.c:1481
-#: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:563
-#: ../widgets/misc/e-web-view.c:1434 ../widgets/misc/e-web-view-gtkhtml.c:1305
+#: ../calendar/gui/dialogs/comp-editor.c:1186 ../e-util/e-focus-tracker.c:128
+#: ../e-util/e-focus-tracker.c:563 ../e-util/e-web-view-gtkhtml.c:1304
+#: ../e-util/e-web-view.c:1413 ../mail/e-mail-browser.c:144
+#: ../shell/e-shell-window-actions.c:911
 msgid "Paste the clipboard"
 msgstr "Убаците из списка исечака"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1213
+#: ../calendar/gui/dialogs/comp-editor.c:1207
 msgid "Save current changes"
 msgstr "Сачувајте текуће измене"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1218
-#: ../widgets/misc/e-mail-signature-editor.c:294
+#: ../calendar/gui/dialogs/comp-editor.c:1212
+#: ../e-util/e-mail-signature-editor.c:301
 msgid "Save and Close"
 msgstr "Сачувај и затвори"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1220
+#: ../calendar/gui/dialogs/comp-editor.c:1214
 msgid "Save current changes and close editor"
 msgstr "Сачувајте текуће измене и затворите уређивач"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1227 ../mail/e-mail-browser.c:155
-#: ../shell/e-shell-window-actions.c:1558
-#: ../widgets/misc/e-focus-tracker.c:142 ../widgets/misc/e-focus-tracker.c:573
+#: ../calendar/gui/dialogs/comp-editor.c:1221 ../e-util/e-focus-tracker.c:142
+#: ../e-util/e-focus-tracker.c:573 ../mail/e-mail-browser.c:151
+#: ../shell/e-shell-window-actions.c:988
 msgid "Select all text"
 msgstr "Изаберите сав текст"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1234
+#: ../calendar/gui/dialogs/comp-editor.c:1228
 msgid "_Classification"
 msgstr "_Разврставање"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1241
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../filter/filter.ui.h:16
-#: ../mail/e-mail-browser.c:169
+#: ../calendar/gui/dialogs/comp-editor.c:1235
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../e-util/filter.ui.h:16
+#: ../e-util/gal-define-views.ui.h:5 ../mail/e-mail-browser.c:165
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../shell/e-shell-window-actions.c:1586
-#: ../widgets/menus/gal-define-views.ui.h:5
+#: ../shell/e-shell-window-actions.c:1016
 msgid "_Edit"
 msgstr "_Уређивање"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1248 ../mail/e-mail-browser.c:162
-#: ../shell/e-shell-window-actions.c:1593
-#: ../widgets/misc/e-mail-signature-editor.c:299
+#: ../calendar/gui/dialogs/comp-editor.c:1242
+#: ../e-util/e-mail-signature-editor.c:306 ../mail/e-mail-browser.c:158
+#: ../shell/e-shell-window-actions.c:1023
 msgid "_File"
 msgstr "_Датотека"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1255
-#: ../shell/e-shell-window-actions.c:1600
+#: ../calendar/gui/dialogs/comp-editor.c:1249
+#: ../shell/e-shell-window-actions.c:1030
 msgid "_Help"
 msgstr "По_моћ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1256
 msgid "_Insert"
 msgstr "_Уметни"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1269
-#: ../composer/e-composer-actions.c:339
+#: ../calendar/gui/dialogs/comp-editor.c:1263
+#: ../composer/e-composer-actions.c:338
 msgid "_Options"
 msgstr "_Могућности"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276 ../mail/e-mail-browser.c:176
-#: ../shell/e-shell-window-actions.c:1635 ../smime/gui/smime-ui.ui.h:28
+#: ../calendar/gui/dialogs/comp-editor.c:1270 ../mail/e-mail-browser.c:172
+#: ../shell/e-shell-window-actions.c:1065 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "П_реглед"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1286
-#: ../composer/e-composer-actions.c:288
+#: ../calendar/gui/dialogs/comp-editor.c:1280
+#: ../composer/e-composer-actions.c:287
 msgid "_Attachment..."
 msgstr "_Прилог..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1288
-#: ../composer/e-composer-actions.c:290
-#: ../widgets/misc/e-attachment-view.c:414
+#: ../calendar/gui/dialogs/comp-editor.c:1282
+#: ../composer/e-composer-actions.c:289 ../e-util/e-attachment-view.c:413
 msgid "Attach a file"
 msgstr "Приложите датотеку"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1296
+#: ../calendar/gui/dialogs/comp-editor.c:1290
 msgid "_Categories"
 msgstr "_Категорије"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1298
+#: ../calendar/gui/dialogs/comp-editor.c:1292
 msgid "Toggles whether to display categories"
 msgstr "Пребацује приказивање категорија"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1304
+#: ../calendar/gui/dialogs/comp-editor.c:1298
 msgid "Time _Zone"
 msgstr "Временска _зона"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1306
+#: ../calendar/gui/dialogs/comp-editor.c:1300
 msgid "Toggles whether the time zone is displayed"
 msgstr "Пребацује приказивање временске зоне"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1315
+#: ../calendar/gui/dialogs/comp-editor.c:1309
 msgid "Pu_blic"
 msgstr "_Јавно"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1317
+#: ../calendar/gui/dialogs/comp-editor.c:1311
 msgid "Classify as public"
 msgstr "Означите као јавно"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1322
+#: ../calendar/gui/dialogs/comp-editor.c:1316
 msgid "_Private"
 msgstr "Л_ично"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1324
+#: ../calendar/gui/dialogs/comp-editor.c:1318
 msgid "Classify as private"
 msgstr "Означите као лично"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1329
+#: ../calendar/gui/dialogs/comp-editor.c:1323
 msgid "_Confidential"
 msgstr "Пове_рљиво"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1331
+#: ../calendar/gui/dialogs/comp-editor.c:1325
 msgid "Classify as confidential"
 msgstr "Означите као поверљиво"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../calendar/gui/dialogs/comp-editor.c:1333
 msgid "R_ole Field"
 msgstr "Поље _улоге"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1341
+#: ../calendar/gui/dialogs/comp-editor.c:1335
 msgid "Toggles whether the Role field is displayed"
 msgstr "Пребацује приказивање поља Улога"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1347
+#: ../calendar/gui/dialogs/comp-editor.c:1341
 msgid "_RSVP"
 msgstr "_Молим одговорите"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1349
+#: ../calendar/gui/dialogs/comp-editor.c:1343
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Пребацује приказивање поља Молим одговорите"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1355
+#: ../calendar/gui/dialogs/comp-editor.c:1349
 msgid "_Status Field"
 msgstr "Поље _стања"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1357
+#: ../calendar/gui/dialogs/comp-editor.c:1351
 msgid "Toggles whether the Status field is displayed"
 msgstr "Пребацује приказивање поља Стања"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1363
+#: ../calendar/gui/dialogs/comp-editor.c:1357
 msgid "_Type Field"
 msgstr "Поље _типа"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1365
+#: ../calendar/gui/dialogs/comp-editor.c:1359
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Пребацује приказивање поља Типа"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../composer/e-composer-actions.c:507
+#: ../calendar/gui/dialogs/comp-editor.c:2120
+#: ../composer/e-composer-actions.c:506
 msgid "Attach"
 msgstr "Приложи"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2463
-#: ../calendar/gui/dialogs/comp-editor.c:2647
-#: ../calendar/gui/dialogs/comp-editor.c:3651
+#: ../calendar/gui/dialogs/comp-editor.c:2470
+#: ../calendar/gui/dialogs/comp-editor.c:2657
+#: ../calendar/gui/dialogs/comp-editor.c:3663
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Промене начињене на овој ставки могу бити занемарене ако буде ажурирано"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3615
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:118
+#: ../calendar/gui/dialogs/comp-editor.c:3627
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:115
 msgid "attachment"
 msgstr "прилог"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3683
+#: ../calendar/gui/dialogs/comp-editor.c:3695
 msgid "Unable to use current version!"
 msgstr "Не могу да користим тренутно издање!"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:439
+#: ../calendar/gui/dialogs/comp-editor-page.c:441
 #, c-format
 msgid "Validation error: %s"
 msgstr "Грешка провере: %s"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:114
+#: ../calendar/gui/dialogs/copy-source-dialog.c:115
 msgid "Could not open destination"
 msgstr "Не могу да отворим одредиште"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:126
+#: ../calendar/gui/dialogs/copy-source-dialog.c:127
 msgid "Destination is read only"
 msgstr "Одредиште је само за читање"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:160
+#: ../calendar/gui/dialogs/copy-source-dialog.c:161
 msgid "Cannot create object"
 msgstr "Не могу да направим објекат"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:189
+#: ../calendar/gui/dialogs/copy-source-dialog.c:190
 msgid "Could not open source"
 msgstr "Не могу да отворим извор"
 
-#: ../calendar/gui/dialogs/delete-comp.c:212
+#: ../calendar/gui/dialogs/delete-comp.c:216
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "Да ли да _избришем ову ставку из свих осталих поштанских сандучића примаоца?"
 
-#: ../calendar/gui/dialogs/delete-comp.c:215
+#: ../calendar/gui/dialogs/delete-comp.c:219
 msgid "_Retract comment"
 msgstr "_Увуци коментар"
 
@@ -2882,108 +2900,107 @@ msgstr "Делегирај на:"
 msgid "Contacts..."
 msgstr "Контакти..."
 
-#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../calendar/gui/dialogs/event-editor.c:211
 msgid "_Reminders"
 msgstr "_Подсетници"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
+#: ../calendar/gui/dialogs/event-editor.c:213
 msgid "Set or unset reminders for this event"
 msgstr "Поставља или искључује подсетнике за овај догађај"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:221
 msgid "Show Time as _Busy"
 msgstr "Прикажи време као _заузето"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:223
 msgid "Toggles whether to show time as busy"
 msgstr "Пребацује приказивање времена као заузето"
 
-#: ../calendar/gui/dialogs/event-editor.c:237
+#: ../calendar/gui/dialogs/event-editor.c:232
 msgid "_Recurrence"
 msgstr "_Понављање"
 
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:234
 msgid "Make this a recurring event"
 msgstr "Нека се овај догађај понавља"
 
-#: ../calendar/gui/dialogs/event-editor.c:244
-#: ../widgets/misc/e-send-options.ui.h:14
+#: ../calendar/gui/dialogs/event-editor.c:239 ../e-util/e-send-options.ui.h:14
 msgid "Send Options"
 msgstr "Опције слања"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
-#: ../calendar/gui/dialogs/task-editor.c:128
+#: ../calendar/gui/dialogs/event-editor.c:241
+#: ../calendar/gui/dialogs/task-editor.c:125
 msgid "Insert advanced send options"
 msgstr "Уметните напредне опције слања"
 
-#: ../calendar/gui/dialogs/event-editor.c:254
+#: ../calendar/gui/dialogs/event-editor.c:249
 msgid "All _Day Event"
 msgstr "Целодневни догађа_ј"
 
-#: ../calendar/gui/dialogs/event-editor.c:256
+#: ../calendar/gui/dialogs/event-editor.c:251
 msgid "Toggles whether to have All Day Event"
 msgstr "Бира да ли дозвољава целодневне догађаје"
 
-#: ../calendar/gui/dialogs/event-editor.c:265
+#: ../calendar/gui/dialogs/event-editor.c:260
 msgid "_Free/Busy"
-msgstr "С_лободно/заузето:"
+msgstr "С_лободно/заузето"
 
-#: ../calendar/gui/dialogs/event-editor.c:267
+#: ../calendar/gui/dialogs/event-editor.c:262
 msgid "Query free / busy information for the attendees"
 msgstr "Затражи податак за слободно/заузето време за ове учеснике"
 
-#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3324
+#: ../calendar/gui/dialogs/event-editor.c:313 ../calendar/gui/print.c:3468
 msgid "Appointment"
 msgstr "Заказивање"
 
-#: ../calendar/gui/dialogs/event-editor.c:388
+#: ../calendar/gui/dialogs/event-editor.c:383
 #: ../calendar/gui/dialogs/event-page.ui.h:24
-#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-list-view.c:165
 msgid "Attendees"
 msgstr "Учесници"
 
-#: ../calendar/gui/dialogs/event-editor.c:585
+#: ../calendar/gui/dialogs/event-editor.c:580
 msgid "Print this event"
 msgstr "Штампајте ову поруку"
 
-#: ../calendar/gui/dialogs/event-page.c:570
+#: ../calendar/gui/dialogs/event-page.c:557
 msgid "Event's start time is in the past"
 msgstr "Почетак догађаја је у прошлости"
 
-#: ../calendar/gui/dialogs/event-page.c:647
+#: ../calendar/gui/dialogs/event-page.c:634
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr ""
 "Догађај није могуће уређивати, пошто је изабрани календар само за читање"
 
-#: ../calendar/gui/dialogs/event-page.c:651
+#: ../calendar/gui/dialogs/event-page.c:638
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Догађај није могуће потпуно уредити, пошто нисте организатор"
 
-#: ../calendar/gui/dialogs/event-page.c:663
-#: ../calendar/gui/dialogs/event-page.c:3143
+#: ../calendar/gui/dialogs/event-page.c:650
+#: ../calendar/gui/dialogs/event-page.c:3171
 msgid "This event has reminders"
 msgstr "Овај догађај има подсетнике"
 
-#: ../calendar/gui/dialogs/event-page.c:730
+#: ../calendar/gui/dialogs/event-page.c:717
 #: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Or_ganizer:"
 msgstr "Ор_ганизатор:"
 
-#: ../calendar/gui/dialogs/event-page.c:1301
+#: ../calendar/gui/dialogs/event-page.c:1299
 msgid "Event with no start date"
 msgstr "Догађај без датума почетка"
 
-#: ../calendar/gui/dialogs/event-page.c:1304
+#: ../calendar/gui/dialogs/event-page.c:1302
 msgid "Event with no end date"
 msgstr "Догађај без датума завршетка"
 
-#: ../calendar/gui/dialogs/event-page.c:1477
-#: ../calendar/gui/dialogs/memo-page.c:732
-#: ../calendar/gui/dialogs/task-page.c:852
+#: ../calendar/gui/dialogs/event-page.c:1475
+#: ../calendar/gui/dialogs/memo-page.c:726
+#: ../calendar/gui/dialogs/task-page.c:853
 msgid "Start date is wrong"
 msgstr "Датум почетка је погрешан"
 
-#: ../calendar/gui/dialogs/event-page.c:1487
+#: ../calendar/gui/dialogs/event-page.c:1486
 msgid "End date is wrong"
 msgstr "Датум завршетка је погрешан"
 
@@ -2991,35 +3008,35 @@ msgstr "Датум завршетка је погрешан"
 msgid "Start time is wrong"
 msgstr "Време почетка је погрешно"
 
-#: ../calendar/gui/dialogs/event-page.c:1517
+#: ../calendar/gui/dialogs/event-page.c:1518
 msgid "End time is wrong"
 msgstr "Време завршетка је погрешно"
 
-#: ../calendar/gui/dialogs/event-page.c:1680
-#: ../calendar/gui/dialogs/memo-page.c:771
-#: ../calendar/gui/dialogs/task-page.c:905
+#: ../calendar/gui/dialogs/event-page.c:1682
+#: ../calendar/gui/dialogs/memo-page.c:765
+#: ../calendar/gui/dialogs/task-page.c:907
 msgid "An organizer is required."
 msgstr "Потребан је организатор."
 
-#: ../calendar/gui/dialogs/event-page.c:1714
-#: ../calendar/gui/dialogs/task-page.c:939
+#: ../calendar/gui/dialogs/event-page.c:1717
+#: ../calendar/gui/dialogs/task-page.c:942
 msgid "At least one attendee is required."
 msgstr "Најмање један учесник је потребан."
 
-#: ../calendar/gui/dialogs/event-page.c:1921
+#: ../calendar/gui/dialogs/event-page.c:1924
 msgid "_Delegatees"
 msgstr "Делегат_и"
 
-#: ../calendar/gui/dialogs/event-page.c:1923
+#: ../calendar/gui/dialogs/event-page.c:1926
 msgid "Atte_ndees"
 msgstr "Уч_есници"
 
-#: ../calendar/gui/dialogs/event-page.c:2998
+#: ../calendar/gui/dialogs/event-page.c:3026
 #, c-format
 msgid "Unable to open the calendar '%s': %s"
 msgstr "Не могу да отворим календар „%s“ : %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3423
+#: ../calendar/gui/dialogs/event-page.c:3451
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -3028,7 +3045,7 @@ msgstr[1] "%d дана пре заказаног"
 msgstr[2] "%d дана пре заказаног"
 msgstr[3] "%d дан пре заказаног"
 
-#: ../calendar/gui/dialogs/event-page.c:3429
+#: ../calendar/gui/dialogs/event-page.c:3457
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -3037,7 +3054,7 @@ msgstr[1] "%d сата пре заказаног"
 msgstr[2] "%d сати пре заказаног"
 msgstr[3] "%d сат пре заказаног"
 
-#: ../calendar/gui/dialogs/event-page.c:3435
+#: ../calendar/gui/dialogs/event-page.c:3463
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -3046,7 +3063,7 @@ msgstr[1] "%d минута пре заказаног"
 msgstr[2] "%d минута пре заказаног"
 msgstr[3] "%d минут пре заказаног"
 
-#: ../calendar/gui/dialogs/event-page.c:3454
+#: ../calendar/gui/dialogs/event-page.c:3484
 msgid "Customize"
 msgstr "Прилагоди"
 
@@ -3056,7 +3073,7 @@ msgstr "Прилагоди"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3460
+#: ../calendar/gui/dialogs/event-page.c:3491
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ништа"
@@ -3098,7 +3115,7 @@ msgstr "_Место:"
 #: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 #: ../calendar/gui/dialogs/task-page.ui.h:7
-#: ../widgets/misc/e-attachment-dialog.c:350
+#: ../e-util/e-attachment-dialog.c:350
 msgid "_Description:"
 msgstr "_Опис:"
 
@@ -3122,7 +3139,7 @@ msgstr "Опис догађаја"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:23
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "Atte_ndees..."
 msgstr "Уч_есници..."
 
@@ -3187,65 +3204,51 @@ msgid "Select Date"
 msgstr "Изаберите датум"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1406
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
 msgid "Select _Today"
 msgstr "Изабери _данашњи дан"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3328
+#: ../calendar/gui/dialogs/memo-editor.c:106 ../calendar/gui/print.c:3472
 msgid "Memo"
 msgstr "Белешка"
 
-#: ../calendar/gui/dialogs/memo-editor.c:159
+#: ../calendar/gui/dialogs/memo-editor.c:156
 msgid "Print this memo"
 msgstr "Штампајте ову белешку"
 
-#: ../calendar/gui/dialogs/memo-page.c:429
+#: ../calendar/gui/dialogs/memo-page.c:421
 msgid "Memo's start date is in the past"
 msgstr "Почетак белешке је у прошлости"
 
-#: ../calendar/gui/dialogs/memo-page.c:465
+#: ../calendar/gui/dialogs/memo-page.c:457
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "Белешку није могуће уређивати, пошто је изабран списак само за читање"
 
-#: ../calendar/gui/dialogs/memo-page.c:469
+#: ../calendar/gui/dialogs/memo-page.c:461
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Белешку није могуће потпуно уредити, пошто нисте организатор"
 
-#: ../calendar/gui/dialogs/memo-page.c:981
+#: ../calendar/gui/dialogs/memo-page.c:979
 #, c-format
 msgid "Unable to open memos in '%s': %s"
 msgstr "Не могу да отворим белешке у „%s“ : %s"
 
-#: ../calendar/gui/dialogs/memo-page.c:983
-#: ../em-format/e-mail-parser-application-mbox.c:111
-#: ../em-format/e-mail-parser-application-smime.c:107
-#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:94
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:96
-#: ../em-format/e-mail-parser-multipart-encrypted.c:122
-#: ../em-format/e-mail-parser-multipart-signed.c:147
-#: ../libemail-engine/mail-ops.c:720 ../mail/e-mail-reader.c:1727
-#: ../mail/em-folder-tree.c:675 ../modules/itip-formatter/itip-view.c:4524
-#: ../modules/itip-formatter/itip-view.c:4875 ../plugins/face/face.c:174
-#: ../smime/gui/certificate-manager.c:317
-msgid "Unknown error"
-msgstr "Непозната грешка"
-
-#: ../calendar/gui/dialogs/memo-page.c:1173
-#: ../em-format/e-mail-formatter.c:1370
+#: ../calendar/gui/dialogs/memo-page.c:1172
+#: ../em-format/e-mail-formatter.c:1391
 #: ../em-format/e-mail-formatter-utils.c:180
-#: ../em-format/e-mail-formatter-utils.c:203 ../mail/em-filter-i18n.h:77
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:69
+#: ../em-format/e-mail-formatter-utils.c:204 ../mail/em-filter-i18n.h:78
+#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:63
 msgid "To"
 msgstr "Прима"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.c:346
+#: ../calendar/gui/dialogs/task-page.c:336
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_List:"
 msgstr "_Списак:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.c:354
+#: ../calendar/gui/dialogs/task-page.c:344
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Organi_zer:"
 msgstr "Органи_затор:"
@@ -3300,21 +3303,21 @@ msgstr "Овај и будуће уносе"
 msgid "All Instances"
 msgstr "Све уносе"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:574
+#: ../calendar/gui/dialogs/recurrence-page.c:573
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ово заказивање садржи понављања која Еволуција не може да уреди."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:969
+#: ../calendar/gui/dialogs/recurrence-page.c:973
 msgid "Recurrence date is invalid"
 msgstr "Датум понављања није исправан"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:1017
 msgid "End time of the recurrence was before event's start"
 msgstr "Време завршетка понављања је пре почетка догађаја"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "on"
 msgstr "у"
 
@@ -3322,7 +3325,7 @@ msgstr "у"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1102
+#: ../calendar/gui/dialogs/recurrence-page.c:1110
 msgid "first"
 msgstr "првом"
 
@@ -3331,7 +3334,7 @@ msgstr "првом"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1108
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 msgid "second"
 msgstr "другом"
 
@@ -3339,7 +3342,7 @@ msgstr "другом"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
 msgid "third"
 msgstr "трећем"
 
@@ -3347,7 +3350,7 @@ msgstr "трећем"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/recurrence-page.c:1126
 msgid "fourth"
 msgstr "четвртом"
 
@@ -3355,7 +3358,7 @@ msgstr "четвртом"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1123
+#: ../calendar/gui/dialogs/recurrence-page.c:1131
 msgid "fifth"
 msgstr "петом"
 
@@ -3363,13 +3366,13 @@ msgstr "петом"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1128
+#: ../calendar/gui/dialogs/recurrence-page.c:1136
 msgid "last"
 msgstr "последњем"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1152
+#: ../calendar/gui/dialogs/recurrence-page.c:1160
 msgid "Other Date"
 msgstr "Други датум"
 
@@ -3377,7 +3380,7 @@ msgstr "Други датум"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1158
+#: ../calendar/gui/dialogs/recurrence-page.c:1166
 msgid "1st to 10th"
 msgstr "од првог до десетог"
 
@@ -3385,7 +3388,7 @@ msgstr "од првог до десетог"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1164
+#: ../calendar/gui/dialogs/recurrence-page.c:1172
 msgid "11th to 20th"
 msgstr "од једанаестог до двадесетог"
 
@@ -3393,41 +3396,41 @@ msgstr "од једанаестог до двадесетог"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1170
+#: ../calendar/gui/dialogs/recurrence-page.c:1178
 msgid "21st to 31st"
 msgstr "од двадесет првог до тридесет првог"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1196
+#: ../calendar/gui/dialogs/recurrence-page.c:1205
 #: ../modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Monday"
 msgstr "Понедељак"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1197
+#: ../calendar/gui/dialogs/recurrence-page.c:1206
 #: ../modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Tuesday"
 msgstr "Уторак"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1198
+#: ../calendar/gui/dialogs/recurrence-page.c:1207
 #: ../modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Wednesday"
 msgstr "Среда"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1199
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 #: ../modules/calendar/e-calendar-preferences.ui.h:4
 msgid "Thursday"
 msgstr "Четвртак"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1200
+#: ../calendar/gui/dialogs/recurrence-page.c:1209
 #: ../modules/calendar/e-calendar-preferences.ui.h:5
 msgid "Friday"
 msgstr "Петак"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1201
+#: ../calendar/gui/dialogs/recurrence-page.c:1210
 #: ../modules/calendar/e-calendar-preferences.ui.h:6
 msgid "Saturday"
 msgstr "Субота"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1202
+#: ../calendar/gui/dialogs/recurrence-page.c:1211
 #: ../modules/calendar/e-calendar-preferences.ui.h:7
 msgid "Sunday"
 msgstr "Недеља"
@@ -3435,31 +3438,31 @@ msgstr "Недеља"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1326
+#: ../calendar/gui/dialogs/recurrence-page.c:1342
 msgid "on the"
 msgstr "на"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1505
+#: ../calendar/gui/dialogs/recurrence-page.c:1527
 msgid "occurrences"
 msgstr "појаве"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2221
+#: ../calendar/gui/dialogs/recurrence-page.c:2253
 msgid "Add exception"
 msgstr "Додај изузетак"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2295
 msgid "Could not get a selection to modify."
 msgstr "Не могу да нађем избор ради мењања."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2268
+#: ../calendar/gui/dialogs/recurrence-page.c:2301
 msgid "Modify exception"
 msgstr "Измените изузетак"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2312
+#: ../calendar/gui/dialogs/recurrence-page.c:2347
 msgid "Could not get a selection to delete."
 msgstr "Не могу да нађем избор ради брисања."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2451
+#: ../calendar/gui/dialogs/recurrence-page.c:2488
 msgid "Date/Time"
 msgstr "Датум/време"
 
@@ -3521,85 +3524,85 @@ msgstr "Изузеци"
 msgid "Preview"
 msgstr "Преглед"
 
-#: ../calendar/gui/dialogs/send-comp.c:196
+#: ../calendar/gui/dialogs/send-comp.c:223
 msgid "Send my reminders with this event"
 msgstr "Пошаљи моје подсетнике са овим догађајем"
 
-#: ../calendar/gui/dialogs/send-comp.c:198
+#: ../calendar/gui/dialogs/send-comp.c:225
 msgid "Notify new attendees _only"
 msgstr "Обавести _само нове учеснике"
 
-#: ../calendar/gui/dialogs/task-details-page.c:355
+#: ../calendar/gui/dialogs/task-details-page.c:352
 #: ../calendar/gui/dialogs/task-details-page.c:377
 msgid "Completed date is wrong"
 msgstr "Датум завршетка је погрешан"
 
-#: ../calendar/gui/dialogs/task-details-page.c:489
+#: ../calendar/gui/dialogs/task-details-page.c:490
 msgid "Web Page"
 msgstr "Веб страница"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:345
-#: ../calendar/gui/e-task-table.c:579 ../calendar/gui/tasktypes.xml.h:19
-#: ../mail/message-list.c:1275 ../widgets/misc/e-send-options.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:348
+#: ../calendar/gui/e-task-table.c:571 ../calendar/gui/tasktypes.xml.h:19
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:1257
 msgid "High"
 msgstr "Висок"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:347
-#: ../calendar/gui/e-cal-model.c:1655 ../calendar/gui/e-task-table.c:580
-#: ../calendar/gui/tasktypes.xml.h:20 ../mail/message-list.c:1274
-#: ../widgets/misc/e-send-options.ui.h:5
+#: ../calendar/gui/e-cal-component-preview.c:350
+#: ../calendar/gui/e-cal-model.c:1682 ../calendar/gui/e-task-table.c:572
+#: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
+#: ../mail/message-list.c:1256
 msgid "Normal"
 msgstr "Обичан"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:349
-#: ../calendar/gui/e-task-table.c:581 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1273 ../widgets/misc/e-send-options.ui.h:4
+#: ../calendar/gui/e-cal-component-preview.c:352
+#: ../calendar/gui/e-task-table.c:573 ../calendar/gui/tasktypes.xml.h:21
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:1255
 msgid "Low"
 msgstr "Низак"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-task-table.c:582 ../calendar/gui/tasktypes.xml.h:22
-#: ../widgets/misc/e-send-options.ui.h:1
+#: ../calendar/gui/e-task-table.c:574 ../calendar/gui/tasktypes.xml.h:22
+#: ../e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "Неодређен"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:331
-#: ../calendar/gui/e-cal-model-tasks.c:489
-#: ../calendar/gui/e-cal-model-tasks.c:774 ../calendar/gui/e-task-table.c:227
-#: ../calendar/gui/e-task-table.c:242 ../calendar/gui/e-task-table.c:656
-#: ../calendar/gui/print.c:3405 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/e-cal-component-preview.c:333
+#: ../calendar/gui/e-cal-model-tasks.c:491
+#: ../calendar/gui/e-cal-model-tasks.c:777 ../calendar/gui/e-task-table.c:214
+#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:654
+#: ../calendar/gui/print.c:3554 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "Није започет"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:321
-#: ../calendar/gui/e-cal-model-tasks.c:491
-#: ../calendar/gui/e-cal-model-tasks.c:776
-#: ../calendar/gui/e-cal-model-tasks.c:854 ../calendar/gui/e-task-table.c:229
-#: ../calendar/gui/e-task-table.c:244 ../calendar/gui/e-task-table.c:657
-#: ../calendar/gui/print.c:3408
+#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-cal-model-tasks.c:493
+#: ../calendar/gui/e-cal-model-tasks.c:779
+#: ../calendar/gui/e-cal-model-tasks.c:857 ../calendar/gui/e-task-table.c:216
+#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:655
+#: ../calendar/gui/print.c:3557
 msgid "In Progress"
 msgstr "У току"
 
 # timezone.
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:14
-#: ../calendar/gui/e-cal-component-preview.c:324
-#: ../calendar/gui/e-cal-model-tasks.c:493
-#: ../calendar/gui/e-cal-model-tasks.c:778
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/e-meeting-store.c:232
-#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:246
-#: ../calendar/gui/e-task-table.c:658 ../calendar/gui/print.c:3411
+#: ../calendar/gui/e-cal-component-preview.c:326
+#: ../calendar/gui/e-cal-model-tasks.c:495
+#: ../calendar/gui/e-cal-model-tasks.c:781
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
+#: ../calendar/gui/e-task-table.c:218 ../calendar/gui/e-task-table.c:233
+#: ../calendar/gui/e-task-table.c:656 ../calendar/gui/print.c:3560
 #: ../calendar/gui/tasktypes.xml.h:13
 #: ../plugins/save-calendar/csv-format.c:376
 msgid "Completed"
@@ -3607,11 +3610,11 @@ msgstr "Завршено"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:327
-#: ../calendar/gui/e-cal-model-tasks.c:495
-#: ../calendar/gui/e-cal-model-tasks.c:780 ../calendar/gui/e-task-table.c:233
-#: ../calendar/gui/e-task-table.c:248 ../calendar/gui/e-task-table.c:659
-#: ../calendar/gui/print.c:3414 ../mail/mail-send-recv.c:879
+#: ../calendar/gui/e-cal-component-preview.c:329
+#: ../calendar/gui/e-cal-model-tasks.c:497
+#: ../calendar/gui/e-cal-model-tasks.c:783 ../calendar/gui/e-task-table.c:220
+#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:657
+#: ../calendar/gui/print.c:3563 ../mail/mail-send-recv.c:878
 msgid "Canceled"
 msgstr "Отказано"
 
@@ -3619,10 +3622,10 @@ msgstr "Отказано"
 #. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:17
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:3624
-#: ../calendar/gui/e-meeting-list-view.c:684
+#: ../calendar/gui/e-cal-model.c:3604
+#: ../calendar/gui/e-meeting-list-view.c:692
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:74
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:75
 #: ../mail/message-list.etspec.h:1
 msgid "Status"
 msgstr "Стање"
@@ -3636,7 +3639,7 @@ msgid "P_ercent complete:"
 msgstr "П_роценат завршеног:"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../widgets/misc/e-send-options.ui.h:26
+#: ../e-util/e-send-options.ui.h:26
 msgid "_Priority:"
 msgstr "_Важност:"
 
@@ -3648,48 +3651,48 @@ msgstr "_Датум завршетка:"
 msgid "_Web Page:"
 msgstr "_Веб страница:"
 
-#: ../calendar/gui/dialogs/task-editor.c:116
+#: ../calendar/gui/dialogs/task-editor.c:113
 msgid "_Status Details"
 msgstr "Детаљи _стања"
 
-#: ../calendar/gui/dialogs/task-editor.c:118
+#: ../calendar/gui/dialogs/task-editor.c:115
 msgid "Click to change or view the status details of the task"
 msgstr "Кликните да измените или да прегледате детаље статуса задатка"
 
-#: ../calendar/gui/dialogs/task-editor.c:126
+#: ../calendar/gui/dialogs/task-editor.c:123
 msgid "_Send Options"
 msgstr "Могућности _слања"
 
-#: ../calendar/gui/dialogs/task-editor.c:186 ../calendar/gui/print.c:3326
-#: ../widgets/misc/e-send-options.c:553
+#: ../calendar/gui/dialogs/task-editor.c:183 ../calendar/gui/print.c:3470
+#: ../e-util/e-send-options.c:553
 msgid "Task"
 msgstr "Задатак"
 
-#: ../calendar/gui/dialogs/task-editor.c:307
+#: ../calendar/gui/dialogs/task-editor.c:304
 msgid "Task Details"
 msgstr "Детаљи задатка"
 
-#: ../calendar/gui/dialogs/task-editor.c:351
+#: ../calendar/gui/dialogs/task-editor.c:348
 msgid "Print this task"
 msgstr "Одштампајте овај задатак"
 
-#: ../calendar/gui/dialogs/task-page.c:259
+#: ../calendar/gui/dialogs/task-page.c:249
 msgid "Task's start date is in the past"
 msgstr "Почетак задатка је у прошлости"
 
-#: ../calendar/gui/dialogs/task-page.c:260
+#: ../calendar/gui/dialogs/task-page.c:250
 msgid "Task's due date is in the past"
 msgstr "Рок за завршетак задатка је у прошлости"
 
-#: ../calendar/gui/dialogs/task-page.c:293
+#: ../calendar/gui/dialogs/task-page.c:283
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "Задатак није могуће уређивати, пошто је изабрани списак само за читање"
 
-#: ../calendar/gui/dialogs/task-page.c:297
+#: ../calendar/gui/dialogs/task-page.c:287
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "Задатак није могуће потпуно уредити, зато што нисте организатор"
 
-#: ../calendar/gui/dialogs/task-page.c:301
+#: ../calendar/gui/dialogs/task-page.c:291
 msgid ""
 "Task cannot be edited, because the selected task list does not support "
 "assigned tasks"
@@ -3701,7 +3704,7 @@ msgstr ""
 msgid "Due date is wrong"
 msgstr "Крајњи рок је погрешан"
 
-#: ../calendar/gui/dialogs/task-page.c:1813
+#: ../calendar/gui/dialogs/task-page.c:1822
 #, c-format
 msgid "Unable to open tasks in '%s': %s"
 msgstr "Не могу да отворим задатке у „%s“ : %s"
@@ -3714,56 +3717,56 @@ msgstr "Крајњи _рок:"
 msgid "Time zone:"
 msgstr "Временска зона:"
 
-#: ../calendar/gui/ea-cal-view.c:320
+#: ../calendar/gui/ea-cal-view.c:324
 msgid "New Appointment"
 msgstr "Ново заказивање"
 
-#: ../calendar/gui/ea-cal-view.c:321
+#: ../calendar/gui/ea-cal-view.c:325
 msgid "New All Day Event"
 msgstr "Нови целодневни догађај"
 
-#: ../calendar/gui/ea-cal-view.c:322
+#: ../calendar/gui/ea-cal-view.c:326
 msgid "New Meeting"
 msgstr "Нови састанак"
 
-#: ../calendar/gui/ea-cal-view.c:323
+#: ../calendar/gui/ea-cal-view.c:327
 msgid "Go to Today"
 msgstr "Иди на данашњи дан"
 
-#: ../calendar/gui/ea-cal-view.c:324
+#: ../calendar/gui/ea-cal-view.c:328
 msgid "Go to Date"
 msgstr "Иди на датум"
 
-#: ../calendar/gui/ea-cal-view-event.c:291
+#: ../calendar/gui/ea-cal-view-event.c:298
 msgid "It has reminders."
 msgstr "Има подсетнике."
 
-#: ../calendar/gui/ea-cal-view-event.c:294
+#: ../calendar/gui/ea-cal-view-event.c:301
 msgid "It has recurrences."
 msgstr "Има понављања."
 
-#: ../calendar/gui/ea-cal-view-event.c:297
+#: ../calendar/gui/ea-cal-view-event.c:304
 msgid "It is a meeting."
 msgstr "То је састанак."
 
-#: ../calendar/gui/ea-cal-view-event.c:304
+#: ../calendar/gui/ea-cal-view-event.c:311
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Календарски догађај: сажетак је %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:307
+#: ../calendar/gui/ea-cal-view-event.c:314
 msgid "Calendar Event: It has no summary."
 msgstr "Календарски догађај: нема сажетка."
 
-#: ../calendar/gui/ea-cal-view-event.c:329
+#: ../calendar/gui/ea-cal-view-event.c:337
 msgid "calendar view event"
 msgstr "догађај прегледа календара"
 
-#: ../calendar/gui/ea-cal-view-event.c:558
+#: ../calendar/gui/ea-cal-view-event.c:566
 msgid "Grab Focus"
 msgstr "Фокусирај"
 
-#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:151
+#: ../calendar/gui/ea-day-view.c:154 ../calendar/gui/ea-week-view.c:154
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -3774,47 +3777,41 @@ msgstr[3] "Има %d догађај."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:154
+#: ../calendar/gui/ea-day-view.c:161 ../calendar/gui/ea-week-view.c:157
 msgid "It has no events."
 msgstr "Нема догађаја."
 
-#. To translators: First %s is the week, for example "July 10th -
-#. July 14th, 2006". Second %s is the number of events in this work
-#. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:163
+#: ../calendar/gui/ea-day-view.c:169
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Преглед радне недеље: %s. %s"
 
-#. To translators: First %s is the day, for example "Thursday July
-#. 13th, 2006". Second %s is the number of events on this day, for
-#. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:169
+#: ../calendar/gui/ea-day-view.c:176
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Дневни преглед: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:210
 msgid "calendar view for a work week"
 msgstr "преглед календара за радну недељу"
 
-#: ../calendar/gui/ea-day-view.c:205
+#: ../calendar/gui/ea-day-view.c:212
 msgid "calendar view for one or more days"
 msgstr "преглед календара за један или више дана"
 
-#: ../calendar/gui/ea-day-view-main-item.c:319
-#: ../calendar/gui/ea-week-view-main-item.c:345
+#: ../calendar/gui/ea-day-view-main-item.c:327
+#: ../calendar/gui/ea-week-view-main-item.c:354
 msgid "a table to view and select the current time range"
 msgstr "табела за приказ и избор текућег временског распона"
 
 #: ../calendar/gui/ea-gnome-calendar.c:48
 #: ../calendar/gui/ea-gnome-calendar.c:56
-#: ../calendar/importers/icalendar-importer.c:1118
+#: ../calendar/importers/icalendar-importer.c:1115
 msgid "Gnome Calendar"
 msgstr "Гномов календар"
 
-#: ../calendar/gui/ea-gnome-calendar.c:199
-#: ../modules/calendar/e-cal-shell-view-private.c:1085
+#: ../calendar/gui/ea-gnome-calendar.c:204
+#: ../modules/calendar/e-cal-shell-view-private.c:1105
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y."
 
@@ -3829,30 +3826,30 @@ msgstr "%A, %d. %b %Y."
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:202 ../calendar/gui/e-day-view.c:1853
-#: ../calendar/gui/e-day-view-top-item.c:835
-#: ../calendar/gui/e-week-view-main-item.c:231
-#: ../modules/calendar/e-cal-shell-view-private.c:1089
+#: ../calendar/gui/ea-gnome-calendar.c:208 ../calendar/gui/e-day-view.c:1888
+#: ../calendar/gui/e-day-view-top-item.c:855
+#: ../calendar/gui/e-week-view-main-item.c:233
+#: ../modules/calendar/e-cal-shell-view-private.c:1109
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../calendar/gui/ea-gnome-calendar.c:209
 #: ../calendar/gui/ea-gnome-calendar.c:211
-#: ../modules/calendar/e-cal-shell-view-private.c:1092
-#: ../modules/calendar/e-cal-shell-view-private.c:1098
-#: ../modules/calendar/e-cal-shell-view-private.c:1101
+#: ../calendar/gui/ea-gnome-calendar.c:217
+#: ../calendar/gui/ea-gnome-calendar.c:220
+#: ../modules/calendar/e-cal-shell-view-private.c:1112
+#: ../modules/calendar/e-cal-shell-view-private.c:1118
+#: ../modules/calendar/e-cal-shell-view-private.c:1121
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y."
 
-#: ../calendar/gui/ea-gnome-calendar.c:228
-#: ../calendar/gui/ea-gnome-calendar.c:234
-#: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../calendar/gui/ea-gnome-calendar.c:242
-#: ../modules/calendar/e-cal-shell-view-private.c:1118
-#: ../modules/calendar/e-cal-shell-view-private.c:1129
-#: ../modules/calendar/e-cal-shell-view-private.c:1136
-#: ../modules/calendar/e-cal-shell-view-private.c:1139
+#: ../calendar/gui/ea-gnome-calendar.c:239
+#: ../calendar/gui/ea-gnome-calendar.c:247
+#: ../calendar/gui/ea-gnome-calendar.c:254
+#: ../calendar/gui/ea-gnome-calendar.c:257
+#: ../modules/calendar/e-cal-shell-view-private.c:1138
+#: ../modules/calendar/e-cal-shell-view-private.c:1149
+#: ../modules/calendar/e-cal-shell-view-private.c:1156
+#: ../modules/calendar/e-cal-shell-view-private.c:1159
 msgid "%d %b %Y"
 msgstr "%d. %b %Y."
 
@@ -3865,10 +3862,10 @@ msgstr "%d. %b %Y."
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:232 ../calendar/gui/e-day-view.c:1869
-#: ../calendar/gui/e-day-view-top-item.c:839
-#: ../calendar/gui/e-week-view-main-item.c:245
-#: ../modules/calendar/e-cal-shell-view-private.c:1125
+#: ../calendar/gui/ea-gnome-calendar.c:244 ../calendar/gui/e-day-view.c:1904
+#: ../calendar/gui/e-day-view-top-item.c:859
+#: ../calendar/gui/e-week-view-main-item.c:247
+#: ../modules/calendar/e-cal-shell-view-private.c:1145
 msgid "%d %b"
 msgstr "%d. %b"
 
@@ -3904,94 +3901,86 @@ msgstr[3] "%d недеља"
 msgid "Unknown action to be performed"
 msgstr "Извршиће се непозната радња"
 
-#. 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"
-#: ../calendar/gui/e-alarm-list.c:440
+#: ../calendar/gui/e-alarm-list.c:441
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s пре почетка састанка"
 
-#. 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"
-#: ../calendar/gui/e-alarm-list.c:445
+#: ../calendar/gui/e-alarm-list.c:447
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s након почетка састанка"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/e-alarm-list.c:454
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s на почетку састанка"
 
-#. 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"
-#: ../calendar/gui/e-alarm-list.c:463
+#: ../calendar/gui/e-alarm-list.c:466
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s пре краја састанка"
 
-#. 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"
-#: ../calendar/gui/e-alarm-list.c:468
+#: ../calendar/gui/e-alarm-list.c:472
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s након завршетка састанка"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:475
+#: ../calendar/gui/e-alarm-list.c:479
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s на крају састанка"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:499
+#: ../calendar/gui/e-alarm-list.c:503
 #, c-format
 msgid "%s at %s"
 msgstr "%s у %s"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound". "Trigger types" are absolute or relative dates
-#: ../calendar/gui/e-alarm-list.c:507
+#: ../calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s за непознат тип покретача"
 
-#: ../calendar/gui/ea-week-view.c:159
+#: ../calendar/gui/ea-week-view.c:163
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Месечни преглед: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:163
+#: ../calendar/gui/ea-week-view.c:168
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Недељни преглед: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:197
+#: ../calendar/gui/ea-week-view.c:202
 msgid "calendar view for a month"
 msgstr "преглед календара за месец"
 
-#: ../calendar/gui/ea-week-view.c:199
+#: ../calendar/gui/ea-week-view.c:204
 msgid "calendar view for one or more weeks"
 msgstr "преглед календара за једну или више недеља"
 
-#: ../calendar/gui/e-cal-component-preview.c:237 ../filter/e-filter-rule.c:748
+#: ../calendar/gui/e-cal-component-preview.c:234 ../e-util/e-filter-rule.c:750
 #: ../mail/e-mail-config-page.c:126
 msgid "Untitled"
 msgstr "Неименовано"
 
-#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-component-preview.c:242
 msgid "Categories:"
 msgstr "Категорије:"
 
-#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-cal-component-preview.c:274
 msgid "Summary:"
 msgstr "Сажетак:"
 
-#: ../calendar/gui/e-cal-component-preview.c:284
+#: ../calendar/gui/e-cal-component-preview.c:283
 msgid "Start Date:"
 msgstr "Датум почетка:"
 
@@ -3999,26 +3988,26 @@ msgstr "Датум почетка:"
 msgid "End Date:"
 msgstr "Датум завршетка:"
 
-#: ../calendar/gui/e-cal-component-preview.c:306
+#: ../calendar/gui/e-cal-component-preview.c:307
 msgid "Due Date:"
 msgstr "Крајњи рок:"
 
-#: ../calendar/gui/e-cal-component-preview.c:317
-#: ../modules/itip-formatter/itip-view.c:1463
-#: ../modules/itip-formatter/itip-view.c:1578
+#: ../calendar/gui/e-cal-component-preview.c:319
+#: ../modules/itip-formatter/itip-view.c:1467
+#: ../modules/itip-formatter/itip-view.c:1584
 msgid "Status:"
 msgstr "Стање:"
 
-#: ../calendar/gui/e-cal-component-preview.c:343
+#: ../calendar/gui/e-cal-component-preview.c:346
 msgid "Priority:"
 msgstr "Важност:"
 
-#: ../calendar/gui/e-cal-component-preview.c:367
+#: ../calendar/gui/e-cal-component-preview.c:371
 #: ../mail/e-mail-config-service-page.c:672
 msgid "Description:"
 msgstr "Опис:"
 
-#: ../calendar/gui/e-cal-component-preview.c:397
+#: ../calendar/gui/e-cal-component-preview.c:402
 msgid "Web Page:"
 msgstr "Веб страница:"
 
@@ -4031,11 +4020,11 @@ msgid "Start date"
 msgstr "Датум почетка"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:644
+#: ../calendar/gui/e-meeting-list-view.c:649
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../e-util/e-attachment-tree-view.c:586
 #: ../mail/e-mail-account-tree-view.c:157
-#: ../widgets/misc/e-attachment-tree-view.c:586
 msgid "Type"
 msgstr "Врста"
 
@@ -4043,7 +4032,7 @@ msgstr "Врста"
 msgid "Completion date"
 msgstr "Датум завршетка"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:881
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:880
 msgid "Complete"
 msgstr "Завршено"
 
@@ -4075,37 +4064,37 @@ msgstr "Направљено"
 msgid "Last modified"
 msgstr "Последње измене"
 
-#: ../calendar/gui/e-calendar-view.c:434
+#: ../calendar/gui/e-calendar-view.c:438
 msgid "Cut selected events to the clipboard"
 msgstr "Сече изабране догађаје у списак исечака"
 
-#: ../calendar/gui/e-calendar-view.c:440
+#: ../calendar/gui/e-calendar-view.c:444
 msgid "Copy selected events to the clipboard"
 msgstr "Умножава изабране догађаје у списак исечака"
 
-#: ../calendar/gui/e-calendar-view.c:446
+#: ../calendar/gui/e-calendar-view.c:450
 msgid "Paste events from the clipboard"
 msgstr "Убацује догађаје из списка исечака"
 
-#: ../calendar/gui/e-calendar-view.c:452
+#: ../calendar/gui/e-calendar-view.c:456
 msgid "Delete selected events"
 msgstr "Брише изабране догађаје"
 
-#: ../calendar/gui/e-calendar-view.c:472 ../calendar/gui/e-memo-table.c:195
-#: ../calendar/gui/e-task-table.c:283
+#: ../calendar/gui/e-calendar-view.c:476 ../calendar/gui/e-memo-table.c:183
+#: ../calendar/gui/e-task-table.c:270
 msgid "Deleting selected objects"
 msgstr "Бришем изабране објекте"
 
-#: ../calendar/gui/e-calendar-view.c:631 ../calendar/gui/e-memo-table.c:875
-#: ../calendar/gui/e-task-table.c:1158
+#: ../calendar/gui/e-calendar-view.c:635 ../calendar/gui/e-memo-table.c:863
+#: ../calendar/gui/e-task-table.c:1161
 msgid "Updating objects"
 msgstr "Ажурирам објекат"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1992 ../calendar/gui/e-memo-table.c:552
-#: ../calendar/gui/e-task-table.c:824
+#: ../calendar/gui/e-calendar-view.c:1999 ../calendar/gui/e-memo-table.c:540
+#: ../calendar/gui/e-task-table.c:827
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Организатор: %s <%s>"
@@ -4113,20 +4102,21 @@ msgstr "Организатор: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1996 ../calendar/gui/e-memo-table.c:557
-#: ../calendar/gui/e-task-table.c:828
+#: ../calendar/gui/e-calendar-view.c:2003 ../calendar/gui/e-memo-table.c:545
+#: ../calendar/gui/e-task-table.c:831
 #, c-format
 msgid "Organizer: %s"
 msgstr "Организатор: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2012 ../calendar/gui/print.c:3360
+#: ../calendar/gui/e-calendar-view.c:2019
+#: ../calendar/gui/e-meeting-time-sel.c:2790 ../calendar/gui/print.c:3508
 #, c-format
 msgid "Location: %s"
 msgstr "Место: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2043
+#: ../calendar/gui/e-calendar-view.c:2050
 #, c-format
 msgid "Time: %s %s"
 msgstr "Време: %s %s"
@@ -4140,86 +4130,86 @@ msgstr "Датум почетка"
 msgid "End Date"
 msgstr "Датум завршетка"
 
-#: ../calendar/gui/e-cal-model.c:842 ../calendar/gui/e-meeting-list-view.c:186
-#: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:174
-#: ../calendar/gui/e-meeting-store.c:237 ../calendar/gui/print.c:1159
-#: ../calendar/gui/print.c:1176 ../e-util/e-charset.c:52
-#: ../modules/itip-formatter/itip-view.c:3462
-#: ../modules/itip-formatter/itip-view.c:5962
-#: ../modules/plugin-manager/evolution-plugin-manager.c:101
+#: ../calendar/gui/e-cal-model.c:854 ../calendar/gui/e-meeting-list-view.c:185
+#: ../calendar/gui/e-meeting-list-view.c:199
+#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:173
+#: ../calendar/gui/e-meeting-store.c:236 ../calendar/gui/print.c:1235
+#: ../calendar/gui/print.c:1252 ../e-util/e-charset.c:52
+#: ../modules/itip-formatter/itip-view.c:3472
+#: ../modules/itip-formatter/itip-view.c:5977
+#: ../modules/plugin-manager/evolution-plugin-manager.c:100
 msgid "Unknown"
 msgstr "Непознато"
 
-#: ../calendar/gui/e-cal-model.c:1657
+#: ../calendar/gui/e-cal-model.c:1684
 msgid "Recurring"
 msgstr "Периодичност"
 
-#: ../calendar/gui/e-cal-model.c:1659
+#: ../calendar/gui/e-cal-model.c:1686
 msgid "Assigned"
 msgstr "Додељено"
 
-#: ../calendar/gui/e-cal-model.c:1661 ../calendar/gui/e-cal-model-tasks.c:1145
-#: ../calendar/gui/e-meeting-list-view.c:210
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:191
-#: ../calendar/gui/e-meeting-store.c:1075
+#: ../calendar/gui/e-cal-model.c:1688 ../calendar/gui/e-cal-model-tasks.c:1148
+#: ../calendar/gui/e-meeting-list-view.c:209
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:190
+#: ../calendar/gui/e-meeting-store.c:1074
 msgid "Yes"
 msgstr "Да"
 
-#: ../calendar/gui/e-cal-model.c:1661 ../calendar/gui/e-cal-model-tasks.c:1145
-#: ../calendar/gui/e-meeting-list-view.c:211
-#: ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-cal-model.c:1688 ../calendar/gui/e-cal-model-tasks.c:1148
+#: ../calendar/gui/e-meeting-list-view.c:210
+#: ../calendar/gui/e-meeting-store.c:192
 msgid "No"
 msgstr "Не"
 
-#: ../calendar/gui/e-cal-model.c:3114
+#: ../calendar/gui/e-cal-model.c:3093
 #, c-format
 msgid "Opening %s"
 msgstr "Отварам „%s“"
 
-#: ../calendar/gui/e-cal-model.c:3565
-#: ../calendar/gui/e-meeting-list-view.c:222
-#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
-#: ../modules/itip-formatter/itip-view.c:5950
+#: ../calendar/gui/e-cal-model.c:3545
+#: ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
+#: ../modules/itip-formatter/itip-view.c:5965
 msgid "Accepted"
 msgstr "Прихваћено"
 
-#: ../calendar/gui/e-cal-model.c:3566
-#: ../calendar/gui/e-meeting-list-view.c:223
-#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
-#: ../modules/itip-formatter/itip-view.c:5956
+#: ../calendar/gui/e-cal-model.c:3546
+#: ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
+#: ../modules/itip-formatter/itip-view.c:5971
 msgid "Declined"
 msgstr "Одбијено"
 
-#: ../calendar/gui/e-cal-model.c:3567
-#: ../calendar/gui/e-meeting-list-view.c:224
-#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-cal-model.c:3547
+#: ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Tentative"
 msgstr "Са резервом"
 
-#: ../calendar/gui/e-cal-model.c:3568
-#: ../calendar/gui/e-meeting-list-view.c:225
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
-#: ../modules/itip-formatter/itip-view.c:5959
+#: ../calendar/gui/e-cal-model.c:3548
+#: ../calendar/gui/e-meeting-list-view.c:224
+#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
+#: ../modules/itip-formatter/itip-view.c:5974
 msgid "Delegated"
 msgstr "Делегирано"
 
-#: ../calendar/gui/e-cal-model.c:3569
+#: ../calendar/gui/e-cal-model.c:3549
 msgid "Needs action"
 msgstr "Захтева радњу"
 
-#: ../calendar/gui/e-cal-model-calendar.c:157
-#: ../calendar/gui/e-task-table.c:633
+#: ../calendar/gui/e-cal-model-calendar.c:158
+#: ../calendar/gui/e-task-table.c:629
 msgid "Free"
 msgstr "Слободно"
 
-#: ../calendar/gui/e-cal-model-calendar.c:160
-#: ../calendar/gui/e-meeting-time-sel.c:562 ../calendar/gui/e-task-table.c:634
+#: ../calendar/gui/e-cal-model-calendar.c:161
+#: ../calendar/gui/e-meeting-time-sel.c:579 ../calendar/gui/e-task-table.c:630
 msgid "Busy"
 msgstr "Заузето"
 
-#: ../calendar/gui/e-cal-model-tasks.c:720
+#: ../calendar/gui/e-cal-model-tasks.c:723
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4235,7 +4225,7 @@ msgstr ""
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:772
+#: ../calendar/gui/e-cal-model-tasks.c:775
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ништа"
@@ -4245,7 +4235,7 @@ msgstr "Ништа"
 # strftime format of a weekday, a date and a
 # time, in 24-hour format.
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:162
+#: ../calendar/gui/e-cell-date-edit-text.c:159
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d. %m. %Y. %H:%M:%S"
 
@@ -4254,11 +4244,11 @@ msgstr "%a %d. %m. %Y. %H:%M:%S"
 # strftime format of a weekday, a date and a
 # time, in 12-hour format.
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:165
+#: ../calendar/gui/e-cell-date-edit-text.c:162
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:173
+#: ../calendar/gui/e-cell-date-edit-text.c:170
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4268,16 +4258,16 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1027 ../calendar/gui/e-week-view.c:773
-#: ../calendar/gui/print.c:985 ../calendar/gui/print.c:1004
-#: ../calendar/gui/print.c:2495 ../calendar/gui/print.c:2515
+#: ../calendar/gui/e-day-view.c:1026 ../calendar/gui/e-week-view.c:772
+#: ../calendar/gui/print.c:1058 ../calendar/gui/print.c:1077
+#: ../calendar/gui/print.c:2608 ../calendar/gui/print.c:2628
 msgid "am"
 msgstr "прп"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1030 ../calendar/gui/e-week-view.c:776
-#: ../calendar/gui/print.c:990 ../calendar/gui/print.c:1006
-#: ../calendar/gui/print.c:2500 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-day-view.c:1029 ../calendar/gui/e-week-view.c:775
+#: ../calendar/gui/print.c:1063 ../calendar/gui/print.c:1079
+#: ../calendar/gui/print.c:2613 ../calendar/gui/print.c:2630
 msgid "pm"
 msgstr "поп"
 
@@ -4292,13 +4282,13 @@ msgstr "поп"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:1836 ../calendar/gui/e-day-view-top-item.c:831
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1979
+#: ../calendar/gui/e-day-view.c:1871 ../calendar/gui/e-day-view-top-item.c:851
+#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2071
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2671
+#: ../calendar/gui/e-day-view.c:2709
 #, c-format
 msgid "Week %d"
 msgstr "%d. недеља"
@@ -4309,12 +4299,12 @@ msgstr "%d. недеља"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:790
+#: ../calendar/gui/e-day-view-time-item.c:794
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i минутни размаци"
 
-#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-day-view-time-item.c:819
 msgid "Show the second time zone"
 msgstr "Прикажи другу временску зону"
 
@@ -4324,183 +4314,196 @@ msgstr "Прикажи другу временску зону"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:832
-#: ../modules/calendar/e-calendar-preferences.c:185
-#: ../modules/calendar/e-calendar-preferences.c:237
+#: ../calendar/gui/e-day-view-time-item.c:836
+#: ../modules/calendar/e-calendar-preferences.c:179
+#: ../modules/calendar/e-calendar-preferences.c:231
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ништа"
 
-#: ../calendar/gui/e-day-view-time-item.c:866
-#: ../calendar/gui/e-timezone-entry.c:322
-#: ../modules/calendar/e-calendar-preferences.c:268
+#: ../calendar/gui/e-day-view-time-item.c:870
+#: ../calendar/gui/e-timezone-entry.c:324
+#: ../modules/calendar/e-calendar-preferences.c:262
 msgid "Select..."
 msgstr "Изабери..."
 
-#: ../calendar/gui/e-meeting-list-view.c:65
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "Председавајући"
 
-#: ../calendar/gui/e-meeting-list-view.c:66
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Required Participants"
 msgstr "Обавезни учесници"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Optional Participants"
 msgstr "Могући учесници"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Resources"
 msgstr "Извори"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/e-meeting-store.c:1069 ../calendar/gui/print.c:1155
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
+#: ../calendar/gui/e-meeting-store.c:1068 ../calendar/gui/print.c:1231
 msgid "Individual"
 msgstr "Појединац"
 
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
-#: ../calendar/gui/print.c:1156 ../widgets/table/e-table-config.ui.h:8
+#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
+#: ../calendar/gui/print.c:1232 ../e-util/e-table-config.ui.h:8
 msgid "Group"
 msgstr "Група"
 
-#: ../calendar/gui/e-meeting-list-view.c:184
-#: ../calendar/gui/e-meeting-store.c:118 ../calendar/gui/e-meeting-store.c:135
-#: ../calendar/gui/print.c:1157
+#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
+#: ../calendar/gui/print.c:1233
 msgid "Resource"
 msgstr "Извор"
 
-#: ../calendar/gui/e-meeting-list-view.c:185
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:1158
+#: ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
+#: ../calendar/gui/print.c:1234
 msgid "Room"
 msgstr "Соба"
 
-#: ../calendar/gui/e-meeting-list-view.c:196
-#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/print.c:1172
+#: ../calendar/gui/e-meeting-list-view.c:195
+#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/print.c:1248
 msgid "Chair"
 msgstr "Столица"
 
-#: ../calendar/gui/e-meeting-list-view.c:197
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/e-meeting-store.c:1072 ../calendar/gui/print.c:1173
+#: ../calendar/gui/e-meeting-list-view.c:196
+#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
+#: ../calendar/gui/e-meeting-store.c:1071 ../calendar/gui/print.c:1249
 msgid "Required Participant"
 msgstr "Обавезан учесник"
 
-#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:170
-#: ../calendar/gui/print.c:1174
+#: ../calendar/gui/e-meeting-list-view.c:197
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
+#: ../calendar/gui/print.c:1250
 msgid "Optional Participant"
 msgstr "Могући учесник"
 
-#: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:155 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/print.c:1175
+#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-meeting-store.c:154 ../calendar/gui/e-meeting-store.c:171
+#: ../calendar/gui/print.c:1251
 msgid "Non-Participant"
 msgstr "Не-учесник"
 
-#: ../calendar/gui/e-meeting-list-view.c:221
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
-#: ../calendar/gui/e-meeting-store.c:1082
+#: ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../calendar/gui/e-meeting-store.c:1081
 msgid "Needs Action"
 msgstr "Потребна радња"
 
-#. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:619
+#: ../calendar/gui/e-meeting-list-view.c:623
 msgid "Attendee                          "
 msgstr "Учесник                          "
 
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:671
+#: ../calendar/gui/e-meeting-list-view.c:678
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "МВОМ"
 
-#: ../calendar/gui/e-meeting-store.c:211 ../calendar/gui/e-meeting-store.c:234
+#: ../calendar/gui/e-meeting-store.c:210 ../calendar/gui/e-meeting-store.c:233
 msgid "In Process"
 msgstr "У току"
 
-#: ../calendar/gui/e-meeting-store.c:1906
+#: ../calendar/gui/e-meeting-store.c:1954
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 "Унесите лозинку да приступите подацима „слободан/заузет“ на серверу „%s“ као "
 "корисник „%s“"
 
-#: ../calendar/gui/e-meeting-store.c:1916
+#: ../calendar/gui/e-meeting-store.c:1964
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Разлог неуспеха: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1921
-#: ../plugins/publish-calendar/publish-calendar.c:335
-#: ../smime/gui/component.c:54
+#: ../calendar/gui/e-meeting-store.c:1969
+#: ../plugins/publish-calendar/publish-calendar.c:341
+#: ../smime/gui/component.c:55
 msgid "Enter password"
 msgstr "Упишите лозинку"
 
-#: ../calendar/gui/e-meeting-time-sel.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:580
 msgid "Out of Office"
 msgstr "Ван канцеларије"
 
-#: ../calendar/gui/e-meeting-time-sel.c:564
+#: ../calendar/gui/e-meeting-time-sel.c:582
 msgid "No Information"
 msgstr "Нема податка"
 
-#: ../calendar/gui/e-meeting-time-sel.c:602
+#: ../calendar/gui/e-meeting-time-sel.c:622
 msgid "O_ptions"
 msgstr "_Могућности"
 
-#: ../calendar/gui/e-meeting-time-sel.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:642
 msgid "Show _only working hours"
 msgstr "Прикажи _само радне сате"
 
-#: ../calendar/gui/e-meeting-time-sel.c:632
+#: ../calendar/gui/e-meeting-time-sel.c:655
 msgid "Show _zoomed out"
 msgstr "Прикажи _умањено"
 
-#: ../calendar/gui/e-meeting-time-sel.c:649
+#: ../calendar/gui/e-meeting-time-sel.c:673
 msgid "_Update free/busy"
 msgstr "_Ажурирај слободно/заузето"
 
-#: ../calendar/gui/e-meeting-time-sel.c:665
+#: ../calendar/gui/e-meeting-time-sel.c:690
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:684
+#: ../calendar/gui/e-meeting-time-sel.c:710
 msgid "_Autopick"
 msgstr "_Самоизбор"
 
-#: ../calendar/gui/e-meeting-time-sel.c:700
+#: ../calendar/gui/e-meeting-time-sel.c:727
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:719
+#: ../calendar/gui/e-meeting-time-sel.c:748
 msgid "_All people and resources"
 msgstr "_Све људе и изворе"
 
-#: ../calendar/gui/e-meeting-time-sel.c:730
+#: ../calendar/gui/e-meeting-time-sel.c:759
 msgid "All _people and one resource"
 msgstr "Све _људе и један извор"
 
-#: ../calendar/gui/e-meeting-time-sel.c:741
+#: ../calendar/gui/e-meeting-time-sel.c:770
 msgid "_Required people"
 msgstr "_Обавезне људе"
 
-#: ../calendar/gui/e-meeting-time-sel.c:751
+#: ../calendar/gui/e-meeting-time-sel.c:780
 msgid "Required people and _one resource"
 msgstr "Обавезне људе и _један извор"
 
-#: ../calendar/gui/e-meeting-time-sel.c:802
+#: ../calendar/gui/e-meeting-time-sel.c:834
 msgid "_Start time:"
 msgstr "_Време почетка:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:843
+#: ../calendar/gui/e-meeting-time-sel.c:878
 msgid "_End time:"
 msgstr "Време _завршетка:"
 
+#: ../calendar/gui/e-meeting-time-sel.c:2786
+#, c-format
+#| msgid "Location: %s"
+msgid ""
+"Summary: %s\n"
+"Location: %s"
+msgstr ""
+"Сажетак: %s\n"
+"Место: %s"
+
+#: ../calendar/gui/e-meeting-time-sel.c:2788 ../calendar/gui/print.c:3497
+#, c-format
+msgid "Summary: %s"
+msgstr "Сажетак: %s"
+
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Click here to add an attendee"
 msgstr "Кликните овде да додате учесника"
@@ -4525,46 +4528,46 @@ msgstr "Заједничко име"
 msgid "Language"
 msgstr "Језик"
 
-#: ../calendar/gui/e-memo-table.c:433
-#: ../modules/calendar/e-cal-shell-content.c:476
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
-#: ../modules/calendar/e-memo-shell-view-actions.c:248
+#: ../calendar/gui/e-memo-table.c:421
+#: ../modules/calendar/e-cal-shell-content.c:472
+#: ../modules/calendar/e-memo-shell-view-actions.c:232
+#: ../modules/calendar/e-memo-shell-view-actions.c:247
 #: ../modules/calendar/e-memo-shell-view.c:306
 msgid "Memos"
 msgstr "Белешке"
 
-#: ../calendar/gui/e-memo-table.c:514 ../calendar/gui/e-task-table.c:787
+#: ../calendar/gui/e-memo-table.c:502 ../calendar/gui/e-task-table.c:790
 msgid "* No Summary *"
 msgstr "* Без сажетка *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:601 ../calendar/gui/e-task-table.c:871
+#: ../calendar/gui/e-memo-table.c:589 ../calendar/gui/e-task-table.c:874
 msgid "Start: "
 msgstr "Почетак: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:620 ../calendar/gui/e-task-table.c:889
+#: ../calendar/gui/e-memo-table.c:608 ../calendar/gui/e-task-table.c:892
 msgid "Due: "
 msgstr "Рок: "
 
-#: ../calendar/gui/e-memo-table.c:739
+#: ../calendar/gui/e-memo-table.c:727
 msgid "Cut selected memos to the clipboard"
 msgstr "Сече изабране белешке у списак исечака"
 
-#: ../calendar/gui/e-memo-table.c:745
+#: ../calendar/gui/e-memo-table.c:733
 msgid "Copy selected memos to the clipboard"
 msgstr "Умножава изабране белешке у списак исечака"
 
-#: ../calendar/gui/e-memo-table.c:751
+#: ../calendar/gui/e-memo-table.c:739
 msgid "Paste memos from the clipboard"
 msgstr "Убацује белешке из списка исечака"
 
-#: ../calendar/gui/e-memo-table.c:757
-#: ../modules/calendar/e-memo-shell-view-actions.c:611
+#: ../calendar/gui/e-memo-table.c:745
+#: ../modules/calendar/e-memo-shell-view-actions.c:610
 msgid "Delete selected memos"
 msgstr "Брише изабране белешке"
 
-#: ../calendar/gui/e-memo-table.c:763
+#: ../calendar/gui/e-memo-table.c:751
 msgid "Select all visible memos"
 msgstr "Бира све видљиве белешке"
 
@@ -4580,44 +4583,44 @@ msgstr "Кликните да додате белешку"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:608
+#: ../calendar/gui/e-task-table.c:602
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:705 ../calendar/gui/print.c:2284
-#: ../calendar/importers/icalendar-importer.c:84
-#: ../calendar/importers/icalendar-importer.c:1082
+#: ../calendar/gui/e-task-table.c:708 ../calendar/gui/print.c:2389
+#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/importers/icalendar-importer.c:1079
 #: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:437
-#: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view-actions.c:271
+#: ../modules/calendar/e-cal-shell-content.c:433
+#: ../modules/calendar/e-task-shell-view-actions.c:255
+#: ../modules/calendar/e-task-shell-view-actions.c:270
 #: ../modules/calendar/e-task-shell-view.c:461
 msgid "Tasks"
 msgstr "Задаци"
 
-#: ../calendar/gui/e-task-table.c:1022
+#: ../calendar/gui/e-task-table.c:1025
 msgid "Cut selected tasks to the clipboard"
 msgstr "Сече изабране задатке у списак исечака"
 
-#: ../calendar/gui/e-task-table.c:1028
+#: ../calendar/gui/e-task-table.c:1031
 msgid "Copy selected tasks to the clipboard"
 msgstr "Умножава изабране задатке у списак исечака"
 
-#: ../calendar/gui/e-task-table.c:1034
+#: ../calendar/gui/e-task-table.c:1037
 msgid "Paste tasks from the clipboard"
 msgstr "Убацује задатке из списка исечака"
 
-#: ../calendar/gui/e-task-table.c:1040
-#: ../modules/calendar/e-task-shell-view-actions.c:735
+#: ../calendar/gui/e-task-table.c:1043
+#: ../modules/calendar/e-task-shell-view-actions.c:734
 msgid "Delete selected tasks"
 msgstr "Брише изабране задатке"
 
-#: ../calendar/gui/e-task-table.c:1046
+#: ../calendar/gui/e-task-table.c:1049
 msgid "Select all visible tasks"
 msgstr "Бира све видљиве задатке"
 
-#: ../calendar/gui/e-timezone-entry.c:333
+#: ../calendar/gui/e-timezone-entry.c:335
 msgid "Select Timezone"
 msgstr "Изабери временску зону"
 
@@ -4626,16 +4629,16 @@ msgstr "Изабери временску зону"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1960
+#: ../calendar/gui/e-week-view-main-item.c:241 ../calendar/gui/print.c:2050
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2315
+#: ../calendar/gui/gnome-cal.c:2323
 msgid "Purging"
 msgstr "Брисање"
 
-#: ../calendar/gui/itip-utils.c:650 ../calendar/gui/itip-utils.c:706
-#: ../calendar/gui/itip-utils.c:819
+#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
+#: ../calendar/gui/itip-utils.c:818
 msgid "An organizer must be set."
 msgstr "Организатор мора бити одређен."
 
@@ -4643,23 +4646,23 @@ msgstr "Организатор мора бити одређен."
 msgid "At least one attendee is necessary"
 msgstr "Најмање један учесник је неопходан"
 
-#: ../calendar/gui/itip-utils.c:906 ../calendar/gui/itip-utils.c:1067
+#: ../calendar/gui/itip-utils.c:905 ../calendar/gui/itip-utils.c:1066
 msgid "Event information"
 msgstr "Подаци о догађају"
 
-#: ../calendar/gui/itip-utils.c:909 ../calendar/gui/itip-utils.c:1070
+#: ../calendar/gui/itip-utils.c:908 ../calendar/gui/itip-utils.c:1069
 msgid "Task information"
 msgstr "Подаци о задатку"
 
-#: ../calendar/gui/itip-utils.c:912 ../calendar/gui/itip-utils.c:1073
+#: ../calendar/gui/itip-utils.c:911 ../calendar/gui/itip-utils.c:1072
 msgid "Memo information"
 msgstr "Подаци о белешци"
 
-#: ../calendar/gui/itip-utils.c:915 ../calendar/gui/itip-utils.c:1091
+#: ../calendar/gui/itip-utils.c:914 ../calendar/gui/itip-utils.c:1090
 msgid "Free/Busy information"
 msgstr "Подаци слободно/заузето"
 
-#: ../calendar/gui/itip-utils.c:918
+#: ../calendar/gui/itip-utils.c:917
 msgid "Calendar information"
 msgstr "Подаци о календару"
 
@@ -4667,7 +4670,7 @@ msgstr "Подаци о календару"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:955
+#: ../calendar/gui/itip-utils.c:954
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Прихваћено"
@@ -4676,7 +4679,7 @@ msgstr "Прихваћено"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:962
+#: ../calendar/gui/itip-utils.c:961
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Прихваћено с резервом"
@@ -4688,7 +4691,7 @@ msgstr "Прихваћено с резервом"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:969 ../calendar/gui/itip-utils.c:1017
+#: ../calendar/gui/itip-utils.c:968 ../calendar/gui/itip-utils.c:1016
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Одбијено"
@@ -4697,7 +4700,7 @@ msgstr "Одбијено"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:976
+#: ../calendar/gui/itip-utils.c:975
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Делегирано"
@@ -4705,7 +4708,7 @@ msgstr "Делегирано"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:989
+#: ../calendar/gui/itip-utils.c:988
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Освежено"
@@ -4713,7 +4716,7 @@ msgstr "Освежено"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:996
+#: ../calendar/gui/itip-utils.c:995
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Откажи"
@@ -4721,7 +4724,7 @@ msgstr "Откажи"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1003
+#: ../calendar/gui/itip-utils.c:1002
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Освежи"
@@ -4729,252 +4732,249 @@ msgstr "Освежи"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1010
+#: ../calendar/gui/itip-utils.c:1009
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Против-предлог"
 
-#: ../calendar/gui/itip-utils.c:1088
+#: ../calendar/gui/itip-utils.c:1087
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Подаци слободно/заузето (%s до %s)"
 
-#: ../calendar/gui/itip-utils.c:1096
+#: ../calendar/gui/itip-utils.c:1095
 msgid "iCalendar information"
 msgstr "Подаци иКалендара"
 
-#: ../calendar/gui/itip-utils.c:1123
+#: ../calendar/gui/itip-utils.c:1122
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "Не могу да сачувам унос, нови догађај се сукобљава са неким другим."
 
 #: ../calendar/gui/itip-utils.c:1127
-msgid "Unable to book a resource, error: "
-msgstr "Не могу да сачувам унос, грешка: "
+#, c-format
+#| msgid "Unable to book a resource, error: "
+msgid "Unable to book a resource, error: %s"
+msgstr "Не могу да сачувам унос, грешка: %s"
 
-#: ../calendar/gui/itip-utils.c:1306
+#: ../calendar/gui/itip-utils.c:1304
 msgid "You must be an attendee of the event."
 msgstr "Морате бити учесник догађаја."
 
-#: ../calendar/gui/print.c:589
+#: ../calendar/gui/print.c:657
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:589
+#: ../calendar/gui/print.c:657
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:589
+#: ../calendar/gui/print.c:657
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:589
+#: ../calendar/gui/print.c:657
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:589
+#: ../calendar/gui/print.c:657
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:658
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:658
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:658
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:658
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:658
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:659
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:659
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:659
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:659
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:659
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:660
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:660
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:660
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:660
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:660
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:661
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:661
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:661
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:661
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:661
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:662
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:662
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:662
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:662
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:662
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:663
 msgid "31st"
 msgstr "31."
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:652
+#: ../calendar/gui/print.c:721
 msgid "Su"
 msgstr "Не"
 
-#: ../calendar/gui/print.c:652
+#: ../calendar/gui/print.c:721
 msgid "Mo"
 msgstr "По"
 
-#: ../calendar/gui/print.c:652
+#: ../calendar/gui/print.c:721
 msgid "Tu"
 msgstr "Ут"
 
-#: ../calendar/gui/print.c:652
+#: ../calendar/gui/print.c:721
 msgid "We"
 msgstr "Ср"
 
-#: ../calendar/gui/print.c:653
+#: ../calendar/gui/print.c:722
 msgid "Th"
 msgstr "Че"
 
-#: ../calendar/gui/print.c:653
+#: ../calendar/gui/print.c:722
 msgid "Fr"
 msgstr "Пе"
 
-#: ../calendar/gui/print.c:653
+#: ../calendar/gui/print.c:722
 msgid "Sa"
 msgstr "Су"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3153
+#: ../calendar/gui/print.c:3296
 msgid " to "
 msgstr " до "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3163
+#: ../calendar/gui/print.c:3306
 msgid " (Completed "
 msgstr " (Завршено је "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3169
+#: ../calendar/gui/print.c:3312
 msgid "Completed "
 msgstr "Завршено је "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3179
+#: ../calendar/gui/print.c:3322
 msgid " (Due "
 msgstr " (Рок "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3186
+#: ../calendar/gui/print.c:3329
 msgid "Due "
 msgstr "Рок "
 
-#: ../calendar/gui/print.c:3351
-#, c-format
-msgid "Summary: %s"
-msgstr "Сажетак: %s"
-
-#: ../calendar/gui/print.c:3378
+#: ../calendar/gui/print.c:3527
 msgid "Attendees: "
 msgstr "Присутни: "
 
-#: ../calendar/gui/print.c:3421
+#: ../calendar/gui/print.c:3571
 #, c-format
 msgid "Status: %s"
 msgstr "Стање: %s"
 
-#: ../calendar/gui/print.c:3436
+#: ../calendar/gui/print.c:3587
 #, c-format
 msgid "Priority: %s"
 msgstr "Важност: %s"
 
-#: ../calendar/gui/print.c:3454
+#: ../calendar/gui/print.c:3605
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Постотак завршеног: %i"
 
-#: ../calendar/gui/print.c:3465
+#: ../calendar/gui/print.c:3619
 #, c-format
 msgid "URL: %s"
 msgstr "Адреса: %s"
 
-#: ../calendar/gui/print.c:3478
+#: ../calendar/gui/print.c:3633
 #, c-format
 msgid "Categories: %s"
 msgstr "Категорије: %s"
 
-#: ../calendar/gui/print.c:3489
+#: ../calendar/gui/print.c:3644
 msgid "Contacts: "
 msgstr "Контакти: "
 
@@ -4991,72 +4991,71 @@ msgstr "Отказано"
 msgid "% Completed"
 msgstr "% је завршено"
 
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:37
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:38
 msgid "is greater than"
 msgstr "је веће од"
 
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:38
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:39
 msgid "is less than"
 msgstr "је мање од"
 
-#: ../calendar/importers/icalendar-importer.c:83
+#: ../calendar/importers/icalendar-importer.c:78
 msgid "Appointments and Meetings"
 msgstr "Заказивање и састанци"
 
-#: ../calendar/importers/icalendar-importer.c:468
-#: ../calendar/importers/icalendar-importer.c:905
-#: ../modules/itip-formatter/itip-view.c:5564
+#: ../calendar/importers/icalendar-importer.c:463
+#: ../calendar/importers/icalendar-importer.c:902
 msgid "Opening calendar"
 msgstr "Отварање календара"
 
-#: ../calendar/importers/icalendar-importer.c:616
+#: ../calendar/importers/icalendar-importer.c:611
 msgid "iCalendar files (.ics)"
 msgstr "Датотеке иКалендара (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:617
+#: ../calendar/importers/icalendar-importer.c:612
 msgid "Evolution iCalendar importer"
 msgstr "Увозник иКалендара Еволуције"
 
-#: ../calendar/importers/icalendar-importer.c:707
+#: ../calendar/importers/icalendar-importer.c:704
 msgid "Reminder!"
 msgstr "Подсетник!"
 
-#: ../calendar/importers/icalendar-importer.c:791
+#: ../calendar/importers/icalendar-importer.c:788
 msgid "vCalendar files (.vcs)"
 msgstr "Датотеке вКалендара (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:792
+#: ../calendar/importers/icalendar-importer.c:789
 msgid "Evolution vCalendar importer"
 msgstr "Увозник вКалендара Еволуције"
 
-#: ../calendar/importers/icalendar-importer.c:1075
+#: ../calendar/importers/icalendar-importer.c:1072
 msgid "Calendar Events"
 msgstr "Догађаји календара"
 
-#: ../calendar/importers/icalendar-importer.c:1119
+#: ../calendar/importers/icalendar-importer.c:1116
 msgid "Evolution Calendar intelligent importer"
 msgstr "Интелигентни увозник календара Еволуције"
 
 #: ../calendar/importers/icalendar-importer.c:1187
-#: ../calendar/importers/icalendar-importer.c:1505
+#: ../calendar/importers/icalendar-importer.c:1506
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Састанак"
 
 #: ../calendar/importers/icalendar-importer.c:1187
-#: ../calendar/importers/icalendar-importer.c:1505
+#: ../calendar/importers/icalendar-importer.c:1506
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Догађај"
 
 #: ../calendar/importers/icalendar-importer.c:1190
-#: ../calendar/importers/icalendar-importer.c:1506
+#: ../calendar/importers/icalendar-importer.c:1507
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Задатак"
 
 #: ../calendar/importers/icalendar-importer.c:1193
-#: ../calendar/importers/icalendar-importer.c:1507
+#: ../calendar/importers/icalendar-importer.c:1508
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Белешка"
@@ -5106,9 +5105,8 @@ msgid "Classification"
 msgstr "Разврставање"
 
 #. Translators: Appointment's summary
-#. Translators: Column header for a component summary
 #: ../calendar/importers/icalendar-importer.c:1245
-#: ../calendar/importers/icalendar-importer.c:1546
+#: ../calendar/importers/icalendar-importer.c:1550
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Сажетак"
@@ -5120,9 +5118,8 @@ msgid "Location"
 msgstr "Место"
 
 #. Translators: Appointment's start time
-#. Translators: Column header for a component start date/time
 #: ../calendar/importers/icalendar-importer.c:1259
-#: ../calendar/importers/icalendar-importer.c:1542
+#: ../calendar/importers/icalendar-importer.c:1545
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Почетак"
@@ -5177,8 +5174,7 @@ msgctxt "iCalImp"
 msgid "Description"
 msgstr "Опис"
 
-#. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1538
+#: ../calendar/importers/icalendar-importer.c:1540
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Врста"
@@ -6733,164 +6729,164 @@ msgstr "Пацифик/Волис"
 msgid "Pacific/Yap"
 msgstr "Пацифик/Јап"
 
-#: ../composer/e-composer-actions.c:208
+#: ../composer/e-composer-actions.c:207
 msgid "Save as..."
 msgstr "Сачувај као..."
 
-#: ../composer/e-composer-actions.c:295
-#: ../widgets/misc/e-mail-signature-editor.c:285
+#: ../composer/e-composer-actions.c:294
+#: ../e-util/e-mail-signature-editor.c:292
 msgid "_Close"
 msgstr "_Затвори"
 
-#: ../composer/e-composer-actions.c:297
+#: ../composer/e-composer-actions.c:296
 msgid "Close the current file"
 msgstr "Затворите тренутну датотеку"
 
-#: ../composer/e-composer-actions.c:302
+#: ../composer/e-composer-actions.c:301
 msgid "New _Message"
 msgstr "Нова _порука"
 
-#: ../composer/e-composer-actions.c:304
+#: ../composer/e-composer-actions.c:303
 msgid "Open New Message window"
 msgstr "Отвара прозор за нову поруку"
 
-#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1495
+#: ../composer/e-composer-actions.c:310 ../shell/e-shell-window-actions.c:925
 msgid "Configure Evolution"
 msgstr "Подеси Еволуцију"
 
-#: ../composer/e-composer-actions.c:318
+#: ../composer/e-composer-actions.c:317
 msgid "Save the current file"
 msgstr "Сачувајте тренутну датотеку"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:322
 msgid "Save _As..."
 msgstr "Сачувај _као..."
 
-#: ../composer/e-composer-actions.c:325
+#: ../composer/e-composer-actions.c:324
 msgid "Save the current file with a different name"
 msgstr "Сачувајте тренутну датотеку под другим именом"
 
-#: ../composer/e-composer-actions.c:332
+#: ../composer/e-composer-actions.c:331
 msgid "Character _Encoding"
 msgstr "Ко_дна страна"
 
-#: ../composer/e-composer-actions.c:349
+#: ../composer/e-composer-actions.c:348
 msgid "_Print..."
 msgstr "_Штампај..."
 
-#: ../composer/e-composer-actions.c:356
+#: ../composer/e-composer-actions.c:355
 msgid "Print Pre_view"
 msgstr "Преглед пред _штампу"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:362
 msgid "Save as _Draft"
 msgstr "Сачувај као _нацрт"
 
-#: ../composer/e-composer-actions.c:365
+#: ../composer/e-composer-actions.c:364
 msgid "Save as draft"
 msgstr "Сачувајте као нацрт"
 
-#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:325
+#: ../composer/e-composer-actions.c:369 ../composer/e-composer-private.c:327
 msgid "S_end"
 msgstr "Пош_аљи"
 
-#: ../composer/e-composer-actions.c:372
+#: ../composer/e-composer-actions.c:371
 msgid "Send this message"
 msgstr "Пошаљите ову поруку"
 
-#: ../composer/e-composer-actions.c:380
+#: ../composer/e-composer-actions.c:379
 msgid "PGP _Encrypt"
 msgstr "ПГП _шифруј"
 
-#: ../composer/e-composer-actions.c:382
+#: ../composer/e-composer-actions.c:381
 msgid "Encrypt this message with PGP"
 msgstr "Шифрујте ову поруку помоћу ПГП-а"
 
-#: ../composer/e-composer-actions.c:388
+#: ../composer/e-composer-actions.c:387
 msgid "PGP _Sign"
 msgstr "ПГП _потпиши"
 
-#: ../composer/e-composer-actions.c:390
+#: ../composer/e-composer-actions.c:389
 msgid "Sign this message with your PGP key"
 msgstr "Потпишите ову поруку помоћу ПГП кључа"
 
-#: ../composer/e-composer-actions.c:396
+#: ../composer/e-composer-actions.c:395
 msgid "_Picture Gallery"
 msgstr "Галерија _слика"
 
-#: ../composer/e-composer-actions.c:398
+#: ../composer/e-composer-actions.c:397
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Приказује збирку слика које можете да превучете у вашу поруку"
 
-#: ../composer/e-composer-actions.c:404
+#: ../composer/e-composer-actions.c:403
 msgid "_Prioritize Message"
 msgstr "В_ажност поруке"
 
-#: ../composer/e-composer-actions.c:406
+#: ../composer/e-composer-actions.c:405
 msgid "Set the message priority to high"
 msgstr "Поставља важност поруке на високо"
 
-#: ../composer/e-composer-actions.c:412
+#: ../composer/e-composer-actions.c:411
 msgid "Re_quest Read Receipt"
 msgstr "Т_ражи повратницу"
 
-#: ../composer/e-composer-actions.c:414
+#: ../composer/e-composer-actions.c:413
 msgid "Get delivery notification when your message is read"
 msgstr "Прима извештај о достави када је порука прочитана"
 
-#: ../composer/e-composer-actions.c:420
+#: ../composer/e-composer-actions.c:419
 msgid "S/MIME En_crypt"
 msgstr "С/МИМЕ _шифруј"
 
-#: ../composer/e-composer-actions.c:422
+#: ../composer/e-composer-actions.c:421
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Шифрује ову поруку помоћу С/МИМЕ уверења за шифровање"
 
-#: ../composer/e-composer-actions.c:428
+#: ../composer/e-composer-actions.c:427
 msgid "S/MIME Sig_n"
 msgstr "С/МИМЕ _потпиши"
 
-#: ../composer/e-composer-actions.c:430
+#: ../composer/e-composer-actions.c:429
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Потписује ову поруку С/МИМЕ уверењем"
 
-#: ../composer/e-composer-actions.c:436
+#: ../composer/e-composer-actions.c:435
 msgid "_Bcc Field"
 msgstr "_Бцц поље"
 
-#: ../composer/e-composer-actions.c:438
+#: ../composer/e-composer-actions.c:437
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Бира да ли је поље Бцц приказано"
 
-#: ../composer/e-composer-actions.c:444
+#: ../composer/e-composer-actions.c:443
 msgid "_Cc Field"
 msgstr "_Цц поље"
 
-#: ../composer/e-composer-actions.c:446
+#: ../composer/e-composer-actions.c:445
 msgid "Toggles whether the CC field is displayed"
 msgstr "Бира да ли је поље ЦЦ приказано"
 
-#: ../composer/e-composer-actions.c:452
+#: ../composer/e-composer-actions.c:451
 msgid "_Reply-To Field"
 msgstr "Поље Одго_вор-за"
 
-#: ../composer/e-composer-actions.c:454
+#: ../composer/e-composer-actions.c:453
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Бира да ли је поље Одговор-за приказано"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:512
 msgid "Save Draft"
 msgstr "Сачувај нацрт"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Унесите примаоце поруке"
 
-#: ../composer/e-composer-header-table.c:45
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Унесите адресе које ће примити графитну копију (cc) поруке"
 
-#: ../composer/e-composer-header-table.c:48
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -6898,7 +6894,7 @@ msgstr ""
 "Унесите адресе које ће примити графитну копију поруке без појављивања у "
 "листи прималаца поруке"
 
-#: ../composer/e-composer-header-table.c:849
+#: ../composer/e-composer-header-table.c:835
 msgid "Fr_om:"
 msgstr "Ш_аље:"
 
@@ -6906,36 +6902,36 @@ msgstr "Ш_аље:"
 # * Create this before we call create_from_optionmenu,
 # * because that causes from_changed to be called, which
 # * expects the reply_to fields to be initialized.
-#: ../composer/e-composer-header-table.c:856
+#: ../composer/e-composer-header-table.c:842
 msgid "_Reply-To:"
 msgstr "_Одговор-за:"
 
-#: ../composer/e-composer-header-table.c:861
+#: ../composer/e-composer-header-table.c:847
 msgid "_To:"
 msgstr "_Прима:"
 
-#: ../composer/e-composer-header-table.c:867
+#: ../composer/e-composer-header-table.c:853
 msgid "_Cc:"
 msgstr "_Цц:"
 
-#: ../composer/e-composer-header-table.c:873
+#: ../composer/e-composer-header-table.c:859
 msgid "_Bcc:"
 msgstr "_Бцц:"
 
-#: ../composer/e-composer-header-table.c:878
+#: ../composer/e-composer-header-table.c:864
 msgid "_Post To:"
 msgstr "Објави _на:"
 
-#: ../composer/e-composer-header-table.c:882
+#: ../composer/e-composer-header-table.c:868
 msgid "S_ubject:"
 msgstr "На_слов:"
 
-#: ../composer/e-composer-header-table.c:890
-#: ../mail/e-mail-config-identity-page.c:466
+#: ../composer/e-composer-header-table.c:876
+#: ../mail/e-mail-config-identity-page.c:488
 msgid "Si_gnature:"
 msgstr "Потп_ис:"
 
-#: ../composer/e-composer-name-header.c:215
+#: ../composer/e-composer-name-header.c:235
 msgid "Click here for the address book"
 msgstr "Кликните овде за адресар."
 
@@ -6943,11 +6939,11 @@ msgstr "Кликните овде за адресар."
 msgid "Click here to select folders to post to"
 msgstr "Кликните овде да изаберете фасцикле за слање"
 
-#: ../composer/e-composer-private.c:345
+#: ../composer/e-composer-private.c:347
 msgid "Save draft"
 msgstr "Сачувајте нацрт"
 
-#: ../composer/e-msg-composer.c:856
+#: ../composer/e-msg-composer.c:862
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -6955,7 +6951,7 @@ msgstr ""
 "Није могуће потписивање одлазеће поруке: није постављено уверење за "
 "потписивање за овај налог"
 
-#: ../composer/e-msg-composer.c:865
+#: ../composer/e-msg-composer.c:871
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -6964,15 +6960,15 @@ msgstr ""
 "Није могуће шифровање одлазеће поруке: није постављено уверење за шифровање "
 "за овај налог"
 
-#: ../composer/e-msg-composer.c:1545 ../composer/e-msg-composer.c:1954
+#: ../composer/e-msg-composer.c:1552 ../composer/e-msg-composer.c:1961
 msgid "Compose Message"
 msgstr "Састави поруку"
 
-#: ../composer/e-msg-composer.c:4198
+#: ../composer/e-msg-composer.c:4215
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "Састављач у телу поруке не садржи текст, што не може бити измењено."
 
-#: ../composer/e-msg-composer.c:4875
+#: ../composer/e-msg-composer.c:4890
 msgid "Untitled Message"
 msgstr "Неименована порука"
 
@@ -7142,7 +7138,7 @@ msgstr "Обавештење аларма Еволуције"
 msgid "Calendar event notifications"
 msgstr "Обавештења о догађајима календара"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:936
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:929
 #: ../modules/mailto-handler/evolution-mailto-handler.c:215
 #: ../shell/e-shell-window-private.c:243
 msgid "Evolution"
@@ -7151,7 +7147,7 @@ msgstr "Еволуција"
 # bug(slobo): tooltip би могао да буде и „Пошаљите е-поруку пријатељима и поред
 # овако уштогљених оригинала
 # msgstr "Пакет пословних програма"
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:651
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:83
 msgid "Groupware Suite"
 msgstr "Пакет групе"
 
@@ -7163,6 +7159,10 @@ msgstr "Еволуција — пошта и календар"
 msgid "Manage your email, contacts and schedule"
 msgstr "Управљајте вашом поштом, контактима и обавезама"
 
+#: ../data/evolution.desktop.in.in.h:5
+msgid "mail;calendar;contact;addressbook;task;"
+msgstr "пошта;календар;контакт;адресар;задатак;"
+
 #: ../data/evolution-settings.desktop.in.in.h:1
 msgid "Email Settings"
 msgstr "Поставке поште"
@@ -9162,7 +9162,7 @@ msgid ""
 "Address book to use for storing automatically synced contacts from Pidgin."
 msgstr ""
 "Адресар који ће бити коришћен за смештај самостално усаглашене контакте са "
-"Голупка"
+"Голупка."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
 msgid "Pidgin check interval"
@@ -9211,7 +9211,7 @@ msgid "The default command that must be used as the editor."
 msgstr "Подразумевана наредба која се користи као уређивач."
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:3
-#: ../plugins/external-editor/external-editor.c:125
+#: ../plugins/external-editor/external-editor.c:123
 msgid "Automatically launch when a new mail is edited"
 msgstr "Аутоматски покреће при уређивању нове поруке"
 
@@ -9399,7 +9399,7 @@ msgstr "Полазна фасцикла избирача датотека"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Полазна фасцикла за прозорчиће избирача датотека."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:311
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:309
 msgid "Start in offline mode"
 msgstr "Започиње рад ван мреже"
 
@@ -9499,22 +9499,13 @@ msgid "Use SpamAssassin daemon and client"
 msgstr "Користи сервис и клијента Убице спама"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
-msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "Користи демона и клијента Убице спама (spamc/spamd)."
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
-msgid "SpamAssassin client binary"
-msgstr "Извршни клијента Убице спама"
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:7
-msgid "SpamAssassin daemon binary"
-msgstr "Извршни демона Убице спама"
+msgid "Use spamc and spamd programs, if available."
+msgstr "Користи програме спамц и спамд, ако су доступни."
 
 #: ../em-format/e-mail-formatter-attachment.c:363
-#: ../mail/message-list.etspec.h:4 ../widgets/misc/e-attachment-bar.c:101
-#: ../widgets/misc/e-attachment-bar.c:106
-#: ../widgets/misc/e-attachment-paned.c:176
-#: ../widgets/misc/e-attachment-paned.c:181
+#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
+#: ../e-util/e-attachment-paned.c:176 ../e-util/e-attachment-paned.c:181
+#: ../mail/message-list.etspec.h:4
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Прилог"
@@ -9522,83 +9513,83 @@ msgstr[1] "Прилози"
 msgstr[2] "Прилози"
 msgstr[3] "Прилог"
 
-#: ../em-format/e-mail-formatter-attachment.c:369
+#: ../em-format/e-mail-formatter-attachment.c:364
 msgid "Display as attachment"
 msgstr "Прикажи као прилог"
 
-#: ../em-format/e-mail-formatter.c:1368 ../mail/e-mail-tag-editor.c:327
-#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:67
+#: ../em-format/e-mail-formatter.c:1389 ../mail/e-mail-tag-editor.c:326
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:61
 msgid "From"
 msgstr "Шаље"
 
-#: ../em-format/e-mail-formatter.c:1369 ../modules/mail/em-mailer-prefs.c:68
+#: ../em-format/e-mail-formatter.c:1390 ../modules/mail/em-mailer-prefs.c:62
 msgid "Reply-To"
 msgstr "Одговор"
 
-#: ../em-format/e-mail-formatter.c:1371
+#: ../em-format/e-mail-formatter.c:1392
 #: ../em-format/e-mail-formatter-utils.c:182
-#: ../em-format/e-mail-formatter-utils.c:205
-#: ../modules/mail/em-mailer-prefs.c:70
+#: ../em-format/e-mail-formatter-utils.c:206
+#: ../modules/mail/em-mailer-prefs.c:64
 msgid "Cc"
 msgstr "Цц"
 
-#: ../em-format/e-mail-formatter.c:1372
+#: ../em-format/e-mail-formatter.c:1393
 #: ../em-format/e-mail-formatter-utils.c:184
-#: ../em-format/e-mail-formatter-utils.c:207
-#: ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/e-mail-formatter-utils.c:208
+#: ../modules/mail/em-mailer-prefs.c:65
 msgid "Bcc"
 msgstr "Бцц"
 
-#: ../em-format/e-mail-formatter.c:1373
-#: ../em-format/e-mail-formatter-quote-headers.c:165
-#: ../mail/e-mail-tag-editor.c:332 ../mail/em-filter-i18n.h:76
-#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:72
-#: ../smime/lib/e-cert.c:1125
+#: ../em-format/e-mail-formatter.c:1394
+#: ../em-format/e-mail-formatter-quote-headers.c:150
+#: ../mail/e-mail-tag-editor.c:331 ../mail/em-filter-i18n.h:77
+#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:66
+#: ../smime/lib/e-asn1-object.c:712
 msgid "Subject"
 msgstr "Наслов"
 
-#: ../em-format/e-mail-formatter.c:1374 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:73 ../widgets/misc/e-dateedit.c:526
-#: ../widgets/misc/e-dateedit.c:548
+#: ../em-format/e-mail-formatter.c:1395 ../e-util/e-dateedit.c:549
+#: ../e-util/e-dateedit.c:572 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:67
 msgid "Date"
 msgstr "Датум"
 
-#: ../em-format/e-mail-formatter.c:1375 ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/e-mail-formatter.c:1396 ../modules/mail/em-mailer-prefs.c:68
 msgid "Newsgroups"
 msgstr "Групе вести"
 
-#: ../em-format/e-mail-formatter.c:1376 ../modules/mail/em-mailer-prefs.c:75
+#: ../em-format/e-mail-formatter.c:1397 ../modules/mail/em-mailer-prefs.c:69
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "Лице"
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user@example.com"
-#: ../em-format/e-mail-formatter-headers.c:114
-#: ../plugins/mail-notification/mail-notification.c:396
+#: ../em-format/e-mail-formatter-headers.c:100
+#: ../plugins/mail-notification/mail-notification.c:395
 #, c-format
 msgid "From: %s"
 msgstr "Шаље: %s"
 
-#: ../em-format/e-mail-formatter-headers.c:134
-#: ../em-format/e-mail-formatter-headers.c:139
+#: ../em-format/e-mail-formatter-headers.c:120
+#: ../em-format/e-mail-formatter-headers.c:125
 msgid "(no subject)"
 msgstr "(без наслова)"
 
-#: ../em-format/e-mail-formatter-headers.c:340
+#: ../em-format/e-mail-formatter-headers.c:327
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Поруку шаље „%s“ на име „%s“"
 
-#: ../em-format/e-mail-formatter-image.c:152
+#: ../em-format/e-mail-formatter-image.c:143
 msgid "Regular Image"
 msgstr "Обична слика"
 
-#: ../em-format/e-mail-formatter-image.c:158
+#: ../em-format/e-mail-formatter-image.c:144
 msgid "Display part as an image"
 msgstr "Приказује делове као слику"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:237
+#: ../em-format/e-mail-formatter-message-rfc822.c:242
 msgid "RFC822 message"
 msgstr "РФЦ822 порука"
 
@@ -9606,97 +9597,97 @@ msgstr "РФЦ822 порука"
 msgid "Format part as an RFC822 message"
 msgstr "Обликује део као РФЦ822 поруку"
 
-#: ../em-format/e-mail-formatter-print.c:53
+#: ../em-format/e-mail-formatter-print.c:56
+#: ../e-util/gal-define-views-dialog.c:361
+#: ../e-util/gal-view-instance-save-as-dialog.c:95
 #: ../mail/e-mail-label-tree-view.c:99
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1255
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1327
 #: ../modules/cal-config-google/e-google-chooser.c:209
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../widgets/menus/gal-define-views-dialog.c:352
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../modules/plugin-manager/evolution-plugin-manager.c:67
 msgid "Name"
 msgstr "Назив"
 
-#: ../em-format/e-mail-formatter-print.c:53 ../mail/message-list.etspec.h:10
-#: ../widgets/misc/e-attachment-tree-view.c:574
+#: ../em-format/e-mail-formatter-print.c:56
+#: ../e-util/e-attachment-tree-view.c:574 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Величина"
 
 #. Add encryption/signature header
-#: ../em-format/e-mail-formatter-print-headers.c:130
+#: ../em-format/e-mail-formatter-print-headers.c:120
 #: ../mail/e-mail-config-security-page.c:642
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:207
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:131
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:195
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:129
 msgid "Security"
 msgstr "Безбедност"
 
-#: ../em-format/e-mail-formatter-print-headers.c:147
+#: ../em-format/e-mail-formatter-print-headers.c:138
 msgid "GPG signed"
 msgstr "ГПГ потписано"
 
-#: ../em-format/e-mail-formatter-print-headers.c:152
+#: ../em-format/e-mail-formatter-print-headers.c:144
 msgid "GPG encrpyted"
 msgstr "ГПГ шифровано"
 
-#: ../em-format/e-mail-formatter-print-headers.c:158
+#: ../em-format/e-mail-formatter-print-headers.c:150
 msgid "S/MIME signed"
 msgstr "С/МИМЕ потписано"
 
-#: ../em-format/e-mail-formatter-print-headers.c:164
+#: ../em-format/e-mail-formatter-print-headers.c:156
 msgid "S/MIME encrpyted"
 msgstr "С/МИМЕ шифровано"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:176
-#: ../em-format/e-mail-formatter-utils.c:316
-#: ../modules/mail/em-mailer-prefs.c:1121
+#: ../em-format/e-mail-formatter-quote-headers.c:161
+#: ../em-format/e-mail-formatter-utils.c:319
+#: ../modules/mail/em-mailer-prefs.c:1117
 msgid "Mailer"
 msgstr "Пошиљалац"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:102
-#: ../em-format/e-mail-formatter-text-enriched.c:115
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:88
+#: ../em-format/e-mail-formatter-text-enriched.c:102
 msgid "Richtext"
 msgstr "Богати текст"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:108
-#: ../em-format/e-mail-formatter-text-enriched.c:121
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:89
+#: ../em-format/e-mail-formatter-text-enriched.c:103
 msgid "Display part as enriched text"
 msgstr "Приказује део као обогаћени текст"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:104
-#: ../em-format/e-mail-formatter-text-html.c:340
+#: ../em-format/e-mail-formatter-quote-text-html.c:90
+#: ../em-format/e-mail-formatter-text-html.c:353
 msgid "HTML"
 msgstr "ХТМЛ"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:110
-#: ../em-format/e-mail-formatter-text-html.c:346
+#: ../em-format/e-mail-formatter-quote-text-html.c:91
+#: ../em-format/e-mail-formatter-text-html.c:354
 msgid "Format part as HTML"
 msgstr "Обликује део као ХТМЛ"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:123
-#: ../em-format/e-mail-formatter-text-plain.c:182
+#: ../em-format/e-mail-formatter-quote-text-plain.c:110
+#: ../em-format/e-mail-formatter-text-plain.c:186
 msgid "Plain Text"
 msgstr "Обичан текст"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:129
-#: ../em-format/e-mail-formatter-text-plain.c:188
+#: ../em-format/e-mail-formatter-quote-text-plain.c:111
+#: ../em-format/e-mail-formatter-text-plain.c:187
 msgid "Format part as plain text"
 msgstr "Обликује део као обичан текст"
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:52
 msgid "Unsigned"
 msgstr "Непотписано"
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:52
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Ова порука није потписана. Није сигурно да је ова порука веродостојна."
 
-#: ../em-format/e-mail-formatter-secure-button.c:66
+#: ../em-format/e-mail-formatter-secure-button.c:53
 msgid "Valid signature"
 msgstr "Исправан потпис"
 
-#: ../em-format/e-mail-formatter-secure-button.c:66
+#: ../em-format/e-mail-formatter-secure-button.c:53
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -9704,22 +9695,22 @@ msgstr ""
 "Ова порука је потписана и исправна што значи да је пошиљалац поруке врло "
 "вероватно веродостојан."
 
-#: ../em-format/e-mail-formatter-secure-button.c:67
+#: ../em-format/e-mail-formatter-secure-button.c:54
 msgid "Invalid signature"
 msgstr "Неисправан потпис"
 
-#: ../em-format/e-mail-formatter-secure-button.c:67
+#: ../em-format/e-mail-formatter-secure-button.c:54
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 "Потпис ове поруке није могао бити проверен, можда је измењена у преносу."
 
-#: ../em-format/e-mail-formatter-secure-button.c:68
+#: ../em-format/e-mail-formatter-secure-button.c:55
 msgid "Valid signature, but cannot verify sender"
 msgstr "Исправан потпис, али не могу да проверим пошиљаоца"
 
-#: ../em-format/e-mail-formatter-secure-button.c:68
+#: ../em-format/e-mail-formatter-secure-button.c:55
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -9727,21 +9718,21 @@ msgstr ""
 "Ова порука је потписана исправним потписом, али пошиљалац поруке не може "
 "бити проверен."
 
-#: ../em-format/e-mail-formatter-secure-button.c:69
+#: ../em-format/e-mail-formatter-secure-button.c:56
 msgid "Signature exists, but need public key"
 msgstr "Потпис постоји, али тражи јавни кључ"
 
-#: ../em-format/e-mail-formatter-secure-button.c:69
+#: ../em-format/e-mail-formatter-secure-button.c:56
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "Ова порука је потписана, али нема одговарајућег јавног кључа."
 
-#: ../em-format/e-mail-formatter-secure-button.c:76
+#: ../em-format/e-mail-formatter-secure-button.c:63
 msgid "Unencrypted"
 msgstr "Нешифровано"
 
-#: ../em-format/e-mail-formatter-secure-button.c:76
+#: ../em-format/e-mail-formatter-secure-button.c:63
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -9749,11 +9740,11 @@ msgstr ""
 "Ова порука није шифрована. Њен садржај је могуће видети у преносу преко "
 "Интернета."
 
-#: ../em-format/e-mail-formatter-secure-button.c:77
+#: ../em-format/e-mail-formatter-secure-button.c:64
 msgid "Encrypted, weak"
 msgstr "Шифровано, слабо"
 
-#: ../em-format/e-mail-formatter-secure-button.c:77
+#: ../em-format/e-mail-formatter-secure-button.c:64
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -9762,22 +9753,22 @@ msgstr ""
 "Ова порука је шифрована, али слабим алгоритмом. Тешко је, али не и немогуће "
 "да неко са стране у догледно време види садржај ове поруке."
 
-#: ../em-format/e-mail-formatter-secure-button.c:78
+#: ../em-format/e-mail-formatter-secure-button.c:65
 msgid "Encrypted"
 msgstr "Шифровано"
 
-#: ../em-format/e-mail-formatter-secure-button.c:78
+#: ../em-format/e-mail-formatter-secure-button.c:65
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 "Ова порука је шифрована.  Тешко ће неко са стране видети садржај ове поруке."
 
-#: ../em-format/e-mail-formatter-secure-button.c:79
+#: ../em-format/e-mail-formatter-secure-button.c:66
 msgid "Encrypted, strong"
 msgstr "Шифровано, јако"
 
-#: ../em-format/e-mail-formatter-secure-button.c:79
+#: ../em-format/e-mail-formatter-secure-button.c:66
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -9786,131 +9777,872 @@ msgstr ""
 "Ова порука је шифрована, јаким алгоритмом. Веома је тешко да неко са стране "
 "у догледно време види садржај ове поруке."
 
-#: ../em-format/e-mail-formatter-secure-button.c:190
-#: ../smime/gui/smime-ui.ui.h:43
+#: ../em-format/e-mail-formatter-secure-button.c:180
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "_View Certificate"
 msgstr "Прегледај _уверење"
 
-#: ../em-format/e-mail-formatter-secure-button.c:205
+#: ../em-format/e-mail-formatter-secure-button.c:195
 msgid "This certificate is not viewable"
 msgstr "Ово уверење није читљиво"
 
-#: ../em-format/e-mail-formatter-source.c:139
+#: ../em-format/e-mail-formatter-source.c:126
 msgid "Source"
 msgstr "Извор"
 
-#: ../em-format/e-mail-formatter-source.c:145
+#: ../em-format/e-mail-formatter-source.c:127
 msgid "Display source of a MIME part"
 msgstr "Приказује извое као МИМЕ део"
 
-#: ../em-format/e-mail-parser-application-mbox.c:108
+#: ../em-format/e-mail-parser-application-mbox.c:88
 #, c-format
 msgid "Error parsing MBOX part: %s"
 msgstr "Грешка обраде МБОКС дела: %s"
 
-#: ../em-format/e-mail-parser-application-smime.c:104
+#: ../em-format/e-mail-parser-application-smime.c:84
 #, c-format
 msgid "Could not parse S/MIME message: %s"
 msgstr "Не могу да обрадим С/МИМЕ поруку: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:91
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:80
 #, c-format
 msgid "Could not parse PGP message: %s"
 msgstr "Не могу да обрадим ПГП поруку: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:93
-#: ../em-format/e-mail-parser-multipart-signed.c:144
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:83
+#: ../em-format/e-mail-parser-multipart-signed.c:128
 #, c-format
 msgid "Error verifying signature: %s"
 msgstr "Грешка провере потписа: %s"
 
-#: ../em-format/e-mail-parser-message-external.c:86
+#: ../em-format/e-mail-parser-message-external.c:69
 msgid "Malformed external-body part"
 msgstr "Лоше сложен спољни део поруке"
 
-#: ../em-format/e-mail-parser-message-external.c:118
+#: ../em-format/e-mail-parser-message-external.c:101
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Показивач на ФТП страницу (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:129
+#: ../em-format/e-mail-parser-message-external.c:112
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Показивач на локалну датотеку (%s) која одговара страници „%s“"
 
-#: ../em-format/e-mail-parser-message-external.c:131
+#: ../em-format/e-mail-parser-message-external.c:114
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Показивач на локалну датотеку (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:150
+#: ../em-format/e-mail-parser-message-external.c:133
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Показивач на удаљени податак (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:167
+#: ../em-format/e-mail-parser-message-external.c:150
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Показивач на непознати спољни податак (типа „%s“)"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:81
-#: ../em-format/e-mail-parser-multipart-signed.c:95
+#: ../em-format/e-mail-parser-multipart-encrypted.c:67
+#: ../em-format/e-mail-parser-multipart-signed.c:81
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Не могу да обрадим МИМЕ поруку. Приказивање извора."
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:99
+#: ../em-format/e-mail-parser-multipart-encrypted.c:83
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Неподржани тип шифре за вишеделни/шифрован (multipart/encrypted)"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:119
+#: ../em-format/e-mail-parser-multipart-encrypted.c:102
 #, c-format
 msgid "Could not parse PGP/MIME message: %s"
 msgstr "Не могу да обрадим ПГП/МИМЕ поруку: %s"
 
-#: ../em-format/e-mail-parser-multipart-signed.c:129
+#: ../em-format/e-mail-parser-multipart-signed.c:114
 msgid "Unsupported signature format"
 msgstr "Неподржан облик потписа"
 
-#: ../em-format/e-mail-part-utils.c:493
+#: ../em-format/e-mail-part-utils.c:500
 #, c-format
 msgid "%s attachment"
 msgstr "%s прилог"
 
+#: ../e-util/e-send-options.ui.h:3
+msgid "Standard"
+msgstr "Обично"
+
+#: ../e-util/e-send-options.ui.h:6
+msgid "Proprietary"
+msgstr "Власничко"
+
+#: ../e-util/e-send-options.ui.h:8
+msgid "Secret"
+msgstr "Тајно"
+
+#: ../e-util/e-send-options.ui.h:9
+msgid "Top Secret"
+msgstr "Строго поверљиво"
+
+#: ../e-util/e-send-options.ui.h:10
+msgid "For Your Eyes Only"
+msgstr "Само за ваше очи"
+
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# When "None" is selected we want the field to be cleared.
+# Note that we don't show this here, since by default a 'None' date
+# is not permitted.
+#. Translators: Used in send options dialog
+#: ../e-util/e-send-options.ui.h:12
+msgctxt "send-options"
+msgid "None"
+msgstr "Ништа"
+
+#: ../e-util/e-send-options.ui.h:13
+msgid "Mail Receipt"
+msgstr "Признаница поште"
+
+#: ../e-util/e-send-options.ui.h:15
+msgid "R_eply requested"
+msgstr "Захтеван је о_дговор"
+
+#: ../e-util/e-send-options.ui.h:16
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "Ун_утар"
+
+#: ../e-util/e-send-options.ui.h:17
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "дана"
+
+#: ../e-util/e-send-options.ui.h:18
+msgid "_When convenient"
+msgstr "Када је з_годно"
+
+#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:840
+msgid "Replies"
+msgstr "Одговори"
+
+#: ../e-util/e-send-options.ui.h:20
+msgid "_Delay message delivery"
+msgstr "_Одложи испоруку поруке"
+
+#: ../e-util/e-send-options.ui.h:21
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_После"
+
+#: ../e-util/e-send-options.ui.h:22
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "дана"
+
+#: ../e-util/e-send-options.ui.h:23
+msgid "_Set expiration date"
+msgstr "Постави _рок"
+
+#: ../e-util/e-send-options.ui.h:24
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_До"
+
+#: ../e-util/e-send-options.ui.h:25
+msgid "Delivery Options"
+msgstr "Опције испоруке"
+
+#: ../e-util/e-send-options.ui.h:27
+msgid "_Classification:"
+msgstr "_Класификација:"
+
+#: ../e-util/e-send-options.ui.h:28
+msgid "Gene_ral Options"
+msgstr "Опш_те опције"
+
+#: ../e-util/e-send-options.ui.h:29
+msgid "Creat_e a sent item to track information"
+msgstr "На_прави послату ставку за праћење податка"
+
+#: ../e-util/e-send-options.ui.h:30
+msgid "_Delivered"
+msgstr "_Испоручено"
+
+#: ../e-util/e-send-options.ui.h:31
+msgid "Deli_vered and opened"
+msgstr "Испо_ручено и отворено"
+
+#: ../e-util/e-send-options.ui.h:32
+msgid "_All information"
+msgstr "_Сви подаци"
+
+#: ../e-util/e-send-options.ui.h:33
+msgid "A_uto-delete sent item"
+msgstr "А_утоматски обриши послату ставку"
+
+#: ../e-util/e-send-options.ui.h:34
+msgid "Status Tracking"
+msgstr "Праћење статуса"
+
+#: ../e-util/e-send-options.ui.h:35
+msgid "_When opened:"
+msgstr "Када је о_творено:"
+
+#: ../e-util/e-send-options.ui.h:36
+msgid "When decli_ned:"
+msgstr "Када је _одбијено:"
+
+#: ../e-util/e-send-options.ui.h:37
+msgid "When co_mpleted:"
+msgstr "Кад је _завршено:"
+
+#: ../e-util/e-send-options.ui.h:38
+msgid "When acce_pted:"
+msgstr "Када је _прихваћено:"
+
+#: ../e-util/e-send-options.ui.h:39
+msgid "Return Notification"
+msgstr "Повратно обавештење"
+
+#: ../e-util/e-send-options.ui.h:40
+msgid "Sta_tus Tracking"
+msgstr "Праћење ста_туса"
+
+#: ../e-util/e-table-config.ui.h:1 ../e-util/e-table-config.c:670
+msgid "Show Fields"
+msgstr "Прикажи поља"
+
+#: ../e-util/e-table-config.ui.h:2
+msgid "A_vailable Fields:"
+msgstr "До_ступна поља:"
+
+#: ../e-util/e-table-config.ui.h:3
+msgid "_Show these fields in order:"
+msgstr "_Прикажи ова поља по реду:"
+
+#: ../e-util/e-table-config.ui.h:4
+msgid "Move _Up"
+msgstr "Премести на _горе"
+
+#: ../e-util/e-table-config.ui.h:5
+msgid "Move _Down"
+msgstr "Помери на _доле"
+
+#: ../e-util/e-table-config.ui.h:7 ../e-util/e-name-selector-dialog.c:970
+msgid "_Remove"
+msgstr "_Уклони"
+
+#: ../e-util/e-table-config.ui.h:9
+msgid "_Show field in View"
+msgstr "_Прикажи поље у прегледу"
+
+#: ../e-util/e-table-config.ui.h:10 ../e-util/e-table-header-item.c:1751
+msgid "Ascending"
+msgstr "Растуће"
+
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1751
+msgid "Descending"
+msgstr "Опадајуће"
+
+#: ../e-util/e-table-config.ui.h:12
+msgid "Group Items By"
+msgstr "Групиши ставке по"
+
+#: ../e-util/e-table-config.ui.h:13
+msgid "Show _field in View"
+msgstr "Прикажи _поље у прегледу"
+
+#: ../e-util/e-table-config.ui.h:14
+msgid "Then By"
+msgstr "Онда по"
+
+#: ../e-util/e-table-config.ui.h:15
+msgid "Show field i_n View"
+msgstr "Прикажи поље _у прегледу"
+
+#: ../e-util/e-table-config.ui.h:16
+msgid "Show field in _View"
+msgstr "Прикажи поље у п_регледу"
+
+#: ../e-util/e-table-config.ui.h:17
+msgid "Clear _All"
+msgstr "Очисти _све"
+
+#: ../e-util/e-table-config.ui.h:18
+msgid "Sort"
+msgstr "Разврстај"
+
+#: ../e-util/e-table-config.ui.h:19
+msgid "Sort Items By"
+msgstr "Разврстај ставке по"
+
+#: ../e-util/e-table-config.ui.h:20
+msgid "Clear All"
+msgstr "Очисти све"
+
+#: ../e-util/e-table-config.ui.h:21
+msgid "_Sort..."
+msgstr "_Разврстај..."
+
+#: ../e-util/e-table-config.ui.h:22
+msgid "_Group By..."
+msgstr "_Групиши по..."
+
+#: ../e-util/e-table-config.ui.h:23
+msgid "_Fields Shown..."
+msgstr "Приказана _поља..."
+
+#: ../e-util/e-timezone-dialog.ui.h:1
+msgid "Select a Time Zone"
+msgstr "Изаберите временску зону"
+
+#: ../e-util/e-timezone-dialog.ui.h:2
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
+msgstr ""
+"Користите леви тастер миша да увећате мапу и изаберете временску зону.\n"
+"Користите десни тастер миша за умањивање."
+
+#: ../e-util/e-timezone-dialog.ui.h:4
+msgid "Time Zones"
+msgstr "Временске зоне"
+
+#: ../e-util/e-timezone-dialog.ui.h:5
+msgid "_Selection"
+msgstr "_Избор"
+
+#: ../e-util/e-timezone-dialog.ui.h:6
+msgid "Timezone drop-down combination box"
+msgstr "Прозорче за подешавање временске зоне"
+
+#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1239
+#: ../mail/em-utils.c:293
+msgid "Incoming"
+msgstr "Долазно"
+
+#: ../e-util/filter.ui.h:2
+msgid "the current time"
+msgstr "тренутно време"
+
+#: ../e-util/filter.ui.h:3
+msgid "the time you specify"
+msgstr "време које одредите"
+
+#: ../e-util/filter.ui.h:4
+msgid "a time relative to the current time"
+msgstr "време у односу на тренутно време"
+
+# bug: plural-forms
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:78
+msgid "seconds"
+msgstr "секунде"
+
+#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
+msgid "weeks"
+msgstr "недеље"
+
+#: ../e-util/filter.ui.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+msgid "months"
+msgstr "месеци"
+
+#: ../e-util/filter.ui.h:11
+msgid "years"
+msgstr "године"
+
+#: ../e-util/filter.ui.h:12
+msgid "ago"
+msgstr "пре"
+
+#: ../e-util/filter.ui.h:13
+msgid "in the future"
+msgstr "у будућности"
+
+#: ../e-util/filter.ui.h:14
+msgid "Show filters for mail:"
+msgstr "Прикажи пропуснике поште:"
+
+#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:166
+msgid "_Filter Rules"
+msgstr "Пр_авила филтера"
+
+#: ../e-util/filter.ui.h:17
+msgid "Compare against"
+msgstr "Упореди са"
+
+#: ../e-util/filter.ui.h:18
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Датум поруке ће бити упоређен са\n"
+"тренутним временом када се филтрирање десило."
+
+#: ../e-util/filter.ui.h:20
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Датум поруке ће бити упоређен са\n"
+"00:00 наведеног датума."
+
+#: ../e-util/filter.ui.h:22
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Датум поруке ће бити упоређен са\n"
+"временом када се филтрирање десило."
+
+#: ../e-util/gal-define-views.ui.h:2
+#, no-c-format
+msgid "Define Views for \"%s\""
+msgstr "Одреди прегледе за „%s“"
+
+#: ../e-util/gal-define-views.ui.h:4 ../e-util/gal-define-views-dialog.c:375
+#, no-c-format
+msgid "Define Views for %s"
+msgstr "Одреди прегледе за %s"
+
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
+msgid "_Create new view"
+msgstr "_Направи нови преглед"
+
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
+#: ../e-util/e-mail-signature-script-dialog.c:417
+#: ../mail/e-mail-config-identity-page.c:311
+#: ../mail/e-mail-config-summary-page.c:341
+msgid "_Name:"
+msgstr "_Име:"
+
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
+msgid "_Replace existing view"
+msgstr "_Замени постојећи преглед"
+
+#: ../e-util/gal-view-new-dialog.ui.h:1
+msgid "Name of new view:"
+msgstr "Назив новог прегледа:"
+
+#: ../e-util/gal-view-new-dialog.ui.h:2
+msgid "Type of view:"
+msgstr "Врста прегледа:"
+
+#: ../e-util/gal-view-new-dialog.ui.h:3
+msgid "Type of View"
+msgstr "Врста прегледа"
+
+#: ../e-util/e-activity-proxy.c:313
+#: ../modules/mail/e-mail-shell-view-actions.c:1484
+msgid "Cancel"
+msgstr "Откажи"
+
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:248
+#: ../e-util/e-activity.c:247
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (отказано)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:251
+#: ../e-util/e-activity.c:250
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (завршено)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:254
+#: ../e-util/e-activity.c:253
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (чекам)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:258
+#: ../e-util/e-activity.c:257
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (отказујем)"
 
-#: ../e-util/e-activity.c:260
+#: ../e-util/e-activity.c:259
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:265
+#: ../e-util/e-activity.c:264
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% завршено)"
 
+#: ../e-util/e-alert-bar.c:120
+msgid "Close this message"
+msgstr "Затворите ову поруку"
+
+#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:703
+msgid "Icon View"
+msgstr "Преглед иконицама"
+
+#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:705
+msgid "List View"
+msgstr "Преглед списком"
+
+#: ../e-util/e-attachment-dialog.c:311
+msgid "Attachment Properties"
+msgstr "Особине прилога"
+
+#: ../e-util/e-attachment-dialog.c:333 ../e-util/e-import-assistant.c:273
+msgid "F_ilename:"
+msgstr "_Назив датотеке:"
+
+#: ../e-util/e-attachment-dialog.c:368
+msgid "MIME Type:"
+msgstr "МИМЕ врста:"
+
+#: ../e-util/e-attachment-dialog.c:376 ../e-util/e-attachment-store.c:441
+msgid "_Suggest automatic display of attachment"
+msgstr "_Предложи аутоматски приказ прилога"
+
+#: ../e-util/e-attachment-handler-image.c:97
+msgid "Could not set as background"
+msgstr "Не могу да поставим као позадину"
+
+#: ../e-util/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "Постави као _позадину"
+
+#: ../e-util/e-attachment-handler-sendto.c:93
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "Не могу да пошаљем прилог"
+msgstr[1] "Не могу да пошаљем прилоге"
+msgstr[2] "Не могу да пошаљем прилоге"
+msgstr[3] "Не могу да пошаљем прилог"
+
+#: ../e-util/e-attachment-handler-sendto.c:135
+msgid "_Send To..."
+msgstr "_Пошаљи за..."
+
+#: ../e-util/e-attachment-handler-sendto.c:137
+msgid "Send the selected attachments somewhere"
+msgstr "Пошаљите изабране прилоге негде"
+
+#: ../e-util/e-attachment-icon-view.c:166
+#: ../e-util/e-attachment-tree-view.c:549
+msgid "Loading"
+msgstr "Учитавам"
+
+#: ../e-util/e-attachment-icon-view.c:178
+#: ../e-util/e-attachment-tree-view.c:561
+msgid "Saving"
+msgstr "Чувам"
+
+#: ../e-util/e-attachment-paned.c:104
+msgid "Hide Attachment _Bar"
+msgstr "Сакриј линију при_лога"
+
+#: ../e-util/e-attachment-paned.c:106 ../e-util/e-attachment-paned.c:719
+msgid "Show Attachment _Bar"
+msgstr "Прикажи линију п_рилога"
+
+#: ../e-util/e-attachment-store.c:429
+msgid "Add Attachment"
+msgstr "Додај прилог"
+
+#: ../e-util/e-attachment-store.c:432
+msgid "A_ttach"
+msgstr "При_ложи"
+
+#: ../e-util/e-attachment-store.c:495
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "Сачувај прилог"
+msgstr[1] "Сачувај прилоге"
+msgstr[2] "Сачувај прилоге"
+msgstr[3] "Сачувај прилог"
+
+#. Translators: Default attachment filename.
+#: ../e-util/e-attachment-store.c:524 ../e-util/e-attachment.c:1841
+#: ../e-util/e-attachment.c:2446
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../e-util/e-attachment-view.c:378
+msgid "Open With Other Application..."
+msgstr "Отвори другим програмом..."
+
+#: ../e-util/e-attachment-view.c:385
+msgid "S_ave All"
+msgstr "Сач_увај све"
+
+#: ../e-util/e-attachment-view.c:411
+msgid "A_dd Attachment..."
+msgstr "До_дај прилог..."
+
+#: ../e-util/e-attachment-view.c:435
+msgid "_Hide"
+msgstr "_Сакриј"
+
+#: ../e-util/e-attachment-view.c:442
+msgid "Hid_e All"
+msgstr "Сак_риј све"
+
+#: ../e-util/e-attachment-view.c:449
+msgid "_View Inline"
+msgstr "Пре_гледај унутар"
+
+#: ../e-util/e-attachment-view.c:456
+msgid "Vie_w All Inline"
+msgstr "Пре_гледај све унутар"
+
+#: ../e-util/e-attachment-view.c:777
+#, c-format
+msgid "Open With \"%s\""
+msgstr "Отвори програмом „%s“"
+
+#: ../e-util/e-attachment-view.c:780
+#, c-format
+msgid "Open this attachment in %s"
+msgstr "Отвори овај прилог у „%s“"
+
+#. To Translators: This text is set as a description of an attached
+#. * message when, for example, attaching it to a composer. When the
+#. * message to be attached has also filled Subject, then this text is
+#. * of form "Attached message - Subject", otherwise it's left as is.
+#: ../e-util/e-attachment.c:978
+msgid "Attached message"
+msgstr "Приложена порука"
+
+#: ../e-util/e-attachment.c:1886 ../e-util/e-attachment.c:2748
+msgid "A load operation is already in progress"
+msgstr "Операција учитавања је већ у току"
+
+#: ../e-util/e-attachment.c:1894 ../e-util/e-attachment.c:2756
+msgid "A save operation is already in progress"
+msgstr "Операција чувања је већ у току"
+
+#: ../e-util/e-attachment.c:2002
+#, c-format
+msgid "Could not load '%s'"
+msgstr "Не могу да учитам „%s“"
+
+#: ../e-util/e-attachment.c:2005
+#, c-format
+msgid "Could not load the attachment"
+msgstr "Не могу да учитам прилог"
+
+#: ../e-util/e-attachment.c:2303
+#, c-format
+msgid "Could not open '%s'"
+msgstr "Не могу да отворим „%s“"
+
+#: ../e-util/e-attachment.c:2306
+#, c-format
+msgid "Could not open the attachment"
+msgstr "Не могу да отворим прилог"
+
+#: ../e-util/e-attachment.c:2764
+msgid "Attachment contents not loaded"
+msgstr "Садржај прилога није учитан"
+
+# * found, so just bail completely.
+#: ../e-util/e-attachment.c:2840
+#, c-format
+msgid "Could not save '%s'"
+msgstr "Не могу да сачувам „%s“"
+
+#: ../e-util/e-attachment.c:2843
+#, c-format
+msgid "Could not save the attachment"
+msgstr "Не могу да сачувам прилог"
+
+#: ../e-util/e-book-source-config.c:98
+msgid "Mark as default address book"
+msgstr "Означава као подразумеван адресар"
+
+#: ../e-util/e-book-source-config.c:103
+msgid "Autocomplete with this address book"
+msgstr "Сам допуњава овим адресаром"
+
+#: ../e-util/e-book-source-config.c:277
+msgid "Copy book content locally for offline operation"
+msgstr "Умножава садржај књиге локално за рад ван мреже"
+
+#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
+#: ../e-util/e-buffer-tagger.c:410
+msgid "Ctrl-click to open a link"
+msgstr "Притисните тастер Ктрл и кликните да отворите везу"
+
+#: ../e-util/e-cal-source-config.c:170
+msgid "Mark as default calendar"
+msgstr "Означава као основни календар"
+
+#: ../e-util/e-cal-source-config.c:173
+msgid "Mark as default task list"
+msgstr "Означава као основни списак задатака"
+
+#: ../e-util/e-cal-source-config.c:176
+msgid "Mark as default memo list"
+msgstr "Означава као основни списак белешки"
+
+#: ../e-util/e-cal-source-config.c:201
+msgid "Color:"
+msgstr "Боја:"
+
+#: ../e-util/e-cal-source-config.c:406
+msgid "Copy calendar contents locally for offline operation"
+msgstr "Умножава садржај календара локално за рад ван мреже"
+
+#: ../e-util/e-cal-source-config.c:410
+msgid "Copy task list contents locally for offline operation"
+msgstr "Умножава садржај списка задатака локално за рад ван мреже"
+
+#: ../e-util/e-cal-source-config.c:414
+msgid "Copy memo list contents locally for offline operation"
+msgstr "Умножава садржај списка белешки локално за рад ван мреже"
+
+#. This is a strftime() format. %B = Month name.
+#: ../e-util/e-calendar-item.c:1324 ../e-util/e-calendar-item.c:2186
+msgctxt "CalItem"
+msgid "%B"
+msgstr "%B"
+
+#. This is a strftime() format. %Y = Year.
+#: ../e-util/e-calendar-item.c:1326
+msgctxt "CalItem"
+msgid "%Y"
+msgstr "%Y"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../e-util/e-calendar-item.c:1363
+msgctxt "CalItem"
+msgid "%B %Y"
+msgstr "%B %Y."
+
+#: ../e-util/e-calendar.c:190
+msgid "Previous month"
+msgstr "Претходни месец"
+
+#: ../e-util/e-calendar.c:215
+msgid "Next month"
+msgstr "Следећи месец"
+
+#: ../e-util/e-calendar.c:241
+msgid "Previous year"
+msgstr "Претходна година"
+
+#: ../e-util/e-calendar.c:266
+msgid "Next year"
+msgstr "Следећа година"
+
+#: ../e-util/e-calendar.c:290
+msgid "Month Calendar"
+msgstr "Месечни календар"
+
+#: ../e-util/e-categories-editor.c:224
+msgid "Currently _used categories:"
+msgstr "Тренутно _коришћене категорије:"
+
+#: ../e-util/e-categories-editor.c:235
+#| msgid "Available Cate_gories"
+msgid "_Available Categories:"
+msgstr "_Доступне категорије:"
+
+#: ../e-util/e-categories-selector.c:323
+#| msgid "Icon View"
+msgid "Icon"
+msgstr "Иконица"
+
+#: ../e-util/e-category-completion.c:300
+#, c-format
+msgid "Create category \"%s\""
+msgstr "Израда категорије „%s“"
+
+#: ../e-util/e-category-editor.c:137
+#| msgid "Category"
+msgid "Category Icon"
+msgstr "Иконица категорије"
+
+#: ../e-util/e-category-editor.c:141
+#| msgid "_No image"
+msgid "_No Image"
+msgstr "_Без слике"
+
+#: ../e-util/e-category-editor.c:178
+#| msgid "Category"
+msgid "Category _Name"
+msgstr "_Назив категорије"
+
+#: ../e-util/e-category-editor.c:190
+#| msgid "Category"
+msgid "Category _Icon"
+msgstr "_Иконица категорије"
+
+#: ../e-util/e-category-editor.c:216
+#| msgid "Calendar Properties"
+msgid "Category Properties"
+msgstr "Особине категорије"
+
+#: ../e-util/e-category-editor.c:277
+#, c-format
+msgid ""
+"There is already a category '%s' in the configuration. Please use another "
+"name"
+msgstr "Већ постоји категорија „%s“ у подешавањима. Молим изаберите други назив"
+
+#: ../e-util/e-cell-combo.c:186
+msgid "popup list"
+msgstr "искачућа листа"
+
+#: ../e-util/e-cell-date-edit.c:299
+msgid "Now"
+msgstr "Сада"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-cell-date-edit.c:307 ../e-util/e-datetime-format.c:209
+#: ../modules/calendar/e-cal-shell-view-actions.c:1926
+#: ../modules/itip-formatter/itip-view.c:228
+msgid "Today"
+msgstr "Данас"
+
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# When "None" is selected we want the field to be cleared.
+# Note that we don't show this here, since by default a 'None' date
+# is not permitted.
+#. Translators: "None" as a label of a button to unset date in a
+#. * date table cell.
+#: ../e-util/e-cell-date-edit.c:317
+msgctxt "table-date"
+msgid "None"
+msgstr "Ништа"
+
+#: ../e-util/e-cell-date-edit.c:325
+msgid "OK"
+msgstr "У реду"
+
+#: ../e-util/e-cell-date-edit.c:873
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "Време мора бити у формату: %s"
+
+#: ../e-util/e-cell-date.c:51 ../mail/message-list.c:1882
+msgid "?"
+msgstr "?"
+
+#: ../e-util/e-cell-percent.c:80
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "Вредност процента мора бити између 0 и 100"
+
+#: ../e-util/e-charset-combo-box.c:100
+msgid "Character Encoding"
+msgstr "Кодна страна"
+
+#: ../e-util/e-charset-combo-box.c:123
+msgid "Enter the character set to use"
+msgstr "Изаберите кодну страну за коришћење"
+
+#: ../e-util/e-charset-combo-box.c:342
+msgid "Other..."
+msgstr "Друго..."
+
 #: ../e-util/e-charset.c:53
 msgid "Arabic"
 msgstr "Арапски"
@@ -9988,27 +10720,80 @@ msgstr "Украјински"
 msgid "Visual"
 msgstr "Визуелни"
 
-#. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:206
-#: ../modules/calendar/e-cal-shell-view-actions.c:1927
-#: ../modules/itip-formatter/itip-view.c:235
-#: ../widgets/table/e-cell-date-edit.c:307
-msgid "Today"
-msgstr "Данас"
+#: ../e-util/e-dateedit.c:523
+msgid "Date and Time"
+msgstr "Датум и време"
+
+#: ../e-util/e-dateedit.c:548
+msgid "Text entry to input date"
+msgstr "Део текста за унос датума"
+
+#: ../e-util/e-dateedit.c:571
+msgid "Click this button to show a calendar"
+msgstr "Притисните на ово дугме да прикажете календар"
+
+#: ../e-util/e-dateedit.c:625
+msgid "Drop-down combination box to select time"
+msgstr "Прозорче за избор времена"
+
+# note(slobo): можда треба рок
+#: ../e-util/e-dateedit.c:626
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
+msgid "Time"
+msgstr "Време"
+
+#: ../e-util/e-dateedit.c:700
+msgid "No_w"
+msgstr "_Сада"
+
+#: ../e-util/e-dateedit.c:707
+msgid "_Today"
+msgstr "_Данас"
+
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# When "None" is selected we want the field to be cleared.
+# Note that we don't show this here, since by default a 'None' date
+# is not permitted.
+#. Note that we don't show this here, since by default a 'None' date
+#. * is not permitted.
+#: ../e-util/e-dateedit.c:716
+msgid "_None"
+msgstr "_Ништа"
+
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# When "None" is selected we want the field to be cleared.
+# Note that we don't show this here, since by default a 'None' date
+# is not permitted.
+#. Translators: "None" for date field of a date edit, shown when
+#. * there is no date set.
+#: ../e-util/e-dateedit.c:1811 ../e-util/e-dateedit.c:2059
+msgctxt "date"
+msgid "None"
+msgstr "Ништа"
+
+#: ../e-util/e-dateedit.c:1951
+msgid "Invalid Date Value"
+msgstr "Неисправан датум"
+
+#: ../e-util/e-dateedit.c:1996
+msgid "Invalid Time Value"
+msgstr "Неисправно време"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:217 ../modules/itip-formatter/itip-view.c:263
+#: ../e-util/e-datetime-format.c:220 ../modules/itip-formatter/itip-view.c:256
 msgid "Tomorrow"
 msgstr "Сутра"
 
-#: ../e-util/e-datetime-format.c:219
+#: ../e-util/e-datetime-format.c:222
 msgid "Yesterday"
 msgstr "Јуче"
 
 #. 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.
-#: ../e-util/e-datetime-format.c:227
+#: ../e-util/e-datetime-format.c:230
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "Следећег %a"
@@ -10016,7 +10801,7 @@ msgstr "Следећег %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.
-#: ../e-util/e-datetime-format.c:233
+#: ../e-util/e-datetime-format.c:236
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "Следећег %a"
@@ -10024,7 +10809,7 @@ msgstr "Следећег %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.
-#: ../e-util/e-datetime-format.c:239
+#: ../e-util/e-datetime-format.c:242
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "Следеће %a"
@@ -10032,7 +10817,7 @@ msgstr "Следеће %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.
-#: ../e-util/e-datetime-format.c:245
+#: ../e-util/e-datetime-format.c:248
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "Следећег %a"
@@ -10040,7 +10825,7 @@ msgstr "Следећег %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.
-#: ../e-util/e-datetime-format.c:251
+#: ../e-util/e-datetime-format.c:254
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "Следећег %a"
@@ -10048,7 +10833,7 @@ msgstr "Следећег %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.
-#: ../e-util/e-datetime-format.c:257
+#: ../e-util/e-datetime-format.c:260
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "Следеће %a"
@@ -10056,17 +10841,17 @@ msgstr "Следеће %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.
-#: ../e-util/e-datetime-format.c:263
+#: ../e-util/e-datetime-format.c:266
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Следеће %a"
 
-#: ../e-util/e-datetime-format.c:350 ../e-util/e-datetime-format.c:360
-#: ../e-util/e-datetime-format.c:369
+#: ../e-util/e-datetime-format.c:353 ../e-util/e-datetime-format.c:363
+#: ../e-util/e-datetime-format.c:372
 msgid "Use locale default"
 msgstr "Користи подразумевани локалитет"
 
-#: ../e-util/e-datetime-format.c:574
+#: ../e-util/e-datetime-format.c:577
 msgid "Format:"
 msgstr "Облик:"
 
@@ -10087,77 +10872,9 @@ msgstr "Уписујем „%s“"
 msgid "Writing \"%s\" to %s"
 msgstr "Уписујем „%s“ у %s"
 
-#: ../e-util/e-print.c:161
-msgid "An error occurred while printing"
-msgstr "Дошло је до грешке за време штампања"
-
-#: ../e-util/e-print.c:168
-msgid "The printing system reported the following details about the error:"
-msgstr "Систем за штампање је известио следеће детаље о грешци:"
-
-#: ../e-util/e-print.c:174
-msgid ""
-"The printing system did not report any additional details about the error."
-msgstr "Систем за штампање није понудио никакве додатне детаље о грешци."
-
-#: ../e-util/e-system.error.xml.h:1
-msgid "A file named \"{0}\" already exists. Do you want to replace it?"
-msgstr "Датотека под називом „{0}“ већ постоји. Да ли желите да је замените?"
-
-#: ../e-util/e-system.error.xml.h:2
-msgid ""
-"The file already exists in \"{0}\". Replacing it will overwrite its contents."
-msgstr ""
-"Већ постоји датотека у „{0}“. Уколико је замените преписаћете њен садржај."
-
-#: ../e-util/e-system.error.xml.h:3
-msgid "_Replace"
-msgstr "_Замени"
-
-#: ../e-util/e-system.error.xml.h:4
-msgid "Cannot save file \"{0}\"."
-msgstr "Не могу да сачувам датотеку „{0}“."
-
-# mail-composer:no-sig-file secondary
-# mail:no-create-tmp-path secondary
-# mail:no-delete-folder secondary
-# system:no-save-file secondary
-# system:no-load-file secondary
-#: ../e-util/e-system.error.xml.h:5
-msgid "Because \"{1}\"."
-msgstr "Због „{1}“."
-
-#: ../e-util/e-system.error.xml.h:6
-msgid "Cannot open file \"{0}\"."
-msgstr "Не могу да отворим датотеку „{0}“."
-
-#: ../e-util/e-system.error.xml.h:7
-msgid "Failed to remove data source &quot;{0}&quot;."
-msgstr "Нисам успео да уклоним извор података „{0}“."
-
-#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:61
-msgid "The reported error was &quot;{1}&quot;."
-msgstr "Пријављена грешка бејаше „{1}“."
-
-#: ../e-util/e-system.error.xml.h:9
-msgid "Failed to update data source &quot;{0}&quot;."
-msgstr "Нисам успео да освежим извор података „{0}“."
-
-#: ../e-util/e-system.error.xml.h:10
-msgid "Failed to delete resource &quot;{0}&quot;."
-msgstr "Нисам успео да обришем ресурс „{0}“."
-
-#: ../e-util/e-util.c:243
-msgid "Could not open the link."
-msgstr "Не могу да отворим везу."
-
-#: ../e-util/e-util.c:290
-msgid "Could not display help for Evolution."
-msgstr "Не могу да прикажем помоћ за Еволуцију."
-
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
-#: ../filter/e-filter-datespec.c:69
+#: ../e-util/e-filter-datespec.c:67
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -10166,7 +10883,7 @@ msgstr[1] "пре %d секунде"
 msgstr[2] "пре %d секунди"
 msgstr[3] "пре %d секунде"
 
-#: ../filter/e-filter-datespec.c:70
+#: ../e-util/e-filter-datespec.c:68
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
@@ -10175,7 +10892,7 @@ msgstr[1] "%d секунде у будућности"
 msgstr[2] "%d секунди у будућности"
 msgstr[3] "%d секунда у будућности"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../e-util/e-filter-datespec.c:69
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -10184,7 +10901,7 @@ msgstr[1] "пре %d минута"
 msgstr[2] "пре %d минута"
 msgstr[3] "пре %d минут"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../e-util/e-filter-datespec.c:70
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
@@ -10193,7 +10910,7 @@ msgstr[1] "%d минута у будућности"
 msgstr[2] "%d минута у будућности"
 msgstr[3] "%d минут у будућности"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../e-util/e-filter-datespec.c:71
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -10202,7 +10919,7 @@ msgstr[1] "пре %d сата"
 msgstr[2] "пре %d сати"
 msgstr[3] "пре %d сат"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../e-util/e-filter-datespec.c:72
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
@@ -10211,7 +10928,7 @@ msgstr[1] "%d сата у будућности"
 msgstr[2] "%d сати у будућности"
 msgstr[3] "%d сат у будућности"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../e-util/e-filter-datespec.c:73
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -10220,7 +10937,7 @@ msgstr[1] "пре %d дана"
 msgstr[2] "пре %d дана"
 msgstr[3] "пре %d дан"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../e-util/e-filter-datespec.c:74
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
@@ -10229,7 +10946,7 @@ msgstr[1] "%d дана у будућности"
 msgstr[2] "%d дана у будућности"
 msgstr[3] "%d дан у будућности"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../e-util/e-filter-datespec.c:75
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -10238,7 +10955,7 @@ msgstr[1] "пре %d недеље"
 msgstr[2] "пре %d недеља"
 msgstr[3] "пре %d недељу"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../e-util/e-filter-datespec.c:76
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
@@ -10247,7 +10964,7 @@ msgstr[1] "%d недеље у будућности"
 msgstr[2] "%d недеља у будућности"
 msgstr[3] "%d недеља у будућности"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../e-util/e-filter-datespec.c:77
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -10256,7 +10973,7 @@ msgstr[1] "пре %d месеца"
 msgstr[2] "пре %d месеци"
 msgstr[3] "пре %d месец"
 
-#: ../filter/e-filter-datespec.c:80
+#: ../e-util/e-filter-datespec.c:78
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
@@ -10265,7 +10982,7 @@ msgstr[1] "%d месеца у будућности"
 msgstr[2] "%d месеци у будућност"
 msgstr[3] "%d месец у будућности"
 
-#: ../filter/e-filter-datespec.c:81
+#: ../e-util/e-filter-datespec.c:79
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
@@ -10274,7 +10991,7 @@ msgstr[1] "пре %d године"
 msgstr[2] "пре %d година"
 msgstr[3] "пре %d годину"
 
-#: ../filter/e-filter-datespec.c:82
+#: ../e-util/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
@@ -10283,45 +11000,45 @@ msgstr[1] "%d године у будућности"
 msgstr[2] "%d година у будућности"
 msgstr[3] "%d година у будућности"
 
-#: ../filter/e-filter-datespec.c:132
+#: ../e-util/e-filter-datespec.c:130
 msgid "<click here to select a date>"
 msgstr "<кликните овде да изаберете датум>"
 
-#: ../filter/e-filter-datespec.c:135 ../filter/e-filter-datespec.c:146
-#: ../filter/e-filter-datespec.c:157
+#: ../e-util/e-filter-datespec.c:133 ../e-util/e-filter-datespec.c:144
+#: ../e-util/e-filter-datespec.c:155
 msgid "now"
 msgstr "сада"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:142
+#: ../e-util/e-filter-datespec.c:140
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y."
 
-#: ../filter/e-filter-datespec.c:289
+#: ../e-util/e-filter-datespec.c:289
 msgid "Select a time to compare against"
 msgstr "Изаберите време за поређење"
 
-#: ../filter/e-filter-file.c:188
+#: ../e-util/e-filter-file.c:187
 msgid "Choose a File"
 msgstr "Изаберите датотеку"
 
-#: ../filter/e-filter-rule.c:741
+#: ../e-util/e-filter-rule.c:743
 msgid "R_ule name:"
 msgstr "Назив _правила:"
 
-#: ../filter/e-filter-rule.c:791
+#: ../e-util/e-filter-rule.c:793
 msgid "all the following conditions"
 msgstr "свим следећим условима"
 
-#: ../filter/e-filter-rule.c:792
+#: ../e-util/e-filter-rule.c:794
 msgid "any of the following conditions"
 msgstr "било ком од следећих услова"
 
-#: ../filter/e-filter-rule.c:798
+#: ../e-util/e-filter-rule.c:800
 msgid "_Find items which match:"
 msgstr "_Пронађи ставке које одговарају:"
 
-#: ../filter/e-filter-rule.c:820
+#: ../e-util/e-filter-rule.c:823
 msgid "Find items that meet the following conditions"
 msgstr "Пронађите ставке које задовољавају следеће услове"
 
@@ -10334,190 +11051,905 @@ msgstr "Пронађите ставке које задовољавају сле
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../filter/e-filter-rule.c:835 ../libemail-engine/camel-null-store.c:28
+#: ../e-util/e-filter-rule.c:838 ../e-util/e-mail-signature-combo-box.c:369
+#: ../libemail-engine/camel-null-store.c:28
 #: ../mail/e-mail-config-summary-page.c:139
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
-#: ../widgets/misc/e-mail-signature-combo-box.c:369
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
 msgid "None"
 msgstr "Ништа"
 
-#: ../filter/e-filter-rule.c:836
+#: ../e-util/e-filter-rule.c:839
 msgid "All related"
 msgstr "Све повезано"
 
-#: ../filter/e-filter-rule.c:837 ../widgets/misc/e-send-options.ui.h:19
-msgid "Replies"
-msgstr "Одговори"
-
-#: ../filter/e-filter-rule.c:838
+#: ../e-util/e-filter-rule.c:841
 msgid "Replies and parents"
 msgstr "Одговори и надређено"
 
-#: ../filter/e-filter-rule.c:839
+#: ../e-util/e-filter-rule.c:842
 msgid "No reply or parent"
 msgstr "Нема одговора или родитеља"
 
-#: ../filter/e-filter-rule.c:842
+#: ../e-util/e-filter-rule.c:845
 msgid "I_nclude threads:"
 msgstr "Укључи _нити:"
 
-#: ../filter/e-filter-rule.c:919
+#: ../e-util/e-filter-rule.c:922
 msgid "A_dd Condition"
 msgstr "Додај _услов"
 
-#: ../filter/e-filter-rule.c:1236 ../filter/filter.ui.h:1
-#: ../mail/em-utils.c:302
-msgid "Incoming"
-msgstr "Долазно"
-
-#: ../filter/e-filter-rule.c:1236 ../mail/em-utils.c:303
+#: ../e-util/e-filter-rule.c:1239 ../mail/em-utils.c:294
 msgid "Outgoing"
 msgstr "Одлазно"
 
-#: ../filter/e-rule-editor.c:273
+#: ../e-util/e-import-assistant.c:256
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
+msgstr ""
+"Изаберите датотеку коју желите да увезете у Еволуцију и из листе изаберите "
+"којег је типа та датотека."
+
+#: ../e-util/e-import-assistant.c:283
+msgid "Select a file"
+msgstr "Изаберите датотеку"
+
+#: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
+msgid "File _type:"
+msgstr "_Врста датотеке:"
+
+#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:921
+msgid "Choose the destination for this import"
+msgstr "Изаберите одредиште за овај увоз"
+
+#: ../e-util/e-import-assistant.c:365
+msgid "Choose the type of importer to run:"
+msgstr "Изаберите тип увозника:"
+
+#: ../e-util/e-import-assistant.c:373
+msgid "Import data and settings from _older programs"
+msgstr "Увези податке и подешавања из _старијих програма"
+
+#: ../e-util/e-import-assistant.c:381
+msgid "Import a _single file"
+msgstr "Увези _једну датотеку"
+
+#: ../e-util/e-import-assistant.c:403
+#: ../modules/startup-wizard/e-mail-config-import-page.c:202
+msgid "Please select the information that you would like to import:"
+msgstr "Изаберите податке које желите да увезете:"
+
+#: ../e-util/e-import-assistant.c:533
+msgid ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
+"like to try again, please click the \"Back\" button."
+msgstr ""
+"Еволуција је проверила подешавања за увоз следећих програма: Пине, Нетскејп, "
+"Елм, иКалендар. Нема подешавања за увожење. Уколико желите да покушате "
+"поново, кликните на дугме „Назад“."
+
+#: ../e-util/e-import-assistant.c:559
+#: ../modules/startup-wizard/e-mail-config-import-page.c:231
+#, c-format
+msgid "From %s:"
+msgstr "Од %s:"
+
+#. Install a custom "Cancel Import" button.
+#: ../e-util/e-import-assistant.c:775
+msgid "_Cancel Import"
+msgstr "_Откажи увожење"
+
+#: ../e-util/e-import-assistant.c:920
+msgid "Preview data to be imported"
+msgstr "Прегледај податке који се увозе"
+
+#: ../e-util/e-import-assistant.c:926 ../e-util/e-import-assistant.c:939
+#: ../e-util/e-import-assistant.c:1292 ../e-util/e-import-assistant.c:1368
+#: ../e-util/e-import-assistant.c:1377
+msgid "Import Data"
+msgstr "Увези податке"
+
+#: ../e-util/e-import-assistant.c:934
+msgid "Select what type of file you want to import from the list."
+msgstr "Изаберите са списка које врсте датотека желите да увезете."
+
+#: ../e-util/e-import-assistant.c:1282 ../e-util/e-import-assistant.c:1317
+msgid "Evolution Import Assistant"
+msgstr "Помоћник Еволуције за увоз"
+
+#: ../e-util/e-import-assistant.c:1299 ../e-util/e-import-assistant.c:1355
+msgid "Import Location"
+msgstr "Увези локацију"
+
+#: ../e-util/e-import-assistant.c:1310
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
+msgstr ""
+"Добро дошли у Помоћника Еволуције за увоз.\n"
+"Овај помоћник ће вас провести кроз поступак увоза спољних датотека у "
+"Еволуцију."
+
+#: ../e-util/e-import-assistant.c:1327
+msgid "Importer Type"
+msgstr "Врста увозника"
+
+#: ../e-util/e-import-assistant.c:1337
+msgid "Select Information to Import"
+msgstr "Изаберите информацију за увоз"
+
+#: ../e-util/e-import-assistant.c:1346
+msgid "Select a File"
+msgstr "Изаберите датотеку"
+
+#: ../e-util/e-import-assistant.c:1363
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr "Кликните на „Примени“ да започнете увоз датотеке у Еволуцију."
+
+#: ../e-util/e-mail-signature-combo-box.c:378
+msgid "Autogenerated"
+msgstr "Аутоматски састављено"
+
+#: ../e-util/e-mail-signature-editor.c:294
+msgid "Close"
+msgstr "Затвори"
+
+#: ../e-util/e-mail-signature-editor.c:299
+msgid "_Save and Close"
+msgstr "_Сачувај и затвори"
+
+#: ../e-util/e-mail-signature-editor.c:513
+msgid "Edit Signature"
+msgstr "Уреди потпис"
+
+#: ../e-util/e-mail-signature-editor.c:533
+msgid "_Signature Name:"
+msgstr "Назив _потписа:"
+
+#: ../e-util/e-mail-signature-editor.c:579
+msgid "Unnamed"
+msgstr "Без имена"
+
+#: ../e-util/e-mail-signature-manager.c:337
+msgid "Add _Script"
+msgstr "Додај ск_рипту"
+
+#: ../e-util/e-mail-signature-manager.c:422
+msgid "Add Signature Script"
+msgstr "Додај скрипту за потпис"
+
+#: ../e-util/e-mail-signature-manager.c:492
+msgid "Edit Signature Script"
+msgstr "Уреди скрипту потписа"
+
+#: ../e-util/e-mail-signature-script-dialog.c:395
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only."
+msgstr ""
+"Излаз ове скрипте ће бити коришћен као\n"
+"потпис. Назив који сте дали ће бити коришћен\n"
+"само за приказ."
+
+#: ../e-util/e-mail-signature-script-dialog.c:446
+msgid "S_cript:"
+msgstr "С_крипта:"
+
+#: ../e-util/e-mail-signature-script-dialog.c:477
+msgid "Script file must be executable."
+msgstr "Датотека скрипте мора бити извршна."
+
+#: ../e-util/e-map.c:886
+msgid "World Map"
+msgstr "Карта света"
+
+#: ../e-util/e-map.c:889
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should instead select the timezone from the drop-down combination box below."
+msgstr ""
+"Алат за избор временске зоне помоћу миша. Тастатуром се избор временске зоне "
+"врши из доњег оквира."
+
+#: ../e-util/e-misc-utils.c:244
+msgid "Could not open the link."
+msgstr "Не могу да отворим везу."
+
+#: ../e-util/e-misc-utils.c:291
+msgid "Could not display help for Evolution."
+msgstr "Не могу да прикажем помоћ за Еволуцију."
+
+#: ../e-util/e-name-selector-dialog.c:280
+#| msgid "Contacts"
+msgid "Show Contacts"
+msgstr "Прикажи контакте"
+
+#: ../e-util/e-name-selector-dialog.c:312
+#| msgid "Address Book"
+msgid "Address B_ook:"
+msgstr "_Адресар:"
+
+#: ../e-util/e-name-selector-dialog.c:319
+#| msgid "Category"
+msgid "Cat_egory:"
+msgstr "_Категорија:"
+
+#: ../e-util/e-name-selector-dialog.c:343
+#| msgid "_Search"
+msgid "_Search:"
+msgstr "_Потражи:"
+
+#: ../e-util/e-name-selector-dialog.c:369
+#: ../e-util/e-name-selector-dialog.c:1245
+#: ../modules/addressbook/e-book-shell-view-actions.c:1028
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:959
+msgid "Any Category"
+msgstr "Било која категорија"
+
+#: ../e-util/e-name-selector-dialog.c:371
+#| msgid "Contacts"
+msgid "Co_ntacts"
+msgstr "Ко_нтакти"
+
+#: ../e-util/e-name-selector-dialog.c:448
+#| msgid "_Search"
+msgid "Search"
+msgstr "Потражи"
+
+#: ../e-util/e-name-selector-dialog.c:451
+#: ../mail/importers/pine-importer.c:429
+msgid "Address Book"
+msgstr "Адресар"
+
+#: ../e-util/e-name-selector-dialog.c:454
+#: ../modules/addressbook/e-book-shell-backend.c:299
+#: ../modules/addressbook/e-book-shell-view.c:356
+msgid "Contacts"
+msgstr "Контакти"
+
+#: ../e-util/e-name-selector-dialog.c:576
+#| msgid "Select Address Book"
+msgid "Select Contacts from Address Book"
+msgstr "Изаберите контакте из адресара"
+
+#: ../e-util/e-name-selector-dialog.c:1160
+#, c-format
+#| msgid "Error loading task list"
+msgid "Error loading address book: %s"
+msgstr "Грешка учитавања адресара: %s"
+
+#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
+#: ../e-util/e-name-selector-entry.c:3007
+#, c-format
+#| msgid "E_xpand All"
+msgid "E_xpand %s Inline"
+msgstr "_Рашири %s унутар"
+
+#. Copy Contact Item
+#: ../e-util/e-name-selector-entry.c:3023
+#, c-format
+msgid "Cop_y %s"
+msgstr "_Умножи %s"
+
+#. Cut Contact Item
+#: ../e-util/e-name-selector-entry.c:3034
+#, c-format
+msgid "C_ut %s"
+msgstr "_Исеци %s"
+
+#. Edit Contact item
+#: ../e-util/e-name-selector-entry.c:3052
+#, c-format
+#| msgid "_Edit"
+msgid "_Edit %s"
+msgstr "_Уреди %s"
+
+#: ../e-util/e-name-selector-list.c:583
+#, c-format
+#| msgid "_Delete"
+msgid "_Delete %s"
+msgstr "_Обриши %s"
+
+#: ../e-util/e-online-button.c:31
+msgid "Evolution is currently online.  Click this button to work offline."
+msgstr ""
+"Еволуција је тренутно на мрежи.  Кликните на ово дугме за рад ван мреже."
+
+#: ../e-util/e-online-button.c:34
+msgid "Evolution is currently offline.  Click this button to work online."
+msgstr ""
+"Еволуција тренутно није на мрежи.  Кликните на ово дугме да се повежете."
+
+#: ../e-util/e-online-button.c:37
+msgid "Evolution is currently offline because the network is unavailable."
+msgstr "Еволуција тренутно није на мрежи јер мрежа није доступна."
+
+#: ../e-util/e-passwords.c:127
+msgid "Keyring key is unusable: no user or host name"
+msgstr "Кључ привеска није употребљив: нема корисника нити домаћина"
+
+#: ../e-util/e-passwords.c:447
+msgid "You have the Caps Lock key on."
+msgstr "Укључили сте велика слова."
+
+#: ../e-util/e-passwords.c:578
+#| msgid "_Remember password"
+msgid "_Remember this passphrase"
+msgstr "_Запамти ову лозинку"
+
+#: ../e-util/e-passwords.c:579
+msgid "_Remember this passphrase for the remainder of this session"
+msgstr "_Запамти ову лозинку до краја ове сесије"
+
+#: ../e-util/e-passwords.c:584
+#| msgid "_Remember password"
+msgid "_Remember this password"
+msgstr "_Запамти ову лозинку"
+
+#: ../e-util/e-passwords.c:585
+msgid "_Remember this password for the remainder of this session"
+msgstr "_Запамти ову лозинку до краја ове сесије"
+
+#: ../e-util/e-preferences-window.c:318
+msgid "Evolution Preferences"
+msgstr "Подешавања Еволуције"
+
+#: ../e-util/e-print.c:161
+msgid "An error occurred while printing"
+msgstr "Дошло је до грешке за време штампања"
+
+#: ../e-util/e-print.c:168
+msgid "The printing system reported the following details about the error:"
+msgstr "Систем за штампање је известио следеће детаље о грешци:"
+
+#: ../e-util/e-print.c:174
+msgid ""
+"The printing system did not report any additional details about the error."
+msgstr "Систем за штампање није понудио никакве додатне детаље о грешци."
+
+#: ../e-util/e-rule-editor.c:288
 msgid "Add Rule"
 msgstr "Додај правило"
 
-#: ../filter/e-rule-editor.c:366
+#: ../e-util/e-rule-editor.c:395
 msgid "Edit Rule"
 msgstr "Уреди правило"
 
-#: ../filter/filter.error.xml.h:1
+# bug: plural-forms if put as "%d matches"
+#: ../e-util/e-search-bar.c:79
+#, c-format
+msgid "Matches: %u"
+msgstr "Поклапања: %u"
+
+#: ../e-util/e-search-bar.c:527
+msgid "Close the find bar"
+msgstr "Затвори траку претраге"
+
+#: ../e-util/e-search-bar.c:535
+msgid "Fin_d:"
+msgstr "Про_нађи:"
+
+#: ../e-util/e-search-bar.c:547
+msgid "Clear the search"
+msgstr "Очисти претрагу"
+
+#: ../e-util/e-search-bar.c:571
+msgid "_Previous"
+msgstr "_Претходно"
+
+#: ../e-util/e-search-bar.c:577
+msgid "Find the previous occurrence of the phrase"
+msgstr "Нађи претходно појављивање израза"
+
+#: ../e-util/e-search-bar.c:590
+msgid "_Next"
+msgstr "_Следеће"
+
+#: ../e-util/e-search-bar.c:596
+msgid "Find the next occurrence of the phrase"
+msgstr "Нађи следеће појављивање израза"
+
+#: ../e-util/e-search-bar.c:609
+msgid "Mat_ch case"
+msgstr "_Упореди величину слова"
+
+#: ../e-util/e-search-bar.c:637
+msgid "Reached bottom of page, continued from top"
+msgstr "Стигао сам до дна странице, настављам са врха"
+
+#: ../e-util/e-search-bar.c:659
+msgid "Reached top of page, continued from bottom"
+msgstr "Стигао сам до врха странице, настављам са дна"
+
+# 48x48/emblems/emblem-mail.icon.in.h:1
+#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:331
+#: ../mail/importers/pine-importer.c:422
+#: ../modules/mail/e-mail-shell-view.c:1045
+msgid "Mail"
+msgstr "Пошта"
+
+#: ../e-util/e-send-options.c:570
+msgid "When de_leted:"
+msgstr "Када је обри_сано:"
+
+#: ../e-util/e-source-config.c:679 ../e-util/e-source-config.c:683
+msgid "Type:"
+msgstr "Врста:"
+
+#: ../e-util/e-source-config.c:691 ../e-util/e-source-config.c:695
+msgid "Name:"
+msgstr "Име:"
+
+#. Translators: This is the first of a sequence of widgets:
+#. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
+#: ../e-util/e-source-config.c:1293
+msgid "Refresh every"
+msgstr "Освежи на сваких"
+
+#: ../e-util/e-source-config.c:1323 ../e-util/e-source-config.c:1392
+msgid "Use a secure connection"
+msgstr "Користи безбедну везу"
+
+#: ../e-util/e-source-config.c:1416
+#| msgid "Ignore invalid SSL certificate"
+msgid "Unset _trust for SSL certificate"
+msgstr "Одзначи _поверење за ССЛ уверење"
+
+#: ../e-util/e-source-config.c:1450
+msgid "User"
+msgstr "Корисник"
+
+#: ../e-util/e-source-selector-dialog.c:229
+#| msgid "_Destination folder:"
+msgid "_Destination"
+msgstr "_Одредиште"
+
+#: ../e-util/e-source-selector-dialog.c:342
+#| msgid "Select destination file"
+msgid "Select destination"
+msgstr "Изаберите одредиште"
+
+#. no suggestions. Put something in the menu anyway...
+#: ../e-util/e-spell-entry.c:352
+msgid "(no suggestions)"
+msgstr "(нема предлога)"
+
+#: ../e-util/e-spell-entry.c:376
+msgid "More..."
+msgstr "Даље..."
+
+#. + Add to Dictionary
+#: ../e-util/e-spell-entry.c:445
+#, c-format
+msgid "Add \"%s\" to Dictionary"
+msgstr "Додај „%s“ у речник"
+
+#. - Ignore All
+#: ../e-util/e-spell-entry.c:488
+msgid "Ignore All"
+msgstr "Занемари све"
+
+#: ../e-util/e-spell-entry.c:514
+msgid "Spelling Suggestions"
+msgstr "Предлози правописа"
+
+#: ../e-util/e-system.error.xml.h:1
+msgid "A file named \"{0}\" already exists. Do you want to replace it?"
+msgstr "Датотека под називом „{0}“ већ постоји. Да ли желите да је замените?"
+
+#: ../e-util/e-system.error.xml.h:2
+msgid ""
+"The file already exists in \"{0}\". Replacing it will overwrite its contents."
+msgstr ""
+"Већ постоји датотека у „{0}“. Уколико је замените преписаћете њен садржај."
+
+#: ../e-util/e-system.error.xml.h:3
+msgid "_Replace"
+msgstr "_Замени"
+
+#: ../e-util/e-system.error.xml.h:4
+msgid "Cannot save file \"{0}\"."
+msgstr "Не могу да сачувам датотеку „{0}“."
+
+# mail-composer:no-sig-file secondary
+# mail:no-create-tmp-path secondary
+# mail:no-delete-folder secondary
+# system:no-save-file secondary
+# system:no-load-file secondary
+#: ../e-util/e-system.error.xml.h:5
+msgid "Because \"{1}\"."
+msgstr "Због „{1}“."
+
+#: ../e-util/e-system.error.xml.h:6
+msgid "Cannot open file \"{0}\"."
+msgstr "Не могу да отворим датотеку „{0}“."
+
+#: ../e-util/e-system.error.xml.h:7
+msgid "Failed to remove data source &quot;{0}&quot;."
+msgstr "Нисам успео да уклоним извор података „{0}“."
+
+#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:61
+msgid "The reported error was &quot;{1}&quot;."
+msgstr "Пријављена грешка бејаше „{1}“."
+
+#: ../e-util/e-system.error.xml.h:9
+msgid "Failed to update data source &quot;{0}&quot;."
+msgstr "Нисам успео да освежим извор података „{0}“."
+
+#: ../e-util/e-system.error.xml.h:10
+msgid "Failed to delete resource &quot;{0}&quot;."
+msgstr "Нисам успео да обришем ресурс „{0}“."
+
+#: ../e-util/e-table-click-to-add.c:643
+#: ../e-util/gal-a11y-e-table-click-to-add.c:62
+#: ../e-util/gal-a11y-e-table-click-to-add.c:143
+msgid "click to add"
+msgstr "кликните да додате"
+
+#: ../e-util/e-table-config.c:397 ../e-util/e-table-config.c:439
+msgid "(Ascending)"
+msgstr "(Растуће)"
+
+#: ../e-util/e-table-config.c:397 ../e-util/e-table-config.c:439
+msgid "(Descending)"
+msgstr "(Опадајуће)"
+
+#: ../e-util/e-table-config.c:404
+msgid "Not sorted"
+msgstr "Није разврстано"
+
+#: ../e-util/e-table-config.c:445
+msgid "No grouping"
+msgstr "Без груписања"
+
+#: ../e-util/e-table-config.c:690
+msgid "Available Fields"
+msgstr "Доступна поља"
+
+#: ../e-util/e-table-field-chooser-dialog.c:227
+msgid "Add a Column"
+msgstr "Додај колону"
+
+#: ../e-util/e-table-field-chooser.c:164
+msgid ""
+"To add a column to your table, drag it into\n"
+"the location in which you want it to appear."
+msgstr ""
+"За додавање колоне у табелу, превуците\n"
+"је на место где желите да се појави."
+
+#: ../e-util/e-table-group-container.c:363
+#, c-format
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
+msgstr[0] "%s: %s (%d ставка)"
+msgstr[1] "%s: %s (%d ставке)"
+msgstr[2] "%s: %s (%d ставки)"
+msgstr[3] "%s: %s (једна ставка)"
+
+#: ../e-util/e-table-group-container.c:377
+#, c-format
+msgid "%s (%d item)"
+msgid_plural "%s (%d items)"
+msgstr[0] "%s (%d ставка)"
+msgstr[1] "%s (%d ставке)"
+msgstr[2] "%s (%d ставки)"
+msgstr[3] "%s (једна ставка)"
+
+#: ../e-util/e-table-header-item.c:1579
+msgid "Customize Current View"
+msgstr "Прилагодите тренутни преглед"
+
+#: ../e-util/e-table-header-item.c:1602
+msgid "Sort _Ascending"
+msgstr "Разврстај _растуће"
+
+#: ../e-util/e-table-header-item.c:1605
+msgid "Sort _Descending"
+msgstr "Разврстај _опадајуће"
+
+#: ../e-util/e-table-header-item.c:1608
+msgid "_Unsort"
+msgstr "_Не разврставај"
+
+#: ../e-util/e-table-header-item.c:1611
+msgid "Group By This _Field"
+msgstr "Групиши по овоме _пољу"
+
+#: ../e-util/e-table-header-item.c:1614
+msgid "Group By _Box"
+msgstr "Групиши по _оквиру"
+
+#: ../e-util/e-table-header-item.c:1618
+msgid "Remove This _Column"
+msgstr "Уклони ову _колону"
+
+#: ../e-util/e-table-header-item.c:1621
+msgid "Add a C_olumn..."
+msgstr "Додај ко_лону..."
+
+#: ../e-util/e-table-header-item.c:1625
+msgid "A_lignment"
+msgstr "По_равнање"
+
+#: ../e-util/e-table-header-item.c:1628
+msgid "B_est Fit"
+msgstr "На_јбоље уклапање"
+
+#: ../e-util/e-table-header-item.c:1631
+msgid "Format Column_s..."
+msgstr "Обликуј коло_не..."
+
+#: ../e-util/e-table-header-item.c:1635
+msgid "Custo_mize Current View..."
+msgstr "Прила_годи тренутни преглед..."
+
+#: ../e-util/e-table-header-item.c:1706
+msgid "_Sort By"
+msgstr "_Поређај по"
+
+#. Custom
+#: ../e-util/e-table-header-item.c:1724
+msgid "_Custom"
+msgstr "_Произвољно"
+
+#: ../e-util/e-text.c:2098
+msgid "Select All"
+msgstr "Изабери све"
+
+#: ../e-util/e-text.c:2111
+msgid "Input Methods"
+msgstr "Начини уноса"
+
+# Универзално време, или УТ
+# Ваљда УВ?
+#. Put the "UTC" entry at the top of the combo's list.
+#: ../e-util/e-timezone-dialog.c:207 ../e-util/e-timezone-dialog.c:429
+#: ../e-util/e-timezone-dialog.c:433 ../e-util/e-timezone-dialog.c:437
+#: ../e-util/e-timezone-dialog.c:803
+msgid "UTC"
+msgstr "КУВ"
+
+#: ../e-util/e-url-entry.c:80
+msgid "Click here to go to URL"
+msgstr "Кликните овде да посетите адресу"
+
+#: ../e-util/e-web-view-gtkhtml.c:406 ../e-util/e-web-view.c:273
+msgid "_Copy Link Location"
+msgstr "_Умножи место везе"
+
+#: ../e-util/e-web-view-gtkhtml.c:408 ../e-util/e-web-view.c:275
+msgid "Copy the link to the clipboard"
+msgstr "Умножава везу у списак исечака"
+
+#: ../e-util/e-web-view-gtkhtml.c:416 ../e-util/e-web-view.c:283
+msgid "_Open Link in Browser"
+msgstr "_Отвори везу у прегледнику"
+
+#: ../e-util/e-web-view-gtkhtml.c:418 ../e-util/e-web-view.c:285
+msgid "Open the link in a web browser"
+msgstr "Отвори везу у веб претраживачу"
+
+#: ../e-util/e-web-view-gtkhtml.c:426 ../e-util/e-web-view.c:293
+msgid "_Copy Email Address"
+msgstr "_Умножи адресу ел. поште"
+
+#: ../e-util/e-web-view-gtkhtml.c:443 ../e-util/e-web-view.c:310
+msgid "_Copy Image"
+msgstr "_Умножи слику"
+
+#: ../e-util/e-web-view-gtkhtml.c:445 ../e-util/e-web-view.c:312
+msgid "Copy the image to the clipboard"
+msgstr "Умножите слику у оставу"
+
+#: ../e-util/e-web-view-gtkhtml.c:465 ../e-util/e-web-view-gtkhtml.c:1310
+#: ../e-util/e-web-view.c:332 ../e-util/e-web-view.c:1419
+msgid "Select all text and images"
+msgstr "Изабери сав текст и слике"
+
+#: ../e-util/e-web-view-gtkhtml.c:974 ../e-util/e-web-view-gtkhtml.c:976
+#: ../e-util/e-web-view-gtkhtml.c:978 ../e-util/e-web-view.c:1086
+#: ../e-util/e-web-view.c:1088 ../e-util/e-web-view.c:1090
+#, c-format
+msgid "Click to call %s"
+msgstr "Кликните да позовете %s"
+
+#: ../e-util/e-web-view-gtkhtml.c:980 ../e-util/e-web-view.c:1092
+msgid "Click to hide/unhide addresses"
+msgstr "Кликните да сакријете/откријете адресе"
+
+#: ../e-util/e-web-view-gtkhtml.c:982 ../e-util/e-web-view.c:1094
+#, c-format
+msgid "Click to open %s"
+msgstr "Кликните да отворите %s"
+
+#: ../e-util/ea-calendar-item.c:315 ../e-util/ea-calendar-item.c:324
+msgid "%d %B %Y"
+msgstr "%d %B %Y."
+
+#: ../e-util/ea-calendar-item.c:327
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Календар: од %s до %s"
+
+#: ../e-util/ea-calendar-item.c:364
+msgid "evolution calendar item"
+msgstr "ставка календара еволуције"
+
+#: ../e-util/evolution-source-viewer.c:635
+#| msgid "Evolution Pine importer"
+msgid "Evolution Source Viewer"
+msgstr "Приказивач извора Еволуције"
+
+#. Translators: The name that is displayed in the user interface
+#: ../e-util/evolution-source-viewer.c:665
+#| msgid "Display"
+msgid "Display Name"
+msgstr "Назив приказа"
+
+#: ../e-util/evolution-source-viewer.c:674
+#| msgid "_Flag:"
+msgid "Flags"
+msgstr "Опције"
+
+#: ../e-util/evolution-source-viewer.c:726
+#: ../mail/e-mail-config-identity-page.c:677
+msgid "Identity"
+msgstr "Идентитет"
+
+#: ../e-util/filter.error.xml.h:1
 msgid "Missing date."
 msgstr "Недостаје датум."
 
-#: ../filter/filter.error.xml.h:2
+#: ../e-util/filter.error.xml.h:2
 msgid "You must choose a date."
 msgstr "Морате да изаберете датум."
 
-#: ../filter/filter.error.xml.h:3
+#: ../e-util/filter.error.xml.h:3
 msgid "Missing filename."
 msgstr "Недостаје назив датотеке."
 
 # filter:bad-file secondary
-#: ../filter/filter.error.xml.h:4
+#: ../e-util/filter.error.xml.h:4
 msgid "You must specify a filename."
 msgstr "Морате дати назив датотеци."
 
-#: ../filter/filter.error.xml.h:5
+#: ../e-util/filter.error.xml.h:5
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
 msgstr "Датотека „{0}“ не постоји или није регуларна."
 
-#: ../filter/filter.error.xml.h:6
+#: ../e-util/filter.error.xml.h:6
 msgid "Bad regular expression &quot;{0}&quot;."
 msgstr "Лош регуларан израз „{0}“."
 
-#: ../filter/filter.error.xml.h:7
+#: ../e-util/filter.error.xml.h:7
 msgid "Could not compile regular expression &quot;{1}&quot;."
 msgstr "Не могу да преведем регуларан израз „{1}“."
 
 # mail:no-name-vfolder primary
-#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
+#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
 msgid "Missing name."
 msgstr "Недостаје име."
 
-#: ../filter/filter.error.xml.h:9
+#: ../e-util/filter.error.xml.h:9
 msgid "You must name this filter."
 msgstr "Морате дати име овом филтеру."
 
-#: ../filter/filter.error.xml.h:10
+#: ../e-util/filter.error.xml.h:10
 msgid "Name &quot;{0}&quot; already used."
 msgstr "Назив „{0}“ је већ употребљен."
 
-#: ../filter/filter.error.xml.h:11
+#: ../e-util/filter.error.xml.h:11
 msgid "Please choose another name."
 msgstr "Изаберите друго име."
 
-#: ../filter/filter.ui.h:2
-msgid "the current time"
-msgstr "тренутно време"
+#. Translators: description of a "popup" action
+#: ../e-util/gal-a11y-e-cell-popup.c:128
+msgid "popup a child"
+msgstr "искачуће изведено"
 
-#: ../filter/filter.ui.h:3
-msgid "the time you specify"
-msgstr "време које одредите"
+#. Translators: description of a "toggle" action
+#: ../e-util/gal-a11y-e-cell-toggle.c:180
+msgid "toggle the cell"
+msgstr "бирање ћелије"
 
-#: ../filter/filter.ui.h:4
-msgid "a time relative to the current time"
-msgstr "време у односу на тренутно време"
+#. Translators: description of an "expand" action
+#: ../e-util/gal-a11y-e-cell-tree.c:215
+msgid "expands the row in the ETree containing this cell"
+msgstr "разгранава ред у Естабло које сдржи ову ћелију"
 
-# bug: plural-forms
-#: ../filter/filter.ui.h:5 ../mail/mail-config.ui.h:78
-msgid "seconds"
-msgstr "секунде"
+#. Translators: description of a "collapse" action
+#: ../e-util/gal-a11y-e-cell-tree.c:223
+msgid "collapses the row in the ETree containing this cell"
+msgstr "скупља ред у Естабло које садржи ову ћелију"
 
-#: ../filter/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
-msgid "weeks"
-msgstr "недеље"
+#: ../e-util/gal-a11y-e-cell.c:123
+msgid "Table Cell"
+msgstr "Ћелија табеле"
 
-#: ../filter/filter.ui.h:10
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
-msgid "months"
-msgstr "месеци"
+#: ../e-util/gal-a11y-e-table-click-to-add.c:72
+msgid "click"
+msgstr "клик"
 
-#: ../filter/filter.ui.h:11
-msgid "years"
-msgstr "године"
+#: ../e-util/gal-a11y-e-table-column-header.c:163
+msgid "sort"
+msgstr "разврставање"
 
-#: ../filter/filter.ui.h:12
-msgid "ago"
-msgstr "пре"
+#: ../e-util/gal-define-views-dialog.c:385
+#: ../e-util/gal-define-views-dialog.c:388
+msgid "Define Views"
+msgstr "Одреди прегледе"
 
-#: ../filter/filter.ui.h:13
-msgid "in the future"
-msgstr "у будућности"
+#: ../e-util/gal-view-factory-etable.c:114
+msgid "Table"
+msgstr "Табела"
 
-#: ../filter/filter.ui.h:14
-msgid "Show filters for mail:"
-msgstr "Прикажи филтере за пошту:"
+#: ../e-util/gal-view-instance-save-as-dialog.c:296
+msgid "Save Current View"
+msgstr "Сачувај тренутни преглед"
 
-#: ../filter/filter.ui.h:15 ../mail/em-filter-editor.c:166
-msgid "_Filter Rules"
-msgstr "Пр_авила филтера"
+#: ../e-util/gal-view-new-dialog.c:173
+msgid "Define New View"
+msgstr "Одреди нови преглед"
 
-#: ../filter/filter.ui.h:17
-msgid "Compare against"
-msgstr "Упореди са"
+#: ../e-util/widgets.error.xml.h:1
+msgid "Do you wish to save your changes?"
+msgstr "Да ли желите да сачувате измене?"
 
-#: ../filter/filter.ui.h:18
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Датум поруке ће бити упоређен са\n"
-"тренутним временом када се филтрирање десило."
+#: ../e-util/widgets.error.xml.h:2
+msgid "This signature has been changed, but has not been saved."
+msgstr "Овај потпис је промењен, али није сачуван."
 
-#: ../filter/filter.ui.h:20
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Датум поруке ће бити упоређен са\n"
-"00:00 наведеног датума."
+#: ../e-util/widgets.error.xml.h:3
+msgid "_Discard changes"
+msgstr "_Одбаци измене"
 
-#: ../filter/filter.ui.h:22
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Датум поруке ће бити упоређен са\n"
-"временом када се филтрирање десило."
+#: ../e-util/widgets.error.xml.h:4
+msgid "Blank Signature"
+msgstr "Празан потпис"
+
+#: ../e-util/widgets.error.xml.h:5
+msgid "Please provide an unique name to identify this signature."
+msgstr "Дајте једно јединствено име које представља овај потпис."
+
+#: ../e-util/widgets.error.xml.h:6
+msgid "Could not load signature."
+msgstr "Не могу да учитам потпис."
+
+#: ../e-util/widgets.error.xml.h:7
+msgid "Could not save signature."
+msgstr "Не могу да сачувам потпис."
+
+#: ../libemail-engine/camel-sasl-xoauth2.c:27
+#| msgid "OAuth"
+msgid "OAuth2"
+msgstr "ОАут2"
+
+#: ../libemail-engine/camel-sasl-xoauth2.c:28
+msgid "This option will use an OAuth 2.0 access token to connect to the server"
+msgstr "Ова опција ће користити ОАут 2.0 симбол приступа да се повеже на сервер"
 
 #: ../libemail-engine/e-mail-authenticator.c:182
 #, c-format
 msgid "Invalid authentication result code (%d)"
 msgstr "Неисправан код резултата потврђивања идентитета (%d)"
 
-#: ../libemail-engine/e-mail-folder-utils.c:112
+#: ../libemail-engine/e-mail-folder-utils.c:114
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Чувам поруку у фасциклу „%s“"
 
-#: ../libemail-engine/e-mail-folder-utils.c:565
+#: ../libemail-engine/e-mail-folder-utils.c:566
 msgid "Forwarded messages"
 msgstr "Прослеђене поруке"
 
-#: ../libemail-engine/e-mail-folder-utils.c:675
-#: ../libemail-engine/e-mail-folder-utils.c:926
+#: ../libemail-engine/e-mail-folder-utils.c:676
+#: ../libemail-engine/e-mail-folder-utils.c:927
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -10526,29 +11958,29 @@ msgstr[1] "Довлачим %d поруке"
 msgstr[2] "Довлачим %d порука"
 msgstr[3] "Довлачим једну поруку"
 
-#: ../libemail-engine/e-mail-folder-utils.c:769
+#: ../libemail-engine/e-mail-folder-utils.c:770
 msgid "Scanning messages for duplicates"
 msgstr "Тражим дупликате у порукама"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1177
+#: ../libemail-engine/e-mail-folder-utils.c:1178
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Уклањам фасциклу „%s“"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1314
+#: ../libemail-engine/e-mail-folder-utils.c:1315
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Датотека „%s“ је уклоњена."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1318
+#: ../libemail-engine/e-mail-folder-utils.c:1319
 msgid "File has been removed."
 msgstr "Датотека је уклоњена."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1377
+#: ../libemail-engine/e-mail-folder-utils.c:1378
 msgid "Removing attachments"
 msgstr "Уклањам прилоге"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1541
+#: ../libemail-engine/e-mail-folder-utils.c:1542
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
@@ -10557,110 +11989,110 @@ msgstr[1] "Чувам %d поруке"
 msgstr[2] "Чувам %d порука"
 msgstr[3] "Чувам једну поруку"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1897 ../mail/em-folder-utils.c:613
+#: ../libemail-engine/e-mail-folder-utils.c:1898 ../mail/em-folder-utils.c:610
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Неисправна путања фасцикле „%s“"
 
-#: ../libemail-engine/e-mail-session.c:116 ../mail/em-folder-properties.c:333
-#: ../mail/em-folder-tree-model.c:765
-#: ../modules/mail/e-mail-shell-view-private.c:1034
-#: ../modules/mail/e-mail-shell-view-private.c:1045
+#: ../libemail-engine/e-mail-session-utils.c:540
+#, c-format
+msgid "No mail service found with UID '%s'"
+msgstr "Није пронађенa услуга поште са ЈИБ-ом „%s“"
+
+#: ../libemail-engine/e-mail-session-utils.c:549
+#, c-format
+msgid "UID '%s' is not a mail transport"
+msgstr "ЛИБ „%s“ није пренос поште"
+
+#: ../libemail-engine/e-mail-session-utils.c:647
+#: ../libemail-engine/mail-ops.c:761
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Неуспела примена одлазних пропусника: %s"
+
+#: ../libemail-engine/e-mail-session-utils.c:676
+#: ../libemail-engine/e-mail-session-utils.c:710
+#: ../libemail-engine/mail-ops.c:780 ../libemail-engine/mail-ops.c:813
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+msgstr ""
+"Нисам успео да прикачим у %s: %s\n"
+"Уместо тога прикачићу у локалну фасциклу „Послато“."
+
+#: ../libemail-engine/e-mail-session-utils.c:730
+#: ../libemail-engine/mail-ops.c:835
+#, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "Нисам успео да прикачим у локалну фасциклу „Послато“: %s"
+
+#: ../libemail-engine/e-mail-session-utils.c:974
+#: ../libemail-engine/mail-ops.c:967 ../libemail-engine/mail-ops.c:1069
+msgid "Sending message"
+msgstr "Слање поруке"
+
+#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:333
+#: ../mail/em-folder-tree-model.c:764
+#: ../modules/mail/e-mail-shell-view-private.c:1095
+#: ../modules/mail/e-mail-shell-view-private.c:1106
 msgid "Inbox"
 msgstr "Сандуче"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:117 ../mail/em-folder-tree-model.c:758
-#: ../modules/mail/e-mail-shell-view-private.c:1032
+#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:757
+#: ../modules/mail/e-mail-shell-view-private.c:1093
 msgid "Drafts"
 msgstr "Нацрти"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:118 ../mail/em-folder-tree-model.c:769
-#: ../modules/mail/e-mail-shell-view-private.c:1036
+#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:768
+#: ../modules/mail/e-mail-shell-view-private.c:1097
 msgid "Outbox"
 msgstr "За слање"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:119 ../mail/em-folder-tree-model.c:773
-#: ../modules/mail/e-mail-shell-view-private.c:1038
+#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:772
+#: ../modules/mail/e-mail-shell-view-private.c:1099
 msgid "Sent"
 msgstr "Послато"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-tree-model.c:761
-#: ../modules/mail/e-mail-shell-view-private.c:1040
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:760
+#: ../modules/mail/e-mail-shell-view-private.c:1101
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1048 ../plugins/templates/templates.c:1345
-#: ../plugins/templates/templates.c:1355
+#: ../plugins/templates/templates.c:1071 ../plugins/templates/templates.c:1368
+#: ../plugins/templates/templates.c:1378
 msgid "Templates"
 msgstr "Шаблони"
 
-#: ../libemail-engine/e-mail-session.c:1319
+#: ../libemail-engine/e-mail-session.c:1351
 #, c-format
 msgid "User cancelled operation"
 msgstr "Корисник је отказао радњу"
 
-#: ../libemail-engine/e-mail-session.c:1489
+#: ../libemail-engine/e-mail-session.c:1572
 #, c-format
 msgid "%s authentication failed"
 msgstr "Није успело %s потврђивање идентитета"
 
-#: ../libemail-engine/e-mail-session.c:1534
+#: ../libemail-engine/e-mail-session.c:1617
 #, c-format
 msgid "No data source found for UID '%s'"
 msgstr "Није пронађен извор података за ЈИБ „%s“"
 
-#: ../libemail-engine/e-mail-session.c:1585
+#: ../libemail-engine/e-mail-session.c:1668
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "Није достављена одредишна адреса, прослеђивање поруке је отказано."
 
-#: ../libemail-engine/e-mail-session.c:1598
+#: ../libemail-engine/e-mail-session.c:1681
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "Није пронађен идентитет за коришћење, прослеђивање поруке је отказано."
 
-#: ../libemail-engine/e-mail-session-utils.c:540
-#, c-format
-msgid "No mail service found with UID '%s'"
-msgstr "Није пронађенa услуга поште са ЈИБ-ом „%s“"
-
-#: ../libemail-engine/e-mail-session-utils.c:549
-#, c-format
-msgid "UID '%s' is not a mail transport"
-msgstr "ЛИБ „%s“ није пренос поште"
-
-#: ../libemail-engine/e-mail-session-utils.c:641
-#: ../libemail-engine/mail-ops.c:698
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Неуспела примена одлазећих филтера: %s"
-
-#: ../libemail-engine/e-mail-session-utils.c:670
-#: ../libemail-engine/e-mail-session-utils.c:704
-#: ../libemail-engine/mail-ops.c:715 ../libemail-engine/mail-ops.c:751
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-msgstr ""
-"Нисам успео да прикачим у %s: %s\n"
-"Уместо тога прикачићу у локалну фасциклу „Послато“."
-
-#: ../libemail-engine/e-mail-session-utils.c:724
-#: ../libemail-engine/mail-ops.c:773
-#, c-format
-msgid "Failed to append to local 'Sent' folder: %s"
-msgstr "Нисам успео да прикачим у локалну фасциклу „Послато“: %s"
-
-#: ../libemail-engine/e-mail-session-utils.c:954
-#: ../libemail-engine/mail-ops.c:905 ../libemail-engine/mail-ops.c:1007
-msgid "Sending message"
-msgstr "Слање поруке"
-
 #: ../libemail-engine/e-mail-store-utils.c:171
 #, c-format
 msgid "Disconnecting from '%s'"
@@ -10676,7 +12108,7 @@ msgstr "Поновно повезивање на „%s“"
 msgid "Preparing account '%s' for offline"
 msgstr "Припремам налог „%s“ за рад ван мреже"
 
-#: ../libemail-engine/mail-folder-cache.c:885
+#: ../libemail-engine/mail-folder-cache.c:880
 #, c-format
 msgid "Pinging %s"
 msgstr "Испитујем доступност за %s"
@@ -10685,17 +12117,45 @@ msgstr "Испитујем доступност за %s"
 msgid "Filtering Selected Messages"
 msgstr "Филтрирање изабраних порука"
 
-#: ../libemail-engine/mail-ops.c:216
-msgid "Fetching Mail"
-msgstr "Узимање поште"
+#: ../libemail-engine/mail-ops.c:152
+#, c-format
+msgid ""
+"Failed to filter selected messages. One reason can be that folder location "
+"set in one or more filters is invalid. Please check your filters in Edit-"
+">Message Filters.\n"
+"Original error was: %s"
+msgstr ""
+"Нисам успео да издвојим изабране поруке. Један од разлога може бити и тај да "
+"је неисправно место фасцикле подешено у једном или више пропусника. Молим "
+"проверите ваше пропуснике у изборнику „Уређивање—>Пропусници порука“.\n"
+"Изворна грешка беше: %s"
+
+#: ../libemail-engine/mail-ops.c:233
+#, c-format
+#| msgid "Fetching Mail"
+msgid "Fetching mail from '%s'"
+msgstr "Довлачим пошту са „%s“"
 
-#: ../libemail-engine/mail-ops.c:916
+#: ../libemail-engine/mail-ops.c:755
+#, c-format
+msgid ""
+"Failed to apply outgoing filters. One reason can be that folder location set "
+"in one or more filters is invalid. Please check your filters in Edit-"
+">Message Filters.\n"
+"Original error was: %s"
+msgstr ""
+"Нисам успео да применим одлазне пропуснике. Један од разлога може бити и тај "
+"да је неисправно место фасцикле подешено у једном или више пропусника. "
+"Молим проверите ваше пропуснике у изборнику „Уређивање—>Пропусници порука“.\n"
+"Изворна грешка беше: %s"
+
+#: ../libemail-engine/mail-ops.c:978
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Шаљем поруку %d од %d"
 
 # bug: plural-forms
-#: ../libemail-engine/mail-ops.c:968
+#: ../libemail-engine/mail-ops.c:1030
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
@@ -10704,40 +12164,40 @@ msgstr[1] "Нисам успео да пошаљем %d од %d порука"
 msgstr[2] "Нисам успео да пошаљем %d од %d порука"
 msgstr[3] "Нисам успео да пошаљем %d од %d порукe"
 
-#: ../libemail-engine/mail-ops.c:974
+#: ../libemail-engine/mail-ops.c:1036
 msgid "Canceled."
 msgstr "Отказано."
 
-#: ../libemail-engine/mail-ops.c:976
+#: ../libemail-engine/mail-ops.c:1038
 msgid "Complete."
 msgstr "Завршено."
 
-#: ../libemail-engine/mail-ops.c:1088
+#: ../libemail-engine/mail-ops.c:1150
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Премештам поруке у „%s“"
 
-#: ../libemail-engine/mail-ops.c:1089
+#: ../libemail-engine/mail-ops.c:1151
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Умножавам поруке у „%s“"
 
-#: ../libemail-engine/mail-ops.c:1207
+#: ../libemail-engine/mail-ops.c:1270
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Смештам фасциклу „%s“"
 
-#: ../libemail-engine/mail-ops.c:1281
+#: ../libemail-engine/mail-ops.c:1398
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Празним и смештам налог „%s“"
 
-#: ../libemail-engine/mail-ops.c:1282
+#: ../libemail-engine/mail-ops.c:1399
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Смештам налог „%s“"
 
-#: ../libemail-engine/mail-ops.c:1356
+#: ../libemail-engine/mail-ops.c:1473
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Избацујем смеће у „%s“"
@@ -10761,12 +12221,12 @@ msgstr "Прослеђена порука — %s"
 msgid "Forwarded message"
 msgstr "Прослеђена порука"
 
-#: ../libemail-engine/mail-vfolder.c:130
+#: ../libemail-engine/mail-vfolder.c:127
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Подешавање фасцикле претраге: %s"
 
-#: ../libemail-engine/mail-vfolder.c:283
+#: ../libemail-engine/mail-vfolder.c:280
 #, c-format
 msgid "Updating Search Folders for '%s' - %s"
 msgstr "Ажурирање фасцикла претраге за „%s — %s“"
@@ -10776,7 +12236,7 @@ msgstr "Ажурирање фасцикла претраге за „%s — %s�
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../libemail-engine/mail-vfolder.c:648
+#: ../libemail-engine/mail-vfolder.c:645
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -10799,23 +12259,23 @@ msgstr[3] ""
 "Фасцикла претраге „%s“ је измењена у налогу за обрисану фасциклу\n"
 "„%s“."
 
-#: ../mail/e-mail-account-manager.c:446
+#: ../mail/e-mail-account-manager.c:460
 msgid "_Restore Default"
 msgstr "Поврати _подразумевано"
 
-#: ../mail/e-mail-account-manager.c:459
+#: ../mail/e-mail-account-manager.c:473
 msgid "You can drag and drop account names to reorder them."
 msgstr "Можете да превучете и убаците називе налога да их поново поређате."
 
-#: ../mail/e-mail-account-manager.c:504
+#: ../mail/e-mail-account-manager.c:518
 msgid "De_fault"
 msgstr "Под_разумевано"
 
 # has "activatable" set.
 #: ../mail/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:505
-#: ../modules/plugin-manager/evolution-plugin-manager.c:360
-#: ../plugins/publish-calendar/publish-calendar.c:864
+#: ../modules/mail/em-composer-prefs.c:488
+#: ../modules/plugin-manager/evolution-plugin-manager.c:359
+#: ../plugins/publish-calendar/publish-calendar.c:876
 msgid "Enabled"
 msgstr "Укључен"
 
@@ -10825,58 +12285,42 @@ msgstr "Назив налога"
 
 #: ../mail/e-mail-account-tree-view.c:134
 #: ../mail/e-mail-config-security-page.c:333
-#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3655
+#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3684
 #: ../mail/mail-config.ui.h:44
 msgid "Default"
 msgstr "Основно"
 
-#: ../mail/e-mail-autoconfig.c:194
-#, c-format
-msgid "No mail exchanger record for '%s'"
-msgstr "Нема записа размењивача поште за „%s“"
-
-#: ../mail/e-mail-autoconfig.c:201
-#, c-format
-msgid "Temporarily unable to resolve '%s'"
-msgstr "Привремено не могу да разрешим „%s“"
-
-#: ../mail/e-mail-autoconfig.c:208
-#, c-format
-msgid "Error resolving '%s'"
-msgstr "Грешка разрешавања „%s“"
-
-#: ../mail/e-mail-autoconfig.c:264
-#, c-format
-msgid "No authoritative name server for '%s'"
-msgstr "Нема меродавног сервера назива за „%s“"
-
-#: ../mail/e-mail-autoconfig.c:661
+#: ../mail/e-mail-autoconfig.c:525
 msgid "No email address provided"
 msgstr "Није достављена адреса ел. поште"
 
-#: ../mail/e-mail-autoconfig.c:670
+#: ../mail/e-mail-autoconfig.c:534
 msgid "Missing domain in email address"
 msgstr "Недостаје домен у адреси ел. поште"
 
-#: ../mail/e-mail-backend.c:734
+#: ../mail/e-mail-backend.c:766
 msgid "Unknown background operation"
 msgstr "Непозната позадинска радња"
 
-#: ../mail/e-mail-browser.c:127 ../shell/e-shell-window-actions.c:1418
-#: ../shell/e-shell-window-actions.c:1425
-#: ../shell/e-shell-window-actions.c:1432
+#: ../mail/e-mail-browser.c:123 ../shell/e-shell-window-actions.c:848
+#: ../shell/e-shell-window-actions.c:855 ../shell/e-shell-window-actions.c:862
 msgid "Close this window"
 msgstr "Затворите овај прозор"
 
-#: ../mail/e-mail-browser.c:284
+#: ../mail/e-mail-browser.c:280
 msgid "(No Subject)"
 msgstr "(Без субјекта)"
 
-#: ../mail/e-mail-config-assistant.c:501
+#. GtkAssistant sinks the floating button reference.
+#: ../mail/e-mail-config-assistant.c:102
+msgid "_Skip Lookup"
+msgstr "_Прескочи претрагу"
+
+#: ../mail/e-mail-config-assistant.c:562
 msgid "Evolution Account Assistant"
 msgstr "Помоћник налога Еволуције"
 
-#: ../mail/e-mail-config-auth-check.c:348
+#: ../mail/e-mail-config-auth-check.c:352
 msgid "Check for Supported Types"
 msgstr "Проверите за подржаним врстама"
 
@@ -10898,83 +12342,87 @@ msgstr ""
 msgid "Done"
 msgstr "Урађено"
 
-#: ../mail/e-mail-config-defaults-page.c:539
+#: ../mail/e-mail-config-defaults-page.c:552
 msgid "Special Folders"
 msgstr "Посебне фасцикле"
 
-#: ../mail/e-mail-config-defaults-page.c:548
+#: ../mail/e-mail-config-defaults-page.c:561
 msgid "Draft Messages _Folder:"
 msgstr "Фасцикла порука _нацрта:"
 
-#: ../mail/e-mail-config-defaults-page.c:558
+#: ../mail/e-mail-config-defaults-page.c:571
 msgid "Choose a folder for saving draft messages."
 msgstr "Изаберите фасциклу за чување порука нацрта."
 
-#: ../mail/e-mail-config-defaults-page.c:572
+#: ../mail/e-mail-config-defaults-page.c:585
 msgid "Sent _Messages Folder:"
 msgstr "Фасцикла послатих _порука:"
 
-#: ../mail/e-mail-config-defaults-page.c:582
+#: ../mail/e-mail-config-defaults-page.c:595
 msgid "Choose a folder for saving sent messages."
 msgstr "Изаберите фасциклу за чување послатих порука."
 
-#: ../mail/e-mail-config-defaults-page.c:596
+#: ../mail/e-mail-config-defaults-page.c:614
+msgid "S_ave replies in the folder of the message being replied to"
+msgstr "Сачувај _одговоре у фасцикли поруке на коју се одговара"
+
+#: ../mail/e-mail-config-defaults-page.c:631
 msgid "_Restore Defaults"
 msgstr "_Поврати основно"
 
-#: ../mail/e-mail-config-defaults-page.c:610
+#: ../mail/e-mail-config-defaults-page.c:645
 msgid "Use a Real Folder for _Trash:"
 msgstr "Користи стварну фасциклу за _смеће:"
 
-#: ../mail/e-mail-config-defaults-page.c:611
+#: ../mail/e-mail-config-defaults-page.c:646
 msgid "Choose a folder for deleted messages."
 msgstr "Изаберите фасциклу за обрисане поруке."
 
-#: ../mail/e-mail-config-defaults-page.c:620
+#: ../mail/e-mail-config-defaults-page.c:655
 msgid "Use a Real Folder for _Junk:"
 msgstr "Користи стварну фасциклу за _ђубре:"
 
-#: ../mail/e-mail-config-defaults-page.c:621
+#: ../mail/e-mail-config-defaults-page.c:656
 msgid "Choose a folder for junk messages."
 msgstr "Изаберите фасциклу за непожељне поруке."
 
-#: ../mail/e-mail-config-defaults-page.c:638
+#: ../mail/e-mail-config-defaults-page.c:673
 msgid "Composing Messages"
 msgstr "Састављање порука"
 
-#: ../mail/e-mail-config-defaults-page.c:647
+#: ../mail/e-mail-config-defaults-page.c:682
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Увек пошаљи _графитну копију (cc):"
 
-#: ../mail/e-mail-config-defaults-page.c:672
+#: ../mail/e-mail-config-defaults-page.c:707
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Увек пошаљи _невидљиву графитну копију (Bcc):"
 
-#: ../mail/e-mail-config-defaults-page.c:707
+#: ../mail/e-mail-config-defaults-page.c:742
 msgid "Message Receipts"
 msgstr "Признанице поруке"
 
-#: ../mail/e-mail-config-defaults-page.c:716
+#: ../mail/e-mail-config-defaults-page.c:751
 msgid "S_end message receipts:"
 msgstr "_Пошаљи повратнице:"
 
-#: ../mail/e-mail-config-defaults-page.c:741
+#: ../mail/e-mail-config-defaults-page.c:776
 msgid "Never"
 msgstr "Никада"
 
-#: ../mail/e-mail-config-defaults-page.c:747
+#: ../mail/e-mail-config-defaults-page.c:782
 msgid "Always"
 msgstr "Увек"
 
-#: ../mail/e-mail-config-defaults-page.c:753
+#: ../mail/e-mail-config-defaults-page.c:788
 msgid "Ask for each message"
 msgstr "Питај за сваку поруку"
 
-#: ../mail/e-mail-config-defaults-page.c:824
+#: ../mail/e-mail-config-defaults-page.c:859
 msgid "Defaults"
 msgstr "Основно"
 
-#: ../mail/e-mail-config-identity-page.c:254
+#: ../mail/e-mail-config-identity-page.c:266
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -10983,12 +12431,12 @@ msgstr ""
 "Унесите име и електронску адресу. „Необавезна“ поља не морају бити попуњена, "
 "осим ако не желите да ове податке укључите у поруке које шаљете."
 
-#: ../mail/e-mail-config-identity-page.c:282
+#: ../mail/e-mail-config-identity-page.c:294
 #: ../mail/e-mail-config-summary-page.c:324
 msgid "Account Information"
 msgstr "Подаци о налогу"
 
-#: ../mail/e-mail-config-identity-page.c:291
+#: ../mail/e-mail-config-identity-page.c:303
 #: ../mail/e-mail-config-summary-page.c:333
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
@@ -10997,47 +12445,35 @@ msgstr ""
 "Упишите име по коме желите да назовете овај налог.\n"
 "На пример, „Пословни“ или „Лични“."
 
-#: ../mail/e-mail-config-identity-page.c:299
-#: ../mail/e-mail-config-summary-page.c:341
-#: ../modules/addressbook/ldap-config.ui.h:12
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-mail-signature-script-dialog.c:417
-msgid "_Name:"
-msgstr "_Име:"
-
-#: ../mail/e-mail-config-identity-page.c:336
+#: ../mail/e-mail-config-identity-page.c:348
 msgid "Required Information"
 msgstr "Обавезни подаци"
 
-#: ../mail/e-mail-config-identity-page.c:345
+#: ../mail/e-mail-config-identity-page.c:357
 msgid "Full Nam_e:"
 msgstr "_Име и презиме:"
 
-#: ../mail/e-mail-config-identity-page.c:372
+#: ../mail/e-mail-config-identity-page.c:384
 msgid "Email _Address:"
 msgstr "Адреса _ел. поште:"
 
-#: ../mail/e-mail-config-identity-page.c:409
+#: ../mail/e-mail-config-identity-page.c:431
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Додатни подаци"
 
-#: ../mail/e-mail-config-identity-page.c:417
+#: ../mail/e-mail-config-identity-page.c:439
 msgid "Re_ply-To:"
 msgstr "Од_говор:"
 
-#: ../mail/e-mail-config-identity-page.c:444
+#: ../mail/e-mail-config-identity-page.c:466
 msgid "Or_ganization:"
 msgstr "Ор_ганизација:"
 
-#: ../mail/e-mail-config-identity-page.c:499
+#: ../mail/e-mail-config-identity-page.c:521
 msgid "Add Ne_w Signature..."
 msgstr "Додај но_ви потпис..."
 
-#: ../mail/e-mail-config-identity-page.c:640
-msgid "Identity"
-msgstr "Идентитет"
-
 #: ../mail/e-mail-config-lookup-page.c:68
 msgid "Looking up account details..."
 msgstr "Тражим појединости налога..."
@@ -11063,7 +12499,7 @@ msgstr "Примање поште"
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
 #: ../modules/itip-formatter/plugin/config-ui.c:91
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/certificate-viewer.c:653
 msgid "General"
 msgstr "Опште"
 
@@ -11195,13 +12631,12 @@ msgid "Server Type:"
 msgstr "Врста сервера:"
 
 #: ../mail/e-mail-config-summary-page.c:454
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:602
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:244
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
 msgid "Server:"
 msgstr "Сервер:"
 
 #: ../mail/e-mail-config-summary-page.c:475
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:697
 msgid "Username:"
 msgstr "Корисничко име:"
 
@@ -11224,43 +12659,43 @@ msgstr ""
 "Кликните „Настави“ да започнете."
 
 #: ../mail/e-mail-config-welcome-page.c:167
-#: ../modules/startup-wizard/e-startup-assistant.c:150
+#: ../modules/startup-wizard/e-startup-assistant.c:152
 msgid "Welcome"
 msgstr "Добродошли"
 
-#: ../mail/e-mail-config-window.c:329
+#: ../mail/e-mail-config-window.c:327
 msgid "Account Editor"
 msgstr "Уређивач налога"
 
-#: ../mail/e-mail-display.c:119
+#: ../mail/e-mail-display.c:113
 msgid "_Add to Address Book..."
 msgstr "_Додај у адресар..."
 
-#: ../mail/e-mail-display.c:126
+#: ../mail/e-mail-display.c:120
 msgid "_To This Address"
 msgstr "_На ову адресу"
 
-#: ../mail/e-mail-display.c:133
+#: ../mail/e-mail-display.c:127
 msgid "_From This Address"
 msgstr "_Са ове адресе"
 
-#: ../mail/e-mail-display.c:140
+#: ../mail/e-mail-display.c:134
 msgid "Send _Reply To..."
 msgstr "_Пошаљи одговор..."
 
-#: ../mail/e-mail-display.c:142
+#: ../mail/e-mail-display.c:136
 msgid "Send a reply message to this address"
 msgstr "Пошаљите поруку одговора на ову адресу"
 
-#: ../mail/e-mail-display.c:149
+#: ../mail/e-mail-display.c:143
 msgid "Create Search _Folder"
 msgstr "Направи фасциклу _претраге"
 
-#: ../mail/e-mail-display.c:159
+#: ../mail/e-mail-display.c:153
 msgid "Save _Image..."
-msgstr "Сачувај _слику"
+msgstr "Сачувај _слику..."
 
-#: ../mail/e-mail-display.c:161
+#: ../mail/e-mail-display.c:155
 msgid "Save the image to a file"
 msgstr "Сачувајте слику у датотеку"
 
@@ -11302,7 +12737,7 @@ msgid "_Later"
 msgstr "Касни_је"
 
 #: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:718
+#: ../modules/mail/e-mail-shell-view-actions.c:771
 msgid "Add Label"
 msgstr "Додајте натпис"
 
@@ -11322,670 +12757,665 @@ msgstr ""
 msgid "Color"
 msgstr "Боја"
 
-#: ../mail/e-mail-migrate.c:332
-#, c-format
-msgid "Unable to create local mail folders at '%s': %s"
-msgstr "Не могу да направим локалне фасцикле за пошту у „%s“: %s"
-
 #: ../mail/e-mail-notebook-view.c:269
 msgid "Please select a folder"
-msgstr "Изаберите фасциклу."
+msgstr "Изаберите фасциклу"
 
-#: ../mail/e-mail-printer.c:124
+#: ../mail/e-mail-printer.c:123
 #, c-format
 msgid "Page %d of %d"
 msgstr "Страница %d од %d"
 
-#: ../mail/e-mail-printer.c:549
-#: ../modules/calendar/e-cal-shell-view-actions.c:217
-#: ../modules/calendar/e-cal-shell-view-actions.c:246
+#: ../mail/e-mail-printer.c:573
+#: ../modules/calendar/e-cal-shell-view-actions.c:216
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
 msgid "Print"
 msgstr "Штампај"
 
-#: ../mail/e-mail-printer.c:555
+#: ../mail/e-mail-printer.c:579
 msgid "Header Name"
 msgstr "Назив заглавља"
 
-#: ../mail/e-mail-printer.c:561
+#: ../mail/e-mail-printer.c:585
 msgid "Header Value"
 msgstr "Вредност заглавља"
 
-#: ../mail/e-mail-printer.c:615 ../mail/mail-config.ui.h:102
+#: ../mail/e-mail-printer.c:639 ../mail/mail-config.ui.h:102
 msgid "Headers"
 msgstr "Заглавља"
 
-#: ../mail/e-mail-reader.c:349
+#: ../mail/e-mail-reader.c:347
 msgid "Save Image"
 msgstr "Сачувај слику"
 
-#: ../mail/e-mail-reader.c:431 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:429 ../mail/em-filter-i18n.h:12
 msgid "Copy to Folder"
 msgstr "Умножи у фасциклу"
 
-#: ../mail/e-mail-reader.c:431 ../mail/em-folder-utils.c:492
+#: ../mail/e-mail-reader.c:429 ../mail/em-folder-utils.c:489
 msgid "C_opy"
 msgstr "_Умножи"
 
-#: ../mail/e-mail-reader.c:965 ../mail/em-filter-i18n.h:53
+#: ../mail/e-mail-reader.c:963 ../mail/em-filter-i18n.h:54
 msgid "Move to Folder"
 msgstr "Премести у фасциклу"
 
-#: ../mail/e-mail-reader.c:965 ../mail/em-folder-utils.c:492
+#: ../mail/e-mail-reader.c:963 ../mail/em-folder-utils.c:489
 msgid "_Move"
 msgstr "Пре_мести"
 
-#: ../mail/e-mail-reader.c:1313 ../mail/e-mail-reader.c:1495
-#: ../mail/e-mail-reader.c:1535
+#: ../mail/e-mail-reader.c:1311 ../mail/e-mail-reader.c:1511
+#: ../mail/e-mail-reader.c:1551
 msgid "_Do not ask me again."
 msgstr "_Не питај ме поново."
 
-#: ../mail/e-mail-reader.c:1541
+#: ../mail/e-mail-reader.c:1557
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Увек занемари „Одговор-за:“ за дописне листе."
 
-#: ../mail/e-mail-reader.c:1726
+#: ../mail/e-mail-reader.c:1752
 msgid "Failed to retrieve message:"
 msgstr "Нисам успео да довучем поруку:"
 
-#: ../mail/e-mail-reader.c:1772 ../mail/e-mail-reader.c:2862
+#: ../mail/e-mail-reader.c:1798 ../mail/e-mail-reader.c:2891
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Довлачим поруку „%s“"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:1975
 msgid "A_dd Sender to Address Book"
 msgstr "До_дај пошиљаоца у адресар"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:1977
 msgid "Add sender to address book"
 msgstr "Додај пошиљаоца у адресар"
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:1982
 msgid "Check for _Junk"
 msgstr "Провери да ли има _ђубрета"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:1984
 msgid "Filter the selected messages for junk status"
 msgstr "Филтрира да ли међу изабраним порукама има ђубрета"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:1989
 msgid "_Copy to Folder..."
 msgstr "_Умножи у фасциклу..."
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:1991
 msgid "Copy selected messages to another folder"
 msgstr "Умножава изабране поруке у другу фасциклу"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:1996
 msgid "_Delete Message"
 msgstr "_Обриши поруку"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:1998
 msgid "Mark the selected messages for deletion"
 msgstr "Означите изабрану(е) поруку(е) за брисање"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:2003
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Направи правило пропусника за дописну _листу..."
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:2005
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Наравите правило за пропуштање порука на ову дописну листу"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:2010
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Направи правило пропусника за _примаоце..."
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:2012
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Направите правило за пропуштање порука овим примаоцима"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:2017
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Направи правило пропусника за _пошиљаоца..."
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2019
 msgid "Create a rule to filter messages from this sender"
 msgstr "Направите правило за пропуштање порука са овог пошиљаоца"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2024
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Направи правило пропусника за _наслов..."
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2026
 msgid "Create a rule to filter messages with this subject"
 msgstr "Направите правило за прпуштање порука са овим насловом"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2031
 msgid "A_pply Filters"
 msgstr "При_мени пропуснике"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2033
 msgid "Apply filter rules to the selected messages"
 msgstr "Примените правила пропуштања на изабране поруке"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2038
 msgid "_Find in Message..."
 msgstr "П_ронађи у поруци..."
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2040
 msgid "Search for text in the body of the displayed message"
 msgstr "Потражите текст у телу приказане поруке"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2045
 msgid "_Clear Flag"
 msgstr "Скло_ни ознаку"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2047
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Уклоните ознаку за праћење са изабраних порука"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2052
 msgid "_Flag Completed"
 msgstr "Означ_и као завршено"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2054
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Поставите ознаку за праћење као завршену на изабраним порукама"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2059
 msgid "Follow _Up..."
 msgstr "Сле_ди..."
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2061
 msgid "Flag the selected messages for follow-up"
 msgstr "Означите изабране поруке за праћење"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2066
 msgid "_Attached"
 msgstr "При_ложено"
 
-#: ../mail/e-mail-reader.c:2042 ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2068 ../mail/e-mail-reader.c:2075
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Проследите изабрану поруку некоме као прилог"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2073
 msgid "Forward As _Attached"
 msgstr "Проследи као _прилог"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2080
 msgid "_Inline"
 msgstr "Унут_ар"
 
-#: ../mail/e-mail-reader.c:2056 ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2082 ../mail/e-mail-reader.c:2089
 msgid "Forward the selected message in the body of a new message"
 msgstr "Проследите изабрану поруку у телу нове поруке"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:2087
 msgid "Forward As _Inline"
 msgstr "Проследи као _унутар поруке"
 
-#: ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:2094
 msgid "_Quoted"
 msgstr "_Цитирано"
 
-#: ../mail/e-mail-reader.c:2070 ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2096 ../mail/e-mail-reader.c:2103
 msgid "Forward the selected message quoted like a reply"
 msgstr "Проследите изабрану поруку цитирану као одговор"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2101
 msgid "Forward As _Quoted"
 msgstr "Проследи као _цитат"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2108
 msgid "_Load Images"
 msgstr "_Учитај слике"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2110
 msgid "Force images in HTML mail to be loaded"
 msgstr "Присилите учитавање слика у ХТМЛ порукама"
 
-#: ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:2115
 msgid "_Important"
 msgstr "_Важно"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2117
 msgid "Mark the selected messages as important"
 msgstr "Означите изабрану(е) поруку(е) као важно"
 
-#: ../mail/e-mail-reader.c:2096
+#: ../mail/e-mail-reader.c:2122
 msgid "_Junk"
 msgstr "_Ђубре"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2124
 msgid "Mark the selected messages as junk"
 msgstr "Означите изабрану(е) поруку(е) као нежељену пошту"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2129
 msgid "_Not Junk"
 msgstr "Ни_је ђубре"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2131
 msgid "Mark the selected messages as not being junk"
 msgstr "Означите изабрану(е) поруку(е) да није нежељена пошта"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2136
 msgid "_Read"
 msgstr "Про_читај"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2138
 msgid "Mark the selected messages as having been read"
 msgstr "Означите изабрану(е) поруку(е) као прочитано"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2143
 msgid "Uni_mportant"
 msgstr "Не_важно"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2145
 msgid "Mark the selected messages as unimportant"
 msgstr "Означите изабрану(е) поруку(е) као неважно"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2150
 msgid "_Unread"
 msgstr "_Непрочитано"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2152
 msgid "Mark the selected messages as not having been read"
 msgstr "Означите изабрану(е) поруку(е) као непрочитано"
 
-#: ../mail/e-mail-reader.c:2131
+#: ../mail/e-mail-reader.c:2157
 msgid "_Edit as New Message..."
 msgstr "_Уреди као нову поруку..."
 
-#: ../mail/e-mail-reader.c:2133
+#: ../mail/e-mail-reader.c:2159
 msgid "Open the selected messages in the composer for editing"
 msgstr "Отворите изабрану поруку у састављачу ради уређивања"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2164
 msgid "Compose _New Message"
 msgstr "Састави _нову поруку"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2166
 msgid "Open a window for composing a mail message"
 msgstr "Отворите прозор за састављање поруке"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2171
 msgid "_Open in New Window"
 msgstr "_Отвори у новом прозору"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2173
 msgid "Open the selected messages in a new window"
 msgstr "Отворите изабране поруке у новом прозору"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2178
 msgid "_Move to Folder..."
 msgstr "_Премести у фасциклу..."
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2180
 msgid "Move selected messages to another folder"
 msgstr "Преместите изабрану(е) поруку(е) у другу фасциклу"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2185
 msgid "_Switch to Folder"
 msgstr "Пређи у _фасциклу"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2187
 msgid "Display the parent folder"
 msgstr "Прикажите надређену фасциклу"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2192
 msgid "Switch to _next tab"
 msgstr "Пребаци на _следећи језичак"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2194
 msgid "Switch to the next tab"
 msgstr "Пребаците се на следећи језичак"
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2199
 msgid "Switch to _previous tab"
 msgstr "Пребаци на _претходни језичак"
 
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2201
 msgid "Switch to the previous tab"
 msgstr "Пребаците се на претходни језичак"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2206
 msgid "Cl_ose current tab"
 msgstr "_Затвори тренутни језичак"
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2208
 msgid "Close current tab"
 msgstr "Затворите тренутни језичак"
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2213
 msgid "_Next Message"
 msgstr "_Следећа порука"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2215
 msgid "Display the next message"
 msgstr "Прикажите следећу поруку"
 
-#: ../mail/e-mail-reader.c:2194
+#: ../mail/e-mail-reader.c:2220
 msgid "Next _Important Message"
 msgstr "Следећа _важна порука"
 
-#: ../mail/e-mail-reader.c:2196
+#: ../mail/e-mail-reader.c:2222
 msgid "Display the next important message"
 msgstr "Прикажите следећу важну поруку"
 
-#: ../mail/e-mail-reader.c:2201
+#: ../mail/e-mail-reader.c:2227
 msgid "Next _Thread"
 msgstr "_Следећа расправа"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2229
 msgid "Display the next thread"
 msgstr "Прикажите следећу расправу"
 
-#: ../mail/e-mail-reader.c:2208
+#: ../mail/e-mail-reader.c:2234
 msgid "Next _Unread Message"
 msgstr "Следећа _непрочитана порука"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2236
 msgid "Display the next unread message"
 msgstr "Прикажите следећу непрочитану поруку"
 
-#: ../mail/e-mail-reader.c:2215
+#: ../mail/e-mail-reader.c:2241
 msgid "_Previous Message"
 msgstr "_Претходна порука"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2243
 msgid "Display the previous message"
 msgstr "Прикажите претходну поруку"
 
-#: ../mail/e-mail-reader.c:2222
+#: ../mail/e-mail-reader.c:2248
 msgid "Pr_evious Important Message"
 msgstr "Пр_етходна важна порука"
 
-#: ../mail/e-mail-reader.c:2224
+#: ../mail/e-mail-reader.c:2250
 msgid "Display the previous important message"
 msgstr "Прикажите претходну важну поруку"
 
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2255
 msgid "Previous T_hread"
 msgstr "_Претходна тема"
 
-#: ../mail/e-mail-reader.c:2231
+#: ../mail/e-mail-reader.c:2257
 msgid "Display the previous thread"
 msgstr "Прикажите претходну тему"
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2262
 msgid "P_revious Unread Message"
 msgstr "П_ретходна непрочитана порука"
 
-#: ../mail/e-mail-reader.c:2238
+#: ../mail/e-mail-reader.c:2264
 msgid "Display the previous unread message"
 msgstr "Прикажите претходну непрочитану поруку"
 
-#: ../mail/e-mail-reader.c:2245
+#: ../mail/e-mail-reader.c:2271
 msgid "Print this message"
 msgstr "Штампајте ову поруку"
 
-#: ../mail/e-mail-reader.c:2252
+#: ../mail/e-mail-reader.c:2278
 msgid "Preview the message to be printed"
 msgstr "Прегледајте поруку пред штампу"
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2283
 msgid "Re_direct"
 msgstr "Преу_смери"
 
-#: ../mail/e-mail-reader.c:2259
+#: ../mail/e-mail-reader.c:2285
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Преусмерите (без читања) изабрану поруку некоме"
 
-#: ../mail/e-mail-reader.c:2264
+#: ../mail/e-mail-reader.c:2290
 msgid "Remo_ve Attachments"
 msgstr "_Уклони прилоге"
 
-#: ../mail/e-mail-reader.c:2266
+#: ../mail/e-mail-reader.c:2292
 msgid "Remove attachments"
 msgstr "Уклоните прилоге"
 
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2297
 msgid "Remove Du_plicate Messages"
 msgstr "Уклони _дуплиране поруке"
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2299
 msgid "Checks selected messages for duplicates"
 msgstr "Проверите изабране поруке за дупликате"
 
-#: ../mail/e-mail-reader.c:2278 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1574
-#: ../modules/mail/e-mail-attachment-handler.c:182
+#: ../mail/e-mail-reader.c:2304 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/mail/e-mail-attachment-handler.c:196
 msgid "Reply to _All"
 msgstr "Одговори _свима"
 
-#: ../mail/e-mail-reader.c:2280
+#: ../mail/e-mail-reader.c:2306
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Саставите одговор свим примаоцима изабране поруке"
 
-#: ../mail/e-mail-reader.c:2285 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2311 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Одговори на _листу"
 
-#: ../mail/e-mail-reader.c:2287
+#: ../mail/e-mail-reader.c:2313
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Саставите одговор дописној листи изабране поруке"
 
-#: ../mail/e-mail-reader.c:2292
-#: ../modules/mail/e-mail-attachment-handler.c:189
+#: ../mail/e-mail-reader.c:2318
+#: ../modules/mail/e-mail-attachment-handler.c:203
 msgid "_Reply to Sender"
 msgstr "_Одговори пошиљаоцу"
 
-#: ../mail/e-mail-reader.c:2294
+#: ../mail/e-mail-reader.c:2320
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Саставите одговор пошиљаоцу изабране поруке"
 
-#: ../mail/e-mail-reader.c:2299
+#: ../mail/e-mail-reader.c:2325
 msgid "_Save as mbox..."
 msgstr "_Сачувај као мбокс..."
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2327
 msgid "Save selected messages as an mbox file"
 msgstr "Сачувајте изабране поруке као „mbox“ датотеку"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2332
 msgid "_Message Source"
 msgstr "Изво_рни код поруке"
 
-#: ../mail/e-mail-reader.c:2308
+#: ../mail/e-mail-reader.c:2334
 msgid "Show the raw email source of the message"
 msgstr "Прикажите изворни код електронске поруке"
 
-#: ../mail/e-mail-reader.c:2320
+#: ../mail/e-mail-reader.c:2346
 msgid "_Undelete Message"
 msgstr "П_оврати поруку"
 
-#: ../mail/e-mail-reader.c:2322
+#: ../mail/e-mail-reader.c:2348
 msgid "Undelete the selected messages"
 msgstr "Повратите изабране поруке"
 
-#: ../mail/e-mail-reader.c:2327
+#: ../mail/e-mail-reader.c:2353
 msgid "_Normal Size"
 msgstr "_Уобичајена величина"
 
-#: ../mail/e-mail-reader.c:2329
+#: ../mail/e-mail-reader.c:2355
 msgid "Reset the text to its original size"
 msgstr "Вратите текст на оригиналну величину"
 
-#: ../mail/e-mail-reader.c:2334
+#: ../mail/e-mail-reader.c:2360
 msgid "_Zoom In"
 msgstr "У_већај"
 
-#: ../mail/e-mail-reader.c:2336
+#: ../mail/e-mail-reader.c:2362
 msgid "Increase the text size"
 msgstr "Увећајте величину текста"
 
-#: ../mail/e-mail-reader.c:2341
+#: ../mail/e-mail-reader.c:2367
 msgid "Zoom _Out"
 msgstr "У_мањи"
 
-#: ../mail/e-mail-reader.c:2343
+#: ../mail/e-mail-reader.c:2369
 msgid "Decrease the text size"
 msgstr "Умањите величину текста"
 
-#: ../mail/e-mail-reader.c:2350
+#: ../mail/e-mail-reader.c:2376
 msgid "Cre_ate"
 msgstr "_Направи"
 
-#: ../mail/e-mail-reader.c:2357
+#: ../mail/e-mail-reader.c:2383
 msgid "Ch_aracter Encoding"
 msgstr "Кодна ст_рана"
 
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2390
 msgid "F_orward As"
 msgstr "_Проследи као"
 
-#: ../mail/e-mail-reader.c:2371
+#: ../mail/e-mail-reader.c:2397
 msgid "_Group Reply"
 msgstr "О_дговори групи"
 
-#: ../mail/e-mail-reader.c:2378
+#: ../mail/e-mail-reader.c:2404
 msgid "_Go To"
 msgstr "_Иди на"
 
-#: ../mail/e-mail-reader.c:2385
+#: ../mail/e-mail-reader.c:2411
 msgid "Mar_k As"
 msgstr "О_значи као"
 
-#: ../mail/e-mail-reader.c:2392
+#: ../mail/e-mail-reader.c:2418
 msgid "_Message"
 msgstr "_Порука"
 
-#: ../mail/e-mail-reader.c:2399
+#: ../mail/e-mail-reader.c:2425
 msgid "_Zoom"
 msgstr "Ув_ећај"
 
-#: ../mail/e-mail-reader.c:2409
+#: ../mail/e-mail-reader.c:2435
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Направи фасциклу претраге са дописне _листе..."
 
-#: ../mail/e-mail-reader.c:2411
+#: ../mail/e-mail-reader.c:2437
 msgid "Create a search folder for this mailing list"
 msgstr "Направите фасциклу претраге за ову дописну листу"
 
-#: ../mail/e-mail-reader.c:2416
+#: ../mail/e-mail-reader.c:2442
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Направи фасциклу претраге од при_малаца..."
 
-#: ../mail/e-mail-reader.c:2418
+#: ../mail/e-mail-reader.c:2444
 msgid "Create a search folder for these recipients"
 msgstr "Направите фасциклу претраге за ове примаоце"
 
-#: ../mail/e-mail-reader.c:2423
+#: ../mail/e-mail-reader.c:2449
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Направи фасциклу претраге од по_шиљаоца..."
 
-#: ../mail/e-mail-reader.c:2425
+#: ../mail/e-mail-reader.c:2451
 msgid "Create a search folder for this sender"
 msgstr "Направите фасциклу претраге за овог пошиљаоца"
 
-#: ../mail/e-mail-reader.c:2430
+#: ../mail/e-mail-reader.c:2456
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Направи фасциклу претраге из _наслова..."
 
-#: ../mail/e-mail-reader.c:2432
+#: ../mail/e-mail-reader.c:2458
 msgid "Create a search folder for this subject"
 msgstr "Направите фасциклу претраге за овај наслов"
 
-#: ../mail/e-mail-reader.c:2455
+#: ../mail/e-mail-reader.c:2481
 msgid "Mark for Follo_w Up..."
 msgstr "Обележи за _праћење..."
 
-#: ../mail/e-mail-reader.c:2463
+#: ../mail/e-mail-reader.c:2489
 msgid "Mark as _Important"
 msgstr "Оначи као _важно"
 
-#: ../mail/e-mail-reader.c:2467
+#: ../mail/e-mail-reader.c:2493
 msgid "Mark as _Junk"
 msgstr "Означи као _ђубре"
 
-#: ../mail/e-mail-reader.c:2471
+#: ../mail/e-mail-reader.c:2497
 msgid "Mark as _Not Junk"
 msgstr "Означи да _није ђубре"
 
-#: ../mail/e-mail-reader.c:2475
+#: ../mail/e-mail-reader.c:2501
 msgid "Mar_k as Read"
 msgstr "О_значи као прочитано"
 
-#: ../mail/e-mail-reader.c:2479
+#: ../mail/e-mail-reader.c:2505
 msgid "Mark as Uni_mportant"
 msgstr "Означи као _неважно"
 
-#: ../mail/e-mail-reader.c:2483
+#: ../mail/e-mail-reader.c:2509
 msgid "Mark as _Unread"
 msgstr "Означи као _непрочитано"
 
-#: ../mail/e-mail-reader.c:2527
+#: ../mail/e-mail-reader.c:2553
 msgid "_Caret Mode"
 msgstr "Метод у_метања"
 
-#: ../mail/e-mail-reader.c:2529
+#: ../mail/e-mail-reader.c:2555
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Прикажите трепћући курсор у телу приказаних порука"
 
-#: ../mail/e-mail-reader.c:2535
+#: ../mail/e-mail-reader.c:2561
 msgid "All Message _Headers"
 msgstr "Сва _заглавља поруке"
 
-#: ../mail/e-mail-reader.c:2537
+#: ../mail/e-mail-reader.c:2563
 msgid "Show messages with all email headers"
 msgstr "Прикажите поруку са свим заглављима ел. поште"
 
-#: ../mail/e-mail-reader.c:2868
+#: ../mail/e-mail-reader.c:2897
 msgid "Retrieving message"
 msgstr "Довлачим поруку"
 
-#: ../mail/e-mail-reader.c:3851
-#: ../modules/mail/e-mail-attachment-handler.c:175
+#: ../mail/e-mail-reader.c:3877
+#: ../modules/mail/e-mail-attachment-handler.c:189
 msgid "_Forward"
 msgstr "Просл_еди"
 
-#: ../mail/e-mail-reader.c:3852
+#: ../mail/e-mail-reader.c:3878
 msgid "Forward the selected message to someone"
 msgstr "Прослеђује изабрану поруку некоме"
 
-#: ../mail/e-mail-reader.c:3871
+#: ../mail/e-mail-reader.c:3897
 msgid "Group Reply"
 msgstr "Одговор групи"
 
-#: ../mail/e-mail-reader.c:3872
+#: ../mail/e-mail-reader.c:3898
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Одговорите дописној листи или свим примаоцима"
 
-#: ../mail/e-mail-reader.c:3929 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3964 ../mail/em-filter-i18n.h:15
 msgid "Delete"
 msgstr "Обриши"
 
-#: ../mail/e-mail-reader.c:3962
-#: ../modules/calendar/e-cal-shell-view-actions.c:1399
+#: ../mail/e-mail-reader.c:3997
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "Next"
 msgstr "Следеће"
 
-#: ../mail/e-mail-reader.c:3966
-#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+#: ../mail/e-mail-reader.c:4001
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "Previous"
 msgstr "Претходно"
 
-#: ../mail/e-mail-reader.c:3975 ../mail/mail-dialogs.ui.h:15
+#: ../mail/e-mail-reader.c:4010 ../mail/mail-dialogs.ui.h:15
 msgid "Reply"
 msgstr "Одговори"
 
-#: ../mail/e-mail-reader.c:4705
+#: ../mail/e-mail-reader.c:4728
 #, c-format
 msgid "Folder '%s'"
 msgstr "Фасцикла „%s“"
 
-#: ../mail/e-mail-reader-utils.c:154
+#: ../mail/e-mail-reader-utils.c:161
 msgid "Do not warn me again"
 msgstr "Не упозоравај ме поново"
 
-#: ../mail/e-mail-reader-utils.c:954
+#: ../mail/e-mail-reader-utils.c:962
 msgid "Printing"
 msgstr "Штампам"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1136
+#: ../mail/e-mail-reader-utils.c:1148
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -12006,7 +13436,7 @@ msgstr[3] ""
 "Фасцикла „%s“ садржи %u дуплирану поруку. Да ли сте сигурни да желите да је "
 "избришете?"
 
-#: ../mail/e-mail-reader-utils.c:1541
+#: ../mail/e-mail-reader-utils.c:1613
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Сачувај поруку"
@@ -12019,7 +13449,7 @@ msgstr[3] "Сачувај поруку"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:1562
+#: ../mail/e-mail-reader-utils.c:1634
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Порука"
@@ -12027,16 +13457,16 @@ msgstr[1] "Поруке"
 msgstr[2] "Поруке"
 msgstr[3] "Порука"
 
-#: ../mail/e-mail-reader-utils.c:2017
+#: ../mail/e-mail-reader-utils.c:2084
 msgid "Parsing message"
 msgstr "Обрађујем поруку"
 
-#: ../mail/e-mail-request.c:152
+#: ../mail/e-mail-request.c:177
 #, c-format
 msgid "Failed to load part '%s'"
 msgstr "Нисам успео да учитам део „%s“"
 
-#: ../mail/e-mail-tag-editor.c:293
+#: ../mail/e-mail-tag-editor.c:292
 msgid "Flag to Follow Up"
 msgstr "Означи за праћење"
 
@@ -12046,7 +13476,7 @@ msgstr "Означи за праћење"
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1282
+#: ../mail/em-composer-utils.c:1278
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -12054,27 +13484,27 @@ msgstr ""
 "У ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. у ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} пише:"
 
-#: ../mail/em-composer-utils.c:1288
+#: ../mail/em-composer-utils.c:1284
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Прослеђена порука --------"
 
-#: ../mail/em-composer-utils.c:1293
+#: ../mail/em-composer-utils.c:1289
 msgid "-----Original Message-----"
 msgstr "-----Оригинална порука-----"
 
-#: ../mail/em-composer-utils.c:2573
+#: ../mail/em-composer-utils.c:2611
 msgid "an unknown sender"
 msgstr "непознати пошиљалац"
 
-#: ../mail/em-composer-utils.c:2991
+#: ../mail/em-composer-utils.c:3030
 msgid "Posting destination"
 msgstr "Одредишна пошта"
 
-#: ../mail/em-composer-utils.c:2992
+#: ../mail/em-composer-utils.c:3031
 msgid "Choose folders to post the message to."
 msgstr "Изаберите фасцикле за слање поруке."
 
-#: ../mail/em-filter-editor-folder-element.c:158
+#: ../mail/em-filter-editor-folder-element.c:157
 msgid "Select Folder"
 msgstr "Изабери фасциклу"
 
@@ -12084,252 +13514,257 @@ msgid "Adjust Score"
 msgstr "Прерачунај"
 
 #: ../mail/em-filter-i18n.h:3
+#| msgid "IMAP Headers"
+msgid "Any header"
+msgstr "Било које заглавље"
+
+#: ../mail/em-filter-i18n.h:4
 msgid "Assign Color"
 msgstr "Додели боју"
 
-#: ../mail/em-filter-i18n.h:4
+#: ../mail/em-filter-i18n.h:5
 msgid "Assign Score"
 msgstr "Додели резултат"
 
-#: ../mail/em-filter-i18n.h:6
+#: ../mail/em-filter-i18n.h:7
 msgid "BCC"
 msgstr "БЦЦ"
 
-#: ../mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:8
 msgid "Beep"
 msgstr "Звоно"
 
-#: ../mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:9
 msgid "CC"
 msgstr "ЦЦ"
 
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:10
 msgid "Completed On"
 msgstr "Завршено за"
 
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:13
 msgid "Date received"
 msgstr "Датум примања"
 
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:14
 msgid "Date sent"
 msgstr "Датум слања"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:16
 msgid "Deleted"
 msgstr "Обрисано"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:18
 msgid "does not end with"
 msgstr "не завршава се са"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:19
 msgid "does not exist"
 msgstr "не постоји"
 
-#: ../mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:20
 msgid "does not have words"
 msgstr "не садржи речи"
 
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:21
 msgid "does not return"
 msgstr "не враћа"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:22
 msgid "does not sound like"
 msgstr "не звучи као"
 
-#: ../mail/em-filter-i18n.h:22
+#: ../mail/em-filter-i18n.h:23
 msgid "does not start with"
 msgstr "не почиње са"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:25
 msgid "Draft"
 msgstr "Нацрт"
 
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:26
 msgid "ends with"
 msgstr "завршава се са"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:28
 msgid "exists"
 msgstr "постоји"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:29
 msgid "Expression"
 msgstr "Израз"
 
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:30
 msgid "Follow Up"
 msgstr "Следи"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:31
 msgid "Forward to"
 msgstr "Проследи"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:32
 msgid "has words"
 msgstr "садржи речи"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:33
 msgid "Important"
 msgstr "Важно"
 
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:35
 msgid "is after"
 msgstr "је после"
 
-#: ../mail/em-filter-i18n.h:35
+#: ../mail/em-filter-i18n.h:36
 msgid "is before"
 msgstr "је пре"
 
-#: ../mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:37
 msgid "is Flagged"
 msgstr "је означено"
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:41
 msgid "is not Flagged"
 msgstr "није означено"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:42
 msgid "is not set"
 msgstr "није подешено"
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:43
 msgid "is set"
 msgstr "подешено"
 
-#: ../mail/em-filter-i18n.h:43 ../mail/mail-config.ui.h:109
+#: ../mail/em-filter-i18n.h:44 ../mail/mail-config.ui.h:109
 msgid "Junk"
 msgstr "Ђубре"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:45
 msgid "Junk Test"
 msgstr "Провера ђубрета"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:46
 msgid "Label"
 msgstr "Натпис"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:47
 msgid "Mailing list"
 msgstr "Дописна листа"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:48
 msgid "Match All"
 msgstr "Одговара све"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:49
 msgid "Message Body"
 msgstr "Тело поруке"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:50
 msgid "Message Header"
 msgstr "Заглавље поруке"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:51
 msgid "Message is Junk"
 msgstr "Порука је ђубре"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:52
 msgid "Message is not Junk"
 msgstr "Порука није ђубре"
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:53
 msgid "Message Location"
 msgstr "Локација поруке"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:55
 msgid "Pipe to Program"
 msgstr "Повежи на програм"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:56
 msgid "Play Sound"
 msgstr "Пусти звук"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:56 ../mail/mail-dialogs.ui.h:14
+#: ../mail/em-filter-i18n.h:57 ../mail/mail-dialogs.ui.h:14
 msgid "Read"
 msgstr "Читај"
 
-#: ../mail/em-filter-i18n.h:57 ../mail/message-list.etspec.h:16
+#: ../mail/em-filter-i18n.h:58 ../mail/message-list.etspec.h:16
 msgid "Recipients"
 msgstr "Примаоци"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:59
 msgid "Regex Match"
 msgstr "Регизр одговара"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:60
 msgid "Replied to"
 msgstr "Одговорено"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:61
 msgid "returns"
 msgstr "повратно"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:62
 msgid "returns greater than"
 msgstr "повратно веће од"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:63
 msgid "returns less than"
 msgstr "повратно мање од"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:64
 msgid "Run Program"
 msgstr "Покрени програм"
 
-#: ../mail/em-filter-i18n.h:64 ../mail/message-list.etspec.h:3
+#: ../mail/em-filter-i18n.h:65 ../mail/message-list.etspec.h:3
 msgid "Score"
 msgstr "Резултат"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/message-list.etspec.h:15
+#: ../mail/em-filter-i18n.h:66 ../mail/message-list.etspec.h:15
 msgid "Sender"
 msgstr "Пошиљалац"
 
 # bug(slobo): вероватно извештај о достави
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:67
 msgid "Sender or Recipients"
 msgstr "Пошиљалац или примаоци"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:68
 msgid "Set Label"
 msgstr "Постави ознаку"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:69
 msgid "Set Status"
 msgstr "Постави статус"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:70
 msgid "Size (kB)"
 msgstr "Величина (kB)"
 
-#: ../mail/em-filter-i18n.h:70
+#: ../mail/em-filter-i18n.h:71
 msgid "sounds like"
 msgstr "звучи као"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:72
 msgid "Source Account"
 msgstr "Изворни налог"
 
-#: ../mail/em-filter-i18n.h:72
+#: ../mail/em-filter-i18n.h:73
 msgid "Specific header"
 msgstr "Одређено заглавље"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:74
 msgid "starts with"
 msgstr "почиње са"
 
-#: ../mail/em-filter-i18n.h:75
+#: ../mail/em-filter-i18n.h:76
 msgid "Stop Processing"
 msgstr "Прекини обраду"
 
-#: ../mail/em-filter-i18n.h:78
+#: ../mail/em-filter-i18n.h:79
 msgid "Unset Color"
 msgstr "Непостављена боја"
 
-#: ../mail/em-filter-i18n.h:79
+#: ../mail/em-filter-i18n.h:80
 msgid "Unset Status"
 msgstr "Непостављен статус"
 
@@ -12388,145 +13823,145 @@ msgstr "_Направи"
 msgid "Folder _name:"
 msgstr "Назив _фасцикле:"
 
-#: ../mail/em-folder-tree.c:644
+#: ../mail/em-folder-tree.c:637
 msgid "Folder names cannot contain '/'"
 msgstr "Називи фасцикли не могу да садрже „/“"
 
-#: ../mail/em-folder-tree.c:780
+#: ../mail/em-folder-tree.c:774
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1605
+#: ../mail/em-folder-tree.c:1599
 msgid "Mail Folder Tree"
 msgstr "Стабло фасцикле за пошту"
 
-#: ../mail/em-folder-tree.c:2132 ../mail/em-folder-utils.c:115
+#: ../mail/em-folder-tree.c:2130 ../mail/em-folder-utils.c:112
 #, c-format
 msgid "Moving folder %s"
 msgstr "Премештам фасциклу „%s“"
 
-#: ../mail/em-folder-tree.c:2135 ../mail/em-folder-utils.c:117
+#: ../mail/em-folder-tree.c:2133 ../mail/em-folder-utils.c:114
 #, c-format
 msgid "Copying folder %s"
 msgstr "Умножавам фасциклу „%s“"
 
-#: ../mail/em-folder-tree.c:2142 ../mail/message-list.c:2301
+#: ../mail/em-folder-tree.c:2140 ../mail/message-list.c:2283
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Премештам поруке у фасциклу „%s“"
 
-#: ../mail/em-folder-tree.c:2146 ../mail/message-list.c:2303
+#: ../mail/em-folder-tree.c:2144 ../mail/message-list.c:2285
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Умножавам поруке у фасциклу „%s“"
 
-#: ../mail/em-folder-tree.c:2165
+#: ../mail/em-folder-tree.c:2163
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Не могу да убацим поруку(е) у оставу на највишем нивоу"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:158
+#: ../mail/em-folder-tree-model.c:155 ../mail/em-folder-tree-model.c:157
 msgid "UNMATCHED"
 msgstr "НЕОДГОВАРА"
 
-#: ../mail/em-folder-tree-model.c:849 ../mail/em-folder-tree-model.c:1134
+#: ../mail/em-folder-tree-model.c:848 ../mail/em-folder-tree-model.c:1133
 msgid "Loading..."
 msgstr "Учитавам..."
 
-#: ../mail/em-folder-utils.c:493
+#: ../mail/em-folder-utils.c:490
 msgid "Move Folder To"
 msgstr "Премести фасциклу у"
 
-#: ../mail/em-folder-utils.c:493
+#: ../mail/em-folder-utils.c:490
 msgid "Copy Folder To"
 msgstr "Умножи фасциклу у"
 
-#: ../mail/em-folder-utils.c:590
+#: ../mail/em-folder-utils.c:587
 msgid "Create Folder"
 msgstr "Направи фасциклу"
 
-#: ../mail/em-folder-utils.c:591
+#: ../mail/em-folder-utils.c:588
 msgid "Specify where to create the folder:"
 msgstr "Наведите где направити фасциклу:"
 
-#: ../mail/em-subscription-editor.c:869
+#: ../mail/em-subscription-editor.c:867
 msgid "_Subscribe"
 msgstr "Пријави _се"
 
-#: ../mail/em-subscription-editor.c:878
+#: ../mail/em-subscription-editor.c:876
 msgid "Su_bscribe To Shown"
 msgstr "Пријави се на _приказане"
 
-#: ../mail/em-subscription-editor.c:886
+#: ../mail/em-subscription-editor.c:884
 msgid "Subscribe To _All"
 msgstr "Пријави се _на све"
 
-#: ../mail/em-subscription-editor.c:986 ../mail/em-subscription-editor.c:1847
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../mail/em-subscription-editor.c:981 ../mail/em-subscription-editor.c:1842
+#: ../modules/mail/e-mail-shell-view-actions.c:1398
 msgid "_Unsubscribe"
 msgstr "_Одјави се"
 
-#: ../mail/em-subscription-editor.c:995
+#: ../mail/em-subscription-editor.c:990
 msgid "Unsu_bscribe From Hidden"
 msgstr "О_дјави се са скривених"
 
-#: ../mail/em-subscription-editor.c:1003
+#: ../mail/em-subscription-editor.c:998
 msgid "Unsubscribe From _All"
 msgstr "Одја_ви се са свих"
 
-#: ../mail/em-subscription-editor.c:1682
+#: ../mail/em-subscription-editor.c:1677
 msgid "Folder Subscriptions"
 msgstr "Пријаве на фасцикле"
 
-#: ../mail/em-subscription-editor.c:1722
+#: ../mail/em-subscription-editor.c:1717
 msgid "_Account:"
 msgstr "_Налог:"
 
-#: ../mail/em-subscription-editor.c:1737
+#: ../mail/em-subscription-editor.c:1732
 msgid "Clear Search"
 msgstr "Очисти претрагу"
 
-#: ../mail/em-subscription-editor.c:1755
+#: ../mail/em-subscription-editor.c:1750
 msgid "Sho_w items that contain:"
 msgstr "_Прикажи ставке које садрже:"
 
-#: ../mail/em-subscription-editor.c:1800
+#: ../mail/em-subscription-editor.c:1795
 msgid "Subscribe to the selected folder"
 msgstr "Пријавите се на изабрану фасциклу"
 
-#: ../mail/em-subscription-editor.c:1801
+#: ../mail/em-subscription-editor.c:1796
 msgid "Su_bscribe"
 msgstr "П_ријави се"
 
-#: ../mail/em-subscription-editor.c:1846
-#: ../modules/mail/e-mail-shell-view-actions.c:1340
+#: ../mail/em-subscription-editor.c:1841
+#: ../modules/mail/e-mail-shell-view-actions.c:1400
 msgid "Unsubscribe from the selected folder"
 msgstr "Одјавите се са изабране фасцикле"
 
-#: ../mail/em-subscription-editor.c:1886
+#: ../mail/em-subscription-editor.c:1881
 msgid "Collapse all folders"
 msgstr "Скупите све фасцикле"
 
-#: ../mail/em-subscription-editor.c:1887
+#: ../mail/em-subscription-editor.c:1882
 msgid "C_ollapse All"
 msgstr "_Скупи све"
 
-#: ../mail/em-subscription-editor.c:1897
+#: ../mail/em-subscription-editor.c:1892
 msgid "Expand all folders"
 msgstr "Разгранајте све фасцикле"
 
-#: ../mail/em-subscription-editor.c:1898
+#: ../mail/em-subscription-editor.c:1893
 msgid "E_xpand All"
 msgstr "_Разгранај све"
 
-#: ../mail/em-subscription-editor.c:1908
+#: ../mail/em-subscription-editor.c:1903
 msgid "Refresh the folder list"
 msgstr "Освежите списак фасцикли"
 
-#: ../mail/em-subscription-editor.c:1920
+#: ../mail/em-subscription-editor.c:1915
 msgid "Stop the current operation"
 msgstr "Зауставите тренутну операцију"
 
@@ -12534,7 +13969,7 @@ msgstr "Зауставите тренутну операцију"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:106
+#: ../mail/em-utils.c:97
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
@@ -12543,16 +13978,16 @@ msgstr[1] "Сигурно желите да отворите %d поруке о�
 msgstr[2] "Сигурно желите да отворите %d порука одједном?"
 msgstr[3] "Сигурно желите да отворите ову једну поруку?"
 
-#: ../mail/em-utils.c:162
+#: ../mail/em-utils.c:153
 #: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
 msgstr "_Не приказуј више ову поруку"
 
-#: ../mail/em-utils.c:314
+#: ../mail/em-utils.c:305
 msgid "Message Filters"
-msgstr "Филтери порука"
+msgstr "Пропусници порука"
 
-#: ../mail/em-utils.c:1067
+#: ../mail/em-utils.c:1058
 #, c-format
 msgid "Messages from %s"
 msgstr "Поруке које је послао %s"
@@ -12561,90 +13996,83 @@ msgstr "Поруке које је послао %s"
 msgid "Search _Folders"
 msgstr "Фас_цикле претраге"
 
-#: ../mail/em-vfolder-editor-rule.c:391
+#: ../mail/em-vfolder-editor-rule.c:397
 msgid "Add Folder"
 msgstr "Додај фасциклу"
 
-#: ../mail/em-vfolder-editor-rule.c:517
+#: ../mail/em-vfolder-editor-rule.c:523
 msgid "Search Folder Sources"
 msgstr "Извор фасцикле претраге"
 
-#: ../mail/em-vfolder-editor-rule.c:549
+#: ../mail/em-vfolder-editor-rule.c:555
 msgid "Automatically update on any _source folder change"
 msgstr "Сам освежи при _свакој измени изворне фасцикле"
 
-#: ../mail/em-vfolder-editor-rule.c:561
+#: ../mail/em-vfolder-editor-rule.c:567
 msgid "All local folders"
 msgstr "Све локалне фасцикле"
 
-#: ../mail/em-vfolder-editor-rule.c:562
+#: ../mail/em-vfolder-editor-rule.c:568
 msgid "All active remote folders"
 msgstr "Све активне мрежне фасцикле"
 
-#: ../mail/em-vfolder-editor-rule.c:563
+#: ../mail/em-vfolder-editor-rule.c:569
 msgid "All local and active remote folders"
 msgstr "Све локалне и активне мрежне фасцикле"
 
-#: ../mail/em-vfolder-editor-rule.c:564
+#: ../mail/em-vfolder-editor-rule.c:570
 msgid "Specific folders"
 msgstr "Одређене фасцикле"
 
-#: ../mail/em-vfolder-editor-rule.c:602
+#: ../mail/em-vfolder-editor-rule.c:608
 msgid "include subfolders"
 msgstr "укључи подфасцикле"
 
-#: ../mail/importers/elm-importer.c:179
+#: ../mail/importers/elm-importer.c:178
 msgid "Importing Elm data"
 msgstr "Увожење Елм података"
 
-# 48x48/emblems/emblem-mail.icon.in.h:1
-#: ../mail/importers/elm-importer.c:332 ../mail/importers/pine-importer.c:423
-#: ../modules/mail/e-mail-shell-view.c:1074
-#: ../widgets/misc/e-send-options.c:538
-msgid "Mail"
-msgstr "Пошта"
-
-#: ../mail/importers/elm-importer.c:379
+#: ../mail/importers/elm-importer.c:378
 msgid "Evolution Elm importer"
 msgstr "Елм увозник Еволуције"
 
-#: ../mail/importers/elm-importer.c:380
+#: ../mail/importers/elm-importer.c:379
 msgid "Import mail from Elm."
 msgstr "Увози пошту из Елма."
 
-#: ../mail/importers/evolution-mbox-importer.c:142
-#: ../plugins/dbx-import/dbx-importer.c:255
+#: ../mail/importers/evolution-mbox-importer.c:140
+#: ../plugins/dbx-import/dbx-importer.c:250
 msgid "_Destination folder:"
 msgstr "_Одредишна фасцикла:"
 
-#: ../mail/importers/evolution-mbox-importer.c:148
-#: ../plugins/dbx-import/dbx-importer.c:261
-#: ../plugins/pst-import/pst-importer.c:570
+#: ../mail/importers/evolution-mbox-importer.c:146
+#: ../plugins/dbx-import/dbx-importer.c:256
+#: ../plugins/pst-import/pst-importer.c:567
 msgid "Select folder"
 msgstr "Изаберите фасциклу"
 
-#: ../mail/importers/evolution-mbox-importer.c:149
-#: ../plugins/dbx-import/dbx-importer.c:262
-#: ../plugins/pst-import/pst-importer.c:571
+#: ../mail/importers/evolution-mbox-importer.c:147
+#: ../plugins/dbx-import/dbx-importer.c:257
+#: ../plugins/pst-import/pst-importer.c:568
 msgid "Select folder to import into"
 msgstr "Изаберите фасциклу за увоз"
 
-#: ../mail/importers/evolution-mbox-importer.c:439
+#: ../mail/importers/evolution-mbox-importer.c:437
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Наслов"
 
-#: ../mail/importers/evolution-mbox-importer.c:444
+#: ../mail/importers/evolution-mbox-importer.c:442
 msgctxt "mboxImp"
 msgid "From"
 msgstr "Шаље"
 
-#: ../mail/importers/evolution-mbox-importer.c:488
-#: ../shell/e-shell-utils.c:195
+#: ../mail/importers/evolution-mbox-importer.c:486
+#: ../shell/e-shell-utils.c:193
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Беркли поштанско сандуче (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:489
+#: ../mail/importers/evolution-mbox-importer.c:487
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Увозник за фасцикле облика Беркли поштанског сандучета"
 
@@ -12654,8 +14082,8 @@ msgstr "Увожење поштанског сандучета"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
-#: ../plugins/dbx-import/dbx-importer.c:616
-#: ../plugins/pst-import/pst-importer.c:784
+#: ../plugins/dbx-import/dbx-importer.c:612
+#: ../plugins/pst-import/pst-importer.c:781
 #, c-format
 msgid "Importing '%s'"
 msgstr "Увозим „%s“"
@@ -12665,43 +14093,39 @@ msgstr "Увозим „%s“"
 msgid "Scanning %s"
 msgstr "Претражујем „%s“"
 
-#: ../mail/importers/pine-importer.c:251
+#: ../mail/importers/pine-importer.c:250
 msgid "Importing Pine data"
 msgstr "Увожење Пине податке"
 
-#: ../mail/importers/pine-importer.c:430
-msgid "Address Book"
-msgstr "Адресар"
-
-#: ../mail/importers/pine-importer.c:478
+#: ../mail/importers/pine-importer.c:477
 msgid "Evolution Pine importer"
 msgstr "Пине увозник Еволуције"
 
-#: ../mail/importers/pine-importer.c:479
+#: ../mail/importers/pine-importer.c:478
 msgid "Import mail from Pine."
 msgstr "Увози пошту из програма Пине."
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Пошта за %s"
 
-#: ../mail/mail-autofilter.c:229 ../mail/mail-autofilter.c:272
+#: ../mail/mail-autofilter.c:226 ../mail/mail-autofilter.c:269
 #, c-format
 msgid "Mail from %s"
 msgstr "Пошта од %s"
 
-#: ../mail/mail-autofilter.c:255
+#: ../mail/mail-autofilter.c:252
 #, c-format
 msgid "Subject is %s"
 msgstr "Наслов је %s"
 
-#: ../mail/mail-autofilter.c:296
+#: ../mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s дописна листа"
 
-#: ../mail/mail-autofilter.c:406
+#: ../mail/mail-autofilter.c:403
 msgid "Add Filter Rule"
 msgstr "Додај правило филтрирања"
 
@@ -12710,7 +14134,7 @@ msgstr "Додај правило филтрирања"
 #. * 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.
-#: ../mail/mail-autofilter.c:513
+#: ../mail/mail-autofilter.c:510
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -12823,16 +14247,16 @@ msgid "_Languages"
 msgstr "_Језици"
 
 #: ../mail/mail-config.ui.h:23
+msgid "Languages Table"
+msgstr "Табела језика"
+
+#: ../mail/mail-config.ui.h:24
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "Списак језика овде осликава само оне језике за које имате инсталиран речник."
 
-#: ../mail/mail-config.ui.h:24
-msgid "Languages Table"
-msgstr "Табела језика"
-
 #: ../mail/mail-config.ui.h:26
 msgid "Check spelling while I _type"
 msgstr "Провери правопис док _куцам"
@@ -12959,7 +14383,7 @@ msgid "No _Proxy for:"
 msgstr "Без _посредника за:"
 
 #: ../mail/mail-config.ui.h:64
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:614
 msgid "Port:"
 msgstr "Порт:"
 
@@ -13040,8 +14464,9 @@ msgid "Delete Mail"
 msgstr "Обриши пошту"
 
 #: ../mail/mail-config.ui.h:85
-msgid "Empty trash folders on e_xit"
-msgstr "Испразни фасцикле са _смећем када изађеш"
+#| msgid "Empty trash folders on e_xit"
+msgid "Empty _trash folders"
+msgstr "Испразни фасцикле _смећа"
 
 #: ../mail/mail-config.ui.h:86
 msgid "Confirm _when expunging a folder"
@@ -13101,7 +14526,7 @@ msgid "Mail Headers Table"
 msgstr "Табела заглавља поште"
 
 #: ../mail/mail-config.ui.h:101
-#: ../modules/addressbook/autocompletion-config.c:90
+#: ../modules/addressbook/autocompletion-config.c:86
 #: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Date/Time Format"
 msgstr "Формат датум/време"
@@ -13111,8 +14536,9 @@ msgid "Check incoming _messages for junk"
 msgstr "Провери има ли ђубрета у _пристиглој пошти"
 
 #: ../mail/mail-config.ui.h:104
-msgid "Delete junk messages on e_xit"
-msgstr "Обриши ђубре при и_злазу"
+#| msgid "Delete junk messages on e_xit"
+msgid "_Delete junk messages"
+msgstr "_Обриши поруке ђубра"
 
 #: ../mail/mail-config.ui.h:105
 msgid "Check cu_stom headers for junk"
@@ -13132,17 +14558,17 @@ msgstr ""
 "Опција се занемарује уколико је пронађено поклапање са произвољним заглављем "
 "ђубрета."
 
-#: ../mail/mail-config.ui.h:110 ../modules/addressbook/ldap-config.ui.h:3
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:237
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:161
+#: ../mail/mail-config.ui.h:110
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:225
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:159
 msgid "No encryption"
 msgstr "Без шифровања"
 
-#: ../mail/mail-config.ui.h:111 ../modules/addressbook/ldap-config.ui.h:1
+#: ../mail/mail-config.ui.h:111
 msgid "TLS encryption"
 msgstr "ТЛС шифровање"
 
-#: ../mail/mail-config.ui.h:112 ../modules/addressbook/ldap-config.ui.h:2
+#: ../mail/mail-config.ui.h:112
 msgid "SSL encryption"
 msgstr "ССЛ шифровање"
 
@@ -13425,7 +14851,7 @@ msgstr ""
 "Сигурно желите трајно да уклоните све обрисане поруке из свих фасцикли?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1233
+#: ../modules/mail/e-mail-shell-view-actions.c:1286
 msgid "_Empty Trash"
 msgstr "_Избаци смеће"
 
@@ -13576,13 +15002,15 @@ msgstr "Не могу да преместим фасциклу „{0}“ у „{
 
 # mail:no-copy-folder-nostore secondary
 #: ../mail/mail.error.xml.h:74
-msgid "Cannot open source \"{2}\"."
-msgstr "Не могу да отворим извор „{2}“."
+#| msgid "Cannot open source \"{2}\"."
+msgid "Cannot open source folder. Error: {2}"
+msgstr "Не могу да отворим фасциклу извора. Грешка: {2}"
 
 # mail:no-copy-folder-to-nostore secondary
 #: ../mail/mail.error.xml.h:75
-msgid "Cannot open target \"{2}\"."
-msgstr "Не могу да отворим циљ „{2}“."
+#| msgid "Cannot open target \"{2}\"."
+msgid "Cannot open target folder. Error: {2}"
+msgstr "Не могу да отворим фасциклу мете. Грешка: {2}"
 
 # mail:no-copy-folder-to-nostore primary
 #: ../mail/mail.error.xml.h:76
@@ -13593,9 +15021,11 @@ msgstr "Не могу да умножим фасциклу „{0}“ у „{1}�
 msgid "Cannot create folder \"{0}\"."
 msgstr "Не могу да направим фасциклу „{0}“."
 
+# mail:no-move-folder-to-nostore primary
 #: ../mail/mail.error.xml.h:78
-msgid "Cannot open source \"{1}\"."
-msgstr "Не могу да отворим извор „{1}“"
+#| msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgid "Cannot open folder. Error: {1}"
+msgstr "Не могу да отворим фасциклу. Грешка: {1}"
 
 # mail:account-notunique primary
 #: ../mail/mail.error.xml.h:79
@@ -13644,7 +15074,7 @@ msgid "Do _Not Disable"
 msgstr "Немој _искључити"
 
 #: ../mail/mail.error.xml.h:90
-#: ../plugins/publish-calendar/publish-calendar.c:626
+#: ../plugins/publish-calendar/publish-calendar.c:635
 msgid "_Disable"
 msgstr "_Искључи"
 
@@ -13674,7 +15104,7 @@ msgstr "Фасцикле претраге су аутоматски ажурир
 
 #: ../mail/mail.error.xml.h:97
 msgid "Mail filters automatically updated."
-msgstr "Филтери поште су аутоматски ажурирани."
+msgstr "Пропусници поште су аутоматски ажурирани."
 
 #: ../mail/mail.error.xml.h:98
 msgid "Missing folder."
@@ -13689,8 +15119,9 @@ msgid "You must name this Search Folder."
 msgstr "Морате да дате назив овој фасцикли претраге."
 
 #: ../mail/mail.error.xml.h:102
-msgid "No sources selected."
-msgstr "Извори нису изабрани."
+#| msgid "No sources selected."
+msgid "No folder selected."
+msgstr "Није изабрана ниједна фасцикла."
 
 #: ../mail/mail.error.xml.h:103
 msgid ""
@@ -13935,7 +15366,7 @@ msgstr "Нисам успео да пронађем дуплиране пору�
 
 #: ../mail/mail.error.xml.h:158
 msgid "Failed to retrieve messages."
-msgstr "Нисам успео да довучем поруке"
+msgstr "Нисам успео да довучем поруке."
 
 #: ../mail/mail.error.xml.h:159
 msgid "Failed to remove attachments from messages."
@@ -13974,128 +15405,125 @@ msgstr "Штампач је одговорио „{0}“."
 msgid "Could not perform this operation on {0}."
 msgstr "Не могу да извршим ову радњу над „{0}“."
 
-#: ../mail/mail-send-recv.c:203
+#: ../mail/mail-send-recv.c:202
 msgid "Canceling..."
 msgstr "Отказујем..."
 
-#: ../mail/mail-send-recv.c:547
+#: ../mail/mail-send-recv.c:546
 msgid "Send & Receive Mail"
 msgstr "Слање и примање поште"
 
-#: ../mail/mail-send-recv.c:563
+#: ../mail/mail-send-recv.c:562
 msgid "Cancel _All"
 msgstr "Откажи _све"
 
-#: ../mail/mail-send-recv.c:656 ../mail/mail-send-recv.c:1040
+#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:1041
 msgid "Updating..."
 msgstr "Освежавам..."
 
-#: ../mail/mail-send-recv.c:656 ../mail/mail-send-recv.c:737
+#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:736
 msgid "Waiting..."
 msgstr "Чекам..."
 
 #: ../mail/mail-send-recv.c:1020
 #, c-format
-msgid "Checking for new mail"
-msgstr "Вршим проверу за новом поштом"
+#| msgid "Checking for new mail"
+msgid "Checking for new mail at '%s'"
+msgstr "Вршим проверу за новом поштом на „%s“"
 
-#: ../mail/mail-vfolder-ui.c:79
+#: ../mail/mail-vfolder-ui.c:78
 msgid "Search Folders"
 msgstr "Фасцикле претраге"
 
-#: ../mail/mail-vfolder-ui.c:159
+#: ../mail/mail-vfolder-ui.c:158
 msgid "Edit Search Folder"
 msgstr "Уреди фасциклу претраге"
 
-#: ../mail/mail-vfolder-ui.c:280
+#: ../mail/mail-vfolder-ui.c:279
 msgid "New Search Folder"
 msgstr "Нова фасцикла претраге"
 
-#: ../mail/message-list.c:1262
+#: ../mail/message-list.c:1244
 msgid "Unseen"
 msgstr "Невиђено"
 
-#: ../mail/message-list.c:1263
+#: ../mail/message-list.c:1245
 msgid "Seen"
 msgstr "Виђено"
 
-#: ../mail/message-list.c:1264
+#: ../mail/message-list.c:1246
 msgid "Answered"
 msgstr "Одговорено"
 
-#: ../mail/message-list.c:1265
+#: ../mail/message-list.c:1247
 msgid "Forwarded"
 msgstr "Прослеђено"
 
-#: ../mail/message-list.c:1266
+#: ../mail/message-list.c:1248
 msgid "Multiple Unseen Messages"
 msgstr "Вишеструке невиђене поруке"
 
-#: ../mail/message-list.c:1267
+#: ../mail/message-list.c:1249
 msgid "Multiple Messages"
 msgstr "Вишеструке поруке"
 
-#: ../mail/message-list.c:1271
+#: ../mail/message-list.c:1253
 msgid "Lowest"
 msgstr "Најниже"
 
-#: ../mail/message-list.c:1272
+#: ../mail/message-list.c:1254
 msgid "Lower"
 msgstr "Ниже"
 
-#: ../mail/message-list.c:1276
+#: ../mail/message-list.c:1258
 msgid "Higher"
 msgstr "Више"
 
-#: ../mail/message-list.c:1277
+#: ../mail/message-list.c:1259
 msgid "Highest"
 msgstr "Највише"
 
-#: ../mail/message-list.c:1900 ../widgets/table/e-cell-date.c:51
-msgid "?"
-msgstr "?"
-
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1907 ../modules/itip-formatter/itip-view.c:249
+#: ../mail/message-list.c:1889 ../modules/itip-formatter/itip-view.c:242
 msgid "Today %l:%M %p"
 msgstr "Данас у %l:%M %p"
 
-#: ../mail/message-list.c:1916
+#: ../mail/message-list.c:1898
 msgid "Yesterday %l:%M %p"
 msgstr "Јуче у %l:%M %p"
 
-#: ../mail/message-list.c:1928
+#: ../mail/message-list.c:1910
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1936
+#: ../mail/message-list.c:1918
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1938
+#: ../mail/message-list.c:1920
 msgid "%b %d %Y"
 msgstr "%d. %b %Y."
 
-#: ../mail/message-list.c:2769
+#: ../mail/message-list.c:2751
 msgid "Select all visible messages"
 msgstr "Изабери све видљиве поруке"
 
-#: ../mail/message-list.c:2907 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:2889 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Поруке"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4132
+#: ../mail/message-list.c:4114
 msgid "Follow-up"
 msgstr "Следи"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4634 ../mail/message-list.c:5038
+#: ../mail/message-list.c:4616 ../mail/message-list.c:5020
 msgid "Generating message list"
 msgstr "Прављење листе порука"
 
-#: ../mail/message-list.c:4868
+#: ../mail/message-list.c:4850
 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 "
@@ -14107,7 +15535,7 @@ msgstr ""
 "покрените нову претрагу било чишћењем исте помоћу ставке изборника „Претрага—"
 ">Очисти“ или изменивши горњи упит."
 
-#: ../mail/message-list.c:4873
+#: ../mail/message-list.c:4855
 msgid "There are no messages in this folder."
 msgstr "Нема порука у овој фасцикли."
 
@@ -14132,8 +15560,9 @@ msgid "Due By"
 msgstr "Рок"
 
 #: ../mail/message-list.etspec.h:18
-msgid "Sent Messages"
-msgstr "Послате поруке"
+#| msgid "Messages"
+msgid "Messages To"
+msgstr "Поруке"
 
 #: ../mail/message-list.etspec.h:20
 msgid "Subject - Trimmed"
@@ -14144,49 +15573,49 @@ msgid "Subject or Addresses contains"
 msgstr "Наслов или адресе садрже"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1698
+#: ../modules/mail/e-mail-shell-view-actions.c:1762
 msgid "Recipients contain"
 msgstr "Примаоци садрже"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1691
+#: ../modules/mail/e-mail-shell-view-actions.c:1755
 msgid "Message contains"
 msgstr "Порука садржи"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1712
+#: ../modules/mail/e-mail-shell-view-actions.c:1776
 msgid "Subject contains"
 msgstr "Наслов садржи"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1705
+#: ../modules/mail/e-mail-shell-view-actions.c:1769
 msgid "Sender contains"
 msgstr "Пошиљалац садржи"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1684
+#: ../modules/mail/e-mail-shell-view-actions.c:1748
 msgid "Body contains"
 msgstr "Тело садржи"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/addressbook/autocompletion-config.c:96
-#: ../modules/mail/em-mailer-prefs.c:1143
+#: ../modules/addressbook/autocompletion-config.c:92
+#: ../modules/mail/em-mailer-prefs.c:1139
 msgid "_Table column:"
 msgstr "Колона _табеле:"
 
-#: ../modules/addressbook/autocompletion-config.c:99
+#: ../modules/addressbook/autocompletion-config.c:95
 msgid "Address formatting"
 msgstr "Обликовање адресе"
 
-#: ../modules/addressbook/autocompletion-config.c:102
+#: ../modules/addressbook/autocompletion-config.c:98
 msgid "_Format address according to standard of its destination country"
 msgstr "_Обликуј адресу према стандарду државе њеног одредишта"
 
-#: ../modules/addressbook/autocompletion-config.c:111
+#: ../modules/addressbook/autocompletion-config.c:107
 msgid "Autocompletion"
 msgstr "Самодовршавање"
 
-#: ../modules/addressbook/autocompletion-config.c:114
+#: ../modules/addressbook/autocompletion-config.c:110
 msgid "Always _show address of the autocompleted contact"
 msgstr "Увек _приказуј адресу самодопуњеног контакта"
 
@@ -14210,297 +15639,285 @@ msgstr "Подаци за ступање у везу"
 msgid "Contact information for %s"
 msgstr "Подаци о контакту за %s"
 
-#: ../modules/addressbook/e-book-shell-backend.c:229
-#: ../modules/addressbook/e-book-shell-view-actions.c:131
+#: ../modules/addressbook/e-book-shell-backend.c:254
+#: ../modules/addressbook/e-book-shell-view-actions.c:125
 msgid "New Address Book"
 msgstr "Нови адресар"
 
-#: ../modules/addressbook/e-book-shell-backend.c:238
+#: ../modules/addressbook/e-book-shell-backend.c:263
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Контакт"
 
-#: ../modules/addressbook/e-book-shell-backend.c:240
-#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/addressbook/e-book-shell-backend.c:265
+#: ../modules/addressbook/e-book-shell-view-actions.c:898
 msgid "Create a new contact"
 msgstr "Направите нови контакт"
 
-#: ../modules/addressbook/e-book-shell-backend.c:245
+#: ../modules/addressbook/e-book-shell-backend.c:270
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Ли_ста контакта"
 
-#: ../modules/addressbook/e-book-shell-backend.c:247
-#: ../modules/addressbook/e-book-shell-view-actions.c:911
+#: ../modules/addressbook/e-book-shell-backend.c:272
+#: ../modules/addressbook/e-book-shell-view-actions.c:905
 msgid "Create a new contact list"
 msgstr "Направите нови списак контакта"
 
-#: ../modules/addressbook/e-book-shell-backend.c:255
+#: ../modules/addressbook/e-book-shell-backend.c:280
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Адресар"
 
-#: ../modules/addressbook/e-book-shell-backend.c:257
-#: ../modules/addressbook/e-book-shell-view-actions.c:834
+#: ../modules/addressbook/e-book-shell-backend.c:282
+#: ../modules/addressbook/e-book-shell-view-actions.c:828
 msgid "Create a new address book"
 msgstr "Направите нови адресар"
 
-#: ../modules/addressbook/e-book-shell-backend.c:274
-#: ../modules/addressbook/e-book-shell-view.c:356
-msgid "Contacts"
-msgstr "Контакти"
-
-#: ../modules/addressbook/e-book-shell-backend.c:285
+#: ../modules/addressbook/e-book-shell-backend.c:310
 msgid "Certificates"
 msgstr "Уверења"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:204
+#: ../modules/addressbook/e-book-shell-view-actions.c:198
 msgid "Address Book Properties"
 msgstr "Поставке адресара"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:386
-#: ../modules/addressbook/e-book-shell-view-actions.c:682
+#: ../modules/addressbook/e-book-shell-view-actions.c:380
+#: ../modules/addressbook/e-book-shell-view-actions.c:676
 msgid "Save as vCard"
 msgstr "Сачувајте као вКарту"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
 msgid "Co_py All Contacts To..."
 msgstr "Умножи _све контакте у..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:813
+#: ../modules/addressbook/e-book-shell-view-actions.c:807
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Умножите контакте изабраног адресара у други"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:818
+#: ../modules/addressbook/e-book-shell-view-actions.c:812
 msgid "D_elete Address Book"
 msgstr "О_бриши адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:820
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
 msgid "Delete the selected address book"
 msgstr "Обришите изабрани адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:825
+#: ../modules/addressbook/e-book-shell-view-actions.c:819
 msgid "Mo_ve All Contacts To..."
 msgstr "Премести _све контакте у..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:827
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
 msgid "Move the contacts of the selected address book to another"
 msgstr "Преместите контакте изабраног адресара у други"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:832
+#: ../modules/addressbook/e-book-shell-view-actions.c:826
 msgid "_New Address Book"
 msgstr "_Нови адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:833
 msgid "Address _Book Properties"
 msgstr "Подешавања адреса_ра"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:835
 msgid "Show properties of the selected address book"
 msgstr "Прикажите својства изабраног адресара"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:846
+#: ../modules/addressbook/e-book-shell-view-actions.c:840
 msgid "Address Book _Map"
 msgstr "_Мапа адресара"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:848
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Show map with all contacts from selected address book"
 msgstr "Прикажите мапу са свим контактима из изабраних адресара"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:853
-#: ../modules/calendar/e-cal-shell-view-actions.c:1448
-#: ../modules/calendar/e-memo-shell-view-actions.c:665
-#: ../modules/calendar/e-task-shell-view-actions.c:789
-#: ../modules/mail/e-mail-shell-view-actions.c:1317
+#: ../modules/addressbook/e-book-shell-view-actions.c:847
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-memo-shell-view-actions.c:664
+#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/mail/e-mail-shell-view-actions.c:1377
 msgid "_Rename..."
 msgstr "_Преименуј..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:855
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
 msgid "Rename the selected address book"
 msgstr "Преименујте изабрани адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:856
 msgid "Stop loading"
 msgstr "Прекини учитавање"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
+#: ../modules/addressbook/e-book-shell-view-actions.c:861
 msgid "_Copy Contact To..."
 msgstr "_Умножи контакт у..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
 msgid "Copy selected contacts to another address book"
 msgstr "Умножите изабране контакте у други адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:874
+#: ../modules/addressbook/e-book-shell-view-actions.c:868
 msgid "_Delete Contact"
 msgstr "_Уклони Контакт"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:881
+#: ../modules/addressbook/e-book-shell-view-actions.c:875
 msgid "_Find in Contact..."
 msgstr "_Пронађи у контакту..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:883
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
 msgid "Search for text in the displayed contact"
 msgstr "Претражите текст у приказаном контакту"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:888
+#: ../modules/addressbook/e-book-shell-view-actions.c:882
 msgid "_Forward Contact..."
 msgstr "_Проследи контакт..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:890
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
 msgid "Send selected contacts to another person"
 msgstr "Пошаљите изабране контакте другој особи"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:895
+#: ../modules/addressbook/e-book-shell-view-actions.c:889
 msgid "_Move Contact To..."
 msgstr "_Премести контакт у..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/addressbook/e-book-shell-view-actions.c:891
 msgid "Move selected contacts to another address book"
 msgstr "Преместите изабране контакте у други адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:902
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
 msgid "_New Contact..."
 msgstr "Нови кон_такт..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:909
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
 msgid "New Contact _List..."
 msgstr "Нова _листа контакта..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:916
+#: ../modules/addressbook/e-book-shell-view-actions.c:910
 msgid "_Open Contact"
 msgstr "_Отвори контакт"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:918
+#: ../modules/addressbook/e-book-shell-view-actions.c:912
 msgid "View the current contact"
 msgstr "Прегледајте текући контакт"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:923
+#: ../modules/addressbook/e-book-shell-view-actions.c:917
 msgid "_Send Message to Contact..."
 msgstr "_Пошаљи поруку контакту..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:925
+#: ../modules/addressbook/e-book-shell-view-actions.c:919
 msgid "Send a message to the selected contacts"
 msgstr "Пошаљите поруку изабраним контактима"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:932
-#: ../modules/calendar/e-cal-shell-view-actions.c:1604
-#: ../modules/calendar/e-task-shell-view-actions.c:847
+#: ../modules/addressbook/e-book-shell-view-actions.c:926
+#: ../modules/calendar/e-cal-shell-view-actions.c:1603
+#: ../modules/calendar/e-task-shell-view-actions.c:846
 msgid "_Actions"
 msgstr "_Радње"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:939
-#: ../modules/calendar/e-memo-shell-view-actions.c:702
-#: ../modules/calendar/e-task-shell-view-actions.c:854
-#: ../modules/mail/e-mail-shell-view-actions.c:1475
+#: ../modules/addressbook/e-book-shell-view-actions.c:933
+#: ../modules/calendar/e-memo-shell-view-actions.c:701
+#: ../modules/calendar/e-task-shell-view-actions.c:853
+#: ../modules/mail/e-mail-shell-view-actions.c:1535
 msgid "_Preview"
 msgstr "_Преглед"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:948
-#: ../modules/calendar/e-cal-shell-view-actions.c:1621
-#: ../modules/calendar/e-memo-shell-view-actions.c:715
-#: ../modules/calendar/e-task-shell-view-actions.c:867
+#: ../modules/addressbook/e-book-shell-view-actions.c:942
+#: ../modules/calendar/e-cal-shell-view-actions.c:1620
+#: ../modules/calendar/e-memo-shell-view-actions.c:714
+#: ../modules/calendar/e-task-shell-view-actions.c:866
 msgid "_Delete"
 msgstr "_Обриши"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:952
-#: ../modules/mail/e-mail-shell-view-actions.c:1240
+#: ../modules/addressbook/e-book-shell-view-actions.c:946
+#: ../modules/mail/e-mail-shell-view-actions.c:1293
 msgid "_Properties"
 msgstr "_Својства"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
+#: ../modules/addressbook/e-book-shell-view-actions.c:950
 msgid "Address Book Map"
 msgstr "Мапа адресара"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:988
+#: ../modules/addressbook/e-book-shell-view-actions.c:982
 msgid "Contact _Preview"
 msgstr "Пре_глед контакта"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:990
+#: ../modules/addressbook/e-book-shell-view-actions.c:984
 msgid "Show contact preview window"
 msgstr "Прикажите прозор за преглед контакта"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:996
+#: ../modules/addressbook/e-book-shell-view-actions.c:990
 msgid "Show _Maps"
 msgstr "Прикажи _мапе"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:998
+#: ../modules/addressbook/e-book-shell-view-actions.c:992
 msgid "Show maps in contact preview window"
 msgstr "Прикажите мапе у прозору за преглед контаката"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1017
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:936
-#: ../modules/mail/e-mail-shell-view-actions.c:1601
+#: ../modules/addressbook/e-book-shell-view-actions.c:1011
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:935
+#: ../modules/mail/e-mail-shell-view-actions.c:1665
 msgid "_Classic View"
 msgstr "_Класични приказ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1019
+#: ../modules/addressbook/e-book-shell-view-actions.c:1013
 msgid "Show contact preview below the contact list"
 msgstr "Прикажите преглед контакта испод контакт листе"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1024
-#: ../modules/calendar/e-memo-shell-view-actions.c:779
-#: ../modules/calendar/e-task-shell-view-actions.c:943
-#: ../modules/mail/e-mail-shell-view-actions.c:1608
+#: ../modules/addressbook/e-book-shell-view-actions.c:1018
+#: ../modules/calendar/e-memo-shell-view-actions.c:778
+#: ../modules/calendar/e-task-shell-view-actions.c:942
+#: ../modules/mail/e-mail-shell-view-actions.c:1672
 msgid "_Vertical View"
 msgstr "_Усправни преглед"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1026
+#: ../modules/addressbook/e-book-shell-view-actions.c:1020
 msgid "Show contact preview alongside the contact list"
 msgstr "Прикажите преглед контакта поред контакт листе"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1034
-#: ../modules/calendar/e-cal-shell-view-actions.c:1760
-#: ../modules/calendar/e-memo-shell-view-actions.c:789
-#: ../modules/calendar/e-task-shell-view-actions.c:960
-msgid "Any Category"
-msgstr "Било која категорија"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:1041
-#: ../modules/calendar/e-cal-shell-view-actions.c:1781
-#: ../modules/calendar/e-memo-shell-view-actions.c:796
-#: ../modules/calendar/e-task-shell-view-actions.c:995
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../modules/calendar/e-cal-shell-view-actions.c:1780
+#: ../modules/calendar/e-memo-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:994
 msgid "Unmatched"
 msgstr "Не одговара"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1051
-#: ../modules/calendar/e-cal-shell-view-actions.c:1791
-#: ../modules/calendar/e-memo-shell-view-actions.c:806
-#: ../modules/calendar/e-task-shell-view-actions.c:1005
-#: ../modules/mail/e-mail-shell-view-actions.c:1677
-#: ../shell/e-shell-content.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:1045
+#: ../modules/calendar/e-cal-shell-view-actions.c:1790
+#: ../modules/calendar/e-memo-shell-view-actions.c:805
+#: ../modules/calendar/e-task-shell-view-actions.c:1004
+#: ../modules/mail/e-mail-shell-view-actions.c:1741
+#: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Напредна претрага"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1084
+#: ../modules/addressbook/e-book-shell-view-actions.c:1078
 msgid "Print all shown contacts"
 msgstr "Штампај све приказане контакте"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1091
+#: ../modules/addressbook/e-book-shell-view-actions.c:1085
 msgid "Preview the contacts to be printed"
 msgstr "Преглед контаката пред штампу"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1098
+#: ../modules/addressbook/e-book-shell-view-actions.c:1092
 msgid "Print selected contacts"
 msgstr "Штампа изабране контакте"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1113
+#: ../modules/addressbook/e-book-shell-view-actions.c:1107
 msgid "S_ave Address Book as vCard"
 msgstr "_Сачувај адресар као вКарту"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1115
+#: ../modules/addressbook/e-book-shell-view-actions.c:1109
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Сачувајте контакте изабраног адресара као вКарту"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1121
-#: ../modules/addressbook/e-book-shell-view-actions.c:1131
+#: ../modules/addressbook/e-book-shell-view-actions.c:1115
+#: ../modules/addressbook/e-book-shell-view-actions.c:1125
 msgid "_Save as vCard..."
 msgstr "_Сачувај као вКарту..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1123
+#: ../modules/addressbook/e-book-shell-view-actions.c:1117
 msgid "Save selected contacts as a vCard"
 msgstr "Сачувај изабране контакте као ВКарту"
 
@@ -14524,121 +15941,15 @@ msgstr "_Пошаљи поруку на листу"
 msgid "_Send Message to Contact"
 msgstr "_Пошаљи поруку контакту"
 
-#: ../modules/addressbook/ldap-config.ui.h:4
-msgid "Anonymously"
-msgstr "Анонимно"
-
-#: ../modules/addressbook/ldap-config.ui.h:5
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:674
-msgid "Using email address"
-msgstr "Користи адресу ел. поште"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
-msgid "Using distinguished name (DN)"
-msgstr "Користи посебан назив (DN)"
-
-#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:8
-msgid "One"
-msgstr "Један"
-
-#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:10
-msgid "Sub"
-msgstr "Под"
-
-#: ../modules/addressbook/ldap-config.ui.h:11
-msgid "Supported Search Bases"
-msgstr "Подржане базе за претрагу"
-
-#: ../modules/addressbook/ldap-config.ui.h:13
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:113
-msgid "_Port:"
-msgstr "_Порт:"
-
-#: ../modules/addressbook/ldap-config.ui.h:14
-msgid "Ser_ver:"
-msgstr "С_ервер:"
-
-#: ../modules/addressbook/ldap-config.ui.h:15
-msgid "Use secure _connection:"
-msgstr "_Користи сигурну везу:"
-
-#: ../modules/addressbook/ldap-config.ui.h:16
-msgid "_Login method:"
-msgstr "Метод _пријаве:"
-
-#: ../modules/addressbook/ldap-config.ui.h:17
-msgid "Lo_gin:"
-msgstr "При_јава:"
-
-#: ../modules/addressbook/ldap-config.ui.h:18
-msgid "Search _base:"
-msgstr "Основа _претраге:"
-
-#: ../modules/addressbook/ldap-config.ui.h:19
-msgid "_Search scope:"
-msgstr "Обим п_ретраге:"
-
-#: ../modules/addressbook/ldap-config.ui.h:20
-msgid "_Find Possible Search Bases"
-msgstr "_Нађи могуће базе за претрагу"
-
-#: ../modules/addressbook/ldap-config.ui.h:21
-msgid "S_earch filter:"
-msgstr "_Филтер претраге:"
-
-#: ../modules/addressbook/ldap-config.ui.h:22
-msgid "Search Filter"
-msgstr "Филтер претраге"
-
-#: ../modules/addressbook/ldap-config.ui.h:23
-msgid ""
-"Search filter is the type of object to be searched for. If this is not "
-"modified, the default search will be performed on the type \"person\"."
-msgstr ""
-"Филтер претраге је врста објекта за којим се трага. Ако се ово не измени, "
-"подразумевана претрага ће бити обављена на врсти „особа“."
-
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../modules/addressbook/ldap-config.ui.h:25
-msgid "1"
-msgstr "1"
-
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../modules/addressbook/ldap-config.ui.h:27
-msgid "5"
-msgstr "5"
-
-#: ../modules/addressbook/ldap-config.ui.h:30
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:830
-msgid "contacts"
-msgstr "контакти"
-
-#: ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Timeout:"
-msgstr "_Временски рок:"
-
-#: ../modules/addressbook/ldap-config.ui.h:32
-msgid "_Download limit:"
-msgstr "Ограничење за _преузимање:"
-
-#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:34
-msgid "B_rowse this book until limit reached"
-msgstr "Пре_гледа овај адресар док се не достигне лимит"
-
-#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:310
+#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:309
 msgid "Audio Player"
 msgstr "Звучни уређај"
 
-#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:316
+#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:310
 msgid "Play the attachment in embedded audio player"
 msgstr "Пусти прилог у уграђеном програму"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:167
+#: ../modules/backup-restore/e-mail-config-restore-page.c:165
 msgid ""
 "You can restore Evolution from a backup file.\n"
 "\n"
@@ -14648,17 +15959,17 @@ msgstr ""
 "\n"
 "То ће повратити све ваше личне податке, подешавања пропусника поште, итд."
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:182
+#: ../modules/backup-restore/e-mail-config-restore-page.c:180
 msgid "_Restore from a backup file:"
 msgstr "_Врати из датотеке резерве:"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:193
+#: ../modules/backup-restore/e-mail-config-restore-page.c:191
 msgid "Choose a backup file to restore"
 msgstr "Изаберите датотеку резерве за повраћај"
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/backup-restore/e-mail-config-restore-page.c:313
+#: ../modules/backup-restore/e-mail-config-restore-page.c:311
 #: ../modules/backup-restore/e-mail-config-restore-ready-page.c:57
 msgid "Restore from Backup"
 msgstr "Врати из резерве"
@@ -14696,108 +16007,108 @@ msgstr "_Врати податке Еволуције..."
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Вратите податке и поставке Еволуције из архиве"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:83
+#: ../modules/backup-restore/evolution-backup-tool.c:84
 msgid "Back up Evolution directory"
 msgstr "Директоријум за резерву Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:85
+#: ../modules/backup-restore/evolution-backup-tool.c:86
 msgid "Restore Evolution directory"
 msgstr "Директоријум за повраћај Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:87
+#: ../modules/backup-restore/evolution-backup-tool.c:88
 msgid "Check Evolution Back up"
 msgstr "Провери резерву Еволуције"
 
 # shell:noshell-reason title
-#: ../modules/backup-restore/evolution-backup-tool.c:89
+#: ../modules/backup-restore/evolution-backup-tool.c:90
 msgid "Restart Evolution"
 msgstr "Поново покреће Еволуцију"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:91
+#: ../modules/backup-restore/evolution-backup-tool.c:92
 msgid "With Graphical User Interface"
 msgstr "Са графичким окружењем"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:315
-#: ../modules/backup-restore/evolution-backup-tool.c:469
+#: ../modules/backup-restore/evolution-backup-tool.c:317
+#: ../modules/backup-restore/evolution-backup-tool.c:511
 msgid "Shutting down Evolution"
 msgstr "Гашење Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:324
+#: ../modules/backup-restore/evolution-backup-tool.c:326
 msgid "Backing Evolution accounts and settings"
 msgstr "Израдите резервну копију налога и поставке Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:341
+#: ../modules/backup-restore/evolution-backup-tool.c:343
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Израда резервне копије података Еволуције (пошта, календари, задаци, белешке)"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:357
+#: ../modules/backup-restore/evolution-backup-tool.c:359
 msgid "Back up complete"
 msgstr "Израда резервне копије је завршена"
 
 # shell:noshell-reason title
-#: ../modules/backup-restore/evolution-backup-tool.c:364
-#: ../modules/backup-restore/evolution-backup-tool.c:654
+#: ../modules/backup-restore/evolution-backup-tool.c:366
+#: ../modules/backup-restore/evolution-backup-tool.c:698
 msgid "Restarting Evolution"
 msgstr "Поновно покретање Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:475
+#: ../modules/backup-restore/evolution-backup-tool.c:517
 msgid "Back up current Evolution data"
 msgstr "Направите резерву тренутних података Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:483
+#: ../modules/backup-restore/evolution-backup-tool.c:524
 msgid "Extracting files from back up"
 msgstr "Извлачим датотеке из резервне копије"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:570
+#: ../modules/backup-restore/evolution-backup-tool.c:606
 msgid "Loading Evolution settings"
 msgstr "Учитавам подешавања Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:624
+#: ../modules/backup-restore/evolution-backup-tool.c:672
 msgid "Removing temporary back up files"
 msgstr "Уклањање привремених резервних датотека"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:636
+#: ../modules/backup-restore/evolution-backup-tool.c:683
 msgid "Reloading registry service"
 msgstr "Поново учитавам услугу завођења"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:861
+#: ../modules/backup-restore/evolution-backup-tool.c:910
 msgid "Evolution Back Up"
 msgstr "Резервни примерак Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:862
+#: ../modules/backup-restore/evolution-backup-tool.c:911
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Смештам резервни примерак у фасциклу „%s“"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:866
+#: ../modules/backup-restore/evolution-backup-tool.c:915
 msgid "Evolution Restore"
 msgstr "Повраћај Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:867
+#: ../modules/backup-restore/evolution-backup-tool.c:916
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Враћам из фасцикле „%s“"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:935
+#: ../modules/backup-restore/evolution-backup-tool.c:986
 msgid "Backing up Evolution Data"
 msgstr "Израђује резервни примерак података Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:936
+#: ../modules/backup-restore/evolution-backup-tool.c:987
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Сачекајте док Еволуција не направи резервни примерак података."
 
 # shell:noshell-reason title
-#: ../modules/backup-restore/evolution-backup-tool.c:938
+#: ../modules/backup-restore/evolution-backup-tool.c:989
 msgid "Restoring Evolution Data"
 msgstr "Повраћај података Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:939
+#: ../modules/backup-restore/evolution-backup-tool.c:990
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Сачекајте док Еволуција не врати податке у првобитно стање."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:957
+#: ../modules/backup-restore/evolution-backup-tool.c:1012
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Ово може потрајати, у зависности од количине података на налогу."
 
@@ -14824,7 +16135,7 @@ msgstr ""
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Close and Back up Evolution"
-msgstr "Изаберите радњу:"
+msgstr "Затворите и направите резерву Евојуције"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid ""
@@ -14856,80 +16167,88 @@ msgstr "Недовољна овлашћења"
 msgid "The selected folder is not writable."
 msgstr "У изабрану фасциклу се не може писати."
 
-#: ../modules/bogofilter/evolution-bogofilter.c:149
+#: ../modules/bogofilter/evolution-bogofilter.c:145
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr "Нисам успео да изродим Богофилтер (%s): "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:167
+#: ../modules/bogofilter/evolution-bogofilter.c:163
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr "Нисам успео да упутим садржај поруке поште Богофилтеру: "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:216
+#: ../modules/bogofilter/evolution-bogofilter.c:212
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr "Или се Богофилтер урушио или није успео да анализира поруку поште"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:318
+#: ../modules/bogofilter/evolution-bogofilter.c:308
 msgid "Bogofilter Options"
 msgstr "Опције Богофилтера"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:327
+#: ../modules/bogofilter/evolution-bogofilter.c:317
 msgid "Convert message text to _Unicode"
 msgstr "Пребаци текст поруке у _Уникод"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:483
+#: ../modules/bogofilter/evolution-bogofilter.c:474
 msgid "Bogofilter"
 msgstr "Богофилтер"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:442
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:447
 msgid "Standard LDAP Port"
 msgstr "Стандардни ЛДАП порт"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:448
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:453
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:625
 msgid "LDAP over SSL (deprecated)"
 msgstr "ЛДАП или ССЛ (превазиђено)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:454
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:459
 msgid "Microsoft Global Catalog"
 msgstr "Мајкрософтов општи каталог"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:460
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:465
 msgid "Microsoft Global Catalog over SSL"
 msgstr "Мајкрософтов општи каталог преко ССЛ"
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:564
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:570
 msgid "Connecting to LDAP"
 msgstr "Повезујем се на ЛДАП"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:581
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:587
 msgid "Server Information"
 msgstr "Подаци сервера"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:628
 msgid "StartTLS (recommended)"
 msgstr "ПочетниТЛС (препоручено)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:630
 msgid "Encryption:"
 msgstr "Шифровање:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:648
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:258
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:182
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:654
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:246
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:180
 msgid "Authentication"
 msgstr "Потврђивање идентитета"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:671
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
 msgid "Anonymous"
 msgstr "Анонимно"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:680
+msgid "Using email address"
+msgstr "Користи адресу ел. поште"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
+msgid "Using distinguished name (DN)"
+msgstr "Користи посебан назив (DN)"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:685
 msgid "Method:"
 msgstr "Начин:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:690
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Using email address\" requires anonymous access to your "
@@ -14940,36 +16259,36 @@ msgstr ""
 "приступ на ваш ЛДАП сервер."
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:705
 msgid "Using LDAP"
 msgstr "Користи ЛДАП"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
-#: ../modules/mail/e-mail-shell-view.c:116
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:722
+#: ../modules/mail/e-mail-shell-view.c:115
 msgid "Searching"
 msgstr "Претражујем"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:738
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:744
 msgid "Search Base:"
 msgstr "Основа претраге:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:743
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:749
 msgid "Find Possible Search Bases"
 msgstr "Нађи могуће базе за претрагу"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:768
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:774
 msgid "One Level"
 msgstr "Један ниво"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:770
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:776
 msgid "Subtree"
 msgstr "Подстабло"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:772
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
 msgid "Search Scope:"
 msgstr "Обим претраге:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:777
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:783
 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 "
@@ -14977,57 +16296,62 @@ msgid ""
 "the entries one level beneath your search base."
 msgstr ""
 "Обим претраге дефинише дубину којом желите да претрага обухвати стабло "
-"директоријума. Обим претраге „Подстабла“ ће укључити све уносе испод базе за "
-"претрагу. Обим претраге „Један ниво“ ће укључити само уносе један ниво испод "
-"ваше базе претраге."
+"директоријума.  Обим претраге „Подстабла“ ће укључити све уносе испод базе "
+"за претрагу.  Обим претраге „Један ниво“ ће укључити само уносе један ниво "
+"испод ваше базе претраге."
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:786
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:792
 msgid "Search Filter:"
 msgstr "Филтер претраге:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:798
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:804
 msgid "Downloading"
 msgstr "Преузимам"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:819
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
 msgid "Limit:"
 msgstr "Ограничење:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:835
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
+msgid "contacts"
+msgstr "контакти"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:841
 msgid "Browse until limit is reached"
 msgstr "Разгледај све док се не достигне ограничење"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:134
-#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:130
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:136
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:205
+#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:128
 msgid "URL:"
 msgstr "Адреса:"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:144
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:146
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
-msgstr "Избегавај ако_поклапа (потребно на Апачу < 2.2.8)"
+msgstr "Избегавај ако-поклапа (потребно на Апачу < 2.2.8)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:417
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:446
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "ХТТП грешка: %s"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:474
 msgid "Could not parse response"
 msgstr "Не могу да обрадим одговор"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:456
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:483
 msgid "Empty response"
 msgstr "Празан одговор"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:464
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:491
 msgid "Unexpected reply from server"
 msgstr "Неочекиван одговор са сервера"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1051
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1123
 msgid "Could not locate user's calendars"
 msgstr "Не могу да пронађем корисников календар."
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1275
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1347
 msgid "Path"
 msgstr "Путања"
 
@@ -15044,35 +16368,31 @@ msgstr "Изаберите списак белешки"
 msgid "Choose a Task List"
 msgstr "Изаберите списак садатака"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:269
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:219
 msgid "Find Calendars"
 msgstr "Пронађите календаре"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:272
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:222
 msgid "Find Memo Lists"
 msgstr "Пронађите спискове белешки"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:275
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:225
 msgid "Find Task Lists"
 msgstr "Пронађите спискове задатака"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:293
-msgid "Path:"
-msgstr "Путања:"
-
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:299
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:243
 msgid "Email:"
 msgstr "Ел. пошта:"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:304
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:248
 msgid "Server handles meeting invitations"
 msgstr "Сервер управља позивима на састанак"
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:73
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:71
 msgid "Choose which address books to use."
 msgstr "Изаберите адресаре који ћете користити."
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:203
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:201
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "Користи у календару за рођендане и годишњице"
 
@@ -15089,56 +16409,56 @@ msgstr "Унесите Гуглову лозинку за „%s“."
 msgid "User declined to provide a password"
 msgstr "Корисник је одбио да достави лозинку"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:161
+#: ../modules/cal-config-local/evolution-cal-config-local.c:160
 msgid "Use an existing iCalendar (ics) file"
 msgstr "Користите постојећу датотеку иКалендара (ics)"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:186
+#: ../modules/cal-config-local/evolution-cal-config-local.c:185
 msgid "iCalendar File"
 msgstr "Датотека иКалендара"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:198
+#: ../modules/cal-config-local/evolution-cal-config-local.c:197
 msgid "Choose an iCalendar file"
 msgstr "Изаберите датотеку иКалендара"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:201
+#: ../modules/cal-config-local/evolution-cal-config-local.c:200
 msgid "File:"
 msgstr "Датотека:"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:216
+#: ../modules/cal-config-local/evolution-cal-config-local.c:215
 msgid "Allow Evolution to update the file"
 msgstr "Допушта Еволуцији да освежи датотеку"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:323
-#: ../smime/gui/smime-ui.ui.h:32
+#: ../modules/calendar/e-cal-attachment-handler.c:322
+#: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
 msgstr "У_вези"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:409
+#: ../modules/calendar/e-cal-attachment-handler.c:408
 msgid "Select a Calendar"
 msgstr "Изаберите календар"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:436
+#: ../modules/calendar/e-cal-attachment-handler.c:435
 msgid "Select a Task List"
 msgstr "Изаберите списак задатака"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:446
+#: ../modules/calendar/e-cal-attachment-handler.c:445
 msgid "I_mport to Calendar"
 msgstr "У_вези у календар"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:453
+#: ../modules/calendar/e-cal-attachment-handler.c:452
 msgid "I_mport to Tasks"
 msgstr "У_вези у задатке"
 
-#: ../modules/calendar/e-calendar-preferences.c:407
+#: ../modules/calendar/e-calendar-preferences.c:401
 msgid "Selected Calendars for Alarms"
 msgstr "Изабрани календари за аларме"
 
-#: ../modules/calendar/e-calendar-preferences.c:829
+#: ../modules/calendar/e-calendar-preferences.c:822
 msgid "Ti_me and date:"
 msgstr "_Време и датум:"
 
-#: ../modules/calendar/e-calendar-preferences.c:830
+#: ../modules/calendar/e-calendar-preferences.c:823
 msgid "_Date only:"
 msgstr "Само _датум:"
 
@@ -15174,12 +16494,6 @@ msgstr "10 минута"
 msgid "05 minutes"
 msgstr "05 минута"
 
-# note(slobo): можда треба рок
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
-#: ../widgets/misc/e-dateedit.c:595
-msgid "Time"
-msgstr "Време"
-
 #: ../modules/calendar/e-calendar-preferences.ui.h:17
 msgid "Se_cond zone:"
 msgstr "Дру_га зона:"
@@ -15205,7 +16519,7 @@ msgid "_24 hour"
 msgstr "_24 - часовни"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:25
-#: ../modules/calendar/e-cal-shell-view-actions.c:1743
+#: ../modules/calendar/e-cal-shell-view-actions.c:1742
 msgid "Work Week"
 msgstr "Радна недеља"
 
@@ -15359,71 +16673,71 @@ msgstr "%u и %d ће бити замењени корисником и доме
 msgid "Publishing Information"
 msgstr "Подаци о објављивању"
 
-#: ../modules/calendar/e-cal-shell-backend.c:278
-#: ../modules/calendar/e-cal-shell-view-actions.c:192
+#: ../modules/calendar/e-cal-shell-backend.c:273
+#: ../modules/calendar/e-cal-shell-view-actions.c:191
 msgid "New Calendar"
 msgstr "Нови календар"
 
-#: ../modules/calendar/e-cal-shell-backend.c:287
+#: ../modules/calendar/e-cal-shell-backend.c:282
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Заказивање"
 
-#: ../modules/calendar/e-cal-shell-backend.c:289
-#: ../modules/calendar/e-cal-shell-view-actions.c:1548
+#: ../modules/calendar/e-cal-shell-backend.c:284
+#: ../modules/calendar/e-cal-shell-view-actions.c:1547
 msgid "Create a new appointment"
 msgstr "Прави ново заказивање"
 
-#: ../modules/calendar/e-cal-shell-backend.c:294
+#: ../modules/calendar/e-cal-shell-backend.c:289
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Целодневно за_казивање"
 
-#: ../modules/calendar/e-cal-shell-backend.c:296
+#: ../modules/calendar/e-cal-shell-backend.c:291
 msgid "Create a new all-day appointment"
 msgstr "Прави ново целодневно заказивање"
 
-#: ../modules/calendar/e-cal-shell-backend.c:301
+#: ../modules/calendar/e-cal-shell-backend.c:296
 msgctxt "New"
 msgid "M_eeting"
 msgstr "С_астанак"
 
-#: ../modules/calendar/e-cal-shell-backend.c:303
+#: ../modules/calendar/e-cal-shell-backend.c:298
 msgid "Create a new meeting request"
 msgstr "Прави нови захтев за састанком"
 
-#: ../modules/calendar/e-cal-shell-backend.c:311
+#: ../modules/calendar/e-cal-shell-backend.c:306
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Кале_ндар"
 
-#: ../modules/calendar/e-cal-shell-backend.c:313
-#: ../modules/calendar/e-cal-shell-view-actions.c:1422
+#: ../modules/calendar/e-cal-shell-backend.c:308
+#: ../modules/calendar/e-cal-shell-view-actions.c:1421
 msgid "Create a new calendar"
 msgstr "Прави нови календар"
 
-#: ../modules/calendar/e-cal-shell-backend.c:597
+#: ../modules/calendar/e-cal-shell-backend.c:627
 msgid "Calendar and Tasks"
 msgstr "Календар и задаци"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:211
+#: ../modules/calendar/e-cal-shell-sidebar.c:207
 msgid "Loading calendars"
 msgstr "Учитавање календара"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:731
+#: ../modules/calendar/e-cal-shell-sidebar.c:674
 msgid "Calendar Selector"
 msgstr "Изборник календара"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:1090
+#: ../modules/calendar/e-cal-shell-sidebar.c:1033
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr "Отварам календар „%s“"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:292
+#: ../modules/calendar/e-cal-shell-view-actions.c:291
 msgid "Calendar Properties"
 msgstr "Особине календара"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:323
+#: ../modules/calendar/e-cal-shell-view-actions.c:322
 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 "
@@ -15434,349 +16748,349 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:340
+#: ../modules/calendar/e-cal-shell-view-actions.c:339
 msgid "Purge events older than"
 msgstr "Избаци догађаје старије од"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:591
+#: ../modules/calendar/e-cal-shell-view-actions.c:590
 msgid "Copying Items"
 msgstr "Умножавање ставки"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:885
+#: ../modules/calendar/e-cal-shell-view-actions.c:884
 msgid "Moving Items"
 msgstr "Премештање ставки"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1218
+#: ../modules/calendar/e-cal-shell-view-actions.c:1217
 msgid "event"
 msgstr "догађај"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1220
+#: ../modules/calendar/e-cal-shell-view-actions.c:1219
 #: ../modules/calendar/e-cal-shell-view-memopad.c:231
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:549
-#: ../modules/calendar/e-task-shell-view-actions.c:666
+#: ../modules/calendar/e-memo-shell-view-actions.c:548
+#: ../modules/calendar/e-task-shell-view-actions.c:665
 msgid "Save as iCalendar"
 msgstr "Сачувај као иКалендар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1378
-#: ../modules/calendar/e-memo-shell-view-actions.c:630
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-memo-shell-view-actions.c:629
 msgid "_Copy..."
 msgstr "_Умножи..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1385
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "D_elete Calendar"
 msgstr "Об_риши календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1387
+#: ../modules/calendar/e-cal-shell-view-actions.c:1386
 msgid "Delete the selected calendar"
 msgstr "Обришите изабрани календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1394
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "Go Back"
 msgstr "Иди назад"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1401
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "Go Forward"
 msgstr "Иди напред"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
 msgid "Select today"
 msgstr "Изабери данашњи дан"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1413
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
 msgid "Select _Date"
 msgstr "Изабери _датум"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1415
+#: ../modules/calendar/e-cal-shell-view-actions.c:1414
 msgid "Select a specific date"
 msgstr "Изаберите одређени датум"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1420
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "_New Calendar"
 msgstr "Нови _календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
-#: ../modules/calendar/e-task-shell-view-actions.c:838
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-task-shell-view-actions.c:837
 msgid "Purg_e"
 msgstr "Изба_ци"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1436
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
 msgid "Purge old appointments and meetings"
 msgstr "Избаците стара заказивања и састанке"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1441
-#: ../modules/calendar/e-memo-shell-view-actions.c:658
-#: ../modules/calendar/e-task-shell-view-actions.c:782
+#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "Re_fresh"
 msgstr "О_свежи"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1443
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
 msgid "Refresh the selected calendar"
 msgstr "Освежите изабрани календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1450
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "Rename the selected calendar"
 msgstr "Преименујте изабрани календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1455
+#: ../modules/calendar/e-cal-shell-view-actions.c:1454
 msgid "Find _next"
 msgstr "Пронађи _следеће"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1457
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "Find next occurrence of the current search string"
 msgstr "Пронађите следеће појављивање текуће ниске претраге"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-cal-shell-view-actions.c:1461
 msgid "Find _previous"
 msgstr "Пронађи _претходно"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1464
+#: ../modules/calendar/e-cal-shell-view-actions.c:1463
 msgid "Find previous occurrence of the current search string"
 msgstr "Пронађите претходно појављивање текуће ниске претраге"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1469
+#: ../modules/calendar/e-cal-shell-view-actions.c:1468
 msgid "Stop _running search"
 msgstr "Заустави _текућу претрагу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1471
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
 msgid "Stop currently running search"
 msgstr "Зауставите тренутно покренуту претрагу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1476
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "Show _Only This Calendar"
 msgstr "Прикажи _само овај календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1483
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "Cop_y to Calendar..."
 msgstr "_Умножи у календар..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1490
+#: ../modules/calendar/e-cal-shell-view-actions.c:1489
 msgid "_Delegate Meeting..."
 msgstr "_Делегирај састанак..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1497
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
 msgid "_Delete Appointment"
 msgstr "_Обриши заказано"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1499
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
 msgid "Delete selected appointments"
 msgstr "Обришите изабрана заказивања"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1504
+#: ../modules/calendar/e-cal-shell-view-actions.c:1503
 msgid "Delete This _Occurrence"
 msgstr "Обриши ову _појаву"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1506
+#: ../modules/calendar/e-cal-shell-view-actions.c:1505
 msgid "Delete this occurrence"
 msgstr "Обришите ову појаву"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../modules/calendar/e-cal-shell-view-actions.c:1510
 msgid "Delete All Occ_urrences"
 msgstr "Обриши све по_јаве"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1513
+#: ../modules/calendar/e-cal-shell-view-actions.c:1512
 msgid "Delete all occurrences"
 msgstr "Обришите све појаве"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1518
+#: ../modules/calendar/e-cal-shell-view-actions.c:1517
 msgid "New All Day _Event..."
 msgstr "Нови целодневни _догађај..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1520
+#: ../modules/calendar/e-cal-shell-view-actions.c:1519
 msgid "Create a new all day event"
 msgstr "Направите нови целодневни догађај"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1525
+#: ../modules/calendar/e-cal-shell-view-actions.c:1524
 #: ../modules/calendar/e-cal-shell-view-memopad.c:265
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-memo-shell-view-actions.c:623
-#: ../modules/calendar/e-task-shell-view-actions.c:747
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "_Forward as iCalendar..."
 msgstr "_Проследи као иКалендар..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1532
+#: ../modules/calendar/e-cal-shell-view-actions.c:1531
 msgid "New _Meeting..."
 msgstr "Нови _састанак..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1534
+#: ../modules/calendar/e-cal-shell-view-actions.c:1533
 msgid "Create a new meeting"
 msgstr "Направите нови састанак"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1539
+#: ../modules/calendar/e-cal-shell-view-actions.c:1538
 msgid "Mo_ve to Calendar..."
 msgstr "Прен_еси у календар..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1546
+#: ../modules/calendar/e-cal-shell-view-actions.c:1545
 msgid "New _Appointment..."
 msgstr "Ново _заказивање..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1553
+#: ../modules/calendar/e-cal-shell-view-actions.c:1552
 msgid "Make this Occurrence _Movable"
 msgstr "Нека ова појава буде _покретна"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1560
+#: ../modules/calendar/e-cal-shell-view-actions.c:1559
 msgid "_Open Appointment"
 msgstr "_Отвори састанак"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1562
+#: ../modules/calendar/e-cal-shell-view-actions.c:1561
 msgid "View the current appointment"
 msgstr "Прегледајте текуће заказивање"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1567
+#: ../modules/calendar/e-cal-shell-view-actions.c:1566
 msgid "_Reply"
 msgstr "_Одговори"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1581
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
 msgid "_Schedule Meeting..."
 msgstr "_Закажи састанак..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1583
+#: ../modules/calendar/e-cal-shell-view-actions.c:1582
 msgid "Converts an appointment to a meeting"
 msgstr "Претворите заказано у састанак"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
 msgid "Conv_ert to Appointment..."
 msgstr "Пре_твори у заказано..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1590
+#: ../modules/calendar/e-cal-shell-view-actions.c:1589
 msgid "Converts a meeting to an appointment"
 msgstr "Претворите састанак у заказано"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/calendar/e-cal-shell-view-actions.c:1594
 msgid "Quit"
 msgstr "Изађи"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1715
+#: ../modules/calendar/e-cal-shell-view-actions.c:1714
 msgid "Day"
 msgstr "Дан"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1717
+#: ../modules/calendar/e-cal-shell-view-actions.c:1716
 msgid "Show one day"
 msgstr "Прикажи један дан"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1722
+#: ../modules/calendar/e-cal-shell-view-actions.c:1721
 msgid "List"
 msgstr "Списак"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1724
+#: ../modules/calendar/e-cal-shell-view-actions.c:1723
 msgid "Show as list"
 msgstr "Прикажи као списак"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1729
+#: ../modules/calendar/e-cal-shell-view-actions.c:1728
 msgid "Month"
 msgstr "Месец"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1730
 msgid "Show one month"
 msgstr "Прикажи један месец"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1736
+#: ../modules/calendar/e-cal-shell-view-actions.c:1735
 msgid "Week"
 msgstr "Недеља"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1738
+#: ../modules/calendar/e-cal-shell-view-actions.c:1737
 msgid "Show one week"
 msgstr "Прикажи једну недељу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1745
+#: ../modules/calendar/e-cal-shell-view-actions.c:1744
 msgid "Show one work week"
 msgstr "Прикажи једну радну недељу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1753
+#: ../modules/calendar/e-cal-shell-view-actions.c:1752
 msgid "Active Appointments"
 msgstr "Активна заказивања"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1767
+#: ../modules/calendar/e-cal-shell-view-actions.c:1766
 msgid "Next 7 Days' Appointments"
 msgstr "Заказано за следећу недељу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1774
+#: ../modules/calendar/e-cal-shell-view-actions.c:1773
 msgid "Occurs Less Than 5 Times"
 msgstr "Дешава се мање од 5 пута"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1805
-#: ../modules/calendar/e-memo-shell-view-actions.c:820
-#: ../modules/calendar/e-task-shell-view-actions.c:1019
+#: ../modules/calendar/e-cal-shell-view-actions.c:1804
+#: ../modules/calendar/e-memo-shell-view-actions.c:819
+#: ../modules/calendar/e-task-shell-view-actions.c:1018
 msgid "Description contains"
 msgstr "Опис садржи"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1812
-#: ../modules/calendar/e-memo-shell-view-actions.c:827
-#: ../modules/calendar/e-task-shell-view-actions.c:1026
+#: ../modules/calendar/e-cal-shell-view-actions.c:1811
+#: ../modules/calendar/e-memo-shell-view-actions.c:826
+#: ../modules/calendar/e-task-shell-view-actions.c:1025
 msgid "Summary contains"
 msgstr "Сажетак садржи"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1824
+#: ../modules/calendar/e-cal-shell-view-actions.c:1823
 msgid "Print this calendar"
 msgstr "Штампа овај календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1831
+#: ../modules/calendar/e-cal-shell-view-actions.c:1830
 msgid "Preview the calendar to be printed"
 msgstr "Преглед календара пред штампу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1853
+#: ../modules/calendar/e-cal-shell-view-actions.c:1852
 #: ../modules/calendar/e-cal-shell-view-memopad.c:306
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:393
-#: ../modules/calendar/e-memo-shell-view-actions.c:868
-#: ../modules/calendar/e-task-shell-view-actions.c:1067
+#: ../modules/calendar/e-memo-shell-view-actions.c:867
+#: ../modules/calendar/e-task-shell-view-actions.c:1066
 msgid "_Save as iCalendar..."
 msgstr "_Сачувај као иКалендар..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1930
+#: ../modules/calendar/e-cal-shell-view-actions.c:1929
 msgid "Go To"
 msgstr "Иди на"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #: ../modules/calendar/e-cal-shell-view-memopad.c:229
-#: ../modules/calendar/e-memo-shell-view-actions.c:547
+#: ../modules/calendar/e-memo-shell-view-actions.c:546
 msgid "memo"
 msgstr "белешка"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:272
-#: ../modules/calendar/e-memo-shell-view-actions.c:679
+#: ../modules/calendar/e-memo-shell-view-actions.c:678
 msgid "New _Memo"
 msgstr "Нова _белешка"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../modules/calendar/e-memo-shell-backend.c:204
-#: ../modules/calendar/e-memo-shell-view-actions.c:681
+#: ../modules/calendar/e-memo-shell-backend.c:201
+#: ../modules/calendar/e-memo-shell-view-actions.c:680
 msgid "Create a new memo"
 msgstr "Направите једну нову белешку"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:279
-#: ../modules/calendar/e-memo-shell-view-actions.c:686
+#: ../modules/calendar/e-memo-shell-view-actions.c:685
 msgid "_Open Memo"
 msgstr "_Отвори белешку"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:281
-#: ../modules/calendar/e-memo-shell-view-actions.c:688
+#: ../modules/calendar/e-memo-shell-view-actions.c:687
 msgid "View the selected memo"
 msgstr "Погледајте изабрану белешку"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:286
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:373
-#: ../modules/calendar/e-memo-shell-view-actions.c:693
-#: ../modules/calendar/e-task-shell-view-actions.c:831
+#: ../modules/calendar/e-memo-shell-view-actions.c:692
+#: ../modules/calendar/e-task-shell-view-actions.c:830
 msgid "Open _Web Page"
 msgstr "Отвори _Веб страницу"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:853
+#: ../modules/calendar/e-memo-shell-view-actions.c:852
 msgid "Print the selected memo"
 msgstr "Штампајте изабрану белешку"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1477
+#: ../modules/calendar/e-cal-shell-view-private.c:1497
 msgid "Searching next matching event"
 msgstr "Тражим следећи одговарајући догађај"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1478
+#: ../modules/calendar/e-cal-shell-view-private.c:1498
 msgid "Searching previous matching event"
 msgstr "Тражим претходни одговарајући догађај"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1499
+#: ../modules/calendar/e-cal-shell-view-private.c:1519
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
@@ -15785,7 +17099,7 @@ msgstr[1] "Не могу да пронађем одговарајући дога
 msgstr[2] "Не могу да пронађем одговарајући догађај у следећих %d година"
 msgstr[3] "Не могу да пронађем одговарајући догађај у следећој %d години"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1503
+#: ../modules/calendar/e-cal-shell-view-private.c:1523
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
@@ -15794,7 +17108,7 @@ msgstr[1] "Не могу да пронађем одговарајући дога
 msgstr[2] "Не могу да пронађем одговарајући догађај у претходних %d години"
 msgstr[3] "Не могу да пронађем одговарајући догађај у претходној %d години"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1528
+#: ../modules/calendar/e-cal-shell-view-private.c:1548
 msgid "Cannot search with no active calendar"
 msgstr "Не могу да тражим ако нема активног календара"
 
@@ -15803,22 +17117,22 @@ msgstr "Не могу да тражим ако нема активног кал�
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:296
-#: ../modules/calendar/e-task-shell-view-actions.c:664
+#: ../modules/calendar/e-task-shell-view-actions.c:663
 msgid "task"
 msgstr "задатак"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:331
-#: ../modules/calendar/e-task-shell-view-actions.c:726
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "_Assign Task"
 msgstr "_Додели задатак"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:803
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Mark as Complete"
 msgstr "_Означи као завршено"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:805
+#: ../modules/calendar/e-task-shell-view-actions.c:804
 msgid "Mark selected tasks as complete"
 msgstr "Обележите изабране задатке као завршене"
 
@@ -15827,144 +17141,144 @@ msgid "_Mark as Incomplete"
 msgstr "_Означи као незавршено"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:354
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/calendar/e-task-shell-view-actions.c:811
 msgid "Mark selected tasks as incomplete"
 msgstr "Обележите изабране задатке као незавршене"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-task-shell-view-actions.c:817
+#: ../modules/calendar/e-task-shell-view-actions.c:816
 msgid "New _Task"
 msgstr "Нови зад_атак"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-task-shell-backend.c:201
-#: ../modules/calendar/e-task-shell-view-actions.c:819
+#: ../modules/calendar/e-task-shell-backend.c:198
+#: ../modules/calendar/e-task-shell-view-actions.c:818
 msgid "Create a new task"
 msgstr "Направите нови задатак"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:366
-#: ../modules/calendar/e-task-shell-view-actions.c:824
+#: ../modules/calendar/e-task-shell-view-actions.c:823
 msgid "_Open Task"
 msgstr "_Отвори задатак"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:368
-#: ../modules/calendar/e-task-shell-view-actions.c:826
+#: ../modules/calendar/e-task-shell-view-actions.c:825
 msgid "View the selected task"
 msgstr "Прегледајте изабрани задатак"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:385
-#: ../modules/calendar/e-task-shell-view-actions.c:1052
+#: ../modules/calendar/e-task-shell-view-actions.c:1051
 msgid "Print the selected task"
 msgstr "Штампа изабрани задатак"
 
-#: ../modules/calendar/e-memo-shell-backend.c:193
-#: ../modules/calendar/e-memo-shell-view-actions.c:217
+#: ../modules/calendar/e-memo-shell-backend.c:190
+#: ../modules/calendar/e-memo-shell-view-actions.c:216
 msgid "New Memo List"
 msgstr "Нови списак белешке"
 
-#: ../modules/calendar/e-memo-shell-backend.c:202
+#: ../modules/calendar/e-memo-shell-backend.c:199
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Белешк_а"
 
-#: ../modules/calendar/e-memo-shell-backend.c:209
+#: ../modules/calendar/e-memo-shell-backend.c:206
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Дељена белешка"
 
-#: ../modules/calendar/e-memo-shell-backend.c:211
+#: ../modules/calendar/e-memo-shell-backend.c:208
 msgid "Create a new shared memo"
 msgstr "Направите нову дељену белешку"
 
-#: ../modules/calendar/e-memo-shell-backend.c:219
+#: ../modules/calendar/e-memo-shell-backend.c:216
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Спи_сак белешки"
 
-#: ../modules/calendar/e-memo-shell-backend.c:221
-#: ../modules/calendar/e-memo-shell-view-actions.c:646
+#: ../modules/calendar/e-memo-shell-backend.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:645
 msgid "Create a new memo list"
 msgstr "Саставите нови списак белешки"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:206
+#: ../modules/calendar/e-memo-shell-sidebar.c:204
 msgid "Loading memos"
 msgstr "Учитавам белешке"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:663
+#: ../modules/calendar/e-memo-shell-sidebar.c:608
 msgid "Memo List Selector"
 msgstr "Изборник спискова белешки"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:975
+#: ../modules/calendar/e-memo-shell-sidebar.c:920
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr "Отварам списак белешки „%s“"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
-#: ../modules/calendar/e-memo-shell-view-actions.c:248
+#: ../modules/calendar/e-memo-shell-view-actions.c:232
+#: ../modules/calendar/e-memo-shell-view-actions.c:247
 msgid "Print Memos"
 msgstr "Штампај белешке"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:289
+#: ../modules/calendar/e-memo-shell-view-actions.c:288
 msgid "Memo List Properties"
 msgstr "Особине списка задатака"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:609
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
 msgid "_Delete Memo"
 msgstr "_Обриши белешку"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:616
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "_Find in Memo..."
 msgstr "П_ронађи у белешци..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:618
+#: ../modules/calendar/e-memo-shell-view-actions.c:617
 msgid "Search for text in the displayed memo"
 msgstr "Претражите текст у приказаној белешци"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:637
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
 msgid "D_elete Memo List"
 msgstr "Об_риши списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:639
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
 msgid "Delete the selected memo list"
 msgstr "Обришите изабрани списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:644
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "_New Memo List"
 msgstr "_Нови списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:660
+#: ../modules/calendar/e-memo-shell-view-actions.c:659
 msgid "Refresh the selected memo list"
 msgstr "Освежите изабрани списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:667
+#: ../modules/calendar/e-memo-shell-view-actions.c:666
 msgid "Rename the selected memo list"
 msgstr "Преименујте изабрани списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:672
+#: ../modules/calendar/e-memo-shell-view-actions.c:671
 msgid "Show _Only This Memo List"
 msgstr "Прикажи _само овај списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
 msgid "Memo _Preview"
 msgstr "_Преглед белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:753
+#: ../modules/calendar/e-memo-shell-view-actions.c:752
 msgid "Show memo preview pane"
 msgstr "Прикажите преглед белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:774
+#: ../modules/calendar/e-memo-shell-view-actions.c:773
 msgid "Show memo preview below the memo list"
 msgstr "Прикажите преглед белешки испод списка белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:781
+#: ../modules/calendar/e-memo-shell-view-actions.c:780
 msgid "Show memo preview alongside the memo list"
 msgstr "Прикажите преглед белешки поред списка белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:839
+#: ../modules/calendar/e-memo-shell-view-actions.c:838
 msgid "Print the list of memos"
 msgstr "Штампајте списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:846
+#: ../modules/calendar/e-memo-shell-view-actions.c:845
 msgid "Preview the list of memos to be printed"
 msgstr "Прегледајте списак белешки за штампу"
 
@@ -15976,7 +17290,7 @@ msgstr "Обриши белешке"
 msgid "Delete Memo"
 msgstr "Обриши белешку"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:428
+#: ../modules/calendar/e-memo-shell-view-private.c:426
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -15985,64 +17299,64 @@ msgstr[1] "%d белешке"
 msgstr[2] "%d белешки"
 msgstr[3] "%d белешка"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:432
-#: ../modules/calendar/e-task-shell-view-private.c:613
+#: ../modules/calendar/e-memo-shell-view-private.c:430
+#: ../modules/calendar/e-task-shell-view-private.c:611
 #, c-format
 msgid "%d selected"
 msgstr "изабраних — %d"
 
-#: ../modules/calendar/e-task-shell-backend.c:190
-#: ../modules/calendar/e-task-shell-view-actions.c:240
+#: ../modules/calendar/e-task-shell-backend.c:187
+#: ../modules/calendar/e-task-shell-view-actions.c:239
 msgid "New Task List"
 msgstr "Нови списак задатака"
 
-#: ../modules/calendar/e-task-shell-backend.c:199
+#: ../modules/calendar/e-task-shell-backend.c:196
 msgctxt "New"
 msgid "_Task"
 msgstr "_Задатак"
 
-#: ../modules/calendar/e-task-shell-backend.c:206
+#: ../modules/calendar/e-task-shell-backend.c:203
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Додељен_и задатак"
 
-#: ../modules/calendar/e-task-shell-backend.c:208
+#: ../modules/calendar/e-task-shell-backend.c:205
 msgid "Create a new assigned task"
 msgstr "Направите нови додељени задатак"
 
-#: ../modules/calendar/e-task-shell-backend.c:216
+#: ../modules/calendar/e-task-shell-backend.c:213
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Списак за_датака"
 
-#: ../modules/calendar/e-task-shell-backend.c:218
-#: ../modules/calendar/e-task-shell-view-actions.c:770
+#: ../modules/calendar/e-task-shell-backend.c:215
+#: ../modules/calendar/e-task-shell-view-actions.c:769
 msgid "Create a new task list"
 msgstr "Направите нови списак задатака"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:206
+#: ../modules/calendar/e-task-shell-sidebar.c:204
 msgid "Loading tasks"
 msgstr "Учитавам задатке"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:663
+#: ../modules/calendar/e-task-shell-sidebar.c:608
 msgid "Task List Selector"
 msgstr "Изборник списка задатака"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:975
+#: ../modules/calendar/e-task-shell-sidebar.c:920
 #, c-format
 msgid "Opening task list '%s'"
 msgstr "Отварам списак задатака „%s“"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view-actions.c:271
+#: ../modules/calendar/e-task-shell-view-actions.c:255
+#: ../modules/calendar/e-task-shell-view-actions.c:270
 msgid "Print Tasks"
 msgstr "Штампај задатке"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:312
+#: ../modules/calendar/e-task-shell-view-actions.c:311
 msgid "Task List Properties"
 msgstr "Особине списка задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:608
+#: ../modules/calendar/e-task-shell-view-actions.c:607
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -16054,99 +17368,99 @@ msgstr ""
 "\n"
 "Да обришем ове задатке?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:615
+#: ../modules/calendar/e-task-shell-view-actions.c:614
 msgid "Do not ask me again"
 msgstr "Не питај ме поново"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:733
+#: ../modules/calendar/e-task-shell-view-actions.c:732
 msgid "_Delete Task"
 msgstr "_Обриши задатак"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "_Find in Task..."
 msgstr "_Пронађи у задатку..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:742
+#: ../modules/calendar/e-task-shell-view-actions.c:741
 msgid "Search for text in the displayed task"
 msgstr "Претражи текст у приказаном задатку"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:754
+#: ../modules/calendar/e-task-shell-view-actions.c:753
 msgid "Copy..."
 msgstr "Умножи..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "D_elete Task List"
 msgstr "О_бриши списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:763
+#: ../modules/calendar/e-task-shell-view-actions.c:762
 msgid "Delete the selected task list"
 msgstr "Обришите изабрани списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "_New Task List"
 msgstr "Но_ви списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:784
+#: ../modules/calendar/e-task-shell-view-actions.c:783
 msgid "Refresh the selected task list"
 msgstr "Освежите изабрани списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:791
+#: ../modules/calendar/e-task-shell-view-actions.c:790
 msgid "Rename the selected task list"
 msgstr "Преименујте изабрани списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:796
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Show _Only This Task List"
 msgstr "Прикажи _само овај списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:810
+#: ../modules/calendar/e-task-shell-view-actions.c:809
 msgid "Mar_k as Incomplete"
 msgstr "О_значи као незавршено"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:840
+#: ../modules/calendar/e-task-shell-view-actions.c:839
 msgid "Delete completed tasks"
 msgstr "Обришите завршене задатке"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:915
+#: ../modules/calendar/e-task-shell-view-actions.c:914
 msgid "Task _Preview"
 msgstr "Преглед за_датака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:917
+#: ../modules/calendar/e-task-shell-view-actions.c:916
 msgid "Show task preview pane"
 msgstr "Прикажите преглед задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:938
+#: ../modules/calendar/e-task-shell-view-actions.c:937
 msgid "Show task preview below the task list"
 msgstr "Прикажите преглед испод списка задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:945
+#: ../modules/calendar/e-task-shell-view-actions.c:944
 msgid "Show task preview alongside the task list"
 msgstr "Прикажите преглед поред списка задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:953
+#: ../modules/calendar/e-task-shell-view-actions.c:952
 msgid "Active Tasks"
 msgstr "Активни задаци"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:967
+#: ../modules/calendar/e-task-shell-view-actions.c:966
 msgid "Completed Tasks"
 msgstr "Завршени задаци"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:974
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Next 7 Days' Tasks"
 msgstr "Задаци за следећу недељу"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:981
+#: ../modules/calendar/e-task-shell-view-actions.c:980
 msgid "Overdue Tasks"
 msgstr "Прекорачени задаци"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:988
+#: ../modules/calendar/e-task-shell-view-actions.c:987
 msgid "Tasks with Attachments"
 msgstr "Задаци са прилозима"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1038
+#: ../modules/calendar/e-task-shell-view-actions.c:1037
 msgid "Print the list of tasks"
 msgstr "Штампајте списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1045
+#: ../modules/calendar/e-task-shell-view-actions.c:1044
 msgid "Preview the list of tasks to be printed"
 msgstr "Прегледајте списак задатака пред штампу"
 
@@ -16158,11 +17472,11 @@ msgstr "Обриши задатке"
 msgid "Delete Task"
 msgstr "Обриши задатак"
 
-#: ../modules/calendar/e-task-shell-view-private.c:502
+#: ../modules/calendar/e-task-shell-view-private.c:500
 msgid "Expunging"
 msgstr "Избацивање"
 
-#: ../modules/calendar/e-task-shell-view-private.c:609
+#: ../modules/calendar/e-task-shell-view-private.c:607
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -16171,100 +17485,59 @@ msgstr[1] "%d задатака"
 msgstr[2] "%d задатака"
 msgstr[3] "%d задатак"
 
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:225
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:395
-msgid "IMAP Headers"
-msgstr "ИМАП заглавља"
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:233
-msgid ""
-"Select a predefined set of IMAP headers to fetch.\n"
-"Note, larger sets of headers take longer to download."
-msgstr ""
-"Изаберите унапред одређени скуп ИМАП заглавља за довлачење.\n"
-"Знајте, да већим скуповима заглавља је потребно више времена за преузимање."
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:243
-msgid "_Fetch All Headers"
-msgstr "_Прибави сва заглавља"
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:257
-msgid "_Basic Headers (fastest)"
-msgstr "_Основна заглавља (најбрже)"
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:271
-msgid "Use this if you are not filtering any mailing lists."
-msgstr "Користите ово уколико немате филтере на дописним листама."
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:281
-msgid "Basic and _Mailing List Headers (default)"
-msgstr "Основна и заглавља _дописних листи (основно)"
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:330
-msgid "Custom Headers"
-msgstr "Прилагођена заглавља"
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:338
-msgid ""
-"Specify any extra headers to fetch in addition to the predefined set of "
-"headers selected above."
-msgstr ""
-"Наведите било које додатно заглавље за довлачење као додатак унапред "
-"одређеном скупу заглавља горе изабраних."
-
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:137
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:145
 msgid "ITIP"
 msgstr "ИТИП"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:143
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:146
 msgid "Display part as an invitation"
 msgstr "Приказује делове као позивницу"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:240
+#: ../modules/itip-formatter/itip-view.c:233
 msgid "Today %H:%M"
 msgstr "Данас у %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:244
+#: ../modules/itip-formatter/itip-view.c:237
 msgid "Today %H:%M:%S"
 msgstr "Данас у %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:253
+#: ../modules/itip-formatter/itip-view.c:246
 msgid "Today %l:%M:%S %p"
 msgstr "Данас у %l:%M:%S %p"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:268
+#: ../modules/itip-formatter/itip-view.c:261
 msgid "Tomorrow %H:%M"
 msgstr "Сутра у %H:%M"
 
 # strftime format of a time in 24-hour format.
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:272
+#: ../modules/itip-formatter/itip-view.c:265
 msgid "Tomorrow %H:%M:%S"
 msgstr "Сутра у %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:277
+#: ../modules/itip-formatter/itip-view.c:270
 msgid "Tomorrow %l:%M %p"
 msgstr "Сутра у %l:%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:281
+#: ../modules/itip-formatter/itip-view.c:274
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Сутра у %l:%M %S %p"
 
 #. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:300
+#: ../modules/itip-formatter/itip-view.c:293
 #, c-format
 msgid "%A"
 msgstr "%A"
@@ -16274,69 +17547,69 @@ msgstr "%A"
 # This is a strftime() format. %H = hour (0-23), %M = minute.
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:305
+#: ../modules/itip-formatter/itip-view.c:298
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 # strftime format of a time in 24-hour format.
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:309
+#: ../modules/itip-formatter/itip-view.c:302
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:314
+#: ../modules/itip-formatter/itip-view.c:307
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 # strftime format of a time in 12-hour format.
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:318
+#: ../modules/itip-formatter/itip-view.c:311
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../modules/itip-formatter/itip-view.c:327
+#: ../modules/itip-formatter/itip-view.c:320
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:333
+#: ../modules/itip-formatter/itip-view.c:326
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:337
+#: ../modules/itip-formatter/itip-view.c:330
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:342
+#: ../modules/itip-formatter/itip-view.c:335
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:346
+#: ../modules/itip-formatter/itip-view.c:339
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../modules/itip-formatter/itip-view.c:352
+#: ../modules/itip-formatter/itip-view.c:345
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y."
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:357
+#: ../modules/itip-formatter/itip-view.c:350
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y. %H:%M"
 
@@ -16346,167 +17619,167 @@ msgstr "%A, %B %e, %Y. %H:%M"
 # time, in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:361
+#: ../modules/itip-formatter/itip-view.c:354
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y. %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:366
+#: ../modules/itip-formatter/itip-view.c:359
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y. %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:370
+#: ../modules/itip-formatter/itip-view.c:363
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y. %l:%M:%S %p"
 
-#: ../modules/itip-formatter/itip-view.c:408
-#: ../modules/itip-formatter/itip-view.c:409
-#: ../modules/itip-formatter/itip-view.c:498
-#: ../modules/itip-formatter/itip-view.c:499
-#: ../modules/itip-formatter/itip-view.c:588
+#: ../modules/itip-formatter/itip-view.c:401
+#: ../modules/itip-formatter/itip-view.c:402
+#: ../modules/itip-formatter/itip-view.c:491
+#: ../modules/itip-formatter/itip-view.c:492
+#: ../modules/itip-formatter/itip-view.c:581
 msgid "An unknown person"
 msgstr "Непозната особа"
 
-#: ../modules/itip-formatter/itip-view.c:413
-#: ../modules/itip-formatter/itip-view.c:503
-#: ../modules/itip-formatter/itip-view.c:592
+#: ../modules/itip-formatter/itip-view.c:406
+#: ../modules/itip-formatter/itip-view.c:496
+#: ../modules/itip-formatter/itip-view.c:585
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Одговорите у име %s"
 
-#: ../modules/itip-formatter/itip-view.c:415
-#: ../modules/itip-formatter/itip-view.c:505
-#: ../modules/itip-formatter/itip-view.c:594
+#: ../modules/itip-formatter/itip-view.c:408
+#: ../modules/itip-formatter/itip-view.c:498
+#: ../modules/itip-formatter/itip-view.c:587
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Примљено у име %s"
 
-#: ../modules/itip-formatter/itip-view.c:420
+#: ../modules/itip-formatter/itip-view.c:413
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s преко %s објављује следећи податак о састанку:"
 
-#: ../modules/itip-formatter/itip-view.c:422
+#: ../modules/itip-formatter/itip-view.c:415
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s објављује следећи податак о састанку:"
 
-#: ../modules/itip-formatter/itip-view.c:427
+#: ../modules/itip-formatter/itip-view.c:420
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s вам делегира следећи састанак:"
 
-#: ../modules/itip-formatter/itip-view.c:430
+#: ../modules/itip-formatter/itip-view.c:423
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s преко %s захтева ваше присуство на следећем састанку:"
 
-#: ../modules/itip-formatter/itip-view.c:432
+#: ../modules/itip-formatter/itip-view.c:425
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s захтева ваше присуство на следећем састанку:"
 
-#: ../modules/itip-formatter/itip-view.c:438
+#: ../modules/itip-formatter/itip-view.c:431
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s преко %s жели да дода постојећем састанку:"
 
-#: ../modules/itip-formatter/itip-view.c:440
+#: ../modules/itip-formatter/itip-view.c:433
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s жели да дода постојећем састанку:"
 
-#: ../modules/itip-formatter/itip-view.c:444
+#: ../modules/itip-formatter/itip-view.c:437
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
 msgstr "%s преко %s жели да прими најновије информације за следећи састанак:"
 
-#: ../modules/itip-formatter/itip-view.c:446
+#: ../modules/itip-formatter/itip-view.c:439
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s жели да прими најновији податак за следећи састанак:"
 
-#: ../modules/itip-formatter/itip-view.c:450
+#: ../modules/itip-formatter/itip-view.c:443
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s преко %s шаље следећи одговор за састанак:"
 
-#: ../modules/itip-formatter/itip-view.c:452
+#: ../modules/itip-formatter/itip-view.c:445
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s шаље следећи одговор за састанак:"
 
-#: ../modules/itip-formatter/itip-view.c:456
+#: ../modules/itip-formatter/itip-view.c:449
 #, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "%s преко %s отказује следећи састанак:"
 
-#: ../modules/itip-formatter/itip-view.c:458
+#: ../modules/itip-formatter/itip-view.c:451
 #, c-format
 msgid "%s has canceled the following meeting:"
 msgstr "%s отказује следећи састанак:"
 
-#: ../modules/itip-formatter/itip-view.c:462
+#: ../modules/itip-formatter/itip-view.c:455
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s преко %s предлаже следеће промене састанка."
 
-#: ../modules/itip-formatter/itip-view.c:464
+#: ../modules/itip-formatter/itip-view.c:457
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s предлаже следеће измене састанка:"
 
-#: ../modules/itip-formatter/itip-view.c:468
+#: ../modules/itip-formatter/itip-view.c:461
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s преко %s одбија следеће промене састанка:"
 
-#: ../modules/itip-formatter/itip-view.c:470
+#: ../modules/itip-formatter/itip-view.c:463
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s одбија следеће измене састанка:"
 
-#: ../modules/itip-formatter/itip-view.c:510
+#: ../modules/itip-formatter/itip-view.c:503
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s преко %s објављује следећи задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:512
+#: ../modules/itip-formatter/itip-view.c:505
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s објави следеће задужење:"
 
-#: ../modules/itip-formatter/itip-view.c:517
+#: ../modules/itip-formatter/itip-view.c:510
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s захтева да %s преузме следећи задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:520
+#: ../modules/itip-formatter/itip-view.c:513
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s преко %s вам додељује задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:522
+#: ../modules/itip-formatter/itip-view.c:515
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s вам додељује задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:528
+#: ../modules/itip-formatter/itip-view.c:521
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s преко %s жели да дода постојећем задатку:"
 
-#: ../modules/itip-formatter/itip-view.c:530
+#: ../modules/itip-formatter/itip-view.c:523
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s жели да дода постојећем задатку:"
 
-#: ../modules/itip-formatter/itip-view.c:534
+#: ../modules/itip-formatter/itip-view.c:527
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -16514,336 +17787,344 @@ msgid ""
 msgstr ""
 "%s преко %s жели да добије најновије информације за следећи додељени задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:536
+#: ../modules/itip-formatter/itip-view.c:529
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s жели да добије најновије информације за следећи додељени задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:540
+#: ../modules/itip-formatter/itip-view.c:533
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s преко %s враћа следећи одговор на додељени задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:542
+#: ../modules/itip-formatter/itip-view.c:535
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s шаље назад следећи одговор на додељени задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:546
+#: ../modules/itip-formatter/itip-view.c:539
 #, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "%s преко %s отказује следећи додељени задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:548
+#: ../modules/itip-formatter/itip-view.c:541
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "%s отказује следећи додељени задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:552
+#: ../modules/itip-formatter/itip-view.c:545
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s преко %s предлаже следеће промене у додели задатка:"
 
-#: ../modules/itip-formatter/itip-view.c:554
+#: ../modules/itip-formatter/itip-view.c:547
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s предлаже следеће промене у додели задатка:"
 
-#: ../modules/itip-formatter/itip-view.c:558
+#: ../modules/itip-formatter/itip-view.c:551
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s преко %s одбија следећи додељени задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:560
+#: ../modules/itip-formatter/itip-view.c:553
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s одбија следећи додељени задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:599
+#: ../modules/itip-formatter/itip-view.c:592
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s преко %s објављује следећу белешку:"
 
-#: ../modules/itip-formatter/itip-view.c:601
+#: ../modules/itip-formatter/itip-view.c:594
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s објављује следећу белешку:"
 
-#: ../modules/itip-formatter/itip-view.c:606
+#: ../modules/itip-formatter/itip-view.c:599
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s преко %s жели да дода постојећој белешци:"
 
-#: ../modules/itip-formatter/itip-view.c:608
+#: ../modules/itip-formatter/itip-view.c:601
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s жели да дода постојећој белешци:"
 
-#: ../modules/itip-formatter/itip-view.c:612
+#: ../modules/itip-formatter/itip-view.c:605
 #, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "%s преко %s отказује следећу дељену белешку:"
 
-#: ../modules/itip-formatter/itip-view.c:614
+#: ../modules/itip-formatter/itip-view.c:607
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "%s отказује следеће дељену белешку:"
 
-#: ../modules/itip-formatter/itip-view.c:687
+#: ../modules/itip-formatter/itip-view.c:680
 msgid "All day:"
 msgstr "Целодневно:"
 
-#: ../modules/itip-formatter/itip-view.c:693
+#: ../modules/itip-formatter/itip-view.c:686
 msgid "Start day:"
 msgstr "Почетак дана:"
 
-#: ../modules/itip-formatter/itip-view.c:693
-#: ../modules/itip-formatter/itip-view.c:1461
+#: ../modules/itip-formatter/itip-view.c:686
+#: ../modules/itip-formatter/itip-view.c:1465
 msgid "Start time:"
 msgstr "Време почетка:"
 
-#: ../modules/itip-formatter/itip-view.c:702
+#: ../modules/itip-formatter/itip-view.c:695
 msgid "End day:"
 msgstr "Крај дана:"
 
-#: ../modules/itip-formatter/itip-view.c:702
-#: ../modules/itip-formatter/itip-view.c:1462
+#: ../modules/itip-formatter/itip-view.c:695
+#: ../modules/itip-formatter/itip-view.c:1466
 msgid "End time:"
 msgstr "Време завршетка:"
 
-#: ../modules/itip-formatter/itip-view.c:1010
-msgid "_Open Calendar"
+#: ../modules/itip-formatter/itip-view.c:1014
+#| msgid "_Open Calendar"
+msgid "Ope_n Calendar"
 msgstr "О_твори календар"
 
-#: ../modules/itip-formatter/itip-view.c:1013
+#: ../modules/itip-formatter/itip-view.c:1017
 msgid "_Decline all"
 msgstr "Од_биј све"
 
-#: ../modules/itip-formatter/itip-view.c:1016
+#: ../modules/itip-formatter/itip-view.c:1020
 msgid "_Decline"
 msgstr "_Одбиј"
 
-#: ../modules/itip-formatter/itip-view.c:1019
+#: ../modules/itip-formatter/itip-view.c:1023
 msgid "_Tentative all"
 msgstr "Све са ре_зервом"
 
-#: ../modules/itip-formatter/itip-view.c:1022
+#: ../modules/itip-formatter/itip-view.c:1026
 msgid "_Tentative"
 msgstr "Са _резервом"
 
-#: ../modules/itip-formatter/itip-view.c:1025
-msgid "A_ccept all"
+#: ../modules/itip-formatter/itip-view.c:1029
+#| msgid "A_ccept all"
+msgid "Acce_pt all"
 msgstr "П_рихвати све"
 
-#: ../modules/itip-formatter/itip-view.c:1028
-msgid "A_ccept"
-msgstr "_Прихвати"
+#: ../modules/itip-formatter/itip-view.c:1032
+#| msgid "Accepted"
+msgid "Acce_pt"
+msgstr "Прих_ваћено"
 
-#: ../modules/itip-formatter/itip-view.c:1031
-msgid "_Send Information"
-msgstr "Пошаљи подат_ке"
+#: ../modules/itip-formatter/itip-view.c:1035
+#| msgid "_Send Information"
+msgid "Send _Information"
+msgstr "Пошаљи _податке"
 
-#: ../modules/itip-formatter/itip-view.c:1034
+#: ../modules/itip-formatter/itip-view.c:1038
 msgid "_Update Attendee Status"
 msgstr "Ажурирај стање учесни_ка"
 
-#: ../modules/itip-formatter/itip-view.c:1037
+#: ../modules/itip-formatter/itip-view.c:1041
 msgid "_Update"
 msgstr "_Освежи"
 
-#: ../modules/itip-formatter/itip-view.c:1464
-#: ../modules/itip-formatter/itip-view.c:1512
-#: ../modules/itip-formatter/itip-view.c:1581
+#: ../modules/itip-formatter/itip-view.c:1468
+#: ../modules/itip-formatter/itip-view.c:1516
+#: ../modules/itip-formatter/itip-view.c:1587
 msgid "Comment:"
 msgstr "Напомена:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1500
+#: ../modules/itip-formatter/itip-view.c:1504
 msgid "Send reply to sender"
 msgstr "Одговори пошиљаоцу"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1515
+#: ../modules/itip-formatter/itip-view.c:1519
 msgid "Send _updates to attendees"
 msgstr "Пошаљи _ажуриране податке учесницима"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1518
+#: ../modules/itip-formatter/itip-view.c:1522
 msgid "_Apply to all instances"
 msgstr "При_мени на све нивое"
 
-#: ../modules/itip-formatter/itip-view.c:1519
+#: ../modules/itip-formatter/itip-view.c:1523
 msgid "Show time as _free"
 msgstr "Прикажи време као _слободно"
 
-#: ../modules/itip-formatter/itip-view.c:1520
+#: ../modules/itip-formatter/itip-view.c:1524
 msgid "_Preserve my reminder"
 msgstr "_Очувај мој подсетник"
 
-#: ../modules/itip-formatter/itip-view.c:1521
+#: ../modules/itip-formatter/itip-view.c:1525
 msgid "_Inherit reminder"
 msgstr "_Наследи подсетник"
 
-#: ../modules/itip-formatter/itip-view.c:1845
+#: ../modules/itip-formatter/itip-view.c:1853
 msgid "_Tasks:"
 msgstr "_Задаци:"
 
-#: ../modules/itip-formatter/itip-view.c:1848
+#: ../modules/itip-formatter/itip-view.c:1856
 msgid "_Memos:"
 msgstr "_Белешке:"
 
+#: ../modules/itip-formatter/itip-view.c:3086
+msgid "Sa_ve"
+msgstr "Са_чувај"
+
 #. Translators: The first '%s' is replaced with a calendar name,
 #. * the second '%s' with an error message
-#: ../modules/itip-formatter/itip-view.c:3493
+#: ../modules/itip-formatter/itip-view.c:3503
 #, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "Не могу да учитам календара „%s“ (%s)"
 
-#: ../modules/itip-formatter/itip-view.c:3652
+#: ../modules/itip-formatter/itip-view.c:3662
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Једно заказивање у календару „%s“ је у исто време кад и овај састанак"
 
-#: ../modules/itip-formatter/itip-view.c:3679
+#: ../modules/itip-formatter/itip-view.c:3691
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Пронашао сам заказивање у календару „%s“"
 
-#: ../modules/itip-formatter/itip-view.c:3774
+#: ../modules/itip-formatter/itip-view.c:3804
 msgid "Unable to find any calendars"
 msgstr "Не могу да пронађем ниједан календар"
 
-#: ../modules/itip-formatter/itip-view.c:3782
+#: ../modules/itip-formatter/itip-view.c:3812
 msgid "Unable to find this meeting in any calendar"
 msgstr "Не могу да пронађем овај састанак ни у једном календару"
 
-#: ../modules/itip-formatter/itip-view.c:3787
+#: ../modules/itip-formatter/itip-view.c:3817
 msgid "Unable to find this task in any task list"
 msgstr "Не могу да пронађем овај задатак ни у једном списку задатака"
 
-#: ../modules/itip-formatter/itip-view.c:3792
+#: ../modules/itip-formatter/itip-view.c:3822
 msgid "Unable to find this memo in any memo list"
 msgstr "Ниједан списак белешки не садржи ову белешку"
 
-#: ../modules/itip-formatter/itip-view.c:4132
+#: ../modules/itip-formatter/itip-view.c:4171
 msgid "Opening the calendar. Please wait..."
 msgstr "Отварам календар. Молим сачекајте..."
 
-#: ../modules/itip-formatter/itip-view.c:4137
+#: ../modules/itip-formatter/itip-view.c:4176
 msgid "Searching for an existing version of this appointment"
 msgstr "Претрага за једном постојећом верзијом овог заказивања је у току"
 
-#: ../modules/itip-formatter/itip-view.c:4523
+#: ../modules/itip-formatter/itip-view.c:4568
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Не могу да пошаљем ставке календару „%s“.  %s"
 
-#: ../modules/itip-formatter/itip-view.c:4538
+#: ../modules/itip-formatter/itip-view.c:4584
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Послато календару „%s“ као прихваћено"
 
-#: ../modules/itip-formatter/itip-view.c:4543
+#: ../modules/itip-formatter/itip-view.c:4589
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Послато календару „%s“ као покушај"
 
-#: ../modules/itip-formatter/itip-view.c:4549
+#: ../modules/itip-formatter/itip-view.c:4595
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Послато календару „%s“ као одбијено"
 
-#: ../modules/itip-formatter/itip-view.c:4555
+#: ../modules/itip-formatter/itip-view.c:4601
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Послато календару „%s“ као отказано"
 
-#: ../modules/itip-formatter/itip-view.c:4576
-#: ../modules/itip-formatter/itip-view.c:5016
-#: ../modules/itip-formatter/itip-view.c:5123
+#: ../modules/itip-formatter/itip-view.c:4622
+#: ../modules/itip-formatter/itip-view.c:5063
+#: ../modules/itip-formatter/itip-view.c:5170
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Чувам измене у календар. Молим сачекајте..."
 
-#: ../modules/itip-formatter/itip-view.c:4617
+#: ../modules/itip-formatter/itip-view.c:4663
 msgid "Unable to parse item"
 msgstr "Не могу да обрадим ставку"
 
-#: ../modules/itip-formatter/itip-view.c:4807
+#: ../modules/itip-formatter/itip-view.c:4853
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Организатор је уклонио делегата „%s“ "
 
-#: ../modules/itip-formatter/itip-view.c:4822
+#: ../modules/itip-formatter/itip-view.c:4868
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Делегату је послато обавештење о отказивању"
 
-#: ../modules/itip-formatter/itip-view.c:4826
+#: ../modules/itip-formatter/itip-view.c:4872
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Не могу делегату да пошаљем обавештење о отказивању"
 
-#: ../modules/itip-formatter/itip-view.c:4874
+#: ../modules/itip-formatter/itip-view.c:4922
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Не могу да ажурирам учесника. %s"
 
-#: ../modules/itip-formatter/itip-view.c:4882
+#: ../modules/itip-formatter/itip-view.c:4929
 msgid "Attendee status updated"
 msgstr "Статус учесника је ажуриран"
 
-#: ../modules/itip-formatter/itip-view.c:4905
+#: ../modules/itip-formatter/itip-view.c:4952
 msgid "The meeting is invalid and cannot be updated"
 msgstr "Састанак није исправан и не може бити ажуриран"
 
-#: ../modules/itip-formatter/itip-view.c:4981
+#: ../modules/itip-formatter/itip-view.c:5028
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Статус учесника није ажуриран због неисправног стања"
 
-#: ../modules/itip-formatter/itip-view.c:5053
-#: ../modules/itip-formatter/itip-view.c:5093
+#: ../modules/itip-formatter/itip-view.c:5100
+#: ../modules/itip-formatter/itip-view.c:5140
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Статус учесника није освежен јер ставка више не постоји"
 
-#: ../modules/itip-formatter/itip-view.c:5156
+#: ../modules/itip-formatter/itip-view.c:5203
 msgid "Meeting information sent"
 msgstr "Податак о састанку је послат"
 
-#: ../modules/itip-formatter/itip-view.c:5161
+#: ../modules/itip-formatter/itip-view.c:5208
 msgid "Task information sent"
 msgstr "Податак о задатку је послат"
 
-#: ../modules/itip-formatter/itip-view.c:5166
+#: ../modules/itip-formatter/itip-view.c:5213
 msgid "Memo information sent"
 msgstr "Податак о белешци је послат"
 
-#: ../modules/itip-formatter/itip-view.c:5177
+#: ../modules/itip-formatter/itip-view.c:5224
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Не могу да пошаљем податак о састанку, састанак не постоји"
 
-#: ../modules/itip-formatter/itip-view.c:5182
+#: ../modules/itip-formatter/itip-view.c:5229
 msgid "Unable to send task information, the task does not exist"
 msgstr "Не могу да пошаљем податак о задатку, задужење не постоји"
 
-#: ../modules/itip-formatter/itip-view.c:5187
+#: ../modules/itip-formatter/itip-view.c:5234
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Не могу да пошаљем податак о белешци, белешка не постоји"
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5252
+#: ../modules/itip-formatter/itip-view.c:5299
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5257
+#: ../modules/itip-formatter/itip-view.c:5304
 msgid "Save Calendar"
 msgstr "Сачувај календар"
 
-#: ../modules/itip-formatter/itip-view.c:5310
-#: ../modules/itip-formatter/itip-view.c:5323
+#: ../modules/itip-formatter/itip-view.c:5357
+#: ../modules/itip-formatter/itip-view.c:5370
 msgid "The calendar attached is not valid"
 msgstr "Приложен календар није исправан"
 
-#: ../modules/itip-formatter/itip-view.c:5311
-#: ../modules/itip-formatter/itip-view.c:5324
+#: ../modules/itip-formatter/itip-view.c:5358
+#: ../modules/itip-formatter/itip-view.c:5371
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -16851,15 +18132,15 @@ msgstr ""
 "Порука пријављује да садржи календар, али тај календар није исправан "
 "иКалендар."
 
-#: ../modules/itip-formatter/itip-view.c:5366
-#: ../modules/itip-formatter/itip-view.c:5396
-#: ../modules/itip-formatter/itip-view.c:5496
+#: ../modules/itip-formatter/itip-view.c:5413
+#: ../modules/itip-formatter/itip-view.c:5443
+#: ../modules/itip-formatter/itip-view.c:5543
 msgid "The item in the calendar is not valid"
 msgstr "Ставка у календару није исправна"
 
-#: ../modules/itip-formatter/itip-view.c:5367
-#: ../modules/itip-formatter/itip-view.c:5397
-#: ../modules/itip-formatter/itip-view.c:5497
+#: ../modules/itip-formatter/itip-view.c:5414
+#: ../modules/itip-formatter/itip-view.c:5444
+#: ../modules/itip-formatter/itip-view.c:5544
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16867,11 +18148,11 @@ msgstr ""
 "Порука садржи календар, али он не садржи догађаје, задатке или податке "
 "слободно/заузето."
 
-#: ../modules/itip-formatter/itip-view.c:5412
+#: ../modules/itip-formatter/itip-view.c:5459
 msgid "The calendar attached contains multiple items"
 msgstr "Календар у прилогу садржи више ставки"
 
-#: ../modules/itip-formatter/itip-view.c:5413
+#: ../modules/itip-formatter/itip-view.c:5460
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16883,24 +18164,24 @@ msgstr ""
 # When "None" is selected we want the field to be cleared.
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
-#: ../modules/itip-formatter/itip-view.c:5937
+#: ../modules/itip-formatter/itip-view.c:5952
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ништа"
 
-#: ../modules/itip-formatter/itip-view.c:5953
+#: ../modules/itip-formatter/itip-view.c:5968
 msgid "Tentatively Accepted"
 msgstr "Прихваћено с резервом"
 
-#: ../modules/itip-formatter/itip-view.c:6096
+#: ../modules/itip-formatter/itip-view.c:6111
 msgid "This meeting recurs"
 msgstr "Овај састанак се понавља"
 
-#: ../modules/itip-formatter/itip-view.c:6099
+#: ../modules/itip-formatter/itip-view.c:6114
 msgid "This task recurs"
 msgstr "Овај задатак се понавља"
 
-#: ../modules/itip-formatter/itip-view.c:6102
+#: ../modules/itip-formatter/itip-view.c:6117
 msgid "This memo recurs"
 msgstr "Ова белешка се понавља"
 
@@ -16996,43 +18277,78 @@ msgstr "Директоријум _припреме:"
 msgid "Choose a mbox spool directory"
 msgstr "Изаберите директоријум мбокс припреме"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:149
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:82
-#: ../modules/plugin-manager/evolution-plugin-manager.c:160
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:137
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:53
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:80
+#: ../modules/plugin-manager/evolution-plugin-manager.c:159
 msgid "Configuration"
 msgstr "Подешавање"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:167
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:100
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:155
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:98
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "_Сервер:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:193
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:229
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:169
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:111
+msgid "_Port:"
+msgstr "_Порт:"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:227
 msgid "User_name:"
 msgstr "Корисничко_име:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:226
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:150
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:214
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:148
 msgid "Encryption _method:"
 msgstr "Начин _шифровања:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:241
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:165
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:229
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:163
 msgid "STARTTLS after connecting"
 msgstr "СТАРТТЛС након повезивања"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:169
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:233
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:167
 msgid "SSL on a dedicated port"
 msgstr "ССЛ на одеђеном порту"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:125
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:69
+msgid "_Use custom binary, instead of 'sendmail'"
+msgstr "_Користи произвољни извршни, уместо „sendmail“"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:73
+#| msgid "Custom Reminder:"
+msgid "_Custom binary:"
+msgstr "_Произвољни извршни:"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:90
+#| msgid "Use custom fonts"
+msgid "U_se custom arguments"
+msgstr "Користи _произвољне аргументе"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:94
+#| msgid "_Arguments:"
+msgid "Cus_tom arguments:"
+msgstr "Произвољни _аргументи:"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:112
+msgid ""
+"Default arguments are '-i -f %F -- %R', where\n"
+"   %F - stands for the From address\n"
+"   %R - stands for the recipient addresses"
+msgstr ""
+"Основни аргументи су „-i -f %F -- %R“, где\n"
+"   %F — означава адресу пошиљаоца\n"
+"   %R — означава адресе прималаца"
+
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
 msgid "Ser_ver requires authentication"
 msgstr "Сер_вер тражи потврђивање идентитета"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:211
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:209
 msgid "T_ype:"
 msgstr "_Врста:"
 
@@ -17044,7 +18360,7 @@ msgstr "Јаху! могућности"
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Додај Јаху! _календар и задатке овом налогу"
 
-#: ../modules/mail/e-mail-attachment-handler.c:390
+#: ../modules/mail/e-mail-attachment-handler.c:404
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
@@ -17053,46 +18369,46 @@ msgstr[1] "%d приложене поруке"
 msgstr[2] "%d приложених порука"
 msgstr[3] "Једна приложена порука"
 
-#: ../modules/mail/e-mail-shell-backend.c:244
+#: ../modules/mail/e-mail-shell-backend.c:238
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Порука"
 
-#: ../modules/mail/e-mail-shell-backend.c:246
+#: ../modules/mail/e-mail-shell-backend.c:240
 msgid "Compose a new mail message"
 msgstr "Саставите нову поруку"
 
-#: ../modules/mail/e-mail-shell-backend.c:254
+#: ../modules/mail/e-mail-shell-backend.c:248
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "Поштански _налог"
 
-#: ../modules/mail/e-mail-shell-backend.c:256
+#: ../modules/mail/e-mail-shell-backend.c:250
 msgid "Create a new mail account"
 msgstr "Направите нови налог за пошту"
 
-#: ../modules/mail/e-mail-shell-backend.c:261
+#: ../modules/mail/e-mail-shell-backend.c:255
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Фасцикла за пошту"
 
-#: ../modules/mail/e-mail-shell-backend.c:263
+#: ../modules/mail/e-mail-shell-backend.c:257
 msgid "Create a new mail folder"
 msgstr "Направите нову фасциклу за пошту"
 
-#: ../modules/mail/e-mail-shell-backend.c:561
+#: ../modules/mail/e-mail-shell-backend.c:555
 msgid "Mail Accounts"
 msgstr "Поштански налози"
 
-#: ../modules/mail/e-mail-shell-backend.c:570
+#: ../modules/mail/e-mail-shell-backend.c:564
 msgid "Mail Preferences"
 msgstr "Поставке поште"
 
-#: ../modules/mail/e-mail-shell-backend.c:579
+#: ../modules/mail/e-mail-shell-backend.c:573
 msgid "Composer Preferences"
 msgstr "Поставке састављача"
 
-#: ../modules/mail/e-mail-shell-backend.c:588
+#: ../modules/mail/e-mail-shell-backend.c:582
 msgid "Network Preferences"
 msgstr "Поставке мреже"
 
@@ -17102,122 +18418,132 @@ msgstr "Поставке мреже"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: The first item in the list, to be able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:890
+#: ../modules/mail/e-mail-shell-backend.c:883
 msgctxt "label"
 msgid "None"
 msgstr "Ништа"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1226
-#: ../modules/mail/e-mail-shell-view.c:975
+#: ../modules/mail/e-mail-shell-view-actions.c:1279
 msgid "_Disable Account"
 msgstr "_Онемогући налог"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1228
+#: ../modules/mail/e-mail-shell-view-actions.c:1281
 msgid "Disable this account"
 msgstr "Искључите овај налог"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1235
+#: ../modules/mail/e-mail-shell-view-actions.c:1288
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Трајно уклоните све обрисане поруке из свих фасцикли"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1242
+#: ../modules/mail/e-mail-shell-view-actions.c:1295
 msgid "Edit properties of this account"
 msgstr "Измените особине овог налога"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#| msgctxt "Meeting"
+#| msgid "Refresh"
+msgid "_Refresh"
+msgstr "_Освежи"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1302
+#| msgid "Edit properties of this account"
+msgid "Refresh list of folders of this account"
+msgstr "Освежите списак фасцикли за овај налог"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1307
 msgid "_Download Messages for Offline Usage"
 msgstr "_Преузми поруке за рад ван мреже"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1249
+#: ../modules/mail/e-mail-shell-view-actions.c:1309
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Преузмите поруке за налоге и фасцикле које су означене за рад ван мреже"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1254
+#: ../modules/mail/e-mail-shell-view-actions.c:1314
 msgid "Fl_ush Outbox"
 msgstr "Ис_празни „За слање“"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1321
 msgid "_Copy Folder To..."
 msgstr "_Умножи фасциклу у..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1263
+#: ../modules/mail/e-mail-shell-view-actions.c:1323
 msgid "Copy the selected folder into another folder"
 msgstr "Умножите изабрану фасциклу у другу фасциклу"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1270
+#: ../modules/mail/e-mail-shell-view-actions.c:1330
 msgid "Permanently remove this folder"
 msgstr "Трајно уклоните ову фасциклу"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1335
 msgid "E_xpunge"
 msgstr "Изба_ци"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1277
+#: ../modules/mail/e-mail-shell-view-actions.c:1337
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Трајно уклоните све обрисане поруке из ове фасцикле"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1342
 msgid "Mar_k All Messages as Read"
 msgstr "Означи све по_руке као прочитане"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1284
+#: ../modules/mail/e-mail-shell-view-actions.c:1344
 msgid "Mark all messages in the folder as read"
 msgstr "Означите све поруке у фасцикли као прочитане"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1349
 msgid "_Move Folder To..."
 msgstr "_Премести фасциклу у..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1291
+#: ../modules/mail/e-mail-shell-view-actions.c:1351
 msgid "Move the selected folder into another folder"
 msgstr "Преместите изабрану фасциклу у другу фасциклу"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1356
 msgid "_New..."
 msgstr "_Ново..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1298
+#: ../modules/mail/e-mail-shell-view-actions.c:1358
 msgid "Create a new folder for storing mail"
 msgstr "Направите нову фасциклу за смештај поште"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1305
+#: ../modules/mail/e-mail-shell-view-actions.c:1365
 msgid "Change the properties of this folder"
 msgstr "Измените особине ове фасцикле"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1312
+#: ../modules/mail/e-mail-shell-view-actions.c:1372
 msgid "Refresh the folder"
 msgstr "Освежите фасциклу"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1319
+#: ../modules/mail/e-mail-shell-view-actions.c:1379
 msgid "Change the name of this folder"
 msgstr "Промените назив ове фасцикле"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/mail/e-mail-shell-view-actions.c:1384
 msgid "Select Message _Thread"
 msgstr "Изабери _расправу"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1326
+#: ../modules/mail/e-mail-shell-view-actions.c:1386
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Означите све поруке исте расправе као изабрану поруку"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1391
 msgid "Select Message S_ubthread"
 msgstr "Изабери п_одниз поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1333
+#: ../modules/mail/e-mail-shell-view-actions.c:1393
 msgid "Select all replies to the currently selected message"
 msgstr "Изаберите све одговоре на тренутно изабрану поруку"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1345
+#: ../modules/mail/e-mail-shell-view-actions.c:1405
 msgid "Empty _Trash"
 msgstr "Избаци _смеће"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1347
+#: ../modules/mail/e-mail-shell-view-actions.c:1407
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Трајно уклоните све обрисане поруке са свих налога"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1352
+#: ../modules/mail/e-mail-shell-view-actions.c:1412
 msgid "_New Label"
 msgstr "_Нова ознака"
 
@@ -17226,210 +18552,201 @@ msgstr "_Нова ознака"
 # When "None" is selected we want the field to be cleared.
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
-#: ../modules/mail/e-mail-shell-view-actions.c:1361
+#: ../modules/mail/e-mail-shell-view-actions.c:1421
 msgid "N_one"
 msgstr "Н_ишта"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1375
+#: ../modules/mail/e-mail-shell-view-actions.c:1435
 msgid "_Manage Subscriptions"
 msgstr "_Управљај пријавама"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1377
-#: ../modules/mail/e-mail-shell-view-actions.c:1454
+#: ../modules/mail/e-mail-shell-view-actions.c:1437
+#: ../modules/mail/e-mail-shell-view-actions.c:1514
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Пријавите се или се одјавите са фасцикли на мрежним серверима"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1382
-#: ../modules/mail/e-mail-shell-view-actions.c:1403
+#: ../modules/mail/e-mail-shell-view-actions.c:1442
+#: ../modules/mail/e-mail-shell-view-actions.c:1463
 msgid "Send / _Receive"
 msgstr "Слање / п_римање"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1384
+#: ../modules/mail/e-mail-shell-view-actions.c:1444
 msgid "Send queued items and retrieve new items"
 msgstr "Пошаљите припремљене и довуците нове ставке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1389
+#: ../modules/mail/e-mail-shell-view-actions.c:1449
 msgid "R_eceive All"
 msgstr "П_рими све"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1391
+#: ../modules/mail/e-mail-shell-view-actions.c:1451
 msgid "Receive new items from all accounts"
 msgstr "Примите нове ставке са свих налога"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1396
+#: ../modules/mail/e-mail-shell-view-actions.c:1456
 msgid "_Send All"
 msgstr "П_ошаљи све"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1398
+#: ../modules/mail/e-mail-shell-view-actions.c:1458
 msgid "Send queued items in all accounts"
 msgstr "Пошаљите ставке на чекању у свим налозима"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1424
-#: ../widgets/misc/e-activity-proxy.c:313
-msgid "Cancel"
-msgstr "Откажи"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1426
+#: ../modules/mail/e-mail-shell-view-actions.c:1486
 msgid "Cancel the current mail operation"
 msgstr "Откажите тренутну операцију са поштом"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1431
+#: ../modules/mail/e-mail-shell-view-actions.c:1491
 msgid "Collapse All _Threads"
 msgstr "Скупи све _расправе"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1433
+#: ../modules/mail/e-mail-shell-view-actions.c:1493
 msgid "Collapse all message threads"
 msgstr "Скупите целокупно гранање расправа"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1438
+#: ../modules/mail/e-mail-shell-view-actions.c:1498
 msgid "E_xpand All Threads"
 msgstr "Разгранај све ра_справе"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1440
+#: ../modules/mail/e-mail-shell-view-actions.c:1500
 msgid "Expand all message threads"
 msgstr "Разгранајте све поруке у расправама"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1445
+#: ../modules/mail/e-mail-shell-view-actions.c:1505
 msgid "_Message Filters"
-msgstr "Ф_илтери поруке"
+msgstr "_Пропусници порука"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1447
+#: ../modules/mail/e-mail-shell-view-actions.c:1507
 msgid "Create or edit rules for filtering new mail"
-msgstr "Направите или уредите правила за филтрирање нове поште"
+msgstr "Направите или уредите правила за издвајање нове поште"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1452
+#: ../modules/mail/e-mail-shell-view-actions.c:1512
 msgid "_Subscriptions..."
 msgstr "_Пријаве..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1461
+#: ../modules/mail/e-mail-shell-view-actions.c:1521
 msgid "F_older"
 msgstr "_Фасцикла"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1468
+#: ../modules/mail/e-mail-shell-view-actions.c:1528
 msgid "_Label"
 msgstr "_Натпис"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1485
+#: ../modules/mail/e-mail-shell-view-actions.c:1545
 msgid "C_reate Search Folder From Search..."
 msgstr "Направи _фасциклу претраге из претраге..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1492
+#: ../modules/mail/e-mail-shell-view-actions.c:1552
 msgid "Search F_olders"
 msgstr "Фас_цикле претраге"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1494
+#: ../modules/mail/e-mail-shell-view-actions.c:1554
 msgid "Create or edit search folder definitions"
 msgstr "Направите или уредите дефиниције фасцикле претраге"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1529
+#: ../modules/mail/e-mail-shell-view-actions.c:1593
 msgid "_New Folder..."
 msgstr "_Нова фасцикла..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1557
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
 msgid "Show Message _Preview"
 msgstr "Прика_жи преглед поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1559
+#: ../modules/mail/e-mail-shell-view-actions.c:1623
 msgid "Show message preview pane"
 msgstr "Прикажите преглед поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1565
+#: ../modules/mail/e-mail-shell-view-actions.c:1629
 msgid "Show _Deleted Messages"
 msgstr "Прикажи о_брисане поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1567
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
 msgid "Show deleted messages with a line through them"
 msgstr "Прикажите обрисане поруке (као прецртане)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1573
+#: ../modules/mail/e-mail-shell-view-actions.c:1637
 msgid "_Group By Threads"
 msgstr "Групиши по _расправама"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1575
+#: ../modules/mail/e-mail-shell-view-actions.c:1639
 msgid "Threaded message list"
 msgstr "Списак порука по темама"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1581
+#: ../modules/mail/e-mail-shell-view-actions.c:1645
 msgid "_Unmatched Folder Enabled"
 msgstr "Укључена _непоклопљена фасцикла"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1583
+#: ../modules/mail/e-mail-shell-view-actions.c:1647
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Окида приликом укључивања непоклопљене фасцикле претраге"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1603
+#: ../modules/mail/e-mail-shell-view-actions.c:1667
 msgid "Show message preview below the message list"
 msgstr "Прикажите преглед поруке испод листе порука"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1610
+#: ../modules/mail/e-mail-shell-view-actions.c:1674
 msgid "Show message preview alongside the message list"
 msgstr "Прикажите преглед поруке поред списка порука"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1618
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
 msgid "All Messages"
 msgstr "Све поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1625
+#: ../modules/mail/e-mail-shell-view-actions.c:1689
 msgid "Important Messages"
 msgstr "Важне поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1632
+#: ../modules/mail/e-mail-shell-view-actions.c:1696
 msgid "Last 5 Days' Messages"
 msgstr "Поруке у задњих 5 дана"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1639
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
 msgid "Messages Not Junk"
 msgstr "Поруке нису ђубре"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1646
+#: ../modules/mail/e-mail-shell-view-actions.c:1710
 msgid "Messages with Attachments"
 msgstr "Поруке са прилозима"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1653
+#: ../modules/mail/e-mail-shell-view-actions.c:1717
 msgid "No Label"
 msgstr "Без ознаке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1660
+#: ../modules/mail/e-mail-shell-view-actions.c:1724
 msgid "Read Messages"
 msgstr "Прочитане поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1667
+#: ../modules/mail/e-mail-shell-view-actions.c:1731
 msgid "Unread Messages"
 msgstr "Непрочитане поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1719
+#: ../modules/mail/e-mail-shell-view-actions.c:1783
 msgid "Subject or Addresses contain"
 msgstr "Наслов или адресе садрже"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1729
+#: ../modules/mail/e-mail-shell-view-actions.c:1793
 msgid "All Accounts"
 msgstr "свим налозима"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1736
+#: ../modules/mail/e-mail-shell-view-actions.c:1800
 msgid "Current Account"
 msgstr "текућем налогу"
 
 # #-#-#-#-#  evolution.gnome-3-4.sr.po (evolution)  #-#-#-#-#
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1743
+#: ../modules/mail/e-mail-shell-view-actions.c:1807
 msgid "Current Folder"
 msgstr "текућој фасцикли"
 
-#: ../modules/mail/e-mail-shell-view.c:613
+#: ../modules/mail/e-mail-shell-view.c:616
 msgid "All Account Search"
 msgstr "Претрага свих налога"
 
-#: ../modules/mail/e-mail-shell-view.c:710
+#: ../modules/mail/e-mail-shell-view.c:717
 msgid "Account Search"
 msgstr "Претрага налога"
 
-#: ../modules/mail/e-mail-shell-view.c:973
-msgid "Proxy _Logout"
-msgstr "_Одјава са мрежног посредника"
-
-#: ../modules/mail/e-mail-shell-view-private.c:962
+#: ../modules/mail/e-mail-shell-view-private.c:1023
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -17438,7 +18755,7 @@ msgstr[1] "%d изабране, "
 msgstr[2] "%d изабраних, "
 msgstr[3] "%d изабрана, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:973
+#: ../modules/mail/e-mail-shell-view-private.c:1034
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -17447,8 +18764,8 @@ msgstr[1] "%d обрисане"
 msgstr[2] "%d обрисаних"
 msgstr[3] "%d обрисана"
 
-#: ../modules/mail/e-mail-shell-view-private.c:979
-#: ../modules/mail/e-mail-shell-view-private.c:986
+#: ../modules/mail/e-mail-shell-view-private.c:1040
+#: ../modules/mail/e-mail-shell-view-private.c:1047
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -17457,7 +18774,7 @@ msgstr[1] "%d непожељне"
 msgstr[2] "%d непожељних"
 msgstr[3] "%d непожељна"
 
-#: ../modules/mail/e-mail-shell-view-private.c:992
+#: ../modules/mail/e-mail-shell-view-private.c:1053
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -17466,7 +18783,7 @@ msgstr[1] "%d нацрта"
 msgstr[2] "%d нацрта"
 msgstr[3] "%d нацрт"
 
-#: ../modules/mail/e-mail-shell-view-private.c:998
+#: ../modules/mail/e-mail-shell-view-private.c:1059
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -17475,7 +18792,7 @@ msgstr[1] "%d непослате"
 msgstr[2] "%d непослатих"
 msgstr[3] "%d непослата"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1004
+#: ../modules/mail/e-mail-shell-view-private.c:1065
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -17484,7 +18801,7 @@ msgstr[1] "%d послате"
 msgstr[2] "%d послатих"
 msgstr[3] "%d послата"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1016
+#: ../modules/mail/e-mail-shell-view-private.c:1077
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -17493,7 +18810,7 @@ msgstr[1] "%d непрочитане, "
 msgstr[2] "%d непрочитаних, "
 msgstr[3] "%d непрочитана, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1019
+#: ../modules/mail/e-mail-shell-view-private.c:1080
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -17502,53 +18819,61 @@ msgstr[1] "%d укупно"
 msgstr[2] "%d укупно"
 msgstr[3] "%d укупно"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1042
+#: ../modules/mail/e-mail-shell-view-private.c:1103
 msgid "Trash"
 msgstr "Смеће"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1458
+#: ../modules/mail/e-mail-shell-view-private.c:1519
 msgid "Send / Receive"
 msgstr "Пошаљи / Прими"
 
-#: ../modules/mail/em-composer-prefs.c:509
+#: ../modules/mail/em-composer-prefs.c:492
 msgid "Language(s)"
 msgstr "Језик(ци)"
 
 # bug: requires a comment on usage
 # слично као за месеце и недеље
-#: ../modules/mail/em-mailer-prefs.c:86
-msgid "Every time"
-msgstr "сваки пут"
+#: ../modules/mail/em-mailer-prefs.c:80
+#| msgid "Every time"
+msgid "On exit, every time"
+msgstr "При изласку, сваки пут"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:87
-msgid "Once per day"
-msgstr "једном дневно"
+#: ../modules/mail/em-mailer-prefs.c:81
+#| msgid "Once per day"
+msgid "On exit, once per day"
+msgstr "При изласку, једном дневно"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:88
-msgid "Once per week"
-msgstr "једном недељно"
+#: ../modules/mail/em-mailer-prefs.c:82
+#| msgid "Once per week"
+msgid "On exit, once per week"
+msgstr "При изласку, једном недељено"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:89
-msgid "Once per month"
-msgstr "једном месечно"
+#: ../modules/mail/em-mailer-prefs.c:83
+#| msgid "Once per month"
+msgid "On exit, once per month"
+msgstr "При изласку, једном месечно"
 
-#: ../modules/mail/em-mailer-prefs.c:318
+#: ../modules/mail/em-mailer-prefs.c:84
+msgid "Immediately, on folder leave"
+msgstr "Одмах, при напуштању фасцикле"
+
+#: ../modules/mail/em-mailer-prefs.c:313
 msgid "Header"
 msgstr "Заглавље"
 
-#: ../modules/mail/em-mailer-prefs.c:322
+#: ../modules/mail/em-mailer-prefs.c:317
 msgid "Contains Value"
 msgstr "Садржи вредност"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1145
+#: ../modules/mail/em-mailer-prefs.c:1141
 msgid "_Date header:"
 msgstr "Заглавље _датума:"
 
-#: ../modules/mail/em-mailer-prefs.c:1146
+#: ../modules/mail/em-mailer-prefs.c:1142
 msgid "Show _original header value"
 msgstr "Прикажи _оригиналну вредност заглавља"
 
@@ -17558,24 +18883,24 @@ msgstr "Да ли желите да Еволуцију учините подра
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:323
+#: ../modules/mdn/evolution-mdn.c:311
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "Ваша порука за %s на тему „%s“ на %s је прочитана."
 
 #. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:390
+#: ../modules/mdn/evolution-mdn.c:378
 #, c-format
 msgid "Delivery Notification for \"%s\""
 msgstr "Обавештење о пријему за „%s“"
 
-#: ../modules/mdn/evolution-mdn.c:543
+#: ../modules/mdn/evolution-mdn.c:536
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "Пошаљи повратницу читања за „%s“"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:548
+#: ../modules/mdn/evolution-mdn.c:541
 msgid "_Notify Sender"
 msgstr "Обавести _пошиљаоца"
 
@@ -17607,7 +18932,7 @@ msgstr ""
 "Еволуција ће се вратити у режим на мрежи када мрежна веза буде била "
 "успостављена."
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:417
+#: ../modules/online-accounts/camel-sasl-xoauth.c:298
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
 "from which to obtain an authentication token."
@@ -17615,43 +18940,43 @@ msgstr ""
 "Не могу да пронађем одговарајући налог на услузи „орг.гном.Налози на мрежи“ "
 "са које бих добио приступ потврђивању идентитета."
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:504
+#: ../modules/online-accounts/camel-sasl-xoauth.c:377
 msgid "OAuth"
 msgstr "ОАут"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:506
+#: ../modules/online-accounts/camel-sasl-xoauth.c:379
 msgid ""
 "This option will connect to the server by way of the GNOME Online Accounts "
 "service"
 msgstr ""
 "Ова опција ће се повезати на сервер путем Гномове услуге налога на мрежи"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Author(s)"
 msgstr "Аутор(и)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:255
+#: ../modules/plugin-manager/evolution-plugin-manager.c:254
 msgid "Plugin Manager"
 msgstr "Управник прикључака"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:270
+#: ../modules/plugin-manager/evolution-plugin-manager.c:269
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Напомена: неке измене неће бити укључене пре поновног покретања"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:299
+#: ../modules/plugin-manager/evolution-plugin-manager.c:298
 msgid "Overview"
 msgstr "Преглед"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:368
-#: ../modules/plugin-manager/evolution-plugin-manager.c:451
+#: ../modules/plugin-manager/evolution-plugin-manager.c:367
+#: ../modules/plugin-manager/evolution-plugin-manager.c:450
 msgid "Plugin"
 msgstr "Прикључак"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:489
+#: ../modules/plugin-manager/evolution-plugin-manager.c:488
 msgid "_Plugins"
 msgstr "_Прикључци"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:490
+#: ../modules/plugin-manager/evolution-plugin-manager.c:489
 msgid "Enable and disable plugins"
 msgstr "Укључује и искључује додатке"
 
@@ -17671,23 +18996,23 @@ msgstr "Прикажи ХТМЛ издање"
 msgid "Display HTML version of multipart/alternative message"
 msgstr "Приказује издање ХТМЛ-а поруке из више делова или неке друге"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
-#: ../modules/prefer-plain/plugin/config-ui.c:46
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../modules/prefer-plain/plugin/config-ui.c:44
 msgid "Show HTML if present"
 msgstr "Прикажи ХТМЛ ако постоји"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
-#: ../modules/prefer-plain/plugin/config-ui.c:47
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
+#: ../modules/prefer-plain/plugin/config-ui.c:45
 msgid "Let Evolution choose the best part to show."
 msgstr "Пушта да Еволуција изабере најбољи део за приказ."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:86
-#: ../modules/prefer-plain/plugin/config-ui.c:50
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../modules/prefer-plain/plugin/config-ui.c:48
 msgid "Show plain text if present"
 msgstr "Прикажи обичан текст ако постоји"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
-#: ../modules/prefer-plain/plugin/config-ui.c:51
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
+#: ../modules/prefer-plain/plugin/config-ui.c:49
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -17695,13 +19020,13 @@ msgstr ""
 "Приказује део са обичним текстом, ако постоји, иначе пушта да Еволуција "
 "изабере најбољи део за приказ."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:91
-#: ../modules/prefer-plain/plugin/config-ui.c:55
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../modules/prefer-plain/plugin/config-ui.c:53
 msgid "Only ever show plain text"
 msgstr "Искључиво приказуј обичан текст"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:92
-#: ../modules/prefer-plain/plugin/config-ui.c:56
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
+#: ../modules/prefer-plain/plugin/config-ui.c:54
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -17709,11 +19034,11 @@ msgstr ""
 "Увек приказује део са обичним текстом, прилажући остале делове у поруку, по "
 "избору."
 
-#: ../modules/prefer-plain/plugin/config-ui.c:107
+#: ../modules/prefer-plain/plugin/config-ui.c:105
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Прикажи по_тиснуте ХТМЛ делове као прилоге"
 
-#: ../modules/prefer-plain/plugin/config-ui.c:129
+#: ../modules/prefer-plain/plugin/config-ui.c:127
 msgid "HTML _Mode"
 msgstr "ХТМЛ _режим"
 
@@ -17730,59 +19055,48 @@ msgstr "Модел текста"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "Прегледа поруке као обичан текст, чак и ако садрже ХТМЛ."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:192
+#: ../modules/spamassassin/evolution-spamassassin.c:184
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr "Нисам успео да изродим Убицу спама (%s): "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:215
+#: ../modules/spamassassin/evolution-spamassassin.c:207
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr "Нисам успео да пошаљем садржај поруке поште до Убице спама: "
 
 # bug: plural-forms
-#: ../modules/spamassassin/evolution-spamassassin.c:234
+#: ../modules/spamassassin/evolution-spamassassin.c:226
 #, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr "Нисам успео да запишем „%s“ у Убици спама: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:262
+#: ../modules/spamassassin/evolution-spamassassin.c:254
 msgid "Failed to read output from SpamAssassin: "
 msgstr "Нисам успео да прочитам излаз из Убице спама: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:317
+#: ../modules/spamassassin/evolution-spamassassin.c:309
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr "Или се Убица спама урушио или није успео да анализира поруку поште"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:885
+#: ../modules/spamassassin/evolution-spamassassin.c:747
 msgid "SpamAssassin Options"
 msgstr "Опције Убице спама"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:900
+#: ../modules/spamassassin/evolution-spamassassin.c:762
 msgid "I_nclude remote tests"
 msgstr "У_кључи мрежне провере"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:914
+#: ../modules/spamassassin/evolution-spamassassin.c:776
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "Ово ће Убицу спама учинити поузданијим , али споријим."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:1123
+#: ../modules/spamassassin/evolution-spamassassin.c:1033
 msgid "SpamAssassin"
 msgstr "Убица спама"
 
-#: ../modules/startup-wizard/e-mail-config-import-page.c:204
-#: ../widgets/misc/e-import-assistant.c:403
-msgid "Please select the information that you would like to import:"
-msgstr "Изаберите податке које желите да увезете:"
-
-#: ../modules/startup-wizard/e-mail-config-import-page.c:233
-#: ../widgets/misc/e-import-assistant.c:559
-#, c-format
-msgid "From %s:"
-msgstr "Од %s:"
-
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/startup-wizard/e-mail-config-import-page.c:264
+#: ../modules/startup-wizard/e-mail-config-import-page.c:262
 #: ../modules/startup-wizard/e-mail-config-import-progress-page.c:342
 msgid "Importing Files"
 msgstr "Увозим датотеке"
@@ -17795,7 +19109,7 @@ msgstr "Увожење је отказано."
 msgid "Import complete."
 msgstr "Увожење је завршено."
 
-#: ../modules/startup-wizard/e-startup-assistant.c:154
+#: ../modules/startup-wizard/e-startup-assistant.c:156
 msgid ""
 "Welcome to Evolution.\n"
 "\n"
@@ -17807,7 +19121,7 @@ msgstr ""
 "Неколико наредних екрана ће омогућити Еволуцији да се повеже на ваше налоге "
 "ел. поште и да увезе датотеке из других програма."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:242
+#: ../modules/startup-wizard/evolution-startup-wizard.c:239
 msgid "Loading accounts..."
 msgstr "Учитавам налоге..."
 
@@ -17819,11 +19133,11 @@ msgstr "Обликуј _као..."
 msgid "_Other languages"
 msgstr "_Други језици"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:342
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:371
 msgid "Text Highlight"
 msgstr "Истицање текста"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:348
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:372
 msgid "Syntax highlighting of mail parts"
 msgstr "Истицање садржаја делова поште"
 
@@ -18045,25 +19359,25 @@ msgstr "_ТЦСХ"
 msgid "_VHDL"
 msgstr "_ВХДЛ"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:118
-#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:201
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:126
+#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:195
 msgid "Show F_ull vCard"
 msgstr "Прикажи _пуну вКарту"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:121
-#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:219
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:129
+#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:213
 msgid "Show Com_pact vCard"
 msgstr "Прикажи _сажету вКарту"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:145
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:153
 msgid "Save _To Addressbook"
 msgstr "Сачувај _у адресар"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:165
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:173
 msgid "There is one other contact."
 msgstr "Постоји још један контакт."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:171
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:179
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
@@ -18072,33 +19386,32 @@ msgstr[1] "Постоје још %d контакта."
 msgstr[2] "Постоји још %d контакта."
 msgstr[3] "Постоји још %d контакт."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:196
-#| msgid "Addressbok Contact"
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:204
 msgid "Addressbook Contact"
 msgstr "Контакт адресара"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:202
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:205
 msgid "Display the part as an addressbook contact"
 msgstr "Прикажите делове као контакт адресара"
 
-#: ../modules/web-inspector/evolution-web-inspector.c:88
+#: ../modules/web-inspector/evolution-web-inspector.c:89
 msgid "_Inspect..."
 msgstr "_Надгледај..."
 
-#: ../modules/web-inspector/evolution-web-inspector.c:90
+#: ../modules/web-inspector/evolution-web-inspector.c:91
 msgid "Inspect the HTML content (debugging feature)"
 msgstr "Надгледај ХТМЛ садржај (уклањање грешака)"
 
-#: ../modules/web-inspector/evolution-web-inspector.c:102
+#: ../modules/web-inspector/evolution-web-inspector.c:103
 msgid "Evolution Web Inspector"
 msgstr "Надзорник веба Еволуције"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../plugins/attachment-reminder/attachment-reminder.c:121
 msgid "_Do not show this message again."
 msgstr "_Не приказуј поново ову поруку."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:590
-#: ../plugins/templates/templates.c:469
+#: ../plugins/attachment-reminder/attachment-reminder.c:583
+#: ../plugins/templates/templates.c:473
 msgid "Keywords"
 msgstr "Кључне речи"
 
@@ -18130,35 +19443,35 @@ msgstr "Подсетник прилога"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "Подсећа када заборавите да додате прилог у поруку."
 
-#: ../plugins/bbdb/bbdb.c:650 ../plugins/bbdb/bbdb.c:659
+#: ../plugins/bbdb/bbdb.c:655 ../plugins/bbdb/bbdb.c:664
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Аутоматски контакти"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:674
+#: ../plugins/bbdb/bbdb.c:679
 msgid "Create _address book entries when sending mails"
 msgstr "Направи уносе у _адресар при слању поште"
 
-#: ../plugins/bbdb/bbdb.c:682
+#: ../plugins/bbdb/bbdb.c:687
 msgid "Select Address book for Automatic Contacts"
 msgstr "Изабери адресар за Аутоматске контакте"
 
-#: ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:704
 msgid "Instant Messaging Contacts"
 msgstr "Контакти тренутних порука"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:714
+#: ../plugins/bbdb/bbdb.c:719
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "_Усклађује слике и податке контакта са листом другара из Пиџина"
 
-#: ../plugins/bbdb/bbdb.c:722
+#: ../plugins/bbdb/bbdb.c:727
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Бира адресар за листу пријатеља Пиџина"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:735
+#: ../plugins/bbdb/bbdb.c:740
 msgid "Synchronize with _buddy list now"
 msgstr "Усклади са _листом другара сада"
 
@@ -18177,9 +19490,10 @@ msgstr ""
 "Ослобађа вас тешког рада у управљању адресаром.\n"
 "\n"
 "Аутоматски попуњава адресар именима и адресама ел. поште када одговарате на "
-"поруке. Такође попуњава податке за контакт брзим гласником из списка другара."
+"поруке.  Такође попуњава податке за контакт брзим гласником из списка "
+"другара."
 
-#: ../plugins/dbx-import/dbx-importer.c:287
+#: ../plugins/dbx-import/dbx-importer.c:282
 msgid "Importing Outlook Express data"
 msgstr "Увозим податке Аутлук Експреса"
 
@@ -18238,17 +19552,17 @@ 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.
-#: ../plugins/email-custom-header/email-custom-header.c:357
+#: ../plugins/email-custom-header/email-custom-header.c:360
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "Ништа"
 
-#: ../plugins/email-custom-header/email-custom-header.c:530
+#: ../plugins/email-custom-header/email-custom-header.c:534
 msgid "_Custom Header"
 msgstr "_Прилагођено заглавље"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:799
+#: ../plugins/email-custom-header/email-custom-header.c:804
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -18256,12 +19570,12 @@ msgstr ""
 "Формат за навођење кључа прилагођеног заглавља је:\n"
 "Вредности назив кључа прилагођеног заглавља су раздвојени са „;“."
 
-#: ../plugins/email-custom-header/email-custom-header.c:851
+#: ../plugins/email-custom-header/email-custom-header.c:857
 msgid "Key"
 msgstr "Кључ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:867
-#: ../plugins/templates/templates.c:477
+#: ../plugins/email-custom-header/email-custom-header.c:874
+#: ../plugins/templates/templates.c:482
 msgid "Values"
 msgstr "Вредности"
 
@@ -18278,11 +19592,11 @@ msgstr "Додајте прилагођена заглавља одлазним
 msgid "Email Custom Header"
 msgstr "Прилагођено заглавље ел. поште"
 
-#: ../plugins/external-editor/external-editor.c:114
+#: ../plugins/external-editor/external-editor.c:112
 msgid "Command to be executed to launch the editor: "
 msgstr "Наредба за извршавање ради покретања уређивача: "
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:113
 msgid ""
 "For XEmacs use \"xemacs\"\n"
 "For Vim use \"gvim -f\""
@@ -18290,8 +19604,8 @@ msgstr ""
 "За иКсЕмакс користите „xemacs“\n"
 "За Вим користите „gvim -f“"
 
-#: ../plugins/external-editor/external-editor.c:396
-#: ../plugins/external-editor/external-editor.c:398
+#: ../plugins/external-editor/external-editor.c:412
+#: ../plugins/external-editor/external-editor.c:414
 msgid "Compose in External Editor"
 msgstr "Саставља у спољном уређивачу"
 
@@ -18339,23 +19653,27 @@ msgstr ""
 "Покренут је спољни уређивач. Прозор састављача поруке није могуће затворити "
 "док је активан уређивач."
 
-#: ../plugins/face/face.c:292
+#: ../plugins/face/face.c:171 ../smime/gui/certificate-manager.c:322
+msgid "Unknown error"
+msgstr "Непозната грешка"
+
+#: ../plugins/face/face.c:289
 msgid "Select a Face Picture"
 msgstr "Изаберите слику лица"
 
-#: ../plugins/face/face.c:302
+#: ../plugins/face/face.c:299
 msgid "Image files"
 msgstr "Датотеке слика"
 
-#: ../plugins/face/face.c:361
+#: ../plugins/face/face.c:358
 msgid "_Insert Face picture by default"
 msgstr "_Унапред уметни слику контакта"
 
-#: ../plugins/face/face.c:374
+#: ../plugins/face/face.c:371
 msgid "Load new _Face picture"
 msgstr "Учитај нову _слику контакта"
 
-#: ../plugins/face/face.c:435
+#: ../plugins/face/face.c:432
 msgid "Include _Face"
 msgstr "Укључи _слику"
 
@@ -18396,55 +19714,55 @@ msgstr "Унутрашња слика"
 msgid "View image attachments directly in mail messages."
 msgstr "Прегледајте прилоге са сликама директно у порукама."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:365
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
 msgid "Get List _Archive"
 msgstr "Прибави _архиву листе"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:369
 msgid "Get an archive of the list this message belongs to"
 msgstr "Прибавља архиву листе којој ова порука припада"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:372
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
 msgid "Get List _Usage Information"
 msgstr "Прибави податке о _коришћењу листе"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:376
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Прибавља податке о коришћењу листе којој ова порука припада"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:379
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
 msgid "Contact List _Owner"
 msgstr "_Власник контакт листе"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:383
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Јавите се власнику дописне листе којој ова порука припада"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:386
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:388
 msgid "_Post Message to List"
 msgstr "_Пошаљи поруку на листу"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:388
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:390
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Саставите поруку за дописну листу којој ова порука припада"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:393
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:395
 msgid "_Subscribe to List"
 msgstr "При_јави се на листу"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:395
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:397
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Пријавите се на дописну листу којој ова порука припада"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:400
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:402
 msgid "_Unsubscribe from List"
 msgstr "О_дјави се са листе"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:402
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:404
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Одјавите се са дописне листе којој ова порука припада"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:409
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:411
 msgid "Mailing _List"
 msgstr "Дописна _листа"
 
@@ -18533,8 +19851,8 @@ msgstr ""
 "\n"
 "Заглавље: {0}"
 
-#: ../plugins/mail-notification/mail-notification.c:385
-#: ../plugins/mail-notification/mail-notification.c:421
+#: ../plugins/mail-notification/mail-notification.c:384
+#: ../plugins/mail-notification/mail-notification.c:420
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -18545,48 +19863,48 @@ msgstr[3] "Примили сте нову поруку."
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:410
+#: ../plugins/mail-notification/mail-notification.c:409
 #, c-format
 msgid "Subject: %s"
 msgstr "Наслов: %s"
 
 # shell:noshell-reason title
-#: ../plugins/mail-notification/mail-notification.c:427
+#: ../plugins/mail-notification/mail-notification.c:426
 msgid "New email in Evolution"
 msgstr "Нова пошта у Еволуцији"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:458
+#: ../plugins/mail-notification/mail-notification.c:461
 #, c-format
 msgid "Show %s"
 msgstr "Прикажи %s"
 
-#: ../plugins/mail-notification/mail-notification.c:658
+#: ../plugins/mail-notification/mail-notification.c:663
 msgid "_Play sound when a new message arrives"
 msgstr "Звучно _обавести када стигне нова порука"
 
-#: ../plugins/mail-notification/mail-notification.c:690
+#: ../plugins/mail-notification/mail-notification.c:695
 msgid "_Beep"
 msgstr "_Запишти"
 
-#: ../plugins/mail-notification/mail-notification.c:703
+#: ../plugins/mail-notification/mail-notification.c:708
 msgid "Use sound _theme"
 msgstr "Користи звук _теме"
 
-#: ../plugins/mail-notification/mail-notification.c:722
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "Play _file:"
 msgstr "Пусти звучну _датотеку:"
 
-#: ../plugins/mail-notification/mail-notification.c:731
+#: ../plugins/mail-notification/mail-notification.c:736
 msgid "Select sound file"
 msgstr "Изаберите звучну датотеку"
 
-#: ../plugins/mail-notification/mail-notification.c:787
+#: ../plugins/mail-notification/mail-notification.c:792
 msgid "Notify new messages for _Inbox only"
 msgstr "Обавести о новим порукама само за _Сандуче"
 
-#: ../plugins/mail-notification/mail-notification.c:797
+#: ../plugins/mail-notification/mail-notification.c:802
 msgid "Show _notification when a new message arrives"
 msgstr "Прикажи _обавештење када пристигне нова порука"
 
@@ -18599,12 +19917,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Обавештава вас када стигне нова порука."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:239
+#: ../plugins/mail-to-task/mail-to-task.c:233
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Сачињено из поруке коју шаље %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:622
+#: ../plugins/mail-to-task/mail-to-task.c:617
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18613,7 +19931,7 @@ msgstr ""
 "Изабрани календар већ садржи догађај „%s“. Желите ли да уредите стари "
 "догађај?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:620
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18621,7 +19939,7 @@ msgid ""
 msgstr ""
 "Изабрани списак већ садржи задатак „%s“. Желите ли да уредите стари задатак?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:628
+#: ../plugins/mail-to-task/mail-to-task.c:623
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18629,8 +19947,7 @@ msgid ""
 msgstr ""
 "Изабрани списак већ садржи белешку „%s“. Желите ли да уредите стару белешку?"
 
-#. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:647
+#: ../plugins/mail-to-task/mail-to-task.c:643
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -18651,8 +19968,7 @@ msgstr[3] ""
 "Изабрали сте %d пошта да преведете у догађаје. Да ли заиста желите све да их "
 "додате?"
 
-#. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:653
+#: ../plugins/mail-to-task/mail-to-task.c:650
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -18673,8 +19989,7 @@ msgstr[3] ""
 "Изабрали сте %d пошта да преведете у задатке. Да ли заиста желите све да их "
 "додате?"
 
-#. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:659
+#: ../plugins/mail-to-task/mail-to-task.c:657
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -18695,11 +20010,11 @@ msgstr[3] ""
 "Изабрали сте %d пошта да преведете у белешке. Да ли заиста желите све да их "
 "додате?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:680
+#: ../plugins/mail-to-task/mail-to-task.c:678
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Да ли желите да наставите са превођењем преосталих пошта?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:755
+#: ../plugins/mail-to-task/mail-to-task.c:754
 msgid "[No Summary]"
 msgstr "[Без сажетка]"
 
@@ -18707,77 +20022,82 @@ msgstr "[Без сажетка]"
 msgid "Invalid object returned from a server"
 msgstr "Неисправан објекат враћен са сервера"
 
-#: ../plugins/mail-to-task/mail-to-task.c:819
+#: ../plugins/mail-to-task/mail-to-task.c:820
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Дошло је до грешке у обради: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:844
+#: ../plugins/mail-to-task/mail-to-task.c:847
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Не могу да отворим календар. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:844
-msgid "Unknown error."
-msgstr "Непозната грешка."
-
-#: ../plugins/mail-to-task/mail-to-task.c:851
+#: ../plugins/mail-to-task/mail-to-task.c:854
+#| msgid ""
+#| "Selected source is read only, thus cannot create event there. Select "
+#| "other source, please."
 msgid ""
-"Selected source is read only, thus cannot create event there. Select other "
-"source, please."
+"Selected calendar is read only, thus cannot create event there. Select other "
+"calendar, please."
 msgstr ""
-"Изабрани извор је само за читање, стога не можете направити догађај. "
-"Изаберите други извор."
+"Изабрани календар је само за читање, стога не можете направити догађај. "
+"Изаберите други календар."
 
-#: ../plugins/mail-to-task/mail-to-task.c:854
+#: ../plugins/mail-to-task/mail-to-task.c:857
+#| msgid ""
+#| "Selected source is read only, thus cannot create task there. Select other "
+#| "source, please."
 msgid ""
-"Selected source is read only, thus cannot create task there. Select other "
-"source, please."
+"Selected task list is read only, thus cannot create task there. Select other "
+"task list, please."
 msgstr ""
-"Изабрани извор је само за читање, стога не можете направити задатак. "
-"Изаберите други извор."
+"Изабрани списак задатака је само за читање, стога не можете направити "
+"задатак. Изаберите други списак задатака."
 
-#: ../plugins/mail-to-task/mail-to-task.c:857
+#: ../plugins/mail-to-task/mail-to-task.c:860
+#| msgid ""
+#| "Selected source is read only, thus cannot create memo there. Select other "
+#| "source, please."
 msgid ""
-"Selected source is read only, thus cannot create memo there. Select other "
-"source, please."
+"Selected memo list is read only, thus cannot create memo there. Select other "
+"memo list, please."
 msgstr ""
-"Изабрани извор је само за читање, стога не можете направити белешку. "
-"Изаберите други извор."
+"Изабрани списак белешки је само за читање, стога не можете направити "
+"белешку. Изаберите други списак белешки."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1186
+#: ../plugins/mail-to-task/mail-to-task.c:1189
 msgid "No writable calendar is available."
-msgstr "Нема доступног календара за уписивање"
+msgstr "Нема доступног календара за уписивање."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1270
+#: ../plugins/mail-to-task/mail-to-task.c:1276
 msgid "Create an _Appointment"
 msgstr "Направи _заказивање"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1272
+#: ../plugins/mail-to-task/mail-to-task.c:1278
 msgid "Create a new event from the selected message"
 msgstr "Прави нови догађај од изабране поруке"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1277
+#: ../plugins/mail-to-task/mail-to-task.c:1283
 msgid "Create a Mem_o"
 msgstr "Направи белешк_у"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1279
+#: ../plugins/mail-to-task/mail-to-task.c:1285
 msgid "Create a new memo from the selected message"
 msgstr "Прави нову белешку од изабране поруке"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1284
+#: ../plugins/mail-to-task/mail-to-task.c:1290
 msgid "Create a _Task"
 msgstr "Направи _задатак"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1286
+#: ../plugins/mail-to-task/mail-to-task.c:1292
 msgid "Create a new task from the selected message"
 msgstr "Прави нови задатак од изабране поруке"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1294
+#: ../plugins/mail-to-task/mail-to-task.c:1300
 msgid "Create a _Meeting"
 msgstr "Направи _састанак"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1296
+#: ../plugins/mail-to-task/mail-to-task.c:1302
 msgid "Create a new meeting from the selected message"
 msgstr "Прави нови састанак од изабране поруке"
 
@@ -18785,11 +20105,11 @@ msgstr "Прави нови састанак од изабране поруке"
 msgid "Convert a mail message to a task."
 msgstr "Претвара поруку у задатак."
 
-#: ../plugins/mark-all-read/mark-all-read.c:43
+#: ../plugins/mark-all-read/mark-all-read.c:42
 msgid "Also mark messages in subfolders?"
 msgstr "Да означим такође и поруке у подфасциклама?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:45
+#: ../plugins/mark-all-read/mark-all-read.c:44
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -18797,16 +20117,16 @@ msgstr ""
 "Желите ли да означите поруке као прочитане само у тренутној фасцикли, или и "
 "оне у подфасциклама?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:185
+#: ../plugins/mark-all-read/mark-all-read.c:184
 msgid "In Current Folder and _Subfolders"
 msgstr "У тренутној фасцикли и _подфасциклама"
 
 # bug: requires a comment on usage
-#: ../plugins/mark-all-read/mark-all-read.c:199
+#: ../plugins/mark-all-read/mark-all-read.c:198
 msgid "In Current _Folder Only"
 msgstr "Само у тренутној _фасцикли"
 
-#: ../plugins/mark-all-read/mark-all-read.c:545
+#: ../plugins/mark-all-read/mark-all-read.c:544
 msgid "Mark Me_ssages as Read"
 msgstr "Означи по_руке као прочитане"
 
@@ -18830,37 +20150,37 @@ msgstr "Личне фасцикле Аутлука (.pst)"
 msgid "Import Outlook messages from PST file"
 msgstr "Увози Аутлук поруке из ПСТ датотеке"
 
-#: ../plugins/pst-import/pst-importer.c:555
+#: ../plugins/pst-import/pst-importer.c:552
 msgid "_Mail"
 msgstr "_Пошта"
 
-#: ../plugins/pst-import/pst-importer.c:584
+#: ../plugins/pst-import/pst-importer.c:581
 msgid "Destination folder:"
 msgstr "Одредишна фасцикла:"
 
-#: ../plugins/pst-import/pst-importer.c:594
+#: ../plugins/pst-import/pst-importer.c:591
 msgid "_Address Book"
 msgstr "_Адресар"
 
-#: ../plugins/pst-import/pst-importer.c:599
+#: ../plugins/pst-import/pst-importer.c:596
 msgid "A_ppointments"
 msgstr "За_казано"
 
-#: ../plugins/pst-import/pst-importer.c:604 ../views/tasks/galview.xml.h:1
+#: ../plugins/pst-import/pst-importer.c:601 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
 msgstr "_Задаци"
 
-#: ../plugins/pst-import/pst-importer.c:609
+#: ../plugins/pst-import/pst-importer.c:606
 msgid "_Journal entries"
 msgstr "Уноси _дневника"
 
-#: ../plugins/pst-import/pst-importer.c:721
+#: ../plugins/pst-import/pst-importer.c:718
 msgid "Importing Outlook data"
 msgstr "Увозим Аутлук податке"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:145
-#: ../plugins/publish-calendar/publish-calendar.c:152
+#: ../plugins/publish-calendar/publish-calendar.c:142
+#: ../plugins/publish-calendar/publish-calendar.c:149
 msgid "Calendar Publishing"
 msgstr "Објављивање календара"
 
@@ -18872,49 +20192,49 @@ msgstr "Места"
 msgid "Publish calendars to the web."
 msgstr "Објавите календаре на веб."
 
-#: ../plugins/publish-calendar/publish-calendar.c:211
-#: ../plugins/publish-calendar/publish-calendar.c:463
+#: ../plugins/publish-calendar/publish-calendar.c:214
+#: ../plugins/publish-calendar/publish-calendar.c:472
 #, c-format
 msgid "Could not open %s:"
 msgstr "Не могу да отворим %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:213
+#: ../plugins/publish-calendar/publish-calendar.c:216
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "Не могу да отворим %s: непозната грешка"
 
-#: ../plugins/publish-calendar/publish-calendar.c:233
+#: ../plugins/publish-calendar/publish-calendar.c:236
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "Дошло је до грешке приликом објављивања на %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:235
+#: ../plugins/publish-calendar/publish-calendar.c:238
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "Објављивање на %s је успешно завршено"
 
-#: ../plugins/publish-calendar/publish-calendar.c:279
+#: ../plugins/publish-calendar/publish-calendar.c:282
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Нисам успео да монтирам %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:626
+#: ../plugins/publish-calendar/publish-calendar.c:635
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "E_nable"
 msgstr "О_могући"
 
-#: ../plugins/publish-calendar/publish-calendar.c:774
+#: ../plugins/publish-calendar/publish-calendar.c:785
 msgid "Are you sure you want to remove this location?"
 msgstr "Сигурно желите да уклоните ову локацију?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1104
+#: ../plugins/publish-calendar/publish-calendar.c:1124
 msgid "Could not create publish thread."
 msgstr "Не могу да објавим расправу."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1112
+#: ../plugins/publish-calendar/publish-calendar.c:1134
 msgid "_Publish Calendar Information"
 msgstr "Објави распоред из _календара"
 
@@ -18968,7 +20288,7 @@ msgstr "О_бјави као:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:18
 msgid "Publishing _Frequency:"
-msgstr "Учеста_лост објављивања"
+msgstr "Учесталост _објављивања:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Time _duration:"
@@ -19012,11 +20332,11 @@ msgstr "Место објављивања"
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "Не могу да објавим календар: позадински процес више не постоји"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:539
+#: ../plugins/publish-calendar/url-editor-dialog.c:540
 msgid "New Location"
 msgstr "Ново место"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:541
+#: ../plugins/publish-calendar/url-editor-dialog.c:542
 msgid "Edit Location"
 msgstr "Измените место"
 
@@ -19099,7 +20419,7 @@ msgstr "_Обавиј вредности са:"
 msgid "Comma separated values (.csv)"
 msgstr "Вредности раздвојене зарезом (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:165 ../shell/e-shell-utils.c:199
+#: ../plugins/save-calendar/ical-format.c:165 ../shell/e-shell-utils.c:197
 msgid "iCalendar (.ics)"
 msgstr "иКалендар (.ics)"
 
@@ -19116,31 +20436,31 @@ msgstr "Чува календар или списак задатака на ди
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:146
+#: ../plugins/save-calendar/rdf-format.c:147
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:377
+#: ../plugins/save-calendar/rdf-format.c:378
 msgid "RDF (.rdf)"
 msgstr "РДФ (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:123
+#: ../plugins/save-calendar/save-calendar.c:121
 msgid "_Format:"
 msgstr "_Формат:"
 
-#: ../plugins/save-calendar/save-calendar.c:185
+#: ../plugins/save-calendar/save-calendar.c:187
 msgid "Select destination file"
 msgstr "Изаберите одредишну датотеку"
 
-#: ../plugins/save-calendar/save-calendar.c:340
+#: ../plugins/save-calendar/save-calendar.c:343
 msgid "Save the selected calendar to disk"
 msgstr "Сачувај изабрани календар на диск"
 
-#: ../plugins/save-calendar/save-calendar.c:371
+#: ../plugins/save-calendar/save-calendar.c:374
 msgid "Save the selected memo list to disk"
 msgstr "Сачувај изабрану белешку на диск"
 
-#: ../plugins/save-calendar/save-calendar.c:402
+#: ../plugins/save-calendar/save-calendar.c:405
 msgid "Save the selected task list to disk"
 msgstr "Сачувај изабрани списак задатака на диск"
 
@@ -19154,35 +20474,40 @@ msgstr ""
 "[тема], $ORIG[шаље], $ORIG[прима] or $ORIG[порука], које ће бити замењене "
 "вредностима из ел. поште на коју одговарате."
 
-#: ../plugins/templates/templates.c:1112
+#: ../plugins/templates/templates.c:1135
 msgid "No Title"
 msgstr "Без звања"
 
-#: ../plugins/templates/templates.c:1221
+#: ../plugins/templates/templates.c:1244
 msgid "Save as _Template"
 msgstr "Сачувај као _шаблон"
 
-#: ../plugins/templates/templates.c:1223
+#: ../plugins/templates/templates.c:1246
 msgid "Save as Template"
 msgstr "Чува као шаблон"
 
-#: ../shell/e-shell.c:313
+#: ../shell/e-shell.c:303
 msgid "Preparing to go offline..."
 msgstr "Припремам се за рад ван мреже..."
 
-#: ../shell/e-shell.c:366
+#: ../shell/e-shell.c:356
 msgid "Preparing to go online..."
 msgstr "Припремам се за рад на мрежи..."
 
-#: ../shell/e-shell.c:437
+#: ../shell/e-shell.c:430
+#| msgid "Preparing to quit..."
+msgid "Preparing to quit"
+msgstr "Припремам се да изађем"
+
+#: ../shell/e-shell.c:436
 msgid "Preparing to quit..."
 msgstr "Припремам се да изађем..."
 
-#: ../shell/e-shell-content.c:727 ../shell/e-shell-content.c:728
+#: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
 msgid "Searches"
 msgstr "Претраге"
 
-#: ../shell/e-shell-content.c:771
+#: ../shell/e-shell-content.c:764
 msgid "Save Search"
 msgstr "Сачувај претрагу"
 
@@ -19190,306 +20515,306 @@ msgstr "Сачувај претрагу"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:940
+#: ../shell/e-shell-searchbar.c:1143
 msgid "Sho_w:"
 msgstr "Прика_жи:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:973
+#: ../shell/e-shell-searchbar.c:1186
 msgid "Sear_ch:"
 msgstr "П_ретражи:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1036
+#: ../shell/e-shell-searchbar.c:1272
 msgid "i_n"
 msgstr " _у "
 
-#: ../shell/e-shell-utils.c:197
+#: ../shell/e-shell-utils.c:195
 msgid "vCard (.vcf)"
 msgstr "вКарта (.vcf)"
 
-#: ../shell/e-shell-utils.c:220
+#: ../shell/e-shell-utils.c:218
 msgid "All Files (*)"
 msgstr "Све датотеке (*)"
 
-#: ../shell/e-shell-view.c:304
+#: ../shell/e-shell-view.c:295
 msgid "Saving user interface state"
 msgstr "Чувам стање корисничког сучеља"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:642
+#: ../shell/e-shell-window-actions.c:74
 msgid "translator-credits"
 msgstr ""
 "Игор Несторовић <igor@prevod.org>\n"
 "Слободан Д, Средојевић <slobo@akrep.be>\n"
+"Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
 "\n"
 "http://prevod.org — превод на српски језик."
 
-#: ../shell/e-shell-window-actions.c:653
+#: ../shell/e-shell-window-actions.c:85
 msgid "Evolution Website"
 msgstr "Веб страница Еволуције"
 
-#: ../shell/e-shell-window-actions.c:891
+#: ../shell/e-shell-window-actions.c:323
 msgid "Categories Editor"
 msgstr "Уређивач категорија"
 
-#: ../shell/e-shell-window-actions.c:1228
+#: ../shell/e-shell-window-actions.c:660
 msgid "Bug Buddy is not installed."
 msgstr "Бубаждајин помоћник није инсталиран."
 
-#: ../shell/e-shell-window-actions.c:1230
+#: ../shell/e-shell-window-actions.c:661
 msgid "Bug Buddy could not be run."
 msgstr "Бубаждајин помоћник не може бити покренут."
 
-#: ../shell/e-shell-window-actions.c:1411
+#: ../shell/e-shell-window-actions.c:841
 msgid "Show information about Evolution"
 msgstr "Приказује податке о Еволуцији"
 
-#: ../shell/e-shell-window-actions.c:1416
-#: ../shell/e-shell-window-actions.c:1430
+#: ../shell/e-shell-window-actions.c:846 ../shell/e-shell-window-actions.c:860
 msgid "_Close Window"
 msgstr "_Затвори прозор"
 
-#: ../shell/e-shell-window-actions.c:1437
+#: ../shell/e-shell-window-actions.c:867
 msgid "_Contents"
 msgstr "_Садржај"
 
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:869
 msgid "Open the Evolution User Guide"
 msgstr "Отворите корисничко упутство Еволуције"
 
-#: ../shell/e-shell-window-actions.c:1465
+#: ../shell/e-shell-window-actions.c:895
 msgid "I_mport..."
 msgstr "_Увези..."
 
-#: ../shell/e-shell-window-actions.c:1467
+#: ../shell/e-shell-window-actions.c:897
 msgid "Import data from other programs"
 msgstr "Увезите податке из других програма"
 
-#: ../shell/e-shell-window-actions.c:1472
+#: ../shell/e-shell-window-actions.c:902
 msgid "New _Window"
 msgstr "Нови _прозор"
 
-#: ../shell/e-shell-window-actions.c:1474
+#: ../shell/e-shell-window-actions.c:904
 msgid "Create a new window displaying this view"
 msgstr "Отворите нов прозор за приказ овог прегледа"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:916
 msgid "Available Cate_gories"
 msgstr "Доступне _категорије"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:918
 msgid "Manage available categories"
 msgstr "Управљајте доступним категоријама"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:930
 msgid "_Quick Reference"
 msgstr "_Кратак подсетник"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:932
 msgid "Show Evolution's shortcut keys"
 msgstr "Прикажите пречице тастатуре Еволуције"
 
-#: ../shell/e-shell-window-actions.c:1509
+#: ../shell/e-shell-window-actions.c:939
 msgid "Exit the program"
 msgstr "Изађите из програма"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:944
 msgid "_Advanced Search..."
 msgstr "_Напредна претрага..."
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:946
 msgid "Construct a more advanced search"
 msgstr "Образујте напреднију претрагу"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:953
 msgid "Clear the current search parameters"
 msgstr "Очистите параметре тренутне претраге"
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:958
 msgid "_Edit Saved Searches..."
 msgstr "_Уреди сачуване претраге..."
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:960
 msgid "Manage your saved searches"
 msgstr "Управљајте вашим сачуваним претрагама"
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:967
 msgid "Click here to change the search type"
 msgstr "Кликните овде да промените врсту претраге"
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:972
 msgid "_Find Now"
 msgstr "Про_нађи сада"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:974
 msgid "Execute the current search parameters"
 msgstr "Извршите параметре тренутне претраге"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:979
 msgid "_Save Search..."
 msgstr "_Сачувај претрагу..."
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:981
 msgid "Save the current search parameters"
 msgstr "Сачувајте параметре тренутне претраге"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:993
 msgid "Submit _Bug Report..."
 msgstr "Пошаљи извештај о _грешци..."
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:995
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Пошаљите извештај о грешци Бубаждајиним помоћником"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1000
 msgid "_Work Offline"
 msgstr "Рад _ван мреже"
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1002
 msgid "Put Evolution into offline mode"
 msgstr "Поставите Еволуцију у рад ван мреже"
 
-#: ../shell/e-shell-window-actions.c:1577
+#: ../shell/e-shell-window-actions.c:1007
 msgid "_Work Online"
 msgstr "_Рад на мрежи"
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1009
 msgid "Put Evolution into online mode"
 msgstr "Поставите Еволуцију у рад на мрежи"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1037
 msgid "Lay_out"
 msgstr "_Распоред"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1044
 msgid "_New"
 msgstr "_Ново"
 
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1051
 msgid "_Search"
 msgstr "Пре_тражи"
 
-#: ../shell/e-shell-window-actions.c:1628
+#: ../shell/e-shell-window-actions.c:1058
 msgid "_Switcher Appearance"
 msgstr "_Изглед пребацивача"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1072
 msgid "_Window"
 msgstr "Про_зор"
 
-#: ../shell/e-shell-window-actions.c:1671
+#: ../shell/e-shell-window-actions.c:1101
 msgid "Show Side _Bar"
 msgstr "Прикажи _бочну површ"
 
-#: ../shell/e-shell-window-actions.c:1673
+#: ../shell/e-shell-window-actions.c:1103
 msgid "Show the side bar"
 msgstr "Прикажите бочну површ"
 
-#: ../shell/e-shell-window-actions.c:1679
+#: ../shell/e-shell-window-actions.c:1109
 msgid "Show _Buttons"
 msgstr "Прикажи _дугмад"
 
-#: ../shell/e-shell-window-actions.c:1681
+#: ../shell/e-shell-window-actions.c:1111
 msgid "Show the switcher buttons"
 msgstr "Прикажите дугмад пребацивача"
 
-#: ../shell/e-shell-window-actions.c:1687
+#: ../shell/e-shell-window-actions.c:1117
 msgid "Show _Status Bar"
 msgstr "Прикажи траку _стања"
 
-#: ../shell/e-shell-window-actions.c:1689
+#: ../shell/e-shell-window-actions.c:1119
 msgid "Show the status bar"
 msgstr "Прикажите траку стања"
 
-#: ../shell/e-shell-window-actions.c:1695
+#: ../shell/e-shell-window-actions.c:1125
 msgid "Show _Tool Bar"
 msgstr "Прикажи траку _алата"
 
-#: ../shell/e-shell-window-actions.c:1697
+#: ../shell/e-shell-window-actions.c:1127
 msgid "Show the tool bar"
 msgstr "Прикажите траку алата"
 
-#: ../shell/e-shell-window-actions.c:1719
+#: ../shell/e-shell-window-actions.c:1149
 msgid "_Icons Only"
 msgstr "Само _иконице"
 
-#: ../shell/e-shell-window-actions.c:1721
+#: ../shell/e-shell-window-actions.c:1151
 msgid "Display window buttons with icons only"
 msgstr "Прикажите дугмад прозора само са иконицама"
 
-#: ../shell/e-shell-window-actions.c:1726
+#: ../shell/e-shell-window-actions.c:1156
 msgid "_Text Only"
 msgstr "Само _текст"
 
-#: ../shell/e-shell-window-actions.c:1728
+#: ../shell/e-shell-window-actions.c:1158
 msgid "Display window buttons with text only"
 msgstr "Прикажите дугмад прозора само са текстом"
 
-#: ../shell/e-shell-window-actions.c:1733
+#: ../shell/e-shell-window-actions.c:1163
 msgid "Icons _and Text"
 msgstr "Иконице _и текст"
 
-#: ../shell/e-shell-window-actions.c:1735
+#: ../shell/e-shell-window-actions.c:1165
 msgid "Display window buttons with icons and text"
 msgstr "Прикажите дугмад прозора са иконицама и текстом"
 
-#: ../shell/e-shell-window-actions.c:1740
+#: ../shell/e-shell-window-actions.c:1170
 msgid "Tool_bar Style"
 msgstr "Стил тра_ке алата"
 
-#: ../shell/e-shell-window-actions.c:1742
+#: ../shell/e-shell-window-actions.c:1172
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Прикажите дугмад прозора користећи подешавања траке алата радне површи"
 
-#: ../shell/e-shell-window-actions.c:1750
+#: ../shell/e-shell-window-actions.c:1180
 msgid "Define Views..."
 msgstr "Одреди прегледе..."
 
-#: ../shell/e-shell-window-actions.c:1752
+#: ../shell/e-shell-window-actions.c:1182
 msgid "Create or edit views"
 msgstr "Направите или измените прегледе"
 
-#: ../shell/e-shell-window-actions.c:1757
+#: ../shell/e-shell-window-actions.c:1187
 msgid "Save Custom View..."
 msgstr "Сачувај прилагођен преглед..."
 
-#: ../shell/e-shell-window-actions.c:1759
+#: ../shell/e-shell-window-actions.c:1189
 msgid "Save current custom view"
 msgstr "Сачувајте тренутни кориснички преглед"
 
-#: ../shell/e-shell-window-actions.c:1766
+#: ../shell/e-shell-window-actions.c:1196
 msgid "C_urrent View"
 msgstr "Т_ренутни преглед"
 
-#: ../shell/e-shell-window-actions.c:1776
+#: ../shell/e-shell-window-actions.c:1206
 msgid "Custom View"
 msgstr "Прилагођен преглед"
 
-#: ../shell/e-shell-window-actions.c:1778
+#: ../shell/e-shell-window-actions.c:1208
 msgid "Current view is a customized view"
 msgstr "Тренутан преглед је подесио корисник"
 
-#: ../shell/e-shell-window-actions.c:1788
+#: ../shell/e-shell-window-actions.c:1218
 msgid "Change the page settings for your current printer"
 msgstr "Измените поставке странице за тренутни штампач"
 
-#: ../shell/e-shell-window-actions.c:2178
+#: ../shell/e-shell-window-actions.c:1608
 #, c-format
 msgid "Switch to %s"
 msgstr "Пређи на %s"
 
-#: ../shell/e-shell-window-actions.c:2299
+#: ../shell/e-shell-window-actions.c:1729
 #, c-format
 msgid "Select view: %s"
 msgstr "Изабери преглед: %s"
 
-#: ../shell/e-shell-window-actions.c:2400
+#: ../shell/e-shell-window-actions.c:1830
 msgid "Execute these search parameters"
 msgstr "Извршите ове параметре претраге"
 
@@ -19504,7 +20829,7 @@ msgid "%s - Evolution"
 msgstr "%s — Еволуција"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:184
+#: ../shell/main.c:182
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19529,17 +20854,17 @@ msgstr ""
 "Ова верзија Еволуције још није потпуна. Све је ближа,\n"
 "али неке могућности или нису завршене или не раде исправно.\n"
 "\n"
-"Уколико желите стабилну верзију Еволуције, уклоните ову верзију,\n"
-"и инсталирајте верзију %s.\n"
+"Уколико желите стабилно издање Еволуције, уклоните ово издање,\n"
+"и инсталирајте издање %s.\n"
 "\n"
-"Уколико пронађете грешке, пријавите нам их на bugzilla.gnome.org.\n"
+"Уколико пронађете грешке, пријавите нам их на „bugzilla.gnome.org“.\n"
 "Овај производ долази без јемства и није намењен појединцима који\n"
 "су склони насилном понашању или бесу.\n"
 "\n"
 "Надамо се да ћете уживати у плодовима нашег напорног рада, и \n"
 "жељно ишчекујемо ваш допринос!\n"
 
-#: ../shell/main.c:208
+#: ../shell/main.c:206
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19547,13 +20872,13 @@ msgstr ""
 "Хвала\n"
 "Тим Еволуције\n"
 
-#: ../shell/main.c:214
+#: ../shell/main.c:212
 msgid "Do not tell me again"
 msgstr "Немој ми поново рећи"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:305
+#: ../shell/main.c:303
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -19561,48 +20886,57 @@ msgstr ""
 "Покреће Еволуцију приказујући одређене компоненте. Доступне опције су: "
 "„mail“, „calendar“, „contacts“, „tasks“ и „memos“"
 
-#: ../shell/main.c:309
+#: ../shell/main.c:307
 msgid "Apply the given geometry to the main window"
 msgstr "Примени дату геометрију на главни прозор"
 
-#: ../shell/main.c:313
+#: ../shell/main.c:311
 msgid "Start in online mode"
 msgstr "Почни рад на мрежи"
 
-#: ../shell/main.c:315
+#: ../shell/main.c:313
 msgid "Ignore network availability"
 msgstr "Занемари доступност мреже"
 
-#: ../shell/main.c:317
+#: ../shell/main.c:315
 msgid "Start in \"express\" mode"
 msgstr "Почни у „експресном“ режиму"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:318
 msgid "Forcibly shut down Evolution"
 msgstr "Силом угаси Еволуцију"
 
-#: ../shell/main.c:323
+#: ../shell/main.c:321
 msgid "Disable loading of any plugins."
 msgstr "Искључи учитавање свих додатака."
 
-#: ../shell/main.c:325
+#: ../shell/main.c:323
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Искључи окно за преглед поште, контакта и задатака."
 
-#: ../shell/main.c:329
+#: ../shell/main.c:327
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Увози адресе датотека датих као остатак аргумената."
 
 # shell:noshell-reason title
-#: ../shell/main.c:331
+#: ../shell/main.c:329
 msgid "Request a running Evolution process to quit"
 msgstr "Захтева крај покренутог процеса Еволуције"
 
-#: ../shell/main.c:504
+#: ../shell/main.c:419
+#, c-format
+msgid ""
+"Cannot start Evolution.  Another Evolution instance may be unresponsive. "
+"System error: %s"
+msgstr ""
+"Не могу да покренем Еволуцију.  Други примерак Еволуције можда не одговара. "
+"Грешка система: %s"
+
+#: ../shell/main.c:515 ../shell/main.c:520
 msgid "- The Evolution PIM and Email Client"
 msgstr "— Еволуција руководилац личним податацима и клијент ел. поште"
 
-#: ../shell/main.c:569
+#: ../shell/main.c:587
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19611,7 +20945,7 @@ msgstr ""
 "%s: „--online“ и „--offline“ се не могу користити заједно.\n"
 "  Покрените „%s --help“ за више података.\n"
 
-#: ../shell/main.c:575
+#: ../shell/main.c:593
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -19659,70 +20993,7 @@ msgstr ""
 "решење можете прво да покушате да надоградите на Еволуцију 2, а затим на "
 "Еволуцију 3."
 
-#: ../smclient/eggdesktopfile.c:166
-#, c-format
-msgid "File is not a valid .desktop file"
-msgstr "Ово није исправна „.desktop“ датотека"
-
-#: ../smclient/eggdesktopfile.c:189
-#, c-format
-msgid "Unrecognized desktop file Version '%s'"
-msgstr "Непрепознато издање датотеке радне површи „%s“"
-
-#: ../smclient/eggdesktopfile.c:959
-#, c-format
-msgid "Starting %s"
-msgstr "Покрећем %s"
-
-#: ../smclient/eggdesktopfile.c:1102
-#, c-format
-msgid "Application does not accept documents on command line"
-msgstr "Програм не прихвата документе из линије наредби"
-
-#: ../smclient/eggdesktopfile.c:1170
-#, c-format
-msgid "Unrecognized launch option: %d"
-msgstr "Непозната опција покретања: %d"
-
-#: ../smclient/eggdesktopfile.c:1370
-#, c-format
-msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr "Не могу да проследим адресе докумената на „Type=Link“ унос"
-
-#: ../smclient/eggdesktopfile.c:1391
-#, c-format
-msgid "Not a launchable item"
-msgstr "Није ставка за покретање"
-
-#: ../smclient/eggsmclient.c:229
-msgid "Disable connection to session manager"
-msgstr "Искључује везу са управником сесије"
-
-#: ../smclient/eggsmclient.c:232
-msgid "Specify file containing saved configuration"
-msgstr "Наводи датотеку која садржи сачувана подешавања"
-
-#: ../smclient/eggsmclient.c:232
-msgid "FILE"
-msgstr "ДАТОТЕКА"
-
-#: ../smclient/eggsmclient.c:235
-msgid "Specify session management ID"
-msgstr "Наводи ИБ управника сесије"
-
-#: ../smclient/eggsmclient.c:235
-msgid "ID"
-msgstr "ИБ"
-
-#: ../smclient/eggsmclient.c:256
-msgid "Session management options:"
-msgstr "Могућности управљања сесијом:"
-
-#: ../smclient/eggsmclient.c:257
-msgid "Show session management options"
-msgstr "Приказује могућности управљања сесијом"
-
-#: ../smime/gui/ca-trust-dialog.c:107
+#: ../smime/gui/ca-trust-dialog.c:109
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19733,109 +21004,176 @@ msgstr ""
 "\n"
 "Уредите поставке поверења:"
 
-#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:96
-#: ../smime/gui/certificate-manager.c:116
+#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
 msgid "Certificate Name"
 msgstr "Назив уверења"
 
-#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
+#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
 msgid "Issued To Organization"
 msgstr "Издато је организацији"
 
-#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
 msgid "Issued To Organizational Unit"
 msgstr "Издато је организационој јединици"
 
-#: ../smime/gui/certificate-manager.c:80
-#: ../smime/gui/certificate-manager.c:100
-#: ../smime/gui/certificate-manager.c:118 ../smime/gui/smime-ui.ui.h:12
-#: ../smime/lib/e-cert.c:542
+#: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
+#: ../smime/gui/certificate-manager.c:114
+#: ../smime/gui/certificate-viewer.c:638 ../smime/lib/e-asn1-object.c:134
 msgid "Serial Number"
 msgstr "Серијски број"
 
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:101
-#: ../smime/gui/certificate-manager.c:119
+#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
+#: ../smime/gui/certificate-manager.c:115
 msgid "Purposes"
 msgstr "Намене"
 
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:102
-#: ../smime/gui/certificate-manager.c:120 ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
+#: ../smime/gui/certificate-manager.c:116
+#: ../smime/gui/certificate-viewer.c:640
 msgid "Issued By"
 msgstr "Издавач"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121
+#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:117
 msgid "Issued By Organization"
 msgstr "Издала је организација"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122
+#: ../smime/gui/certificate-manager.c:80
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:118
 msgid "Issued By Organizational Unit"
 msgstr "Издала је организациона јединица"
 
-#: ../smime/gui/certificate-manager.c:85
-#: ../smime/gui/certificate-manager.c:105
-#: ../smime/gui/certificate-manager.c:123
+#: ../smime/gui/certificate-manager.c:81
+#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:119
 msgid "Issued"
 msgstr "Издато"
 
-#: ../smime/gui/certificate-manager.c:86
-#: ../smime/gui/certificate-manager.c:106
-#: ../smime/gui/certificate-manager.c:124
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:120
 msgid "Expires"
 msgstr "Истиче"
 
-#: ../smime/gui/certificate-manager.c:87
-#: ../smime/gui/certificate-manager.c:107
-#: ../smime/gui/certificate-manager.c:125 ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/certificate-manager.c:83
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:121
+#: ../smime/gui/certificate-viewer.c:650
 msgid "SHA1 Fingerprint"
 msgstr "СХА1 отисак"
 
-#: ../smime/gui/certificate-manager.c:88
-#: ../smime/gui/certificate-manager.c:108
-#: ../smime/gui/certificate-manager.c:126 ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:122
+#: ../smime/gui/certificate-viewer.c:651
 msgid "MD5 Fingerprint"
 msgstr "МД5 Отисак"
 
-#: ../smime/gui/certificate-manager.c:97
-#: ../smime/gui/certificate-manager.c:117
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
 msgid "Email Address"
 msgstr "Адреса ел. поште"
 
-#: ../smime/gui/certificate-manager.c:589
+#: ../smime/gui/certificate-manager.c:614
 msgid "Select a certificate to import..."
 msgstr "Изаберите уверење за увоз..."
 
-#: ../smime/gui/certificate-manager.c:602
+#: ../smime/gui/certificate-manager.c:628
 msgid "All files"
 msgstr "Све датотеке"
 
-#: ../smime/gui/certificate-manager.c:637
+#: ../smime/gui/certificate-manager.c:664
 msgid "Failed to import certificate"
 msgstr "Нисам успео да увезем уверење"
 
-#: ../smime/gui/certificate-manager.c:1013
+#: ../smime/gui/certificate-manager.c:1046
 msgid "All PKCS12 files"
 msgstr "Све ПКЦС12 датотеке"
 
-#: ../smime/gui/certificate-manager.c:1030
+#: ../smime/gui/certificate-manager.c:1063
 msgid "All email certificate files"
 msgstr "Све датотеке уверења поште"
 
-#: ../smime/gui/certificate-manager.c:1047
+#: ../smime/gui/certificate-manager.c:1080
 msgid "All CA certificate files"
 msgstr "Све датотеке ЦА уверења"
 
-#: ../smime/gui/certificate-viewer.c:349
-#, c-format
-msgid "Certificate Viewer: %s"
-msgstr "Прегледач уверења: %s"
+#: ../smime/gui/certificate-viewer.c:292
+#| msgid "<Not Part of Certificate>"
+msgid "Not part of certificate"
+msgstr "Није део уверења"
+
+#: ../smime/gui/certificate-viewer.c:600
+msgid "This certificate has been verified for the following uses:"
+msgstr "Ово уверење је проверено за следеће потребе:"
 
-#: ../smime/gui/cert-trust-dialog.c:148
+#: ../smime/gui/certificate-viewer.c:604 ../smime/lib/e-asn1-object.c:387
+msgid "SSL Client Certificate"
+msgstr "Уверење ССЛ клијента"
+
+#: ../smime/gui/certificate-viewer.c:609 ../smime/lib/e-asn1-object.c:391
+msgid "SSL Server Certificate"
+msgstr "Уверење ССЛ сервера"
+
+#: ../smime/gui/certificate-viewer.c:614
+msgid "Email Signer Certificate"
+msgstr "Уверење потписника ел. поруке"
+
+#: ../smime/gui/certificate-viewer.c:619
+msgid "Email Recipient Certificate"
+msgstr "Уверење примаоца ел. поруке"
+
+#: ../smime/gui/certificate-viewer.c:634
+msgid "Issued To"
+msgstr "Коме је издато"
+
+#: ../smime/gui/certificate-viewer.c:635 ../smime/gui/certificate-viewer.c:641
+msgid "Common Name (CN)"
+msgstr "Заједничко име (CN)"
+
+#: ../smime/gui/certificate-viewer.c:636 ../smime/gui/certificate-viewer.c:642
+msgid "Organization (O)"
+msgstr "Организација (O)"
+
+#: ../smime/gui/certificate-viewer.c:637 ../smime/gui/certificate-viewer.c:643
+msgid "Organizational Unit (OU)"
+msgstr "Организациона јединица (OU)"
+
+#: ../smime/gui/certificate-viewer.c:645
+msgid "Validity"
+msgstr "Исправност"
+
+#: ../smime/gui/certificate-viewer.c:646
+msgid "Issued On"
+msgstr "Издато је"
+
+#: ../smime/gui/certificate-viewer.c:647
+msgid "Expires On"
+msgstr "Истиче"
+
+#: ../smime/gui/certificate-viewer.c:649
+msgid "Fingerprints"
+msgstr "Отисци"
+
+#: ../smime/gui/certificate-viewer.c:671
+msgid "Certificate Hierarchy"
+msgstr "Хијерархија уверења"
+
+#: ../smime/gui/certificate-viewer.c:674
+msgid "Certificate Fields"
+msgstr "Поља уверења"
+
+#: ../smime/gui/certificate-viewer.c:677
+msgid "Field Value"
+msgstr "Вредност поља"
+
+#: ../smime/gui/certificate-viewer.c:679
+msgid "Details"
+msgstr "Појединости"
+
+#: ../smime/gui/cert-trust-dialog.c:153
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -19844,7 +21182,7 @@ msgstr ""
 "Пошто верујете издаваоцу овог уверења, онда верујете и у аутентичност овог "
 "уверења осим ако овде не назначите другачије"
 
-#: ../smime/gui/cert-trust-dialog.c:152
+#: ../smime/gui/cert-trust-dialog.c:158
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -19853,17 +21191,17 @@ msgstr ""
 "Пошто не верујете издаваоцу овог уверења, онда не верујете ни у аутентичност "
 "овог уверења осим ако овде не назначите другачије"
 
-#: ../smime/gui/component.c:50
+#: ../smime/gui/component.c:51
 #, c-format
 msgid "Enter the password for '%s'"
 msgstr "Унесите лозинку за „%s“"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:76
+#: ../smime/gui/component.c:77
 msgid "Enter new password for certificate database"
 msgstr "Унесите нову лозинку за базу уверења"
 
-#: ../smime/gui/component.c:79
+#: ../smime/gui/component.c:80
 msgid "Enter new password"
 msgstr "Унесите нову лозинку"
 
@@ -19890,133 +21228,61 @@ msgstr ""
 msgid "Select certificate"
 msgstr "Изаберите уверење"
 
-#: ../smime/gui/smime-ui.ui.h:3 ../smime/lib/e-cert.c:802
-msgid "SSL Client Certificate"
-msgstr "Уверење ССЛ клијента"
-
-#: ../smime/gui/smime-ui.ui.h:4 ../smime/lib/e-cert.c:806
-msgid "SSL Server Certificate"
-msgstr "Уверење ССЛ сервера"
-
-#: ../smime/gui/smime-ui.ui.h:5
-msgid "Email Signer Certificate"
-msgstr "Уверење потписника ел. поруке"
-
-#: ../smime/gui/smime-ui.ui.h:6
-msgid "Email Recipient Certificate"
-msgstr "Уверење примаоца ел. поруке"
-
-#: ../smime/gui/smime-ui.ui.h:7
-msgid "This certificate has been verified for the following uses:"
-msgstr "Ово уверење је проверено за следеће потребе:"
-
-#: ../smime/gui/smime-ui.ui.h:8
-msgid "Issued To"
-msgstr "Коме је издато"
-
-#: ../smime/gui/smime-ui.ui.h:9
-msgid "Common Name (CN)"
-msgstr "Заједничко име (CN)"
-
-#: ../smime/gui/smime-ui.ui.h:10
-msgid "Organization (O)"
-msgstr "Организација (O)"
-
-#: ../smime/gui/smime-ui.ui.h:11
-msgid "Organizational Unit (OU)"
-msgstr "Организациона јединица (OU)"
-
-#: ../smime/gui/smime-ui.ui.h:13
-msgid "Issued On"
-msgstr "Издато је"
-
-#: ../smime/gui/smime-ui.ui.h:14
-msgid "Expires On"
-msgstr "Истиче"
-
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Fingerprints"
-msgstr "Отисци"
-
-#: ../smime/gui/smime-ui.ui.h:19
-msgid "<Not Part of Certificate>"
-msgstr "<није део уверења>"
-
-#: ../smime/gui/smime-ui.ui.h:20
-msgid "Validity"
-msgstr "Исправност"
-
-#: ../smime/gui/smime-ui.ui.h:22
-msgid "Certificate Hierarchy"
-msgstr "Хијерархија уверења"
-
-#: ../smime/gui/smime-ui.ui.h:23
-msgid "Certificate Fields"
-msgstr "Поља уверења"
-
-#: ../smime/gui/smime-ui.ui.h:24
-msgid "Field Value"
-msgstr "Вредност поља"
-
-#: ../smime/gui/smime-ui.ui.h:25
-msgid "Details"
-msgstr "Појединости"
-
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:3
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Поседујете уверења ових организација која вас одређују:"
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:4
 msgid "Certificates Table"
 msgstr "Табела уверења"
 
 #. This is a verb, as in "make a backup".
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "_Backup"
 msgstr "Направи _резерву"
 
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:8
 msgid "Backup _All"
 msgstr "Направи резерву _свега"
 
-#: ../smime/gui/smime-ui.ui.h:33
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Your Certificates"
 msgstr "Ваша уверења"
 
-#: ../smime/gui/smime-ui.ui.h:34
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "You have certificates on file that identify these people:"
 msgstr "Поседујете уверења која одређују ове особе:"
 
-#: ../smime/gui/smime-ui.ui.h:35
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "Уверења контакта"
 
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:13
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "Поседујете уверења која одређују ове издаваоце уверења:"
 
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Authorities"
 msgstr "Издаваоци"
 
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Certificate Authority Trust"
 msgstr "Поверење издаваоцу уверења"
 
-#: ../smime/gui/smime-ui.ui.h:39
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Trust this CA to identify _websites."
 msgstr "Веруј овом издаваоцу уверења за препознавање _веб страница."
 
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Trust this CA to identify _email users."
 msgstr "Веруј овом издаваоцу уверења за препознавање _ел. адреса."
 
-#: ../smime/gui/smime-ui.ui.h:41
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Trust this CA to identify _software developers."
 msgstr "Веруј овом издаваоцу уверења за препознавање _програмера."
 
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:19
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -20024,177 +21290,164 @@ msgstr ""
 "Пре веровања овом издаваоцу уверења, прво прегледајте његово уверење, "
 "политику и процедуре (ако су доступни)."
 
-#: ../smime/gui/smime-ui.ui.h:44 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:21 ../smime/lib/e-asn1-object.c:658
 msgid "Certificate"
 msgstr "Уверење"
 
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "Certificate details"
 msgstr "Детаљи уверења"
 
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "Email Certificate Trust Settings"
 msgstr "Подешавања поверења у уверења ел. поште"
 
-#: ../smime/gui/smime-ui.ui.h:47
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Trust the authenticity of this certificate"
 msgstr "Веруј у веродостојност овог уверења"
 
-#: ../smime/gui/smime-ui.ui.h:48
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Не веруј у веродостојност овог уверења"
 
-#: ../smime/gui/smime-ui.ui.h:49
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "_Edit CA Trust"
 msgstr "_Уреди ЦА поверење"
 
-#: ../smime/lib/e-cert.c:201 ../smime/lib/e-cert.c:213
-msgid "%d/%m/%Y"
-msgstr "%d. %m. %Y."
-
-#. x509 certificate usage types
-#: ../smime/lib/e-cert.c:390
-msgid "Sign"
-msgstr "Потпиши"
-
-#: ../smime/lib/e-cert.c:391
-msgid "Encrypt"
-msgstr "Шифруј"
-
-#: ../smime/lib/e-cert.c:503
+#: ../smime/lib/e-asn1-object.c:95
 msgid "Version"
 msgstr "Издање"
 
-#: ../smime/lib/e-cert.c:518
+#: ../smime/lib/e-asn1-object.c:110
 msgid "Version 1"
 msgstr "Издање 1"
 
-#: ../smime/lib/e-cert.c:521
+#: ../smime/lib/e-asn1-object.c:113
 msgid "Version 2"
 msgstr "Издање 2"
 
-#: ../smime/lib/e-cert.c:524
+#: ../smime/lib/e-asn1-object.c:116
 msgid "Version 3"
 msgstr "Издање 3"
 
-#: ../smime/lib/e-cert.c:607
+#: ../smime/lib/e-asn1-object.c:192
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "ПКЦС #1 МД2 са РСА шифровањем"
 
-#: ../smime/lib/e-cert.c:610
+#: ../smime/lib/e-asn1-object.c:195
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "ПКЦС #1 МД5 са РСА шифровањем"
 
-#: ../smime/lib/e-cert.c:613
+#: ../smime/lib/e-asn1-object.c:198
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "ПКЦС #1 СХА-1 са РСА шифровањем"
 
-#: ../smime/lib/e-cert.c:616
+#: ../smime/lib/e-asn1-object.c:201
 msgid "PKCS #1 SHA-256 With RSA Encryption"
 msgstr "ПКЦС #1 СХА-256 са РСА шифровањем"
 
-#: ../smime/lib/e-cert.c:619
+#: ../smime/lib/e-asn1-object.c:204
 msgid "PKCS #1 SHA-384 With RSA Encryption"
 msgstr "ПКЦС #1 СХА-384 са РСА шифровањем"
 
-#: ../smime/lib/e-cert.c:622
+#: ../smime/lib/e-asn1-object.c:207
 msgid "PKCS #1 SHA-512 With RSA Encryption"
 msgstr "ПКЦС #1 СХА-512 са РСА шифровањем"
 
-#: ../smime/lib/e-cert.c:649
+#: ../smime/lib/e-asn1-object.c:234
 msgid "PKCS #1 RSA Encryption"
 msgstr "ПКЦС #1 РСА шифровање"
 
-#: ../smime/lib/e-cert.c:652
+#: ../smime/lib/e-asn1-object.c:237
 msgid "Certificate Key Usage"
 msgstr "Употреба кључа уверења"
 
-#: ../smime/lib/e-cert.c:655
+#: ../smime/lib/e-asn1-object.c:240
 msgid "Netscape Certificate Type"
 msgstr "Врста Нетскејп уверења"
 
-#: ../smime/lib/e-cert.c:658
+#: ../smime/lib/e-asn1-object.c:243
 msgid "Certificate Authority Key Identifier"
 msgstr "Одређивач кључа издаваоца уверења"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-asn1-object.c:255
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Одређивач предмета (%s)"
 
-#: ../smime/lib/e-cert.c:722
+#: ../smime/lib/e-asn1-object.c:306
 msgid "Algorithm Identifier"
 msgstr "Одређивач алгоритма"
 
-#: ../smime/lib/e-cert.c:730
+#: ../smime/lib/e-asn1-object.c:314
 msgid "Algorithm Parameters"
 msgstr "Параметри алгоритма"
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-asn1-object.c:336
 msgid "Subject Public Key Info"
 msgstr "Подаци о јавном кључу субјекта"
 
-#: ../smime/lib/e-cert.c:757
+#: ../smime/lib/e-asn1-object.c:341
 msgid "Subject Public Key Algorithm"
 msgstr "Алгоритам јавног кључа субјекта"
 
-#: ../smime/lib/e-cert.c:772
+#: ../smime/lib/e-asn1-object.c:356
 msgid "Subject's Public Key"
 msgstr "Јавни кључ субјекта"
 
-#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:843
+#: ../smime/lib/e-asn1-object.c:378 ../smime/lib/e-asn1-object.c:428
 msgid "Error: Unable to process extension"
 msgstr "Грешка: не могу да обрадим проширење"
 
-#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
+#: ../smime/lib/e-asn1-object.c:399 ../smime/lib/e-asn1-object.c:411
 msgid "Object Signer"
 msgstr "Потписник предмета"
 
-#: ../smime/lib/e-cert.c:818
+#: ../smime/lib/e-asn1-object.c:403
 msgid "SSL Certificate Authority"
 msgstr "Издавач ССЛ уверења"
 
-#: ../smime/lib/e-cert.c:822
+#: ../smime/lib/e-asn1-object.c:407
 msgid "Email Certificate Authority"
 msgstr "Издавач уверења ел. поште"
 
-#: ../smime/lib/e-cert.c:851
+#: ../smime/lib/e-asn1-object.c:436
 msgid "Signing"
 msgstr "Потписивање"
 
-#: ../smime/lib/e-cert.c:855
+#: ../smime/lib/e-asn1-object.c:440
 msgid "Non-repudiation"
 msgstr "Без одрицања"
 
-#: ../smime/lib/e-cert.c:859
+#: ../smime/lib/e-asn1-object.c:444
 msgid "Key Encipherment"
 msgstr "Замућивање кључа"
 
-#: ../smime/lib/e-cert.c:863
+#: ../smime/lib/e-asn1-object.c:448
 msgid "Data Encipherment"
 msgstr "Замућивање података"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-asn1-object.c:452
 msgid "Key Agreement"
 msgstr "Сагласност кључа"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-asn1-object.c:456
 msgid "Certificate Signer"
 msgstr "Потписник уверења"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-asn1-object.c:460
 msgid "CRL Signer"
 msgstr "ЦРЛ потписник"
 
-#: ../smime/lib/e-cert.c:924
+#: ../smime/lib/e-asn1-object.c:509
 msgid "Critical"
 msgstr "Критично"
 
-#: ../smime/lib/e-cert.c:926 ../smime/lib/e-cert.c:929
+#: ../smime/lib/e-asn1-object.c:511 ../smime/lib/e-asn1-object.c:514
 msgid "Not Critical"
 msgstr "Није критично"
 
-#: ../smime/lib/e-cert.c:950
+#: ../smime/lib/e-asn1-object.c:535
 msgid "Extensions"
 msgstr "Проширења"
 
@@ -20206,40 +21459,53 @@ msgstr "Проширења"
 #. * change this string, unless changing the order of
 #. * name and value.  As a result example:
 #. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-cert.c:1029
+#: ../smime/lib/e-asn1-object.c:615
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-asn1-object.c:672 ../smime/lib/e-asn1-object.c:807
 msgid "Certificate Signature Algorithm"
 msgstr "Алгоритам потписа уверења"
 
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-asn1-object.c:681
 msgid "Issuer"
 msgstr "Издавач"
 
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-asn1-object.c:735
 msgid "Issuer Unique ID"
 msgstr "Јединствени ИБ издавача"
 
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-asn1-object.c:754
 msgid "Subject Unique ID"
 msgstr "Јединствени ИБ субјекта"
 
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-asn1-object.c:813
 msgid "Certificate Signature Value"
 msgstr "Вредност потписа уверења"
 
-#: ../smime/lib/e-cert-db.c:860
+#: ../smime/lib/e-cert.c:201 ../smime/lib/e-cert.c:213
+msgid "%d/%m/%Y"
+msgstr "%d. %m. %Y."
+
+#. x509 certificate usage types
+#: ../smime/lib/e-cert.c:392
+msgid "Sign"
+msgstr "Потпиши"
+
+#: ../smime/lib/e-cert.c:393
+msgid "Encrypt"
+msgstr "Шифруј"
+
+#: ../smime/lib/e-cert-db.c:864
 msgid "Certificate already exists"
 msgstr "Уверење већ постоји"
 
-#: ../smime/lib/e-pkcs12.c:200
+#: ../smime/lib/e-pkcs12.c:199
 msgid "PKCS12 File Password"
 msgstr "ПКЦС12 лозинка датотеке"
 
-#: ../smime/lib/e-pkcs12.c:201
+#: ../smime/lib/e-pkcs12.c:200
 msgid "Enter password for PKCS12 file:"
 msgstr "Унесите лозинку за ПКЦС12 датотеку:"
 
@@ -20318,1494 +21584,3 @@ msgstr "Са _роком"
 #: ../views/tasks/galview.xml.h:3
 msgid "With _Status"
 msgstr "Са _стањем"
-
-# Универзално време, или УТ
-# Ваљда УВ?
-#. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:202
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:416
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:420
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:424
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:770
-msgid "UTC"
-msgstr "КУВ"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
-msgid "Select a Time Zone"
-msgstr "Изаберите временску зону"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
-msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-"Use the right mouse button to zoom out."
-msgstr ""
-"Користите леви тастер миша да увећате мапу и изаберете временску зону.\n"
-"Користите десни тастер миша за умањивање."
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
-msgid "Time Zones"
-msgstr "Временске зоне"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
-msgid "_Selection"
-msgstr "_Избор"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:6
-msgid "Timezone drop-down combination box"
-msgstr "Прозорче за подешавање временске зоне"
-
-#: ../widgets/menus/gal-define-views-dialog.c:364
-#: ../widgets/menus/gal-define-views.ui.h:4
-#, no-c-format
-msgid "Define Views for %s"
-msgstr "Одреди прегледе за %s"
-
-#: ../widgets/menus/gal-define-views-dialog.c:372
-#: ../widgets/menus/gal-define-views-dialog.c:374
-msgid "Define Views"
-msgstr "Одреди прегледе"
-
-#: ../widgets/menus/gal-define-views.ui.h:2
-#, no-c-format
-msgid "Define Views for \"%s\""
-msgstr "Одреди прегледе за „%s“"
-
-#: ../widgets/menus/gal-view-factory-etable.c:115
-msgid "Table"
-msgstr "Табела"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:288
-msgid "Save Current View"
-msgstr "Сачувај тренутни преглед"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
-msgid "_Create new view"
-msgstr "_Направи нови преглед"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:3
-msgid "_Replace existing view"
-msgstr "_Замени постојећи преглед"
-
-#: ../widgets/menus/gal-view-new-dialog.c:172
-msgid "Define New View"
-msgstr "Одреди нови преглед"
-
-#: ../widgets/menus/gal-view-new-dialog.ui.h:1
-msgid "Name of new view:"
-msgstr "Назив новог прегледа:"
-
-#: ../widgets/menus/gal-view-new-dialog.ui.h:2
-msgid "Type of view:"
-msgstr "Врста прегледа:"
-
-#: ../widgets/menus/gal-view-new-dialog.ui.h:3
-msgid "Type of View"
-msgstr "Врста прегледа"
-
-#: ../widgets/misc/ea-calendar-item.c:308
-#: ../widgets/misc/ea-calendar-item.c:317
-msgid "%d %B %Y"
-msgstr "%d %B %Y."
-
-#: ../widgets/misc/ea-calendar-item.c:320
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "Календар: од %s до %s"
-
-#: ../widgets/misc/ea-calendar-item.c:356
-msgid "evolution calendar item"
-msgstr "ставка календара еволуције"
-
-#: ../widgets/misc/e-alert-bar.c:120
-msgid "Close this message"
-msgstr "Затворите ову поруку"
-
-#: ../widgets/misc/e-attachment-bar.c:658
-#: ../widgets/misc/e-attachment-paned.c:703
-msgid "Icon View"
-msgstr "Преглед иконицама"
-
-#: ../widgets/misc/e-attachment-bar.c:660
-#: ../widgets/misc/e-attachment-paned.c:705
-msgid "List View"
-msgstr "Преглед списком"
-
-#. To Translators: This text is set as a description of an attached
-#. * message when, for example, attaching it to a composer. When the
-#. * message to be attached has also filled Subject, then this text is
-#. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:966
-msgid "Attached message"
-msgstr "Приложена порука"
-
-#. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2384
-#: ../widgets/misc/e-attachment-store.c:525
-msgid "attachment.dat"
-msgstr "attachment.dat"
-
-#: ../widgets/misc/e-attachment.c:1874 ../widgets/misc/e-attachment.c:2686
-msgid "A load operation is already in progress"
-msgstr "Операција учитавања је већ у току"
-
-#: ../widgets/misc/e-attachment.c:1882 ../widgets/misc/e-attachment.c:2694
-msgid "A save operation is already in progress"
-msgstr "Операција чувања је већ у току"
-
-#: ../widgets/misc/e-attachment.c:1989
-#, c-format
-msgid "Could not load '%s'"
-msgstr "Не могу да учитам „%s“"
-
-#: ../widgets/misc/e-attachment.c:1992
-#, c-format
-msgid "Could not load the attachment"
-msgstr "Не могу да учитам прилог"
-
-#: ../widgets/misc/e-attachment.c:2265
-#, c-format
-msgid "Could not open '%s'"
-msgstr "Не могу да отворим „%s“"
-
-#: ../widgets/misc/e-attachment.c:2268
-#, c-format
-msgid "Could not open the attachment"
-msgstr "Не могу да отворим прилог"
-
-#: ../widgets/misc/e-attachment.c:2702
-msgid "Attachment contents not loaded"
-msgstr "Садржај прилога није учитан"
-
-# * found, so just bail completely.
-#: ../widgets/misc/e-attachment.c:2778
-#, c-format
-msgid "Could not save '%s'"
-msgstr "Не могу да сачувам „%s“"
-
-#: ../widgets/misc/e-attachment.c:2781
-#, c-format
-msgid "Could not save the attachment"
-msgstr "Не могу да сачувам прилог"
-
-#: ../widgets/misc/e-attachment-dialog.c:311
-msgid "Attachment Properties"
-msgstr "Особине прилога"
-
-#: ../widgets/misc/e-attachment-dialog.c:333
-#: ../widgets/misc/e-import-assistant.c:273
-msgid "F_ilename:"
-msgstr "_Назив датотеке:"
-
-#: ../widgets/misc/e-attachment-dialog.c:368
-msgid "MIME Type:"
-msgstr "МИМЕ врста:"
-
-#: ../widgets/misc/e-attachment-dialog.c:376
-#: ../widgets/misc/e-attachment-store.c:442
-msgid "_Suggest automatic display of attachment"
-msgstr "_Предложи аутоматски приказ прилога"
-
-#: ../widgets/misc/e-attachment-handler-image.c:99
-msgid "Could not set as background"
-msgstr "Не могу да поставим као позадину"
-
-#: ../widgets/misc/e-attachment-handler-image.c:149
-msgid "Set as _Background"
-msgstr "Постави као _позадину"
-
-#: ../widgets/misc/e-attachment-handler-sendto.c:93
-msgid "Could not send attachment"
-msgid_plural "Could not send attachments"
-msgstr[0] "Не могу да пошаљем прилог"
-msgstr[1] "Не могу да пошаљем прилоге"
-msgstr[2] "Не могу да пошаљем прилоге"
-msgstr[3] "Не могу да пошаљем прилог"
-
-#: ../widgets/misc/e-attachment-handler-sendto.c:135
-msgid "_Send To..."
-msgstr "_Пошаљи за..."
-
-#: ../widgets/misc/e-attachment-handler-sendto.c:137
-msgid "Send the selected attachments somewhere"
-msgstr "Пошаљите изабране прилоге негде"
-
-#: ../widgets/misc/e-attachment-icon-view.c:166
-#: ../widgets/misc/e-attachment-tree-view.c:549
-msgid "Loading"
-msgstr "Учитавам"
-
-#: ../widgets/misc/e-attachment-icon-view.c:178
-#: ../widgets/misc/e-attachment-tree-view.c:561
-msgid "Saving"
-msgstr "Чувам"
-
-#: ../widgets/misc/e-attachment-paned.c:104
-msgid "Hide Attachment _Bar"
-msgstr "Сакриј линију при_лога"
-
-#: ../widgets/misc/e-attachment-paned.c:106
-#: ../widgets/misc/e-attachment-paned.c:719
-msgid "Show Attachment _Bar"
-msgstr "Прикажи линију п_рилога"
-
-#: ../widgets/misc/e-attachment-store.c:430
-msgid "Add Attachment"
-msgstr "Додај прилог"
-
-#: ../widgets/misc/e-attachment-store.c:433
-msgid "A_ttach"
-msgstr "При_ложи"
-
-#: ../widgets/misc/e-attachment-store.c:496
-msgid "Save Attachment"
-msgid_plural "Save Attachments"
-msgstr[0] "Сачувај прилог"
-msgstr[1] "Сачувај прилоге"
-msgstr[2] "Сачувај прилоге"
-msgstr[3] "Сачувај прилог"
-
-#: ../widgets/misc/e-attachment-view.c:379
-msgid "Open With Other Application..."
-msgstr "Отвори другим програмом..."
-
-#: ../widgets/misc/e-attachment-view.c:386
-msgid "S_ave All"
-msgstr "Сач_увај све"
-
-#: ../widgets/misc/e-attachment-view.c:412
-msgid "A_dd Attachment..."
-msgstr "До_дај прилог..."
-
-#: ../widgets/misc/e-attachment-view.c:436
-msgid "_Hide"
-msgstr "_Сакриј"
-
-#: ../widgets/misc/e-attachment-view.c:443
-msgid "Hid_e All"
-msgstr "Сак_риј све"
-
-#: ../widgets/misc/e-attachment-view.c:450
-msgid "_View Inline"
-msgstr "Пре_гледај унутар"
-
-#: ../widgets/misc/e-attachment-view.c:457
-msgid "Vie_w All Inline"
-msgstr "Пре_гледај све унутар"
-
-#: ../widgets/misc/e-attachment-view.c:778
-#, c-format
-msgid "Open With \"%s\""
-msgstr "Отвори програмом „%s“"
-
-#: ../widgets/misc/e-attachment-view.c:781
-#, c-format
-msgid "Open this attachment in %s"
-msgstr "Отвори овај прилог у „%s“"
-
-#: ../widgets/misc/e-book-source-config.c:98
-msgid "Mark as default address book"
-msgstr "Означава као подразумеван адресар"
-
-#: ../widgets/misc/e-book-source-config.c:103
-msgid "Autocomplete with this address book"
-msgstr "Сам допуњава овим адресаром"
-
-#: ../widgets/misc/e-book-source-config.c:277
-msgid "Copy book content locally for offline operation"
-msgstr "Умножава садржај књиге локално за рад ван мреже"
-
-#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
-#: ../widgets/misc/e-buffer-tagger.c:389
-msgid "Ctrl-click to open a link"
-msgstr "Притисните тастер Ктрл и кликните да отворите везу"
-
-#: ../widgets/misc/e-calendar.c:187
-msgid "Previous month"
-msgstr "Претходни месец"
-
-#: ../widgets/misc/e-calendar.c:211
-msgid "Next month"
-msgstr "Следећи месец"
-
-#: ../widgets/misc/e-calendar.c:233
-msgid "Previous year"
-msgstr "Претходна година"
-
-#: ../widgets/misc/e-calendar.c:254
-msgid "Next year"
-msgstr "Следећа година"
-
-#: ../widgets/misc/e-calendar.c:278
-msgid "Month Calendar"
-msgstr "Месечни календар"
-
-#. This is a strftime() format. %B = Month name.
-#: ../widgets/misc/e-calendar-item.c:1283
-#: ../widgets/misc/e-calendar-item.c:2136
-msgctxt "CalItem"
-msgid "%B"
-msgstr "%B"
-
-#. This is a strftime() format. %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1285
-msgctxt "CalItem"
-msgid "%Y"
-msgstr "%Y"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1322
-msgctxt "CalItem"
-msgid "%B %Y"
-msgstr "%B %Y."
-
-#: ../widgets/misc/e-cal-source-config.c:170
-msgid "Mark as default calendar"
-msgstr "Означава као основни календар"
-
-#: ../widgets/misc/e-cal-source-config.c:173
-msgid "Mark as default task list"
-msgstr "Означава као основни списак задатака"
-
-#: ../widgets/misc/e-cal-source-config.c:176
-msgid "Mark as default memo list"
-msgstr "Означава као основни списак белешки"
-
-#: ../widgets/misc/e-cal-source-config.c:201
-msgid "Color:"
-msgstr "Боја:"
-
-#: ../widgets/misc/e-cal-source-config.c:406
-msgid "Copy calendar contents locally for offline operation"
-msgstr "Умножава садржај календара локално за рад ван мреже"
-
-#: ../widgets/misc/e-cal-source-config.c:410
-msgid "Copy task list contents locally for offline operation"
-msgstr "Умножава садржај списка задатака локално за рад ван мреже"
-
-#: ../widgets/misc/e-cal-source-config.c:414
-msgid "Copy memo list contents locally for offline operation"
-msgstr "Умножава садржај списка белешки локално за рад ван мреже"
-
-#: ../widgets/misc/e-charset-combo-box.c:100
-msgid "Character Encoding"
-msgstr "Кодна страна"
-
-#: ../widgets/misc/e-charset-combo-box.c:123
-msgid "Enter the character set to use"
-msgstr "Изаберите кодну страну за коришћење"
-
-#: ../widgets/misc/e-charset-combo-box.c:342
-msgid "Other..."
-msgstr "Друго..."
-
-#: ../widgets/misc/e-contact-map-window.c:356
-msgid "Contacts Map"
-msgstr "Карта контаката"
-
-#: ../widgets/misc/e-dateedit.c:504
-msgid "Date and Time"
-msgstr "Датум и време"
-
-#: ../widgets/misc/e-dateedit.c:525
-msgid "Text entry to input date"
-msgstr "Део текста за унос датума"
-
-#: ../widgets/misc/e-dateedit.c:547
-msgid "Click this button to show a calendar"
-msgstr "Притисните на ово дугме да прикажете календар"
-
-#: ../widgets/misc/e-dateedit.c:594
-msgid "Drop-down combination box to select time"
-msgstr "Прозорче за избор времена"
-
-#: ../widgets/misc/e-dateedit.c:666
-msgid "No_w"
-msgstr "_Сада"
-
-#: ../widgets/misc/e-dateedit.c:673
-msgid "_Today"
-msgstr "_Данас"
-
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# When "None" is selected we want the field to be cleared.
-# Note that we don't show this here, since by default a 'None' date
-# is not permitted.
-#. Note that we don't show this here, since by default a 'None' date
-#. * is not permitted.
-#: ../widgets/misc/e-dateedit.c:682
-msgid "_None"
-msgstr "_Ништа"
-
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# When "None" is selected we want the field to be cleared.
-# Note that we don't show this here, since by default a 'None' date
-# is not permitted.
-#. Translators: "None" for date field of a date edit, shown when
-#. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1697 ../widgets/misc/e-dateedit.c:1930
-msgctxt "date"
-msgid "None"
-msgstr "Ништа"
-
-#: ../widgets/misc/e-dateedit.c:1824
-msgid "Invalid Date Value"
-msgstr "Неисправан датум"
-
-#: ../widgets/misc/e-dateedit.c:1868
-msgid "Invalid Time Value"
-msgstr "Неисправно време"
-
-#: ../widgets/misc/e-import-assistant.c:256
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list."
-msgstr ""
-"Изаберите датотеку коју желите да увезете у Еволуцију и из листе изаберите "
-"којег је типа та датотека."
-
-#: ../widgets/misc/e-import-assistant.c:283
-msgid "Select a file"
-msgstr "Изаберите датотеку"
-
-#: ../widgets/misc/e-import-assistant.c:297
-#: ../widgets/misc/e-import-assistant.c:472
-msgid "File _type:"
-msgstr "_Врста датотеке:"
-
-#: ../widgets/misc/e-import-assistant.c:340
-#: ../widgets/misc/e-import-assistant.c:920
-msgid "Choose the destination for this import"
-msgstr "Изаберите одредиште за овај увоз"
-
-#: ../widgets/misc/e-import-assistant.c:365
-msgid "Choose the type of importer to run:"
-msgstr "Изаберите тип увозника:"
-
-#: ../widgets/misc/e-import-assistant.c:373
-msgid "Import data and settings from _older programs"
-msgstr "Увези податке и подешавања из _старијих програма"
-
-#: ../widgets/misc/e-import-assistant.c:381
-msgid "Import a _single file"
-msgstr "Увези _једну датотеку"
-
-#: ../widgets/misc/e-import-assistant.c:533
-msgid ""
-"Evolution checked for settings to import from the following applications: "
-"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
-"like to try again, please click the \"Back\" button."
-msgstr ""
-"Еволуција је проверила подешавања за увоз следећих програма: Пине, Нетскејп, "
-"Елм, иКалендар. Нема подешавања за увожење. Уколико желите да покушате "
-"поново, кликните на дугме „Назад“."
-
-#. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:775
-msgid "_Cancel Import"
-msgstr "_Откажи увожење"
-
-#: ../widgets/misc/e-import-assistant.c:919
-msgid "Preview data to be imported"
-msgstr "Прегледај податке који се увозе"
-
-#: ../widgets/misc/e-import-assistant.c:925
-#: ../widgets/misc/e-import-assistant.c:938
-#: ../widgets/misc/e-import-assistant.c:1291
-#: ../widgets/misc/e-import-assistant.c:1367
-#: ../widgets/misc/e-import-assistant.c:1376
-msgid "Import Data"
-msgstr "Увези податке"
-
-#: ../widgets/misc/e-import-assistant.c:933
-msgid "Select what type of file you want to import from the list."
-msgstr "Изаберите са списка које врсте датотека желите да увезете."
-
-#: ../widgets/misc/e-import-assistant.c:1281
-#: ../widgets/misc/e-import-assistant.c:1316
-msgid "Evolution Import Assistant"
-msgstr "Помоћник Еволуције за увоз"
-
-#: ../widgets/misc/e-import-assistant.c:1298
-#: ../widgets/misc/e-import-assistant.c:1354
-msgid "Import Location"
-msgstr "Увези локацију"
-
-#: ../widgets/misc/e-import-assistant.c:1309
-msgid ""
-"Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of importing "
-"external files into Evolution."
-msgstr ""
-"Добро дошли у Помоћника Еволуције за увоз.\n"
-"Овај помоћник ће вас провести кроз поступак увоза спољних датотека у "
-"Еволуцију."
-
-#: ../widgets/misc/e-import-assistant.c:1326
-msgid "Importer Type"
-msgstr "Врста увозника"
-
-#: ../widgets/misc/e-import-assistant.c:1336
-msgid "Select Information to Import"
-msgstr "Изаберите информацију за увоз"
-
-#: ../widgets/misc/e-import-assistant.c:1345
-msgid "Select a File"
-msgstr "Изаберите датотеку"
-
-#: ../widgets/misc/e-import-assistant.c:1362
-msgid "Click \"Apply\" to begin importing the file into Evolution."
-msgstr "Кликните на „Примени“ да започнете увоз датотеке у Еволуцију."
-
-#: ../widgets/misc/e-mail-signature-combo-box.c:378
-msgid "Autogenerated"
-msgstr "Аутоматски састављено"
-
-#: ../widgets/misc/e-mail-signature-editor.c:287
-msgid "Close"
-msgstr "Затвори"
-
-#: ../widgets/misc/e-mail-signature-editor.c:292
-msgid "_Save and Close"
-msgstr "_Сачувај и затвори"
-
-#: ../widgets/misc/e-mail-signature-editor.c:506
-msgid "Edit Signature"
-msgstr "Уреди потпис"
-
-#: ../widgets/misc/e-mail-signature-editor.c:526
-msgid "_Signature Name:"
-msgstr "Назив _потписа:"
-
-#: ../widgets/misc/e-mail-signature-editor.c:572
-msgid "Unnamed"
-msgstr "Без имена"
-
-#: ../widgets/misc/e-mail-signature-manager.c:337
-msgid "Add _Script"
-msgstr "Додај ск_рипту"
-
-#: ../widgets/misc/e-mail-signature-manager.c:421
-msgid "Add Signature Script"
-msgstr "Додај скрипту за потпис"
-
-#: ../widgets/misc/e-mail-signature-manager.c:491
-msgid "Edit Signature Script"
-msgstr "Уреди скрипту потписа"
-
-#: ../widgets/misc/e-mail-signature-script-dialog.c:395
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only."
-msgstr ""
-"Излаз ове скрипте ће бити коришћен као\n"
-"потпис. Назив који сте дали ће бити коришћен\n"
-"само за приказ."
-
-#: ../widgets/misc/e-mail-signature-script-dialog.c:446
-msgid "S_cript:"
-msgstr "С_крипта:"
-
-#: ../widgets/misc/e-mail-signature-script-dialog.c:477
-msgid "Script file must be executable."
-msgstr "Датотека скрипте мора бити извршна."
-
-#: ../widgets/misc/e-map.c:886
-msgid "World Map"
-msgstr "Карта света"
-
-#: ../widgets/misc/e-map.c:889
-msgid ""
-"Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should instead select the timezone from the drop-down combination box below."
-msgstr ""
-"Алат за избор временске зоне помоћу миша. Тастатуром се избор временске зоне "
-"врши из доњег оквира."
-
-#: ../widgets/misc/e-online-button.c:31
-msgid "Evolution is currently online.  Click this button to work offline."
-msgstr ""
-"Еволуција је тренутно на мрежи.  Кликните на ово дугме за рад ван мреже."
-
-#: ../widgets/misc/e-online-button.c:34
-msgid "Evolution is currently offline.  Click this button to work online."
-msgstr ""
-"Еволуција тренутно није на мрежи.  Кликните на ово дугме да се повежете."
-
-#: ../widgets/misc/e-online-button.c:37
-msgid "Evolution is currently offline because the network is unavailable."
-msgstr "Еволуција тренутно није на мрежи јер мрежа није доступна."
-
-#: ../widgets/misc/e-preferences-window.c:317
-msgid "Evolution Preferences"
-msgstr "Подешавања Еволуције"
-
-# bug: plural-forms if put as "%d matches"
-#: ../widgets/misc/e-search-bar.c:79
-#, c-format
-msgid "Matches: %u"
-msgstr "Поклапања: %u"
-
-#: ../widgets/misc/e-search-bar.c:527
-msgid "Close the find bar"
-msgstr "Затвори траку претраге"
-
-#: ../widgets/misc/e-search-bar.c:535
-msgid "Fin_d:"
-msgstr "Про_нађи:"
-
-#: ../widgets/misc/e-search-bar.c:547
-msgid "Clear the search"
-msgstr "Очисти претрагу"
-
-#: ../widgets/misc/e-search-bar.c:571
-msgid "_Previous"
-msgstr "_Претходно"
-
-#: ../widgets/misc/e-search-bar.c:577
-msgid "Find the previous occurrence of the phrase"
-msgstr "Нађи претходно појављивање израза"
-
-#: ../widgets/misc/e-search-bar.c:590
-msgid "_Next"
-msgstr "_Следеће"
-
-#: ../widgets/misc/e-search-bar.c:596
-msgid "Find the next occurrence of the phrase"
-msgstr "Нађи следеће појављивање израза"
-
-#: ../widgets/misc/e-search-bar.c:609
-msgid "Mat_ch case"
-msgstr "_Упореди величину слова"
-
-#: ../widgets/misc/e-search-bar.c:637
-msgid "Reached bottom of page, continued from top"
-msgstr "Стигао сам до дна странице, настављам са врха"
-
-#: ../widgets/misc/e-search-bar.c:659
-msgid "Reached top of page, continued from bottom"
-msgstr "Стигао сам до врха странице, настављам са дна"
-
-#: ../widgets/misc/e-send-options.c:570
-msgid "When de_leted:"
-msgstr "Када је обри_сано:"
-
-#: ../widgets/misc/e-send-options.ui.h:3
-msgid "Standard"
-msgstr "Обично"
-
-#: ../widgets/misc/e-send-options.ui.h:6
-msgid "Proprietary"
-msgstr "Власничко"
-
-#: ../widgets/misc/e-send-options.ui.h:8
-msgid "Secret"
-msgstr "Тајно"
-
-#: ../widgets/misc/e-send-options.ui.h:9
-msgid "Top Secret"
-msgstr "Строго поверљиво"
-
-#: ../widgets/misc/e-send-options.ui.h:10
-msgid "For Your Eyes Only"
-msgstr "Само за ваше очи"
-
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# When "None" is selected we want the field to be cleared.
-# Note that we don't show this here, since by default a 'None' date
-# is not permitted.
-#. Translators: Used in send options dialog
-#: ../widgets/misc/e-send-options.ui.h:12
-msgctxt "send-options"
-msgid "None"
-msgstr "Ништа"
-
-#: ../widgets/misc/e-send-options.ui.h:13
-msgid "Mail Receipt"
-msgstr "Признаница поште"
-
-#: ../widgets/misc/e-send-options.ui.h:15
-msgid "R_eply requested"
-msgstr "Захтеван је о_дговор"
-
-#: ../widgets/misc/e-send-options.ui.h:16
-msgctxt "ESendOptionsWithin"
-msgid "Wi_thin"
-msgstr "Ун_утар"
-
-#: ../widgets/misc/e-send-options.ui.h:17
-msgctxt "ESendOptionsWithin"
-msgid "days"
-msgstr "дана"
-
-#: ../widgets/misc/e-send-options.ui.h:18
-msgid "_When convenient"
-msgstr "Када је з_годно"
-
-#: ../widgets/misc/e-send-options.ui.h:20
-msgid "_Delay message delivery"
-msgstr "_Одложи испоруку поруке"
-
-#: ../widgets/misc/e-send-options.ui.h:21
-msgctxt "ESendOptionsAfter"
-msgid "_After"
-msgstr "_После"
-
-#: ../widgets/misc/e-send-options.ui.h:22
-msgctxt "ESendOptionsAfter"
-msgid "days"
-msgstr "дана"
-
-#: ../widgets/misc/e-send-options.ui.h:23
-msgid "_Set expiration date"
-msgstr "Постави _рок"
-
-#: ../widgets/misc/e-send-options.ui.h:24
-msgctxt "ESendOptions"
-msgid "_Until"
-msgstr "_До"
-
-#: ../widgets/misc/e-send-options.ui.h:25
-msgid "Delivery Options"
-msgstr "Опције испоруке"
-
-#: ../widgets/misc/e-send-options.ui.h:27
-msgid "_Classification:"
-msgstr "_Класификација:"
-
-#: ../widgets/misc/e-send-options.ui.h:28
-msgid "Gene_ral Options"
-msgstr "Опш_те опције"
-
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "Creat_e a sent item to track information"
-msgstr "На_прави послату ставку за праћење податка"
-
-#: ../widgets/misc/e-send-options.ui.h:30
-msgid "_Delivered"
-msgstr "_Испоручено"
-
-#: ../widgets/misc/e-send-options.ui.h:31
-msgid "Deli_vered and opened"
-msgstr "Испо_ручено и отворено"
-
-#: ../widgets/misc/e-send-options.ui.h:32
-msgid "_All information"
-msgstr "_Сви подаци"
-
-#: ../widgets/misc/e-send-options.ui.h:33
-msgid "A_uto-delete sent item"
-msgstr "А_утоматски обриши послату ставку"
-
-#: ../widgets/misc/e-send-options.ui.h:34
-msgid "Status Tracking"
-msgstr "Праћење статуса"
-
-#: ../widgets/misc/e-send-options.ui.h:35
-msgid "_When opened:"
-msgstr "Када је о_творено:"
-
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "When decli_ned:"
-msgstr "Када је _одбијено:"
-
-#: ../widgets/misc/e-send-options.ui.h:37
-msgid "When co_mpleted:"
-msgstr "Кад је _завршено:"
-
-#: ../widgets/misc/e-send-options.ui.h:38
-msgid "When acce_pted:"
-msgstr "Када је _прихваћено:"
-
-#: ../widgets/misc/e-send-options.ui.h:39
-msgid "Return Notification"
-msgstr "Повратно обавештење"
-
-#: ../widgets/misc/e-send-options.ui.h:40
-msgid "Sta_tus Tracking"
-msgstr "Праћење ста_туса"
-
-#: ../widgets/misc/e-source-config.c:675 ../widgets/misc/e-source-config.c:679
-msgid "Type:"
-msgstr "Врста:"
-
-#: ../widgets/misc/e-source-config.c:687 ../widgets/misc/e-source-config.c:691
-msgid "Name:"
-msgstr "Име:"
-
-#. Translators: This is the first of a sequence of widgets:
-#. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../widgets/misc/e-source-config.c:1289
-msgid "Refresh every"
-msgstr "Освежи на сваких"
-
-#: ../widgets/misc/e-source-config.c:1319
-#: ../widgets/misc/e-source-config.c:1347
-msgid "Use a secure connection"
-msgstr "Користи безбедну везу"
-
-#: ../widgets/misc/e-source-config.c:1361
-msgid "Ignore invalid SSL certificate"
-msgstr "Занемари неисправно ССЛ уверење"
-
-#: ../widgets/misc/e-source-config.c:1398
-msgid "User"
-msgstr "Корисник"
-
-#. no suggestions. Put something in the menu anyway...
-#: ../widgets/misc/e-spell-entry.c:351
-msgid "(no suggestions)"
-msgstr "(нема предлога)"
-
-#: ../widgets/misc/e-spell-entry.c:375
-msgid "More..."
-msgstr "Даље..."
-
-#. + Add to Dictionary
-#: ../widgets/misc/e-spell-entry.c:444
-#, c-format
-msgid "Add \"%s\" to Dictionary"
-msgstr "Додај „%s“ у речник"
-
-#. - Ignore All
-#: ../widgets/misc/e-spell-entry.c:487
-msgid "Ignore All"
-msgstr "Занемари све"
-
-#: ../widgets/misc/e-spell-entry.c:513
-msgid "Spelling Suggestions"
-msgstr "Предлози правописа"
-
-#: ../widgets/misc/e-url-entry.c:78
-msgid "Click here to go to URL"
-msgstr "Кликните овде да посетите адресу"
-
-#: ../widgets/misc/e-web-view.c:274 ../widgets/misc/e-web-view-gtkhtml.c:407
-msgid "_Copy Link Location"
-msgstr "_Умножи место везе"
-
-#: ../widgets/misc/e-web-view.c:276 ../widgets/misc/e-web-view-gtkhtml.c:409
-msgid "Copy the link to the clipboard"
-msgstr "Умножава везу у списак исечака"
-
-#: ../widgets/misc/e-web-view.c:284 ../widgets/misc/e-web-view-gtkhtml.c:417
-msgid "_Open Link in Browser"
-msgstr "_Отвори везу у прегледнику"
-
-#: ../widgets/misc/e-web-view.c:286 ../widgets/misc/e-web-view-gtkhtml.c:419
-msgid "Open the link in a web browser"
-msgstr "Отвори везу у веб претраживачу"
-
-#: ../widgets/misc/e-web-view.c:294 ../widgets/misc/e-web-view-gtkhtml.c:427
-msgid "_Copy Email Address"
-msgstr "_Умножи адресу ел. поште"
-
-#: ../widgets/misc/e-web-view.c:311 ../widgets/misc/e-web-view-gtkhtml.c:444
-msgid "_Copy Image"
-msgstr "_Умножи слику"
-
-#: ../widgets/misc/e-web-view.c:313 ../widgets/misc/e-web-view-gtkhtml.c:446
-msgid "Copy the image to the clipboard"
-msgstr "Умножите слику у оставу"
-
-#: ../widgets/misc/e-web-view.c:333 ../widgets/misc/e-web-view.c:1440
-#: ../widgets/misc/e-web-view-gtkhtml.c:466
-#: ../widgets/misc/e-web-view-gtkhtml.c:1311
-msgid "Select all text and images"
-msgstr "Изабери сав текст и слике"
-
-#: ../widgets/misc/e-web-view.c:1104 ../widgets/misc/e-web-view.c:1106
-#: ../widgets/misc/e-web-view.c:1108 ../widgets/misc/e-web-view-gtkhtml.c:975
-#: ../widgets/misc/e-web-view-gtkhtml.c:977
-#: ../widgets/misc/e-web-view-gtkhtml.c:979
-#, c-format
-msgid "Click to call %s"
-msgstr "Кликните да позовете %s"
-
-#: ../widgets/misc/e-web-view.c:1110 ../widgets/misc/e-web-view-gtkhtml.c:981
-msgid "Click to hide/unhide addresses"
-msgstr "Кликните да сакријете/откријете адресе"
-
-#: ../widgets/misc/e-web-view.c:1112 ../widgets/misc/e-web-view-gtkhtml.c:983
-#, c-format
-msgid "Click to open %s"
-msgstr "Кликните да отворите %s"
-
-#: ../widgets/misc/widgets.error.xml.h:1
-msgid "Do you wish to save your changes?"
-msgstr "Да ли желите да сачувате измене?"
-
-#: ../widgets/misc/widgets.error.xml.h:2
-msgid "This signature has been changed, but has not been saved."
-msgstr "Овај потпис је промењен, али није сачуван."
-
-#: ../widgets/misc/widgets.error.xml.h:3
-msgid "_Discard changes"
-msgstr "_Одбаци измене"
-
-#: ../widgets/misc/widgets.error.xml.h:4
-msgid "Blank Signature"
-msgstr "Празан потпис"
-
-#: ../widgets/misc/widgets.error.xml.h:5
-msgid "Please provide an unique name to identify this signature."
-msgstr "Дајте једно јединствено име које представља овај потпис."
-
-#: ../widgets/misc/widgets.error.xml.h:6
-msgid "Could not load signature."
-msgstr "Не могу да учитам потпис."
-
-#: ../widgets/misc/widgets.error.xml.h:7
-msgid "Could not save signature."
-msgstr "Не могу да сачувам потпис."
-
-#: ../widgets/table/e-cell-combo.c:187
-msgid "popup list"
-msgstr "искачућа листа"
-
-#: ../widgets/table/e-cell-date-edit.c:299
-msgid "Now"
-msgstr "Сада"
-
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# When "None" is selected we want the field to be cleared.
-# Note that we don't show this here, since by default a 'None' date
-# is not permitted.
-#. Translators: "None" as a label of a button to unset date in a
-#. * date table cell.
-#: ../widgets/table/e-cell-date-edit.c:317
-msgctxt "table-date"
-msgid "None"
-msgstr "Ништа"
-
-#: ../widgets/table/e-cell-date-edit.c:325
-msgid "OK"
-msgstr "У реду"
-
-#: ../widgets/table/e-cell-date-edit.c:873
-#, c-format
-msgid "The time must be in the format: %s"
-msgstr "Време мора бити у формату: %s"
-
-#: ../widgets/table/e-cell-percent.c:80
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Вредност процента мора бити између 0 и 100"
-
-#: ../widgets/table/e-table-click-to-add.c:609
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:62
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:143
-msgid "click to add"
-msgstr "кликните да додате"
-
-#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
-msgid "(Ascending)"
-msgstr "(Растуће)"
-
-#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
-msgid "(Descending)"
-msgstr "(Опадајуће)"
-
-#: ../widgets/table/e-table-config.c:400
-msgid "Not sorted"
-msgstr "Није разврстано"
-
-#: ../widgets/table/e-table-config.c:441
-msgid "No grouping"
-msgstr "Без груписања"
-
-#: ../widgets/table/e-table-config.c:666
-#: ../widgets/table/e-table-config.ui.h:1
-msgid "Show Fields"
-msgstr "Прикажи поља"
-
-#: ../widgets/table/e-table-config.c:686
-msgid "Available Fields"
-msgstr "Доступна поља"
-
-#: ../widgets/table/e-table-config.ui.h:2
-msgid "A_vailable Fields:"
-msgstr "До_ступна поља:"
-
-#: ../widgets/table/e-table-config.ui.h:3
-msgid "_Show these fields in order:"
-msgstr "_Прикажи ова поља по реду:"
-
-#: ../widgets/table/e-table-config.ui.h:4
-msgid "Move _Up"
-msgstr "Премести на _горе"
-
-#: ../widgets/table/e-table-config.ui.h:5
-msgid "Move _Down"
-msgstr "Помери на _доле"
-
-#: ../widgets/table/e-table-config.ui.h:7
-msgid "_Remove"
-msgstr "_Уклони"
-
-#: ../widgets/table/e-table-config.ui.h:9
-msgid "_Show field in View"
-msgstr "_Прикажи поље у прегледу"
-
-#: ../widgets/table/e-table-config.ui.h:10
-#: ../widgets/table/e-table-header-item.c:1736
-msgid "Ascending"
-msgstr "Растуће"
-
-#: ../widgets/table/e-table-config.ui.h:11
-#: ../widgets/table/e-table-header-item.c:1736
-msgid "Descending"
-msgstr "Опадајуће"
-
-#: ../widgets/table/e-table-config.ui.h:12
-msgid "Group Items By"
-msgstr "Групиши ставке по"
-
-#: ../widgets/table/e-table-config.ui.h:13
-msgid "Show _field in View"
-msgstr "Прикажи _поље у прегледу"
-
-#: ../widgets/table/e-table-config.ui.h:14
-msgid "Then By"
-msgstr "Онда по"
-
-#: ../widgets/table/e-table-config.ui.h:15
-msgid "Show field i_n View"
-msgstr "Прикажи поље _у прегледу"
-
-#: ../widgets/table/e-table-config.ui.h:16
-msgid "Show field in _View"
-msgstr "Прикажи поље у п_регледу"
-
-#: ../widgets/table/e-table-config.ui.h:17
-msgid "Clear _All"
-msgstr "Очисти _све"
-
-#: ../widgets/table/e-table-config.ui.h:18
-msgid "Sort"
-msgstr "Разврстај"
-
-#: ../widgets/table/e-table-config.ui.h:19
-msgid "Sort Items By"
-msgstr "Разврстај ставке по"
-
-#: ../widgets/table/e-table-config.ui.h:20
-msgid "Clear All"
-msgstr "Очисти све"
-
-#: ../widgets/table/e-table-config.ui.h:21
-msgid "_Sort..."
-msgstr "_Разврстај..."
-
-#: ../widgets/table/e-table-config.ui.h:22
-msgid "_Group By..."
-msgstr "_Групиши по..."
-
-#: ../widgets/table/e-table-config.ui.h:23
-msgid "_Fields Shown..."
-msgstr "Приказана _поља..."
-
-#: ../widgets/table/e-table-field-chooser.c:152
-msgid ""
-"To add a column to your table, drag it into\n"
-"the location in which you want it to appear."
-msgstr ""
-"За додавање колоне у табелу, превуците\n"
-"је на место где желите да се појави."
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:224
-msgid "Add a Column"
-msgstr "Додај колону"
-
-#. Translators: This text is used as a special row when an ETable
-#. * has turned on grouping on a column, which has set a title.
-#. * The first %s is replaced with a column title.
-#. * The second %s is replaced with an actual  group value.
-#. * Finally the %d is replaced with count of items in this group.
-#. * Example: "Family name: Smith (13 items)"
-#.
-#: ../widgets/table/e-table-group-container.c:360
-#, c-format
-msgid "%s: %s (%d item)"
-msgid_plural "%s: %s (%d items)"
-msgstr[0] "%s: %s (%d ставка)"
-msgstr[1] "%s: %s (%d ставке)"
-msgstr[2] "%s: %s (%d ставки)"
-msgstr[3] "%s: %s (једна ставка)"
-
-#. Translators: This text is used as a special row when an ETable
-#. * has turned on grouping on a column, which doesn't have set a title.
-#. * The %s is replaced with an actual group value.
-#. * The %d is replaced with count of items in this group.
-#. * Example: "Smith (13 items)"
-#.
-#: ../widgets/table/e-table-group-container.c:372
-#, c-format
-msgid "%s (%d item)"
-msgid_plural "%s (%d items)"
-msgstr[0] "%s (%d ставка)"
-msgstr[1] "%s (%d ставке)"
-msgstr[2] "%s (%d ставки)"
-msgstr[3] "%s (једна ставка)"
-
-#: ../widgets/table/e-table-header-item.c:1574
-msgid "Customize Current View"
-msgstr "Прилагодите тренутни преглед"
-
-#: ../widgets/table/e-table-header-item.c:1596
-msgid "Sort _Ascending"
-msgstr "Разврстај _растуће"
-
-#: ../widgets/table/e-table-header-item.c:1599
-msgid "Sort _Descending"
-msgstr "Разврстај _опадајуће"
-
-#: ../widgets/table/e-table-header-item.c:1602
-msgid "_Unsort"
-msgstr "_Не разврставај"
-
-#: ../widgets/table/e-table-header-item.c:1605
-msgid "Group By This _Field"
-msgstr "Групиши по овоме _пољу"
-
-#: ../widgets/table/e-table-header-item.c:1608
-msgid "Group By _Box"
-msgstr "Групиши по _оквиру"
-
-#: ../widgets/table/e-table-header-item.c:1612
-msgid "Remove This _Column"
-msgstr "Уклони ову _колону"
-
-#: ../widgets/table/e-table-header-item.c:1615
-msgid "Add a C_olumn..."
-msgstr "Додај ко_лону..."
-
-#: ../widgets/table/e-table-header-item.c:1619
-msgid "A_lignment"
-msgstr "По_равнање"
-
-#: ../widgets/table/e-table-header-item.c:1622
-msgid "B_est Fit"
-msgstr "На_јбоље уклапање"
-
-#: ../widgets/table/e-table-header-item.c:1625
-msgid "Format Column_s..."
-msgstr "Обликуј коло_не..."
-
-#: ../widgets/table/e-table-header-item.c:1629
-msgid "Custo_mize Current View..."
-msgstr "Прила_годи тренутни преглед..."
-
-#: ../widgets/table/e-table-header-item.c:1691
-msgid "_Sort By"
-msgstr "_Поређај по"
-
-#. Custom
-#: ../widgets/table/e-table-header-item.c:1709
-msgid "_Custom"
-msgstr "_Произвољно"
-
-#: ../widgets/table/gal-a11y-e-cell.c:123
-msgid "Table Cell"
-msgstr "Ћелија табеле"
-
-#. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:125
-msgid "popup a child"
-msgstr "искачуће изведено"
-
-#. Translators: description of a "toggle" action
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:178
-msgid "toggle the cell"
-msgstr "бирање ћелије"
-
-#. Translators: description of an "expand" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:214
-msgid "expands the row in the ETree containing this cell"
-msgstr "разгранава ред у Естабло које сдржи ову ћелију"
-
-#. Translators: description of a "collapse" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:221
-msgid "collapses the row in the ETree containing this cell"
-msgstr "скупља ред у Естабло које садржи ову ћелију"
-
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:72
-msgid "click"
-msgstr "клик"
-
-#: ../widgets/table/gal-a11y-e-table-column-header.c:161
-msgid "sort"
-msgstr "разврставање"
-
-#: ../widgets/text/e-text.c:2074
-msgid "Select All"
-msgstr "Изабери све"
-
-#: ../widgets/text/e-text.c:2087
-msgid "Input Methods"
-msgstr "Начини уноса"
-
-#~ msgctxt "New"
-#~ msgid "_Test Item"
-#~ msgstr "_Пробна ставка"
-
-#~ msgid "Create a new test item"
-#~ msgstr "Направите нову пробну ставку"
-
-#~ msgctxt "New"
-#~ msgid "Test _Source"
-#~ msgstr "Пробни _извор"
-
-#~ msgid "Create a new test source"
-#~ msgstr "Направите нови пробни извор"
-
-#~ msgid "ID of the socket to embed in"
-#~ msgstr "ИБ прикључка за уметање"
-
-#~ msgid "socket"
-#~ msgstr "утичница"
-
-#~ msgid "Please enter your full name."
-#~ msgstr "Унесите ваше пуно име."
-
-#~ msgid "Please enter your email address."
-#~ msgstr "Унесите адресу ел. поште."
-
-#~ msgid "The email address you have entered is invalid."
-#~ msgstr "Унета адреса ел. поште није исправна."
-
-#~ msgid "Please enter your password."
-#~ msgstr "Унесите вашу лозинку."
-
-#~ msgid "CalDAV"
-#~ msgstr "КолДАВ"
-
-#~ msgid "Google"
-#~ msgstr "Гугл"
-
-#~ msgid "Always (SSL)"
-#~ msgstr "Увек (ССЛ)"
-
-#~ msgid "When possible (TLS)"
-#~ msgstr "Када је могуће (ТЛС)"
-
-# Create the default Person calendar
-# Create the default Person task list
-# orange
-#~ msgid "Personal details:"
-#~ msgstr "Лични подаци:"
-
-#~ msgid "Email address:"
-#~ msgstr "Адреса ел. поште:"
-
-#~ msgid "Details:"
-#~ msgstr "Детаљи:"
-
-#~ msgid "Server type:"
-#~ msgstr "Врста сервера:"
-
-#~ msgid "Server address:"
-#~ msgstr "Адреса сервера:"
-
-#~ msgid "Use encryption:"
-#~ msgstr "Користи шифровање:"
-
-#~ msgid ""
-#~ "To use the email application you'll need to setup an account. Put your "
-#~ "email address and password in below and we'll try and work out all the "
-#~ "settings. If we can't do it automatically you'll need your server details "
-#~ "as well."
-#~ msgstr ""
-#~ "Да користите програм за пошту потребно је да подесите налог. Унесите "
-#~ "адресу ел. поште и лозинку да покушамо да препознамо поставке. Уколико то "
-#~ "није могуће аутоматски, мораћете да додате и податке о серверу."
-
-#~ msgid ""
-#~ "Sorry, we can't work out the settings to get your mail automatically. "
-#~ "Please enter them below. We've tried to make a start with the details you "
-#~ "just entered but you may need to change them."
-#~ msgstr ""
-#~ "Жао нам је, не можемо аутоматски да препознамо поставке. Унесите их доле. "
-#~ "Покушали смо да са подацима које сте унели започнемо подешавање, али "
-#~ "можда ће бити потребно да их измените."
-
-#~ msgid "You can specify more options to configure the account."
-#~ msgstr "Можете да наведете још опција за подешавање налога."
-
-#~ msgid ""
-#~ "Now we need your settings for sending mail. We've tried to make some "
-#~ "guesses but you should check them over to make sure."
-#~ msgstr ""
-#~ "Сада су нам потребне поставке за слање поште. Покушали смо да погодимо "
-#~ "поставке, али је потребно да их проверите."
-
-#~ msgid "You can specify your default settings for your account."
-#~ msgstr "Можете одредити подразумеване поставке налога."
-
-#~ msgid ""
-#~ "Time to check things over before we try and connect to the server and "
-#~ "fetch your mail."
-#~ msgstr ""
-#~ "Време је да проверимо поставке пре него што покушамо да се повежемо на "
-#~ "сервер да бисмо добавили вашу пошту."
-
-#~ msgid "Next - Receiving mail"
-#~ msgstr "Напред — Примање поште"
-
-#~ msgid "Receiving mail"
-#~ msgstr "Примање поште"
-
-#~ msgid "Next - Sending mail"
-#~ msgstr "Напред — Слање поште"
-
-#~ msgid "Back - Identity"
-#~ msgstr "Назад — Идентитет"
-
-#~ msgid "Next - Receiving options"
-#~ msgstr "Напред — Опције за примање"
-
-#~ msgid "Receiving options"
-#~ msgstr "Опције за примање"
-
-#~ msgid "Back - Receiving mail"
-#~ msgstr "Назад — Примање поште"
-
-#~ msgid "Sending mail"
-#~ msgstr "Слање поште"
-
-#~ msgid "Next - Review account"
-#~ msgstr "Напред — Преглед поставки налога"
-
-#~ msgid "Next - Defaults"
-#~ msgstr "Напред — Подразумевано"
-
-#~ msgid "Back - Receiving options"
-#~ msgstr "Назад — Опције за примање"
-
-#~ msgid "Back - Sending mail"
-#~ msgstr "Назад — Слање поште"
-
-#~ msgid "Review account"
-#~ msgstr "Преглед поставки налога"
-
-#~ msgid "Finish"
-#~ msgstr "Завршетак"
-
-#~ msgid "Back - Sending"
-#~ msgstr "Назад — Слање"
-
-#~ msgid "Setup Google contacts with Evolution"
-#~ msgstr "Подесите Гугл контакте са Еволуцијом"
-
-#~ msgid "Setup Google calendar with Evolution"
-#~ msgstr "Подесите Гугл календар са Еволуцијом"
-
-#~ msgid "You may need to enable IMAP access."
-#~ msgstr "Можда ћете морати да омогућите ИМАП приступ."
-
-#~ msgid "Google account settings:"
-#~ msgstr "Подешавања Гугл налога:"
-
-#~ msgid "Setup Yahoo calendar with Evolution"
-#~ msgstr "Подесите Јаху календар са Еволуцијом"
-
-#~ msgid ""
-#~ "Yahoo calendars are named as firstname_lastname. We have tried to form "
-#~ "the calendar name. So please confirm and re-enter the calendar name if it "
-#~ "is not correct."
-#~ msgstr ""
-#~ "Јаху календарима се додељују имена облика „име_презиме“. Покушали смо да "
-#~ "формирамо име календара. Потврдите или унесите друго уколико предложено "
-#~ "није исправно."
-
-#~ msgid "Yahoo account settings:"
-#~ msgstr "Подешавања Јаху налога:"
-
-#~ msgid "Yahoo Calendar name:"
-#~ msgstr "Назив Јаху календара:"
-
-#~ msgid "Password:"
-#~ msgstr "Лозинка:"
-
-#~ msgid "Close Tab"
-#~ msgstr "Затвори језичак"
-
-#~ msgid "Account Wizard"
-#~ msgstr "Чаробњак налога"
-
-#~ msgid "Evolution account assistant"
-#~ msgstr "Помоћник налога Еволуције"
-
-#~ msgid "Modify %s..."
-#~ msgstr "Измени %s..."
-
-#~ msgid "Add a new account"
-#~ msgstr "Додајте нови налог"
-
-#~ msgid "Account management"
-#~ msgstr "Управљање налозима"
-
-#~ msgid "Settings"
-#~ msgstr "Подешавања"
-
-#~ msgid "Cannot get transport for account '%s'"
-#~ msgstr "Не могу да добијем пренос за налог „%s“"
-
-#~ msgid "Some features may not work properly with your current server"
-#~ msgstr "Неке опције неће исправно радити на вашем тренутном серверу"
-
-#~ msgid ""
-#~ "You are connecting to an unsupported GroupWise server and may encounter "
-#~ "problems using Evolution. For best results the server should be upgraded "
-#~ "to a supported version"
-#~ msgstr ""
-#~ "Повезујете се на неподржан ГроупВајз сервер што може да доведе до "
-#~ "проблема у раду Еволуције. Најбоље је да сервер буде надограђен на "
-#~ "подржану верзију."
-
-#~ msgid "GroupWise Address book creation:"
-#~ msgstr "Стварање ГроупВајз адресара:"
-
-#~ msgid ""
-#~ "Currently you can only access the GroupWise System Address Book from "
-#~ "Evolution. Please use some other GroupWise mail client once to get your "
-#~ "GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
-#~ msgstr ""
-#~ "Тренутно из Еволуције можете приступити само системском адресару "
-#~ "ГроупВајза. Користите неки други ГроупВајз клијент за електронску пошту "
-#~ "да добавите честе контакте и фасцикле са личним контактима ГроупВајза."
-
-#~ msgid "Some features may not work properly with your current server."
-#~ msgstr ""
-#~ "На текућој верзији сервера неке могућности можда неће исправно радити."
-
-#~ msgid ""
-#~ "You are connecting to an unsupported GroupWise server and may encounter "
-#~ "problems using Evolution. For best results, the server should be upgraded "
-#~ "to a supported version."
-#~ msgstr ""
-#~ "Повезујете се на неподржан ГроупВајз сервер што може да доведе до "
-#~ "проблема у раду Еволуције. Најбоље је да сервер буде надограђен на "
-#~ "подржану верзију."
-
-#~ msgid "Undo the last action"
-#~ msgstr "Опозива последњу радњу"
-
-#~ msgid "Redo the last undone action"
-#~ msgstr "Поново врши опозвану радњу"
-
-#~ msgid "Search for text"
-#~ msgstr "Претражује текст"
-
-#~ msgid "Search for and replace text"
-#~ msgstr "Претражује и замењује текст"
-
-#~ msgid "Unable to connect to the GroupWise server."
-#~ msgstr "Нисам успео да се повежем на ГроупВајз сервер."
-
-#~ msgid "Please check your account settings and try again."
-#~ msgstr "Проверите подешавања налога и покушајте поново."
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 73264e432b..c7b392a014 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -4,15 +4,15 @@
 # Maintainer: Igor Nestorović <jung@one.ekof.bg.ac.yu>
 # Reviewed on 2005-08-22 by Igor Nestorović <igor@prevod.org>
 # Miloš Popović <gpopac@gmail.com>, 2010.
-# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011, 2012.
-#: ../shell/main.c:555
+# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011, 2012, 2013.
+#: ../shell/main.c:573
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolut"
 "ion&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2012-08-24 22:06+0000\n"
-"PO-Revision-Date: 2012-09-06 22:41+0200\n"
+"POT-Creation-Date: 2013-01-24 17:15+0000\n"
+"PO-Revision-Date: 2013-01-26 09:09+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
 "Language-Team: Serbian <gnom@prevod.org>\n"
 "Language: sr\n"
@@ -198,8 +198,8 @@ msgstr ""
 "Kontakt sa ovom adresom već postoji. Želite li ipak da dodate novu kartu sa "
 "istom adresom?"
 
-#: ../addressbook/addressbook.error.xml.h:36
-#: ../mail/em-vfolder-editor-rule.c:391 ../widgets/table/e-table-config.ui.h:6
+#: ../addressbook/addressbook.error.xml.h:36 ../e-util/e-table-config.ui.h:6
+#: ../e-util/e-name-selector-dialog.c:966 ../mail/em-vfolder-editor-rule.c:397
 msgid "_Add"
 msgstr "_Dodaj"
 
@@ -236,7 +236,7 @@ msgstr ""
 "želite da ga dodate?"
 
 #: ../addressbook/addressbook.error.xml.h:43
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1264
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1258
 msgid "Failed to delete contact"
 msgstr "Nisam uspeo da obrišem kontakt"
 
@@ -258,9 +258,9 @@ msgstr ""
 "adresar sa bočne trake u pregledu Kontakti."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:625
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:647
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2935
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:618
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:640
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2932
 msgid "Contact Editor"
 msgstr "Uređivač za kontakte"
 
@@ -298,10 +298,10 @@ msgstr "_Želi da prima HTML poštu"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
 #: ../addressbook/gui/merging/eab-contact-merging.c:396
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:611
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:973
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../smime/lib/e-cert.c:810
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:606
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:971
+#: ../smime/lib/e-asn1-object.c:395
 msgid "Email"
 msgstr "El. pošta"
 
@@ -314,7 +314,7 @@ msgid "Instant Messaging"
 msgstr "Trenutne poruke"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/importers/evolution-vcard-importer.c:1002
+#: ../addressbook/importers/evolution-vcard-importer.c:1004
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -323,9 +323,9 @@ msgid "_Home Page:"
 msgstr "_Lična strana:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
-#: ../calendar/gui/dialogs/event-page.c:722
+#: ../calendar/gui/dialogs/event-page.c:709
 #: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../modules/itip-formatter/itip-view.c:1842
+#: ../modules/itip-formatter/itip-view.c:1850
 msgid "_Calendar:"
 msgstr "_Kalendar:"
 
@@ -342,7 +342,7 @@ msgid "Home Page:"
 msgstr "Matična strana:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../modules/cal-config-google/evolution-cal-config-google.c:98
+#: ../modules/cal-config-google/evolution-cal-config-google.c:97
 msgid "Calendar:"
 msgstr "Kalendar:"
 
@@ -376,7 +376,8 @@ msgid "_Profession:"
 msgstr "_Zanimanje:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:27
-#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+#| msgid "_Title:"
+msgctxt "Job"
 msgid "_Title:"
 msgstr "_Zvanje:"
 
@@ -417,8 +418,8 @@ msgid "_Anniversary:"
 msgstr "_Godišnjica:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:706
-#: ../calendar/gui/e-calendar-view.c:2150
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
+#: ../calendar/gui/e-calendar-view.c:2193
 msgid "Anniversary"
 msgstr "Godišnjica"
 
@@ -428,8 +429,8 @@ msgstr "Godišnjica"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:705
-#: ../calendar/gui/e-calendar-view.c:2149 ../shell/main.c:129
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:702
+#: ../calendar/gui/e-calendar-view.c:2192 ../shell/main.c:127
 msgid "Birthday"
 msgstr "Rođendan"
 
@@ -467,27 +468,27 @@ msgid "_Address:"
 msgstr "_Adresa:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
-#: ../addressbook/gui/widgets/eab-contact-display.c:399
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:75
-#: ../widgets/misc/e-contact-map.c:298
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:186
+#: ../addressbook/gui/widgets/e-contact-map.c:308
+#: ../addressbook/gui/widgets/eab-contact-display.c:389
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:69
 msgid "Home"
 msgstr "Kuća"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-display.c:396
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:74
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:687
-#: ../widgets/misc/e-contact-map.c:306
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:185
+#: ../addressbook/gui/widgets/e-contact-map.c:316
+#: ../addressbook/gui/widgets/eab-contact-display.c:386
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:68
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:684
 msgid "Work"
 msgstr "Posao"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:194
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:76
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:384
-#: ../calendar/gui/e-cal-model.c:3570
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:187
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:70
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:379
+#: ../calendar/gui/e-cal-model.c:3550
 msgid "Other"
 msgstr "Drugo"
 
@@ -499,79 +500,79 @@ msgstr "Adresa stanovanja"
 msgid "Notes"
 msgstr "Napomene"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:614
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:165
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:609
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:617
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:166
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:612
 msgid "Jabber"
 msgstr "Džaber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:619
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:167
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:614
 msgid "Yahoo"
 msgstr "Jahu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:620
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:168
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:615
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:618
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:169
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:613
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:616
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:611
 msgid "ICQ"
 msgstr "ICKu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:615
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:610
 msgid "GroupWise"
 msgstr "GroupVajz"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:621
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:616
 msgid "Skype"
 msgstr "Skajp"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:180
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:622
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:617
 msgid "Twitter"
 msgstr "Tviter"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:217
-#: ../addressbook/gui/widgets/eab-gui-util.c:497
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:210
+#: ../addressbook/gui/widgets/eab-gui-util.c:493
 msgid "Error adding contact"
 msgstr "Greška pri dodavanju kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:232
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:225
 msgid "Error modifying contact"
 msgstr "Greška pri izmeni kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:247
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:240
 msgid "Error removing contact"
 msgstr "Greška pri uklanjanju kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:641
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2929
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:634
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:2926
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Uređivač za kontakte — %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3411
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3447
 msgid "Please select an image for this contact"
 msgstr "Izaberite sliku za ovaj kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3412
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3448
 msgid "_No image"
 msgstr "_Bez slike"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3745
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3781
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -579,48 +580,48 @@ msgstr ""
 "Podaci o kontaktu nisu ispravni:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3751
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3787
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "„%s“ ima neispravan format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3758
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3795
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "„%s“ ne može biti budući datum"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3766
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3803
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s„%s“ ima neispravan format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3779
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3793
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3816
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3830
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s„%s“ je prazan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3808
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3845
 msgid "Invalid contact."
 msgstr "Neispravan kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:438
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:435
 msgid "Contact Quick-Add"
 msgstr "Brzo dodavanje kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:441
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:438
 msgid "_Edit Full"
 msgstr "_Uredi potpuno"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:491
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:488
 msgid "_Full name"
 msgstr "_Ime i prezime"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:502
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:501
 msgid "E_mail"
 msgstr "E-_pošta"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:513
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:514
 msgid "_Select Address Book"
 msgstr "_Izaberi adresar"
 
@@ -677,6 +678,12 @@ msgstr "Ime i prezime"
 msgid "_First:"
 msgstr "_Ime:"
 
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+#| msgid "_Title:"
+msgctxt "FullName"
+msgid "_Title:"
+msgstr "_Zvanje:"
+
 #: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_Middle:"
 msgstr "_Srednje:"
@@ -690,7 +697,7 @@ msgid "_Suffix:"
 msgstr "_Sufiks:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:764
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:794
 msgid "Contact List Editor"
 msgstr "Uređivač kontakt liste"
 
@@ -726,23 +733,23 @@ msgstr "Umetnite adrese el. pošte iz adresara"
 msgid "_Select..."
 msgstr "_Izaberi..."
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:887
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:917
 msgid "Contact List Members"
 msgstr "Članovi kontakt liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1412
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1443
 msgid "_Members"
 msgstr "_Članovi"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1531
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1562
 msgid "Error adding list"
 msgstr "Greška pri dodavanju liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1546
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1577
 msgid "Error modifying list"
 msgstr "Greška pri izmeni liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1561
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1592
 msgid "Error removing list"
 msgstr "Greška pri uklanjanju liste"
 
@@ -794,296 +801,25 @@ msgid "Merge Contact"
 msgstr "Pripoji kontakt"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1072
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
 msgid "Name contains"
 msgstr "Naziv sadrži"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1065
+#: ../modules/addressbook/e-book-shell-view-actions.c:1059
 msgid "Email begins with"
 msgstr "E-pošta počinje sa"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:3
 #: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
 #: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1058
-#: ../modules/calendar/e-cal-shell-view-actions.c:1798
-#: ../modules/calendar/e-memo-shell-view-actions.c:813
-#: ../modules/calendar/e-task-shell-view-actions.c:1012
+#: ../modules/addressbook/e-book-shell-view-actions.c:1052
+#: ../modules/calendar/e-cal-shell-view-actions.c:1797
+#: ../modules/calendar/e-memo-shell-view-actions.c:812
+#: ../modules/calendar/e-task-shell-view-actions.c:1011
 msgid "Any field contains"
 msgstr "Polje koje sadrži"
 
-# note(slobo): message thread, niz --> bolji prevod je rasprava
-# note(slobo): ponegde sam za summary koristio --> „u kratkim crtama“
-# note(slobo): za memo sam koristio --> beleške
-# note(slobo): upgrading memo: dopuna beleške je bolje od nadogradnja beleške
-# note(slobo): set alarm, postavi alarm ... proba na par mesta --> „navij sat“
-# note(slobo): filter, filter -->  propusnik, proba na par mesta
-# note(slobo): address book, adresar --> imenik na par mesta proba
-# note(slobo): spam , Đubre --> Neželjena pošta
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:93
-#: ../addressbook/gui/widgets/ea-addressbook-view.c:102
-#: ../addressbook/gui/widgets/ea-minicard-view.c:189
-msgid "evolution address book"
-msgstr "Adresar Evolucije"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:162
-msgid "Copy _Email Address"
-msgstr "Umnoži elektronsku _adresu"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:164
-#: ../widgets/misc/e-web-view.c:296 ../widgets/misc/e-web-view-gtkhtml.c:429
-msgid "Copy the email address to the clipboard"
-msgstr "Umnožava adrese u spisak isečaka"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:169
-#: ../widgets/misc/e-web-view.c:301 ../widgets/misc/e-web-view-gtkhtml.c:434
-msgid "_Send New Message To..."
-msgstr "_Pošalji poruku za..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:171
-#: ../widgets/misc/e-web-view.c:303 ../widgets/misc/e-web-view-gtkhtml.c:436
-msgid "Send a mail message to this address"
-msgstr "Šalje poruku na ovu adresu"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:333
-#: ../widgets/misc/e-web-view.c:1102 ../widgets/misc/e-web-view-gtkhtml.c:973
-#, c-format
-msgid "Click to mail %s"
-msgstr "Kliknite da pošaljete %s"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:154
-msgid "Open map"
-msgstr "Otvorite mapu"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:549
-msgid "List Members:"
-msgstr "Članovi liste:"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:613
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-msgid "Nickname"
-msgstr "Nadimak"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-msgid "Company"
-msgstr "Preduzeće"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:667
-msgid "Department"
-msgstr "Odeljenje"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:668
-msgid "Profession"
-msgstr "Zanimanje"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:669
-msgid "Position"
-msgstr "Položaj"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:670
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-msgid "Manager"
-msgstr "Rukovodilac"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:671
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-msgid "Assistant"
-msgstr "Pomoćnik"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:672
-msgid "Video Chat"
-msgstr "Video razgovor"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:673
-#: ../modules/calendar/e-cal-shell-view-actions.c:217
-#: ../modules/calendar/e-cal-shell-view-actions.c:246
-#: ../modules/calendar/e-cal-shell-view.c:548
-#: ../plugins/publish-calendar/publish-calendar.ui.h:21
-#: ../widgets/misc/e-send-options.c:546
-msgid "Calendar"
-msgstr "Kalendar"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:674
-#: ../calendar/gui/dialogs/event-editor.c:127
-#: ../calendar/gui/dialogs/event-editor.c:354
-#: ../plugins/publish-calendar/publish-calendar.ui.h:2
-msgid "Free/Busy"
-msgstr "Slobodno/zauzeto"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:675
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:702
-msgid "Phone"
-msgstr "Telefon"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:676
-msgid "Fax"
-msgstr "Faks"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:677
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:704
-msgid "Address"
-msgstr "Adresa"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:700
-msgid "Home Page"
-msgstr "Matična stranica"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:701
-msgid "Web Log"
-msgstr "Veb log"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-msgid "Mobile Phone"
-msgstr "Mobilni telefon"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:707
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-msgid "Spouse"
-msgstr "Supružnik"
-
-# Create the default Person calendar
-# Create the default Person task list
-# orange
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:717
-msgid "Personal"
-msgstr "Lično"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:741
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-msgid "Note"
-msgstr "Napomena"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:937
-msgid "List Members"
-msgstr "Članovi liste"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:958
-msgid "Job Title"
-msgstr "Zvanje na poslu"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:999
-msgid "Home page"
-msgstr "Matična stranica:"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1009
-msgid "Blog"
-msgstr "Blog"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:124
-msgid ""
-"This address book cannot be opened. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents."
-msgstr ""
-"Ne mogu da otvorim ovaj adresar. To znači da on ili nije označen za "
-"korišćenje van mreže ili da još nije preuzet za rad van mreže. Učitajte "
-"adresar kada se povežete radi preuzimanja njegovog sadržaja."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:143
-#, c-format
-msgid ""
-"This address book cannot be opened.  Please check that the path %s exists "
-"and that permissions are set to access it."
-msgstr ""
-"Ne mogu da otvorim ovaj adresar.  Proverite da li postoji putanja %s i da li "
-"imate prava pristupa."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:156
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  To "
-"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
-msgstr ""
-"Ovo izdanje Evolucije nema u sebi podršku za LDAP.  Ukoliko želite da "
-"koristite LDAP u Evoluciji, morate da instalirate paket Evolucije sa "
-"podrškom za LDAP."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:165
-msgid ""
-"This address book cannot be opened.  This either means that an incorrect URI "
-"was entered, or the server is unreachable."
-msgstr ""
-"Ne mogu da otvorim ovaj adresar.  To znači da ste ili uneli pogrešnu adresu, "
-"ili je server nedostupan."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:173
-msgid "Detailed error message:"
-msgstr "Detalji greške:"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:210
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this address book."
-msgstr ""
-"Broj karti koje odgovaraju upitu je veći od broja na koji je server \n"
-"podešen da odgovori ili koji je Evolucija podešena da prikaže.\n"
-"Preciznije oblikujte upit ili povećajte ograničenje\n"
-"broja rezultata u postavkama adresara za server direktorijuma."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:217
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"configured for this address book.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this address book."
-msgstr ""
-"Vreme za izvršavanje ovog upita je preko ograničenja servera ili\n"
-"ograničenja koje ste podesili za ovaj adresar. Preciznije oblikujte\n"
-"upit ili povećajte vremensko ograničenje u postavkama servera\n"
-"direktorijuma za ovaj adresar."
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:225
-#, c-format
-msgid "The backend for this address book was unable to parse this query. %s"
-msgstr "Osnovni proces ovog adresara nije mogao da obradi upit. %s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:230
-#, c-format
-msgid "The backend for this address book refused to perform this query. %s"
-msgstr "Osnovni proces ovog adresara je odbio da obavi ovaj upit. %s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:236
-#: ../addressbook/gui/widgets/eab-gui-util.c:242
-#, c-format
-msgid "This query did not complete successfully. %s"
-msgstr "Ovaj upit nije uspešno završen. %s"
-
-#. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:264
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:315
-msgid "Select Address Book"
-msgstr "Izaberi adresar"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:397
-msgid "list"
-msgstr "spisak"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:586
-msgid "Move contact to"
-msgstr "Premesti kontakt u"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:588
-msgid "Copy contact to"
-msgstr "Umnoži kontakt u"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:591
-msgid "Move contacts to"
-msgstr "Premesti kontakte u"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:593
-msgid "Copy contacts to"
-msgstr "Umnoži kontakte u"
-
 #: ../addressbook/gui/widgets/e-addressbook-model.c:164
 msgid "No contacts"
 msgstr "Nema kontakta"
@@ -1101,63 +837,63 @@ msgstr[3] "jedan kontakt"
 msgid "Error getting book view"
 msgstr "Greška pri učitavanju pregleda knjige"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:805
+#: ../addressbook/gui/widgets/e-addressbook-model.c:812
 msgid "Search Interrupted"
 msgstr "Pretraga je prekinuta"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:160
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:161
 msgid "Error modifying card"
 msgstr "Greška pri izmeni karte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:644
+#: ../addressbook/gui/widgets/e-addressbook-view.c:635
 msgid "Cut selected contacts to the clipboard"
 msgstr "Seče označene kontakte u spisak isečaka"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:650
+#: ../addressbook/gui/widgets/e-addressbook-view.c:641
 msgid "Copy selected contacts to the clipboard"
 msgstr "Umnožava označene kontakte u spisak isečaka"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:656
+#: ../addressbook/gui/widgets/e-addressbook-view.c:647
 msgid "Paste contacts from the clipboard"
 msgstr "Ubacuje kontakte iz spiska isečaka"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:662
-#: ../modules/addressbook/e-book-shell-view-actions.c:876
+#: ../addressbook/gui/widgets/e-addressbook-view.c:653
+#: ../modules/addressbook/e-book-shell-view-actions.c:870
 msgid "Delete selected contacts"
 msgstr "Briše izabrane kontakte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:668
+#: ../addressbook/gui/widgets/e-addressbook-view.c:659
 msgid "Select all visible contacts"
 msgstr "Označava sve vidljive kontakte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Sigurno želite da obrišete ove liste kontakta?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1310
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Sigurno želite da obrišete ovaj spisak kontakta?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1314
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
-msgstr "Sigurno želite da obrišete ovaj spisak kontakta (%s) ?"
+msgstr "Sigurno želite da obrišete ovaj spisak kontakta (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1326
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Sigurno želite da obrišete ove kontakte?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1324
 msgid "Are you sure you want to delete this contact?"
 msgstr "Sigurno želite da obrišete ovaj kontakt?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1334
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1328
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
-msgstr "Sigurno želite da obrišete ovaj kontakt (%s) ?"
+msgstr "Sigurno želite da obrišete ovaj kontakt (%s)?"
 
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1490
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -1178,11 +914,11 @@ msgstr[3] ""
 "Otvaranje jednog kontakta će takođe otvoriti jedan novi prozor.\n"
 "Da li zaista želite da prikažete sve ove kontakte?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1498
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1492
 msgid "_Don't Display"
 msgstr "_Ne prikazuj"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1499
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1493
 msgid "Display _All Contacts"
 msgstr "Prikaži _sve kontakte"
 
@@ -1198,6 +934,11 @@ msgstr "Dato ime"
 msgid "Family Name"
 msgstr "Prezime"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:608
+msgid "Nickname"
+msgstr "Nadimak"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Email 2"
 msgstr "2. elektronska adresa"
@@ -1250,6 +991,11 @@ msgstr "Kućni faks"
 msgid "ISDN Phone"
 msgstr "ISDN telefon"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:700
+msgid "Mobile Phone"
+msgstr "Mobilni telefon"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Other Phone"
 msgstr "Drugi telefon"
@@ -1284,6 +1030,11 @@ msgstr "Teleks"
 msgid "TTYTDD"
 msgstr "TTUTDD"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:663
+msgid "Company"
+msgstr "Preduzeće"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Unit"
 msgstr "Jedinica"
@@ -1297,11 +1048,21 @@ msgid "Title"
 msgstr "Titula"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:38
-#: ../calendar/gui/e-meeting-list-view.c:657
+#: ../calendar/gui/e-meeting-list-view.c:663
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:5
 msgid "Role"
 msgstr "Uloga"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:667
+msgid "Manager"
+msgstr "Rukovodilac"
+
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:668
+msgid "Assistant"
+msgstr "Pomoćnik"
+
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
 msgstr "Veb stranica"
@@ -1314,57 +1075,25 @@ msgstr "Dnevnik"
 #: ../calendar/gui/dialogs/event-page.ui.h:20
 #: ../calendar/gui/e-calendar-table.etspec.h:12
 #: ../calendar/gui/e-cal-list-view.etspec.h:6
-#: ../calendar/gui/e-memo-table.etspec.h:4
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../e-util/e-categories-dialog.c:89
 msgid "Categories"
 msgstr "Kategorije"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:34
-msgid "Open"
-msgstr "Otvori"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:156
-msgid "Contact List: "
-msgstr "Spisak kontakta: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:157
-msgid "Contact: "
-msgstr "Kontakt: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:183
-msgid "evolution minicard"
-msgstr "minikarta evolucije"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
-msgid "New Contact"
-msgstr "Novi kontakt"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:37
-msgid "New Contact List"
-msgstr "Nova kontakt lista"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:172
-#, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "trenutna fascikla adresara %s ima %d kartu"
-msgstr[1] "trenutna fascikla adresara %s ima %d karte"
-msgstr[2] "trenutna fascikla adresara %s ima %d karti"
-msgstr[3] "trenutna fascikla adresara %s ima jednu kartu"
-
-#: ../addressbook/gui/widgets/e-minicard.c:93
-msgid "Work Email"
-msgstr "Poslovna el. pošta"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:704
+msgid "Spouse"
+msgstr "Supružnik"
 
-#: ../addressbook/gui/widgets/e-minicard.c:94
-msgid "Home Email"
-msgstr "Kućna el. pošta"
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:738
+msgid "Note"
+msgstr "Napomena"
 
-#: ../addressbook/gui/widgets/e-minicard.c:95
-#: ../addressbook/gui/widgets/e-minicard.c:775
-msgid "Other Email"
-msgstr "Druga el. pošta"
+#: ../addressbook/gui/widgets/e-contact-map-window.c:364
+msgid "Contacts Map"
+msgstr "Karta kontakata"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:188
+#: ../addressbook/gui/widgets/e-minicard-view.c:191
 msgid ""
 "\n"
 "\n"
@@ -1374,7 +1103,7 @@ msgstr ""
 "\n"
 "Tražim kontakte..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#: ../addressbook/gui/widgets/e-minicard-view.c:194
 msgid ""
 "\n"
 "\n"
@@ -1388,7 +1117,7 @@ msgstr ""
 "\n"
 "ili kliknite dvaput ovde da napravite novi kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:194
+#: ../addressbook/gui/widgets/e-minicard-view.c:197
 msgid ""
 "\n"
 "\n"
@@ -1402,7 +1131,7 @@ msgstr ""
 "\n"
 "Kliknite dvaput da napravite nov kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:198
+#: ../addressbook/gui/widgets/e-minicard-view.c:201
 msgid ""
 "\n"
 "\n"
@@ -1412,7 +1141,7 @@ msgstr ""
 "\n"
 "Pretraga za kontaktima."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:200
+#: ../addressbook/gui/widgets/e-minicard-view.c:203
 msgid ""
 "\n"
 "\n"
@@ -1422,48 +1151,330 @@ msgstr ""
 "\n"
 "Nema stavki za prikazivanje."
 
+#: ../addressbook/gui/widgets/e-minicard.c:93
+msgid "Work Email"
+msgstr "Poslovna el. pošta"
+
+#: ../addressbook/gui/widgets/e-minicard.c:94
+msgid "Home Email"
+msgstr "Kućna el. pošta"
+
+#: ../addressbook/gui/widgets/e-minicard.c:95
+#: ../addressbook/gui/widgets/e-minicard.c:828
+msgid "Other Email"
+msgstr "Druga el. pošta"
+
+# note(slobo): message thread, niz --> bolji prevod je rasprava
+# note(slobo): ponegde sam za summary koristio --> „u kratkim crtama“
+# note(slobo): za memo sam koristio --> beleške
+# note(slobo): upgrading memo: dopuna beleške je bolje od nadogradnja beleške
+# note(slobo): set alarm, postavi alarm ... proba na par mesta --> „navij sat“
+# note(slobo): filter, filter -->  propusnik, proba na par mesta
+# note(slobo): address book, adresar --> imenik na par mesta proba
+# note(slobo): spam , Đubre --> Neželjena pošta
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:95
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:104
+#: ../addressbook/gui/widgets/ea-minicard-view.c:194
+msgid "evolution address book"
+msgstr "Adresar Evolucije"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+msgid "New Contact"
+msgstr "Novi kontakt"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:37
+msgid "New Contact List"
+msgstr "Nova kontakt lista"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:177
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "trenutna fascikla adresara %s ima %d kartu"
+msgstr[1] "trenutna fascikla adresara %s ima %d karte"
+msgstr[2] "trenutna fascikla adresara %s ima %d karti"
+msgstr[3] "trenutna fascikla adresara %s ima jednu kartu"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:34
+msgid "Open"
+msgstr "Otvori"
+
+#: ../addressbook/gui/widgets/ea-minicard.c:160
+msgid "Contact List: "
+msgstr "Spisak kontakta: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:161
+msgid "Contact: "
+msgstr "Kontakt: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:188
+msgid "evolution minicard"
+msgstr "minikarta evolucije"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:152
+msgid "Copy _Email Address"
+msgstr "Umnoži elektronsku _adresu"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:154
+#: ../e-util/e-web-view-gtkhtml.c:428 ../e-util/e-web-view.c:295
+msgid "Copy the email address to the clipboard"
+msgstr "Umnožava adrese u spisak isečaka"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:159
+#: ../e-util/e-web-view-gtkhtml.c:433 ../e-util/e-web-view.c:300
+msgid "_Send New Message To..."
+msgstr "_Pošalji poruku za..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:161
+#: ../e-util/e-web-view-gtkhtml.c:435 ../e-util/e-web-view.c:302
+msgid "Send a mail message to this address"
+msgstr "Šalje poruku na ovu adresu"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:323
+#: ../e-util/e-web-view-gtkhtml.c:972 ../e-util/e-web-view.c:1084
+#, c-format
+msgid "Click to mail %s"
+msgstr "Kliknite da pošaljete %s"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:148
+msgid "Open map"
+msgstr "Otvorite mapu"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:544
+msgid "List Members:"
+msgstr "Članovi liste:"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:664
+msgid "Department"
+msgstr "Odeljenje"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:665
+msgid "Profession"
+msgstr "Zanimanje"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
+msgid "Position"
+msgstr "Položaj"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:669
+msgid "Video Chat"
+msgstr "Video razgovor"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:670
+#: ../e-util/e-send-options.c:546
+#: ../modules/calendar/e-cal-shell-view-actions.c:216
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
+#: ../modules/calendar/e-cal-shell-view.c:548
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Calendar"
+msgstr "Kalendar"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:671
+#: ../calendar/gui/dialogs/event-editor.c:122
+#: ../calendar/gui/dialogs/event-editor.c:349
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Free/Busy"
+msgstr "Slobodno/zauzeto"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:672
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:699
+msgid "Phone"
+msgstr "Telefon"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:673
+msgid "Fax"
+msgstr "Faks"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:674
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:701
+msgid "Address"
+msgstr "Adresa"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:697
+msgid "Home Page"
+msgstr "Matična stranica"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:698
+msgid "Web Log"
+msgstr "Veb log"
+
+# Create the default Person calendar
+# Create the default Person task list
+# orange
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:714
+msgid "Personal"
+msgstr "Lično"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:935
+msgid "List Members"
+msgstr "Članovi liste"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:956
+msgid "Job Title"
+msgstr "Zvanje na poslu"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:997
+msgid "Home page"
+msgstr "Matična stranica"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1007
+msgid "Blog"
+msgstr "Blog"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:118
+msgid ""
+"This address book cannot be opened. This either means this book is not "
+"marked for offline usage or not yet downloaded for offline usage. Please "
+"load the address book once in online mode to download its contents."
+msgstr ""
+"Ne mogu da otvorim ovaj adresar. To znači da on ili nije označen za "
+"korišćenje van mreže ili da još nije preuzet za rad van mreže. Učitajte "
+"adresar kada se povežete radi preuzimanja njegovog sadržaja."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:137
+#, c-format
+msgid ""
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
+msgstr ""
+"Ne mogu da otvorim ovaj adresar.  Proverite da li postoji putanja %s i da li "
+"imate prava pristupa."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:150
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
+msgstr ""
+"Ovo izdanje Evolucije nema u sebi podršku za LDAP.  Ukoliko želite da "
+"koristite LDAP u Evoluciji, morate da instalirate paket Evolucije sa "
+"podrškom za LDAP."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:159
+msgid ""
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
+msgstr ""
+"Ne mogu da otvorim ovaj adresar.  To znači da ste ili uneli pogrešnu adresu, "
+"ili je server nedostupan."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:167
+msgid "Detailed error message:"
+msgstr "Detalji greške:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:204
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this address book."
+msgstr ""
+"Broj karti koje odgovaraju upitu je veći od broja na koji je server \n"
+"podešen da odgovori ili koji je Evolucija podešena da prikaže.\n"
+"Preciznije oblikujte upit ili povećajte ograničenje\n"
+"broja rezultata u postavkama adresara za server direktorijuma."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"configured for this address book.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this address book."
+msgstr ""
+"Vreme za izvršavanje ovog upita je preko ograničenja servera ili\n"
+"ograničenja koje ste podesili za ovaj adresar. Preciznije oblikujte\n"
+"upit ili povećajte vremensko ograničenje u postavkama servera\n"
+"direktorijuma za ovaj adresar."
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:219
+#, c-format
+msgid "The backend for this address book was unable to parse this query. %s"
+msgstr "Osnovni proces ovog adresara nije mogao da obradi upit. %s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:224
+#, c-format
+msgid "The backend for this address book refused to perform this query. %s"
+msgstr "Osnovni proces ovog adresara je odbio da obavi ovaj upit. %s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:230
+#: ../addressbook/gui/widgets/eab-gui-util.c:236
+#, c-format
+msgid "This query did not complete successfully. %s"
+msgstr "Ovaj upit nije uspešno završen. %s"
+
+#. This is a filename. Translators take note.
+#: ../addressbook/gui/widgets/eab-gui-util.c:258
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:309
+msgid "Select Address Book"
+msgstr "Izaberi adresar"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:391
+msgid "list"
+msgstr "spisak"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:582
+msgid "Move contact to"
+msgstr "Premesti kontakt u"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:584
+msgid "Copy contact to"
+msgstr "Umnoži kontakt u"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:587
+msgid "Move contacts to"
+msgstr "Premesti kontakte u"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:589
+msgid "Copy contacts to"
+msgstr "Umnoži kontakte u"
+
 #: ../addressbook/gui/widgets/gal-view-factory-minicard.c:38
 msgid "Card View"
 msgstr "Pregled karte"
 
-#: ../addressbook/importers/evolution-csv-importer.c:746
-#: ../addressbook/importers/evolution-ldif-importer.c:544
+#: ../addressbook/importers/evolution-csv-importer.c:744
+#: ../addressbook/importers/evolution-ldif-importer.c:543
 #: ../addressbook/importers/evolution-vcard-importer.c:279
-#: ../calendar/importers/icalendar-importer.c:446
-#: ../calendar/importers/icalendar-importer.c:939
-#: ../calendar/importers/icalendar-importer.c:978 ../shell/shell.error.xml.h:1
+#: ../calendar/importers/icalendar-importer.c:441
+#: ../calendar/importers/icalendar-importer.c:936
+#: ../calendar/importers/icalendar-importer.c:975 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Uvozim..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1084
+#: ../addressbook/importers/evolution-csv-importer.c:1082
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Autluk kontakti CSV ili Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1085
+#: ../addressbook/importers/evolution-csv-importer.c:1083
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Autlukov uvoznik CSV i Tab kontakata"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1093
+#: ../addressbook/importers/evolution-csv-importer.c:1091
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozila kontakti CSV ili Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1094
+#: ../addressbook/importers/evolution-csv-importer.c:1092
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozilin uvoznik CSV i Tab kontakata"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1102
+#: ../addressbook/importers/evolution-csv-importer.c:1100
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolucija kontakti CSV ili Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1103
+#: ../addressbook/importers/evolution-csv-importer.c:1101
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolucijin uvoznik CSV i Tab kontakata"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:805
+#: ../addressbook/importers/evolution-ldif-importer.c:804
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP oblik razmene podataka (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:806
+#: ../addressbook/importers/evolution-ldif-importer.c:805
 msgid "Evolution LDIF importer"
 msgstr "Evolucijin LDIF uvoznik"
 
@@ -1477,7 +1488,7 @@ msgstr "Evolucijin vKart uvoznik"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:717
+#: ../addressbook/printing/e-contact-print.c:764
 #, c-format
 msgid "Page %d"
 msgstr "%d. stranica"
@@ -1552,7 +1563,7 @@ msgstr "Ne mogu da otvorim datoteku"
 msgid "Failed to open client '%s': %s"
 msgstr "Nisam uspeo da otvorim „%s“: %s"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:108
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:106
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
@@ -1560,7 +1571,7 @@ msgstr[1] "minuta"
 msgstr[2] "minuta"
 msgstr[3] "minut"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:121
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:119
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "sat"
@@ -1571,8 +1582,8 @@ msgstr[3] "sat"
 #. For Translator : 'day' is part of the sentence of the form 'appointment recurs/Every [x] month(s) on the [first] [day] [forever]'
 #. * (dropdown menu options are in[square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:134
-#: ../calendar/gui/dialogs/recurrence-page.c:1195
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:132
+#: ../calendar/gui/dialogs/recurrence-page.c:1204
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dan"
@@ -1580,7 +1591,7 @@ msgstr[1] "dana"
 msgstr[2] "dana"
 msgstr[3] "dan"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:330
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:329
 msgid "Start time"
 msgstr "Vreme početka"
 
@@ -1596,17 +1607,16 @@ msgstr "Zanemari _sve"
 msgid "_Snooze"
 msgstr "_Dremanje"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4
-#: ../libevolution-utils/e-alert-dialog.c:162
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../e-util/e-alert-dialog.c:162
 msgid "_Dismiss"
 msgstr "_Zanemari"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:5
-#: ../calendar/alarm-notify/alarm-queue.c:1755
-#: ../calendar/alarm-notify/alarm-queue.c:1765
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:191
-#: ../modules/itip-formatter/itip-view.c:1460
-#: ../modules/itip-formatter/itip-view.c:1569
+#: ../calendar/alarm-notify/alarm-queue.c:1766
+#: ../calendar/alarm-notify/alarm-queue.c:1776
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:190
+#: ../modules/itip-formatter/itip-view.c:1464
+#: ../modules/itip-formatter/itip-view.c:1575
 msgid "Location:"
 msgstr "Mesto:"
 
@@ -1621,46 +1631,51 @@ msgstr "Vreme _dremanja:"
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/alarm-notify/alarm-notify.ui.h:8
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../filter/filter.ui.h:8
-#: ../modules/calendar/e-cal-shell-view-actions.c:353
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10 ../e-util/filter.ui.h:8
+#: ../e-util/e-interval-chooser.c:143
+#: ../modules/calendar/e-cal-shell-view-actions.c:352
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
-#: ../widgets/misc/e-interval-chooser.c:143
 msgid "days"
 msgstr "dana"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:9
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
-#: ../calendar/gui/dialogs/event-page.ui.h:18 ../filter/filter.ui.h:7
-#: ../widgets/misc/e-interval-chooser.c:141
+#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/filter.ui.h:7
+#: ../e-util/e-interval-chooser.c:141
 msgid "hours"
 msgstr "sati"
 
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
 #: ../calendar/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-#: ../calendar/gui/dialogs/event-page.ui.h:19 ../filter/filter.ui.h:6
+#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/filter.ui.h:6
+#: ../e-util/e-interval-chooser.c:139
 #: ../mail/e-mail-config-provider-page.c:527
-#: ../modules/addressbook/ldap-config.ui.h:29
-#: ../widgets/misc/e-interval-chooser.c:139
 msgid "minutes"
 msgstr "minuta"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1604
-#: ../calendar/alarm-notify/alarm-queue.c:1736
+#: ../calendar/alarm-notify/alarm-queue.c:1612
+#: ../calendar/alarm-notify/alarm-queue.c:1746
 msgid "No summary available."
 msgstr "Nema dostupnog sažetka."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1613
-#: ../calendar/alarm-notify/alarm-queue.c:1615
+#: ../calendar/alarm-notify/alarm-queue.c:1621
+#: ../calendar/alarm-notify/alarm-queue.c:1623
 msgid "No description available."
 msgstr "Nema dostupnog opisa."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1623
+#: ../calendar/alarm-notify/alarm-queue.c:1631
 msgid "No location information available."
 msgstr "Nema dostupnog podatka o lokaciji."
 
+#: ../calendar/alarm-notify/alarm-queue.c:1636
+#: ../calendar/alarm-notify/alarm-queue.c:1737
+#: ../calendar/alarm-notify/alarm-queue.c:2099
+#| msgid "Evolution Restore"
+msgid "Evolution Reminders"
+msgstr "Podsetnici Evolucije"
+
 # bug(slobo): plural-forms. Report this one to bugzilla.gnome.org
-#: ../calendar/alarm-notify/alarm-queue.c:1669
+#: ../calendar/alarm-notify/alarm-queue.c:1679
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
@@ -1669,12 +1684,12 @@ msgstr[1] "Imate %d potsetnika"
 msgstr[2] "Imate %d potsetnika"
 msgstr[3] "Imate jedan potsetnik"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1865
-#: ../calendar/alarm-notify/alarm-queue.c:1900
+#: ../calendar/alarm-notify/alarm-queue.c:1884
+#: ../calendar/alarm-notify/alarm-queue.c:1919
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1869
+#: ../calendar/alarm-notify/alarm-queue.c:1888
 msgid ""
 "Evolution does not support calendar reminders with\n"
 "email notifications yet, but this reminder was\n"
@@ -1686,7 +1701,7 @@ msgstr ""
 "je podešen da pošalje poruku.  Evolucija će\n"
 "umesto toga prikazati normalno prozorče."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1906
+#: ../calendar/alarm-notify/alarm-queue.c:1925
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1703,7 +1718,7 @@ msgstr ""
 "\n"
 "Da li ste sigurni da želite da pokrenete ovaj program?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1921
+#: ../calendar/alarm-notify/alarm-queue.c:1940
 msgid "Do not ask me about this program again."
 msgstr "Ne pitaj me ponovo za ovaj program."
 
@@ -1768,7 +1783,7 @@ msgid "_Send Notice"
 msgstr "Pošalji po_dsetnik"
 
 #: ../calendar/calendar.error.xml.h:5
-#: ../calendar/gui/dialogs/delete-comp.c:189
+#: ../calendar/gui/dialogs/delete-comp.c:193
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Sigurno želite da obrišete ovaj sastanak?"
@@ -1788,7 +1803,7 @@ msgstr ""
 "znati da je zadatak obrisan."
 
 #: ../calendar/calendar.error.xml.h:9
-#: ../calendar/gui/dialogs/delete-comp.c:192
+#: ../calendar/gui/dialogs/delete-comp.c:196
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Sigurno želite da obrišete ovaj zadatak?"
@@ -1813,7 +1828,7 @@ msgstr ""
 "znati da je beleška obrisana."
 
 #: ../calendar/calendar.error.xml.h:13
-#: ../calendar/gui/dialogs/delete-comp.c:195
+#: ../calendar/gui/dialogs/delete-comp.c:199
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Sigurno želite da obrišete ovu belešku?"
@@ -1982,8 +1997,7 @@ msgstr ""
 "Preuzimanje nekoliko priloga je u toku. Ukoliko sada sačuvate zadatak ovi "
 "prilozi neće biti sačuvani sa njim."
 
-#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:316
-#: ../modules/itip-formatter/itip-view.c:3078
+#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:315
 msgid "_Save"
 msgstr "_Sačuvaj"
 
@@ -2068,40 +2082,49 @@ msgid "This memo list will be removed permanently."
 msgstr "Ovaj spisak beleški će biti trajno uklonjen."
 
 #: ../calendar/calendar.error.xml.h:66
-msgid "Delete remote calendar &quot;{0}&quot;?"
+#| msgid "Delete calendar '{0}'?"
+msgid "Delete remote calendar '{0}'?"
 msgstr "Da obrišem udaljeni kalendar „{0}“?"
 
 #: ../calendar/calendar.error.xml.h:67
+#| msgid ""
+#| "This will permanently remove the calendar &quot;{0}&quot; from the "
+#| "server. Are you sure you want to proceed?"
 msgid ""
-"This will permanently remove the calendar &quot;{0}&quot; from the server. "
-"Are you sure you want to proceed?"
+"This will permanently remove the calendar '{0}' from the server. Are you "
+"sure you want to proceed?"
 msgstr ""
 "Ovo će trajno ukloniti kalendar „{0}“ sa servera. Da li ste sigurni da "
 "želite da nastavite?"
 
 #: ../calendar/calendar.error.xml.h:69
-msgid "Delete remote task list &quot;{0}&quot;?"
+#| msgid "Delete task list '{0}'?"
+msgid "Delete remote task list '{0}'?"
 msgstr "Da obrišem udaljeni spisak zadataka „{0}“?"
 
 #: ../calendar/calendar.error.xml.h:70
+#| msgid ""
+#| "This will permanently remove the task list &quot;{0}&quot; from the "
+#| "server. Are you sure you want to proceed?"
 msgid ""
-"This will permanently remove the task list &quot;{0}&quot; from the server. "
-"Are you sure you want to proceed?"
+"This will permanently remove the task list '{0}' from the server. Are you "
+"sure you want to proceed?"
 msgstr ""
 "Ovo će trajno ukloniti spisak zadataka „{0}“ sa servera. Da li ste sigurni "
 "da želite da nastavite?"
 
 #: ../calendar/calendar.error.xml.h:71
-msgid "Delete remote memo list &quot;{0}&quot;?"
+#| msgid "Delete memo list '{0}'?"
+msgid "Delete remote memo list '{0}'?"
 msgstr "Da obrišem udaljeni spisak beleški „{0}“?"
 
 #: ../calendar/calendar.error.xml.h:72
 #| msgid ""
-#| "This will permanently remote the memo list &quot;{0}&quot; from the "
+#| "This will permanently remove the memo list &quot;{0}&quot; from the "
 #| "server. Are you sure you want to proceed?"
 msgid ""
-"This will permanently remove the memo list &quot;{0}&quot; from the server. "
-"Are you sure you want to proceed?"
+"This will permanently remove the memo list '{0}' from the server. Are you "
+"sure you want to proceed?"
 msgstr ""
 "Ovo će trajno ukloniti spisak beleški „{0}“ sa servera. Da li ste sigurni da "
 "želite da nastavite?"
@@ -2134,33 +2157,23 @@ msgstr ""
 msgid "Are you sure you want to save the memo without a summary?"
 msgstr "Sigurno želite da sačuvate belešku bez sažetka?"
 
-#: ../calendar/calendar.error.xml.h:78
-msgid "Error loading calendar"
-msgstr "Greška pri učitavanju kalendara"
+#. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
+#. {1} is replaced with a calendar/task/memo list name, where the error happened
+#: ../calendar/calendar.error.xml.h:80
+#| msgid "Error loading calendar"
+msgid "Error loading calendar '{0}: {1}'"
+msgstr "Greška učitavanja kalendara „{0}: {1}“"
 
-#: ../calendar/calendar.error.xml.h:79
+#: ../calendar/calendar.error.xml.h:81
 msgid "The calendar is not marked for offline usage."
 msgstr "Ovaj kalendar nije označen za korišćenje van mreže."
 
-#: ../calendar/calendar.error.xml.h:80
-msgid "Cannot create a new event"
-msgstr "Ne mogu da napravim novi događaj"
-
-#. For Translators: {0} is the name of the calendar source
 #: ../calendar/calendar.error.xml.h:82
-msgid ""
-"'{0}' is a read-only calendar and cannot be modified. Please select a "
-"different calendar from the side bar in the Calendar view."
-msgstr ""
-"Kalendar „{0}“ je samo za čitanje i nije podložan izmenama. Izaberite drugi "
-"kalendar sa bočne trake u pregledu kalendara."
-
-#: ../calendar/calendar.error.xml.h:83
 msgid "Cannot save event"
 msgstr "Ne mogu da sačuvam događaj"
 
-#. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:85
+#. Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:84
 msgid ""
 "'{0}' is a read-only calendar and cannot be modified. Please select a "
 "different calendar that can accept appointments."
@@ -2168,45 +2181,55 @@ msgstr ""
 "Kalendar „{0}“ je samo za čitanje i ne može biti izmenjen. Izaberite drugi "
 "kalendar koji prihvata zakazivanje."
 
-#: ../calendar/calendar.error.xml.h:86
+#: ../calendar/calendar.error.xml.h:85
 msgid "Cannot save task"
 msgstr "Ne mogu da sačuvam zadatak"
 
-#. For Translators: {0} is the name of the calendar source
-#: ../calendar/calendar.error.xml.h:88
+#. Translators: {0} is the name of the calendar source
+#: ../calendar/calendar.error.xml.h:87
 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."
 
-#: ../calendar/calendar.error.xml.h:89
-msgid "Error loading task list"
-msgstr "Greška pri učitavanju spiska zadataka"
-
+#. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
+#. {1} is replaced with a calendar/task/memo list name, where the error happened
 #: ../calendar/calendar.error.xml.h:90
+#| msgid "Error loading task list"
+msgid "Error loading task list '{0}: {1}'"
+msgstr "Greška učitavanja spiska zadataka „{0}: {1}“"
+
+#: ../calendar/calendar.error.xml.h:91
 msgid "The task list is not marked for offline usage."
 msgstr "Spisak zadataka nije označen za korišćenje van mreže."
 
-#: ../calendar/calendar.error.xml.h:91
-msgid "Error loading memo list"
-msgstr "Greška pri učitavanju spiska beleški"
+#. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
+#. {1} is replaced with a calendar/task/memo list name, where the error happened
+#: ../calendar/calendar.error.xml.h:94
+#| msgid "Error loading memo list"
+msgid "Error loading memo list '{0}: {1}'"
+msgstr "Greška učitavanja spiska beleški „{0}: {1}“"
 
-#: ../calendar/calendar.error.xml.h:92
+#: ../calendar/calendar.error.xml.h:95
 msgid "The memo list is not marked for offline usage."
 msgstr "Spisak beleški nije označen za korišćenje van mreže."
 
 #. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
 #. {1} is replaced with a calendar/task/memo list name, where the error happened
-#: ../calendar/calendar.error.xml.h:95
-msgid "Error on {0}: {1}"
-msgstr "Greška {0}a: {1}"
+#: ../calendar/calendar.error.xml.h:98
+#| msgid "Error on {0}: {1}"
+msgid "Error on '{0}: {1}'"
+msgstr "Greška na „{0}: {1}“"
 
-#: ../calendar/calendar.error.xml.h:96
-msgid "Could not perform this operation."
-msgstr "Ne mogu da izvršim radnju."
+#. Translators: {0} is replaced with a group name, like CalDAV, Google, or such;
+#. {1} is replaced with a calendar/task/memo list name, where the error happened
+#: ../calendar/calendar.error.xml.h:101
+#| msgid "Could not perform this operation on {0}."
+msgid "Could not perform this operation on '{0}: {1}'."
+msgstr "Ne mogu da izvršim ovu radnju nad „{0}: {1}“."
 
-#: ../calendar/calendar.error.xml.h:97 ../mail/mail.error.xml.h:167
+#: ../calendar/calendar.error.xml.h:102 ../mail/mail.error.xml.h:167
 msgid "You must be working online to complete this operation."
 msgstr "Morate da budete na mreži da biste završili ovu radnju."
 
@@ -2235,20 +2258,19 @@ msgid "Summary"
 msgstr "Sažetak"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:10
+#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:11
 msgid "contains"
 msgstr "sadrži"
 
 #: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:17
 msgid "does not contain"
 msgstr "ne sadrži"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../modules/plugin-manager/evolution-plugin-manager.c:70
-#: ../widgets/misc/e-attachment-tree-view.c:528
-#: ../widgets/table/e-table-config.ui.h:24
+#: ../e-util/e-table-config.ui.h:24 ../e-util/e-attachment-tree-view.c:528
+#: ../modules/plugin-manager/evolution-plugin-manager.c:69
 msgid "Description"
 msgstr "Opis"
 
@@ -2262,30 +2284,30 @@ msgid "Classification"
 msgstr "Razvrstavanje"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:8
-#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:33
+#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:34
 msgid "is"
 msgstr "je"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:39
+#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:40
 msgid "is not"
 msgstr "nije"
 
-#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:240
-#: ../calendar/gui/e-cal-model.c:829 ../calendar/gui/e-cal-model.c:836
-#: ../calendar/gui/e-task-table.c:555 ../calendar/gui/memotypes.xml.h:10
+#: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/e-cal-list-view.c:234
+#: ../calendar/gui/e-cal-model.c:841 ../calendar/gui/e-cal-model.c:848
+#: ../calendar/gui/e-task-table.c:545 ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "Javno"
 
-#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:241
-#: ../calendar/gui/e-cal-model.c:838 ../calendar/gui/e-task-table.c:556
+#: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/e-cal-list-view.c:235
+#: ../calendar/gui/e-cal-model.c:850 ../calendar/gui/e-task-table.c:546
 #: ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "Lično"
 
-#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:242
-#: ../calendar/gui/e-cal-model.c:840 ../calendar/gui/e-task-table.c:557
-#: ../calendar/gui/memotypes.xml.h:12 ../widgets/misc/e-send-options.ui.h:7
+#: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/e-cal-list-view.c:236
+#: ../calendar/gui/e-cal-model.c:852 ../calendar/gui/e-task-table.c:547
+#: ../calendar/gui/memotypes.xml.h:12 ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Poverljivo"
 
@@ -2302,37 +2324,37 @@ msgstr "Učesnik"
 
 #: ../calendar/gui/caltypes.xml.h:14
 #: ../calendar/gui/e-cal-list-view.etspec.h:5 ../mail/message-list.etspec.h:14
-#: ../plugins/publish-calendar/publish-calendar.c:870
+#: ../plugins/publish-calendar/publish-calendar.c:883
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
 #: ../plugins/save-calendar/csv-format.c:386
 msgid "Location"
 msgstr "Mesto"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:23
+#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:328
 msgid "Category"
 msgstr "Kategorija"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
-#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
-#: ../em-format/e-mail-formatter-print-headers.c:198
-#: ../mail/em-filter-i18n.h:5
+#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:56
+#: ../em-format/e-mail-formatter-print-headers.c:187
+#: ../mail/em-filter-i18n.h:6
 msgid "Attachments"
 msgstr "Prilozi"
 
 #: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:26
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:27
 msgid "Exist"
 msgstr "Postoji"
 
 #: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:23
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:24
 msgid "Do Not Exist"
 msgstr "Ne postoji"
 
 #: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/dialogs/event-editor.c:321
-#: ../calendar/gui/dialogs/event-editor.c:342
+#: ../calendar/gui/dialogs/event-editor.c:316
+#: ../calendar/gui/dialogs/event-editor.c:337
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:15
 msgid "Recurrence"
 msgstr "Ponavljanje"
@@ -2363,26 +2385,26 @@ msgstr "Sažetak sadrži"
 msgid "Description Contains"
 msgstr "Opisi"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:632
+#: ../calendar/gui/dialogs/alarm-dialog.c:631
 msgid "Edit Reminder"
 msgstr "Uredi podsetnik"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:823
+#: ../calendar/gui/dialogs/alarm-dialog.c:822
 #: ../calendar/gui/e-alarm-list.c:412
 msgid "Pop up an alert"
 msgstr "Iskačuće upozorenje"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:824
+#: ../calendar/gui/dialogs/alarm-dialog.c:823
 #: ../calendar/gui/e-alarm-list.c:408
 msgid "Play a sound"
 msgstr "Pušta zvuk"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:825
+#: ../calendar/gui/dialogs/alarm-dialog.c:824
 #: ../calendar/gui/e-alarm-list.c:420
 msgid "Run a program"
 msgstr "Pokreće program"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:826
+#: ../calendar/gui/dialogs/alarm-dialog.c:825
 #: ../calendar/gui/e-alarm-list.c:416
 msgid "Send an email"
 msgstr "Šalje elektronsku poruku"
@@ -2421,7 +2443,7 @@ msgid "Add Reminder"
 msgstr "Dodaj podsetnik"
 
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
-#: ../calendar/gui/dialogs/event-editor.c:364
+#: ../calendar/gui/dialogs/event-editor.c:359
 msgid "Reminder"
 msgstr "Podsetnik"
 
@@ -2500,309 +2522,305 @@ msgstr "Ovaj zadatak je obrisan."
 msgid "This memo has been deleted."
 msgstr "Ova beleška je obrisana."
 
-#: ../calendar/gui/dialogs/changed-comp.c:77
+#: ../calendar/gui/dialogs/changed-comp.c:78
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Načinili ste izmene. Da zanemarim te izmene i da zatvorim uređivač?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:79
+#: ../calendar/gui/dialogs/changed-comp.c:80
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Niste načinili izmene, da zatvorim uređivač?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:84
+#: ../calendar/gui/dialogs/changed-comp.c:85
 msgid "This event has been changed."
 msgstr "Ovaj događaj je izmenjen."
 
-#: ../calendar/gui/dialogs/changed-comp.c:88
+#: ../calendar/gui/dialogs/changed-comp.c:89
 msgid "This task has been changed."
 msgstr "Ovaj zadatak je izmenjen."
 
-#: ../calendar/gui/dialogs/changed-comp.c:92
+#: ../calendar/gui/dialogs/changed-comp.c:93
 msgid "This memo has been changed."
 msgstr "Ova beleška je izmenjena."
 
-#: ../calendar/gui/dialogs/changed-comp.c:101
+#: ../calendar/gui/dialogs/changed-comp.c:103
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Načinili ste izmene. Da zanemarim te izmene i da osvežim uređivač?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:105
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Niste načinili izmene, da osvežim uređivač?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:278
+#: ../calendar/gui/dialogs/comp-editor.c:269
 msgid "Could not save attachments"
 msgstr "Ne mogu da sačuvam priloge"
 
-#: ../calendar/gui/dialogs/comp-editor.c:629
+#: ../calendar/gui/dialogs/comp-editor.c:621
 msgid "Could not update object"
 msgstr "Ne mogu da osvežim objekat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:763
+#: ../calendar/gui/dialogs/comp-editor.c:755
 msgid "Edit Appointment"
 msgstr "Uredi zakazivanje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:770
+#: ../calendar/gui/dialogs/comp-editor.c:762
 #, c-format
 msgid "Meeting - %s"
 msgstr "Sastanak — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:772
+#: ../calendar/gui/dialogs/comp-editor.c:764
 #, c-format
 msgid "Appointment - %s"
 msgstr "Zakazivanje — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:778
+#: ../calendar/gui/dialogs/comp-editor.c:770
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Dodeljen zadatak — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:780
+#: ../calendar/gui/dialogs/comp-editor.c:772
 #, c-format
 msgid "Task - %s"
 msgstr "Zadatak — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:785
+#: ../calendar/gui/dialogs/comp-editor.c:777
 #, c-format
 msgid "Memo - %s"
 msgstr "Beleška — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:801
+#: ../calendar/gui/dialogs/comp-editor.c:793
 msgid "No Summary"
 msgstr "Bez sažetka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:922
+#: ../calendar/gui/dialogs/comp-editor.c:914
 msgid "Keep original item?"
 msgstr "Zadržati originalnu stavku?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1157
+#: ../calendar/gui/dialogs/comp-editor.c:1151
 msgid "Close the current window"
 msgstr "Zatvorite trenutni prozor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1164 ../mail/e-mail-browser.c:134
-#: ../shell/e-shell-window-actions.c:1446
-#: ../widgets/misc/e-focus-tracker.c:121 ../widgets/misc/e-focus-tracker.c:558
-#: ../widgets/misc/e-web-view.c:323 ../widgets/misc/e-web-view.c:1428
-#: ../widgets/misc/e-web-view-gtkhtml.c:456
-#: ../widgets/misc/e-web-view-gtkhtml.c:1299
+#: ../calendar/gui/dialogs/comp-editor.c:1158 ../e-util/e-focus-tracker.c:121
+#: ../e-util/e-focus-tracker.c:558 ../e-util/e-web-view-gtkhtml.c:455
+#: ../e-util/e-web-view-gtkhtml.c:1298 ../e-util/e-web-view.c:322
+#: ../e-util/e-web-view.c:1407 ../mail/e-mail-browser.c:130
+#: ../shell/e-shell-window-actions.c:876
 msgid "Copy the selection"
 msgstr "Umnožite izabrano"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1171 ../mail/e-mail-browser.c:141
-#: ../shell/e-shell-window-actions.c:1453
-#: ../widgets/misc/e-focus-tracker.c:114 ../widgets/misc/e-focus-tracker.c:553
-#: ../widgets/misc/e-web-view.c:1422 ../widgets/misc/e-web-view-gtkhtml.c:1293
+#: ../calendar/gui/dialogs/comp-editor.c:1165 ../e-util/e-focus-tracker.c:114
+#: ../e-util/e-focus-tracker.c:553 ../e-util/e-web-view-gtkhtml.c:1292
+#: ../e-util/e-web-view.c:1401 ../mail/e-mail-browser.c:137
+#: ../shell/e-shell-window-actions.c:883
 msgid "Cut the selection"
 msgstr "Isecite izabrano"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1178
-#: ../shell/e-shell-window-actions.c:1460
-#: ../widgets/misc/e-focus-tracker.c:135 ../widgets/misc/e-focus-tracker.c:568
+#: ../calendar/gui/dialogs/comp-editor.c:1172 ../e-util/e-focus-tracker.c:135
+#: ../e-util/e-focus-tracker.c:568 ../shell/e-shell-window-actions.c:890
 msgid "Delete the selection"
 msgstr "Obrišite izbor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1185
+#: ../calendar/gui/dialogs/comp-editor.c:1179
 msgid "View help"
 msgstr "Pogledaj pomoć"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1192 ../mail/e-mail-browser.c:148
-#: ../shell/e-shell-window-actions.c:1481
-#: ../widgets/misc/e-focus-tracker.c:128 ../widgets/misc/e-focus-tracker.c:563
-#: ../widgets/misc/e-web-view.c:1434 ../widgets/misc/e-web-view-gtkhtml.c:1305
+#: ../calendar/gui/dialogs/comp-editor.c:1186 ../e-util/e-focus-tracker.c:128
+#: ../e-util/e-focus-tracker.c:563 ../e-util/e-web-view-gtkhtml.c:1304
+#: ../e-util/e-web-view.c:1413 ../mail/e-mail-browser.c:144
+#: ../shell/e-shell-window-actions.c:911
 msgid "Paste the clipboard"
 msgstr "Ubacite iz spiska isečaka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1213
+#: ../calendar/gui/dialogs/comp-editor.c:1207
 msgid "Save current changes"
 msgstr "Sačuvajte tekuće izmene"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1218
-#: ../widgets/misc/e-mail-signature-editor.c:294
+#: ../calendar/gui/dialogs/comp-editor.c:1212
+#: ../e-util/e-mail-signature-editor.c:301
 msgid "Save and Close"
 msgstr "Sačuvaj i zatvori"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1220
+#: ../calendar/gui/dialogs/comp-editor.c:1214
 msgid "Save current changes and close editor"
 msgstr "Sačuvajte tekuće izmene i zatvorite uređivač"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1227 ../mail/e-mail-browser.c:155
-#: ../shell/e-shell-window-actions.c:1558
-#: ../widgets/misc/e-focus-tracker.c:142 ../widgets/misc/e-focus-tracker.c:573
+#: ../calendar/gui/dialogs/comp-editor.c:1221 ../e-util/e-focus-tracker.c:142
+#: ../e-util/e-focus-tracker.c:573 ../mail/e-mail-browser.c:151
+#: ../shell/e-shell-window-actions.c:988
 msgid "Select all text"
 msgstr "Izaberite sav tekst"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1234
+#: ../calendar/gui/dialogs/comp-editor.c:1228
 msgid "_Classification"
 msgstr "_Razvrstavanje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1241
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../filter/filter.ui.h:16
-#: ../mail/e-mail-browser.c:169
+#: ../calendar/gui/dialogs/comp-editor.c:1235
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../e-util/filter.ui.h:16
+#: ../e-util/gal-define-views.ui.h:5 ../mail/e-mail-browser.c:165
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../shell/e-shell-window-actions.c:1586
-#: ../widgets/menus/gal-define-views.ui.h:5
+#: ../shell/e-shell-window-actions.c:1016
 msgid "_Edit"
 msgstr "_Uređivanje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1248 ../mail/e-mail-browser.c:162
-#: ../shell/e-shell-window-actions.c:1593
-#: ../widgets/misc/e-mail-signature-editor.c:299
+#: ../calendar/gui/dialogs/comp-editor.c:1242
+#: ../e-util/e-mail-signature-editor.c:306 ../mail/e-mail-browser.c:158
+#: ../shell/e-shell-window-actions.c:1023
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1255
-#: ../shell/e-shell-window-actions.c:1600
+#: ../calendar/gui/dialogs/comp-editor.c:1249
+#: ../shell/e-shell-window-actions.c:1030
 msgid "_Help"
 msgstr "Po_moć"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1262
+#: ../calendar/gui/dialogs/comp-editor.c:1256
 msgid "_Insert"
 msgstr "_Umetni"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1269
-#: ../composer/e-composer-actions.c:339
+#: ../calendar/gui/dialogs/comp-editor.c:1263
+#: ../composer/e-composer-actions.c:338
 msgid "_Options"
 msgstr "_Mogućnosti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1276 ../mail/e-mail-browser.c:176
-#: ../shell/e-shell-window-actions.c:1635 ../smime/gui/smime-ui.ui.h:28
+#: ../calendar/gui/dialogs/comp-editor.c:1270 ../mail/e-mail-browser.c:172
+#: ../shell/e-shell-window-actions.c:1065 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "P_regled"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1286
-#: ../composer/e-composer-actions.c:288
+#: ../calendar/gui/dialogs/comp-editor.c:1280
+#: ../composer/e-composer-actions.c:287
 msgid "_Attachment..."
 msgstr "_Prilog..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1288
-#: ../composer/e-composer-actions.c:290
-#: ../widgets/misc/e-attachment-view.c:414
+#: ../calendar/gui/dialogs/comp-editor.c:1282
+#: ../composer/e-composer-actions.c:289 ../e-util/e-attachment-view.c:413
 msgid "Attach a file"
 msgstr "Priložite datoteku"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1296
+#: ../calendar/gui/dialogs/comp-editor.c:1290
 msgid "_Categories"
 msgstr "_Kategorije"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1298
+#: ../calendar/gui/dialogs/comp-editor.c:1292
 msgid "Toggles whether to display categories"
 msgstr "Prebacuje prikazivanje kategorija"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1304
+#: ../calendar/gui/dialogs/comp-editor.c:1298
 msgid "Time _Zone"
 msgstr "Vremenska _zona"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1306
+#: ../calendar/gui/dialogs/comp-editor.c:1300
 msgid "Toggles whether the time zone is displayed"
 msgstr "Prebacuje prikazivanje vremenske zone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1315
+#: ../calendar/gui/dialogs/comp-editor.c:1309
 msgid "Pu_blic"
 msgstr "_Javno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1317
+#: ../calendar/gui/dialogs/comp-editor.c:1311
 msgid "Classify as public"
 msgstr "Označite kao javno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1322
+#: ../calendar/gui/dialogs/comp-editor.c:1316
 msgid "_Private"
 msgstr "L_ično"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1324
+#: ../calendar/gui/dialogs/comp-editor.c:1318
 msgid "Classify as private"
 msgstr "Označite kao lično"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1329
+#: ../calendar/gui/dialogs/comp-editor.c:1323
 msgid "_Confidential"
 msgstr "Pove_rljivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1331
+#: ../calendar/gui/dialogs/comp-editor.c:1325
 msgid "Classify as confidential"
 msgstr "Označite kao poverljivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1339
+#: ../calendar/gui/dialogs/comp-editor.c:1333
 msgid "R_ole Field"
 msgstr "Polje _uloge"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1341
+#: ../calendar/gui/dialogs/comp-editor.c:1335
 msgid "Toggles whether the Role field is displayed"
 msgstr "Prebacuje prikazivanje polja Uloga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1347
+#: ../calendar/gui/dialogs/comp-editor.c:1341
 msgid "_RSVP"
 msgstr "_Molim odgovorite"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1349
+#: ../calendar/gui/dialogs/comp-editor.c:1343
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Prebacuje prikazivanje polja Molim odgovorite"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1355
+#: ../calendar/gui/dialogs/comp-editor.c:1349
 msgid "_Status Field"
 msgstr "Polje _stanja"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1357
+#: ../calendar/gui/dialogs/comp-editor.c:1351
 msgid "Toggles whether the Status field is displayed"
 msgstr "Prebacuje prikazivanje polja Stanja"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1363
+#: ../calendar/gui/dialogs/comp-editor.c:1357
 msgid "_Type Field"
 msgstr "Polje _tipa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1365
+#: ../calendar/gui/dialogs/comp-editor.c:1359
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Prebacuje prikazivanje polja Tipa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2114
-#: ../composer/e-composer-actions.c:507
+#: ../calendar/gui/dialogs/comp-editor.c:2120
+#: ../composer/e-composer-actions.c:506
 msgid "Attach"
 msgstr "Priloži"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2463
-#: ../calendar/gui/dialogs/comp-editor.c:2647
-#: ../calendar/gui/dialogs/comp-editor.c:3651
+#: ../calendar/gui/dialogs/comp-editor.c:2470
+#: ../calendar/gui/dialogs/comp-editor.c:2657
+#: ../calendar/gui/dialogs/comp-editor.c:3663
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Promene načinjene na ovoj stavki mogu biti zanemarene ako bude ažurirano"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3615
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:118
+#: ../calendar/gui/dialogs/comp-editor.c:3627
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:115
 msgid "attachment"
 msgstr "prilog"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3683
+#: ../calendar/gui/dialogs/comp-editor.c:3695
 msgid "Unable to use current version!"
 msgstr "Ne mogu da koristim trenutno izdanje!"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:439
+#: ../calendar/gui/dialogs/comp-editor-page.c:441
 #, c-format
 msgid "Validation error: %s"
 msgstr "Greška provere: %s"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:114
+#: ../calendar/gui/dialogs/copy-source-dialog.c:115
 msgid "Could not open destination"
 msgstr "Ne mogu da otvorim odredište"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:126
+#: ../calendar/gui/dialogs/copy-source-dialog.c:127
 msgid "Destination is read only"
 msgstr "Odredište je samo za čitanje"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:160
+#: ../calendar/gui/dialogs/copy-source-dialog.c:161
 msgid "Cannot create object"
 msgstr "Ne mogu da napravim objekat"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:189
+#: ../calendar/gui/dialogs/copy-source-dialog.c:190
 msgid "Could not open source"
 msgstr "Ne mogu da otvorim izvor"
 
-#: ../calendar/gui/dialogs/delete-comp.c:212
+#: ../calendar/gui/dialogs/delete-comp.c:216
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "Da li da _izbrišem ovu stavku iz svih ostalih poštanskih sandučića primaoca?"
 
-#: ../calendar/gui/dialogs/delete-comp.c:215
+#: ../calendar/gui/dialogs/delete-comp.c:219
 msgid "_Retract comment"
 msgstr "_Uvuci komentar"
 
@@ -2882,108 +2900,107 @@ msgstr "Delegiraj na:"
 msgid "Contacts..."
 msgstr "Kontakti..."
 
-#: ../calendar/gui/dialogs/event-editor.c:216
+#: ../calendar/gui/dialogs/event-editor.c:211
 msgid "_Reminders"
 msgstr "_Podsetnici"
 
-#: ../calendar/gui/dialogs/event-editor.c:218
+#: ../calendar/gui/dialogs/event-editor.c:213
 msgid "Set or unset reminders for this event"
 msgstr "Postavlja ili isključuje podsetnike za ovaj događaj"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:221
 msgid "Show Time as _Busy"
 msgstr "Prikaži vreme kao _zauzeto"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:223
 msgid "Toggles whether to show time as busy"
 msgstr "Prebacuje prikazivanje vremena kao zauzeto"
 
-#: ../calendar/gui/dialogs/event-editor.c:237
+#: ../calendar/gui/dialogs/event-editor.c:232
 msgid "_Recurrence"
 msgstr "_Ponavljanje"
 
-#: ../calendar/gui/dialogs/event-editor.c:239
+#: ../calendar/gui/dialogs/event-editor.c:234
 msgid "Make this a recurring event"
 msgstr "Neka se ovaj događaj ponavlja"
 
-#: ../calendar/gui/dialogs/event-editor.c:244
-#: ../widgets/misc/e-send-options.ui.h:14
+#: ../calendar/gui/dialogs/event-editor.c:239 ../e-util/e-send-options.ui.h:14
 msgid "Send Options"
 msgstr "Opcije slanja"
 
-#: ../calendar/gui/dialogs/event-editor.c:246
-#: ../calendar/gui/dialogs/task-editor.c:128
+#: ../calendar/gui/dialogs/event-editor.c:241
+#: ../calendar/gui/dialogs/task-editor.c:125
 msgid "Insert advanced send options"
 msgstr "Umetnite napredne opcije slanja"
 
-#: ../calendar/gui/dialogs/event-editor.c:254
+#: ../calendar/gui/dialogs/event-editor.c:249
 msgid "All _Day Event"
 msgstr "Celodnevni događa_j"
 
-#: ../calendar/gui/dialogs/event-editor.c:256
+#: ../calendar/gui/dialogs/event-editor.c:251
 msgid "Toggles whether to have All Day Event"
 msgstr "Bira da li dozvoljava celodnevne događaje"
 
-#: ../calendar/gui/dialogs/event-editor.c:265
+#: ../calendar/gui/dialogs/event-editor.c:260
 msgid "_Free/Busy"
-msgstr "S_lobodno/zauzeto:"
+msgstr "S_lobodno/zauzeto"
 
-#: ../calendar/gui/dialogs/event-editor.c:267
+#: ../calendar/gui/dialogs/event-editor.c:262
 msgid "Query free / busy information for the attendees"
 msgstr "Zatraži podatak za slobodno/zauzeto vreme za ove učesnike"
 
-#: ../calendar/gui/dialogs/event-editor.c:318 ../calendar/gui/print.c:3324
+#: ../calendar/gui/dialogs/event-editor.c:313 ../calendar/gui/print.c:3468
 msgid "Appointment"
 msgstr "Zakazivanje"
 
-#: ../calendar/gui/dialogs/event-editor.c:388
+#: ../calendar/gui/dialogs/event-editor.c:383
 #: ../calendar/gui/dialogs/event-page.ui.h:24
-#: ../calendar/gui/e-meeting-list-view.c:166
+#: ../calendar/gui/e-meeting-list-view.c:165
 msgid "Attendees"
 msgstr "Učesnici"
 
-#: ../calendar/gui/dialogs/event-editor.c:585
+#: ../calendar/gui/dialogs/event-editor.c:580
 msgid "Print this event"
 msgstr "Štampajte ovu poruku"
 
-#: ../calendar/gui/dialogs/event-page.c:570
+#: ../calendar/gui/dialogs/event-page.c:557
 msgid "Event's start time is in the past"
 msgstr "Početak događaja je u prošlosti"
 
-#: ../calendar/gui/dialogs/event-page.c:647
+#: ../calendar/gui/dialogs/event-page.c:634
 msgid "Event cannot be edited, because the selected calendar is read only"
 msgstr ""
 "Događaj nije moguće uređivati, pošto je izabrani kalendar samo za čitanje"
 
-#: ../calendar/gui/dialogs/event-page.c:651
+#: ../calendar/gui/dialogs/event-page.c:638
 msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Događaj nije moguće potpuno urediti, pošto niste organizator"
 
-#: ../calendar/gui/dialogs/event-page.c:663
-#: ../calendar/gui/dialogs/event-page.c:3143
+#: ../calendar/gui/dialogs/event-page.c:650
+#: ../calendar/gui/dialogs/event-page.c:3171
 msgid "This event has reminders"
 msgstr "Ovaj događaj ima podsetnike"
 
-#: ../calendar/gui/dialogs/event-page.c:730
+#: ../calendar/gui/dialogs/event-page.c:717
 #: ../calendar/gui/dialogs/event-page.ui.h:13
 msgid "Or_ganizer:"
 msgstr "Or_ganizator:"
 
-#: ../calendar/gui/dialogs/event-page.c:1301
+#: ../calendar/gui/dialogs/event-page.c:1299
 msgid "Event with no start date"
 msgstr "Događaj bez datuma početka"
 
-#: ../calendar/gui/dialogs/event-page.c:1304
+#: ../calendar/gui/dialogs/event-page.c:1302
 msgid "Event with no end date"
 msgstr "Događaj bez datuma završetka"
 
-#: ../calendar/gui/dialogs/event-page.c:1477
-#: ../calendar/gui/dialogs/memo-page.c:732
-#: ../calendar/gui/dialogs/task-page.c:852
+#: ../calendar/gui/dialogs/event-page.c:1475
+#: ../calendar/gui/dialogs/memo-page.c:726
+#: ../calendar/gui/dialogs/task-page.c:853
 msgid "Start date is wrong"
 msgstr "Datum početka je pogrešan"
 
-#: ../calendar/gui/dialogs/event-page.c:1487
+#: ../calendar/gui/dialogs/event-page.c:1486
 msgid "End date is wrong"
 msgstr "Datum završetka je pogrešan"
 
@@ -2991,35 +3008,35 @@ msgstr "Datum završetka je pogrešan"
 msgid "Start time is wrong"
 msgstr "Vreme početka je pogrešno"
 
-#: ../calendar/gui/dialogs/event-page.c:1517
+#: ../calendar/gui/dialogs/event-page.c:1518
 msgid "End time is wrong"
 msgstr "Vreme završetka je pogrešno"
 
-#: ../calendar/gui/dialogs/event-page.c:1680
-#: ../calendar/gui/dialogs/memo-page.c:771
-#: ../calendar/gui/dialogs/task-page.c:905
+#: ../calendar/gui/dialogs/event-page.c:1682
+#: ../calendar/gui/dialogs/memo-page.c:765
+#: ../calendar/gui/dialogs/task-page.c:907
 msgid "An organizer is required."
 msgstr "Potreban je organizator."
 
-#: ../calendar/gui/dialogs/event-page.c:1714
-#: ../calendar/gui/dialogs/task-page.c:939
+#: ../calendar/gui/dialogs/event-page.c:1717
+#: ../calendar/gui/dialogs/task-page.c:942
 msgid "At least one attendee is required."
 msgstr "Najmanje jedan učesnik je potreban."
 
-#: ../calendar/gui/dialogs/event-page.c:1921
+#: ../calendar/gui/dialogs/event-page.c:1924
 msgid "_Delegatees"
 msgstr "Delegat_i"
 
-#: ../calendar/gui/dialogs/event-page.c:1923
+#: ../calendar/gui/dialogs/event-page.c:1926
 msgid "Atte_ndees"
 msgstr "Uč_esnici"
 
-#: ../calendar/gui/dialogs/event-page.c:2998
+#: ../calendar/gui/dialogs/event-page.c:3026
 #, c-format
 msgid "Unable to open the calendar '%s': %s"
 msgstr "Ne mogu da otvorim kalendar „%s“ : %s"
 
-#: ../calendar/gui/dialogs/event-page.c:3423
+#: ../calendar/gui/dialogs/event-page.c:3451
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -3028,7 +3045,7 @@ msgstr[1] "%d dana pre zakazanog"
 msgstr[2] "%d dana pre zakazanog"
 msgstr[3] "%d dan pre zakazanog"
 
-#: ../calendar/gui/dialogs/event-page.c:3429
+#: ../calendar/gui/dialogs/event-page.c:3457
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -3037,7 +3054,7 @@ msgstr[1] "%d sata pre zakazanog"
 msgstr[2] "%d sati pre zakazanog"
 msgstr[3] "%d sat pre zakazanog"
 
-#: ../calendar/gui/dialogs/event-page.c:3435
+#: ../calendar/gui/dialogs/event-page.c:3463
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -3046,7 +3063,7 @@ msgstr[1] "%d minuta pre zakazanog"
 msgstr[2] "%d minuta pre zakazanog"
 msgstr[3] "%d minut pre zakazanog"
 
-#: ../calendar/gui/dialogs/event-page.c:3454
+#: ../calendar/gui/dialogs/event-page.c:3484
 msgid "Customize"
 msgstr "Prilagodi"
 
@@ -3056,7 +3073,7 @@ msgstr "Prilagodi"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3460
+#: ../calendar/gui/dialogs/event-page.c:3491
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ništa"
@@ -3098,7 +3115,7 @@ msgstr "_Mesto:"
 #: ../calendar/gui/dialogs/event-page.ui.h:12
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 #: ../calendar/gui/dialogs/task-page.ui.h:7
-#: ../widgets/misc/e-attachment-dialog.c:350
+#: ../e-util/e-attachment-dialog.c:350
 msgid "_Description:"
 msgstr "_Opis:"
 
@@ -3122,7 +3139,7 @@ msgstr "Opis događaja"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:23
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-meeting-time-sel.c:579
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "Atte_ndees..."
 msgstr "Uč_esnici..."
 
@@ -3187,65 +3204,51 @@ msgid "Select Date"
 msgstr "Izaberite datum"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1406
+#: ../modules/calendar/e-cal-shell-view-actions.c:1405
 msgid "Select _Today"
 msgstr "Izaberi _današnji dan"
 
-#: ../calendar/gui/dialogs/memo-editor.c:109 ../calendar/gui/print.c:3328
+#: ../calendar/gui/dialogs/memo-editor.c:106 ../calendar/gui/print.c:3472
 msgid "Memo"
 msgstr "Beleška"
 
-#: ../calendar/gui/dialogs/memo-editor.c:159
+#: ../calendar/gui/dialogs/memo-editor.c:156
 msgid "Print this memo"
 msgstr "Štampajte ovu belešku"
 
-#: ../calendar/gui/dialogs/memo-page.c:429
+#: ../calendar/gui/dialogs/memo-page.c:421
 msgid "Memo's start date is in the past"
 msgstr "Početak beleške je u prošlosti"
 
-#: ../calendar/gui/dialogs/memo-page.c:465
+#: ../calendar/gui/dialogs/memo-page.c:457
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "Belešku nije moguće uređivati, pošto je izabran spisak samo za čitanje"
 
-#: ../calendar/gui/dialogs/memo-page.c:469
+#: ../calendar/gui/dialogs/memo-page.c:461
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Belešku nije moguće potpuno urediti, pošto niste organizator"
 
-#: ../calendar/gui/dialogs/memo-page.c:981
+#: ../calendar/gui/dialogs/memo-page.c:979
 #, c-format
 msgid "Unable to open memos in '%s': %s"
 msgstr "Ne mogu da otvorim beleške u „%s“ : %s"
 
-#: ../calendar/gui/dialogs/memo-page.c:983
-#: ../em-format/e-mail-parser-application-mbox.c:111
-#: ../em-format/e-mail-parser-application-smime.c:107
-#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:94
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:96
-#: ../em-format/e-mail-parser-multipart-encrypted.c:122
-#: ../em-format/e-mail-parser-multipart-signed.c:147
-#: ../libemail-engine/mail-ops.c:720 ../mail/e-mail-reader.c:1727
-#: ../mail/em-folder-tree.c:675 ../modules/itip-formatter/itip-view.c:4524
-#: ../modules/itip-formatter/itip-view.c:4875 ../plugins/face/face.c:174
-#: ../smime/gui/certificate-manager.c:317
-msgid "Unknown error"
-msgstr "Nepoznata greška"
-
-#: ../calendar/gui/dialogs/memo-page.c:1173
-#: ../em-format/e-mail-formatter.c:1370
+#: ../calendar/gui/dialogs/memo-page.c:1172
+#: ../em-format/e-mail-formatter.c:1391
 #: ../em-format/e-mail-formatter-utils.c:180
-#: ../em-format/e-mail-formatter-utils.c:203 ../mail/em-filter-i18n.h:77
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:69
+#: ../em-format/e-mail-formatter-utils.c:204 ../mail/em-filter-i18n.h:78
+#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:63
 msgid "To"
 msgstr "Prima"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
-#: ../calendar/gui/dialogs/task-page.c:346
+#: ../calendar/gui/dialogs/task-page.c:336
 #: ../calendar/gui/dialogs/task-page.ui.h:9
 msgid "_List:"
 msgstr "_Spisak:"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:4
-#: ../calendar/gui/dialogs/task-page.c:354
+#: ../calendar/gui/dialogs/task-page.c:344
 #: ../calendar/gui/dialogs/task-page.ui.h:2
 msgid "Organi_zer:"
 msgstr "Organi_zator:"
@@ -3300,21 +3303,21 @@ msgstr "Ovaj i buduće unose"
 msgid "All Instances"
 msgstr "Sve unose"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:574
+#: ../calendar/gui/dialogs/recurrence-page.c:573
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ovo zakazivanje sadrži ponavljanja koja Evolucija ne može da uredi."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:969
+#: ../calendar/gui/dialogs/recurrence-page.c:973
 msgid "Recurrence date is invalid"
 msgstr "Datum ponavljanja nije ispravan"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1009
+#: ../calendar/gui/dialogs/recurrence-page.c:1017
 msgid "End time of the recurrence was before event's start"
 msgstr "Vreme završetka ponavljanja je pre početka događaja"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] week(s) on [Wednesday] [forever]'
 #. * (dropdown menu options are in [square brackets]). This means that after the 'on', name of a week day always follows.
-#: ../calendar/gui/dialogs/recurrence-page.c:1039
+#: ../calendar/gui/dialogs/recurrence-page.c:1047
 msgid "on"
 msgstr "u"
 
@@ -3322,7 +3325,7 @@ msgstr "u"
 #. * (dropdown menu options are in [square brackets]). This means that after 'first', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1102
+#: ../calendar/gui/dialogs/recurrence-page.c:1110
 msgid "first"
 msgstr "prvom"
 
@@ -3331,7 +3334,7 @@ msgstr "prvom"
 #. * (dropdown menu options are in [square brackets]). This means that after 'second', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1108
+#: ../calendar/gui/dialogs/recurrence-page.c:1116
 msgid "second"
 msgstr "drugom"
 
@@ -3339,7 +3342,7 @@ msgstr "drugom"
 #. * (dropdown menu options are in [square brackets]). This means that after 'third', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1113
+#: ../calendar/gui/dialogs/recurrence-page.c:1121
 msgid "third"
 msgstr "trećem"
 
@@ -3347,7 +3350,7 @@ msgstr "trećem"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fourth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1118
+#: ../calendar/gui/dialogs/recurrence-page.c:1126
 msgid "fourth"
 msgstr "četvrtom"
 
@@ -3355,7 +3358,7 @@ msgstr "četvrtom"
 #. * (dropdown menu options are in [square brackets]). This means that after 'fifth', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1123
+#: ../calendar/gui/dialogs/recurrence-page.c:1131
 msgid "fifth"
 msgstr "petom"
 
@@ -3363,13 +3366,13 @@ msgstr "petom"
 #. * (dropdown menu options are in [square brackets]). This means that after 'last', either the string 'day' or
 #. * the name of a week day (like 'Monday' or 'Friday') always follow.
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1128
+#: ../calendar/gui/dialogs/recurrence-page.c:1136
 msgid "last"
 msgstr "poslednjem"
 
 #. TRANSLATORS: Entire string is for example: This appointment recurs/Every [x] month(s) on the [Other date] [11th to 20th] [17th] [forever]'
 #. * (dropdown menu options are in [square brackets]).
-#: ../calendar/gui/dialogs/recurrence-page.c:1152
+#: ../calendar/gui/dialogs/recurrence-page.c:1160
 msgid "Other Date"
 msgstr "Drugi datum"
 
@@ -3377,7 +3380,7 @@ msgstr "Drugi datum"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [1st to 10th] [7th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1158
+#: ../calendar/gui/dialogs/recurrence-page.c:1166
 msgid "1st to 10th"
 msgstr "od prvog do desetog"
 
@@ -3385,7 +3388,7 @@ msgstr "od prvog do desetog"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [11th to 20th] [17th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1164
+#: ../calendar/gui/dialogs/recurrence-page.c:1172
 msgid "11th to 20th"
 msgstr "od jedanaestog do dvadesetog"
 
@@ -3393,41 +3396,41 @@ msgstr "od jedanaestog do dvadesetog"
 #. * the month to setup an appointment recurrence. The entire string is for example: This appointment recurs/Every [x] month(s)
 #. * on the [Other date] [21th to 31th] [27th] [forever]' (dropdown menu options are in [square brackets]).
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1170
+#: ../calendar/gui/dialogs/recurrence-page.c:1178
 msgid "21st to 31st"
 msgstr "od dvadeset prvog do trideset prvog"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1196
+#: ../calendar/gui/dialogs/recurrence-page.c:1205
 #: ../modules/calendar/e-calendar-preferences.ui.h:1
 msgid "Monday"
 msgstr "Ponedeljak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1197
+#: ../calendar/gui/dialogs/recurrence-page.c:1206
 #: ../modules/calendar/e-calendar-preferences.ui.h:2
 msgid "Tuesday"
 msgstr "Utorak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1198
+#: ../calendar/gui/dialogs/recurrence-page.c:1207
 #: ../modules/calendar/e-calendar-preferences.ui.h:3
 msgid "Wednesday"
 msgstr "Sreda"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1199
+#: ../calendar/gui/dialogs/recurrence-page.c:1208
 #: ../modules/calendar/e-calendar-preferences.ui.h:4
 msgid "Thursday"
 msgstr "Četvrtak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1200
+#: ../calendar/gui/dialogs/recurrence-page.c:1209
 #: ../modules/calendar/e-calendar-preferences.ui.h:5
 msgid "Friday"
 msgstr "Petak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1201
+#: ../calendar/gui/dialogs/recurrence-page.c:1210
 #: ../modules/calendar/e-calendar-preferences.ui.h:6
 msgid "Saturday"
 msgstr "Subota"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1202
+#: ../calendar/gui/dialogs/recurrence-page.c:1211
 #: ../modules/calendar/e-calendar-preferences.ui.h:7
 msgid "Sunday"
 msgstr "Nedelja"
@@ -3435,31 +3438,31 @@ msgstr "Nedelja"
 #. TRANSLATORS: Entire string is for example: 'This appointment recurs/Every [x] month(s) on the [second] [Tuesday] [forever]'
 #. * (dropdown menu options are in [square brackets])."
 #.
-#: ../calendar/gui/dialogs/recurrence-page.c:1326
+#: ../calendar/gui/dialogs/recurrence-page.c:1342
 msgid "on the"
 msgstr "na"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1505
+#: ../calendar/gui/dialogs/recurrence-page.c:1527
 msgid "occurrences"
 msgstr "pojave"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2221
+#: ../calendar/gui/dialogs/recurrence-page.c:2253
 msgid "Add exception"
 msgstr "Dodaj izuzetak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2262
+#: ../calendar/gui/dialogs/recurrence-page.c:2295
 msgid "Could not get a selection to modify."
 msgstr "Ne mogu da nađem izbor radi menjanja."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2268
+#: ../calendar/gui/dialogs/recurrence-page.c:2301
 msgid "Modify exception"
 msgstr "Izmenite izuzetak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2312
+#: ../calendar/gui/dialogs/recurrence-page.c:2347
 msgid "Could not get a selection to delete."
 msgstr "Ne mogu da nađem izbor radi brisanja."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2451
+#: ../calendar/gui/dialogs/recurrence-page.c:2488
 msgid "Date/Time"
 msgstr "Datum/vreme"
 
@@ -3521,85 +3524,85 @@ msgstr "Izuzeci"
 msgid "Preview"
 msgstr "Pregled"
 
-#: ../calendar/gui/dialogs/send-comp.c:196
+#: ../calendar/gui/dialogs/send-comp.c:223
 msgid "Send my reminders with this event"
 msgstr "Pošalji moje podsetnike sa ovim događajem"
 
-#: ../calendar/gui/dialogs/send-comp.c:198
+#: ../calendar/gui/dialogs/send-comp.c:225
 msgid "Notify new attendees _only"
 msgstr "Obavesti _samo nove učesnike"
 
-#: ../calendar/gui/dialogs/task-details-page.c:355
+#: ../calendar/gui/dialogs/task-details-page.c:352
 #: ../calendar/gui/dialogs/task-details-page.c:377
 msgid "Completed date is wrong"
 msgstr "Datum završetka je pogrešan"
 
-#: ../calendar/gui/dialogs/task-details-page.c:489
+#: ../calendar/gui/dialogs/task-details-page.c:490
 msgid "Web Page"
 msgstr "Veb stranica"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:2
-#: ../calendar/gui/e-cal-component-preview.c:345
-#: ../calendar/gui/e-task-table.c:579 ../calendar/gui/tasktypes.xml.h:19
-#: ../mail/message-list.c:1275 ../widgets/misc/e-send-options.ui.h:2
+#: ../calendar/gui/e-cal-component-preview.c:348
+#: ../calendar/gui/e-task-table.c:571 ../calendar/gui/tasktypes.xml.h:19
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:1257
 msgid "High"
 msgstr "Visok"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:4
-#: ../calendar/gui/e-cal-component-preview.c:347
-#: ../calendar/gui/e-cal-model.c:1655 ../calendar/gui/e-task-table.c:580
-#: ../calendar/gui/tasktypes.xml.h:20 ../mail/message-list.c:1274
-#: ../widgets/misc/e-send-options.ui.h:5
+#: ../calendar/gui/e-cal-component-preview.c:350
+#: ../calendar/gui/e-cal-model.c:1682 ../calendar/gui/e-task-table.c:572
+#: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
+#: ../mail/message-list.c:1256
 msgid "Normal"
 msgstr "Običan"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:6
-#: ../calendar/gui/e-cal-component-preview.c:349
-#: ../calendar/gui/e-task-table.c:581 ../calendar/gui/tasktypes.xml.h:21
-#: ../mail/message-list.c:1273 ../widgets/misc/e-send-options.ui.h:4
+#: ../calendar/gui/e-cal-component-preview.c:352
+#: ../calendar/gui/e-task-table.c:573 ../calendar/gui/tasktypes.xml.h:21
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:1255
 msgid "Low"
 msgstr "Nizak"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-details-page.ui.h:8
-#: ../calendar/gui/e-task-table.c:582 ../calendar/gui/tasktypes.xml.h:22
-#: ../widgets/misc/e-send-options.ui.h:1
+#: ../calendar/gui/e-task-table.c:574 ../calendar/gui/tasktypes.xml.h:22
+#: ../e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "Neodređen"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:331
-#: ../calendar/gui/e-cal-model-tasks.c:489
-#: ../calendar/gui/e-cal-model-tasks.c:774 ../calendar/gui/e-task-table.c:227
-#: ../calendar/gui/e-task-table.c:242 ../calendar/gui/e-task-table.c:656
-#: ../calendar/gui/print.c:3405 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/e-cal-component-preview.c:333
+#: ../calendar/gui/e-cal-model-tasks.c:491
+#: ../calendar/gui/e-cal-model-tasks.c:777 ../calendar/gui/e-task-table.c:214
+#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:654
+#: ../calendar/gui/print.c:3554 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "Nije započet"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:321
-#: ../calendar/gui/e-cal-model-tasks.c:491
-#: ../calendar/gui/e-cal-model-tasks.c:776
-#: ../calendar/gui/e-cal-model-tasks.c:854 ../calendar/gui/e-task-table.c:229
-#: ../calendar/gui/e-task-table.c:244 ../calendar/gui/e-task-table.c:657
-#: ../calendar/gui/print.c:3408
+#: ../calendar/gui/e-cal-component-preview.c:323
+#: ../calendar/gui/e-cal-model-tasks.c:493
+#: ../calendar/gui/e-cal-model-tasks.c:779
+#: ../calendar/gui/e-cal-model-tasks.c:857 ../calendar/gui/e-task-table.c:216
+#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:655
+#: ../calendar/gui/print.c:3557
 msgid "In Progress"
 msgstr "U toku"
 
 # timezone.
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:14
-#: ../calendar/gui/e-cal-component-preview.c:324
-#: ../calendar/gui/e-cal-model-tasks.c:493
-#: ../calendar/gui/e-cal-model-tasks.c:778
-#: ../calendar/gui/e-meeting-store.c:209 ../calendar/gui/e-meeting-store.c:232
-#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:246
-#: ../calendar/gui/e-task-table.c:658 ../calendar/gui/print.c:3411
+#: ../calendar/gui/e-cal-component-preview.c:326
+#: ../calendar/gui/e-cal-model-tasks.c:495
+#: ../calendar/gui/e-cal-model-tasks.c:781
+#: ../calendar/gui/e-meeting-store.c:208 ../calendar/gui/e-meeting-store.c:231
+#: ../calendar/gui/e-task-table.c:218 ../calendar/gui/e-task-table.c:233
+#: ../calendar/gui/e-task-table.c:656 ../calendar/gui/print.c:3560
 #: ../calendar/gui/tasktypes.xml.h:13
 #: ../plugins/save-calendar/csv-format.c:376
 msgid "Completed"
@@ -3607,11 +3610,11 @@ msgstr "Završeno"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-details-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:327
-#: ../calendar/gui/e-cal-model-tasks.c:495
-#: ../calendar/gui/e-cal-model-tasks.c:780 ../calendar/gui/e-task-table.c:233
-#: ../calendar/gui/e-task-table.c:248 ../calendar/gui/e-task-table.c:659
-#: ../calendar/gui/print.c:3414 ../mail/mail-send-recv.c:879
+#: ../calendar/gui/e-cal-component-preview.c:329
+#: ../calendar/gui/e-cal-model-tasks.c:497
+#: ../calendar/gui/e-cal-model-tasks.c:783 ../calendar/gui/e-task-table.c:220
+#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:657
+#: ../calendar/gui/print.c:3563 ../mail/mail-send-recv.c:878
 msgid "Canceled"
 msgstr "Otkazano"
 
@@ -3619,10 +3622,10 @@ msgstr "Otkazano"
 #. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/dialogs/task-details-page.ui.h:17
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:3624
-#: ../calendar/gui/e-meeting-list-view.c:684
+#: ../calendar/gui/e-cal-model.c:3604
+#: ../calendar/gui/e-meeting-list-view.c:692
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:74
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:75
 #: ../mail/message-list.etspec.h:1
 msgid "Status"
 msgstr "Stanje"
@@ -3636,7 +3639,7 @@ msgid "P_ercent complete:"
 msgstr "P_rocenat završenog:"
 
 #: ../calendar/gui/dialogs/task-details-page.ui.h:20
-#: ../widgets/misc/e-send-options.ui.h:26
+#: ../e-util/e-send-options.ui.h:26
 msgid "_Priority:"
 msgstr "_Važnost:"
 
@@ -3648,48 +3651,48 @@ msgstr "_Datum završetka:"
 msgid "_Web Page:"
 msgstr "_Veb stranica:"
 
-#: ../calendar/gui/dialogs/task-editor.c:116
+#: ../calendar/gui/dialogs/task-editor.c:113
 msgid "_Status Details"
 msgstr "Detalji _stanja"
 
-#: ../calendar/gui/dialogs/task-editor.c:118
+#: ../calendar/gui/dialogs/task-editor.c:115
 msgid "Click to change or view the status details of the task"
 msgstr "Kliknite da izmenite ili da pregledate detalje statusa zadatka"
 
-#: ../calendar/gui/dialogs/task-editor.c:126
+#: ../calendar/gui/dialogs/task-editor.c:123
 msgid "_Send Options"
 msgstr "Mogućnosti _slanja"
 
-#: ../calendar/gui/dialogs/task-editor.c:186 ../calendar/gui/print.c:3326
-#: ../widgets/misc/e-send-options.c:553
+#: ../calendar/gui/dialogs/task-editor.c:183 ../calendar/gui/print.c:3470
+#: ../e-util/e-send-options.c:553
 msgid "Task"
 msgstr "Zadatak"
 
-#: ../calendar/gui/dialogs/task-editor.c:307
+#: ../calendar/gui/dialogs/task-editor.c:304
 msgid "Task Details"
 msgstr "Detalji zadatka"
 
-#: ../calendar/gui/dialogs/task-editor.c:351
+#: ../calendar/gui/dialogs/task-editor.c:348
 msgid "Print this task"
 msgstr "Odštampajte ovaj zadatak"
 
-#: ../calendar/gui/dialogs/task-page.c:259
+#: ../calendar/gui/dialogs/task-page.c:249
 msgid "Task's start date is in the past"
 msgstr "Početak zadatka je u prošlosti"
 
-#: ../calendar/gui/dialogs/task-page.c:260
+#: ../calendar/gui/dialogs/task-page.c:250
 msgid "Task's due date is in the past"
 msgstr "Rok za završetak zadatka je u prošlosti"
 
-#: ../calendar/gui/dialogs/task-page.c:293
+#: ../calendar/gui/dialogs/task-page.c:283
 msgid "Task cannot be edited, because the selected task list is read only"
 msgstr "Zadatak nije moguće uređivati, pošto je izabrani spisak samo za čitanje"
 
-#: ../calendar/gui/dialogs/task-page.c:297
+#: ../calendar/gui/dialogs/task-page.c:287
 msgid "Task cannot be fully edited, because you are not the organizer"
 msgstr "Zadatak nije moguće potpuno urediti, zato što niste organizator"
 
-#: ../calendar/gui/dialogs/task-page.c:301
+#: ../calendar/gui/dialogs/task-page.c:291
 msgid ""
 "Task cannot be edited, because the selected task list does not support "
 "assigned tasks"
@@ -3701,7 +3704,7 @@ msgstr ""
 msgid "Due date is wrong"
 msgstr "Krajnji rok je pogrešan"
 
-#: ../calendar/gui/dialogs/task-page.c:1813
+#: ../calendar/gui/dialogs/task-page.c:1822
 #, c-format
 msgid "Unable to open tasks in '%s': %s"
 msgstr "Ne mogu da otvorim zadatke u „%s“ : %s"
@@ -3714,56 +3717,56 @@ msgstr "Krajnji _rok:"
 msgid "Time zone:"
 msgstr "Vremenska zona:"
 
-#: ../calendar/gui/ea-cal-view.c:320
+#: ../calendar/gui/ea-cal-view.c:324
 msgid "New Appointment"
 msgstr "Novo zakazivanje"
 
-#: ../calendar/gui/ea-cal-view.c:321
+#: ../calendar/gui/ea-cal-view.c:325
 msgid "New All Day Event"
 msgstr "Novi celodnevni događaj"
 
-#: ../calendar/gui/ea-cal-view.c:322
+#: ../calendar/gui/ea-cal-view.c:326
 msgid "New Meeting"
 msgstr "Novi sastanak"
 
-#: ../calendar/gui/ea-cal-view.c:323
+#: ../calendar/gui/ea-cal-view.c:327
 msgid "Go to Today"
 msgstr "Idi na današnji dan"
 
-#: ../calendar/gui/ea-cal-view.c:324
+#: ../calendar/gui/ea-cal-view.c:328
 msgid "Go to Date"
 msgstr "Idi na datum"
 
-#: ../calendar/gui/ea-cal-view-event.c:291
+#: ../calendar/gui/ea-cal-view-event.c:298
 msgid "It has reminders."
 msgstr "Ima podsetnike."
 
-#: ../calendar/gui/ea-cal-view-event.c:294
+#: ../calendar/gui/ea-cal-view-event.c:301
 msgid "It has recurrences."
 msgstr "Ima ponavljanja."
 
-#: ../calendar/gui/ea-cal-view-event.c:297
+#: ../calendar/gui/ea-cal-view-event.c:304
 msgid "It is a meeting."
 msgstr "To je sastanak."
 
-#: ../calendar/gui/ea-cal-view-event.c:304
+#: ../calendar/gui/ea-cal-view-event.c:311
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalendarski događaj: sažetak je %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:307
+#: ../calendar/gui/ea-cal-view-event.c:314
 msgid "Calendar Event: It has no summary."
 msgstr "Kalendarski događaj: nema sažetka."
 
-#: ../calendar/gui/ea-cal-view-event.c:329
+#: ../calendar/gui/ea-cal-view-event.c:337
 msgid "calendar view event"
 msgstr "događaj pregleda kalendara"
 
-#: ../calendar/gui/ea-cal-view-event.c:558
+#: ../calendar/gui/ea-cal-view-event.c:566
 msgid "Grab Focus"
 msgstr "Fokusiraj"
 
-#: ../calendar/gui/ea-day-view.c:151 ../calendar/gui/ea-week-view.c:151
+#: ../calendar/gui/ea-day-view.c:154 ../calendar/gui/ea-week-view.c:154
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -3774,47 +3777,41 @@ msgstr[3] "Ima %d događaj."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:156 ../calendar/gui/ea-week-view.c:154
+#: ../calendar/gui/ea-day-view.c:161 ../calendar/gui/ea-week-view.c:157
 msgid "It has no events."
 msgstr "Nema događaja."
 
-#. To translators: First %s is the week, for example "July 10th -
-#. July 14th, 2006". Second %s is the number of events in this work
-#. week, for example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:163
+#: ../calendar/gui/ea-day-view.c:169
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Pregled radne nedelje: %s. %s"
 
-#. To translators: First %s is the day, for example "Thursday July
-#. 13th, 2006". Second %s is the number of events on this day, for
-#. example "It has %d event/events." or  "It has no events."
-#: ../calendar/gui/ea-day-view.c:169
+#: ../calendar/gui/ea-day-view.c:176
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Dnevni pregled: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:203
+#: ../calendar/gui/ea-day-view.c:210
 msgid "calendar view for a work week"
 msgstr "pregled kalendara za radnu nedelju"
 
-#: ../calendar/gui/ea-day-view.c:205
+#: ../calendar/gui/ea-day-view.c:212
 msgid "calendar view for one or more days"
 msgstr "pregled kalendara za jedan ili više dana"
 
-#: ../calendar/gui/ea-day-view-main-item.c:319
-#: ../calendar/gui/ea-week-view-main-item.c:345
+#: ../calendar/gui/ea-day-view-main-item.c:327
+#: ../calendar/gui/ea-week-view-main-item.c:354
 msgid "a table to view and select the current time range"
 msgstr "tabela za prikaz i izbor tekućeg vremenskog raspona"
 
 #: ../calendar/gui/ea-gnome-calendar.c:48
 #: ../calendar/gui/ea-gnome-calendar.c:56
-#: ../calendar/importers/icalendar-importer.c:1118
+#: ../calendar/importers/icalendar-importer.c:1115
 msgid "Gnome Calendar"
 msgstr "Gnomov kalendar"
 
-#: ../calendar/gui/ea-gnome-calendar.c:199
-#: ../modules/calendar/e-cal-shell-view-private.c:1085
+#: ../calendar/gui/ea-gnome-calendar.c:204
+#: ../modules/calendar/e-cal-shell-view-private.c:1105
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y."
 
@@ -3829,30 +3826,30 @@ msgstr "%A, %d. %b %Y."
 #. * %d = day of month, %b = abbreviated month name.
 #. * You can change the order but don't change the
 #. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:202 ../calendar/gui/e-day-view.c:1853
-#: ../calendar/gui/e-day-view-top-item.c:835
-#: ../calendar/gui/e-week-view-main-item.c:231
-#: ../modules/calendar/e-cal-shell-view-private.c:1089
+#: ../calendar/gui/ea-gnome-calendar.c:208 ../calendar/gui/e-day-view.c:1888
+#: ../calendar/gui/e-day-view-top-item.c:855
+#: ../calendar/gui/e-week-view-main-item.c:233
+#: ../modules/calendar/e-cal-shell-view-private.c:1109
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../calendar/gui/ea-gnome-calendar.c:209
 #: ../calendar/gui/ea-gnome-calendar.c:211
-#: ../modules/calendar/e-cal-shell-view-private.c:1092
-#: ../modules/calendar/e-cal-shell-view-private.c:1098
-#: ../modules/calendar/e-cal-shell-view-private.c:1101
+#: ../calendar/gui/ea-gnome-calendar.c:217
+#: ../calendar/gui/ea-gnome-calendar.c:220
+#: ../modules/calendar/e-cal-shell-view-private.c:1112
+#: ../modules/calendar/e-cal-shell-view-private.c:1118
+#: ../modules/calendar/e-cal-shell-view-private.c:1121
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y."
 
-#: ../calendar/gui/ea-gnome-calendar.c:228
-#: ../calendar/gui/ea-gnome-calendar.c:234
-#: ../calendar/gui/ea-gnome-calendar.c:240
-#: ../calendar/gui/ea-gnome-calendar.c:242
-#: ../modules/calendar/e-cal-shell-view-private.c:1118
-#: ../modules/calendar/e-cal-shell-view-private.c:1129
-#: ../modules/calendar/e-cal-shell-view-private.c:1136
-#: ../modules/calendar/e-cal-shell-view-private.c:1139
+#: ../calendar/gui/ea-gnome-calendar.c:239
+#: ../calendar/gui/ea-gnome-calendar.c:247
+#: ../calendar/gui/ea-gnome-calendar.c:254
+#: ../calendar/gui/ea-gnome-calendar.c:257
+#: ../modules/calendar/e-cal-shell-view-private.c:1138
+#: ../modules/calendar/e-cal-shell-view-private.c:1149
+#: ../modules/calendar/e-cal-shell-view-private.c:1156
+#: ../modules/calendar/e-cal-shell-view-private.c:1159
 msgid "%d %b %Y"
 msgstr "%d. %b %Y."
 
@@ -3865,10 +3862,10 @@ msgstr "%d. %b %Y."
 #. strftime format %d = day of month, %b = abbreviated
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:232 ../calendar/gui/e-day-view.c:1869
-#: ../calendar/gui/e-day-view-top-item.c:839
-#: ../calendar/gui/e-week-view-main-item.c:245
-#: ../modules/calendar/e-cal-shell-view-private.c:1125
+#: ../calendar/gui/ea-gnome-calendar.c:244 ../calendar/gui/e-day-view.c:1904
+#: ../calendar/gui/e-day-view-top-item.c:859
+#: ../calendar/gui/e-week-view-main-item.c:247
+#: ../modules/calendar/e-cal-shell-view-private.c:1145
 msgid "%d %b"
 msgstr "%d. %b"
 
@@ -3904,94 +3901,86 @@ msgstr[3] "%d nedelja"
 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"
-#: ../calendar/gui/e-alarm-list.c:440
+#: ../calendar/gui/e-alarm-list.c:441
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s pre početka sastanka"
 
-#. 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"
-#: ../calendar/gui/e-alarm-list.c:445
+#: ../calendar/gui/e-alarm-list.c:447
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s nakon početka sastanka"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:452
+#: ../calendar/gui/e-alarm-list.c:454
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s na početku sastanka"
 
-#. 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"
-#: ../calendar/gui/e-alarm-list.c:463
+#: ../calendar/gui/e-alarm-list.c:466
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s pre kraja sastanka"
 
-#. 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"
-#: ../calendar/gui/e-alarm-list.c:468
+#: ../calendar/gui/e-alarm-list.c:472
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s nakon završetka sastanka"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:475
+#: ../calendar/gui/e-alarm-list.c:479
 #, c-format
 msgid "%s at the end of the appointment"
 msgstr "%s na kraju sastanka"
 
 #. Translator: The first %s refers to the base, which would be actions like
 #. * "Play a Sound". Second %s is an absolute time, e.g. "10:00AM"
-#: ../calendar/gui/e-alarm-list.c:499
+#: ../calendar/gui/e-alarm-list.c:503
 #, c-format
 msgid "%s at %s"
 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
-#: ../calendar/gui/e-alarm-list.c:507
+#: ../calendar/gui/e-alarm-list.c:511
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s za nepoznat tip pokretača"
 
-#: ../calendar/gui/ea-week-view.c:159
+#: ../calendar/gui/ea-week-view.c:163
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Mesečni pregled: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:163
+#: ../calendar/gui/ea-week-view.c:168
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Nedeljni pregled: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:197
+#: ../calendar/gui/ea-week-view.c:202
 msgid "calendar view for a month"
 msgstr "pregled kalendara za mesec"
 
-#: ../calendar/gui/ea-week-view.c:199
+#: ../calendar/gui/ea-week-view.c:204
 msgid "calendar view for one or more weeks"
 msgstr "pregled kalendara za jednu ili više nedelja"
 
-#: ../calendar/gui/e-cal-component-preview.c:237 ../filter/e-filter-rule.c:748
+#: ../calendar/gui/e-cal-component-preview.c:234 ../e-util/e-filter-rule.c:750
 #: ../mail/e-mail-config-page.c:126
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: ../calendar/gui/e-cal-component-preview.c:245
+#: ../calendar/gui/e-cal-component-preview.c:242
 msgid "Categories:"
 msgstr "Kategorije:"
 
-#: ../calendar/gui/e-cal-component-preview.c:276
+#: ../calendar/gui/e-cal-component-preview.c:274
 msgid "Summary:"
 msgstr "Sažetak:"
 
-#: ../calendar/gui/e-cal-component-preview.c:284
+#: ../calendar/gui/e-cal-component-preview.c:283
 msgid "Start Date:"
 msgstr "Datum početka:"
 
@@ -3999,26 +3988,26 @@ msgstr "Datum početka:"
 msgid "End Date:"
 msgstr "Datum završetka:"
 
-#: ../calendar/gui/e-cal-component-preview.c:306
+#: ../calendar/gui/e-cal-component-preview.c:307
 msgid "Due Date:"
 msgstr "Krajnji rok:"
 
-#: ../calendar/gui/e-cal-component-preview.c:317
-#: ../modules/itip-formatter/itip-view.c:1463
-#: ../modules/itip-formatter/itip-view.c:1578
+#: ../calendar/gui/e-cal-component-preview.c:319
+#: ../modules/itip-formatter/itip-view.c:1467
+#: ../modules/itip-formatter/itip-view.c:1584
 msgid "Status:"
 msgstr "Stanje:"
 
-#: ../calendar/gui/e-cal-component-preview.c:343
+#: ../calendar/gui/e-cal-component-preview.c:346
 msgid "Priority:"
 msgstr "Važnost:"
 
-#: ../calendar/gui/e-cal-component-preview.c:367
+#: ../calendar/gui/e-cal-component-preview.c:371
 #: ../mail/e-mail-config-service-page.c:672
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../calendar/gui/e-cal-component-preview.c:397
+#: ../calendar/gui/e-cal-component-preview.c:402
 msgid "Web Page:"
 msgstr "Veb stranica:"
 
@@ -4031,11 +4020,11 @@ msgid "Start date"
 msgstr "Datum početka"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:3
-#: ../calendar/gui/e-meeting-list-view.c:644
+#: ../calendar/gui/e-meeting-list-view.c:649
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
+#: ../e-util/e-attachment-tree-view.c:586
 #: ../mail/e-mail-account-tree-view.c:157
-#: ../widgets/misc/e-attachment-tree-view.c:586
 msgid "Type"
 msgstr "Vrsta"
 
@@ -4043,7 +4032,7 @@ msgstr "Vrsta"
 msgid "Completion date"
 msgstr "Datum završetka"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:881
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:880
 msgid "Complete"
 msgstr "Završeno"
 
@@ -4075,37 +4064,37 @@ msgstr "Napravljeno"
 msgid "Last modified"
 msgstr "Poslednje izmene"
 
-#: ../calendar/gui/e-calendar-view.c:434
+#: ../calendar/gui/e-calendar-view.c:438
 msgid "Cut selected events to the clipboard"
 msgstr "Seče izabrane događaje u spisak isečaka"
 
-#: ../calendar/gui/e-calendar-view.c:440
+#: ../calendar/gui/e-calendar-view.c:444
 msgid "Copy selected events to the clipboard"
 msgstr "Umnožava izabrane događaje u spisak isečaka"
 
-#: ../calendar/gui/e-calendar-view.c:446
+#: ../calendar/gui/e-calendar-view.c:450
 msgid "Paste events from the clipboard"
 msgstr "Ubacuje događaje iz spiska isečaka"
 
-#: ../calendar/gui/e-calendar-view.c:452
+#: ../calendar/gui/e-calendar-view.c:456
 msgid "Delete selected events"
 msgstr "Briše izabrane događaje"
 
-#: ../calendar/gui/e-calendar-view.c:472 ../calendar/gui/e-memo-table.c:195
-#: ../calendar/gui/e-task-table.c:283
+#: ../calendar/gui/e-calendar-view.c:476 ../calendar/gui/e-memo-table.c:183
+#: ../calendar/gui/e-task-table.c:270
 msgid "Deleting selected objects"
 msgstr "Brišem izabrane objekte"
 
-#: ../calendar/gui/e-calendar-view.c:631 ../calendar/gui/e-memo-table.c:875
-#: ../calendar/gui/e-task-table.c:1158
+#: ../calendar/gui/e-calendar-view.c:635 ../calendar/gui/e-memo-table.c:863
+#: ../calendar/gui/e-task-table.c:1161
 msgid "Updating objects"
 msgstr "Ažuriram objekat"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email@ofuser.com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email@ofuser.com>"
-#: ../calendar/gui/e-calendar-view.c:1992 ../calendar/gui/e-memo-table.c:552
-#: ../calendar/gui/e-task-table.c:824
+#: ../calendar/gui/e-calendar-view.c:1999 ../calendar/gui/e-memo-table.c:540
+#: ../calendar/gui/e-task-table.c:827
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizator: %s <%s>"
@@ -4113,20 +4102,21 @@ msgstr "Organizator: %s <%s>"
 #. With SunOne accouts, there may be no ':' in organiser.value
 #. With SunOne accounts, there may be no ':' in
 #. * organizer.value.
-#: ../calendar/gui/e-calendar-view.c:1996 ../calendar/gui/e-memo-table.c:557
-#: ../calendar/gui/e-task-table.c:828
+#: ../calendar/gui/e-calendar-view.c:2003 ../calendar/gui/e-memo-table.c:545
+#: ../calendar/gui/e-task-table.c:831
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2012 ../calendar/gui/print.c:3360
+#: ../calendar/gui/e-calendar-view.c:2019
+#: ../calendar/gui/e-meeting-time-sel.c:2790 ../calendar/gui/print.c:3508
 #, c-format
 msgid "Location: %s"
 msgstr "Mesto: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2043
+#: ../calendar/gui/e-calendar-view.c:2050
 #, c-format
 msgid "Time: %s %s"
 msgstr "Vreme: %s %s"
@@ -4140,86 +4130,86 @@ msgstr "Datum početka"
 msgid "End Date"
 msgstr "Datum završetka"
 
-#: ../calendar/gui/e-cal-model.c:842 ../calendar/gui/e-meeting-list-view.c:186
-#: ../calendar/gui/e-meeting-list-view.c:200
-#: ../calendar/gui/e-meeting-store.c:139 ../calendar/gui/e-meeting-store.c:174
-#: ../calendar/gui/e-meeting-store.c:237 ../calendar/gui/print.c:1159
-#: ../calendar/gui/print.c:1176 ../e-util/e-charset.c:52
-#: ../modules/itip-formatter/itip-view.c:3462
-#: ../modules/itip-formatter/itip-view.c:5962
-#: ../modules/plugin-manager/evolution-plugin-manager.c:101
+#: ../calendar/gui/e-cal-model.c:854 ../calendar/gui/e-meeting-list-view.c:185
+#: ../calendar/gui/e-meeting-list-view.c:199
+#: ../calendar/gui/e-meeting-store.c:138 ../calendar/gui/e-meeting-store.c:173
+#: ../calendar/gui/e-meeting-store.c:236 ../calendar/gui/print.c:1235
+#: ../calendar/gui/print.c:1252 ../e-util/e-charset.c:52
+#: ../modules/itip-formatter/itip-view.c:3472
+#: ../modules/itip-formatter/itip-view.c:5977
+#: ../modules/plugin-manager/evolution-plugin-manager.c:100
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../calendar/gui/e-cal-model.c:1657
+#: ../calendar/gui/e-cal-model.c:1684
 msgid "Recurring"
 msgstr "Periodičnost"
 
-#: ../calendar/gui/e-cal-model.c:1659
+#: ../calendar/gui/e-cal-model.c:1686
 msgid "Assigned"
 msgstr "Dodeljeno"
 
-#: ../calendar/gui/e-cal-model.c:1661 ../calendar/gui/e-cal-model-tasks.c:1145
-#: ../calendar/gui/e-meeting-list-view.c:210
-#: ../calendar/gui/e-meeting-store.c:181 ../calendar/gui/e-meeting-store.c:191
-#: ../calendar/gui/e-meeting-store.c:1075
+#: ../calendar/gui/e-cal-model.c:1688 ../calendar/gui/e-cal-model-tasks.c:1148
+#: ../calendar/gui/e-meeting-list-view.c:209
+#: ../calendar/gui/e-meeting-store.c:180 ../calendar/gui/e-meeting-store.c:190
+#: ../calendar/gui/e-meeting-store.c:1074
 msgid "Yes"
 msgstr "Da"
 
-#: ../calendar/gui/e-cal-model.c:1661 ../calendar/gui/e-cal-model-tasks.c:1145
-#: ../calendar/gui/e-meeting-list-view.c:211
-#: ../calendar/gui/e-meeting-store.c:193
+#: ../calendar/gui/e-cal-model.c:1688 ../calendar/gui/e-cal-model-tasks.c:1148
+#: ../calendar/gui/e-meeting-list-view.c:210
+#: ../calendar/gui/e-meeting-store.c:192
 msgid "No"
 msgstr "Ne"
 
-#: ../calendar/gui/e-cal-model.c:3114
+#: ../calendar/gui/e-cal-model.c:3093
 #, c-format
 msgid "Opening %s"
 msgstr "Otvaram „%s“"
 
-#: ../calendar/gui/e-cal-model.c:3565
-#: ../calendar/gui/e-meeting-list-view.c:222
-#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
-#: ../modules/itip-formatter/itip-view.c:5950
+#: ../calendar/gui/e-cal-model.c:3545
+#: ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
+#: ../modules/itip-formatter/itip-view.c:5965
 msgid "Accepted"
 msgstr "Prihvaćeno"
 
-#: ../calendar/gui/e-cal-model.c:3566
-#: ../calendar/gui/e-meeting-list-view.c:223
-#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
-#: ../modules/itip-formatter/itip-view.c:5956
+#: ../calendar/gui/e-cal-model.c:3546
+#: ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
+#: ../modules/itip-formatter/itip-view.c:5971
 msgid "Declined"
 msgstr "Odbijeno"
 
-#: ../calendar/gui/e-cal-model.c:3567
-#: ../calendar/gui/e-meeting-list-view.c:224
-#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
-#: ../calendar/gui/e-meeting-time-sel.c:561
+#: ../calendar/gui/e-cal-model.c:3547
+#: ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../calendar/gui/e-meeting-time-sel.c:578
 msgid "Tentative"
 msgstr "Sa rezervom"
 
-#: ../calendar/gui/e-cal-model.c:3568
-#: ../calendar/gui/e-meeting-list-view.c:225
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
-#: ../modules/itip-formatter/itip-view.c:5959
+#: ../calendar/gui/e-cal-model.c:3548
+#: ../calendar/gui/e-meeting-list-view.c:224
+#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
+#: ../modules/itip-formatter/itip-view.c:5974
 msgid "Delegated"
 msgstr "Delegirano"
 
-#: ../calendar/gui/e-cal-model.c:3569
+#: ../calendar/gui/e-cal-model.c:3549
 msgid "Needs action"
 msgstr "Zahteva radnju"
 
-#: ../calendar/gui/e-cal-model-calendar.c:157
-#: ../calendar/gui/e-task-table.c:633
+#: ../calendar/gui/e-cal-model-calendar.c:158
+#: ../calendar/gui/e-task-table.c:629
 msgid "Free"
 msgstr "Slobodno"
 
-#: ../calendar/gui/e-cal-model-calendar.c:160
-#: ../calendar/gui/e-meeting-time-sel.c:562 ../calendar/gui/e-task-table.c:634
+#: ../calendar/gui/e-cal-model-calendar.c:161
+#: ../calendar/gui/e-meeting-time-sel.c:579 ../calendar/gui/e-task-table.c:630
 msgid "Busy"
 msgstr "Zauzeto"
 
-#: ../calendar/gui/e-cal-model-tasks.c:720
+#: ../calendar/gui/e-cal-model-tasks.c:723
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4235,7 +4225,7 @@ msgstr ""
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" for task's status
-#: ../calendar/gui/e-cal-model-tasks.c:772
+#: ../calendar/gui/e-cal-model-tasks.c:775
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ništa"
@@ -4245,7 +4235,7 @@ msgstr "Ništa"
 # strftime format of a weekday, a date and a
 # time, in 24-hour format.
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:162
+#: ../calendar/gui/e-cell-date-edit-text.c:159
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d. %m. %Y. %H:%M:%S"
 
@@ -4254,11 +4244,11 @@ msgstr "%a %d. %m. %Y. %H:%M:%S"
 # strftime format of a weekday, a date and a
 # time, in 12-hour format.
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:165
+#: ../calendar/gui/e-cell-date-edit-text.c:162
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:173
+#: ../calendar/gui/e-cell-date-edit-text.c:170
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4268,16 +4258,16 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1027 ../calendar/gui/e-week-view.c:773
-#: ../calendar/gui/print.c:985 ../calendar/gui/print.c:1004
-#: ../calendar/gui/print.c:2495 ../calendar/gui/print.c:2515
+#: ../calendar/gui/e-day-view.c:1026 ../calendar/gui/e-week-view.c:772
+#: ../calendar/gui/print.c:1058 ../calendar/gui/print.c:1077
+#: ../calendar/gui/print.c:2608 ../calendar/gui/print.c:2628
 msgid "am"
 msgstr "prp"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1030 ../calendar/gui/e-week-view.c:776
-#: ../calendar/gui/print.c:990 ../calendar/gui/print.c:1006
-#: ../calendar/gui/print.c:2500 ../calendar/gui/print.c:2517
+#: ../calendar/gui/e-day-view.c:1029 ../calendar/gui/e-week-view.c:775
+#: ../calendar/gui/print.c:1063 ../calendar/gui/print.c:1079
+#: ../calendar/gui/print.c:2613 ../calendar/gui/print.c:2630
 msgid "pm"
 msgstr "pop"
 
@@ -4292,13 +4282,13 @@ msgstr "pop"
 #. * month, %B = full month name. You can change the
 #. * order but don't change the specifiers or add
 #. * anything.
-#: ../calendar/gui/e-day-view.c:1836 ../calendar/gui/e-day-view-top-item.c:831
-#: ../calendar/gui/e-week-view-main-item.c:222 ../calendar/gui/print.c:1979
+#: ../calendar/gui/e-day-view.c:1871 ../calendar/gui/e-day-view-top-item.c:851
+#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2071
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:2671
+#: ../calendar/gui/e-day-view.c:2709
 #, c-format
 msgid "Week %d"
 msgstr "%d. nedelja"
@@ -4309,12 +4299,12 @@ msgstr "%d. nedelja"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:790
+#: ../calendar/gui/e-day-view-time-item.c:794
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutni razmaci"
 
-#: ../calendar/gui/e-day-view-time-item.c:815
+#: ../calendar/gui/e-day-view-time-item.c:819
 msgid "Show the second time zone"
 msgstr "Prikaži drugu vremensku zonu"
 
@@ -4324,183 +4314,196 @@ msgstr "Prikaži drugu vremensku zonu"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:832
-#: ../modules/calendar/e-calendar-preferences.c:185
-#: ../modules/calendar/e-calendar-preferences.c:237
+#: ../calendar/gui/e-day-view-time-item.c:836
+#: ../modules/calendar/e-calendar-preferences.c:179
+#: ../modules/calendar/e-calendar-preferences.c:231
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ništa"
 
-#: ../calendar/gui/e-day-view-time-item.c:866
-#: ../calendar/gui/e-timezone-entry.c:322
-#: ../modules/calendar/e-calendar-preferences.c:268
+#: ../calendar/gui/e-day-view-time-item.c:870
+#: ../calendar/gui/e-timezone-entry.c:324
+#: ../modules/calendar/e-calendar-preferences.c:262
 msgid "Select..."
 msgstr "Izaberi..."
 
-#: ../calendar/gui/e-meeting-list-view.c:65
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Chair Persons"
 msgstr "Predsedavajući"
 
-#: ../calendar/gui/e-meeting-list-view.c:66
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Required Participants"
 msgstr "Obavezni učesnici"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Optional Participants"
 msgstr "Mogući učesnici"
 
-#: ../calendar/gui/e-meeting-list-view.c:68
+#: ../calendar/gui/e-meeting-list-view.c:67
 msgid "Resources"
 msgstr "Izvori"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/e-meeting-store.c:1069 ../calendar/gui/print.c:1155
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
+#: ../calendar/gui/e-meeting-store.c:1068 ../calendar/gui/print.c:1231
 msgid "Individual"
 msgstr "Pojedinac"
 
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
-#: ../calendar/gui/print.c:1156 ../widgets/table/e-table-config.ui.h:8
+#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
+#: ../calendar/gui/print.c:1232 ../e-util/e-table-config.ui.h:8
 msgid "Group"
 msgstr "Grupa"
 
-#: ../calendar/gui/e-meeting-list-view.c:184
-#: ../calendar/gui/e-meeting-store.c:118 ../calendar/gui/e-meeting-store.c:135
-#: ../calendar/gui/print.c:1157
+#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-store.c:117 ../calendar/gui/e-meeting-store.c:134
+#: ../calendar/gui/print.c:1233
 msgid "Resource"
 msgstr "Izvor"
 
-#: ../calendar/gui/e-meeting-list-view.c:185
-#: ../calendar/gui/e-meeting-store.c:120 ../calendar/gui/e-meeting-store.c:137
-#: ../calendar/gui/print.c:1158
+#: ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-meeting-store.c:119 ../calendar/gui/e-meeting-store.c:136
+#: ../calendar/gui/print.c:1234
 msgid "Room"
 msgstr "Soba"
 
-#: ../calendar/gui/e-meeting-list-view.c:196
-#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/print.c:1172
+#: ../calendar/gui/e-meeting-list-view.c:195
+#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/print.c:1248
 msgid "Chair"
 msgstr "Stolica"
 
-#: ../calendar/gui/e-meeting-list-view.c:197
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/e-meeting-store.c:1072 ../calendar/gui/print.c:1173
+#: ../calendar/gui/e-meeting-list-view.c:196
+#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
+#: ../calendar/gui/e-meeting-store.c:1071 ../calendar/gui/print.c:1249
 msgid "Required Participant"
 msgstr "Obavezan učesnik"
 
-#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:153 ../calendar/gui/e-meeting-store.c:170
-#: ../calendar/gui/print.c:1174
+#: ../calendar/gui/e-meeting-list-view.c:197
+#: ../calendar/gui/e-meeting-store.c:152 ../calendar/gui/e-meeting-store.c:169
+#: ../calendar/gui/print.c:1250
 msgid "Optional Participant"
 msgstr "Mogući učesnik"
 
-#: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:155 ../calendar/gui/e-meeting-store.c:172
-#: ../calendar/gui/print.c:1175
+#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-meeting-store.c:154 ../calendar/gui/e-meeting-store.c:171
+#: ../calendar/gui/print.c:1251
 msgid "Non-Participant"
 msgstr "Ne-učesnik"
 
-#: ../calendar/gui/e-meeting-list-view.c:221
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
-#: ../calendar/gui/e-meeting-store.c:1082
+#: ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../calendar/gui/e-meeting-store.c:1081
 msgid "Needs Action"
 msgstr "Potrebna radnja"
 
-#. The extra space is just a hack to occupy more space for Attendee
-#: ../calendar/gui/e-meeting-list-view.c:619
+#: ../calendar/gui/e-meeting-list-view.c:623
 msgid "Attendee                          "
 msgstr "Učesnik                          "
 
-#. To translators: RSVP means "please reply"
-#: ../calendar/gui/e-meeting-list-view.c:671
+#: ../calendar/gui/e-meeting-list-view.c:678
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:6
 msgid "RSVP"
 msgstr "MVOM"
 
-#: ../calendar/gui/e-meeting-store.c:211 ../calendar/gui/e-meeting-store.c:234
+#: ../calendar/gui/e-meeting-store.c:210 ../calendar/gui/e-meeting-store.c:233
 msgid "In Process"
 msgstr "U toku"
 
-#: ../calendar/gui/e-meeting-store.c:1906
+#: ../calendar/gui/e-meeting-store.c:1954
 #, c-format
 msgid "Enter password to access free/busy information on server %s as user %s"
 msgstr ""
 "Unesite lozinku da pristupite podacima „slobodan/zauzet“ na serveru „%s“ kao "
 "korisnik „%s“"
 
-#: ../calendar/gui/e-meeting-store.c:1916
+#: ../calendar/gui/e-meeting-store.c:1964
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Razlog neuspeha: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1921
-#: ../plugins/publish-calendar/publish-calendar.c:335
-#: ../smime/gui/component.c:54
+#: ../calendar/gui/e-meeting-store.c:1969
+#: ../plugins/publish-calendar/publish-calendar.c:341
+#: ../smime/gui/component.c:55
 msgid "Enter password"
 msgstr "Upišite lozinku"
 
-#: ../calendar/gui/e-meeting-time-sel.c:563
+#: ../calendar/gui/e-meeting-time-sel.c:580
 msgid "Out of Office"
 msgstr "Van kancelarije"
 
-#: ../calendar/gui/e-meeting-time-sel.c:564
+#: ../calendar/gui/e-meeting-time-sel.c:582
 msgid "No Information"
 msgstr "Nema podatka"
 
-#: ../calendar/gui/e-meeting-time-sel.c:602
+#: ../calendar/gui/e-meeting-time-sel.c:622
 msgid "O_ptions"
 msgstr "_Mogućnosti"
 
-#: ../calendar/gui/e-meeting-time-sel.c:620
+#: ../calendar/gui/e-meeting-time-sel.c:642
 msgid "Show _only working hours"
 msgstr "Prikaži _samo radne sate"
 
-#: ../calendar/gui/e-meeting-time-sel.c:632
+#: ../calendar/gui/e-meeting-time-sel.c:655
 msgid "Show _zoomed out"
 msgstr "Prikaži _umanjeno"
 
-#: ../calendar/gui/e-meeting-time-sel.c:649
+#: ../calendar/gui/e-meeting-time-sel.c:673
 msgid "_Update free/busy"
 msgstr "_Ažuriraj slobodno/zauzeto"
 
-#: ../calendar/gui/e-meeting-time-sel.c:665
+#: ../calendar/gui/e-meeting-time-sel.c:690
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:684
+#: ../calendar/gui/e-meeting-time-sel.c:710
 msgid "_Autopick"
 msgstr "_Samoizbor"
 
-#: ../calendar/gui/e-meeting-time-sel.c:700
+#: ../calendar/gui/e-meeting-time-sel.c:727
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:719
+#: ../calendar/gui/e-meeting-time-sel.c:748
 msgid "_All people and resources"
 msgstr "_Sve ljude i izvore"
 
-#: ../calendar/gui/e-meeting-time-sel.c:730
+#: ../calendar/gui/e-meeting-time-sel.c:759
 msgid "All _people and one resource"
 msgstr "Sve _ljude i jedan izvor"
 
-#: ../calendar/gui/e-meeting-time-sel.c:741
+#: ../calendar/gui/e-meeting-time-sel.c:770
 msgid "_Required people"
 msgstr "_Obavezne ljude"
 
-#: ../calendar/gui/e-meeting-time-sel.c:751
+#: ../calendar/gui/e-meeting-time-sel.c:780
 msgid "Required people and _one resource"
 msgstr "Obavezne ljude i _jedan izvor"
 
-#: ../calendar/gui/e-meeting-time-sel.c:802
+#: ../calendar/gui/e-meeting-time-sel.c:834
 msgid "_Start time:"
 msgstr "_Vreme početka:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:843
+#: ../calendar/gui/e-meeting-time-sel.c:878
 msgid "_End time:"
 msgstr "Vreme _završetka:"
 
+#: ../calendar/gui/e-meeting-time-sel.c:2786
+#, c-format
+#| msgid "Location: %s"
+msgid ""
+"Summary: %s\n"
+"Location: %s"
+msgstr ""
+"Sažetak: %s\n"
+"Mesto: %s"
+
+#: ../calendar/gui/e-meeting-time-sel.c:2788 ../calendar/gui/print.c:3497
+#, c-format
+msgid "Summary: %s"
+msgstr "Sažetak: %s"
+
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:1
 msgid "Click here to add an attendee"
 msgstr "Kliknite ovde da dodate učesnika"
@@ -4525,46 +4528,46 @@ msgstr "Zajedničko ime"
 msgid "Language"
 msgstr "Jezik"
 
-#: ../calendar/gui/e-memo-table.c:433
-#: ../modules/calendar/e-cal-shell-content.c:476
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
-#: ../modules/calendar/e-memo-shell-view-actions.c:248
+#: ../calendar/gui/e-memo-table.c:421
+#: ../modules/calendar/e-cal-shell-content.c:472
+#: ../modules/calendar/e-memo-shell-view-actions.c:232
+#: ../modules/calendar/e-memo-shell-view-actions.c:247
 #: ../modules/calendar/e-memo-shell-view.c:306
 msgid "Memos"
 msgstr "Beleške"
 
-#: ../calendar/gui/e-memo-table.c:514 ../calendar/gui/e-task-table.c:787
+#: ../calendar/gui/e-memo-table.c:502 ../calendar/gui/e-task-table.c:790
 msgid "* No Summary *"
 msgstr "* Bez sažetka *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:601 ../calendar/gui/e-task-table.c:871
+#: ../calendar/gui/e-memo-table.c:589 ../calendar/gui/e-task-table.c:874
 msgid "Start: "
 msgstr "Početak: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:620 ../calendar/gui/e-task-table.c:889
+#: ../calendar/gui/e-memo-table.c:608 ../calendar/gui/e-task-table.c:892
 msgid "Due: "
 msgstr "Rok: "
 
-#: ../calendar/gui/e-memo-table.c:739
+#: ../calendar/gui/e-memo-table.c:727
 msgid "Cut selected memos to the clipboard"
 msgstr "Seče izabrane beleške u spisak isečaka"
 
-#: ../calendar/gui/e-memo-table.c:745
+#: ../calendar/gui/e-memo-table.c:733
 msgid "Copy selected memos to the clipboard"
 msgstr "Umnožava izabrane beleške u spisak isečaka"
 
-#: ../calendar/gui/e-memo-table.c:751
+#: ../calendar/gui/e-memo-table.c:739
 msgid "Paste memos from the clipboard"
 msgstr "Ubacuje beleške iz spiska isečaka"
 
-#: ../calendar/gui/e-memo-table.c:757
-#: ../modules/calendar/e-memo-shell-view-actions.c:611
+#: ../calendar/gui/e-memo-table.c:745
+#: ../modules/calendar/e-memo-shell-view-actions.c:610
 msgid "Delete selected memos"
 msgstr "Briše izabrane beleške"
 
-#: ../calendar/gui/e-memo-table.c:763
+#: ../calendar/gui/e-memo-table.c:751
 msgid "Select all visible memos"
 msgstr "Bira sve vidljive beleške"
 
@@ -4580,44 +4583,44 @@ msgstr "Kliknite da dodate belešku"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:608
+#: ../calendar/gui/e-task-table.c:602
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:705 ../calendar/gui/print.c:2284
-#: ../calendar/importers/icalendar-importer.c:84
-#: ../calendar/importers/icalendar-importer.c:1082
+#: ../calendar/gui/e-task-table.c:708 ../calendar/gui/print.c:2389
+#: ../calendar/importers/icalendar-importer.c:79
+#: ../calendar/importers/icalendar-importer.c:1079
 #: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:437
-#: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view-actions.c:271
+#: ../modules/calendar/e-cal-shell-content.c:433
+#: ../modules/calendar/e-task-shell-view-actions.c:255
+#: ../modules/calendar/e-task-shell-view-actions.c:270
 #: ../modules/calendar/e-task-shell-view.c:461
 msgid "Tasks"
 msgstr "Zadaci"
 
-#: ../calendar/gui/e-task-table.c:1022
+#: ../calendar/gui/e-task-table.c:1025
 msgid "Cut selected tasks to the clipboard"
 msgstr "Seče izabrane zadatke u spisak isečaka"
 
-#: ../calendar/gui/e-task-table.c:1028
+#: ../calendar/gui/e-task-table.c:1031
 msgid "Copy selected tasks to the clipboard"
 msgstr "Umnožava izabrane zadatke u spisak isečaka"
 
-#: ../calendar/gui/e-task-table.c:1034
+#: ../calendar/gui/e-task-table.c:1037
 msgid "Paste tasks from the clipboard"
 msgstr "Ubacuje zadatke iz spiska isečaka"
 
-#: ../calendar/gui/e-task-table.c:1040
-#: ../modules/calendar/e-task-shell-view-actions.c:735
+#: ../calendar/gui/e-task-table.c:1043
+#: ../modules/calendar/e-task-shell-view-actions.c:734
 msgid "Delete selected tasks"
 msgstr "Briše izabrane zadatke"
 
-#: ../calendar/gui/e-task-table.c:1046
+#: ../calendar/gui/e-task-table.c:1049
 msgid "Select all visible tasks"
 msgstr "Bira sve vidljive zadatke"
 
-#: ../calendar/gui/e-timezone-entry.c:333
+#: ../calendar/gui/e-timezone-entry.c:335
 msgid "Select Timezone"
 msgstr "Izaberi vremensku zonu"
 
@@ -4626,16 +4629,16 @@ msgstr "Izaberi vremensku zonu"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:239 ../calendar/gui/print.c:1960
+#: ../calendar/gui/e-week-view-main-item.c:241 ../calendar/gui/print.c:2050
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2315
+#: ../calendar/gui/gnome-cal.c:2323
 msgid "Purging"
 msgstr "Brisanje"
 
-#: ../calendar/gui/itip-utils.c:650 ../calendar/gui/itip-utils.c:706
-#: ../calendar/gui/itip-utils.c:819
+#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
+#: ../calendar/gui/itip-utils.c:818
 msgid "An organizer must be set."
 msgstr "Organizator mora biti određen."
 
@@ -4643,23 +4646,23 @@ msgstr "Organizator mora biti određen."
 msgid "At least one attendee is necessary"
 msgstr "Najmanje jedan učesnik je neophodan"
 
-#: ../calendar/gui/itip-utils.c:906 ../calendar/gui/itip-utils.c:1067
+#: ../calendar/gui/itip-utils.c:905 ../calendar/gui/itip-utils.c:1066
 msgid "Event information"
 msgstr "Podaci o događaju"
 
-#: ../calendar/gui/itip-utils.c:909 ../calendar/gui/itip-utils.c:1070
+#: ../calendar/gui/itip-utils.c:908 ../calendar/gui/itip-utils.c:1069
 msgid "Task information"
 msgstr "Podaci o zadatku"
 
-#: ../calendar/gui/itip-utils.c:912 ../calendar/gui/itip-utils.c:1073
+#: ../calendar/gui/itip-utils.c:911 ../calendar/gui/itip-utils.c:1072
 msgid "Memo information"
 msgstr "Podaci o belešci"
 
-#: ../calendar/gui/itip-utils.c:915 ../calendar/gui/itip-utils.c:1091
+#: ../calendar/gui/itip-utils.c:914 ../calendar/gui/itip-utils.c:1090
 msgid "Free/Busy information"
 msgstr "Podaci slobodno/zauzeto"
 
-#: ../calendar/gui/itip-utils.c:918
+#: ../calendar/gui/itip-utils.c:917
 msgid "Calendar information"
 msgstr "Podaci o kalendaru"
 
@@ -4667,7 +4670,7 @@ msgstr "Podaci o kalendaru"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:955
+#: ../calendar/gui/itip-utils.c:954
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Prihvaćeno"
@@ -4676,7 +4679,7 @@ msgstr "Prihvaćeno"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Tentatively Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:962
+#: ../calendar/gui/itip-utils.c:961
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Prihvaćeno s rezervom"
@@ -4688,7 +4691,7 @@ msgstr "Prihvaćeno s rezervom"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Declined: Meeting Name".
-#: ../calendar/gui/itip-utils.c:969 ../calendar/gui/itip-utils.c:1017
+#: ../calendar/gui/itip-utils.c:968 ../calendar/gui/itip-utils.c:1016
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Odbijeno"
@@ -4697,7 +4700,7 @@ msgstr "Odbijeno"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:976
+#: ../calendar/gui/itip-utils.c:975
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegirano"
@@ -4705,7 +4708,7 @@ msgstr "Delegirano"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Updated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:989
+#: ../calendar/gui/itip-utils.c:988
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Osveženo"
@@ -4713,7 +4716,7 @@ msgstr "Osveženo"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Cancel: Meeting Name".
-#: ../calendar/gui/itip-utils.c:996
+#: ../calendar/gui/itip-utils.c:995
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Otkaži"
@@ -4721,7 +4724,7 @@ msgstr "Otkaži"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Refresh: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1003
+#: ../calendar/gui/itip-utils.c:1002
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Osveži"
@@ -4729,252 +4732,249 @@ msgstr "Osveži"
 #. Translators: This is part of the subject line of a
 #. * meeting request or update email.  The full subject
 #. * line would be: "Counter-proposal: Meeting Name".
-#: ../calendar/gui/itip-utils.c:1010
+#: ../calendar/gui/itip-utils.c:1009
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Protiv-predlog"
 
-#: ../calendar/gui/itip-utils.c:1088
+#: ../calendar/gui/itip-utils.c:1087
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Podaci slobodno/zauzeto (%s do %s)"
 
-#: ../calendar/gui/itip-utils.c:1096
+#: ../calendar/gui/itip-utils.c:1095
 msgid "iCalendar information"
 msgstr "Podaci iKalendara"
 
-#: ../calendar/gui/itip-utils.c:1123
+#: ../calendar/gui/itip-utils.c:1122
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "Ne mogu da sačuvam unos, novi događaj se sukobljava sa nekim drugim."
 
 #: ../calendar/gui/itip-utils.c:1127
-msgid "Unable to book a resource, error: "
-msgstr "Ne mogu da sačuvam unos, greška: "
+#, c-format
+#| msgid "Unable to book a resource, error: "
+msgid "Unable to book a resource, error: %s"
+msgstr "Ne mogu da sačuvam unos, greška: %s"
 
-#: ../calendar/gui/itip-utils.c:1306
+#: ../calendar/gui/itip-utils.c:1304
 msgid "You must be an attendee of the event."
 msgstr "Morate biti učesnik događaja."
 
-#: ../calendar/gui/print.c:589
+#: ../calendar/gui/print.c:657
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:589
+#: ../calendar/gui/print.c:657
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:589
+#: ../calendar/gui/print.c:657
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:589
+#: ../calendar/gui/print.c:657
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:589
+#: ../calendar/gui/print.c:657
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:658
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:658
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:658
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:658
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:590
+#: ../calendar/gui/print.c:658
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:659
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:659
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:659
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:659
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:591
+#: ../calendar/gui/print.c:659
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:660
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:660
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:660
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:660
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:592
+#: ../calendar/gui/print.c:660
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:661
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:661
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:661
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:661
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:593
+#: ../calendar/gui/print.c:661
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:662
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:662
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:662
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:662
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:594
+#: ../calendar/gui/print.c:662
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:595
+#: ../calendar/gui/print.c:663
 msgid "31st"
 msgstr "31."
 
 #. Translators: These are workday abbreviations, e.g. Su=Sunday and Th=thursday
-#: ../calendar/gui/print.c:652
+#: ../calendar/gui/print.c:721
 msgid "Su"
 msgstr "Ne"
 
-#: ../calendar/gui/print.c:652
+#: ../calendar/gui/print.c:721
 msgid "Mo"
 msgstr "Po"
 
-#: ../calendar/gui/print.c:652
+#: ../calendar/gui/print.c:721
 msgid "Tu"
 msgstr "Ut"
 
-#: ../calendar/gui/print.c:652
+#: ../calendar/gui/print.c:721
 msgid "We"
 msgstr "Sr"
 
-#: ../calendar/gui/print.c:653
+#: ../calendar/gui/print.c:722
 msgid "Th"
 msgstr "Če"
 
-#: ../calendar/gui/print.c:653
+#: ../calendar/gui/print.c:722
 msgid "Fr"
 msgstr "Pe"
 
-#: ../calendar/gui/print.c:653
+#: ../calendar/gui/print.c:722
 msgid "Sa"
 msgstr "Su"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3153
+#: ../calendar/gui/print.c:3296
 msgid " to "
 msgstr " do "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3163
+#: ../calendar/gui/print.c:3306
 msgid " (Completed "
 msgstr " (Završeno je "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3169
+#: ../calendar/gui/print.c:3312
 msgid "Completed "
 msgstr "Završeno je "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3179
+#: ../calendar/gui/print.c:3322
 msgid " (Due "
 msgstr " (Rok "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3186
+#: ../calendar/gui/print.c:3329
 msgid "Due "
 msgstr "Rok "
 
-#: ../calendar/gui/print.c:3351
-#, c-format
-msgid "Summary: %s"
-msgstr "Sažetak: %s"
-
-#: ../calendar/gui/print.c:3378
+#: ../calendar/gui/print.c:3527
 msgid "Attendees: "
 msgstr "Prisutni: "
 
-#: ../calendar/gui/print.c:3421
+#: ../calendar/gui/print.c:3571
 #, c-format
 msgid "Status: %s"
 msgstr "Stanje: %s"
 
-#: ../calendar/gui/print.c:3436
+#: ../calendar/gui/print.c:3587
 #, c-format
 msgid "Priority: %s"
 msgstr "Važnost: %s"
 
-#: ../calendar/gui/print.c:3454
+#: ../calendar/gui/print.c:3605
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Postotak završenog: %i"
 
-#: ../calendar/gui/print.c:3465
+#: ../calendar/gui/print.c:3619
 #, c-format
 msgid "URL: %s"
 msgstr "Adresa: %s"
 
-#: ../calendar/gui/print.c:3478
+#: ../calendar/gui/print.c:3633
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
-#: ../calendar/gui/print.c:3489
+#: ../calendar/gui/print.c:3644
 msgid "Contacts: "
 msgstr "Kontakti: "
 
@@ -4991,72 +4991,71 @@ msgstr "Otkazano"
 msgid "% Completed"
 msgstr "% je završeno"
 
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:37
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:38
 msgid "is greater than"
 msgstr "je veće od"
 
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:38
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:39
 msgid "is less than"
 msgstr "je manje od"
 
-#: ../calendar/importers/icalendar-importer.c:83
+#: ../calendar/importers/icalendar-importer.c:78
 msgid "Appointments and Meetings"
 msgstr "Zakazivanje i sastanci"
 
-#: ../calendar/importers/icalendar-importer.c:468
-#: ../calendar/importers/icalendar-importer.c:905
-#: ../modules/itip-formatter/itip-view.c:5564
+#: ../calendar/importers/icalendar-importer.c:463
+#: ../calendar/importers/icalendar-importer.c:902
 msgid "Opening calendar"
 msgstr "Otvaranje kalendara"
 
-#: ../calendar/importers/icalendar-importer.c:616
+#: ../calendar/importers/icalendar-importer.c:611
 msgid "iCalendar files (.ics)"
 msgstr "Datoteke iKalendara (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:617
+#: ../calendar/importers/icalendar-importer.c:612
 msgid "Evolution iCalendar importer"
 msgstr "Uvoznik iKalendara Evolucije"
 
-#: ../calendar/importers/icalendar-importer.c:707
+#: ../calendar/importers/icalendar-importer.c:704
 msgid "Reminder!"
 msgstr "Podsetnik!"
 
-#: ../calendar/importers/icalendar-importer.c:791
+#: ../calendar/importers/icalendar-importer.c:788
 msgid "vCalendar files (.vcs)"
 msgstr "Datoteke vKalendara (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:792
+#: ../calendar/importers/icalendar-importer.c:789
 msgid "Evolution vCalendar importer"
 msgstr "Uvoznik vKalendara Evolucije"
 
-#: ../calendar/importers/icalendar-importer.c:1075
+#: ../calendar/importers/icalendar-importer.c:1072
 msgid "Calendar Events"
 msgstr "Događaji kalendara"
 
-#: ../calendar/importers/icalendar-importer.c:1119
+#: ../calendar/importers/icalendar-importer.c:1116
 msgid "Evolution Calendar intelligent importer"
 msgstr "Inteligentni uvoznik kalendara Evolucije"
 
 #: ../calendar/importers/icalendar-importer.c:1187
-#: ../calendar/importers/icalendar-importer.c:1505
+#: ../calendar/importers/icalendar-importer.c:1506
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Sastanak"
 
 #: ../calendar/importers/icalendar-importer.c:1187
-#: ../calendar/importers/icalendar-importer.c:1505
+#: ../calendar/importers/icalendar-importer.c:1506
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Događaj"
 
 #: ../calendar/importers/icalendar-importer.c:1190
-#: ../calendar/importers/icalendar-importer.c:1506
+#: ../calendar/importers/icalendar-importer.c:1507
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Zadatak"
 
 #: ../calendar/importers/icalendar-importer.c:1193
-#: ../calendar/importers/icalendar-importer.c:1507
+#: ../calendar/importers/icalendar-importer.c:1508
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Beleška"
@@ -5106,9 +5105,8 @@ msgid "Classification"
 msgstr "Razvrstavanje"
 
 #. Translators: Appointment's summary
-#. Translators: Column header for a component summary
 #: ../calendar/importers/icalendar-importer.c:1245
-#: ../calendar/importers/icalendar-importer.c:1546
+#: ../calendar/importers/icalendar-importer.c:1550
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Sažetak"
@@ -5120,9 +5118,8 @@ msgid "Location"
 msgstr "Mesto"
 
 #. Translators: Appointment's start time
-#. Translators: Column header for a component start date/time
 #: ../calendar/importers/icalendar-importer.c:1259
-#: ../calendar/importers/icalendar-importer.c:1542
+#: ../calendar/importers/icalendar-importer.c:1545
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Početak"
@@ -5177,8 +5174,7 @@ msgctxt "iCalImp"
 msgid "Description"
 msgstr "Opis"
 
-#. Translators: Column header for a component type; it can be Event, Task or Memo
-#: ../calendar/importers/icalendar-importer.c:1538
+#: ../calendar/importers/icalendar-importer.c:1540
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Vrsta"
@@ -6733,164 +6729,164 @@ msgstr "Pacifik/Volis"
 msgid "Pacific/Yap"
 msgstr "Pacifik/Jap"
 
-#: ../composer/e-composer-actions.c:208
+#: ../composer/e-composer-actions.c:207
 msgid "Save as..."
 msgstr "Sačuvaj kao..."
 
-#: ../composer/e-composer-actions.c:295
-#: ../widgets/misc/e-mail-signature-editor.c:285
+#: ../composer/e-composer-actions.c:294
+#: ../e-util/e-mail-signature-editor.c:292
 msgid "_Close"
 msgstr "_Zatvori"
 
-#: ../composer/e-composer-actions.c:297
+#: ../composer/e-composer-actions.c:296
 msgid "Close the current file"
 msgstr "Zatvorite trenutnu datoteku"
 
-#: ../composer/e-composer-actions.c:302
+#: ../composer/e-composer-actions.c:301
 msgid "New _Message"
 msgstr "Nova _poruka"
 
-#: ../composer/e-composer-actions.c:304
+#: ../composer/e-composer-actions.c:303
 msgid "Open New Message window"
 msgstr "Otvara prozor za novu poruku"
 
-#: ../composer/e-composer-actions.c:311 ../shell/e-shell-window-actions.c:1495
+#: ../composer/e-composer-actions.c:310 ../shell/e-shell-window-actions.c:925
 msgid "Configure Evolution"
 msgstr "Podesi Evoluciju"
 
-#: ../composer/e-composer-actions.c:318
+#: ../composer/e-composer-actions.c:317
 msgid "Save the current file"
 msgstr "Sačuvajte trenutnu datoteku"
 
-#: ../composer/e-composer-actions.c:323
+#: ../composer/e-composer-actions.c:322
 msgid "Save _As..."
 msgstr "Sačuvaj _kao..."
 
-#: ../composer/e-composer-actions.c:325
+#: ../composer/e-composer-actions.c:324
 msgid "Save the current file with a different name"
 msgstr "Sačuvajte trenutnu datoteku pod drugim imenom"
 
-#: ../composer/e-composer-actions.c:332
+#: ../composer/e-composer-actions.c:331
 msgid "Character _Encoding"
 msgstr "Ko_dna strana"
 
-#: ../composer/e-composer-actions.c:349
+#: ../composer/e-composer-actions.c:348
 msgid "_Print..."
 msgstr "_Štampaj..."
 
-#: ../composer/e-composer-actions.c:356
+#: ../composer/e-composer-actions.c:355
 msgid "Print Pre_view"
 msgstr "Pregled pred _štampu"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:362
 msgid "Save as _Draft"
 msgstr "Sačuvaj kao _nacrt"
 
-#: ../composer/e-composer-actions.c:365
+#: ../composer/e-composer-actions.c:364
 msgid "Save as draft"
 msgstr "Sačuvajte kao nacrt"
 
-#: ../composer/e-composer-actions.c:370 ../composer/e-composer-private.c:325
+#: ../composer/e-composer-actions.c:369 ../composer/e-composer-private.c:327
 msgid "S_end"
 msgstr "Poš_alji"
 
-#: ../composer/e-composer-actions.c:372
+#: ../composer/e-composer-actions.c:371
 msgid "Send this message"
 msgstr "Pošaljite ovu poruku"
 
-#: ../composer/e-composer-actions.c:380
+#: ../composer/e-composer-actions.c:379
 msgid "PGP _Encrypt"
 msgstr "PGP _šifruj"
 
-#: ../composer/e-composer-actions.c:382
+#: ../composer/e-composer-actions.c:381
 msgid "Encrypt this message with PGP"
 msgstr "Šifrujte ovu poruku pomoću PGP-a"
 
-#: ../composer/e-composer-actions.c:388
+#: ../composer/e-composer-actions.c:387
 msgid "PGP _Sign"
 msgstr "PGP _potpiši"
 
-#: ../composer/e-composer-actions.c:390
+#: ../composer/e-composer-actions.c:389
 msgid "Sign this message with your PGP key"
 msgstr "Potpišite ovu poruku pomoću PGP ključa"
 
-#: ../composer/e-composer-actions.c:396
+#: ../composer/e-composer-actions.c:395
 msgid "_Picture Gallery"
 msgstr "Galerija _slika"
 
-#: ../composer/e-composer-actions.c:398
+#: ../composer/e-composer-actions.c:397
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Prikazuje zbirku slika koje možete da prevučete u vašu poruku"
 
-#: ../composer/e-composer-actions.c:404
+#: ../composer/e-composer-actions.c:403
 msgid "_Prioritize Message"
 msgstr "V_ažnost poruke"
 
-#: ../composer/e-composer-actions.c:406
+#: ../composer/e-composer-actions.c:405
 msgid "Set the message priority to high"
 msgstr "Postavlja važnost poruke na visoko"
 
-#: ../composer/e-composer-actions.c:412
+#: ../composer/e-composer-actions.c:411
 msgid "Re_quest Read Receipt"
 msgstr "T_raži povratnicu"
 
-#: ../composer/e-composer-actions.c:414
+#: ../composer/e-composer-actions.c:413
 msgid "Get delivery notification when your message is read"
 msgstr "Prima izveštaj o dostavi kada je poruka pročitana"
 
-#: ../composer/e-composer-actions.c:420
+#: ../composer/e-composer-actions.c:419
 msgid "S/MIME En_crypt"
 msgstr "S/MIME _šifruj"
 
-#: ../composer/e-composer-actions.c:422
+#: ../composer/e-composer-actions.c:421
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Šifruje ovu poruku pomoću S/MIME uverenja za šifrovanje"
 
-#: ../composer/e-composer-actions.c:428
+#: ../composer/e-composer-actions.c:427
 msgid "S/MIME Sig_n"
 msgstr "S/MIME _potpiši"
 
-#: ../composer/e-composer-actions.c:430
+#: ../composer/e-composer-actions.c:429
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Potpisuje ovu poruku S/MIME uverenjem"
 
-#: ../composer/e-composer-actions.c:436
+#: ../composer/e-composer-actions.c:435
 msgid "_Bcc Field"
 msgstr "_Bcc polje"
 
-#: ../composer/e-composer-actions.c:438
+#: ../composer/e-composer-actions.c:437
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Bira da li je polje Bcc prikazano"
 
-#: ../composer/e-composer-actions.c:444
+#: ../composer/e-composer-actions.c:443
 msgid "_Cc Field"
 msgstr "_Cc polje"
 
-#: ../composer/e-composer-actions.c:446
+#: ../composer/e-composer-actions.c:445
 msgid "Toggles whether the CC field is displayed"
 msgstr "Bira da li je polje CC prikazano"
 
-#: ../composer/e-composer-actions.c:452
+#: ../composer/e-composer-actions.c:451
 msgid "_Reply-To Field"
 msgstr "Polje Odgo_vor-za"
 
-#: ../composer/e-composer-actions.c:454
+#: ../composer/e-composer-actions.c:453
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Bira da li je polje Odgovor-za prikazano"
 
-#: ../composer/e-composer-actions.c:513
+#: ../composer/e-composer-actions.c:512
 msgid "Save Draft"
 msgstr "Sačuvaj nacrt"
 
-#: ../composer/e-composer-header-table.c:43
+#: ../composer/e-composer-header-table.c:41
 msgid "Enter the recipients of the message"
 msgstr "Unesite primaoce poruke"
 
-#: ../composer/e-composer-header-table.c:45
+#: ../composer/e-composer-header-table.c:43
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Unesite adrese koje će primiti grafitnu kopiju (cc) poruke"
 
-#: ../composer/e-composer-header-table.c:48
+#: ../composer/e-composer-header-table.c:46
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -6898,7 +6894,7 @@ msgstr ""
 "Unesite adrese koje će primiti grafitnu kopiju poruke bez pojavljivanja u "
 "listi primalaca poruke"
 
-#: ../composer/e-composer-header-table.c:849
+#: ../composer/e-composer-header-table.c:835
 msgid "Fr_om:"
 msgstr "Š_alje:"
 
@@ -6906,36 +6902,36 @@ msgstr "Š_alje:"
 # * Create this before we call create_from_optionmenu,
 # * because that causes from_changed to be called, which
 # * expects the reply_to fields to be initialized.
-#: ../composer/e-composer-header-table.c:856
+#: ../composer/e-composer-header-table.c:842
 msgid "_Reply-To:"
 msgstr "_Odgovor-za:"
 
-#: ../composer/e-composer-header-table.c:861
+#: ../composer/e-composer-header-table.c:847
 msgid "_To:"
 msgstr "_Prima:"
 
-#: ../composer/e-composer-header-table.c:867
+#: ../composer/e-composer-header-table.c:853
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:873
+#: ../composer/e-composer-header-table.c:859
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:878
+#: ../composer/e-composer-header-table.c:864
 msgid "_Post To:"
 msgstr "Objavi _na:"
 
-#: ../composer/e-composer-header-table.c:882
+#: ../composer/e-composer-header-table.c:868
 msgid "S_ubject:"
 msgstr "Na_slov:"
 
-#: ../composer/e-composer-header-table.c:890
-#: ../mail/e-mail-config-identity-page.c:466
+#: ../composer/e-composer-header-table.c:876
+#: ../mail/e-mail-config-identity-page.c:488
 msgid "Si_gnature:"
 msgstr "Potp_is:"
 
-#: ../composer/e-composer-name-header.c:215
+#: ../composer/e-composer-name-header.c:235
 msgid "Click here for the address book"
 msgstr "Kliknite ovde za adresar."
 
@@ -6943,11 +6939,11 @@ msgstr "Kliknite ovde za adresar."
 msgid "Click here to select folders to post to"
 msgstr "Kliknite ovde da izaberete fascikle za slanje"
 
-#: ../composer/e-composer-private.c:345
+#: ../composer/e-composer-private.c:347
 msgid "Save draft"
 msgstr "Sačuvajte nacrt"
 
-#: ../composer/e-msg-composer.c:856
+#: ../composer/e-msg-composer.c:862
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -6955,7 +6951,7 @@ msgstr ""
 "Nije moguće potpisivanje odlazeće poruke: nije postavljeno uverenje za "
 "potpisivanje za ovaj nalog"
 
-#: ../composer/e-msg-composer.c:865
+#: ../composer/e-msg-composer.c:871
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -6964,15 +6960,15 @@ msgstr ""
 "Nije moguće šifrovanje odlazeće poruke: nije postavljeno uverenje za šifrovanje "
 "za ovaj nalog"
 
-#: ../composer/e-msg-composer.c:1545 ../composer/e-msg-composer.c:1954
+#: ../composer/e-msg-composer.c:1552 ../composer/e-msg-composer.c:1961
 msgid "Compose Message"
 msgstr "Sastavi poruku"
 
-#: ../composer/e-msg-composer.c:4198
+#: ../composer/e-msg-composer.c:4215
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "Sastavljač u telu poruke ne sadrži tekst, što ne može biti izmenjeno."
 
-#: ../composer/e-msg-composer.c:4875
+#: ../composer/e-msg-composer.c:4890
 msgid "Untitled Message"
 msgstr "Neimenovana poruka"
 
@@ -7142,7 +7138,7 @@ msgstr "Obaveštenje alarma Evolucije"
 msgid "Calendar event notifications"
 msgstr "Obaveštenja o događajima kalendara"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:936
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:929
 #: ../modules/mailto-handler/evolution-mailto-handler.c:215
 #: ../shell/e-shell-window-private.c:243
 msgid "Evolution"
@@ -7151,7 +7147,7 @@ msgstr "Evolucija"
 # bug(slobo): tooltip bi mogao da bude i „Pošaljite e-poruku prijateljima i pored
 # ovako uštogljenih originala
 # msgstr "Paket poslovnih programa"
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:651
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:83
 msgid "Groupware Suite"
 msgstr "Paket grupe"
 
@@ -7163,6 +7159,10 @@ msgstr "Evolucija — pošta i kalendar"
 msgid "Manage your email, contacts and schedule"
 msgstr "Upravljajte vašom poštom, kontaktima i obavezama"
 
+#: ../data/evolution.desktop.in.in.h:5
+msgid "mail;calendar;contact;addressbook;task;"
+msgstr "pošta;kalendar;kontakt;adresar;zadatak;"
+
 #: ../data/evolution-settings.desktop.in.in.h:1
 msgid "Email Settings"
 msgstr "Postavke pošte"
@@ -9162,7 +9162,7 @@ msgid ""
 "Address book to use for storing automatically synced contacts from Pidgin."
 msgstr ""
 "Adresar koji će biti korišćen za smeštaj samostalno usaglašene kontakte sa "
-"Golupka"
+"Golupka."
 
 #: ../data/org.gnome.evolution.plugin.autocontacts.gschema.xml.in.h:9
 msgid "Pidgin check interval"
@@ -9211,7 +9211,7 @@ msgid "The default command that must be used as the editor."
 msgstr "Podrazumevana naredba koja se koristi kao uređivač."
 
 #: ../data/org.gnome.evolution.plugin.external-editor.gschema.xml.in.h:3
-#: ../plugins/external-editor/external-editor.c:125
+#: ../plugins/external-editor/external-editor.c:123
 msgid "Automatically launch when a new mail is edited"
 msgstr "Automatski pokreće pri uređivanju nove poruke"
 
@@ -9399,7 +9399,7 @@ msgstr "Polazna fascikla izbirača datoteka"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Polazna fascikla za prozorčiće izbirača datoteka."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:311
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:309
 msgid "Start in offline mode"
 msgstr "Započinje rad van mreže"
 
@@ -9499,22 +9499,13 @@ msgid "Use SpamAssassin daemon and client"
 msgstr "Koristi servis i klijenta Ubice spama"
 
 #: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
-msgid "Use SpamAssassin daemon and client (spamc/spamd)."
-msgstr "Koristi demona i klijenta Ubice spama (spamc/spamd)."
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
-msgid "SpamAssassin client binary"
-msgstr "Izvršni klijenta Ubice spama"
-
-#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:7
-msgid "SpamAssassin daemon binary"
-msgstr "Izvršni demona Ubice spama"
+msgid "Use spamc and spamd programs, if available."
+msgstr "Koristi programe spamc i spamd, ako su dostupni."
 
 #: ../em-format/e-mail-formatter-attachment.c:363
-#: ../mail/message-list.etspec.h:4 ../widgets/misc/e-attachment-bar.c:101
-#: ../widgets/misc/e-attachment-bar.c:106
-#: ../widgets/misc/e-attachment-paned.c:176
-#: ../widgets/misc/e-attachment-paned.c:181
+#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
+#: ../e-util/e-attachment-paned.c:176 ../e-util/e-attachment-paned.c:181
+#: ../mail/message-list.etspec.h:4
 msgid "Attachment"
 msgid_plural "Attachments"
 msgstr[0] "Prilog"
@@ -9522,83 +9513,83 @@ msgstr[1] "Prilozi"
 msgstr[2] "Prilozi"
 msgstr[3] "Prilog"
 
-#: ../em-format/e-mail-formatter-attachment.c:369
+#: ../em-format/e-mail-formatter-attachment.c:364
 msgid "Display as attachment"
 msgstr "Prikaži kao prilog"
 
-#: ../em-format/e-mail-formatter.c:1368 ../mail/e-mail-tag-editor.c:327
-#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:67
+#: ../em-format/e-mail-formatter.c:1389 ../mail/e-mail-tag-editor.c:326
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:61
 msgid "From"
 msgstr "Šalje"
 
-#: ../em-format/e-mail-formatter.c:1369 ../modules/mail/em-mailer-prefs.c:68
+#: ../em-format/e-mail-formatter.c:1390 ../modules/mail/em-mailer-prefs.c:62
 msgid "Reply-To"
 msgstr "Odgovor"
 
-#: ../em-format/e-mail-formatter.c:1371
+#: ../em-format/e-mail-formatter.c:1392
 #: ../em-format/e-mail-formatter-utils.c:182
-#: ../em-format/e-mail-formatter-utils.c:205
-#: ../modules/mail/em-mailer-prefs.c:70
+#: ../em-format/e-mail-formatter-utils.c:206
+#: ../modules/mail/em-mailer-prefs.c:64
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/e-mail-formatter.c:1372
+#: ../em-format/e-mail-formatter.c:1393
 #: ../em-format/e-mail-formatter-utils.c:184
-#: ../em-format/e-mail-formatter-utils.c:207
-#: ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/e-mail-formatter-utils.c:208
+#: ../modules/mail/em-mailer-prefs.c:65
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/e-mail-formatter.c:1373
-#: ../em-format/e-mail-formatter-quote-headers.c:165
-#: ../mail/e-mail-tag-editor.c:332 ../mail/em-filter-i18n.h:76
-#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:72
-#: ../smime/lib/e-cert.c:1125
+#: ../em-format/e-mail-formatter.c:1394
+#: ../em-format/e-mail-formatter-quote-headers.c:150
+#: ../mail/e-mail-tag-editor.c:331 ../mail/em-filter-i18n.h:77
+#: ../mail/message-list.etspec.h:6 ../modules/mail/em-mailer-prefs.c:66
+#: ../smime/lib/e-asn1-object.c:712
 msgid "Subject"
 msgstr "Naslov"
 
-#: ../em-format/e-mail-formatter.c:1374 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:73 ../widgets/misc/e-dateedit.c:526
-#: ../widgets/misc/e-dateedit.c:548
+#: ../em-format/e-mail-formatter.c:1395 ../e-util/e-dateedit.c:549
+#: ../e-util/e-dateedit.c:572 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:67
 msgid "Date"
 msgstr "Datum"
 
-#: ../em-format/e-mail-formatter.c:1375 ../modules/mail/em-mailer-prefs.c:74
+#: ../em-format/e-mail-formatter.c:1396 ../modules/mail/em-mailer-prefs.c:68
 msgid "Newsgroups"
 msgstr "Grupe vesti"
 
-#: ../em-format/e-mail-formatter.c:1376 ../modules/mail/em-mailer-prefs.c:75
+#: ../em-format/e-mail-formatter.c:1397 ../modules/mail/em-mailer-prefs.c:69
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "Lice"
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user@example.com"
-#: ../em-format/e-mail-formatter-headers.c:114
-#: ../plugins/mail-notification/mail-notification.c:396
+#: ../em-format/e-mail-formatter-headers.c:100
+#: ../plugins/mail-notification/mail-notification.c:395
 #, c-format
 msgid "From: %s"
 msgstr "Šalje: %s"
 
-#: ../em-format/e-mail-formatter-headers.c:134
-#: ../em-format/e-mail-formatter-headers.c:139
+#: ../em-format/e-mail-formatter-headers.c:120
+#: ../em-format/e-mail-formatter-headers.c:125
 msgid "(no subject)"
 msgstr "(bez naslova)"
 
-#: ../em-format/e-mail-formatter-headers.c:340
+#: ../em-format/e-mail-formatter-headers.c:327
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "Poruku šalje „%s“ na ime „%s“"
 
-#: ../em-format/e-mail-formatter-image.c:152
+#: ../em-format/e-mail-formatter-image.c:143
 msgid "Regular Image"
 msgstr "Obična slika"
 
-#: ../em-format/e-mail-formatter-image.c:158
+#: ../em-format/e-mail-formatter-image.c:144
 msgid "Display part as an image"
 msgstr "Prikazuje delove kao sliku"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:237
+#: ../em-format/e-mail-formatter-message-rfc822.c:242
 msgid "RFC822 message"
 msgstr "RFC822 poruka"
 
@@ -9606,97 +9597,97 @@ msgstr "RFC822 poruka"
 msgid "Format part as an RFC822 message"
 msgstr "Oblikuje deo kao RFC822 poruku"
 
-#: ../em-format/e-mail-formatter-print.c:53
+#: ../em-format/e-mail-formatter-print.c:56
+#: ../e-util/gal-define-views-dialog.c:361
+#: ../e-util/gal-view-instance-save-as-dialog.c:95
 #: ../mail/e-mail-label-tree-view.c:99
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1255
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1327
 #: ../modules/cal-config-google/e-google-chooser.c:209
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
-#: ../widgets/menus/gal-define-views-dialog.c:352
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:91
+#: ../modules/plugin-manager/evolution-plugin-manager.c:67
 msgid "Name"
 msgstr "Naziv"
 
-#: ../em-format/e-mail-formatter-print.c:53 ../mail/message-list.etspec.h:10
-#: ../widgets/misc/e-attachment-tree-view.c:574
+#: ../em-format/e-mail-formatter-print.c:56
+#: ../e-util/e-attachment-tree-view.c:574 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Veličina"
 
 #. Add encryption/signature header
-#: ../em-format/e-mail-formatter-print-headers.c:130
+#: ../em-format/e-mail-formatter-print-headers.c:120
 #: ../mail/e-mail-config-security-page.c:642
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:207
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:131
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:195
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:129
 msgid "Security"
 msgstr "Bezbednost"
 
-#: ../em-format/e-mail-formatter-print-headers.c:147
+#: ../em-format/e-mail-formatter-print-headers.c:138
 msgid "GPG signed"
 msgstr "GPG potpisano"
 
-#: ../em-format/e-mail-formatter-print-headers.c:152
+#: ../em-format/e-mail-formatter-print-headers.c:144
 msgid "GPG encrpyted"
 msgstr "GPG šifrovano"
 
-#: ../em-format/e-mail-formatter-print-headers.c:158
+#: ../em-format/e-mail-formatter-print-headers.c:150
 msgid "S/MIME signed"
 msgstr "S/MIME potpisano"
 
-#: ../em-format/e-mail-formatter-print-headers.c:164
+#: ../em-format/e-mail-formatter-print-headers.c:156
 msgid "S/MIME encrpyted"
 msgstr "S/MIME šifrovano"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:176
-#: ../em-format/e-mail-formatter-utils.c:316
-#: ../modules/mail/em-mailer-prefs.c:1121
+#: ../em-format/e-mail-formatter-quote-headers.c:161
+#: ../em-format/e-mail-formatter-utils.c:319
+#: ../modules/mail/em-mailer-prefs.c:1117
 msgid "Mailer"
 msgstr "Pošiljalac"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:102
-#: ../em-format/e-mail-formatter-text-enriched.c:115
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:88
+#: ../em-format/e-mail-formatter-text-enriched.c:102
 msgid "Richtext"
 msgstr "Bogati tekst"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:108
-#: ../em-format/e-mail-formatter-text-enriched.c:121
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:89
+#: ../em-format/e-mail-formatter-text-enriched.c:103
 msgid "Display part as enriched text"
 msgstr "Prikazuje deo kao obogaćeni tekst"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:104
-#: ../em-format/e-mail-formatter-text-html.c:340
+#: ../em-format/e-mail-formatter-quote-text-html.c:90
+#: ../em-format/e-mail-formatter-text-html.c:353
 msgid "HTML"
 msgstr "HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:110
-#: ../em-format/e-mail-formatter-text-html.c:346
+#: ../em-format/e-mail-formatter-quote-text-html.c:91
+#: ../em-format/e-mail-formatter-text-html.c:354
 msgid "Format part as HTML"
 msgstr "Oblikuje deo kao HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:123
-#: ../em-format/e-mail-formatter-text-plain.c:182
+#: ../em-format/e-mail-formatter-quote-text-plain.c:110
+#: ../em-format/e-mail-formatter-text-plain.c:186
 msgid "Plain Text"
 msgstr "Običan tekst"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:129
-#: ../em-format/e-mail-formatter-text-plain.c:188
+#: ../em-format/e-mail-formatter-quote-text-plain.c:111
+#: ../em-format/e-mail-formatter-text-plain.c:187
 msgid "Format part as plain text"
 msgstr "Oblikuje deo kao običan tekst"
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:52
 msgid "Unsigned"
 msgstr "Nepotpisano"
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:52
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Ova poruka nije potpisana. Nije sigurno da je ova poruka verodostojna."
 
-#: ../em-format/e-mail-formatter-secure-button.c:66
+#: ../em-format/e-mail-formatter-secure-button.c:53
 msgid "Valid signature"
 msgstr "Ispravan potpis"
 
-#: ../em-format/e-mail-formatter-secure-button.c:66
+#: ../em-format/e-mail-formatter-secure-button.c:53
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -9704,22 +9695,22 @@ msgstr ""
 "Ova poruka je potpisana i ispravna što znači da je pošiljalac poruke vrlo "
 "verovatno verodostojan."
 
-#: ../em-format/e-mail-formatter-secure-button.c:67
+#: ../em-format/e-mail-formatter-secure-button.c:54
 msgid "Invalid signature"
 msgstr "Neispravan potpis"
 
-#: ../em-format/e-mail-formatter-secure-button.c:67
+#: ../em-format/e-mail-formatter-secure-button.c:54
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 "Potpis ove poruke nije mogao biti proveren, možda je izmenjena u prenosu."
 
-#: ../em-format/e-mail-formatter-secure-button.c:68
+#: ../em-format/e-mail-formatter-secure-button.c:55
 msgid "Valid signature, but cannot verify sender"
 msgstr "Ispravan potpis, ali ne mogu da proverim pošiljaoca"
 
-#: ../em-format/e-mail-formatter-secure-button.c:68
+#: ../em-format/e-mail-formatter-secure-button.c:55
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -9727,21 +9718,21 @@ msgstr ""
 "Ova poruka je potpisana ispravnim potpisom, ali pošiljalac poruke ne može "
 "biti proveren."
 
-#: ../em-format/e-mail-formatter-secure-button.c:69
+#: ../em-format/e-mail-formatter-secure-button.c:56
 msgid "Signature exists, but need public key"
 msgstr "Potpis postoji, ali traži javni ključ"
 
-#: ../em-format/e-mail-formatter-secure-button.c:69
+#: ../em-format/e-mail-formatter-secure-button.c:56
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "Ova poruka je potpisana, ali nema odgovarajućeg javnog ključa."
 
-#: ../em-format/e-mail-formatter-secure-button.c:76
+#: ../em-format/e-mail-formatter-secure-button.c:63
 msgid "Unencrypted"
 msgstr "Nešifrovano"
 
-#: ../em-format/e-mail-formatter-secure-button.c:76
+#: ../em-format/e-mail-formatter-secure-button.c:63
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -9749,11 +9740,11 @@ msgstr ""
 "Ova poruka nije šifrovana. Njen sadržaj je moguće videti u prenosu preko "
 "Interneta."
 
-#: ../em-format/e-mail-formatter-secure-button.c:77
+#: ../em-format/e-mail-formatter-secure-button.c:64
 msgid "Encrypted, weak"
 msgstr "Šifrovano, slabo"
 
-#: ../em-format/e-mail-formatter-secure-button.c:77
+#: ../em-format/e-mail-formatter-secure-button.c:64
 msgid ""
 "This message is encrypted, but with a weak encryption algorithm. It would be "
 "difficult, but not impossible for an outsider to view the content of this "
@@ -9762,22 +9753,22 @@ msgstr ""
 "Ova poruka je šifrovana, ali slabim algoritmom. Teško je, ali ne i nemoguće "
 "da neko sa strane u dogledno vreme vidi sadržaj ove poruke."
 
-#: ../em-format/e-mail-formatter-secure-button.c:78
+#: ../em-format/e-mail-formatter-secure-button.c:65
 msgid "Encrypted"
 msgstr "Šifrovano"
 
-#: ../em-format/e-mail-formatter-secure-button.c:78
+#: ../em-format/e-mail-formatter-secure-button.c:65
 msgid ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 msgstr ""
 "Ova poruka je šifrovana.  Teško će neko sa strane videti sadržaj ove poruke."
 
-#: ../em-format/e-mail-formatter-secure-button.c:79
+#: ../em-format/e-mail-formatter-secure-button.c:66
 msgid "Encrypted, strong"
 msgstr "Šifrovano, jako"
 
-#: ../em-format/e-mail-formatter-secure-button.c:79
+#: ../em-format/e-mail-formatter-secure-button.c:66
 msgid ""
 "This message is encrypted, with a strong encryption algorithm. It would be "
 "very difficult for an outsider to view the content of this message in a "
@@ -9786,131 +9777,872 @@ msgstr ""
 "Ova poruka je šifrovana, jakim algoritmom. Veoma je teško da neko sa strane "
 "u dogledno vreme vidi sadržaj ove poruke."
 
-#: ../em-format/e-mail-formatter-secure-button.c:190
-#: ../smime/gui/smime-ui.ui.h:43
+#: ../em-format/e-mail-formatter-secure-button.c:180
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "_View Certificate"
 msgstr "Pregledaj _uverenje"
 
-#: ../em-format/e-mail-formatter-secure-button.c:205
+#: ../em-format/e-mail-formatter-secure-button.c:195
 msgid "This certificate is not viewable"
 msgstr "Ovo uverenje nije čitljivo"
 
-#: ../em-format/e-mail-formatter-source.c:139
+#: ../em-format/e-mail-formatter-source.c:126
 msgid "Source"
 msgstr "Izvor"
 
-#: ../em-format/e-mail-formatter-source.c:145
+#: ../em-format/e-mail-formatter-source.c:127
 msgid "Display source of a MIME part"
 msgstr "Prikazuje izvoe kao MIME deo"
 
-#: ../em-format/e-mail-parser-application-mbox.c:108
+#: ../em-format/e-mail-parser-application-mbox.c:88
 #, c-format
 msgid "Error parsing MBOX part: %s"
 msgstr "Greška obrade MBOKS dela: %s"
 
-#: ../em-format/e-mail-parser-application-smime.c:104
+#: ../em-format/e-mail-parser-application-smime.c:84
 #, c-format
 msgid "Could not parse S/MIME message: %s"
 msgstr "Ne mogu da obradim S/MIME poruku: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:91
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:80
 #, c-format
 msgid "Could not parse PGP message: %s"
 msgstr "Ne mogu da obradim PGP poruku: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:93
-#: ../em-format/e-mail-parser-multipart-signed.c:144
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:83
+#: ../em-format/e-mail-parser-multipart-signed.c:128
 #, c-format
 msgid "Error verifying signature: %s"
 msgstr "Greška provere potpisa: %s"
 
-#: ../em-format/e-mail-parser-message-external.c:86
+#: ../em-format/e-mail-parser-message-external.c:69
 msgid "Malformed external-body part"
 msgstr "Loše složen spoljni deo poruke"
 
-#: ../em-format/e-mail-parser-message-external.c:118
+#: ../em-format/e-mail-parser-message-external.c:101
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pokazivač na FTP stranicu (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:129
+#: ../em-format/e-mail-parser-message-external.c:112
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pokazivač na lokalnu datoteku (%s) koja odgovara stranici „%s“"
 
-#: ../em-format/e-mail-parser-message-external.c:131
+#: ../em-format/e-mail-parser-message-external.c:114
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pokazivač na lokalnu datoteku (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:150
+#: ../em-format/e-mail-parser-message-external.c:133
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pokazivač na udaljeni podatak (%s)"
 
-#: ../em-format/e-mail-parser-message-external.c:167
+#: ../em-format/e-mail-parser-message-external.c:150
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pokazivač na nepoznati spoljni podatak (tipa „%s“)"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:81
-#: ../em-format/e-mail-parser-multipart-signed.c:95
+#: ../em-format/e-mail-parser-multipart-encrypted.c:67
+#: ../em-format/e-mail-parser-multipart-signed.c:81
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Ne mogu da obradim MIME poruku. Prikazivanje izvora."
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:99
+#: ../em-format/e-mail-parser-multipart-encrypted.c:83
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Nepodržani tip šifre za višedelni/šifrovan (multipart/encrypted)"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:119
+#: ../em-format/e-mail-parser-multipart-encrypted.c:102
 #, c-format
 msgid "Could not parse PGP/MIME message: %s"
 msgstr "Ne mogu da obradim PGP/MIME poruku: %s"
 
-#: ../em-format/e-mail-parser-multipart-signed.c:129
+#: ../em-format/e-mail-parser-multipart-signed.c:114
 msgid "Unsupported signature format"
 msgstr "Nepodržan oblik potpisa"
 
-#: ../em-format/e-mail-part-utils.c:493
+#: ../em-format/e-mail-part-utils.c:500
 #, c-format
 msgid "%s attachment"
 msgstr "%s prilog"
 
+#: ../e-util/e-send-options.ui.h:3
+msgid "Standard"
+msgstr "Obično"
+
+#: ../e-util/e-send-options.ui.h:6
+msgid "Proprietary"
+msgstr "Vlasničko"
+
+#: ../e-util/e-send-options.ui.h:8
+msgid "Secret"
+msgstr "Tajno"
+
+#: ../e-util/e-send-options.ui.h:9
+msgid "Top Secret"
+msgstr "Strogo poverljivo"
+
+#: ../e-util/e-send-options.ui.h:10
+msgid "For Your Eyes Only"
+msgstr "Samo za vaše oči"
+
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# When "None" is selected we want the field to be cleared.
+# Note that we don't show this here, since by default a 'None' date
+# is not permitted.
+#. Translators: Used in send options dialog
+#: ../e-util/e-send-options.ui.h:12
+msgctxt "send-options"
+msgid "None"
+msgstr "Ništa"
+
+#: ../e-util/e-send-options.ui.h:13
+msgid "Mail Receipt"
+msgstr "Priznanica pošte"
+
+#: ../e-util/e-send-options.ui.h:15
+msgid "R_eply requested"
+msgstr "Zahtevan je o_dgovor"
+
+#: ../e-util/e-send-options.ui.h:16
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "Un_utar"
+
+#: ../e-util/e-send-options.ui.h:17
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "dana"
+
+#: ../e-util/e-send-options.ui.h:18
+msgid "_When convenient"
+msgstr "Kada je z_godno"
+
+#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:840
+msgid "Replies"
+msgstr "Odgovori"
+
+#: ../e-util/e-send-options.ui.h:20
+msgid "_Delay message delivery"
+msgstr "_Odloži isporuku poruke"
+
+#: ../e-util/e-send-options.ui.h:21
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_Posle"
+
+#: ../e-util/e-send-options.ui.h:22
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "dana"
+
+#: ../e-util/e-send-options.ui.h:23
+msgid "_Set expiration date"
+msgstr "Postavi _rok"
+
+#: ../e-util/e-send-options.ui.h:24
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_Do"
+
+#: ../e-util/e-send-options.ui.h:25
+msgid "Delivery Options"
+msgstr "Opcije isporuke"
+
+#: ../e-util/e-send-options.ui.h:27
+msgid "_Classification:"
+msgstr "_Klasifikacija:"
+
+#: ../e-util/e-send-options.ui.h:28
+msgid "Gene_ral Options"
+msgstr "Opš_te opcije"
+
+#: ../e-util/e-send-options.ui.h:29
+msgid "Creat_e a sent item to track information"
+msgstr "Na_pravi poslatu stavku za praćenje podatka"
+
+#: ../e-util/e-send-options.ui.h:30
+msgid "_Delivered"
+msgstr "_Isporučeno"
+
+#: ../e-util/e-send-options.ui.h:31
+msgid "Deli_vered and opened"
+msgstr "Ispo_ručeno i otvoreno"
+
+#: ../e-util/e-send-options.ui.h:32
+msgid "_All information"
+msgstr "_Svi podaci"
+
+#: ../e-util/e-send-options.ui.h:33
+msgid "A_uto-delete sent item"
+msgstr "A_utomatski obriši poslatu stavku"
+
+#: ../e-util/e-send-options.ui.h:34
+msgid "Status Tracking"
+msgstr "Praćenje statusa"
+
+#: ../e-util/e-send-options.ui.h:35
+msgid "_When opened:"
+msgstr "Kada je o_tvoreno:"
+
+#: ../e-util/e-send-options.ui.h:36
+msgid "When decli_ned:"
+msgstr "Kada je _odbijeno:"
+
+#: ../e-util/e-send-options.ui.h:37
+msgid "When co_mpleted:"
+msgstr "Kad je _završeno:"
+
+#: ../e-util/e-send-options.ui.h:38
+msgid "When acce_pted:"
+msgstr "Kada je _prihvaćeno:"
+
+#: ../e-util/e-send-options.ui.h:39
+msgid "Return Notification"
+msgstr "Povratno obaveštenje"
+
+#: ../e-util/e-send-options.ui.h:40
+msgid "Sta_tus Tracking"
+msgstr "Praćenje sta_tusa"
+
+#: ../e-util/e-table-config.ui.h:1 ../e-util/e-table-config.c:670
+msgid "Show Fields"
+msgstr "Prikaži polja"
+
+#: ../e-util/e-table-config.ui.h:2
+msgid "A_vailable Fields:"
+msgstr "Do_stupna polja:"
+
+#: ../e-util/e-table-config.ui.h:3
+msgid "_Show these fields in order:"
+msgstr "_Prikaži ova polja po redu:"
+
+#: ../e-util/e-table-config.ui.h:4
+msgid "Move _Up"
+msgstr "Premesti na _gore"
+
+#: ../e-util/e-table-config.ui.h:5
+msgid "Move _Down"
+msgstr "Pomeri na _dole"
+
+#: ../e-util/e-table-config.ui.h:7 ../e-util/e-name-selector-dialog.c:970
+msgid "_Remove"
+msgstr "_Ukloni"
+
+#: ../e-util/e-table-config.ui.h:9
+msgid "_Show field in View"
+msgstr "_Prikaži polje u pregledu"
+
+#: ../e-util/e-table-config.ui.h:10 ../e-util/e-table-header-item.c:1751
+msgid "Ascending"
+msgstr "Rastuće"
+
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1751
+msgid "Descending"
+msgstr "Opadajuće"
+
+#: ../e-util/e-table-config.ui.h:12
+msgid "Group Items By"
+msgstr "Grupiši stavke po"
+
+#: ../e-util/e-table-config.ui.h:13
+msgid "Show _field in View"
+msgstr "Prikaži _polje u pregledu"
+
+#: ../e-util/e-table-config.ui.h:14
+msgid "Then By"
+msgstr "Onda po"
+
+#: ../e-util/e-table-config.ui.h:15
+msgid "Show field i_n View"
+msgstr "Prikaži polje _u pregledu"
+
+#: ../e-util/e-table-config.ui.h:16
+msgid "Show field in _View"
+msgstr "Prikaži polje u p_regledu"
+
+#: ../e-util/e-table-config.ui.h:17
+msgid "Clear _All"
+msgstr "Očisti _sve"
+
+#: ../e-util/e-table-config.ui.h:18
+msgid "Sort"
+msgstr "Razvrstaj"
+
+#: ../e-util/e-table-config.ui.h:19
+msgid "Sort Items By"
+msgstr "Razvrstaj stavke po"
+
+#: ../e-util/e-table-config.ui.h:20
+msgid "Clear All"
+msgstr "Očisti sve"
+
+#: ../e-util/e-table-config.ui.h:21
+msgid "_Sort..."
+msgstr "_Razvrstaj..."
+
+#: ../e-util/e-table-config.ui.h:22
+msgid "_Group By..."
+msgstr "_Grupiši po..."
+
+#: ../e-util/e-table-config.ui.h:23
+msgid "_Fields Shown..."
+msgstr "Prikazana _polja..."
+
+#: ../e-util/e-timezone-dialog.ui.h:1
+msgid "Select a Time Zone"
+msgstr "Izaberite vremensku zonu"
+
+#: ../e-util/e-timezone-dialog.ui.h:2
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
+msgstr ""
+"Koristite levi taster miša da uvećate mapu i izaberete vremensku zonu.\n"
+"Koristite desni taster miša za umanjivanje."
+
+#: ../e-util/e-timezone-dialog.ui.h:4
+msgid "Time Zones"
+msgstr "Vremenske zone"
+
+#: ../e-util/e-timezone-dialog.ui.h:5
+msgid "_Selection"
+msgstr "_Izbor"
+
+#: ../e-util/e-timezone-dialog.ui.h:6
+msgid "Timezone drop-down combination box"
+msgstr "Prozorče za podešavanje vremenske zone"
+
+#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1239
+#: ../mail/em-utils.c:293
+msgid "Incoming"
+msgstr "Dolazno"
+
+#: ../e-util/filter.ui.h:2
+msgid "the current time"
+msgstr "trenutno vreme"
+
+#: ../e-util/filter.ui.h:3
+msgid "the time you specify"
+msgstr "vreme koje odredite"
+
+#: ../e-util/filter.ui.h:4
+msgid "a time relative to the current time"
+msgstr "vreme u odnosu na trenutno vreme"
+
+# bug: plural-forms
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:78
+msgid "seconds"
+msgstr "sekunde"
+
+#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
+msgid "weeks"
+msgstr "nedelje"
+
+#: ../e-util/filter.ui.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+msgid "months"
+msgstr "meseci"
+
+#: ../e-util/filter.ui.h:11
+msgid "years"
+msgstr "godine"
+
+#: ../e-util/filter.ui.h:12
+msgid "ago"
+msgstr "pre"
+
+#: ../e-util/filter.ui.h:13
+msgid "in the future"
+msgstr "u budućnosti"
+
+#: ../e-util/filter.ui.h:14
+msgid "Show filters for mail:"
+msgstr "Prikaži propusnike pošte:"
+
+#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:166
+msgid "_Filter Rules"
+msgstr "Pr_avila filtera"
+
+#: ../e-util/filter.ui.h:17
+msgid "Compare against"
+msgstr "Uporedi sa"
+
+#: ../e-util/filter.ui.h:18
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Datum poruke će biti upoređen sa\n"
+"trenutnim vremenom kada se filtriranje desilo."
+
+#: ../e-util/filter.ui.h:20
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Datum poruke će biti upoređen sa\n"
+"00:00 navedenog datuma."
+
+#: ../e-util/filter.ui.h:22
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Datum poruke će biti upoređen sa\n"
+"vremenom kada se filtriranje desilo."
+
+#: ../e-util/gal-define-views.ui.h:2
+#, no-c-format
+msgid "Define Views for \"%s\""
+msgstr "Odredi preglede za „%s“"
+
+#: ../e-util/gal-define-views.ui.h:4 ../e-util/gal-define-views-dialog.c:375
+#, no-c-format
+msgid "Define Views for %s"
+msgstr "Odredi preglede za %s"
+
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
+msgid "_Create new view"
+msgstr "_Napravi novi pregled"
+
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
+#: ../e-util/e-mail-signature-script-dialog.c:417
+#: ../mail/e-mail-config-identity-page.c:311
+#: ../mail/e-mail-config-summary-page.c:341
+msgid "_Name:"
+msgstr "_Ime:"
+
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
+msgid "_Replace existing view"
+msgstr "_Zameni postojeći pregled"
+
+#: ../e-util/gal-view-new-dialog.ui.h:1
+msgid "Name of new view:"
+msgstr "Naziv novog pregleda:"
+
+#: ../e-util/gal-view-new-dialog.ui.h:2
+msgid "Type of view:"
+msgstr "Vrsta pregleda:"
+
+#: ../e-util/gal-view-new-dialog.ui.h:3
+msgid "Type of View"
+msgstr "Vrsta pregleda"
+
+#: ../e-util/e-activity-proxy.c:313
+#: ../modules/mail/e-mail-shell-view-actions.c:1484
+msgid "Cancel"
+msgstr "Otkaži"
+
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:248
+#: ../e-util/e-activity.c:247
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (otkazano)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:251
+#: ../e-util/e-activity.c:250
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (završeno)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:254
+#: ../e-util/e-activity.c:253
 #, c-format
 msgid "%s (waiting)"
 msgstr "%s (čekam)"
 
 #. Translators: This is a running activity which
 #. *              the user has requested to cancel.
-#: ../e-util/e-activity.c:258
+#: ../e-util/e-activity.c:257
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (otkazujem)"
 
-#: ../e-util/e-activity.c:260
+#: ../e-util/e-activity.c:259
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:265
+#: ../e-util/e-activity.c:264
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% završeno)"
 
+#: ../e-util/e-alert-bar.c:120
+msgid "Close this message"
+msgstr "Zatvorite ovu poruku"
+
+#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:703
+msgid "Icon View"
+msgstr "Pregled ikonicama"
+
+#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:705
+msgid "List View"
+msgstr "Pregled spiskom"
+
+#: ../e-util/e-attachment-dialog.c:311
+msgid "Attachment Properties"
+msgstr "Osobine priloga"
+
+#: ../e-util/e-attachment-dialog.c:333 ../e-util/e-import-assistant.c:273
+msgid "F_ilename:"
+msgstr "_Naziv datoteke:"
+
+#: ../e-util/e-attachment-dialog.c:368
+msgid "MIME Type:"
+msgstr "MIME vrsta:"
+
+#: ../e-util/e-attachment-dialog.c:376 ../e-util/e-attachment-store.c:441
+msgid "_Suggest automatic display of attachment"
+msgstr "_Predloži automatski prikaz priloga"
+
+#: ../e-util/e-attachment-handler-image.c:97
+msgid "Could not set as background"
+msgstr "Ne mogu da postavim kao pozadinu"
+
+#: ../e-util/e-attachment-handler-image.c:147
+msgid "Set as _Background"
+msgstr "Postavi kao _pozadinu"
+
+#: ../e-util/e-attachment-handler-sendto.c:93
+msgid "Could not send attachment"
+msgid_plural "Could not send attachments"
+msgstr[0] "Ne mogu da pošaljem prilog"
+msgstr[1] "Ne mogu da pošaljem priloge"
+msgstr[2] "Ne mogu da pošaljem priloge"
+msgstr[3] "Ne mogu da pošaljem prilog"
+
+#: ../e-util/e-attachment-handler-sendto.c:135
+msgid "_Send To..."
+msgstr "_Pošalji za..."
+
+#: ../e-util/e-attachment-handler-sendto.c:137
+msgid "Send the selected attachments somewhere"
+msgstr "Pošaljite izabrane priloge negde"
+
+#: ../e-util/e-attachment-icon-view.c:166
+#: ../e-util/e-attachment-tree-view.c:549
+msgid "Loading"
+msgstr "Učitavam"
+
+#: ../e-util/e-attachment-icon-view.c:178
+#: ../e-util/e-attachment-tree-view.c:561
+msgid "Saving"
+msgstr "Čuvam"
+
+#: ../e-util/e-attachment-paned.c:104
+msgid "Hide Attachment _Bar"
+msgstr "Sakrij liniju pri_loga"
+
+#: ../e-util/e-attachment-paned.c:106 ../e-util/e-attachment-paned.c:719
+msgid "Show Attachment _Bar"
+msgstr "Prikaži liniju p_riloga"
+
+#: ../e-util/e-attachment-store.c:429
+msgid "Add Attachment"
+msgstr "Dodaj prilog"
+
+#: ../e-util/e-attachment-store.c:432
+msgid "A_ttach"
+msgstr "Pri_loži"
+
+#: ../e-util/e-attachment-store.c:495
+msgid "Save Attachment"
+msgid_plural "Save Attachments"
+msgstr[0] "Sačuvaj prilog"
+msgstr[1] "Sačuvaj priloge"
+msgstr[2] "Sačuvaj priloge"
+msgstr[3] "Sačuvaj prilog"
+
+#. Translators: Default attachment filename.
+#: ../e-util/e-attachment-store.c:524 ../e-util/e-attachment.c:1841
+#: ../e-util/e-attachment.c:2446
+msgid "attachment.dat"
+msgstr "attachment.dat"
+
+#: ../e-util/e-attachment-view.c:378
+msgid "Open With Other Application..."
+msgstr "Otvori drugim programom..."
+
+#: ../e-util/e-attachment-view.c:385
+msgid "S_ave All"
+msgstr "Sač_uvaj sve"
+
+#: ../e-util/e-attachment-view.c:411
+msgid "A_dd Attachment..."
+msgstr "Do_daj prilog..."
+
+#: ../e-util/e-attachment-view.c:435
+msgid "_Hide"
+msgstr "_Sakrij"
+
+#: ../e-util/e-attachment-view.c:442
+msgid "Hid_e All"
+msgstr "Sak_rij sve"
+
+#: ../e-util/e-attachment-view.c:449
+msgid "_View Inline"
+msgstr "Pre_gledaj unutar"
+
+#: ../e-util/e-attachment-view.c:456
+msgid "Vie_w All Inline"
+msgstr "Pre_gledaj sve unutar"
+
+#: ../e-util/e-attachment-view.c:777
+#, c-format
+msgid "Open With \"%s\""
+msgstr "Otvori programom „%s“"
+
+#: ../e-util/e-attachment-view.c:780
+#, c-format
+msgid "Open this attachment in %s"
+msgstr "Otvori ovaj prilog u „%s“"
+
+#. To Translators: This text is set as a description of an attached
+#. * message when, for example, attaching it to a composer. When the
+#. * message to be attached has also filled Subject, then this text is
+#. * of form "Attached message - Subject", otherwise it's left as is.
+#: ../e-util/e-attachment.c:978
+msgid "Attached message"
+msgstr "Priložena poruka"
+
+#: ../e-util/e-attachment.c:1886 ../e-util/e-attachment.c:2748
+msgid "A load operation is already in progress"
+msgstr "Operacija učitavanja je već u toku"
+
+#: ../e-util/e-attachment.c:1894 ../e-util/e-attachment.c:2756
+msgid "A save operation is already in progress"
+msgstr "Operacija čuvanja je već u toku"
+
+#: ../e-util/e-attachment.c:2002
+#, c-format
+msgid "Could not load '%s'"
+msgstr "Ne mogu da učitam „%s“"
+
+#: ../e-util/e-attachment.c:2005
+#, c-format
+msgid "Could not load the attachment"
+msgstr "Ne mogu da učitam prilog"
+
+#: ../e-util/e-attachment.c:2303
+#, c-format
+msgid "Could not open '%s'"
+msgstr "Ne mogu da otvorim „%s“"
+
+#: ../e-util/e-attachment.c:2306
+#, c-format
+msgid "Could not open the attachment"
+msgstr "Ne mogu da otvorim prilog"
+
+#: ../e-util/e-attachment.c:2764
+msgid "Attachment contents not loaded"
+msgstr "Sadržaj priloga nije učitan"
+
+# * found, so just bail completely.
+#: ../e-util/e-attachment.c:2840
+#, c-format
+msgid "Could not save '%s'"
+msgstr "Ne mogu da sačuvam „%s“"
+
+#: ../e-util/e-attachment.c:2843
+#, c-format
+msgid "Could not save the attachment"
+msgstr "Ne mogu da sačuvam prilog"
+
+#: ../e-util/e-book-source-config.c:98
+msgid "Mark as default address book"
+msgstr "Označava kao podrazumevan adresar"
+
+#: ../e-util/e-book-source-config.c:103
+msgid "Autocomplete with this address book"
+msgstr "Sam dopunjava ovim adresarom"
+
+#: ../e-util/e-book-source-config.c:277
+msgid "Copy book content locally for offline operation"
+msgstr "Umnožava sadržaj knjige lokalno za rad van mreže"
+
+#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
+#: ../e-util/e-buffer-tagger.c:410
+msgid "Ctrl-click to open a link"
+msgstr "Pritisnite taster Ktrl i kliknite da otvorite vezu"
+
+#: ../e-util/e-cal-source-config.c:170
+msgid "Mark as default calendar"
+msgstr "Označava kao osnovni kalendar"
+
+#: ../e-util/e-cal-source-config.c:173
+msgid "Mark as default task list"
+msgstr "Označava kao osnovni spisak zadataka"
+
+#: ../e-util/e-cal-source-config.c:176
+msgid "Mark as default memo list"
+msgstr "Označava kao osnovni spisak beleški"
+
+#: ../e-util/e-cal-source-config.c:201
+msgid "Color:"
+msgstr "Boja:"
+
+#: ../e-util/e-cal-source-config.c:406
+msgid "Copy calendar contents locally for offline operation"
+msgstr "Umnožava sadržaj kalendara lokalno za rad van mreže"
+
+#: ../e-util/e-cal-source-config.c:410
+msgid "Copy task list contents locally for offline operation"
+msgstr "Umnožava sadržaj spiska zadataka lokalno za rad van mreže"
+
+#: ../e-util/e-cal-source-config.c:414
+msgid "Copy memo list contents locally for offline operation"
+msgstr "Umnožava sadržaj spiska beleški lokalno za rad van mreže"
+
+#. This is a strftime() format. %B = Month name.
+#: ../e-util/e-calendar-item.c:1324 ../e-util/e-calendar-item.c:2186
+msgctxt "CalItem"
+msgid "%B"
+msgstr "%B"
+
+#. This is a strftime() format. %Y = Year.
+#: ../e-util/e-calendar-item.c:1326
+msgctxt "CalItem"
+msgid "%Y"
+msgstr "%Y"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../e-util/e-calendar-item.c:1363
+msgctxt "CalItem"
+msgid "%B %Y"
+msgstr "%B %Y."
+
+#: ../e-util/e-calendar.c:190
+msgid "Previous month"
+msgstr "Prethodni mesec"
+
+#: ../e-util/e-calendar.c:215
+msgid "Next month"
+msgstr "Sledeći mesec"
+
+#: ../e-util/e-calendar.c:241
+msgid "Previous year"
+msgstr "Prethodna godina"
+
+#: ../e-util/e-calendar.c:266
+msgid "Next year"
+msgstr "Sledeća godina"
+
+#: ../e-util/e-calendar.c:290
+msgid "Month Calendar"
+msgstr "Mesečni kalendar"
+
+#: ../e-util/e-categories-editor.c:224
+msgid "Currently _used categories:"
+msgstr "Trenutno _korišćene kategorije:"
+
+#: ../e-util/e-categories-editor.c:235
+#| msgid "Available Cate_gories"
+msgid "_Available Categories:"
+msgstr "_Dostupne kategorije:"
+
+#: ../e-util/e-categories-selector.c:323
+#| msgid "Icon View"
+msgid "Icon"
+msgstr "Ikonica"
+
+#: ../e-util/e-category-completion.c:300
+#, c-format
+msgid "Create category \"%s\""
+msgstr "Izrada kategorije „%s“"
+
+#: ../e-util/e-category-editor.c:137
+#| msgid "Category"
+msgid "Category Icon"
+msgstr "Ikonica kategorije"
+
+#: ../e-util/e-category-editor.c:141
+#| msgid "_No image"
+msgid "_No Image"
+msgstr "_Bez slike"
+
+#: ../e-util/e-category-editor.c:178
+#| msgid "Category"
+msgid "Category _Name"
+msgstr "_Naziv kategorije"
+
+#: ../e-util/e-category-editor.c:190
+#| msgid "Category"
+msgid "Category _Icon"
+msgstr "_Ikonica kategorije"
+
+#: ../e-util/e-category-editor.c:216
+#| msgid "Calendar Properties"
+msgid "Category Properties"
+msgstr "Osobine kategorije"
+
+#: ../e-util/e-category-editor.c:277
+#, 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"
+
+#: ../e-util/e-cell-combo.c:186
+msgid "popup list"
+msgstr "iskačuća lista"
+
+#: ../e-util/e-cell-date-edit.c:299
+msgid "Now"
+msgstr "Sada"
+
+#. strftime format of a weekday and a date.
+#: ../e-util/e-cell-date-edit.c:307 ../e-util/e-datetime-format.c:209
+#: ../modules/calendar/e-cal-shell-view-actions.c:1926
+#: ../modules/itip-formatter/itip-view.c:228
+msgid "Today"
+msgstr "Danas"
+
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# When "None" is selected we want the field to be cleared.
+# Note that we don't show this here, since by default a 'None' date
+# is not permitted.
+#. Translators: "None" as a label of a button to unset date in a
+#. * date table cell.
+#: ../e-util/e-cell-date-edit.c:317
+msgctxt "table-date"
+msgid "None"
+msgstr "Ništa"
+
+#: ../e-util/e-cell-date-edit.c:325
+msgid "OK"
+msgstr "U redu"
+
+#: ../e-util/e-cell-date-edit.c:873
+#, c-format
+msgid "The time must be in the format: %s"
+msgstr "Vreme mora biti u formatu: %s"
+
+#: ../e-util/e-cell-date.c:51 ../mail/message-list.c:1882
+msgid "?"
+msgstr "?"
+
+#: ../e-util/e-cell-percent.c:80
+msgid "The percent value must be between 0 and 100, inclusive"
+msgstr "Vrednost procenta mora biti između 0 i 100"
+
+#: ../e-util/e-charset-combo-box.c:100
+msgid "Character Encoding"
+msgstr "Kodna strana"
+
+#: ../e-util/e-charset-combo-box.c:123
+msgid "Enter the character set to use"
+msgstr "Izaberite kodnu stranu za korišćenje"
+
+#: ../e-util/e-charset-combo-box.c:342
+msgid "Other..."
+msgstr "Drugo..."
+
 #: ../e-util/e-charset.c:53
 msgid "Arabic"
 msgstr "Arapski"
@@ -9988,27 +10720,80 @@ msgstr "Ukrajinski"
 msgid "Visual"
 msgstr "Vizuelni"
 
-#. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:206
-#: ../modules/calendar/e-cal-shell-view-actions.c:1927
-#: ../modules/itip-formatter/itip-view.c:235
-#: ../widgets/table/e-cell-date-edit.c:307
-msgid "Today"
-msgstr "Danas"
+#: ../e-util/e-dateedit.c:523
+msgid "Date and Time"
+msgstr "Datum i vreme"
+
+#: ../e-util/e-dateedit.c:548
+msgid "Text entry to input date"
+msgstr "Deo teksta za unos datuma"
+
+#: ../e-util/e-dateedit.c:571
+msgid "Click this button to show a calendar"
+msgstr "Pritisnite na ovo dugme da prikažete kalendar"
+
+#: ../e-util/e-dateedit.c:625
+msgid "Drop-down combination box to select time"
+msgstr "Prozorče za izbor vremena"
+
+# note(slobo): možda treba rok
+#: ../e-util/e-dateedit.c:626
+#: ../modules/calendar/e-calendar-preferences.ui.h:16
+msgid "Time"
+msgstr "Vreme"
+
+#: ../e-util/e-dateedit.c:700
+msgid "No_w"
+msgstr "_Sada"
+
+#: ../e-util/e-dateedit.c:707
+msgid "_Today"
+msgstr "_Danas"
+
+# add a "None" option to the stores menu
+# Put the "None" and "UTC" entries at the top of the combo's list.
+# When "None" is selected we want the field to be cleared.
+# Note that we don't show this here, since by default a 'None' date
+# is not permitted.
+#. Note that we don't show this here, since by default a 'None' date
+#. * is not permitted.
+#: ../e-util/e-dateedit.c:716
+msgid "_None"
+msgstr "_Ništa"
+
+# 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 date field of a date edit, shown when
+#. * there is no date set.
+#: ../e-util/e-dateedit.c:1811 ../e-util/e-dateedit.c:2059
+msgctxt "date"
+msgid "None"
+msgstr "Ništa"
+
+#: ../e-util/e-dateedit.c:1951
+msgid "Invalid Date Value"
+msgstr "Neispravan datum"
+
+#: ../e-util/e-dateedit.c:1996
+msgid "Invalid Time Value"
+msgstr "Neispravno vreme"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:217 ../modules/itip-formatter/itip-view.c:263
+#: ../e-util/e-datetime-format.c:220 ../modules/itip-formatter/itip-view.c:256
 msgid "Tomorrow"
 msgstr "Sutra"
 
-#: ../e-util/e-datetime-format.c:219
+#: ../e-util/e-datetime-format.c:222
 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.
-#: ../e-util/e-datetime-format.c:227
+#: ../e-util/e-datetime-format.c:230
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "Sledećeg %a"
@@ -10016,7 +10801,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.
-#: ../e-util/e-datetime-format.c:233
+#: ../e-util/e-datetime-format.c:236
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "Sledećeg %a"
@@ -10024,7 +10809,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.
-#: ../e-util/e-datetime-format.c:239
+#: ../e-util/e-datetime-format.c:242
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "Sledeće %a"
@@ -10032,7 +10817,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.
-#: ../e-util/e-datetime-format.c:245
+#: ../e-util/e-datetime-format.c:248
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "Sledećeg %a"
@@ -10040,7 +10825,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.
-#: ../e-util/e-datetime-format.c:251
+#: ../e-util/e-datetime-format.c:254
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "Sledećeg %a"
@@ -10048,7 +10833,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.
-#: ../e-util/e-datetime-format.c:257
+#: ../e-util/e-datetime-format.c:260
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "Sledeće %a"
@@ -10056,17 +10841,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.
-#: ../e-util/e-datetime-format.c:263
+#: ../e-util/e-datetime-format.c:266
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Sledeće %a"
 
-#: ../e-util/e-datetime-format.c:350 ../e-util/e-datetime-format.c:360
-#: ../e-util/e-datetime-format.c:369
+#: ../e-util/e-datetime-format.c:353 ../e-util/e-datetime-format.c:363
+#: ../e-util/e-datetime-format.c:372
 msgid "Use locale default"
 msgstr "Koristi podrazumevani lokalitet"
 
-#: ../e-util/e-datetime-format.c:574
+#: ../e-util/e-datetime-format.c:577
 msgid "Format:"
 msgstr "Oblik:"
 
@@ -10087,77 +10872,9 @@ msgstr "Upisujem „%s“"
 msgid "Writing \"%s\" to %s"
 msgstr "Upisujem „%s“ u %s"
 
-#: ../e-util/e-print.c:161
-msgid "An error occurred while printing"
-msgstr "Došlo je do greške za vreme štampanja"
-
-#: ../e-util/e-print.c:168
-msgid "The printing system reported the following details about the error:"
-msgstr "Sistem za štampanje je izvestio sledeće detalje o grešci:"
-
-#: ../e-util/e-print.c:174
-msgid ""
-"The printing system did not report any additional details about the error."
-msgstr "Sistem za štampanje nije ponudio nikakve dodatne detalje o grešci."
-
-#: ../e-util/e-system.error.xml.h:1
-msgid "A file named \"{0}\" already exists. Do you want to replace it?"
-msgstr "Datoteka pod nazivom „{0}“ već postoji. Da li želite da je zamenite?"
-
-#: ../e-util/e-system.error.xml.h:2
-msgid ""
-"The file already exists in \"{0}\". Replacing it will overwrite its contents."
-msgstr ""
-"Već postoji datoteka u „{0}“. Ukoliko je zamenite prepisaćete njen sadržaj."
-
-#: ../e-util/e-system.error.xml.h:3
-msgid "_Replace"
-msgstr "_Zameni"
-
-#: ../e-util/e-system.error.xml.h:4
-msgid "Cannot save file \"{0}\"."
-msgstr "Ne mogu da sačuvam datoteku „{0}“."
-
-# mail-composer:no-sig-file secondary
-# mail:no-create-tmp-path secondary
-# mail:no-delete-folder secondary
-# system:no-save-file secondary
-# system:no-load-file secondary
-#: ../e-util/e-system.error.xml.h:5
-msgid "Because \"{1}\"."
-msgstr "Zbog „{1}“."
-
-#: ../e-util/e-system.error.xml.h:6
-msgid "Cannot open file \"{0}\"."
-msgstr "Ne mogu da otvorim datoteku „{0}“."
-
-#: ../e-util/e-system.error.xml.h:7
-msgid "Failed to remove data source &quot;{0}&quot;."
-msgstr "Nisam uspeo da uklonim izvor podataka „{0}“."
-
-#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:61
-msgid "The reported error was &quot;{1}&quot;."
-msgstr "Prijavljena greška bejaše „{1}“."
-
-#: ../e-util/e-system.error.xml.h:9
-msgid "Failed to update data source &quot;{0}&quot;."
-msgstr "Nisam uspeo da osvežim izvor podataka „{0}“."
-
-#: ../e-util/e-system.error.xml.h:10
-msgid "Failed to delete resource &quot;{0}&quot;."
-msgstr "Nisam uspeo da obrišem resurs „{0}“."
-
-#: ../e-util/e-util.c:243
-msgid "Could not open the link."
-msgstr "Ne mogu da otvorim vezu."
-
-#: ../e-util/e-util.c:290
-msgid "Could not display help for Evolution."
-msgstr "Ne mogu da prikažem pomoć za Evoluciju."
-
 #. Don't delete this code, since it is needed so that xgettext can extract the translations.
 #. * Please, keep these strings in sync with the strings in the timespans array
-#: ../filter/e-filter-datespec.c:69
+#: ../e-util/e-filter-datespec.c:67
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -10166,7 +10883,7 @@ msgstr[1] "pre %d sekunde"
 msgstr[2] "pre %d sekundi"
 msgstr[3] "pre %d sekunde"
 
-#: ../filter/e-filter-datespec.c:70
+#: ../e-util/e-filter-datespec.c:68
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
@@ -10175,7 +10892,7 @@ msgstr[1] "%d sekunde u budućnosti"
 msgstr[2] "%d sekundi u budućnosti"
 msgstr[3] "%d sekunda u budućnosti"
 
-#: ../filter/e-filter-datespec.c:71
+#: ../e-util/e-filter-datespec.c:69
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -10184,7 +10901,7 @@ msgstr[1] "pre %d minuta"
 msgstr[2] "pre %d minuta"
 msgstr[3] "pre %d minut"
 
-#: ../filter/e-filter-datespec.c:72
+#: ../e-util/e-filter-datespec.c:70
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
@@ -10193,7 +10910,7 @@ msgstr[1] "%d minuta u budućnosti"
 msgstr[2] "%d minuta u budućnosti"
 msgstr[3] "%d minut u budućnosti"
 
-#: ../filter/e-filter-datespec.c:73
+#: ../e-util/e-filter-datespec.c:71
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -10202,7 +10919,7 @@ msgstr[1] "pre %d sata"
 msgstr[2] "pre %d sati"
 msgstr[3] "pre %d sat"
 
-#: ../filter/e-filter-datespec.c:74
+#: ../e-util/e-filter-datespec.c:72
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
@@ -10211,7 +10928,7 @@ msgstr[1] "%d sata u budućnosti"
 msgstr[2] "%d sati u budućnosti"
 msgstr[3] "%d sat u budućnosti"
 
-#: ../filter/e-filter-datespec.c:75
+#: ../e-util/e-filter-datespec.c:73
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -10220,7 +10937,7 @@ msgstr[1] "pre %d dana"
 msgstr[2] "pre %d dana"
 msgstr[3] "pre %d dan"
 
-#: ../filter/e-filter-datespec.c:76
+#: ../e-util/e-filter-datespec.c:74
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
@@ -10229,7 +10946,7 @@ msgstr[1] "%d dana u budućnosti"
 msgstr[2] "%d dana u budućnosti"
 msgstr[3] "%d dan u budućnosti"
 
-#: ../filter/e-filter-datespec.c:77
+#: ../e-util/e-filter-datespec.c:75
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -10238,7 +10955,7 @@ msgstr[1] "pre %d nedelje"
 msgstr[2] "pre %d nedelja"
 msgstr[3] "pre %d nedelju"
 
-#: ../filter/e-filter-datespec.c:78
+#: ../e-util/e-filter-datespec.c:76
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
@@ -10247,7 +10964,7 @@ msgstr[1] "%d nedelje u budućnosti"
 msgstr[2] "%d nedelja u budućnosti"
 msgstr[3] "%d nedelja u budućnosti"
 
-#: ../filter/e-filter-datespec.c:79
+#: ../e-util/e-filter-datespec.c:77
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -10256,7 +10973,7 @@ msgstr[1] "pre %d meseca"
 msgstr[2] "pre %d meseci"
 msgstr[3] "pre %d mesec"
 
-#: ../filter/e-filter-datespec.c:80
+#: ../e-util/e-filter-datespec.c:78
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
@@ -10265,7 +10982,7 @@ msgstr[1] "%d meseca u budućnosti"
 msgstr[2] "%d meseci u budućnost"
 msgstr[3] "%d mesec u budućnosti"
 
-#: ../filter/e-filter-datespec.c:81
+#: ../e-util/e-filter-datespec.c:79
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
@@ -10274,7 +10991,7 @@ msgstr[1] "pre %d godine"
 msgstr[2] "pre %d godina"
 msgstr[3] "pre %d godinu"
 
-#: ../filter/e-filter-datespec.c:82
+#: ../e-util/e-filter-datespec.c:80
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
@@ -10283,45 +11000,45 @@ msgstr[1] "%d godine u budućnosti"
 msgstr[2] "%d godina u budućnosti"
 msgstr[3] "%d godina u budućnosti"
 
-#: ../filter/e-filter-datespec.c:132
+#: ../e-util/e-filter-datespec.c:130
 msgid "<click here to select a date>"
 msgstr "<kliknite ovde da izaberete datum>"
 
-#: ../filter/e-filter-datespec.c:135 ../filter/e-filter-datespec.c:146
-#: ../filter/e-filter-datespec.c:157
+#: ../e-util/e-filter-datespec.c:133 ../e-util/e-filter-datespec.c:144
+#: ../e-util/e-filter-datespec.c:155
 msgid "now"
 msgstr "sada"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../filter/e-filter-datespec.c:142
+#: ../e-util/e-filter-datespec.c:140
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y."
 
-#: ../filter/e-filter-datespec.c:289
+#: ../e-util/e-filter-datespec.c:289
 msgid "Select a time to compare against"
 msgstr "Izaberite vreme za poređenje"
 
-#: ../filter/e-filter-file.c:188
+#: ../e-util/e-filter-file.c:187
 msgid "Choose a File"
 msgstr "Izaberite datoteku"
 
-#: ../filter/e-filter-rule.c:741
+#: ../e-util/e-filter-rule.c:743
 msgid "R_ule name:"
 msgstr "Naziv _pravila:"
 
-#: ../filter/e-filter-rule.c:791
+#: ../e-util/e-filter-rule.c:793
 msgid "all the following conditions"
 msgstr "svim sledećim uslovima"
 
-#: ../filter/e-filter-rule.c:792
+#: ../e-util/e-filter-rule.c:794
 msgid "any of the following conditions"
 msgstr "bilo kom od sledećih uslova"
 
-#: ../filter/e-filter-rule.c:798
+#: ../e-util/e-filter-rule.c:800
 msgid "_Find items which match:"
 msgstr "_Pronađi stavke koje odgovaraju:"
 
-#: ../filter/e-filter-rule.c:820
+#: ../e-util/e-filter-rule.c:823
 msgid "Find items that meet the following conditions"
 msgstr "Pronađite stavke koje zadovoljavaju sledeće uslove"
 
@@ -10334,190 +11051,905 @@ msgstr "Pronađite stavke koje zadovoljavaju sledeće uslove"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../filter/e-filter-rule.c:835 ../libemail-engine/camel-null-store.c:28
+#: ../e-util/e-filter-rule.c:838 ../e-util/e-mail-signature-combo-box.c:369
+#: ../libemail-engine/camel-null-store.c:28
 #: ../mail/e-mail-config-summary-page.c:139
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
-#: ../widgets/misc/e-mail-signature-combo-box.c:369
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
 msgid "None"
 msgstr "Ništa"
 
-#: ../filter/e-filter-rule.c:836
+#: ../e-util/e-filter-rule.c:839
 msgid "All related"
 msgstr "Sve povezano"
 
-#: ../filter/e-filter-rule.c:837 ../widgets/misc/e-send-options.ui.h:19
-msgid "Replies"
-msgstr "Odgovori"
-
-#: ../filter/e-filter-rule.c:838
+#: ../e-util/e-filter-rule.c:841
 msgid "Replies and parents"
 msgstr "Odgovori i nadređeno"
 
-#: ../filter/e-filter-rule.c:839
+#: ../e-util/e-filter-rule.c:842
 msgid "No reply or parent"
 msgstr "Nema odgovora ili roditelja"
 
-#: ../filter/e-filter-rule.c:842
+#: ../e-util/e-filter-rule.c:845
 msgid "I_nclude threads:"
 msgstr "Uključi _niti:"
 
-#: ../filter/e-filter-rule.c:919
+#: ../e-util/e-filter-rule.c:922
 msgid "A_dd Condition"
 msgstr "Dodaj _uslov"
 
-#: ../filter/e-filter-rule.c:1236 ../filter/filter.ui.h:1
-#: ../mail/em-utils.c:302
-msgid "Incoming"
-msgstr "Dolazno"
-
-#: ../filter/e-filter-rule.c:1236 ../mail/em-utils.c:303
+#: ../e-util/e-filter-rule.c:1239 ../mail/em-utils.c:294
 msgid "Outgoing"
 msgstr "Odlazno"
 
-#: ../filter/e-rule-editor.c:273
+#: ../e-util/e-import-assistant.c:256
+msgid ""
+"Choose the file that you want to import into Evolution, and select what type "
+"of file it is from the list."
+msgstr ""
+"Izaberite datoteku koju želite da uvezete u Evoluciju i iz liste izaberite "
+"kojeg je tipa ta datoteka."
+
+#: ../e-util/e-import-assistant.c:283
+msgid "Select a file"
+msgstr "Izaberite datoteku"
+
+#: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
+msgid "File _type:"
+msgstr "_Vrsta datoteke:"
+
+#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:921
+msgid "Choose the destination for this import"
+msgstr "Izaberite odredište za ovaj uvoz"
+
+#: ../e-util/e-import-assistant.c:365
+msgid "Choose the type of importer to run:"
+msgstr "Izaberite tip uvoznika:"
+
+#: ../e-util/e-import-assistant.c:373
+msgid "Import data and settings from _older programs"
+msgstr "Uvezi podatke i podešavanja iz _starijih programa"
+
+#: ../e-util/e-import-assistant.c:381
+msgid "Import a _single file"
+msgstr "Uvezi _jednu datoteku"
+
+#: ../e-util/e-import-assistant.c:403
+#: ../modules/startup-wizard/e-mail-config-import-page.c:202
+msgid "Please select the information that you would like to import:"
+msgstr "Izaberite podatke koje želite da uvezete:"
+
+#: ../e-util/e-import-assistant.c:533
+msgid ""
+"Evolution checked for settings to import from the following applications: "
+"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
+"like to try again, please click the \"Back\" button."
+msgstr ""
+"Evolucija je proverila podešavanja za uvoz sledećih programa: Pine, Netskejp, "
+"Elm, iKalendar. Nema podešavanja za uvoženje. Ukoliko želite da pokušate "
+"ponovo, kliknite na dugme „Nazad“."
+
+#: ../e-util/e-import-assistant.c:559
+#: ../modules/startup-wizard/e-mail-config-import-page.c:231
+#, c-format
+msgid "From %s:"
+msgstr "Od %s:"
+
+#. Install a custom "Cancel Import" button.
+#: ../e-util/e-import-assistant.c:775
+msgid "_Cancel Import"
+msgstr "_Otkaži uvoženje"
+
+#: ../e-util/e-import-assistant.c:920
+msgid "Preview data to be imported"
+msgstr "Pregledaj podatke koji se uvoze"
+
+#: ../e-util/e-import-assistant.c:926 ../e-util/e-import-assistant.c:939
+#: ../e-util/e-import-assistant.c:1292 ../e-util/e-import-assistant.c:1368
+#: ../e-util/e-import-assistant.c:1377
+msgid "Import Data"
+msgstr "Uvezi podatke"
+
+#: ../e-util/e-import-assistant.c:934
+msgid "Select what type of file you want to import from the list."
+msgstr "Izaberite sa spiska koje vrste datoteka želite da uvezete."
+
+#: ../e-util/e-import-assistant.c:1282 ../e-util/e-import-assistant.c:1317
+msgid "Evolution Import Assistant"
+msgstr "Pomoćnik Evolucije za uvoz"
+
+#: ../e-util/e-import-assistant.c:1299 ../e-util/e-import-assistant.c:1355
+msgid "Import Location"
+msgstr "Uvezi lokaciju"
+
+#: ../e-util/e-import-assistant.c:1310
+msgid ""
+"Welcome to the Evolution Import Assistant.\n"
+"With this assistant you will be guided through the process of importing "
+"external files into Evolution."
+msgstr ""
+"Dobro došli u Pomoćnika Evolucije za uvoz.\n"
+"Ovaj pomoćnik će vas provesti kroz postupak uvoza spoljnih datoteka u "
+"Evoluciju."
+
+#: ../e-util/e-import-assistant.c:1327
+msgid "Importer Type"
+msgstr "Vrsta uvoznika"
+
+#: ../e-util/e-import-assistant.c:1337
+msgid "Select Information to Import"
+msgstr "Izaberite informaciju za uvoz"
+
+#: ../e-util/e-import-assistant.c:1346
+msgid "Select a File"
+msgstr "Izaberite datoteku"
+
+#: ../e-util/e-import-assistant.c:1363
+msgid "Click \"Apply\" to begin importing the file into Evolution."
+msgstr "Kliknite na „Primeni“ da započnete uvoz datoteke u Evoluciju."
+
+#: ../e-util/e-mail-signature-combo-box.c:378
+msgid "Autogenerated"
+msgstr "Automatski sastavljeno"
+
+#: ../e-util/e-mail-signature-editor.c:294
+msgid "Close"
+msgstr "Zatvori"
+
+#: ../e-util/e-mail-signature-editor.c:299
+msgid "_Save and Close"
+msgstr "_Sačuvaj i zatvori"
+
+#: ../e-util/e-mail-signature-editor.c:513
+msgid "Edit Signature"
+msgstr "Uredi potpis"
+
+#: ../e-util/e-mail-signature-editor.c:533
+msgid "_Signature Name:"
+msgstr "Naziv _potpisa:"
+
+#: ../e-util/e-mail-signature-editor.c:579
+msgid "Unnamed"
+msgstr "Bez imena"
+
+#: ../e-util/e-mail-signature-manager.c:337
+msgid "Add _Script"
+msgstr "Dodaj sk_riptu"
+
+#: ../e-util/e-mail-signature-manager.c:422
+msgid "Add Signature Script"
+msgstr "Dodaj skriptu za potpis"
+
+#: ../e-util/e-mail-signature-manager.c:492
+msgid "Edit Signature Script"
+msgstr "Uredi skriptu potpisa"
+
+#: ../e-util/e-mail-signature-script-dialog.c:395
+msgid ""
+"The output of this script will be used as your\n"
+"signature. The name you specify will be used\n"
+"for display purposes only."
+msgstr ""
+"Izlaz ove skripte će biti korišćen kao\n"
+"potpis. Naziv koji ste dali će biti korišćen\n"
+"samo za prikaz."
+
+#: ../e-util/e-mail-signature-script-dialog.c:446
+msgid "S_cript:"
+msgstr "S_kripta:"
+
+#: ../e-util/e-mail-signature-script-dialog.c:477
+msgid "Script file must be executable."
+msgstr "Datoteka skripte mora biti izvršna."
+
+#: ../e-util/e-map.c:886
+msgid "World Map"
+msgstr "Karta sveta"
+
+#: ../e-util/e-map.c:889
+msgid ""
+"Mouse-based interactive map widget for selecting timezone. Keyboard users "
+"should instead select the timezone from the drop-down combination box below."
+msgstr ""
+"Alat za izbor vremenske zone pomoću miša. Tastaturom se izbor vremenske zone "
+"vrši iz donjeg okvira."
+
+#: ../e-util/e-misc-utils.c:244
+msgid "Could not open the link."
+msgstr "Ne mogu da otvorim vezu."
+
+#: ../e-util/e-misc-utils.c:291
+msgid "Could not display help for Evolution."
+msgstr "Ne mogu da prikažem pomoć za Evoluciju."
+
+#: ../e-util/e-name-selector-dialog.c:280
+#| msgid "Contacts"
+msgid "Show Contacts"
+msgstr "Prikaži kontakte"
+
+#: ../e-util/e-name-selector-dialog.c:312
+#| msgid "Address Book"
+msgid "Address B_ook:"
+msgstr "_Adresar:"
+
+#: ../e-util/e-name-selector-dialog.c:319
+#| msgid "Category"
+msgid "Cat_egory:"
+msgstr "_Kategorija:"
+
+#: ../e-util/e-name-selector-dialog.c:343
+#| msgid "_Search"
+msgid "_Search:"
+msgstr "_Potraži:"
+
+#: ../e-util/e-name-selector-dialog.c:369
+#: ../e-util/e-name-selector-dialog.c:1245
+#: ../modules/addressbook/e-book-shell-view-actions.c:1028
+#: ../modules/calendar/e-cal-shell-view-actions.c:1759
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:959
+msgid "Any Category"
+msgstr "Bilo koja kategorija"
+
+#: ../e-util/e-name-selector-dialog.c:371
+#| msgid "Contacts"
+msgid "Co_ntacts"
+msgstr "Ko_ntakti"
+
+#: ../e-util/e-name-selector-dialog.c:448
+#| msgid "_Search"
+msgid "Search"
+msgstr "Potraži"
+
+#: ../e-util/e-name-selector-dialog.c:451
+#: ../mail/importers/pine-importer.c:429
+msgid "Address Book"
+msgstr "Adresar"
+
+#: ../e-util/e-name-selector-dialog.c:454
+#: ../modules/addressbook/e-book-shell-backend.c:299
+#: ../modules/addressbook/e-book-shell-view.c:356
+msgid "Contacts"
+msgstr "Kontakti"
+
+#: ../e-util/e-name-selector-dialog.c:576
+#| msgid "Select Address Book"
+msgid "Select Contacts from Address Book"
+msgstr "Izaberite kontakte iz adresara"
+
+#: ../e-util/e-name-selector-dialog.c:1160
+#, c-format
+#| msgid "Error loading task list"
+msgid "Error loading address book: %s"
+msgstr "Greška učitavanja adresara: %s"
+
+#. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
+#: ../e-util/e-name-selector-entry.c:3007
+#, c-format
+#| msgid "E_xpand All"
+msgid "E_xpand %s Inline"
+msgstr "_Raširi %s unutar"
+
+#. Copy Contact Item
+#: ../e-util/e-name-selector-entry.c:3023
+#, c-format
+msgid "Cop_y %s"
+msgstr "_Umnoži %s"
+
+#. Cut Contact Item
+#: ../e-util/e-name-selector-entry.c:3034
+#, c-format
+msgid "C_ut %s"
+msgstr "_Iseci %s"
+
+#. Edit Contact item
+#: ../e-util/e-name-selector-entry.c:3052
+#, c-format
+#| msgid "_Edit"
+msgid "_Edit %s"
+msgstr "_Uredi %s"
+
+#: ../e-util/e-name-selector-list.c:583
+#, c-format
+#| msgid "_Delete"
+msgid "_Delete %s"
+msgstr "_Obriši %s"
+
+#: ../e-util/e-online-button.c:31
+msgid "Evolution is currently online.  Click this button to work offline."
+msgstr ""
+"Evolucija je trenutno na mreži.  Kliknite na ovo dugme za rad van mreže."
+
+#: ../e-util/e-online-button.c:34
+msgid "Evolution is currently offline.  Click this button to work online."
+msgstr ""
+"Evolucija trenutno nije na mreži.  Kliknite na ovo dugme da se povežete."
+
+#: ../e-util/e-online-button.c:37
+msgid "Evolution is currently offline because the network is unavailable."
+msgstr "Evolucija trenutno nije na mreži jer mreža nije dostupna."
+
+#: ../e-util/e-passwords.c:127
+msgid "Keyring key is unusable: no user or host name"
+msgstr "Ključ priveska nije upotrebljiv: nema korisnika niti domaćina"
+
+#: ../e-util/e-passwords.c:447
+msgid "You have the Caps Lock key on."
+msgstr "Uključili ste velika slova."
+
+#: ../e-util/e-passwords.c:578
+#| msgid "_Remember password"
+msgid "_Remember this passphrase"
+msgstr "_Zapamti ovu lozinku"
+
+#: ../e-util/e-passwords.c:579
+msgid "_Remember this passphrase for the remainder of this session"
+msgstr "_Zapamti ovu lozinku do kraja ove sesije"
+
+#: ../e-util/e-passwords.c:584
+#| msgid "_Remember password"
+msgid "_Remember this password"
+msgstr "_Zapamti ovu lozinku"
+
+#: ../e-util/e-passwords.c:585
+msgid "_Remember this password for the remainder of this session"
+msgstr "_Zapamti ovu lozinku do kraja ove sesije"
+
+#: ../e-util/e-preferences-window.c:318
+msgid "Evolution Preferences"
+msgstr "Podešavanja Evolucije"
+
+#: ../e-util/e-print.c:161
+msgid "An error occurred while printing"
+msgstr "Došlo je do greške za vreme štampanja"
+
+#: ../e-util/e-print.c:168
+msgid "The printing system reported the following details about the error:"
+msgstr "Sistem za štampanje je izvestio sledeće detalje o grešci:"
+
+#: ../e-util/e-print.c:174
+msgid ""
+"The printing system did not report any additional details about the error."
+msgstr "Sistem za štampanje nije ponudio nikakve dodatne detalje o grešci."
+
+#: ../e-util/e-rule-editor.c:288
 msgid "Add Rule"
 msgstr "Dodaj pravilo"
 
-#: ../filter/e-rule-editor.c:366
+#: ../e-util/e-rule-editor.c:395
 msgid "Edit Rule"
 msgstr "Uredi pravilo"
 
-#: ../filter/filter.error.xml.h:1
+# bug: plural-forms if put as "%d matches"
+#: ../e-util/e-search-bar.c:79
+#, c-format
+msgid "Matches: %u"
+msgstr "Poklapanja: %u"
+
+#: ../e-util/e-search-bar.c:527
+msgid "Close the find bar"
+msgstr "Zatvori traku pretrage"
+
+#: ../e-util/e-search-bar.c:535
+msgid "Fin_d:"
+msgstr "Pro_nađi:"
+
+#: ../e-util/e-search-bar.c:547
+msgid "Clear the search"
+msgstr "Očisti pretragu"
+
+#: ../e-util/e-search-bar.c:571
+msgid "_Previous"
+msgstr "_Prethodno"
+
+#: ../e-util/e-search-bar.c:577
+msgid "Find the previous occurrence of the phrase"
+msgstr "Nađi prethodno pojavljivanje izraza"
+
+#: ../e-util/e-search-bar.c:590
+msgid "_Next"
+msgstr "_Sledeće"
+
+#: ../e-util/e-search-bar.c:596
+msgid "Find the next occurrence of the phrase"
+msgstr "Nađi sledeće pojavljivanje izraza"
+
+#: ../e-util/e-search-bar.c:609
+msgid "Mat_ch case"
+msgstr "_Uporedi veličinu slova"
+
+#: ../e-util/e-search-bar.c:637
+msgid "Reached bottom of page, continued from top"
+msgstr "Stigao sam do dna stranice, nastavljam sa vrha"
+
+#: ../e-util/e-search-bar.c:659
+msgid "Reached top of page, continued from bottom"
+msgstr "Stigao sam do vrha stranice, nastavljam sa dna"
+
+# 48x48/emblems/emblem-mail.icon.in.h:1
+#: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:331
+#: ../mail/importers/pine-importer.c:422
+#: ../modules/mail/e-mail-shell-view.c:1045
+msgid "Mail"
+msgstr "Pošta"
+
+#: ../e-util/e-send-options.c:570
+msgid "When de_leted:"
+msgstr "Kada je obri_sano:"
+
+#: ../e-util/e-source-config.c:679 ../e-util/e-source-config.c:683
+msgid "Type:"
+msgstr "Vrsta:"
+
+#: ../e-util/e-source-config.c:691 ../e-util/e-source-config.c:695
+msgid "Name:"
+msgstr "Ime:"
+
+#. Translators: This is the first of a sequence of widgets:
+#. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
+#: ../e-util/e-source-config.c:1293
+msgid "Refresh every"
+msgstr "Osveži na svakih"
+
+#: ../e-util/e-source-config.c:1323 ../e-util/e-source-config.c:1392
+msgid "Use a secure connection"
+msgstr "Koristi bezbednu vezu"
+
+#: ../e-util/e-source-config.c:1416
+#| msgid "Ignore invalid SSL certificate"
+msgid "Unset _trust for SSL certificate"
+msgstr "Odznači _poverenje za SSL uverenje"
+
+#: ../e-util/e-source-config.c:1450
+msgid "User"
+msgstr "Korisnik"
+
+#: ../e-util/e-source-selector-dialog.c:229
+#| msgid "_Destination folder:"
+msgid "_Destination"
+msgstr "_Odredište"
+
+#: ../e-util/e-source-selector-dialog.c:342
+#| msgid "Select destination file"
+msgid "Select destination"
+msgstr "Izaberite odredište"
+
+#. no suggestions. Put something in the menu anyway...
+#: ../e-util/e-spell-entry.c:352
+msgid "(no suggestions)"
+msgstr "(nema predloga)"
+
+#: ../e-util/e-spell-entry.c:376
+msgid "More..."
+msgstr "Dalje..."
+
+#. + Add to Dictionary
+#: ../e-util/e-spell-entry.c:445
+#, c-format
+msgid "Add \"%s\" to Dictionary"
+msgstr "Dodaj „%s“ u rečnik"
+
+#. - Ignore All
+#: ../e-util/e-spell-entry.c:488
+msgid "Ignore All"
+msgstr "Zanemari sve"
+
+#: ../e-util/e-spell-entry.c:514
+msgid "Spelling Suggestions"
+msgstr "Predlozi pravopisa"
+
+#: ../e-util/e-system.error.xml.h:1
+msgid "A file named \"{0}\" already exists. Do you want to replace it?"
+msgstr "Datoteka pod nazivom „{0}“ već postoji. Da li želite da je zamenite?"
+
+#: ../e-util/e-system.error.xml.h:2
+msgid ""
+"The file already exists in \"{0}\". Replacing it will overwrite its contents."
+msgstr ""
+"Već postoji datoteka u „{0}“. Ukoliko je zamenite prepisaćete njen sadržaj."
+
+#: ../e-util/e-system.error.xml.h:3
+msgid "_Replace"
+msgstr "_Zameni"
+
+#: ../e-util/e-system.error.xml.h:4
+msgid "Cannot save file \"{0}\"."
+msgstr "Ne mogu da sačuvam datoteku „{0}“."
+
+# mail-composer:no-sig-file secondary
+# mail:no-create-tmp-path secondary
+# mail:no-delete-folder secondary
+# system:no-save-file secondary
+# system:no-load-file secondary
+#: ../e-util/e-system.error.xml.h:5
+msgid "Because \"{1}\"."
+msgstr "Zbog „{1}“."
+
+#: ../e-util/e-system.error.xml.h:6
+msgid "Cannot open file \"{0}\"."
+msgstr "Ne mogu da otvorim datoteku „{0}“."
+
+#: ../e-util/e-system.error.xml.h:7
+msgid "Failed to remove data source &quot;{0}&quot;."
+msgstr "Nisam uspeo da uklonim izvor podataka „{0}“."
+
+#: ../e-util/e-system.error.xml.h:8 ../mail/mail.error.xml.h:61
+msgid "The reported error was &quot;{1}&quot;."
+msgstr "Prijavljena greška bejaše „{1}“."
+
+#: ../e-util/e-system.error.xml.h:9
+msgid "Failed to update data source &quot;{0}&quot;."
+msgstr "Nisam uspeo da osvežim izvor podataka „{0}“."
+
+#: ../e-util/e-system.error.xml.h:10
+msgid "Failed to delete resource &quot;{0}&quot;."
+msgstr "Nisam uspeo da obrišem resurs „{0}“."
+
+#: ../e-util/e-table-click-to-add.c:643
+#: ../e-util/gal-a11y-e-table-click-to-add.c:62
+#: ../e-util/gal-a11y-e-table-click-to-add.c:143
+msgid "click to add"
+msgstr "kliknite da dodate"
+
+#: ../e-util/e-table-config.c:397 ../e-util/e-table-config.c:439
+msgid "(Ascending)"
+msgstr "(Rastuće)"
+
+#: ../e-util/e-table-config.c:397 ../e-util/e-table-config.c:439
+msgid "(Descending)"
+msgstr "(Opadajuće)"
+
+#: ../e-util/e-table-config.c:404
+msgid "Not sorted"
+msgstr "Nije razvrstano"
+
+#: ../e-util/e-table-config.c:445
+msgid "No grouping"
+msgstr "Bez grupisanja"
+
+#: ../e-util/e-table-config.c:690
+msgid "Available Fields"
+msgstr "Dostupna polja"
+
+#: ../e-util/e-table-field-chooser-dialog.c:227
+msgid "Add a Column"
+msgstr "Dodaj kolonu"
+
+#: ../e-util/e-table-field-chooser.c:164
+msgid ""
+"To add a column to your table, drag it into\n"
+"the location in which you want it to appear."
+msgstr ""
+"Za dodavanje kolone u tabelu, prevucite\n"
+"je na mesto gde želite da se pojavi."
+
+#: ../e-util/e-table-group-container.c:363
+#, c-format
+msgid "%s: %s (%d item)"
+msgid_plural "%s: %s (%d items)"
+msgstr[0] "%s: %s (%d stavka)"
+msgstr[1] "%s: %s (%d stavke)"
+msgstr[2] "%s: %s (%d stavki)"
+msgstr[3] "%s: %s (jedna stavka)"
+
+#: ../e-util/e-table-group-container.c:377
+#, c-format
+msgid "%s (%d item)"
+msgid_plural "%s (%d items)"
+msgstr[0] "%s (%d stavka)"
+msgstr[1] "%s (%d stavke)"
+msgstr[2] "%s (%d stavki)"
+msgstr[3] "%s (jedna stavka)"
+
+#: ../e-util/e-table-header-item.c:1579
+msgid "Customize Current View"
+msgstr "Prilagodite trenutni pregled"
+
+#: ../e-util/e-table-header-item.c:1602
+msgid "Sort _Ascending"
+msgstr "Razvrstaj _rastuće"
+
+#: ../e-util/e-table-header-item.c:1605
+msgid "Sort _Descending"
+msgstr "Razvrstaj _opadajuće"
+
+#: ../e-util/e-table-header-item.c:1608
+msgid "_Unsort"
+msgstr "_Ne razvrstavaj"
+
+#: ../e-util/e-table-header-item.c:1611
+msgid "Group By This _Field"
+msgstr "Grupiši po ovome _polju"
+
+#: ../e-util/e-table-header-item.c:1614
+msgid "Group By _Box"
+msgstr "Grupiši po _okviru"
+
+#: ../e-util/e-table-header-item.c:1618
+msgid "Remove This _Column"
+msgstr "Ukloni ovu _kolonu"
+
+#: ../e-util/e-table-header-item.c:1621
+msgid "Add a C_olumn..."
+msgstr "Dodaj ko_lonu..."
+
+#: ../e-util/e-table-header-item.c:1625
+msgid "A_lignment"
+msgstr "Po_ravnanje"
+
+#: ../e-util/e-table-header-item.c:1628
+msgid "B_est Fit"
+msgstr "Na_jbolje uklapanje"
+
+#: ../e-util/e-table-header-item.c:1631
+msgid "Format Column_s..."
+msgstr "Oblikuj kolo_ne..."
+
+#: ../e-util/e-table-header-item.c:1635
+msgid "Custo_mize Current View..."
+msgstr "Prila_godi trenutni pregled..."
+
+#: ../e-util/e-table-header-item.c:1706
+msgid "_Sort By"
+msgstr "_Poređaj po"
+
+#. Custom
+#: ../e-util/e-table-header-item.c:1724
+msgid "_Custom"
+msgstr "_Proizvoljno"
+
+#: ../e-util/e-text.c:2098
+msgid "Select All"
+msgstr "Izaberi sve"
+
+#: ../e-util/e-text.c:2111
+msgid "Input Methods"
+msgstr "Načini unosa"
+
+# Univerzalno vreme, ili UT
+# Valjda UV?
+#. Put the "UTC" entry at the top of the combo's list.
+#: ../e-util/e-timezone-dialog.c:207 ../e-util/e-timezone-dialog.c:429
+#: ../e-util/e-timezone-dialog.c:433 ../e-util/e-timezone-dialog.c:437
+#: ../e-util/e-timezone-dialog.c:803
+msgid "UTC"
+msgstr "KUV"
+
+#: ../e-util/e-url-entry.c:80
+msgid "Click here to go to URL"
+msgstr "Kliknite ovde da posetite adresu"
+
+#: ../e-util/e-web-view-gtkhtml.c:406 ../e-util/e-web-view.c:273
+msgid "_Copy Link Location"
+msgstr "_Umnoži mesto veze"
+
+#: ../e-util/e-web-view-gtkhtml.c:408 ../e-util/e-web-view.c:275
+msgid "Copy the link to the clipboard"
+msgstr "Umnožava vezu u spisak isečaka"
+
+#: ../e-util/e-web-view-gtkhtml.c:416 ../e-util/e-web-view.c:283
+msgid "_Open Link in Browser"
+msgstr "_Otvori vezu u pregledniku"
+
+#: ../e-util/e-web-view-gtkhtml.c:418 ../e-util/e-web-view.c:285
+msgid "Open the link in a web browser"
+msgstr "Otvori vezu u veb pretraživaču"
+
+#: ../e-util/e-web-view-gtkhtml.c:426 ../e-util/e-web-view.c:293
+msgid "_Copy Email Address"
+msgstr "_Umnoži adresu el. pošte"
+
+#: ../e-util/e-web-view-gtkhtml.c:443 ../e-util/e-web-view.c:310
+msgid "_Copy Image"
+msgstr "_Umnoži sliku"
+
+#: ../e-util/e-web-view-gtkhtml.c:445 ../e-util/e-web-view.c:312
+msgid "Copy the image to the clipboard"
+msgstr "Umnožite sliku u ostavu"
+
+#: ../e-util/e-web-view-gtkhtml.c:465 ../e-util/e-web-view-gtkhtml.c:1310
+#: ../e-util/e-web-view.c:332 ../e-util/e-web-view.c:1419
+msgid "Select all text and images"
+msgstr "Izaberi sav tekst i slike"
+
+#: ../e-util/e-web-view-gtkhtml.c:974 ../e-util/e-web-view-gtkhtml.c:976
+#: ../e-util/e-web-view-gtkhtml.c:978 ../e-util/e-web-view.c:1086
+#: ../e-util/e-web-view.c:1088 ../e-util/e-web-view.c:1090
+#, c-format
+msgid "Click to call %s"
+msgstr "Kliknite da pozovete %s"
+
+#: ../e-util/e-web-view-gtkhtml.c:980 ../e-util/e-web-view.c:1092
+msgid "Click to hide/unhide addresses"
+msgstr "Kliknite da sakrijete/otkrijete adrese"
+
+#: ../e-util/e-web-view-gtkhtml.c:982 ../e-util/e-web-view.c:1094
+#, c-format
+msgid "Click to open %s"
+msgstr "Kliknite da otvorite %s"
+
+#: ../e-util/ea-calendar-item.c:315 ../e-util/ea-calendar-item.c:324
+msgid "%d %B %Y"
+msgstr "%d %B %Y."
+
+#: ../e-util/ea-calendar-item.c:327
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Kalendar: od %s do %s"
+
+#: ../e-util/ea-calendar-item.c:364
+msgid "evolution calendar item"
+msgstr "stavka kalendara evolucije"
+
+#: ../e-util/evolution-source-viewer.c:635
+#| msgid "Evolution Pine importer"
+msgid "Evolution Source Viewer"
+msgstr "Prikazivač izvora Evolucije"
+
+#. Translators: The name that is displayed in the user interface
+#: ../e-util/evolution-source-viewer.c:665
+#| msgid "Display"
+msgid "Display Name"
+msgstr "Naziv prikaza"
+
+#: ../e-util/evolution-source-viewer.c:674
+#| msgid "_Flag:"
+msgid "Flags"
+msgstr "Opcije"
+
+#: ../e-util/evolution-source-viewer.c:726
+#: ../mail/e-mail-config-identity-page.c:677
+msgid "Identity"
+msgstr "Identitet"
+
+#: ../e-util/filter.error.xml.h:1
 msgid "Missing date."
 msgstr "Nedostaje datum."
 
-#: ../filter/filter.error.xml.h:2
+#: ../e-util/filter.error.xml.h:2
 msgid "You must choose a date."
 msgstr "Morate da izaberete datum."
 
-#: ../filter/filter.error.xml.h:3
+#: ../e-util/filter.error.xml.h:3
 msgid "Missing filename."
 msgstr "Nedostaje naziv datoteke."
 
 # filter:bad-file secondary
-#: ../filter/filter.error.xml.h:4
+#: ../e-util/filter.error.xml.h:4
 msgid "You must specify a filename."
 msgstr "Morate dati naziv datoteci."
 
-#: ../filter/filter.error.xml.h:5
+#: ../e-util/filter.error.xml.h:5
 msgid "File &quot;{0}&quot; does not exist or is not a regular file."
 msgstr "Datoteka „{0}“ ne postoji ili nije regularna."
 
-#: ../filter/filter.error.xml.h:6
+#: ../e-util/filter.error.xml.h:6
 msgid "Bad regular expression &quot;{0}&quot;."
 msgstr "Loš regularan izraz „{0}“."
 
-#: ../filter/filter.error.xml.h:7
+#: ../e-util/filter.error.xml.h:7
 msgid "Could not compile regular expression &quot;{1}&quot;."
 msgstr "Ne mogu da prevedem regularan izraz „{1}“."
 
 # mail:no-name-vfolder primary
-#: ../filter/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
+#: ../e-util/filter.error.xml.h:8 ../mail/mail.error.xml.h:100
 msgid "Missing name."
 msgstr "Nedostaje ime."
 
-#: ../filter/filter.error.xml.h:9
+#: ../e-util/filter.error.xml.h:9
 msgid "You must name this filter."
 msgstr "Morate dati ime ovom filteru."
 
-#: ../filter/filter.error.xml.h:10
+#: ../e-util/filter.error.xml.h:10
 msgid "Name &quot;{0}&quot; already used."
 msgstr "Naziv „{0}“ je već upotrebljen."
 
-#: ../filter/filter.error.xml.h:11
+#: ../e-util/filter.error.xml.h:11
 msgid "Please choose another name."
 msgstr "Izaberite drugo ime."
 
-#: ../filter/filter.ui.h:2
-msgid "the current time"
-msgstr "trenutno vreme"
+#. Translators: description of a "popup" action
+#: ../e-util/gal-a11y-e-cell-popup.c:128
+msgid "popup a child"
+msgstr "iskačuće izvedeno"
 
-#: ../filter/filter.ui.h:3
-msgid "the time you specify"
-msgstr "vreme koje odredite"
+#. Translators: description of a "toggle" action
+#: ../e-util/gal-a11y-e-cell-toggle.c:180
+msgid "toggle the cell"
+msgstr "biranje ćelije"
 
-#: ../filter/filter.ui.h:4
-msgid "a time relative to the current time"
-msgstr "vreme u odnosu na trenutno vreme"
+#. Translators: description of an "expand" action
+#: ../e-util/gal-a11y-e-cell-tree.c:215
+msgid "expands the row in the ETree containing this cell"
+msgstr "razgranava red u Establo koje sdrži ovu ćeliju"
 
-# bug: plural-forms
-#: ../filter/filter.ui.h:5 ../mail/mail-config.ui.h:78
-msgid "seconds"
-msgstr "sekunde"
+#. Translators: description of a "collapse" action
+#: ../e-util/gal-a11y-e-cell-tree.c:223
+msgid "collapses the row in the ETree containing this cell"
+msgstr "skuplja red u Establo koje sadrži ovu ćeliju"
 
-#: ../filter/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
-msgid "weeks"
-msgstr "nedelje"
+#: ../e-util/gal-a11y-e-cell.c:123
+msgid "Table Cell"
+msgstr "Ćelija tabele"
 
-#: ../filter/filter.ui.h:10
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
-msgid "months"
-msgstr "meseci"
+#: ../e-util/gal-a11y-e-table-click-to-add.c:72
+msgid "click"
+msgstr "klik"
 
-#: ../filter/filter.ui.h:11
-msgid "years"
-msgstr "godine"
+#: ../e-util/gal-a11y-e-table-column-header.c:163
+msgid "sort"
+msgstr "razvrstavanje"
 
-#: ../filter/filter.ui.h:12
-msgid "ago"
-msgstr "pre"
+#: ../e-util/gal-define-views-dialog.c:385
+#: ../e-util/gal-define-views-dialog.c:388
+msgid "Define Views"
+msgstr "Odredi preglede"
 
-#: ../filter/filter.ui.h:13
-msgid "in the future"
-msgstr "u budućnosti"
+#: ../e-util/gal-view-factory-etable.c:114
+msgid "Table"
+msgstr "Tabela"
 
-#: ../filter/filter.ui.h:14
-msgid "Show filters for mail:"
-msgstr "Prikaži filtere za poštu:"
+#: ../e-util/gal-view-instance-save-as-dialog.c:296
+msgid "Save Current View"
+msgstr "Sačuvaj trenutni pregled"
 
-#: ../filter/filter.ui.h:15 ../mail/em-filter-editor.c:166
-msgid "_Filter Rules"
-msgstr "Pr_avila filtera"
+#: ../e-util/gal-view-new-dialog.c:173
+msgid "Define New View"
+msgstr "Odredi novi pregled"
 
-#: ../filter/filter.ui.h:17
-msgid "Compare against"
-msgstr "Uporedi sa"
+#: ../e-util/widgets.error.xml.h:1
+msgid "Do you wish to save your changes?"
+msgstr "Da li želite da sačuvate izmene?"
 
-#: ../filter/filter.ui.h:18
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Datum poruke će biti upoređen sa\n"
-"trenutnim vremenom kada se filtriranje desilo."
+#: ../e-util/widgets.error.xml.h:2
+msgid "This signature has been changed, but has not been saved."
+msgstr "Ovaj potpis je promenjen, ali nije sačuvan."
 
-#: ../filter/filter.ui.h:20
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Datum poruke će biti upoređen sa\n"
-"00:00 navedenog datuma."
+#: ../e-util/widgets.error.xml.h:3
+msgid "_Discard changes"
+msgstr "_Odbaci izmene"
 
-#: ../filter/filter.ui.h:22
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Datum poruke će biti upoređen sa\n"
-"vremenom kada se filtriranje desilo."
+#: ../e-util/widgets.error.xml.h:4
+msgid "Blank Signature"
+msgstr "Prazan potpis"
+
+#: ../e-util/widgets.error.xml.h:5
+msgid "Please provide an unique name to identify this signature."
+msgstr "Dajte jedno jedinstveno ime koje predstavlja ovaj potpis."
+
+#: ../e-util/widgets.error.xml.h:6
+msgid "Could not load signature."
+msgstr "Ne mogu da učitam potpis."
+
+#: ../e-util/widgets.error.xml.h:7
+msgid "Could not save signature."
+msgstr "Ne mogu da sačuvam potpis."
+
+#: ../libemail-engine/camel-sasl-xoauth2.c:27
+#| msgid "OAuth"
+msgid "OAuth2"
+msgstr "OAut2"
+
+#: ../libemail-engine/camel-sasl-xoauth2.c:28
+msgid "This option will use an OAuth 2.0 access token to connect to the server"
+msgstr "Ova opcija će koristiti OAut 2.0 simbol pristupa da se poveže na server"
 
 #: ../libemail-engine/e-mail-authenticator.c:182
 #, c-format
 msgid "Invalid authentication result code (%d)"
 msgstr "Neispravan kod rezultata potvrđivanja identiteta (%d)"
 
-#: ../libemail-engine/e-mail-folder-utils.c:112
+#: ../libemail-engine/e-mail-folder-utils.c:114
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Čuvam poruku u fasciklu „%s“"
 
-#: ../libemail-engine/e-mail-folder-utils.c:565
+#: ../libemail-engine/e-mail-folder-utils.c:566
 msgid "Forwarded messages"
 msgstr "Prosleđene poruke"
 
-#: ../libemail-engine/e-mail-folder-utils.c:675
-#: ../libemail-engine/e-mail-folder-utils.c:926
+#: ../libemail-engine/e-mail-folder-utils.c:676
+#: ../libemail-engine/e-mail-folder-utils.c:927
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -10526,29 +11958,29 @@ msgstr[1] "Dovlačim %d poruke"
 msgstr[2] "Dovlačim %d poruka"
 msgstr[3] "Dovlačim jednu poruku"
 
-#: ../libemail-engine/e-mail-folder-utils.c:769
+#: ../libemail-engine/e-mail-folder-utils.c:770
 msgid "Scanning messages for duplicates"
 msgstr "Tražim duplikate u porukama"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1177
+#: ../libemail-engine/e-mail-folder-utils.c:1178
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Uklanjam fasciklu „%s“"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1314
+#: ../libemail-engine/e-mail-folder-utils.c:1315
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Datoteka „%s“ je uklonjena."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1318
+#: ../libemail-engine/e-mail-folder-utils.c:1319
 msgid "File has been removed."
 msgstr "Datoteka je uklonjena."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1377
+#: ../libemail-engine/e-mail-folder-utils.c:1378
 msgid "Removing attachments"
 msgstr "Uklanjam priloge"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1541
+#: ../libemail-engine/e-mail-folder-utils.c:1542
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
@@ -10557,110 +11989,110 @@ msgstr[1] "Čuvam %d poruke"
 msgstr[2] "Čuvam %d poruka"
 msgstr[3] "Čuvam jednu poruku"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1897 ../mail/em-folder-utils.c:613
+#: ../libemail-engine/e-mail-folder-utils.c:1898 ../mail/em-folder-utils.c:610
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Neispravna putanja fascikle „%s“"
 
-#: ../libemail-engine/e-mail-session.c:116 ../mail/em-folder-properties.c:333
-#: ../mail/em-folder-tree-model.c:765
-#: ../modules/mail/e-mail-shell-view-private.c:1034
-#: ../modules/mail/e-mail-shell-view-private.c:1045
+#: ../libemail-engine/e-mail-session-utils.c:540
+#, c-format
+msgid "No mail service found with UID '%s'"
+msgstr "Nije pronađena usluga pošte sa JIB-om „%s“"
+
+#: ../libemail-engine/e-mail-session-utils.c:549
+#, c-format
+msgid "UID '%s' is not a mail transport"
+msgstr "LIB „%s“ nije prenos pošte"
+
+#: ../libemail-engine/e-mail-session-utils.c:647
+#: ../libemail-engine/mail-ops.c:761
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Neuspela primena odlaznih propusnika: %s"
+
+#: ../libemail-engine/e-mail-session-utils.c:676
+#: ../libemail-engine/e-mail-session-utils.c:710
+#: ../libemail-engine/mail-ops.c:780 ../libemail-engine/mail-ops.c:813
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+msgstr ""
+"Nisam uspeo da prikačim u %s: %s\n"
+"Umesto toga prikačiću u lokalnu fasciklu „Poslato“."
+
+#: ../libemail-engine/e-mail-session-utils.c:730
+#: ../libemail-engine/mail-ops.c:835
+#, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "Nisam uspeo da prikačim u lokalnu fasciklu „Poslato“: %s"
+
+#: ../libemail-engine/e-mail-session-utils.c:974
+#: ../libemail-engine/mail-ops.c:967 ../libemail-engine/mail-ops.c:1069
+msgid "Sending message"
+msgstr "Slanje poruke"
+
+#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:333
+#: ../mail/em-folder-tree-model.c:764
+#: ../modules/mail/e-mail-shell-view-private.c:1095
+#: ../modules/mail/e-mail-shell-view-private.c:1106
 msgid "Inbox"
 msgstr "Sanduče"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:117 ../mail/em-folder-tree-model.c:758
-#: ../modules/mail/e-mail-shell-view-private.c:1032
+#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:757
+#: ../modules/mail/e-mail-shell-view-private.c:1093
 msgid "Drafts"
 msgstr "Nacrti"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:118 ../mail/em-folder-tree-model.c:769
-#: ../modules/mail/e-mail-shell-view-private.c:1036
+#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:768
+#: ../modules/mail/e-mail-shell-view-private.c:1097
 msgid "Outbox"
 msgstr "Za slanje"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:119 ../mail/em-folder-tree-model.c:773
-#: ../modules/mail/e-mail-shell-view-private.c:1038
+#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:772
+#: ../modules/mail/e-mail-shell-view-private.c:1099
 msgid "Sent"
 msgstr "Poslato"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-tree-model.c:761
-#: ../modules/mail/e-mail-shell-view-private.c:1040
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:760
+#: ../modules/mail/e-mail-shell-view-private.c:1101
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1048 ../plugins/templates/templates.c:1345
-#: ../plugins/templates/templates.c:1355
+#: ../plugins/templates/templates.c:1071 ../plugins/templates/templates.c:1368
+#: ../plugins/templates/templates.c:1378
 msgid "Templates"
 msgstr "Šabloni"
 
-#: ../libemail-engine/e-mail-session.c:1319
+#: ../libemail-engine/e-mail-session.c:1351
 #, c-format
 msgid "User cancelled operation"
 msgstr "Korisnik je otkazao radnju"
 
-#: ../libemail-engine/e-mail-session.c:1489
+#: ../libemail-engine/e-mail-session.c:1572
 #, c-format
 msgid "%s authentication failed"
 msgstr "Nije uspelo %s potvrđivanje identiteta"
 
-#: ../libemail-engine/e-mail-session.c:1534
+#: ../libemail-engine/e-mail-session.c:1617
 #, c-format
 msgid "No data source found for UID '%s'"
 msgstr "Nije pronađen izvor podataka za JIB „%s“"
 
-#: ../libemail-engine/e-mail-session.c:1585
+#: ../libemail-engine/e-mail-session.c:1668
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "Nije dostavljena odredišna adresa, prosleđivanje poruke je otkazano."
 
-#: ../libemail-engine/e-mail-session.c:1598
+#: ../libemail-engine/e-mail-session.c:1681
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "Nije pronađen identitet za korišćenje, prosleđivanje poruke je otkazano."
 
-#: ../libemail-engine/e-mail-session-utils.c:540
-#, c-format
-msgid "No mail service found with UID '%s'"
-msgstr "Nije pronađena usluga pošte sa JIB-om „%s“"
-
-#: ../libemail-engine/e-mail-session-utils.c:549
-#, c-format
-msgid "UID '%s' is not a mail transport"
-msgstr "LIB „%s“ nije prenos pošte"
-
-#: ../libemail-engine/e-mail-session-utils.c:641
-#: ../libemail-engine/mail-ops.c:698
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Neuspela primena odlazećih filtera: %s"
-
-#: ../libemail-engine/e-mail-session-utils.c:670
-#: ../libemail-engine/e-mail-session-utils.c:704
-#: ../libemail-engine/mail-ops.c:715 ../libemail-engine/mail-ops.c:751
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-msgstr ""
-"Nisam uspeo da prikačim u %s: %s\n"
-"Umesto toga prikačiću u lokalnu fasciklu „Poslato“."
-
-#: ../libemail-engine/e-mail-session-utils.c:724
-#: ../libemail-engine/mail-ops.c:773
-#, c-format
-msgid "Failed to append to local 'Sent' folder: %s"
-msgstr "Nisam uspeo da prikačim u lokalnu fasciklu „Poslato“: %s"
-
-#: ../libemail-engine/e-mail-session-utils.c:954
-#: ../libemail-engine/mail-ops.c:905 ../libemail-engine/mail-ops.c:1007
-msgid "Sending message"
-msgstr "Slanje poruke"
-
 #: ../libemail-engine/e-mail-store-utils.c:171
 #, c-format
 msgid "Disconnecting from '%s'"
@@ -10676,7 +12108,7 @@ msgstr "Ponovno povezivanje na „%s“"
 msgid "Preparing account '%s' for offline"
 msgstr "Pripremam nalog „%s“ za rad van mreže"
 
-#: ../libemail-engine/mail-folder-cache.c:885
+#: ../libemail-engine/mail-folder-cache.c:880
 #, c-format
 msgid "Pinging %s"
 msgstr "Ispitujem dostupnost za %s"
@@ -10685,17 +12117,45 @@ msgstr "Ispitujem dostupnost za %s"
 msgid "Filtering Selected Messages"
 msgstr "Filtriranje izabranih poruka"
 
-#: ../libemail-engine/mail-ops.c:216
-msgid "Fetching Mail"
-msgstr "Uzimanje pošte"
+#: ../libemail-engine/mail-ops.c:152
+#, c-format
+msgid ""
+"Failed to filter selected messages. One reason can be that folder location "
+"set in one or more filters is invalid. Please check your filters in Edit-"
+">Message Filters.\n"
+"Original error was: %s"
+msgstr ""
+"Nisam uspeo da izdvojim izabrane poruke. Jedan od razloga može biti i taj da "
+"je neispravno mesto fascikle podešeno u jednom ili više propusnika. Molim "
+"proverite vaše propusnike u izborniku „Uređivanje—>Propusnici poruka“.\n"
+"Izvorna greška beše: %s"
+
+#: ../libemail-engine/mail-ops.c:233
+#, c-format
+#| msgid "Fetching Mail"
+msgid "Fetching mail from '%s'"
+msgstr "Dovlačim poštu sa „%s“"
 
-#: ../libemail-engine/mail-ops.c:916
+#: ../libemail-engine/mail-ops.c:755
+#, c-format
+msgid ""
+"Failed to apply outgoing filters. One reason can be that folder location set "
+"in one or more filters is invalid. Please check your filters in Edit-"
+">Message Filters.\n"
+"Original error was: %s"
+msgstr ""
+"Nisam uspeo da primenim odlazne propusnike. Jedan od razloga može biti i taj "
+"da je neispravno mesto fascikle podešeno u jednom ili više propusnika. "
+"Molim proverite vaše propusnike u izborniku „Uređivanje—>Propusnici poruka“.\n"
+"Izvorna greška beše: %s"
+
+#: ../libemail-engine/mail-ops.c:978
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Šaljem poruku %d od %d"
 
 # bug: plural-forms
-#: ../libemail-engine/mail-ops.c:968
+#: ../libemail-engine/mail-ops.c:1030
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
@@ -10704,40 +12164,40 @@ msgstr[1] "Nisam uspeo da pošaljem %d od %d poruka"
 msgstr[2] "Nisam uspeo da pošaljem %d od %d poruka"
 msgstr[3] "Nisam uspeo da pošaljem %d od %d poruke"
 
-#: ../libemail-engine/mail-ops.c:974
+#: ../libemail-engine/mail-ops.c:1036
 msgid "Canceled."
 msgstr "Otkazano."
 
-#: ../libemail-engine/mail-ops.c:976
+#: ../libemail-engine/mail-ops.c:1038
 msgid "Complete."
 msgstr "Završeno."
 
-#: ../libemail-engine/mail-ops.c:1088
+#: ../libemail-engine/mail-ops.c:1150
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Premeštam poruke u „%s“"
 
-#: ../libemail-engine/mail-ops.c:1089
+#: ../libemail-engine/mail-ops.c:1151
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Umnožavam poruke u „%s“"
 
-#: ../libemail-engine/mail-ops.c:1207
+#: ../libemail-engine/mail-ops.c:1270
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Smeštam fasciklu „%s“"
 
-#: ../libemail-engine/mail-ops.c:1281
+#: ../libemail-engine/mail-ops.c:1398
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Praznim i smeštam nalog „%s“"
 
-#: ../libemail-engine/mail-ops.c:1282
+#: ../libemail-engine/mail-ops.c:1399
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Smeštam nalog „%s“"
 
-#: ../libemail-engine/mail-ops.c:1356
+#: ../libemail-engine/mail-ops.c:1473
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Izbacujem smeće u „%s“"
@@ -10761,12 +12221,12 @@ msgstr "Prosleđena poruka — %s"
 msgid "Forwarded message"
 msgstr "Prosleđena poruka"
 
-#: ../libemail-engine/mail-vfolder.c:130
+#: ../libemail-engine/mail-vfolder.c:127
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Podešavanje fascikle pretrage: %s"
 
-#: ../libemail-engine/mail-vfolder.c:283
+#: ../libemail-engine/mail-vfolder.c:280
 #, c-format
 msgid "Updating Search Folders for '%s' - %s"
 msgstr "Ažuriranje fascikla pretrage za „%s — %s“"
@@ -10776,7 +12236,7 @@ msgstr "Ažuriranje fascikla pretrage za „%s — %s“"
 #. * removed folder. For more than one search folder is
 #. * each of them on a separate line, with four spaces
 #. * in front of its name, without quotes.
-#: ../libemail-engine/mail-vfolder.c:648
+#: ../libemail-engine/mail-vfolder.c:645
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -10799,23 +12259,23 @@ msgstr[3] ""
 "Fascikla pretrage „%s“ je izmenjena u nalogu za obrisanu fasciklu\n"
 "„%s“."
 
-#: ../mail/e-mail-account-manager.c:446
+#: ../mail/e-mail-account-manager.c:460
 msgid "_Restore Default"
 msgstr "Povrati _podrazumevano"
 
-#: ../mail/e-mail-account-manager.c:459
+#: ../mail/e-mail-account-manager.c:473
 msgid "You can drag and drop account names to reorder them."
 msgstr "Možete da prevučete i ubacite nazive naloga da ih ponovo poređate."
 
-#: ../mail/e-mail-account-manager.c:504
+#: ../mail/e-mail-account-manager.c:518
 msgid "De_fault"
 msgstr "Pod_razumevano"
 
 # has "activatable" set.
 #: ../mail/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:505
-#: ../modules/plugin-manager/evolution-plugin-manager.c:360
-#: ../plugins/publish-calendar/publish-calendar.c:864
+#: ../modules/mail/em-composer-prefs.c:488
+#: ../modules/plugin-manager/evolution-plugin-manager.c:359
+#: ../plugins/publish-calendar/publish-calendar.c:876
 msgid "Enabled"
 msgstr "Uključen"
 
@@ -10825,58 +12285,42 @@ msgstr "Naziv naloga"
 
 #: ../mail/e-mail-account-tree-view.c:134
 #: ../mail/e-mail-config-security-page.c:333
-#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3655
+#: ../mail/e-mail-config-security-page.c:472 ../mail/e-mail-reader.c:3684
 #: ../mail/mail-config.ui.h:44
 msgid "Default"
 msgstr "Osnovno"
 
-#: ../mail/e-mail-autoconfig.c:194
-#, c-format
-msgid "No mail exchanger record for '%s'"
-msgstr "Nema zapisa razmenjivača pošte za „%s“"
-
-#: ../mail/e-mail-autoconfig.c:201
-#, c-format
-msgid "Temporarily unable to resolve '%s'"
-msgstr "Privremeno ne mogu da razrešim „%s“"
-
-#: ../mail/e-mail-autoconfig.c:208
-#, c-format
-msgid "Error resolving '%s'"
-msgstr "Greška razrešavanja „%s“"
-
-#: ../mail/e-mail-autoconfig.c:264
-#, c-format
-msgid "No authoritative name server for '%s'"
-msgstr "Nema merodavnog servera naziva za „%s“"
-
-#: ../mail/e-mail-autoconfig.c:661
+#: ../mail/e-mail-autoconfig.c:525
 msgid "No email address provided"
 msgstr "Nije dostavljena adresa el. pošte"
 
-#: ../mail/e-mail-autoconfig.c:670
+#: ../mail/e-mail-autoconfig.c:534
 msgid "Missing domain in email address"
 msgstr "Nedostaje domen u adresi el. pošte"
 
-#: ../mail/e-mail-backend.c:734
+#: ../mail/e-mail-backend.c:766
 msgid "Unknown background operation"
 msgstr "Nepoznata pozadinska radnja"
 
-#: ../mail/e-mail-browser.c:127 ../shell/e-shell-window-actions.c:1418
-#: ../shell/e-shell-window-actions.c:1425
-#: ../shell/e-shell-window-actions.c:1432
+#: ../mail/e-mail-browser.c:123 ../shell/e-shell-window-actions.c:848
+#: ../shell/e-shell-window-actions.c:855 ../shell/e-shell-window-actions.c:862
 msgid "Close this window"
 msgstr "Zatvorite ovaj prozor"
 
-#: ../mail/e-mail-browser.c:284
+#: ../mail/e-mail-browser.c:280
 msgid "(No Subject)"
 msgstr "(Bez subjekta)"
 
-#: ../mail/e-mail-config-assistant.c:501
+#. GtkAssistant sinks the floating button reference.
+#: ../mail/e-mail-config-assistant.c:102
+msgid "_Skip Lookup"
+msgstr "_Preskoči pretragu"
+
+#: ../mail/e-mail-config-assistant.c:562
 msgid "Evolution Account Assistant"
 msgstr "Pomoćnik naloga Evolucije"
 
-#: ../mail/e-mail-config-auth-check.c:348
+#: ../mail/e-mail-config-auth-check.c:352
 msgid "Check for Supported Types"
 msgstr "Proverite za podržanim vrstama"
 
@@ -10898,83 +12342,87 @@ msgstr ""
 msgid "Done"
 msgstr "Urađeno"
 
-#: ../mail/e-mail-config-defaults-page.c:539
+#: ../mail/e-mail-config-defaults-page.c:552
 msgid "Special Folders"
 msgstr "Posebne fascikle"
 
-#: ../mail/e-mail-config-defaults-page.c:548
+#: ../mail/e-mail-config-defaults-page.c:561
 msgid "Draft Messages _Folder:"
 msgstr "Fascikla poruka _nacrta:"
 
-#: ../mail/e-mail-config-defaults-page.c:558
+#: ../mail/e-mail-config-defaults-page.c:571
 msgid "Choose a folder for saving draft messages."
 msgstr "Izaberite fasciklu za čuvanje poruka nacrta."
 
-#: ../mail/e-mail-config-defaults-page.c:572
+#: ../mail/e-mail-config-defaults-page.c:585
 msgid "Sent _Messages Folder:"
 msgstr "Fascikla poslatih _poruka:"
 
-#: ../mail/e-mail-config-defaults-page.c:582
+#: ../mail/e-mail-config-defaults-page.c:595
 msgid "Choose a folder for saving sent messages."
 msgstr "Izaberite fasciklu za čuvanje poslatih poruka."
 
-#: ../mail/e-mail-config-defaults-page.c:596
+#: ../mail/e-mail-config-defaults-page.c:614
+msgid "S_ave replies in the folder of the message being replied to"
+msgstr "Sačuvaj _odgovore u fascikli poruke na koju se odgovara"
+
+#: ../mail/e-mail-config-defaults-page.c:631
 msgid "_Restore Defaults"
 msgstr "_Povrati osnovno"
 
-#: ../mail/e-mail-config-defaults-page.c:610
+#: ../mail/e-mail-config-defaults-page.c:645
 msgid "Use a Real Folder for _Trash:"
 msgstr "Koristi stvarnu fasciklu za _smeće:"
 
-#: ../mail/e-mail-config-defaults-page.c:611
+#: ../mail/e-mail-config-defaults-page.c:646
 msgid "Choose a folder for deleted messages."
 msgstr "Izaberite fasciklu za obrisane poruke."
 
-#: ../mail/e-mail-config-defaults-page.c:620
+#: ../mail/e-mail-config-defaults-page.c:655
 msgid "Use a Real Folder for _Junk:"
 msgstr "Koristi stvarnu fasciklu za _đubre:"
 
-#: ../mail/e-mail-config-defaults-page.c:621
+#: ../mail/e-mail-config-defaults-page.c:656
 msgid "Choose a folder for junk messages."
 msgstr "Izaberite fasciklu za nepoželjne poruke."
 
-#: ../mail/e-mail-config-defaults-page.c:638
+#: ../mail/e-mail-config-defaults-page.c:673
 msgid "Composing Messages"
 msgstr "Sastavljanje poruka"
 
-#: ../mail/e-mail-config-defaults-page.c:647
+#: ../mail/e-mail-config-defaults-page.c:682
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Uvek pošalji _grafitnu kopiju (cc):"
 
-#: ../mail/e-mail-config-defaults-page.c:672
+#: ../mail/e-mail-config-defaults-page.c:707
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Uvek pošalji _nevidljivu grafitnu kopiju (Bcc):"
 
-#: ../mail/e-mail-config-defaults-page.c:707
+#: ../mail/e-mail-config-defaults-page.c:742
 msgid "Message Receipts"
 msgstr "Priznanice poruke"
 
-#: ../mail/e-mail-config-defaults-page.c:716
+#: ../mail/e-mail-config-defaults-page.c:751
 msgid "S_end message receipts:"
 msgstr "_Pošalji povratnice:"
 
-#: ../mail/e-mail-config-defaults-page.c:741
+#: ../mail/e-mail-config-defaults-page.c:776
 msgid "Never"
 msgstr "Nikada"
 
-#: ../mail/e-mail-config-defaults-page.c:747
+#: ../mail/e-mail-config-defaults-page.c:782
 msgid "Always"
 msgstr "Uvek"
 
-#: ../mail/e-mail-config-defaults-page.c:753
+#: ../mail/e-mail-config-defaults-page.c:788
 msgid "Ask for each message"
 msgstr "Pitaj za svaku poruku"
 
-#: ../mail/e-mail-config-defaults-page.c:824
+#: ../mail/e-mail-config-defaults-page.c:859
 msgid "Defaults"
 msgstr "Osnovno"
 
-#: ../mail/e-mail-config-identity-page.c:254
+#: ../mail/e-mail-config-identity-page.c:266
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -10983,12 +12431,12 @@ msgstr ""
 "Unesite ime i elektronsku adresu. „Neobavezna“ polja ne moraju biti popunjena, "
 "osim ako ne želite da ove podatke uključite u poruke koje šaljete."
 
-#: ../mail/e-mail-config-identity-page.c:282
+#: ../mail/e-mail-config-identity-page.c:294
 #: ../mail/e-mail-config-summary-page.c:324
 msgid "Account Information"
 msgstr "Podaci o nalogu"
 
-#: ../mail/e-mail-config-identity-page.c:291
+#: ../mail/e-mail-config-identity-page.c:303
 #: ../mail/e-mail-config-summary-page.c:333
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
@@ -10997,47 +12445,35 @@ msgstr ""
 "Upišite ime po kome želite da nazovete ovaj nalog.\n"
 "Na primer, „Poslovni“ ili „Lični“."
 
-#: ../mail/e-mail-config-identity-page.c:299
-#: ../mail/e-mail-config-summary-page.c:341
-#: ../modules/addressbook/ldap-config.ui.h:12
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:2
-#: ../widgets/misc/e-mail-signature-script-dialog.c:417
-msgid "_Name:"
-msgstr "_Ime:"
-
-#: ../mail/e-mail-config-identity-page.c:336
+#: ../mail/e-mail-config-identity-page.c:348
 msgid "Required Information"
 msgstr "Obavezni podaci"
 
-#: ../mail/e-mail-config-identity-page.c:345
+#: ../mail/e-mail-config-identity-page.c:357
 msgid "Full Nam_e:"
 msgstr "_Ime i prezime:"
 
-#: ../mail/e-mail-config-identity-page.c:372
+#: ../mail/e-mail-config-identity-page.c:384
 msgid "Email _Address:"
 msgstr "Adresa _el. pošte:"
 
-#: ../mail/e-mail-config-identity-page.c:409
+#: ../mail/e-mail-config-identity-page.c:431
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Dodatni podaci"
 
-#: ../mail/e-mail-config-identity-page.c:417
+#: ../mail/e-mail-config-identity-page.c:439
 msgid "Re_ply-To:"
 msgstr "Od_govor:"
 
-#: ../mail/e-mail-config-identity-page.c:444
+#: ../mail/e-mail-config-identity-page.c:466
 msgid "Or_ganization:"
 msgstr "Or_ganizacija:"
 
-#: ../mail/e-mail-config-identity-page.c:499
+#: ../mail/e-mail-config-identity-page.c:521
 msgid "Add Ne_w Signature..."
 msgstr "Dodaj no_vi potpis..."
 
-#: ../mail/e-mail-config-identity-page.c:640
-msgid "Identity"
-msgstr "Identitet"
-
 #: ../mail/e-mail-config-lookup-page.c:68
 msgid "Looking up account details..."
 msgstr "Tražim pojedinosti naloga..."
@@ -11063,7 +12499,7 @@ msgstr "Primanje pošte"
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
 #: ../modules/itip-formatter/plugin/config-ui.c:91
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
-#: ../smime/gui/smime-ui.ui.h:21
+#: ../smime/gui/certificate-viewer.c:653
 msgid "General"
 msgstr "Opšte"
 
@@ -11195,13 +12631,12 @@ msgid "Server Type:"
 msgstr "Vrsta servera:"
 
 #: ../mail/e-mail-config-summary-page.c:454
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:602
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:244
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
 msgid "Server:"
 msgstr "Server:"
 
 #: ../mail/e-mail-config-summary-page.c:475
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:697
 msgid "Username:"
 msgstr "Korisničko ime:"
 
@@ -11224,43 +12659,43 @@ msgstr ""
 "Kliknite „Nastavi“ da započnete."
 
 #: ../mail/e-mail-config-welcome-page.c:167
-#: ../modules/startup-wizard/e-startup-assistant.c:150
+#: ../modules/startup-wizard/e-startup-assistant.c:152
 msgid "Welcome"
 msgstr "Dobrodošli"
 
-#: ../mail/e-mail-config-window.c:329
+#: ../mail/e-mail-config-window.c:327
 msgid "Account Editor"
 msgstr "Uređivač naloga"
 
-#: ../mail/e-mail-display.c:119
+#: ../mail/e-mail-display.c:113
 msgid "_Add to Address Book..."
 msgstr "_Dodaj u adresar..."
 
-#: ../mail/e-mail-display.c:126
+#: ../mail/e-mail-display.c:120
 msgid "_To This Address"
 msgstr "_Na ovu adresu"
 
-#: ../mail/e-mail-display.c:133
+#: ../mail/e-mail-display.c:127
 msgid "_From This Address"
 msgstr "_Sa ove adrese"
 
-#: ../mail/e-mail-display.c:140
+#: ../mail/e-mail-display.c:134
 msgid "Send _Reply To..."
 msgstr "_Pošalji odgovor..."
 
-#: ../mail/e-mail-display.c:142
+#: ../mail/e-mail-display.c:136
 msgid "Send a reply message to this address"
 msgstr "Pošaljite poruku odgovora na ovu adresu"
 
-#: ../mail/e-mail-display.c:149
+#: ../mail/e-mail-display.c:143
 msgid "Create Search _Folder"
 msgstr "Napravi fasciklu _pretrage"
 
-#: ../mail/e-mail-display.c:159
+#: ../mail/e-mail-display.c:153
 msgid "Save _Image..."
-msgstr "Sačuvaj _sliku"
+msgstr "Sačuvaj _sliku..."
 
-#: ../mail/e-mail-display.c:161
+#: ../mail/e-mail-display.c:155
 msgid "Save the image to a file"
 msgstr "Sačuvajte sliku u datoteku"
 
@@ -11302,7 +12737,7 @@ msgid "_Later"
 msgstr "Kasni_je"
 
 #: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:718
+#: ../modules/mail/e-mail-shell-view-actions.c:771
 msgid "Add Label"
 msgstr "Dodajte natpis"
 
@@ -11322,670 +12757,665 @@ msgstr ""
 msgid "Color"
 msgstr "Boja"
 
-#: ../mail/e-mail-migrate.c:332
-#, c-format
-msgid "Unable to create local mail folders at '%s': %s"
-msgstr "Ne mogu da napravim lokalne fascikle za poštu u „%s“: %s"
-
 #: ../mail/e-mail-notebook-view.c:269
 msgid "Please select a folder"
-msgstr "Izaberite fasciklu."
+msgstr "Izaberite fasciklu"
 
-#: ../mail/e-mail-printer.c:124
+#: ../mail/e-mail-printer.c:123
 #, c-format
 msgid "Page %d of %d"
 msgstr "Stranica %d od %d"
 
-#: ../mail/e-mail-printer.c:549
-#: ../modules/calendar/e-cal-shell-view-actions.c:217
-#: ../modules/calendar/e-cal-shell-view-actions.c:246
+#: ../mail/e-mail-printer.c:573
+#: ../modules/calendar/e-cal-shell-view-actions.c:216
+#: ../modules/calendar/e-cal-shell-view-actions.c:245
 msgid "Print"
 msgstr "Štampaj"
 
-#: ../mail/e-mail-printer.c:555
+#: ../mail/e-mail-printer.c:579
 msgid "Header Name"
 msgstr "Naziv zaglavlja"
 
-#: ../mail/e-mail-printer.c:561
+#: ../mail/e-mail-printer.c:585
 msgid "Header Value"
 msgstr "Vrednost zaglavlja"
 
-#: ../mail/e-mail-printer.c:615 ../mail/mail-config.ui.h:102
+#: ../mail/e-mail-printer.c:639 ../mail/mail-config.ui.h:102
 msgid "Headers"
 msgstr "Zaglavlja"
 
-#: ../mail/e-mail-reader.c:349
+#: ../mail/e-mail-reader.c:347
 msgid "Save Image"
 msgstr "Sačuvaj sliku"
 
-#: ../mail/e-mail-reader.c:431 ../mail/em-filter-i18n.h:11
+#: ../mail/e-mail-reader.c:429 ../mail/em-filter-i18n.h:12
 msgid "Copy to Folder"
 msgstr "Umnoži u fasciklu"
 
-#: ../mail/e-mail-reader.c:431 ../mail/em-folder-utils.c:492
+#: ../mail/e-mail-reader.c:429 ../mail/em-folder-utils.c:489
 msgid "C_opy"
 msgstr "_Umnoži"
 
-#: ../mail/e-mail-reader.c:965 ../mail/em-filter-i18n.h:53
+#: ../mail/e-mail-reader.c:963 ../mail/em-filter-i18n.h:54
 msgid "Move to Folder"
 msgstr "Premesti u fasciklu"
 
-#: ../mail/e-mail-reader.c:965 ../mail/em-folder-utils.c:492
+#: ../mail/e-mail-reader.c:963 ../mail/em-folder-utils.c:489
 msgid "_Move"
 msgstr "Pre_mesti"
 
-#: ../mail/e-mail-reader.c:1313 ../mail/e-mail-reader.c:1495
-#: ../mail/e-mail-reader.c:1535
+#: ../mail/e-mail-reader.c:1311 ../mail/e-mail-reader.c:1511
+#: ../mail/e-mail-reader.c:1551
 msgid "_Do not ask me again."
 msgstr "_Ne pitaj me ponovo."
 
-#: ../mail/e-mail-reader.c:1541
+#: ../mail/e-mail-reader.c:1557
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Uvek zanemari „Odgovor-za:“ za dopisne liste."
 
-#: ../mail/e-mail-reader.c:1726
+#: ../mail/e-mail-reader.c:1752
 msgid "Failed to retrieve message:"
 msgstr "Nisam uspeo da dovučem poruku:"
 
-#: ../mail/e-mail-reader.c:1772 ../mail/e-mail-reader.c:2862
+#: ../mail/e-mail-reader.c:1798 ../mail/e-mail-reader.c:2891
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Dovlačim poruku „%s“"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:1975
 msgid "A_dd Sender to Address Book"
 msgstr "Do_daj pošiljaoca u adresar"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:1977
 msgid "Add sender to address book"
 msgstr "Dodaj pošiljaoca u adresar"
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:1982
 msgid "Check for _Junk"
 msgstr "Proveri da li ima _đubreta"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:1984
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrira da li među izabranim porukama ima đubreta"
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:1989
 msgid "_Copy to Folder..."
 msgstr "_Umnoži u fasciklu..."
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:1991
 msgid "Copy selected messages to another folder"
 msgstr "Umnožava izabrane poruke u drugu fasciklu"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:1996
 msgid "_Delete Message"
 msgstr "_Obriši poruku"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:1998
 msgid "Mark the selected messages for deletion"
 msgstr "Označite izabranu(e) poruku(e) za brisanje"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:2003
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Napravi pravilo propusnika za dopisnu _listu..."
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:2005
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Naravite pravilo za propuštanje poruka na ovu dopisnu listu"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:2010
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Napravi pravilo propusnika za _primaoce..."
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:2012
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Napravite pravilo za propuštanje poruka ovim primaocima"
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:2017
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Napravi pravilo propusnika za _pošiljaoca..."
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2019
 msgid "Create a rule to filter messages from this sender"
 msgstr "Napravite pravilo za propuštanje poruka sa ovog pošiljaoca"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2024
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Napravi pravilo propusnika za _naslov..."
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2026
 msgid "Create a rule to filter messages with this subject"
 msgstr "Napravite pravilo za prpuštanje poruka sa ovim naslovom"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2031
 msgid "A_pply Filters"
 msgstr "Pri_meni propusnike"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2033
 msgid "Apply filter rules to the selected messages"
 msgstr "Primenite pravila propuštanja na izabrane poruke"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2038
 msgid "_Find in Message..."
 msgstr "P_ronađi u poruci..."
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2040
 msgid "Search for text in the body of the displayed message"
 msgstr "Potražite tekst u telu prikazane poruke"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2045
 msgid "_Clear Flag"
 msgstr "Sklo_ni oznaku"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2047
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Uklonite oznaku za praćenje sa izabranih poruka"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2052
 msgid "_Flag Completed"
 msgstr "Označ_i kao završeno"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2054
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Postavite oznaku za praćenje kao završenu na izabranim porukama"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2059
 msgid "Follow _Up..."
 msgstr "Sle_di..."
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2061
 msgid "Flag the selected messages for follow-up"
 msgstr "Označite izabrane poruke za praćenje"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2066
 msgid "_Attached"
 msgstr "Pri_loženo"
 
-#: ../mail/e-mail-reader.c:2042 ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2068 ../mail/e-mail-reader.c:2075
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Prosledite izabranu poruku nekome kao prilog"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2073
 msgid "Forward As _Attached"
 msgstr "Prosledi kao _prilog"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2080
 msgid "_Inline"
 msgstr "Unut_ar"
 
-#: ../mail/e-mail-reader.c:2056 ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2082 ../mail/e-mail-reader.c:2089
 msgid "Forward the selected message in the body of a new message"
 msgstr "Prosledite izabranu poruku u telu nove poruke"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:2087
 msgid "Forward As _Inline"
 msgstr "Prosledi kao _unutar poruke"
 
-#: ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:2094
 msgid "_Quoted"
 msgstr "_Citirano"
 
-#: ../mail/e-mail-reader.c:2070 ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2096 ../mail/e-mail-reader.c:2103
 msgid "Forward the selected message quoted like a reply"
 msgstr "Prosledite izabranu poruku citiranu kao odgovor"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2101
 msgid "Forward As _Quoted"
 msgstr "Prosledi kao _citat"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2108
 msgid "_Load Images"
 msgstr "_Učitaj slike"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2110
 msgid "Force images in HTML mail to be loaded"
 msgstr "Prisilite učitavanje slika u HTML porukama"
 
-#: ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:2115
 msgid "_Important"
 msgstr "_Važno"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2117
 msgid "Mark the selected messages as important"
 msgstr "Označite izabranu(e) poruku(e) kao važno"
 
-#: ../mail/e-mail-reader.c:2096
+#: ../mail/e-mail-reader.c:2122
 msgid "_Junk"
 msgstr "_Đubre"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2124
 msgid "Mark the selected messages as junk"
 msgstr "Označite izabranu(e) poruku(e) kao neželjenu poštu"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2129
 msgid "_Not Junk"
 msgstr "Ni_je đubre"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2131
 msgid "Mark the selected messages as not being junk"
 msgstr "Označite izabranu(e) poruku(e) da nije neželjena pošta"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2136
 msgid "_Read"
 msgstr "Pro_čitaj"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2138
 msgid "Mark the selected messages as having been read"
 msgstr "Označite izabranu(e) poruku(e) kao pročitano"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2143
 msgid "Uni_mportant"
 msgstr "Ne_važno"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2145
 msgid "Mark the selected messages as unimportant"
 msgstr "Označite izabranu(e) poruku(e) kao nevažno"
 
-#: ../mail/e-mail-reader.c:2124
+#: ../mail/e-mail-reader.c:2150
 msgid "_Unread"
 msgstr "_Nepročitano"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2152
 msgid "Mark the selected messages as not having been read"
 msgstr "Označite izabranu(e) poruku(e) kao nepročitano"
 
-#: ../mail/e-mail-reader.c:2131
+#: ../mail/e-mail-reader.c:2157
 msgid "_Edit as New Message..."
 msgstr "_Uredi kao novu poruku..."
 
-#: ../mail/e-mail-reader.c:2133
+#: ../mail/e-mail-reader.c:2159
 msgid "Open the selected messages in the composer for editing"
 msgstr "Otvorite izabranu poruku u sastavljaču radi uređivanja"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2164
 msgid "Compose _New Message"
 msgstr "Sastavi _novu poruku"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2166
 msgid "Open a window for composing a mail message"
 msgstr "Otvorite prozor za sastavljanje poruke"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2171
 msgid "_Open in New Window"
 msgstr "_Otvori u novom prozoru"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2173
 msgid "Open the selected messages in a new window"
 msgstr "Otvorite izabrane poruke u novom prozoru"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2178
 msgid "_Move to Folder..."
 msgstr "_Premesti u fasciklu..."
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2180
 msgid "Move selected messages to another folder"
 msgstr "Premestite izabranu(e) poruku(e) u drugu fasciklu"
 
-#: ../mail/e-mail-reader.c:2159
+#: ../mail/e-mail-reader.c:2185
 msgid "_Switch to Folder"
 msgstr "Pređi u _fasciklu"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2187
 msgid "Display the parent folder"
 msgstr "Prikažite nadređenu fasciklu"
 
-#: ../mail/e-mail-reader.c:2166
+#: ../mail/e-mail-reader.c:2192
 msgid "Switch to _next tab"
 msgstr "Prebaci na _sledeći jezičak"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2194
 msgid "Switch to the next tab"
 msgstr "Prebacite se na sledeći jezičak"
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2199
 msgid "Switch to _previous tab"
 msgstr "Prebaci na _prethodni jezičak"
 
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2201
 msgid "Switch to the previous tab"
 msgstr "Prebacite se na prethodni jezičak"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2206
 msgid "Cl_ose current tab"
 msgstr "_Zatvori trenutni jezičak"
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2208
 msgid "Close current tab"
 msgstr "Zatvorite trenutni jezičak"
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2213
 msgid "_Next Message"
 msgstr "_Sledeća poruka"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2215
 msgid "Display the next message"
 msgstr "Prikažite sledeću poruku"
 
-#: ../mail/e-mail-reader.c:2194
+#: ../mail/e-mail-reader.c:2220
 msgid "Next _Important Message"
 msgstr "Sledeća _važna poruka"
 
-#: ../mail/e-mail-reader.c:2196
+#: ../mail/e-mail-reader.c:2222
 msgid "Display the next important message"
 msgstr "Prikažite sledeću važnu poruku"
 
-#: ../mail/e-mail-reader.c:2201
+#: ../mail/e-mail-reader.c:2227
 msgid "Next _Thread"
 msgstr "_Sledeća rasprava"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2229
 msgid "Display the next thread"
 msgstr "Prikažite sledeću raspravu"
 
-#: ../mail/e-mail-reader.c:2208
+#: ../mail/e-mail-reader.c:2234
 msgid "Next _Unread Message"
 msgstr "Sledeća _nepročitana poruka"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2236
 msgid "Display the next unread message"
 msgstr "Prikažite sledeću nepročitanu poruku"
 
-#: ../mail/e-mail-reader.c:2215
+#: ../mail/e-mail-reader.c:2241
 msgid "_Previous Message"
 msgstr "_Prethodna poruka"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2243
 msgid "Display the previous message"
 msgstr "Prikažite prethodnu poruku"
 
-#: ../mail/e-mail-reader.c:2222
+#: ../mail/e-mail-reader.c:2248
 msgid "Pr_evious Important Message"
 msgstr "Pr_ethodna važna poruka"
 
-#: ../mail/e-mail-reader.c:2224
+#: ../mail/e-mail-reader.c:2250
 msgid "Display the previous important message"
 msgstr "Prikažite prethodnu važnu poruku"
 
-#: ../mail/e-mail-reader.c:2229
+#: ../mail/e-mail-reader.c:2255
 msgid "Previous T_hread"
 msgstr "_Prethodna tema"
 
-#: ../mail/e-mail-reader.c:2231
+#: ../mail/e-mail-reader.c:2257
 msgid "Display the previous thread"
 msgstr "Prikažite prethodnu temu"
 
-#: ../mail/e-mail-reader.c:2236
+#: ../mail/e-mail-reader.c:2262
 msgid "P_revious Unread Message"
 msgstr "P_rethodna nepročitana poruka"
 
-#: ../mail/e-mail-reader.c:2238
+#: ../mail/e-mail-reader.c:2264
 msgid "Display the previous unread message"
 msgstr "Prikažite prethodnu nepročitanu poruku"
 
-#: ../mail/e-mail-reader.c:2245
+#: ../mail/e-mail-reader.c:2271
 msgid "Print this message"
 msgstr "Štampajte ovu poruku"
 
-#: ../mail/e-mail-reader.c:2252
+#: ../mail/e-mail-reader.c:2278
 msgid "Preview the message to be printed"
 msgstr "Pregledajte poruku pred štampu"
 
-#: ../mail/e-mail-reader.c:2257
+#: ../mail/e-mail-reader.c:2283
 msgid "Re_direct"
 msgstr "Preu_smeri"
 
-#: ../mail/e-mail-reader.c:2259
+#: ../mail/e-mail-reader.c:2285
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Preusmerite (bez čitanja) izabranu poruku nekome"
 
-#: ../mail/e-mail-reader.c:2264
+#: ../mail/e-mail-reader.c:2290
 msgid "Remo_ve Attachments"
 msgstr "_Ukloni priloge"
 
-#: ../mail/e-mail-reader.c:2266
+#: ../mail/e-mail-reader.c:2292
 msgid "Remove attachments"
 msgstr "Uklonite priloge"
 
-#: ../mail/e-mail-reader.c:2271
+#: ../mail/e-mail-reader.c:2297
 msgid "Remove Du_plicate Messages"
 msgstr "Ukloni _duplirane poruke"
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2299
 msgid "Checks selected messages for duplicates"
 msgstr "Proverite izabrane poruke za duplikate"
 
-#: ../mail/e-mail-reader.c:2278 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1574
-#: ../modules/mail/e-mail-attachment-handler.c:182
+#: ../mail/e-mail-reader.c:2304 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/mail/e-mail-attachment-handler.c:196
 msgid "Reply to _All"
 msgstr "Odgovori _svima"
 
-#: ../mail/e-mail-reader.c:2280
+#: ../mail/e-mail-reader.c:2306
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Sastavite odgovor svim primaocima izabrane poruke"
 
-#: ../mail/e-mail-reader.c:2285 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2311 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Odgovori na _listu"
 
-#: ../mail/e-mail-reader.c:2287
+#: ../mail/e-mail-reader.c:2313
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Sastavite odgovor dopisnoj listi izabrane poruke"
 
-#: ../mail/e-mail-reader.c:2292
-#: ../modules/mail/e-mail-attachment-handler.c:189
+#: ../mail/e-mail-reader.c:2318
+#: ../modules/mail/e-mail-attachment-handler.c:203
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljaocu"
 
-#: ../mail/e-mail-reader.c:2294
+#: ../mail/e-mail-reader.c:2320
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Sastavite odgovor pošiljaocu izabrane poruke"
 
-#: ../mail/e-mail-reader.c:2299
+#: ../mail/e-mail-reader.c:2325
 msgid "_Save as mbox..."
 msgstr "_Sačuvaj kao mboks..."
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2327
 msgid "Save selected messages as an mbox file"
 msgstr "Sačuvajte izabrane poruke kao „mbox“ datoteku"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2332
 msgid "_Message Source"
 msgstr "Izvo_rni kod poruke"
 
-#: ../mail/e-mail-reader.c:2308
+#: ../mail/e-mail-reader.c:2334
 msgid "Show the raw email source of the message"
 msgstr "Prikažite izvorni kod elektronske poruke"
 
-#: ../mail/e-mail-reader.c:2320
+#: ../mail/e-mail-reader.c:2346
 msgid "_Undelete Message"
 msgstr "P_ovrati poruku"
 
-#: ../mail/e-mail-reader.c:2322
+#: ../mail/e-mail-reader.c:2348
 msgid "Undelete the selected messages"
 msgstr "Povratite izabrane poruke"
 
-#: ../mail/e-mail-reader.c:2327
+#: ../mail/e-mail-reader.c:2353
 msgid "_Normal Size"
 msgstr "_Uobičajena veličina"
 
-#: ../mail/e-mail-reader.c:2329
+#: ../mail/e-mail-reader.c:2355
 msgid "Reset the text to its original size"
 msgstr "Vratite tekst na originalnu veličinu"
 
-#: ../mail/e-mail-reader.c:2334
+#: ../mail/e-mail-reader.c:2360
 msgid "_Zoom In"
 msgstr "U_većaj"
 
-#: ../mail/e-mail-reader.c:2336
+#: ../mail/e-mail-reader.c:2362
 msgid "Increase the text size"
 msgstr "Uvećajte veličinu teksta"
 
-#: ../mail/e-mail-reader.c:2341
+#: ../mail/e-mail-reader.c:2367
 msgid "Zoom _Out"
 msgstr "U_manji"
 
-#: ../mail/e-mail-reader.c:2343
+#: ../mail/e-mail-reader.c:2369
 msgid "Decrease the text size"
 msgstr "Umanjite veličinu teksta"
 
-#: ../mail/e-mail-reader.c:2350
+#: ../mail/e-mail-reader.c:2376
 msgid "Cre_ate"
 msgstr "_Napravi"
 
-#: ../mail/e-mail-reader.c:2357
+#: ../mail/e-mail-reader.c:2383
 msgid "Ch_aracter Encoding"
 msgstr "Kodna st_rana"
 
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2390
 msgid "F_orward As"
 msgstr "_Prosledi kao"
 
-#: ../mail/e-mail-reader.c:2371
+#: ../mail/e-mail-reader.c:2397
 msgid "_Group Reply"
 msgstr "O_dgovori grupi"
 
-#: ../mail/e-mail-reader.c:2378
+#: ../mail/e-mail-reader.c:2404
 msgid "_Go To"
 msgstr "_Idi na"
 
-#: ../mail/e-mail-reader.c:2385
+#: ../mail/e-mail-reader.c:2411
 msgid "Mar_k As"
 msgstr "O_znači kao"
 
-#: ../mail/e-mail-reader.c:2392
+#: ../mail/e-mail-reader.c:2418
 msgid "_Message"
 msgstr "_Poruka"
 
-#: ../mail/e-mail-reader.c:2399
+#: ../mail/e-mail-reader.c:2425
 msgid "_Zoom"
 msgstr "Uv_ećaj"
 
-#: ../mail/e-mail-reader.c:2409
+#: ../mail/e-mail-reader.c:2435
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Napravi fasciklu pretrage sa dopisne _liste..."
 
-#: ../mail/e-mail-reader.c:2411
+#: ../mail/e-mail-reader.c:2437
 msgid "Create a search folder for this mailing list"
 msgstr "Napravite fasciklu pretrage za ovu dopisnu listu"
 
-#: ../mail/e-mail-reader.c:2416
+#: ../mail/e-mail-reader.c:2442
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Napravi fasciklu pretrage od pri_malaca..."
 
-#: ../mail/e-mail-reader.c:2418
+#: ../mail/e-mail-reader.c:2444
 msgid "Create a search folder for these recipients"
 msgstr "Napravite fasciklu pretrage za ove primaoce"
 
-#: ../mail/e-mail-reader.c:2423
+#: ../mail/e-mail-reader.c:2449
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Napravi fasciklu pretrage od po_šiljaoca..."
 
-#: ../mail/e-mail-reader.c:2425
+#: ../mail/e-mail-reader.c:2451
 msgid "Create a search folder for this sender"
 msgstr "Napravite fasciklu pretrage za ovog pošiljaoca"
 
-#: ../mail/e-mail-reader.c:2430
+#: ../mail/e-mail-reader.c:2456
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Napravi fasciklu pretrage iz _naslova..."
 
-#: ../mail/e-mail-reader.c:2432
+#: ../mail/e-mail-reader.c:2458
 msgid "Create a search folder for this subject"
 msgstr "Napravite fasciklu pretrage za ovaj naslov"
 
-#: ../mail/e-mail-reader.c:2455
+#: ../mail/e-mail-reader.c:2481
 msgid "Mark for Follo_w Up..."
 msgstr "Obeleži za _praćenje..."
 
-#: ../mail/e-mail-reader.c:2463
+#: ../mail/e-mail-reader.c:2489
 msgid "Mark as _Important"
 msgstr "Onači kao _važno"
 
-#: ../mail/e-mail-reader.c:2467
+#: ../mail/e-mail-reader.c:2493
 msgid "Mark as _Junk"
 msgstr "Označi kao _đubre"
 
-#: ../mail/e-mail-reader.c:2471
+#: ../mail/e-mail-reader.c:2497
 msgid "Mark as _Not Junk"
 msgstr "Označi da _nije đubre"
 
-#: ../mail/e-mail-reader.c:2475
+#: ../mail/e-mail-reader.c:2501
 msgid "Mar_k as Read"
 msgstr "O_znači kao pročitano"
 
-#: ../mail/e-mail-reader.c:2479
+#: ../mail/e-mail-reader.c:2505
 msgid "Mark as Uni_mportant"
 msgstr "Označi kao _nevažno"
 
-#: ../mail/e-mail-reader.c:2483
+#: ../mail/e-mail-reader.c:2509
 msgid "Mark as _Unread"
 msgstr "Označi kao _nepročitano"
 
-#: ../mail/e-mail-reader.c:2527
+#: ../mail/e-mail-reader.c:2553
 msgid "_Caret Mode"
 msgstr "Metod u_metanja"
 
-#: ../mail/e-mail-reader.c:2529
+#: ../mail/e-mail-reader.c:2555
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Prikažite trepćući kursor u telu prikazanih poruka"
 
-#: ../mail/e-mail-reader.c:2535
+#: ../mail/e-mail-reader.c:2561
 msgid "All Message _Headers"
 msgstr "Sva _zaglavlja poruke"
 
-#: ../mail/e-mail-reader.c:2537
+#: ../mail/e-mail-reader.c:2563
 msgid "Show messages with all email headers"
 msgstr "Prikažite poruku sa svim zaglavljima el. pošte"
 
-#: ../mail/e-mail-reader.c:2868
+#: ../mail/e-mail-reader.c:2897
 msgid "Retrieving message"
 msgstr "Dovlačim poruku"
 
-#: ../mail/e-mail-reader.c:3851
-#: ../modules/mail/e-mail-attachment-handler.c:175
+#: ../mail/e-mail-reader.c:3877
+#: ../modules/mail/e-mail-attachment-handler.c:189
 msgid "_Forward"
 msgstr "Prosl_edi"
 
-#: ../mail/e-mail-reader.c:3852
+#: ../mail/e-mail-reader.c:3878
 msgid "Forward the selected message to someone"
 msgstr "Prosleđuje izabranu poruku nekome"
 
-#: ../mail/e-mail-reader.c:3871
+#: ../mail/e-mail-reader.c:3897
 msgid "Group Reply"
 msgstr "Odgovor grupi"
 
-#: ../mail/e-mail-reader.c:3872
+#: ../mail/e-mail-reader.c:3898
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Odgovorite dopisnoj listi ili svim primaocima"
 
-#: ../mail/e-mail-reader.c:3929 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:3964 ../mail/em-filter-i18n.h:15
 msgid "Delete"
 msgstr "Obriši"
 
-#: ../mail/e-mail-reader.c:3962
-#: ../modules/calendar/e-cal-shell-view-actions.c:1399
+#: ../mail/e-mail-reader.c:3997
+#: ../modules/calendar/e-cal-shell-view-actions.c:1398
 msgid "Next"
 msgstr "Sledeće"
 
-#: ../mail/e-mail-reader.c:3966
-#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+#: ../mail/e-mail-reader.c:4001
+#: ../modules/calendar/e-cal-shell-view-actions.c:1391
 msgid "Previous"
 msgstr "Prethodno"
 
-#: ../mail/e-mail-reader.c:3975 ../mail/mail-dialogs.ui.h:15
+#: ../mail/e-mail-reader.c:4010 ../mail/mail-dialogs.ui.h:15
 msgid "Reply"
 msgstr "Odgovori"
 
-#: ../mail/e-mail-reader.c:4705
+#: ../mail/e-mail-reader.c:4728
 #, c-format
 msgid "Folder '%s'"
 msgstr "Fascikla „%s“"
 
-#: ../mail/e-mail-reader-utils.c:154
+#: ../mail/e-mail-reader-utils.c:161
 msgid "Do not warn me again"
 msgstr "Ne upozoravaj me ponovo"
 
-#: ../mail/e-mail-reader-utils.c:954
+#: ../mail/e-mail-reader-utils.c:962
 msgid "Printing"
 msgstr "Štampam"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1136
+#: ../mail/e-mail-reader-utils.c:1148
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -12006,7 +13436,7 @@ msgstr[3] ""
 "Fascikla „%s“ sadrži %u dupliranu poruku. Da li ste sigurni da želite da je "
 "izbrišete?"
 
-#: ../mail/e-mail-reader-utils.c:1541
+#: ../mail/e-mail-reader-utils.c:1613
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Sačuvaj poruku"
@@ -12019,7 +13449,7 @@ msgstr[3] "Sačuvaj poruku"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:1562
+#: ../mail/e-mail-reader-utils.c:1634
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Poruka"
@@ -12027,16 +13457,16 @@ msgstr[1] "Poruke"
 msgstr[2] "Poruke"
 msgstr[3] "Poruka"
 
-#: ../mail/e-mail-reader-utils.c:2017
+#: ../mail/e-mail-reader-utils.c:2084
 msgid "Parsing message"
 msgstr "Obrađujem poruku"
 
-#: ../mail/e-mail-request.c:152
+#: ../mail/e-mail-request.c:177
 #, c-format
 msgid "Failed to load part '%s'"
 msgstr "Nisam uspeo da učitam deo „%s“"
 
-#: ../mail/e-mail-tag-editor.c:293
+#: ../mail/e-mail-tag-editor.c:292
 msgid "Flag to Follow Up"
 msgstr "Označi za praćenje"
 
@@ -12046,7 +13476,7 @@ msgstr "Označi za praćenje"
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1282
+#: ../mail/em-composer-utils.c:1278
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -12054,27 +13484,27 @@ msgstr ""
 "U ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. u ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} piše:"
 
-#: ../mail/em-composer-utils.c:1288
+#: ../mail/em-composer-utils.c:1284
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Prosleđena poruka --------"
 
-#: ../mail/em-composer-utils.c:1293
+#: ../mail/em-composer-utils.c:1289
 msgid "-----Original Message-----"
 msgstr "-----Originalna poruka-----"
 
-#: ../mail/em-composer-utils.c:2573
+#: ../mail/em-composer-utils.c:2611
 msgid "an unknown sender"
 msgstr "nepoznati pošiljalac"
 
-#: ../mail/em-composer-utils.c:2991
+#: ../mail/em-composer-utils.c:3030
 msgid "Posting destination"
 msgstr "Odredišna pošta"
 
-#: ../mail/em-composer-utils.c:2992
+#: ../mail/em-composer-utils.c:3031
 msgid "Choose folders to post the message to."
 msgstr "Izaberite fascikle za slanje poruke."
 
-#: ../mail/em-filter-editor-folder-element.c:158
+#: ../mail/em-filter-editor-folder-element.c:157
 msgid "Select Folder"
 msgstr "Izaberi fasciklu"
 
@@ -12084,252 +13514,257 @@ msgid "Adjust Score"
 msgstr "Preračunaj"
 
 #: ../mail/em-filter-i18n.h:3
+#| msgid "IMAP Headers"
+msgid "Any header"
+msgstr "Bilo koje zaglavlje"
+
+#: ../mail/em-filter-i18n.h:4
 msgid "Assign Color"
 msgstr "Dodeli boju"
 
-#: ../mail/em-filter-i18n.h:4
+#: ../mail/em-filter-i18n.h:5
 msgid "Assign Score"
 msgstr "Dodeli rezultat"
 
-#: ../mail/em-filter-i18n.h:6
+#: ../mail/em-filter-i18n.h:7
 msgid "BCC"
 msgstr "BCC"
 
-#: ../mail/em-filter-i18n.h:7
+#: ../mail/em-filter-i18n.h:8
 msgid "Beep"
 msgstr "Zvono"
 
-#: ../mail/em-filter-i18n.h:8
+#: ../mail/em-filter-i18n.h:9
 msgid "CC"
 msgstr "CC"
 
-#: ../mail/em-filter-i18n.h:9
+#: ../mail/em-filter-i18n.h:10
 msgid "Completed On"
 msgstr "Završeno za"
 
-#: ../mail/em-filter-i18n.h:12
+#: ../mail/em-filter-i18n.h:13
 msgid "Date received"
 msgstr "Datum primanja"
 
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:14
 msgid "Date sent"
 msgstr "Datum slanja"
 
-#: ../mail/em-filter-i18n.h:15
+#: ../mail/em-filter-i18n.h:16
 msgid "Deleted"
 msgstr "Obrisano"
 
-#: ../mail/em-filter-i18n.h:17
+#: ../mail/em-filter-i18n.h:18
 msgid "does not end with"
 msgstr "ne završava se sa"
 
-#: ../mail/em-filter-i18n.h:18
+#: ../mail/em-filter-i18n.h:19
 msgid "does not exist"
 msgstr "ne postoji"
 
-#: ../mail/em-filter-i18n.h:19
+#: ../mail/em-filter-i18n.h:20
 msgid "does not have words"
 msgstr "ne sadrži reči"
 
-#: ../mail/em-filter-i18n.h:20
+#: ../mail/em-filter-i18n.h:21
 msgid "does not return"
 msgstr "ne vraća"
 
-#: ../mail/em-filter-i18n.h:21
+#: ../mail/em-filter-i18n.h:22
 msgid "does not sound like"
 msgstr "ne zvuči kao"
 
-#: ../mail/em-filter-i18n.h:22
+#: ../mail/em-filter-i18n.h:23
 msgid "does not start with"
 msgstr "ne počinje sa"
 
-#: ../mail/em-filter-i18n.h:24
+#: ../mail/em-filter-i18n.h:25
 msgid "Draft"
 msgstr "Nacrt"
 
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:26
 msgid "ends with"
 msgstr "završava se sa"
 
-#: ../mail/em-filter-i18n.h:27
+#: ../mail/em-filter-i18n.h:28
 msgid "exists"
 msgstr "postoji"
 
-#: ../mail/em-filter-i18n.h:28
+#: ../mail/em-filter-i18n.h:29
 msgid "Expression"
 msgstr "Izraz"
 
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:30
 msgid "Follow Up"
 msgstr "Sledi"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:31
 msgid "Forward to"
 msgstr "Prosledi"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:32
 msgid "has words"
 msgstr "sadrži reči"
 
-#: ../mail/em-filter-i18n.h:32
+#: ../mail/em-filter-i18n.h:33
 msgid "Important"
 msgstr "Važno"
 
-#: ../mail/em-filter-i18n.h:34
+#: ../mail/em-filter-i18n.h:35
 msgid "is after"
 msgstr "je posle"
 
-#: ../mail/em-filter-i18n.h:35
+#: ../mail/em-filter-i18n.h:36
 msgid "is before"
 msgstr "je pre"
 
-#: ../mail/em-filter-i18n.h:36
+#: ../mail/em-filter-i18n.h:37
 msgid "is Flagged"
 msgstr "je označeno"
 
-#: ../mail/em-filter-i18n.h:40
+#: ../mail/em-filter-i18n.h:41
 msgid "is not Flagged"
 msgstr "nije označeno"
 
-#: ../mail/em-filter-i18n.h:41
+#: ../mail/em-filter-i18n.h:42
 msgid "is not set"
 msgstr "nije podešeno"
 
-#: ../mail/em-filter-i18n.h:42
+#: ../mail/em-filter-i18n.h:43
 msgid "is set"
 msgstr "podešeno"
 
-#: ../mail/em-filter-i18n.h:43 ../mail/mail-config.ui.h:109
+#: ../mail/em-filter-i18n.h:44 ../mail/mail-config.ui.h:109
 msgid "Junk"
 msgstr "Đubre"
 
-#: ../mail/em-filter-i18n.h:44
+#: ../mail/em-filter-i18n.h:45
 msgid "Junk Test"
 msgstr "Provera đubreta"
 
-#: ../mail/em-filter-i18n.h:45
+#: ../mail/em-filter-i18n.h:46
 msgid "Label"
 msgstr "Natpis"
 
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:47
 msgid "Mailing list"
 msgstr "Dopisna lista"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:48
 msgid "Match All"
 msgstr "Odgovara sve"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:49
 msgid "Message Body"
 msgstr "Telo poruke"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:50
 msgid "Message Header"
 msgstr "Zaglavlje poruke"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:51
 msgid "Message is Junk"
 msgstr "Poruka je đubre"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:52
 msgid "Message is not Junk"
 msgstr "Poruka nije đubre"
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:53
 msgid "Message Location"
 msgstr "Lokacija poruke"
 
-#: ../mail/em-filter-i18n.h:54
+#: ../mail/em-filter-i18n.h:55
 msgid "Pipe to Program"
 msgstr "Poveži na program"
 
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:56
 msgid "Play Sound"
 msgstr "Pusti zvuk"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:56 ../mail/mail-dialogs.ui.h:14
+#: ../mail/em-filter-i18n.h:57 ../mail/mail-dialogs.ui.h:14
 msgid "Read"
 msgstr "Čitaj"
 
-#: ../mail/em-filter-i18n.h:57 ../mail/message-list.etspec.h:16
+#: ../mail/em-filter-i18n.h:58 ../mail/message-list.etspec.h:16
 msgid "Recipients"
 msgstr "Primaoci"
 
-#: ../mail/em-filter-i18n.h:58
+#: ../mail/em-filter-i18n.h:59
 msgid "Regex Match"
 msgstr "Regizr odgovara"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:60
 msgid "Replied to"
 msgstr "Odgovoreno"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:61
 msgid "returns"
 msgstr "povratno"
 
-#: ../mail/em-filter-i18n.h:61
+#: ../mail/em-filter-i18n.h:62
 msgid "returns greater than"
 msgstr "povratno veće od"
 
-#: ../mail/em-filter-i18n.h:62
+#: ../mail/em-filter-i18n.h:63
 msgid "returns less than"
 msgstr "povratno manje od"
 
-#: ../mail/em-filter-i18n.h:63
+#: ../mail/em-filter-i18n.h:64
 msgid "Run Program"
 msgstr "Pokreni program"
 
-#: ../mail/em-filter-i18n.h:64 ../mail/message-list.etspec.h:3
+#: ../mail/em-filter-i18n.h:65 ../mail/message-list.etspec.h:3
 msgid "Score"
 msgstr "Rezultat"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/message-list.etspec.h:15
+#: ../mail/em-filter-i18n.h:66 ../mail/message-list.etspec.h:15
 msgid "Sender"
 msgstr "Pošiljalac"
 
 # bug(slobo): verovatno izveštaj o dostavi
-#: ../mail/em-filter-i18n.h:66
+#: ../mail/em-filter-i18n.h:67
 msgid "Sender or Recipients"
 msgstr "Pošiljalac ili primaoci"
 
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:68
 msgid "Set Label"
 msgstr "Postavi oznaku"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:69
 msgid "Set Status"
 msgstr "Postavi status"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:70
 msgid "Size (kB)"
 msgstr "Veličina (kB)"
 
-#: ../mail/em-filter-i18n.h:70
+#: ../mail/em-filter-i18n.h:71
 msgid "sounds like"
 msgstr "zvuči kao"
 
-#: ../mail/em-filter-i18n.h:71
+#: ../mail/em-filter-i18n.h:72
 msgid "Source Account"
 msgstr "Izvorni nalog"
 
-#: ../mail/em-filter-i18n.h:72
+#: ../mail/em-filter-i18n.h:73
 msgid "Specific header"
 msgstr "Određeno zaglavlje"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:74
 msgid "starts with"
 msgstr "počinje sa"
 
-#: ../mail/em-filter-i18n.h:75
+#: ../mail/em-filter-i18n.h:76
 msgid "Stop Processing"
 msgstr "Prekini obradu"
 
-#: ../mail/em-filter-i18n.h:78
+#: ../mail/em-filter-i18n.h:79
 msgid "Unset Color"
 msgstr "Nepostavljena boja"
 
-#: ../mail/em-filter-i18n.h:79
+#: ../mail/em-filter-i18n.h:80
 msgid "Unset Status"
 msgstr "Nepostavljen status"
 
@@ -12388,145 +13823,145 @@ msgstr "_Napravi"
 msgid "Folder _name:"
 msgstr "Naziv _fascikle:"
 
-#: ../mail/em-folder-tree.c:644
+#: ../mail/em-folder-tree.c:637
 msgid "Folder names cannot contain '/'"
 msgstr "Nazivi fascikli ne mogu da sadrže „/“"
 
-#: ../mail/em-folder-tree.c:780
+#: ../mail/em-folder-tree.c:774
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1605
+#: ../mail/em-folder-tree.c:1599
 msgid "Mail Folder Tree"
 msgstr "Stablo fascikle za poštu"
 
-#: ../mail/em-folder-tree.c:2132 ../mail/em-folder-utils.c:115
+#: ../mail/em-folder-tree.c:2130 ../mail/em-folder-utils.c:112
 #, c-format
 msgid "Moving folder %s"
 msgstr "Premeštam fasciklu „%s“"
 
-#: ../mail/em-folder-tree.c:2135 ../mail/em-folder-utils.c:117
+#: ../mail/em-folder-tree.c:2133 ../mail/em-folder-utils.c:114
 #, c-format
 msgid "Copying folder %s"
 msgstr "Umnožavam fasciklu „%s“"
 
-#: ../mail/em-folder-tree.c:2142 ../mail/message-list.c:2301
+#: ../mail/em-folder-tree.c:2140 ../mail/message-list.c:2283
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Premeštam poruke u fasciklu „%s“"
 
-#: ../mail/em-folder-tree.c:2146 ../mail/message-list.c:2303
+#: ../mail/em-folder-tree.c:2144 ../mail/message-list.c:2285
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Umnožavam poruke u fasciklu „%s“"
 
-#: ../mail/em-folder-tree.c:2165
+#: ../mail/em-folder-tree.c:2163
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ne mogu da ubacim poruku(e) u ostavu na najvišem nivou"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:156 ../mail/em-folder-tree-model.c:158
+#: ../mail/em-folder-tree-model.c:155 ../mail/em-folder-tree-model.c:157
 msgid "UNMATCHED"
 msgstr "NEODGOVARA"
 
-#: ../mail/em-folder-tree-model.c:849 ../mail/em-folder-tree-model.c:1134
+#: ../mail/em-folder-tree-model.c:848 ../mail/em-folder-tree-model.c:1133
 msgid "Loading..."
 msgstr "Učitavam..."
 
-#: ../mail/em-folder-utils.c:493
+#: ../mail/em-folder-utils.c:490
 msgid "Move Folder To"
 msgstr "Premesti fasciklu u"
 
-#: ../mail/em-folder-utils.c:493
+#: ../mail/em-folder-utils.c:490
 msgid "Copy Folder To"
 msgstr "Umnoži fasciklu u"
 
-#: ../mail/em-folder-utils.c:590
+#: ../mail/em-folder-utils.c:587
 msgid "Create Folder"
 msgstr "Napravi fasciklu"
 
-#: ../mail/em-folder-utils.c:591
+#: ../mail/em-folder-utils.c:588
 msgid "Specify where to create the folder:"
 msgstr "Navedite gde napraviti fasciklu:"
 
-#: ../mail/em-subscription-editor.c:869
+#: ../mail/em-subscription-editor.c:867
 msgid "_Subscribe"
 msgstr "Prijavi _se"
 
-#: ../mail/em-subscription-editor.c:878
+#: ../mail/em-subscription-editor.c:876
 msgid "Su_bscribe To Shown"
 msgstr "Prijavi se na _prikazane"
 
-#: ../mail/em-subscription-editor.c:886
+#: ../mail/em-subscription-editor.c:884
 msgid "Subscribe To _All"
 msgstr "Prijavi se _na sve"
 
-#: ../mail/em-subscription-editor.c:986 ../mail/em-subscription-editor.c:1847
-#: ../modules/mail/e-mail-shell-view-actions.c:1338
+#: ../mail/em-subscription-editor.c:981 ../mail/em-subscription-editor.c:1842
+#: ../modules/mail/e-mail-shell-view-actions.c:1398
 msgid "_Unsubscribe"
 msgstr "_Odjavi se"
 
-#: ../mail/em-subscription-editor.c:995
+#: ../mail/em-subscription-editor.c:990
 msgid "Unsu_bscribe From Hidden"
 msgstr "O_djavi se sa skrivenih"
 
-#: ../mail/em-subscription-editor.c:1003
+#: ../mail/em-subscription-editor.c:998
 msgid "Unsubscribe From _All"
 msgstr "Odja_vi se sa svih"
 
-#: ../mail/em-subscription-editor.c:1682
+#: ../mail/em-subscription-editor.c:1677
 msgid "Folder Subscriptions"
 msgstr "Prijave na fascikle"
 
-#: ../mail/em-subscription-editor.c:1722
+#: ../mail/em-subscription-editor.c:1717
 msgid "_Account:"
 msgstr "_Nalog:"
 
-#: ../mail/em-subscription-editor.c:1737
+#: ../mail/em-subscription-editor.c:1732
 msgid "Clear Search"
 msgstr "Očisti pretragu"
 
-#: ../mail/em-subscription-editor.c:1755
+#: ../mail/em-subscription-editor.c:1750
 msgid "Sho_w items that contain:"
 msgstr "_Prikaži stavke koje sadrže:"
 
-#: ../mail/em-subscription-editor.c:1800
+#: ../mail/em-subscription-editor.c:1795
 msgid "Subscribe to the selected folder"
 msgstr "Prijavite se na izabranu fasciklu"
 
-#: ../mail/em-subscription-editor.c:1801
+#: ../mail/em-subscription-editor.c:1796
 msgid "Su_bscribe"
 msgstr "P_rijavi se"
 
-#: ../mail/em-subscription-editor.c:1846
-#: ../modules/mail/e-mail-shell-view-actions.c:1340
+#: ../mail/em-subscription-editor.c:1841
+#: ../modules/mail/e-mail-shell-view-actions.c:1400
 msgid "Unsubscribe from the selected folder"
 msgstr "Odjavite se sa izabrane fascikle"
 
-#: ../mail/em-subscription-editor.c:1886
+#: ../mail/em-subscription-editor.c:1881
 msgid "Collapse all folders"
 msgstr "Skupite sve fascikle"
 
-#: ../mail/em-subscription-editor.c:1887
+#: ../mail/em-subscription-editor.c:1882
 msgid "C_ollapse All"
 msgstr "_Skupi sve"
 
-#: ../mail/em-subscription-editor.c:1897
+#: ../mail/em-subscription-editor.c:1892
 msgid "Expand all folders"
 msgstr "Razgranajte sve fascikle"
 
-#: ../mail/em-subscription-editor.c:1898
+#: ../mail/em-subscription-editor.c:1893
 msgid "E_xpand All"
 msgstr "_Razgranaj sve"
 
-#: ../mail/em-subscription-editor.c:1908
+#: ../mail/em-subscription-editor.c:1903
 msgid "Refresh the folder list"
 msgstr "Osvežite spisak fascikli"
 
-#: ../mail/em-subscription-editor.c:1920
+#: ../mail/em-subscription-editor.c:1915
 msgid "Stop the current operation"
 msgstr "Zaustavite trenutnu operaciju"
 
@@ -12534,7 +13969,7 @@ msgstr "Zaustavite trenutnu operaciju"
 #. * messages to be opened.  The %d is replaced with the actual
 #. * count of messages. If you need a '%' in your text, then
 #. * write it doubled, like '%%'.
-#: ../mail/em-utils.c:106
+#: ../mail/em-utils.c:97
 #, c-format
 msgid "Are you sure you want to open %d message at once?"
 msgid_plural "Are you sure you want to open %d messages at once?"
@@ -12543,16 +13978,16 @@ msgstr[1] "Sigurno želite da otvorite %d poruke odjednom?"
 msgstr[2] "Sigurno želite da otvorite %d poruka odjednom?"
 msgstr[3] "Sigurno želite da otvorite ovu jednu poruku?"
 
-#: ../mail/em-utils.c:162
+#: ../mail/em-utils.c:153
 #: ../modules/mailto-handler/evolution-mailto-handler.c:154
 msgid "_Do not show this message again"
 msgstr "_Ne prikazuj više ovu poruku"
 
-#: ../mail/em-utils.c:314
+#: ../mail/em-utils.c:305
 msgid "Message Filters"
-msgstr "Filteri poruka"
+msgstr "Propusnici poruka"
 
-#: ../mail/em-utils.c:1067
+#: ../mail/em-utils.c:1058
 #, c-format
 msgid "Messages from %s"
 msgstr "Poruke koje je poslao %s"
@@ -12561,90 +13996,83 @@ msgstr "Poruke koje je poslao %s"
 msgid "Search _Folders"
 msgstr "Fas_cikle pretrage"
 
-#: ../mail/em-vfolder-editor-rule.c:391
+#: ../mail/em-vfolder-editor-rule.c:397
 msgid "Add Folder"
 msgstr "Dodaj fasciklu"
 
-#: ../mail/em-vfolder-editor-rule.c:517
+#: ../mail/em-vfolder-editor-rule.c:523
 msgid "Search Folder Sources"
 msgstr "Izvor fascikle pretrage"
 
-#: ../mail/em-vfolder-editor-rule.c:549
+#: ../mail/em-vfolder-editor-rule.c:555
 msgid "Automatically update on any _source folder change"
 msgstr "Sam osveži pri _svakoj izmeni izvorne fascikle"
 
-#: ../mail/em-vfolder-editor-rule.c:561
+#: ../mail/em-vfolder-editor-rule.c:567
 msgid "All local folders"
 msgstr "Sve lokalne fascikle"
 
-#: ../mail/em-vfolder-editor-rule.c:562
+#: ../mail/em-vfolder-editor-rule.c:568
 msgid "All active remote folders"
 msgstr "Sve aktivne mrežne fascikle"
 
-#: ../mail/em-vfolder-editor-rule.c:563
+#: ../mail/em-vfolder-editor-rule.c:569
 msgid "All local and active remote folders"
 msgstr "Sve lokalne i aktivne mrežne fascikle"
 
-#: ../mail/em-vfolder-editor-rule.c:564
+#: ../mail/em-vfolder-editor-rule.c:570
 msgid "Specific folders"
 msgstr "Određene fascikle"
 
-#: ../mail/em-vfolder-editor-rule.c:602
+#: ../mail/em-vfolder-editor-rule.c:608
 msgid "include subfolders"
 msgstr "uključi podfascikle"
 
-#: ../mail/importers/elm-importer.c:179
+#: ../mail/importers/elm-importer.c:178
 msgid "Importing Elm data"
 msgstr "Uvoženje Elm podataka"
 
-# 48x48/emblems/emblem-mail.icon.in.h:1
-#: ../mail/importers/elm-importer.c:332 ../mail/importers/pine-importer.c:423
-#: ../modules/mail/e-mail-shell-view.c:1074
-#: ../widgets/misc/e-send-options.c:538
-msgid "Mail"
-msgstr "Pošta"
-
-#: ../mail/importers/elm-importer.c:379
+#: ../mail/importers/elm-importer.c:378
 msgid "Evolution Elm importer"
 msgstr "Elm uvoznik Evolucije"
 
-#: ../mail/importers/elm-importer.c:380
+#: ../mail/importers/elm-importer.c:379
 msgid "Import mail from Elm."
 msgstr "Uvozi poštu iz Elma."
 
-#: ../mail/importers/evolution-mbox-importer.c:142
-#: ../plugins/dbx-import/dbx-importer.c:255
+#: ../mail/importers/evolution-mbox-importer.c:140
+#: ../plugins/dbx-import/dbx-importer.c:250
 msgid "_Destination folder:"
 msgstr "_Odredišna fascikla:"
 
-#: ../mail/importers/evolution-mbox-importer.c:148
-#: ../plugins/dbx-import/dbx-importer.c:261
-#: ../plugins/pst-import/pst-importer.c:570
+#: ../mail/importers/evolution-mbox-importer.c:146
+#: ../plugins/dbx-import/dbx-importer.c:256
+#: ../plugins/pst-import/pst-importer.c:567
 msgid "Select folder"
 msgstr "Izaberite fasciklu"
 
-#: ../mail/importers/evolution-mbox-importer.c:149
-#: ../plugins/dbx-import/dbx-importer.c:262
-#: ../plugins/pst-import/pst-importer.c:571
+#: ../mail/importers/evolution-mbox-importer.c:147
+#: ../plugins/dbx-import/dbx-importer.c:257
+#: ../plugins/pst-import/pst-importer.c:568
 msgid "Select folder to import into"
 msgstr "Izaberite fasciklu za uvoz"
 
-#: ../mail/importers/evolution-mbox-importer.c:439
+#: ../mail/importers/evolution-mbox-importer.c:437
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Naslov"
 
-#: ../mail/importers/evolution-mbox-importer.c:444
+#: ../mail/importers/evolution-mbox-importer.c:442
 msgctxt "mboxImp"
 msgid "From"
 msgstr "Šalje"
 
-#: ../mail/importers/evolution-mbox-importer.c:488
-#: ../shell/e-shell-utils.c:195
+#: ../mail/importers/evolution-mbox-importer.c:486
+#: ../shell/e-shell-utils.c:193
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkli poštansko sanduče (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:489
+#: ../mail/importers/evolution-mbox-importer.c:487
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Uvoznik za fascikle oblika Berkli poštanskog sandučeta"
 
@@ -12654,8 +14082,8 @@ msgstr "Uvoženje poštanskog sandučeta"
 
 #. Destination folder, was set in our widget
 #: ../mail/importers/mail-importer.c:153
-#: ../plugins/dbx-import/dbx-importer.c:616
-#: ../plugins/pst-import/pst-importer.c:784
+#: ../plugins/dbx-import/dbx-importer.c:612
+#: ../plugins/pst-import/pst-importer.c:781
 #, c-format
 msgid "Importing '%s'"
 msgstr "Uvozim „%s“"
@@ -12665,43 +14093,39 @@ msgstr "Uvozim „%s“"
 msgid "Scanning %s"
 msgstr "Pretražujem „%s“"
 
-#: ../mail/importers/pine-importer.c:251
+#: ../mail/importers/pine-importer.c:250
 msgid "Importing Pine data"
 msgstr "Uvoženje Pine podatke"
 
-#: ../mail/importers/pine-importer.c:430
-msgid "Address Book"
-msgstr "Adresar"
-
-#: ../mail/importers/pine-importer.c:478
+#: ../mail/importers/pine-importer.c:477
 msgid "Evolution Pine importer"
 msgstr "Pine uvoznik Evolucije"
 
-#: ../mail/importers/pine-importer.c:479
+#: ../mail/importers/pine-importer.c:478
 msgid "Import mail from Pine."
 msgstr "Uvozi poštu iz programa Pine."
 
-#: ../mail/mail-autofilter.c:73
+#: ../mail/mail-autofilter.c:70
 #, c-format
 msgid "Mail to %s"
 msgstr "Pošta za %s"
 
-#: ../mail/mail-autofilter.c:229 ../mail/mail-autofilter.c:272
+#: ../mail/mail-autofilter.c:226 ../mail/mail-autofilter.c:269
 #, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: ../mail/mail-autofilter.c:255
+#: ../mail/mail-autofilter.c:252
 #, c-format
 msgid "Subject is %s"
 msgstr "Naslov je %s"
 
-#: ../mail/mail-autofilter.c:296
+#: ../mail/mail-autofilter.c:293
 #, c-format
 msgid "%s mailing list"
 msgstr "%s dopisna lista"
 
-#: ../mail/mail-autofilter.c:406
+#: ../mail/mail-autofilter.c:403
 msgid "Add Filter Rule"
 msgstr "Dodaj pravilo filtriranja"
 
@@ -12710,7 +14134,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.
-#: ../mail/mail-autofilter.c:513
+#: ../mail/mail-autofilter.c:510
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -12823,16 +14247,16 @@ msgid "_Languages"
 msgstr "_Jezici"
 
 #: ../mail/mail-config.ui.h:23
+msgid "Languages Table"
+msgstr "Tabela jezika"
+
+#: ../mail/mail-config.ui.h:24
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "Spisak jezika ovde oslikava samo one jezike za koje imate instaliran rečnik."
 
-#: ../mail/mail-config.ui.h:24
-msgid "Languages Table"
-msgstr "Tabela jezika"
-
 #: ../mail/mail-config.ui.h:26
 msgid "Check spelling while I _type"
 msgstr "Proveri pravopis dok _kucam"
@@ -12959,7 +14383,7 @@ msgid "No _Proxy for:"
 msgstr "Bez _posrednika za:"
 
 #: ../mail/mail-config.ui.h:64
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:614
 msgid "Port:"
 msgstr "Port:"
 
@@ -13040,8 +14464,9 @@ msgid "Delete Mail"
 msgstr "Obriši poštu"
 
 #: ../mail/mail-config.ui.h:85
-msgid "Empty trash folders on e_xit"
-msgstr "Isprazni fascikle sa _smećem kada izađeš"
+#| msgid "Empty trash folders on e_xit"
+msgid "Empty _trash folders"
+msgstr "Isprazni fascikle _smeća"
 
 #: ../mail/mail-config.ui.h:86
 msgid "Confirm _when expunging a folder"
@@ -13101,7 +14526,7 @@ msgid "Mail Headers Table"
 msgstr "Tabela zaglavlja pošte"
 
 #: ../mail/mail-config.ui.h:101
-#: ../modules/addressbook/autocompletion-config.c:90
+#: ../modules/addressbook/autocompletion-config.c:86
 #: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Date/Time Format"
 msgstr "Format datum/vreme"
@@ -13111,8 +14536,9 @@ msgid "Check incoming _messages for junk"
 msgstr "Proveri ima li đubreta u _pristigloj pošti"
 
 #: ../mail/mail-config.ui.h:104
-msgid "Delete junk messages on e_xit"
-msgstr "Obriši đubre pri i_zlazu"
+#| msgid "Delete junk messages on e_xit"
+msgid "_Delete junk messages"
+msgstr "_Obriši poruke đubra"
 
 #: ../mail/mail-config.ui.h:105
 msgid "Check cu_stom headers for junk"
@@ -13132,17 +14558,17 @@ msgstr ""
 "Opcija se zanemaruje ukoliko je pronađeno poklapanje sa proizvoljnim zaglavljem "
 "đubreta."
 
-#: ../mail/mail-config.ui.h:110 ../modules/addressbook/ldap-config.ui.h:3
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:237
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:161
+#: ../mail/mail-config.ui.h:110
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:225
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:159
 msgid "No encryption"
 msgstr "Bez šifrovanja"
 
-#: ../mail/mail-config.ui.h:111 ../modules/addressbook/ldap-config.ui.h:1
+#: ../mail/mail-config.ui.h:111
 msgid "TLS encryption"
 msgstr "TLS šifrovanje"
 
-#: ../mail/mail-config.ui.h:112 ../modules/addressbook/ldap-config.ui.h:2
+#: ../mail/mail-config.ui.h:112
 msgid "SSL encryption"
 msgstr "SSL šifrovanje"
 
@@ -13425,7 +14851,7 @@ msgstr ""
 "Sigurno želite trajno da uklonite sve obrisane poruke iz svih fascikli?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1233
+#: ../modules/mail/e-mail-shell-view-actions.c:1286
 msgid "_Empty Trash"
 msgstr "_Izbaci smeće"
 
@@ -13576,13 +15002,15 @@ msgstr "Ne mogu da premestim fasciklu „{0}“ u „{1}“."
 
 # mail:no-copy-folder-nostore secondary
 #: ../mail/mail.error.xml.h:74
-msgid "Cannot open source \"{2}\"."
-msgstr "Ne mogu da otvorim izvor „{2}“."
+#| msgid "Cannot open source \"{2}\"."
+msgid "Cannot open source folder. Error: {2}"
+msgstr "Ne mogu da otvorim fasciklu izvora. Greška: {2}"
 
 # mail:no-copy-folder-to-nostore secondary
 #: ../mail/mail.error.xml.h:75
-msgid "Cannot open target \"{2}\"."
-msgstr "Ne mogu da otvorim cilj „{2}“."
+#| msgid "Cannot open target \"{2}\"."
+msgid "Cannot open target folder. Error: {2}"
+msgstr "Ne mogu da otvorim fasciklu mete. Greška: {2}"
 
 # mail:no-copy-folder-to-nostore primary
 #: ../mail/mail.error.xml.h:76
@@ -13593,9 +15021,11 @@ msgstr "Ne mogu da umnožim fasciklu „{0}“ u „{1}“."
 msgid "Cannot create folder \"{0}\"."
 msgstr "Ne mogu da napravim fasciklu „{0}“."
 
+# mail:no-move-folder-to-nostore primary
 #: ../mail/mail.error.xml.h:78
-msgid "Cannot open source \"{1}\"."
-msgstr "Ne mogu da otvorim izvor „{1}“"
+#| msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgid "Cannot open folder. Error: {1}"
+msgstr "Ne mogu da otvorim fasciklu. Greška: {1}"
 
 # mail:account-notunique primary
 #: ../mail/mail.error.xml.h:79
@@ -13644,7 +15074,7 @@ msgid "Do _Not Disable"
 msgstr "Nemoj _isključiti"
 
 #: ../mail/mail.error.xml.h:90
-#: ../plugins/publish-calendar/publish-calendar.c:626
+#: ../plugins/publish-calendar/publish-calendar.c:635
 msgid "_Disable"
 msgstr "_Isključi"
 
@@ -13674,7 +15104,7 @@ msgstr "Fascikle pretrage su automatski ažurirane."
 
 #: ../mail/mail.error.xml.h:97
 msgid "Mail filters automatically updated."
-msgstr "Filteri pošte su automatski ažurirani."
+msgstr "Propusnici pošte su automatski ažurirani."
 
 #: ../mail/mail.error.xml.h:98
 msgid "Missing folder."
@@ -13689,8 +15119,9 @@ msgid "You must name this Search Folder."
 msgstr "Morate da date naziv ovoj fascikli pretrage."
 
 #: ../mail/mail.error.xml.h:102
-msgid "No sources selected."
-msgstr "Izvori nisu izabrani."
+#| msgid "No sources selected."
+msgid "No folder selected."
+msgstr "Nije izabrana nijedna fascikla."
 
 #: ../mail/mail.error.xml.h:103
 msgid ""
@@ -13935,7 +15366,7 @@ msgstr "Nisam uspeo da pronađem duplirane poruke."
 
 #: ../mail/mail.error.xml.h:158
 msgid "Failed to retrieve messages."
-msgstr "Nisam uspeo da dovučem poruke"
+msgstr "Nisam uspeo da dovučem poruke."
 
 #: ../mail/mail.error.xml.h:159
 msgid "Failed to remove attachments from messages."
@@ -13974,128 +15405,125 @@ msgstr "Štampač je odgovorio „{0}“."
 msgid "Could not perform this operation on {0}."
 msgstr "Ne mogu da izvršim ovu radnju nad „{0}“."
 
-#: ../mail/mail-send-recv.c:203
+#: ../mail/mail-send-recv.c:202
 msgid "Canceling..."
 msgstr "Otkazujem..."
 
-#: ../mail/mail-send-recv.c:547
+#: ../mail/mail-send-recv.c:546
 msgid "Send & Receive Mail"
 msgstr "Slanje i primanje pošte"
 
-#: ../mail/mail-send-recv.c:563
+#: ../mail/mail-send-recv.c:562
 msgid "Cancel _All"
 msgstr "Otkaži _sve"
 
-#: ../mail/mail-send-recv.c:656 ../mail/mail-send-recv.c:1040
+#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:1041
 msgid "Updating..."
 msgstr "Osvežavam..."
 
-#: ../mail/mail-send-recv.c:656 ../mail/mail-send-recv.c:737
+#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:736
 msgid "Waiting..."
 msgstr "Čekam..."
 
 #: ../mail/mail-send-recv.c:1020
 #, c-format
-msgid "Checking for new mail"
-msgstr "Vršim proveru za novom poštom"
+#| msgid "Checking for new mail"
+msgid "Checking for new mail at '%s'"
+msgstr "Vršim proveru za novom poštom na „%s“"
 
-#: ../mail/mail-vfolder-ui.c:79
+#: ../mail/mail-vfolder-ui.c:78
 msgid "Search Folders"
 msgstr "Fascikle pretrage"
 
-#: ../mail/mail-vfolder-ui.c:159
+#: ../mail/mail-vfolder-ui.c:158
 msgid "Edit Search Folder"
 msgstr "Uredi fasciklu pretrage"
 
-#: ../mail/mail-vfolder-ui.c:280
+#: ../mail/mail-vfolder-ui.c:279
 msgid "New Search Folder"
 msgstr "Nova fascikla pretrage"
 
-#: ../mail/message-list.c:1262
+#: ../mail/message-list.c:1244
 msgid "Unseen"
 msgstr "Neviđeno"
 
-#: ../mail/message-list.c:1263
+#: ../mail/message-list.c:1245
 msgid "Seen"
 msgstr "Viđeno"
 
-#: ../mail/message-list.c:1264
+#: ../mail/message-list.c:1246
 msgid "Answered"
 msgstr "Odgovoreno"
 
-#: ../mail/message-list.c:1265
+#: ../mail/message-list.c:1247
 msgid "Forwarded"
 msgstr "Prosleđeno"
 
-#: ../mail/message-list.c:1266
+#: ../mail/message-list.c:1248
 msgid "Multiple Unseen Messages"
 msgstr "Višestruke neviđene poruke"
 
-#: ../mail/message-list.c:1267
+#: ../mail/message-list.c:1249
 msgid "Multiple Messages"
 msgstr "Višestruke poruke"
 
-#: ../mail/message-list.c:1271
+#: ../mail/message-list.c:1253
 msgid "Lowest"
 msgstr "Najniže"
 
-#: ../mail/message-list.c:1272
+#: ../mail/message-list.c:1254
 msgid "Lower"
 msgstr "Niže"
 
-#: ../mail/message-list.c:1276
+#: ../mail/message-list.c:1258
 msgid "Higher"
 msgstr "Više"
 
-#: ../mail/message-list.c:1277
+#: ../mail/message-list.c:1259
 msgid "Highest"
 msgstr "Najviše"
 
-#: ../mail/message-list.c:1900 ../widgets/table/e-cell-date.c:51
-msgid "?"
-msgstr "?"
-
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1907 ../modules/itip-formatter/itip-view.c:249
+#: ../mail/message-list.c:1889 ../modules/itip-formatter/itip-view.c:242
 msgid "Today %l:%M %p"
 msgstr "Danas u %l:%M %p"
 
-#: ../mail/message-list.c:1916
+#: ../mail/message-list.c:1898
 msgid "Yesterday %l:%M %p"
 msgstr "Juče u %l:%M %p"
 
-#: ../mail/message-list.c:1928
+#: ../mail/message-list.c:1910
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1936
+#: ../mail/message-list.c:1918
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1938
+#: ../mail/message-list.c:1920
 msgid "%b %d %Y"
 msgstr "%d. %b %Y."
 
-#: ../mail/message-list.c:2769
+#: ../mail/message-list.c:2751
 msgid "Select all visible messages"
 msgstr "Izaberi sve vidljive poruke"
 
-#: ../mail/message-list.c:2907 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:2889 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Poruke"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4132
+#: ../mail/message-list.c:4114
 msgid "Follow-up"
 msgstr "Sledi"
 
 #. there is some info why the message list is empty, let it be something useful
-#: ../mail/message-list.c:4634 ../mail/message-list.c:5038
+#: ../mail/message-list.c:4616 ../mail/message-list.c:5020
 msgid "Generating message list"
 msgstr "Pravljenje liste poruka"
 
-#: ../mail/message-list.c:4868
+#: ../mail/message-list.c:4850
 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 "
@@ -14107,7 +15535,7 @@ msgstr ""
 "pokrenite novu pretragu bilo čišćenjem iste pomoću stavke izbornika „Pretraga—"
 ">Očisti“ ili izmenivši gornji upit."
 
-#: ../mail/message-list.c:4873
+#: ../mail/message-list.c:4855
 msgid "There are no messages in this folder."
 msgstr "Nema poruka u ovoj fascikli."
 
@@ -14132,8 +15560,9 @@ msgid "Due By"
 msgstr "Rok"
 
 #: ../mail/message-list.etspec.h:18
-msgid "Sent Messages"
-msgstr "Poslate poruke"
+#| msgid "Messages"
+msgid "Messages To"
+msgstr "Poruke"
 
 #: ../mail/message-list.etspec.h:20
 msgid "Subject - Trimmed"
@@ -14144,49 +15573,49 @@ msgid "Subject or Addresses contains"
 msgstr "Naslov ili adrese sadrže"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:1698
+#: ../modules/mail/e-mail-shell-view-actions.c:1762
 msgid "Recipients contain"
 msgstr "Primaoci sadrže"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1691
+#: ../modules/mail/e-mail-shell-view-actions.c:1755
 msgid "Message contains"
 msgstr "Poruka sadrži"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:1712
+#: ../modules/mail/e-mail-shell-view-actions.c:1776
 msgid "Subject contains"
 msgstr "Naslov sadrži"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:1705
+#: ../modules/mail/e-mail-shell-view-actions.c:1769
 msgid "Sender contains"
 msgstr "Pošiljalac sadrži"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1684
+#: ../modules/mail/e-mail-shell-view-actions.c:1748
 msgid "Body contains"
 msgstr "Telo sadrži"
 
 #. To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list
-#: ../modules/addressbook/autocompletion-config.c:96
-#: ../modules/mail/em-mailer-prefs.c:1143
+#: ../modules/addressbook/autocompletion-config.c:92
+#: ../modules/mail/em-mailer-prefs.c:1139
 msgid "_Table column:"
 msgstr "Kolona _tabele:"
 
-#: ../modules/addressbook/autocompletion-config.c:99
+#: ../modules/addressbook/autocompletion-config.c:95
 msgid "Address formatting"
 msgstr "Oblikovanje adrese"
 
-#: ../modules/addressbook/autocompletion-config.c:102
+#: ../modules/addressbook/autocompletion-config.c:98
 msgid "_Format address according to standard of its destination country"
 msgstr "_Oblikuj adresu prema standardu države njenog odredišta"
 
-#: ../modules/addressbook/autocompletion-config.c:111
+#: ../modules/addressbook/autocompletion-config.c:107
 msgid "Autocompletion"
 msgstr "Samodovršavanje"
 
-#: ../modules/addressbook/autocompletion-config.c:114
+#: ../modules/addressbook/autocompletion-config.c:110
 msgid "Always _show address of the autocompleted contact"
 msgstr "Uvek _prikazuj adresu samodopunjenog kontakta"
 
@@ -14210,297 +15639,285 @@ msgstr "Podaci za stupanje u vezu"
 msgid "Contact information for %s"
 msgstr "Podaci o kontaktu za %s"
 
-#: ../modules/addressbook/e-book-shell-backend.c:229
-#: ../modules/addressbook/e-book-shell-view-actions.c:131
+#: ../modules/addressbook/e-book-shell-backend.c:254
+#: ../modules/addressbook/e-book-shell-view-actions.c:125
 msgid "New Address Book"
 msgstr "Novi adresar"
 
-#: ../modules/addressbook/e-book-shell-backend.c:238
+#: ../modules/addressbook/e-book-shell-backend.c:263
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../modules/addressbook/e-book-shell-backend.c:240
-#: ../modules/addressbook/e-book-shell-view-actions.c:904
+#: ../modules/addressbook/e-book-shell-backend.c:265
+#: ../modules/addressbook/e-book-shell-view-actions.c:898
 msgid "Create a new contact"
 msgstr "Napravite novi kontakt"
 
-#: ../modules/addressbook/e-book-shell-backend.c:245
+#: ../modules/addressbook/e-book-shell-backend.c:270
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Li_sta kontakta"
 
-#: ../modules/addressbook/e-book-shell-backend.c:247
-#: ../modules/addressbook/e-book-shell-view-actions.c:911
+#: ../modules/addressbook/e-book-shell-backend.c:272
+#: ../modules/addressbook/e-book-shell-view-actions.c:905
 msgid "Create a new contact list"
 msgstr "Napravite novi spisak kontakta"
 
-#: ../modules/addressbook/e-book-shell-backend.c:255
+#: ../modules/addressbook/e-book-shell-backend.c:280
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Adresar"
 
-#: ../modules/addressbook/e-book-shell-backend.c:257
-#: ../modules/addressbook/e-book-shell-view-actions.c:834
+#: ../modules/addressbook/e-book-shell-backend.c:282
+#: ../modules/addressbook/e-book-shell-view-actions.c:828
 msgid "Create a new address book"
 msgstr "Napravite novi adresar"
 
-#: ../modules/addressbook/e-book-shell-backend.c:274
-#: ../modules/addressbook/e-book-shell-view.c:356
-msgid "Contacts"
-msgstr "Kontakti"
-
-#: ../modules/addressbook/e-book-shell-backend.c:285
+#: ../modules/addressbook/e-book-shell-backend.c:310
 msgid "Certificates"
 msgstr "Uverenja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:204
+#: ../modules/addressbook/e-book-shell-view-actions.c:198
 msgid "Address Book Properties"
 msgstr "Postavke adresara"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:386
-#: ../modules/addressbook/e-book-shell-view-actions.c:682
+#: ../modules/addressbook/e-book-shell-view-actions.c:380
+#: ../modules/addressbook/e-book-shell-view-actions.c:676
 msgid "Save as vCard"
 msgstr "Sačuvajte kao vKartu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:811
+#: ../modules/addressbook/e-book-shell-view-actions.c:805
 msgid "Co_py All Contacts To..."
 msgstr "Umnoži _sve kontakte u..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:813
+#: ../modules/addressbook/e-book-shell-view-actions.c:807
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Umnožite kontakte izabranog adresara u drugi"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:818
+#: ../modules/addressbook/e-book-shell-view-actions.c:812
 msgid "D_elete Address Book"
 msgstr "O_briši adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:820
+#: ../modules/addressbook/e-book-shell-view-actions.c:814
 msgid "Delete the selected address book"
 msgstr "Obrišite izabrani adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:825
+#: ../modules/addressbook/e-book-shell-view-actions.c:819
 msgid "Mo_ve All Contacts To..."
 msgstr "Premesti _sve kontakte u..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:827
+#: ../modules/addressbook/e-book-shell-view-actions.c:821
 msgid "Move the contacts of the selected address book to another"
 msgstr "Premestite kontakte izabranog adresara u drugi"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:832
+#: ../modules/addressbook/e-book-shell-view-actions.c:826
 msgid "_New Address Book"
 msgstr "_Novi adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:839
+#: ../modules/addressbook/e-book-shell-view-actions.c:833
 msgid "Address _Book Properties"
 msgstr "Podešavanja adresa_ra"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:841
+#: ../modules/addressbook/e-book-shell-view-actions.c:835
 msgid "Show properties of the selected address book"
 msgstr "Prikažite svojstva izabranog adresara"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:846
+#: ../modules/addressbook/e-book-shell-view-actions.c:840
 msgid "Address Book _Map"
 msgstr "_Mapa adresara"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:848
+#: ../modules/addressbook/e-book-shell-view-actions.c:842
 msgid "Show map with all contacts from selected address book"
 msgstr "Prikažite mapu sa svim kontaktima iz izabranih adresara"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:853
-#: ../modules/calendar/e-cal-shell-view-actions.c:1448
-#: ../modules/calendar/e-memo-shell-view-actions.c:665
-#: ../modules/calendar/e-task-shell-view-actions.c:789
-#: ../modules/mail/e-mail-shell-view-actions.c:1317
+#: ../modules/addressbook/e-book-shell-view-actions.c:847
+#: ../modules/calendar/e-cal-shell-view-actions.c:1447
+#: ../modules/calendar/e-memo-shell-view-actions.c:664
+#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/mail/e-mail-shell-view-actions.c:1377
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:855
+#: ../modules/addressbook/e-book-shell-view-actions.c:849
 msgid "Rename the selected address book"
 msgstr "Preimenujte izabrani adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:862
+#: ../modules/addressbook/e-book-shell-view-actions.c:856
 msgid "Stop loading"
 msgstr "Prekini učitavanje"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:867
+#: ../modules/addressbook/e-book-shell-view-actions.c:861
 msgid "_Copy Contact To..."
 msgstr "_Umnoži kontakt u..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:869
+#: ../modules/addressbook/e-book-shell-view-actions.c:863
 msgid "Copy selected contacts to another address book"
 msgstr "Umnožite izabrane kontakte u drugi adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:874
+#: ../modules/addressbook/e-book-shell-view-actions.c:868
 msgid "_Delete Contact"
 msgstr "_Ukloni Kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:881
+#: ../modules/addressbook/e-book-shell-view-actions.c:875
 msgid "_Find in Contact..."
 msgstr "_Pronađi u kontaktu..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:883
+#: ../modules/addressbook/e-book-shell-view-actions.c:877
 msgid "Search for text in the displayed contact"
 msgstr "Pretražite tekst u prikazanom kontaktu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:888
+#: ../modules/addressbook/e-book-shell-view-actions.c:882
 msgid "_Forward Contact..."
 msgstr "_Prosledi kontakt..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:890
+#: ../modules/addressbook/e-book-shell-view-actions.c:884
 msgid "Send selected contacts to another person"
 msgstr "Pošaljite izabrane kontakte drugoj osobi"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:895
+#: ../modules/addressbook/e-book-shell-view-actions.c:889
 msgid "_Move Contact To..."
 msgstr "_Premesti kontakt u..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:897
+#: ../modules/addressbook/e-book-shell-view-actions.c:891
 msgid "Move selected contacts to another address book"
 msgstr "Premestite izabrane kontakte u drugi adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:902
+#: ../modules/addressbook/e-book-shell-view-actions.c:896
 msgid "_New Contact..."
 msgstr "Novi kon_takt..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:909
+#: ../modules/addressbook/e-book-shell-view-actions.c:903
 msgid "New Contact _List..."
 msgstr "Nova _lista kontakta..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:916
+#: ../modules/addressbook/e-book-shell-view-actions.c:910
 msgid "_Open Contact"
 msgstr "_Otvori kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:918
+#: ../modules/addressbook/e-book-shell-view-actions.c:912
 msgid "View the current contact"
 msgstr "Pregledajte tekući kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:923
+#: ../modules/addressbook/e-book-shell-view-actions.c:917
 msgid "_Send Message to Contact..."
 msgstr "_Pošalji poruku kontaktu..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:925
+#: ../modules/addressbook/e-book-shell-view-actions.c:919
 msgid "Send a message to the selected contacts"
 msgstr "Pošaljite poruku izabranim kontaktima"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:932
-#: ../modules/calendar/e-cal-shell-view-actions.c:1604
-#: ../modules/calendar/e-task-shell-view-actions.c:847
+#: ../modules/addressbook/e-book-shell-view-actions.c:926
+#: ../modules/calendar/e-cal-shell-view-actions.c:1603
+#: ../modules/calendar/e-task-shell-view-actions.c:846
 msgid "_Actions"
 msgstr "_Radnje"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:939
-#: ../modules/calendar/e-memo-shell-view-actions.c:702
-#: ../modules/calendar/e-task-shell-view-actions.c:854
-#: ../modules/mail/e-mail-shell-view-actions.c:1475
+#: ../modules/addressbook/e-book-shell-view-actions.c:933
+#: ../modules/calendar/e-memo-shell-view-actions.c:701
+#: ../modules/calendar/e-task-shell-view-actions.c:853
+#: ../modules/mail/e-mail-shell-view-actions.c:1535
 msgid "_Preview"
 msgstr "_Pregled"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:948
-#: ../modules/calendar/e-cal-shell-view-actions.c:1621
-#: ../modules/calendar/e-memo-shell-view-actions.c:715
-#: ../modules/calendar/e-task-shell-view-actions.c:867
+#: ../modules/addressbook/e-book-shell-view-actions.c:942
+#: ../modules/calendar/e-cal-shell-view-actions.c:1620
+#: ../modules/calendar/e-memo-shell-view-actions.c:714
+#: ../modules/calendar/e-task-shell-view-actions.c:866
 msgid "_Delete"
 msgstr "_Obriši"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:952
-#: ../modules/mail/e-mail-shell-view-actions.c:1240
+#: ../modules/addressbook/e-book-shell-view-actions.c:946
+#: ../modules/mail/e-mail-shell-view-actions.c:1293
 msgid "_Properties"
 msgstr "_Svojstva"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
+#: ../modules/addressbook/e-book-shell-view-actions.c:950
 msgid "Address Book Map"
 msgstr "Mapa adresara"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:988
+#: ../modules/addressbook/e-book-shell-view-actions.c:982
 msgid "Contact _Preview"
 msgstr "Pre_gled kontakta"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:990
+#: ../modules/addressbook/e-book-shell-view-actions.c:984
 msgid "Show contact preview window"
 msgstr "Prikažite prozor za pregled kontakta"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:996
+#: ../modules/addressbook/e-book-shell-view-actions.c:990
 msgid "Show _Maps"
 msgstr "Prikaži _mape"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:998
+#: ../modules/addressbook/e-book-shell-view-actions.c:992
 msgid "Show maps in contact preview window"
 msgstr "Prikažite mape u prozoru za pregled kontakata"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1017
-#: ../modules/calendar/e-memo-shell-view-actions.c:772
-#: ../modules/calendar/e-task-shell-view-actions.c:936
-#: ../modules/mail/e-mail-shell-view-actions.c:1601
+#: ../modules/addressbook/e-book-shell-view-actions.c:1011
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:935
+#: ../modules/mail/e-mail-shell-view-actions.c:1665
 msgid "_Classic View"
 msgstr "_Klasični prikaz"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1019
+#: ../modules/addressbook/e-book-shell-view-actions.c:1013
 msgid "Show contact preview below the contact list"
 msgstr "Prikažite pregled kontakta ispod kontakt liste"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1024
-#: ../modules/calendar/e-memo-shell-view-actions.c:779
-#: ../modules/calendar/e-task-shell-view-actions.c:943
-#: ../modules/mail/e-mail-shell-view-actions.c:1608
+#: ../modules/addressbook/e-book-shell-view-actions.c:1018
+#: ../modules/calendar/e-memo-shell-view-actions.c:778
+#: ../modules/calendar/e-task-shell-view-actions.c:942
+#: ../modules/mail/e-mail-shell-view-actions.c:1672
 msgid "_Vertical View"
 msgstr "_Uspravni pregled"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1026
+#: ../modules/addressbook/e-book-shell-view-actions.c:1020
 msgid "Show contact preview alongside the contact list"
 msgstr "Prikažite pregled kontakta pored kontakt liste"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1034
-#: ../modules/calendar/e-cal-shell-view-actions.c:1760
-#: ../modules/calendar/e-memo-shell-view-actions.c:789
-#: ../modules/calendar/e-task-shell-view-actions.c:960
-msgid "Any Category"
-msgstr "Bilo koja kategorija"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:1041
-#: ../modules/calendar/e-cal-shell-view-actions.c:1781
-#: ../modules/calendar/e-memo-shell-view-actions.c:796
-#: ../modules/calendar/e-task-shell-view-actions.c:995
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../modules/calendar/e-cal-shell-view-actions.c:1780
+#: ../modules/calendar/e-memo-shell-view-actions.c:795
+#: ../modules/calendar/e-task-shell-view-actions.c:994
 msgid "Unmatched"
 msgstr "Ne odgovara"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1051
-#: ../modules/calendar/e-cal-shell-view-actions.c:1791
-#: ../modules/calendar/e-memo-shell-view-actions.c:806
-#: ../modules/calendar/e-task-shell-view-actions.c:1005
-#: ../modules/mail/e-mail-shell-view-actions.c:1677
-#: ../shell/e-shell-content.c:664
+#: ../modules/addressbook/e-book-shell-view-actions.c:1045
+#: ../modules/calendar/e-cal-shell-view-actions.c:1790
+#: ../modules/calendar/e-memo-shell-view-actions.c:805
+#: ../modules/calendar/e-task-shell-view-actions.c:1004
+#: ../modules/mail/e-mail-shell-view-actions.c:1741
+#: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Napredna pretraga"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1084
+#: ../modules/addressbook/e-book-shell-view-actions.c:1078
 msgid "Print all shown contacts"
 msgstr "Štampaj sve prikazane kontakte"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1091
+#: ../modules/addressbook/e-book-shell-view-actions.c:1085
 msgid "Preview the contacts to be printed"
 msgstr "Pregled kontakata pred štampu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1098
+#: ../modules/addressbook/e-book-shell-view-actions.c:1092
 msgid "Print selected contacts"
 msgstr "Štampa izabrane kontakte"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1113
+#: ../modules/addressbook/e-book-shell-view-actions.c:1107
 msgid "S_ave Address Book as vCard"
 msgstr "_Sačuvaj adresar kao vKartu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1115
+#: ../modules/addressbook/e-book-shell-view-actions.c:1109
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Sačuvajte kontakte izabranog adresara kao vKartu"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1121
-#: ../modules/addressbook/e-book-shell-view-actions.c:1131
+#: ../modules/addressbook/e-book-shell-view-actions.c:1115
+#: ../modules/addressbook/e-book-shell-view-actions.c:1125
 msgid "_Save as vCard..."
 msgstr "_Sačuvaj kao vKartu..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1123
+#: ../modules/addressbook/e-book-shell-view-actions.c:1117
 msgid "Save selected contacts as a vCard"
 msgstr "Sačuvaj izabrane kontakte kao VKartu"
 
@@ -14524,121 +15941,15 @@ msgstr "_Pošalji poruku na listu"
 msgid "_Send Message to Contact"
 msgstr "_Pošalji poruku kontaktu"
 
-#: ../modules/addressbook/ldap-config.ui.h:4
-msgid "Anonymously"
-msgstr "Anonimno"
-
-#: ../modules/addressbook/ldap-config.ui.h:5
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:674
-msgid "Using email address"
-msgstr "Koristi adresu el. pošte"
-
-#: ../modules/addressbook/ldap-config.ui.h:6
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
-msgid "Using distinguished name (DN)"
-msgstr "Koristi poseban naziv (DN)"
-
-#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:8
-msgid "One"
-msgstr "Jedan"
-
-#. To Translators: This string is part of the search scope configuration, search for text with 'sub' in this file for more detailed explanation.
-#: ../modules/addressbook/ldap-config.ui.h:10
-msgid "Sub"
-msgstr "Pod"
-
-#: ../modules/addressbook/ldap-config.ui.h:11
-msgid "Supported Search Bases"
-msgstr "Podržane baze za pretragu"
-
-#: ../modules/addressbook/ldap-config.ui.h:13
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:113
-msgid "_Port:"
-msgstr "_Port:"
-
-#: ../modules/addressbook/ldap-config.ui.h:14
-msgid "Ser_ver:"
-msgstr "S_erver:"
-
-#: ../modules/addressbook/ldap-config.ui.h:15
-msgid "Use secure _connection:"
-msgstr "_Koristi sigurnu vezu:"
-
-#: ../modules/addressbook/ldap-config.ui.h:16
-msgid "_Login method:"
-msgstr "Metod _prijave:"
-
-#: ../modules/addressbook/ldap-config.ui.h:17
-msgid "Lo_gin:"
-msgstr "Pri_java:"
-
-#: ../modules/addressbook/ldap-config.ui.h:18
-msgid "Search _base:"
-msgstr "Osnova _pretrage:"
-
-#: ../modules/addressbook/ldap-config.ui.h:19
-msgid "_Search scope:"
-msgstr "Obim p_retrage:"
-
-#: ../modules/addressbook/ldap-config.ui.h:20
-msgid "_Find Possible Search Bases"
-msgstr "_Nađi moguće baze za pretragu"
-
-#: ../modules/addressbook/ldap-config.ui.h:21
-msgid "S_earch filter:"
-msgstr "_Filter pretrage:"
-
-#: ../modules/addressbook/ldap-config.ui.h:22
-msgid "Search Filter"
-msgstr "Filter pretrage"
-
-#: ../modules/addressbook/ldap-config.ui.h:23
-msgid ""
-"Search filter is the type of object to be searched for. If this is not "
-"modified, the default search will be performed on the type \"person\"."
-msgstr ""
-"Filter pretrage je vrsta objekta za kojim se traga. Ako se ovo ne izmeni, "
-"podrazumevana pretraga će biti obavljena na vrsti „osoba“."
-
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../modules/addressbook/ldap-config.ui.h:25
-msgid "1"
-msgstr "1"
-
-#. Translators: This is part of 'Timeout: 1 [slider] 5 minutes' option
-#: ../modules/addressbook/ldap-config.ui.h:27
-msgid "5"
-msgstr "5"
-
-#: ../modules/addressbook/ldap-config.ui.h:30
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:830
-msgid "contacts"
-msgstr "kontakti"
-
-#: ../modules/addressbook/ldap-config.ui.h:31
-msgid "_Timeout:"
-msgstr "_Vremenski rok:"
-
-#: ../modules/addressbook/ldap-config.ui.h:32
-msgid "_Download limit:"
-msgstr "Ograničenje za _preuzimanje:"
-
-#. To translators: If enabled, addressbook will only fetch contacts from the server until either set time limit or amount of contacts limit reached
-#: ../modules/addressbook/ldap-config.ui.h:34
-msgid "B_rowse this book until limit reached"
-msgstr "Pre_gleda ovaj adresar dok se ne dostigne limit"
-
-#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:310
+#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:309
 msgid "Audio Player"
 msgstr "Zvučni uređaj"
 
-#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:316
+#: ../modules/audio-inline/e-mail-formatter-audio-inline.c:310
 msgid "Play the attachment in embedded audio player"
 msgstr "Pusti prilog u ugrađenom programu"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:167
+#: ../modules/backup-restore/e-mail-config-restore-page.c:165
 msgid ""
 "You can restore Evolution from a backup file.\n"
 "\n"
@@ -14648,17 +15959,17 @@ msgstr ""
 "\n"
 "To će povratiti sve vaše lične podatke, podešavanja propusnika pošte, itd."
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:182
+#: ../modules/backup-restore/e-mail-config-restore-page.c:180
 msgid "_Restore from a backup file:"
 msgstr "_Vrati iz datoteke rezerve:"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:193
+#: ../modules/backup-restore/e-mail-config-restore-page.c:191
 msgid "Choose a backup file to restore"
 msgstr "Izaberite datoteku rezerve za povraćaj"
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/backup-restore/e-mail-config-restore-page.c:313
+#: ../modules/backup-restore/e-mail-config-restore-page.c:311
 #: ../modules/backup-restore/e-mail-config-restore-ready-page.c:57
 msgid "Restore from Backup"
 msgstr "Vrati iz rezerve"
@@ -14696,108 +16007,108 @@ msgstr "_Vrati podatke Evolucije..."
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Vratite podatke i postavke Evolucije iz arhive"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:83
+#: ../modules/backup-restore/evolution-backup-tool.c:84
 msgid "Back up Evolution directory"
 msgstr "Direktorijum za rezervu Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:85
+#: ../modules/backup-restore/evolution-backup-tool.c:86
 msgid "Restore Evolution directory"
 msgstr "Direktorijum za povraćaj Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:87
+#: ../modules/backup-restore/evolution-backup-tool.c:88
 msgid "Check Evolution Back up"
 msgstr "Proveri rezervu Evolucije"
 
 # shell:noshell-reason title
-#: ../modules/backup-restore/evolution-backup-tool.c:89
+#: ../modules/backup-restore/evolution-backup-tool.c:90
 msgid "Restart Evolution"
 msgstr "Ponovo pokreće Evoluciju"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:91
+#: ../modules/backup-restore/evolution-backup-tool.c:92
 msgid "With Graphical User Interface"
 msgstr "Sa grafičkim okruženjem"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:315
-#: ../modules/backup-restore/evolution-backup-tool.c:469
+#: ../modules/backup-restore/evolution-backup-tool.c:317
+#: ../modules/backup-restore/evolution-backup-tool.c:511
 msgid "Shutting down Evolution"
 msgstr "Gašenje Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:324
+#: ../modules/backup-restore/evolution-backup-tool.c:326
 msgid "Backing Evolution accounts and settings"
 msgstr "Izradite rezervnu kopiju naloga i postavke Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:341
+#: ../modules/backup-restore/evolution-backup-tool.c:343
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Izrada rezervne kopije podataka Evolucije (pošta, kalendari, zadaci, beleške)"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:357
+#: ../modules/backup-restore/evolution-backup-tool.c:359
 msgid "Back up complete"
 msgstr "Izrada rezervne kopije je završena"
 
 # shell:noshell-reason title
-#: ../modules/backup-restore/evolution-backup-tool.c:364
-#: ../modules/backup-restore/evolution-backup-tool.c:654
+#: ../modules/backup-restore/evolution-backup-tool.c:366
+#: ../modules/backup-restore/evolution-backup-tool.c:698
 msgid "Restarting Evolution"
 msgstr "Ponovno pokretanje Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:475
+#: ../modules/backup-restore/evolution-backup-tool.c:517
 msgid "Back up current Evolution data"
 msgstr "Napravite rezervu trenutnih podataka Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:483
+#: ../modules/backup-restore/evolution-backup-tool.c:524
 msgid "Extracting files from back up"
 msgstr "Izvlačim datoteke iz rezervne kopije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:570
+#: ../modules/backup-restore/evolution-backup-tool.c:606
 msgid "Loading Evolution settings"
 msgstr "Učitavam podešavanja Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:624
+#: ../modules/backup-restore/evolution-backup-tool.c:672
 msgid "Removing temporary back up files"
 msgstr "Uklanjanje privremenih rezervnih datoteka"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:636
+#: ../modules/backup-restore/evolution-backup-tool.c:683
 msgid "Reloading registry service"
 msgstr "Ponovo učitavam uslugu zavođenja"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:861
+#: ../modules/backup-restore/evolution-backup-tool.c:910
 msgid "Evolution Back Up"
 msgstr "Rezervni primerak Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:862
+#: ../modules/backup-restore/evolution-backup-tool.c:911
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Smeštam rezervni primerak u fasciklu „%s“"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:866
+#: ../modules/backup-restore/evolution-backup-tool.c:915
 msgid "Evolution Restore"
 msgstr "Povraćaj Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:867
+#: ../modules/backup-restore/evolution-backup-tool.c:916
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Vraćam iz fascikle „%s“"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:935
+#: ../modules/backup-restore/evolution-backup-tool.c:986
 msgid "Backing up Evolution Data"
 msgstr "Izrađuje rezervni primerak podataka Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:936
+#: ../modules/backup-restore/evolution-backup-tool.c:987
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Sačekajte dok Evolucija ne napravi rezervni primerak podataka."
 
 # shell:noshell-reason title
-#: ../modules/backup-restore/evolution-backup-tool.c:938
+#: ../modules/backup-restore/evolution-backup-tool.c:989
 msgid "Restoring Evolution Data"
 msgstr "Povraćaj podataka Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:939
+#: ../modules/backup-restore/evolution-backup-tool.c:990
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Sačekajte dok Evolucija ne vrati podatke u prvobitno stanje."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:957
+#: ../modules/backup-restore/evolution-backup-tool.c:1012
 msgid "This may take a while depending on the amount of data in your account."
 msgstr "Ovo može potrajati, u zavisnosti od količine podataka na nalogu."
 
@@ -14824,7 +16135,7 @@ msgstr ""
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
 msgid "Close and Back up Evolution"
-msgstr "Izaberite radnju:"
+msgstr "Zatvorite i napravite rezervu Evojucije"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
 msgid ""
@@ -14856,80 +16167,88 @@ msgstr "Nedovoljna ovlašćenja"
 msgid "The selected folder is not writable."
 msgstr "U izabranu fasciklu se ne može pisati."
 
-#: ../modules/bogofilter/evolution-bogofilter.c:149
+#: ../modules/bogofilter/evolution-bogofilter.c:145
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr "Nisam uspeo da izrodim Bogofilter (%s): "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:167
+#: ../modules/bogofilter/evolution-bogofilter.c:163
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr "Nisam uspeo da uputim sadržaj poruke pošte Bogofilteru: "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:216
+#: ../modules/bogofilter/evolution-bogofilter.c:212
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr "Ili se Bogofilter urušio ili nije uspeo da analizira poruku pošte"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:318
+#: ../modules/bogofilter/evolution-bogofilter.c:308
 msgid "Bogofilter Options"
 msgstr "Opcije Bogofiltera"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:327
+#: ../modules/bogofilter/evolution-bogofilter.c:317
 msgid "Convert message text to _Unicode"
 msgstr "Prebaci tekst poruke u _Unikod"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:483
+#: ../modules/bogofilter/evolution-bogofilter.c:474
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:442
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:447
 msgid "Standard LDAP Port"
 msgstr "Standardni LDAP port"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:448
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:453
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:625
 msgid "LDAP over SSL (deprecated)"
 msgstr "LDAP ili SSL (prevaziđeno)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:454
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:459
 msgid "Microsoft Global Catalog"
 msgstr "Majkrosoftov opšti katalog"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:460
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:465
 msgid "Microsoft Global Catalog over SSL"
 msgstr "Majkrosoftov opšti katalog preko SSL"
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:564
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:570
 msgid "Connecting to LDAP"
 msgstr "Povezujem se na LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:581
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:587
 msgid "Server Information"
 msgstr "Podaci servera"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:628
 msgid "StartTLS (recommended)"
 msgstr "PočetniTLS (preporučeno)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:630
 msgid "Encryption:"
 msgstr "Šifrovanje:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:648
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:258
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:182
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:654
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:246
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:180
 msgid "Authentication"
 msgstr "Potvrđivanje identiteta"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:671
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
 msgid "Anonymous"
 msgstr "Anonimno"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:680
+msgid "Using email address"
+msgstr "Koristi adresu el. pošte"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
+msgid "Using distinguished name (DN)"
+msgstr "Koristi poseban naziv (DN)"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:685
 msgid "Method:"
 msgstr "Način:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:690
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Using email address\" requires anonymous access to your "
@@ -14940,36 +16259,36 @@ msgstr ""
 "pristup na vaš LDAP server."
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:705
 msgid "Using LDAP"
 msgstr "Koristi LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
-#: ../modules/mail/e-mail-shell-view.c:116
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:722
+#: ../modules/mail/e-mail-shell-view.c:115
 msgid "Searching"
 msgstr "Pretražujem"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:738
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:744
 msgid "Search Base:"
 msgstr "Osnova pretrage:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:743
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:749
 msgid "Find Possible Search Bases"
 msgstr "Nađi moguće baze za pretragu"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:768
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:774
 msgid "One Level"
 msgstr "Jedan nivo"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:770
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:776
 msgid "Subtree"
 msgstr "Podstablo"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:772
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
 msgid "Search Scope:"
 msgstr "Obim pretrage:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:777
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:783
 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 "
@@ -14977,57 +16296,62 @@ msgid ""
 "the entries one level beneath your search base."
 msgstr ""
 "Obim pretrage definiše dubinu kojom želite da pretraga obuhvati stablo "
-"direktorijuma. Obim pretrage „Podstabla“ će uključiti sve unose ispod baze za "
-"pretragu. Obim pretrage „Jedan nivo“ će uključiti samo unose jedan nivo ispod "
-"vaše baze pretrage."
+"direktorijuma.  Obim pretrage „Podstabla“ će uključiti sve unose ispod baze "
+"za pretragu.  Obim pretrage „Jedan nivo“ će uključiti samo unose jedan nivo "
+"ispod vaše baze pretrage."
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:786
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:792
 msgid "Search Filter:"
 msgstr "Filter pretrage:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:798
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:804
 msgid "Downloading"
 msgstr "Preuzimam"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:819
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
 msgid "Limit:"
 msgstr "Ograničenje:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:835
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
+msgid "contacts"
+msgstr "kontakti"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:841
 msgid "Browse until limit is reached"
 msgstr "Razgledaj sve dok se ne dostigne ograničenje"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:134
-#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:130
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:136
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:205
+#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:128
 msgid "URL:"
 msgstr "Adresa:"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:144
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:146
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
-msgstr "Izbegavaj ako_poklapa (potrebno na Apaču < 2.2.8)"
+msgstr "Izbegavaj ako-poklapa (potrebno na Apaču < 2.2.8)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:417
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:446
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP greška: %s"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:474
 msgid "Could not parse response"
 msgstr "Ne mogu da obradim odgovor"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:456
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:483
 msgid "Empty response"
 msgstr "Prazan odgovor"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:464
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:491
 msgid "Unexpected reply from server"
 msgstr "Neočekivan odgovor sa servera"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1051
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1123
 msgid "Could not locate user's calendars"
 msgstr "Ne mogu da pronađem korisnikov kalendar."
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1275
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1347
 msgid "Path"
 msgstr "Putanja"
 
@@ -15044,35 +16368,31 @@ msgstr "Izaberite spisak beleški"
 msgid "Choose a Task List"
 msgstr "Izaberite spisak sadataka"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:269
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:219
 msgid "Find Calendars"
 msgstr "Pronađite kalendare"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:272
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:222
 msgid "Find Memo Lists"
 msgstr "Pronađite spiskove beleški"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:275
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:225
 msgid "Find Task Lists"
 msgstr "Pronađite spiskove zadataka"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:293
-msgid "Path:"
-msgstr "Putanja:"
-
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:299
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:243
 msgid "Email:"
 msgstr "El. pošta:"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:304
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:248
 msgid "Server handles meeting invitations"
 msgstr "Server upravlja pozivima na sastanak"
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:73
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:71
 msgid "Choose which address books to use."
 msgstr "Izaberite adresare koji ćete koristiti."
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:203
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:201
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "Koristi u kalendaru za rođendane i godišnjice"
 
@@ -15089,56 +16409,56 @@ msgstr "Unesite Guglovu lozinku za „%s“."
 msgid "User declined to provide a password"
 msgstr "Korisnik je odbio da dostavi lozinku"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:161
+#: ../modules/cal-config-local/evolution-cal-config-local.c:160
 msgid "Use an existing iCalendar (ics) file"
 msgstr "Koristite postojeću datoteku iKalendara (ics)"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:186
+#: ../modules/cal-config-local/evolution-cal-config-local.c:185
 msgid "iCalendar File"
 msgstr "Datoteka iKalendara"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:198
+#: ../modules/cal-config-local/evolution-cal-config-local.c:197
 msgid "Choose an iCalendar file"
 msgstr "Izaberite datoteku iKalendara"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:201
+#: ../modules/cal-config-local/evolution-cal-config-local.c:200
 msgid "File:"
 msgstr "Datoteka:"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:216
+#: ../modules/cal-config-local/evolution-cal-config-local.c:215
 msgid "Allow Evolution to update the file"
 msgstr "Dopušta Evoluciji da osveži datoteku"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:323
-#: ../smime/gui/smime-ui.ui.h:32
+#: ../modules/calendar/e-cal-attachment-handler.c:322
+#: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
 msgstr "U_vezi"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:409
+#: ../modules/calendar/e-cal-attachment-handler.c:408
 msgid "Select a Calendar"
 msgstr "Izaberite kalendar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:436
+#: ../modules/calendar/e-cal-attachment-handler.c:435
 msgid "Select a Task List"
 msgstr "Izaberite spisak zadataka"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:446
+#: ../modules/calendar/e-cal-attachment-handler.c:445
 msgid "I_mport to Calendar"
 msgstr "U_vezi u kalendar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:453
+#: ../modules/calendar/e-cal-attachment-handler.c:452
 msgid "I_mport to Tasks"
 msgstr "U_vezi u zadatke"
 
-#: ../modules/calendar/e-calendar-preferences.c:407
+#: ../modules/calendar/e-calendar-preferences.c:401
 msgid "Selected Calendars for Alarms"
 msgstr "Izabrani kalendari za alarme"
 
-#: ../modules/calendar/e-calendar-preferences.c:829
+#: ../modules/calendar/e-calendar-preferences.c:822
 msgid "Ti_me and date:"
 msgstr "_Vreme i datum:"
 
-#: ../modules/calendar/e-calendar-preferences.c:830
+#: ../modules/calendar/e-calendar-preferences.c:823
 msgid "_Date only:"
 msgstr "Samo _datum:"
 
@@ -15174,12 +16494,6 @@ msgstr "10 minuta"
 msgid "05 minutes"
 msgstr "05 minuta"
 
-# note(slobo): možda treba rok
-#: ../modules/calendar/e-calendar-preferences.ui.h:16
-#: ../widgets/misc/e-dateedit.c:595
-msgid "Time"
-msgstr "Vreme"
-
 #: ../modules/calendar/e-calendar-preferences.ui.h:17
 msgid "Se_cond zone:"
 msgstr "Dru_ga zona:"
@@ -15205,7 +16519,7 @@ msgid "_24 hour"
 msgstr "_24 - časovni"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:25
-#: ../modules/calendar/e-cal-shell-view-actions.c:1743
+#: ../modules/calendar/e-cal-shell-view-actions.c:1742
 msgid "Work Week"
 msgstr "Radna nedelja"
 
@@ -15359,71 +16673,71 @@ msgstr "%u i %d će biti zamenjeni korisnikom i domenom iz elektronske adrese."
 msgid "Publishing Information"
 msgstr "Podaci o objavljivanju"
 
-#: ../modules/calendar/e-cal-shell-backend.c:278
-#: ../modules/calendar/e-cal-shell-view-actions.c:192
+#: ../modules/calendar/e-cal-shell-backend.c:273
+#: ../modules/calendar/e-cal-shell-view-actions.c:191
 msgid "New Calendar"
 msgstr "Novi kalendar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:287
+#: ../modules/calendar/e-cal-shell-backend.c:282
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:289
-#: ../modules/calendar/e-cal-shell-view-actions.c:1548
+#: ../modules/calendar/e-cal-shell-backend.c:284
+#: ../modules/calendar/e-cal-shell-view-actions.c:1547
 msgid "Create a new appointment"
 msgstr "Pravi novo zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:294
+#: ../modules/calendar/e-cal-shell-backend.c:289
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Celodnevno za_kazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:296
+#: ../modules/calendar/e-cal-shell-backend.c:291
 msgid "Create a new all-day appointment"
 msgstr "Pravi novo celodnevno zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:301
+#: ../modules/calendar/e-cal-shell-backend.c:296
 msgctxt "New"
 msgid "M_eeting"
 msgstr "S_astanak"
 
-#: ../modules/calendar/e-cal-shell-backend.c:303
+#: ../modules/calendar/e-cal-shell-backend.c:298
 msgid "Create a new meeting request"
 msgstr "Pravi novi zahtev za sastankom"
 
-#: ../modules/calendar/e-cal-shell-backend.c:311
+#: ../modules/calendar/e-cal-shell-backend.c:306
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_ndar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:313
-#: ../modules/calendar/e-cal-shell-view-actions.c:1422
+#: ../modules/calendar/e-cal-shell-backend.c:308
+#: ../modules/calendar/e-cal-shell-view-actions.c:1421
 msgid "Create a new calendar"
 msgstr "Pravi novi kalendar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:597
+#: ../modules/calendar/e-cal-shell-backend.c:627
 msgid "Calendar and Tasks"
 msgstr "Kalendar i zadaci"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:211
+#: ../modules/calendar/e-cal-shell-sidebar.c:207
 msgid "Loading calendars"
 msgstr "Učitavanje kalendara"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:731
+#: ../modules/calendar/e-cal-shell-sidebar.c:674
 msgid "Calendar Selector"
 msgstr "Izbornik kalendara"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:1090
+#: ../modules/calendar/e-cal-shell-sidebar.c:1033
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr "Otvaram kalendar „%s“"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:292
+#: ../modules/calendar/e-cal-shell-view-actions.c:291
 msgid "Calendar Properties"
 msgstr "Osobine kalendara"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:323
+#: ../modules/calendar/e-cal-shell-view-actions.c:322
 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 "
@@ -15434,349 +16748,349 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:340
+#: ../modules/calendar/e-cal-shell-view-actions.c:339
 msgid "Purge events older than"
 msgstr "Izbaci događaje starije od"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:591
+#: ../modules/calendar/e-cal-shell-view-actions.c:590
 msgid "Copying Items"
 msgstr "Umnožavanje stavki"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:885
+#: ../modules/calendar/e-cal-shell-view-actions.c:884
 msgid "Moving Items"
 msgstr "Premeštanje stavki"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1218
+#: ../modules/calendar/e-cal-shell-view-actions.c:1217
 msgid "event"
 msgstr "događaj"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1220
+#: ../modules/calendar/e-cal-shell-view-actions.c:1219
 #: ../modules/calendar/e-cal-shell-view-memopad.c:231
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:549
-#: ../modules/calendar/e-task-shell-view-actions.c:666
+#: ../modules/calendar/e-memo-shell-view-actions.c:548
+#: ../modules/calendar/e-task-shell-view-actions.c:665
 msgid "Save as iCalendar"
 msgstr "Sačuvaj kao iKalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1378
-#: ../modules/calendar/e-memo-shell-view-actions.c:630
+#: ../modules/calendar/e-cal-shell-view-actions.c:1377
+#: ../modules/calendar/e-memo-shell-view-actions.c:629
 msgid "_Copy..."
 msgstr "_Umnoži..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1385
+#: ../modules/calendar/e-cal-shell-view-actions.c:1384
 msgid "D_elete Calendar"
 msgstr "Ob_riši kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1387
+#: ../modules/calendar/e-cal-shell-view-actions.c:1386
 msgid "Delete the selected calendar"
 msgstr "Obrišite izabrani kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1394
+#: ../modules/calendar/e-cal-shell-view-actions.c:1393
 msgid "Go Back"
 msgstr "Idi nazad"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1401
+#: ../modules/calendar/e-cal-shell-view-actions.c:1400
 msgid "Go Forward"
 msgstr "Idi napred"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1407
 msgid "Select today"
 msgstr "Izaberi današnji dan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1413
+#: ../modules/calendar/e-cal-shell-view-actions.c:1412
 msgid "Select _Date"
 msgstr "Izaberi _datum"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1415
+#: ../modules/calendar/e-cal-shell-view-actions.c:1414
 msgid "Select a specific date"
 msgstr "Izaberite određeni datum"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1420
+#: ../modules/calendar/e-cal-shell-view-actions.c:1419
 msgid "_New Calendar"
 msgstr "Novi _kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
-#: ../modules/calendar/e-task-shell-view-actions.c:838
+#: ../modules/calendar/e-cal-shell-view-actions.c:1433
+#: ../modules/calendar/e-task-shell-view-actions.c:837
 msgid "Purg_e"
 msgstr "Izba_ci"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1436
+#: ../modules/calendar/e-cal-shell-view-actions.c:1435
 msgid "Purge old appointments and meetings"
 msgstr "Izbacite stara zakazivanja i sastanke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1441
-#: ../modules/calendar/e-memo-shell-view-actions.c:658
-#: ../modules/calendar/e-task-shell-view-actions.c:782
+#: ../modules/calendar/e-cal-shell-view-actions.c:1440
+#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-task-shell-view-actions.c:781
 msgid "Re_fresh"
 msgstr "O_sveži"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1443
+#: ../modules/calendar/e-cal-shell-view-actions.c:1442
 msgid "Refresh the selected calendar"
 msgstr "Osvežite izabrani kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1450
+#: ../modules/calendar/e-cal-shell-view-actions.c:1449
 msgid "Rename the selected calendar"
 msgstr "Preimenujte izabrani kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1455
+#: ../modules/calendar/e-cal-shell-view-actions.c:1454
 msgid "Find _next"
 msgstr "Pronađi _sledeće"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1457
+#: ../modules/calendar/e-cal-shell-view-actions.c:1456
 msgid "Find next occurrence of the current search string"
 msgstr "Pronađite sledeće pojavljivanje tekuće niske pretrage"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-cal-shell-view-actions.c:1461
 msgid "Find _previous"
 msgstr "Pronađi _prethodno"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1464
+#: ../modules/calendar/e-cal-shell-view-actions.c:1463
 msgid "Find previous occurrence of the current search string"
 msgstr "Pronađite prethodno pojavljivanje tekuće niske pretrage"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1469
+#: ../modules/calendar/e-cal-shell-view-actions.c:1468
 msgid "Stop _running search"
 msgstr "Zaustavi _tekuću pretragu"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1471
+#: ../modules/calendar/e-cal-shell-view-actions.c:1470
 msgid "Stop currently running search"
 msgstr "Zaustavite trenutno pokrenutu pretragu"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1476
+#: ../modules/calendar/e-cal-shell-view-actions.c:1475
 msgid "Show _Only This Calendar"
 msgstr "Prikaži _samo ovaj kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1483
+#: ../modules/calendar/e-cal-shell-view-actions.c:1482
 msgid "Cop_y to Calendar..."
 msgstr "_Umnoži u kalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1490
+#: ../modules/calendar/e-cal-shell-view-actions.c:1489
 msgid "_Delegate Meeting..."
 msgstr "_Delegiraj sastanak..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1497
+#: ../modules/calendar/e-cal-shell-view-actions.c:1496
 msgid "_Delete Appointment"
 msgstr "_Obriši zakazano"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1499
+#: ../modules/calendar/e-cal-shell-view-actions.c:1498
 msgid "Delete selected appointments"
 msgstr "Obrišite izabrana zakazivanja"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1504
+#: ../modules/calendar/e-cal-shell-view-actions.c:1503
 msgid "Delete This _Occurrence"
 msgstr "Obriši ovu _pojavu"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1506
+#: ../modules/calendar/e-cal-shell-view-actions.c:1505
 msgid "Delete this occurrence"
 msgstr "Obrišite ovu pojavu"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../modules/calendar/e-cal-shell-view-actions.c:1510
 msgid "Delete All Occ_urrences"
 msgstr "Obriši sve po_jave"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1513
+#: ../modules/calendar/e-cal-shell-view-actions.c:1512
 msgid "Delete all occurrences"
 msgstr "Obrišite sve pojave"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1518
+#: ../modules/calendar/e-cal-shell-view-actions.c:1517
 msgid "New All Day _Event..."
 msgstr "Novi celodnevni _događaj..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1520
+#: ../modules/calendar/e-cal-shell-view-actions.c:1519
 msgid "Create a new all day event"
 msgstr "Napravite novi celodnevni događaj"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1525
+#: ../modules/calendar/e-cal-shell-view-actions.c:1524
 #: ../modules/calendar/e-cal-shell-view-memopad.c:265
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:338
-#: ../modules/calendar/e-memo-shell-view-actions.c:623
-#: ../modules/calendar/e-task-shell-view-actions.c:747
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-task-shell-view-actions.c:746
 msgid "_Forward as iCalendar..."
 msgstr "_Prosledi kao iKalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1532
+#: ../modules/calendar/e-cal-shell-view-actions.c:1531
 msgid "New _Meeting..."
 msgstr "Novi _sastanak..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1534
+#: ../modules/calendar/e-cal-shell-view-actions.c:1533
 msgid "Create a new meeting"
 msgstr "Napravite novi sastanak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1539
+#: ../modules/calendar/e-cal-shell-view-actions.c:1538
 msgid "Mo_ve to Calendar..."
 msgstr "Pren_esi u kalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1546
+#: ../modules/calendar/e-cal-shell-view-actions.c:1545
 msgid "New _Appointment..."
 msgstr "Novo _zakazivanje..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1553
+#: ../modules/calendar/e-cal-shell-view-actions.c:1552
 msgid "Make this Occurrence _Movable"
 msgstr "Neka ova pojava bude _pokretna"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1560
+#: ../modules/calendar/e-cal-shell-view-actions.c:1559
 msgid "_Open Appointment"
 msgstr "_Otvori sastanak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1562
+#: ../modules/calendar/e-cal-shell-view-actions.c:1561
 msgid "View the current appointment"
 msgstr "Pregledajte tekuće zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1567
+#: ../modules/calendar/e-cal-shell-view-actions.c:1566
 msgid "_Reply"
 msgstr "_Odgovori"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1581
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
 msgid "_Schedule Meeting..."
 msgstr "_Zakaži sastanak..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1583
+#: ../modules/calendar/e-cal-shell-view-actions.c:1582
 msgid "Converts an appointment to a meeting"
 msgstr "Pretvorite zakazano u sastanak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1588
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
 msgid "Conv_ert to Appointment..."
 msgstr "Pre_tvori u zakazano..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1590
+#: ../modules/calendar/e-cal-shell-view-actions.c:1589
 msgid "Converts a meeting to an appointment"
 msgstr "Pretvorite sastanak u zakazano"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1595
+#: ../modules/calendar/e-cal-shell-view-actions.c:1594
 msgid "Quit"
 msgstr "Izađi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1715
+#: ../modules/calendar/e-cal-shell-view-actions.c:1714
 msgid "Day"
 msgstr "Dan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1717
+#: ../modules/calendar/e-cal-shell-view-actions.c:1716
 msgid "Show one day"
 msgstr "Prikaži jedan dan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1722
+#: ../modules/calendar/e-cal-shell-view-actions.c:1721
 msgid "List"
 msgstr "Spisak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1724
+#: ../modules/calendar/e-cal-shell-view-actions.c:1723
 msgid "Show as list"
 msgstr "Prikaži kao spisak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1729
+#: ../modules/calendar/e-cal-shell-view-actions.c:1728
 msgid "Month"
 msgstr "Mesec"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1730
 msgid "Show one month"
 msgstr "Prikaži jedan mesec"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1736
+#: ../modules/calendar/e-cal-shell-view-actions.c:1735
 msgid "Week"
 msgstr "Nedelja"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1738
+#: ../modules/calendar/e-cal-shell-view-actions.c:1737
 msgid "Show one week"
 msgstr "Prikaži jednu nedelju"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1745
+#: ../modules/calendar/e-cal-shell-view-actions.c:1744
 msgid "Show one work week"
 msgstr "Prikaži jednu radnu nedelju"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1753
+#: ../modules/calendar/e-cal-shell-view-actions.c:1752
 msgid "Active Appointments"
 msgstr "Aktivna zakazivanja"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1767
+#: ../modules/calendar/e-cal-shell-view-actions.c:1766
 msgid "Next 7 Days' Appointments"
 msgstr "Zakazano za sledeću nedelju"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1774
+#: ../modules/calendar/e-cal-shell-view-actions.c:1773
 msgid "Occurs Less Than 5 Times"
 msgstr "Dešava se manje od 5 puta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1805
-#: ../modules/calendar/e-memo-shell-view-actions.c:820
-#: ../modules/calendar/e-task-shell-view-actions.c:1019
+#: ../modules/calendar/e-cal-shell-view-actions.c:1804
+#: ../modules/calendar/e-memo-shell-view-actions.c:819
+#: ../modules/calendar/e-task-shell-view-actions.c:1018
 msgid "Description contains"
 msgstr "Opis sadrži"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1812
-#: ../modules/calendar/e-memo-shell-view-actions.c:827
-#: ../modules/calendar/e-task-shell-view-actions.c:1026
+#: ../modules/calendar/e-cal-shell-view-actions.c:1811
+#: ../modules/calendar/e-memo-shell-view-actions.c:826
+#: ../modules/calendar/e-task-shell-view-actions.c:1025
 msgid "Summary contains"
 msgstr "Sažetak sadrži"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1824
+#: ../modules/calendar/e-cal-shell-view-actions.c:1823
 msgid "Print this calendar"
 msgstr "Štampa ovaj kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1831
+#: ../modules/calendar/e-cal-shell-view-actions.c:1830
 msgid "Preview the calendar to be printed"
 msgstr "Pregled kalendara pred štampu"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1853
+#: ../modules/calendar/e-cal-shell-view-actions.c:1852
 #: ../modules/calendar/e-cal-shell-view-memopad.c:306
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:393
-#: ../modules/calendar/e-memo-shell-view-actions.c:868
-#: ../modules/calendar/e-task-shell-view-actions.c:1067
+#: ../modules/calendar/e-memo-shell-view-actions.c:867
+#: ../modules/calendar/e-task-shell-view-actions.c:1066
 msgid "_Save as iCalendar..."
 msgstr "_Sačuvaj kao iKalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1930
+#: ../modules/calendar/e-cal-shell-view-actions.c:1929
 msgid "Go To"
 msgstr "Idi na"
 
 #. Translators: Default filename part saving a memo to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #: ../modules/calendar/e-cal-shell-view-memopad.c:229
-#: ../modules/calendar/e-memo-shell-view-actions.c:547
+#: ../modules/calendar/e-memo-shell-view-actions.c:546
 msgid "memo"
 msgstr "beleška"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:272
-#: ../modules/calendar/e-memo-shell-view-actions.c:679
+#: ../modules/calendar/e-memo-shell-view-actions.c:678
 msgid "New _Memo"
 msgstr "Nova _beleška"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../modules/calendar/e-memo-shell-backend.c:204
-#: ../modules/calendar/e-memo-shell-view-actions.c:681
+#: ../modules/calendar/e-memo-shell-backend.c:201
+#: ../modules/calendar/e-memo-shell-view-actions.c:680
 msgid "Create a new memo"
 msgstr "Napravite jednu novu belešku"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:279
-#: ../modules/calendar/e-memo-shell-view-actions.c:686
+#: ../modules/calendar/e-memo-shell-view-actions.c:685
 msgid "_Open Memo"
 msgstr "_Otvori belešku"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:281
-#: ../modules/calendar/e-memo-shell-view-actions.c:688
+#: ../modules/calendar/e-memo-shell-view-actions.c:687
 msgid "View the selected memo"
 msgstr "Pogledajte izabranu belešku"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:286
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:373
-#: ../modules/calendar/e-memo-shell-view-actions.c:693
-#: ../modules/calendar/e-task-shell-view-actions.c:831
+#: ../modules/calendar/e-memo-shell-view-actions.c:692
+#: ../modules/calendar/e-task-shell-view-actions.c:830
 msgid "Open _Web Page"
 msgstr "Otvori _Veb stranicu"
 
 #: ../modules/calendar/e-cal-shell-view-memopad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:853
+#: ../modules/calendar/e-memo-shell-view-actions.c:852
 msgid "Print the selected memo"
 msgstr "Štampajte izabranu belešku"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1477
+#: ../modules/calendar/e-cal-shell-view-private.c:1497
 msgid "Searching next matching event"
 msgstr "Tražim sledeći odgovarajući događaj"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1478
+#: ../modules/calendar/e-cal-shell-view-private.c:1498
 msgid "Searching previous matching event"
 msgstr "Tražim prethodni odgovarajući događaj"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1499
+#: ../modules/calendar/e-cal-shell-view-private.c:1519
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
@@ -15785,7 +17099,7 @@ msgstr[1] "Ne mogu da pronađem odgovarajući događaj u sledeće %d godine"
 msgstr[2] "Ne mogu da pronađem odgovarajući događaj u sledećih %d godina"
 msgstr[3] "Ne mogu da pronađem odgovarajući događaj u sledećoj %d godini"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1503
+#: ../modules/calendar/e-cal-shell-view-private.c:1523
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
@@ -15794,7 +17108,7 @@ msgstr[1] "Ne mogu da pronađem odgovarajući događaj u prethodne %d godini"
 msgstr[2] "Ne mogu da pronađem odgovarajući događaj u prethodnih %d godini"
 msgstr[3] "Ne mogu da pronađem odgovarajući događaj u prethodnoj %d godini"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1528
+#: ../modules/calendar/e-cal-shell-view-private.c:1548
 msgid "Cannot search with no active calendar"
 msgstr "Ne mogu da tražim ako nema aktivnog kalendara"
 
@@ -15803,22 +17117,22 @@ msgstr "Ne mogu da tražim ako nema aktivnog kalendara"
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:296
-#: ../modules/calendar/e-task-shell-view-actions.c:664
+#: ../modules/calendar/e-task-shell-view-actions.c:663
 msgid "task"
 msgstr "zadatak"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:331
-#: ../modules/calendar/e-task-shell-view-actions.c:726
+#: ../modules/calendar/e-task-shell-view-actions.c:725
 msgid "_Assign Task"
 msgstr "_Dodeli zadatak"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:803
+#: ../modules/calendar/e-task-shell-view-actions.c:802
 msgid "_Mark as Complete"
 msgstr "_Označi kao završeno"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:805
+#: ../modules/calendar/e-task-shell-view-actions.c:804
 msgid "Mark selected tasks as complete"
 msgstr "Obeležite izabrane zadatke kao završene"
 
@@ -15827,144 +17141,144 @@ msgid "_Mark as Incomplete"
 msgstr "_Označi kao nezavršeno"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:354
-#: ../modules/calendar/e-task-shell-view-actions.c:812
+#: ../modules/calendar/e-task-shell-view-actions.c:811
 msgid "Mark selected tasks as incomplete"
 msgstr "Obeležite izabrane zadatke kao nezavršene"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-task-shell-view-actions.c:817
+#: ../modules/calendar/e-task-shell-view-actions.c:816
 msgid "New _Task"
 msgstr "Novi zad_atak"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-task-shell-backend.c:201
-#: ../modules/calendar/e-task-shell-view-actions.c:819
+#: ../modules/calendar/e-task-shell-backend.c:198
+#: ../modules/calendar/e-task-shell-view-actions.c:818
 msgid "Create a new task"
 msgstr "Napravite novi zadatak"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:366
-#: ../modules/calendar/e-task-shell-view-actions.c:824
+#: ../modules/calendar/e-task-shell-view-actions.c:823
 msgid "_Open Task"
 msgstr "_Otvori zadatak"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:368
-#: ../modules/calendar/e-task-shell-view-actions.c:826
+#: ../modules/calendar/e-task-shell-view-actions.c:825
 msgid "View the selected task"
 msgstr "Pregledajte izabrani zadatak"
 
 #: ../modules/calendar/e-cal-shell-view-taskpad.c:385
-#: ../modules/calendar/e-task-shell-view-actions.c:1052
+#: ../modules/calendar/e-task-shell-view-actions.c:1051
 msgid "Print the selected task"
 msgstr "Štampa izabrani zadatak"
 
-#: ../modules/calendar/e-memo-shell-backend.c:193
-#: ../modules/calendar/e-memo-shell-view-actions.c:217
+#: ../modules/calendar/e-memo-shell-backend.c:190
+#: ../modules/calendar/e-memo-shell-view-actions.c:216
 msgid "New Memo List"
 msgstr "Novi spisak beleške"
 
-#: ../modules/calendar/e-memo-shell-backend.c:202
+#: ../modules/calendar/e-memo-shell-backend.c:199
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Belešk_a"
 
-#: ../modules/calendar/e-memo-shell-backend.c:209
+#: ../modules/calendar/e-memo-shell-backend.c:206
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Deljena beleška"
 
-#: ../modules/calendar/e-memo-shell-backend.c:211
+#: ../modules/calendar/e-memo-shell-backend.c:208
 msgid "Create a new shared memo"
 msgstr "Napravite novu deljenu belešku"
 
-#: ../modules/calendar/e-memo-shell-backend.c:219
+#: ../modules/calendar/e-memo-shell-backend.c:216
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Spi_sak beleški"
 
-#: ../modules/calendar/e-memo-shell-backend.c:221
-#: ../modules/calendar/e-memo-shell-view-actions.c:646
+#: ../modules/calendar/e-memo-shell-backend.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:645
 msgid "Create a new memo list"
 msgstr "Sastavite novi spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:206
+#: ../modules/calendar/e-memo-shell-sidebar.c:204
 msgid "Loading memos"
 msgstr "Učitavam beleške"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:663
+#: ../modules/calendar/e-memo-shell-sidebar.c:608
 msgid "Memo List Selector"
 msgstr "Izbornik spiskova beleški"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:975
+#: ../modules/calendar/e-memo-shell-sidebar.c:920
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr "Otvaram spisak beleški „%s“"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:233
-#: ../modules/calendar/e-memo-shell-view-actions.c:248
+#: ../modules/calendar/e-memo-shell-view-actions.c:232
+#: ../modules/calendar/e-memo-shell-view-actions.c:247
 msgid "Print Memos"
 msgstr "Štampaj beleške"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:289
+#: ../modules/calendar/e-memo-shell-view-actions.c:288
 msgid "Memo List Properties"
 msgstr "Osobine spiska zadataka"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:609
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
 msgid "_Delete Memo"
 msgstr "_Obriši belešku"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:616
+#: ../modules/calendar/e-memo-shell-view-actions.c:615
 msgid "_Find in Memo..."
 msgstr "P_ronađi u belešci..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:618
+#: ../modules/calendar/e-memo-shell-view-actions.c:617
 msgid "Search for text in the displayed memo"
 msgstr "Pretražite tekst u prikazanoj belešci"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:637
+#: ../modules/calendar/e-memo-shell-view-actions.c:636
 msgid "D_elete Memo List"
 msgstr "Ob_riši spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:639
+#: ../modules/calendar/e-memo-shell-view-actions.c:638
 msgid "Delete the selected memo list"
 msgstr "Obrišite izabrani spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:644
+#: ../modules/calendar/e-memo-shell-view-actions.c:643
 msgid "_New Memo List"
 msgstr "_Novi spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:660
+#: ../modules/calendar/e-memo-shell-view-actions.c:659
 msgid "Refresh the selected memo list"
 msgstr "Osvežite izabrani spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:667
+#: ../modules/calendar/e-memo-shell-view-actions.c:666
 msgid "Rename the selected memo list"
 msgstr "Preimenujte izabrani spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:672
+#: ../modules/calendar/e-memo-shell-view-actions.c:671
 msgid "Show _Only This Memo List"
 msgstr "Prikaži _samo ovaj spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-memo-shell-view-actions.c:750
 msgid "Memo _Preview"
 msgstr "_Pregled beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:753
+#: ../modules/calendar/e-memo-shell-view-actions.c:752
 msgid "Show memo preview pane"
 msgstr "Prikažite pregled beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:774
+#: ../modules/calendar/e-memo-shell-view-actions.c:773
 msgid "Show memo preview below the memo list"
 msgstr "Prikažite pregled beleški ispod spiska beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:781
+#: ../modules/calendar/e-memo-shell-view-actions.c:780
 msgid "Show memo preview alongside the memo list"
 msgstr "Prikažite pregled beleški pored spiska beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:839
+#: ../modules/calendar/e-memo-shell-view-actions.c:838
 msgid "Print the list of memos"
 msgstr "Štampajte spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:846
+#: ../modules/calendar/e-memo-shell-view-actions.c:845
 msgid "Preview the list of memos to be printed"
 msgstr "Pregledajte spisak beleški za štampu"
 
@@ -15976,7 +17290,7 @@ msgstr "Obriši beleške"
 msgid "Delete Memo"
 msgstr "Obriši belešku"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:428
+#: ../modules/calendar/e-memo-shell-view-private.c:426
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -15985,64 +17299,64 @@ msgstr[1] "%d beleške"
 msgstr[2] "%d beleški"
 msgstr[3] "%d beleška"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:432
-#: ../modules/calendar/e-task-shell-view-private.c:613
+#: ../modules/calendar/e-memo-shell-view-private.c:430
+#: ../modules/calendar/e-task-shell-view-private.c:611
 #, c-format
 msgid "%d selected"
 msgstr "izabranih — %d"
 
-#: ../modules/calendar/e-task-shell-backend.c:190
-#: ../modules/calendar/e-task-shell-view-actions.c:240
+#: ../modules/calendar/e-task-shell-backend.c:187
+#: ../modules/calendar/e-task-shell-view-actions.c:239
 msgid "New Task List"
 msgstr "Novi spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-backend.c:199
+#: ../modules/calendar/e-task-shell-backend.c:196
 msgctxt "New"
 msgid "_Task"
 msgstr "_Zadatak"
 
-#: ../modules/calendar/e-task-shell-backend.c:206
+#: ../modules/calendar/e-task-shell-backend.c:203
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Dodeljen_i zadatak"
 
-#: ../modules/calendar/e-task-shell-backend.c:208
+#: ../modules/calendar/e-task-shell-backend.c:205
 msgid "Create a new assigned task"
 msgstr "Napravite novi dodeljeni zadatak"
 
-#: ../modules/calendar/e-task-shell-backend.c:216
+#: ../modules/calendar/e-task-shell-backend.c:213
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Spisak za_dataka"
 
-#: ../modules/calendar/e-task-shell-backend.c:218
-#: ../modules/calendar/e-task-shell-view-actions.c:770
+#: ../modules/calendar/e-task-shell-backend.c:215
+#: ../modules/calendar/e-task-shell-view-actions.c:769
 msgid "Create a new task list"
 msgstr "Napravite novi spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:206
+#: ../modules/calendar/e-task-shell-sidebar.c:204
 msgid "Loading tasks"
 msgstr "Učitavam zadatke"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:663
+#: ../modules/calendar/e-task-shell-sidebar.c:608
 msgid "Task List Selector"
 msgstr "Izbornik spiska zadataka"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:975
+#: ../modules/calendar/e-task-shell-sidebar.c:920
 #, c-format
 msgid "Opening task list '%s'"
 msgstr "Otvaram spisak zadataka „%s“"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:256
-#: ../modules/calendar/e-task-shell-view-actions.c:271
+#: ../modules/calendar/e-task-shell-view-actions.c:255
+#: ../modules/calendar/e-task-shell-view-actions.c:270
 msgid "Print Tasks"
 msgstr "Štampaj zadatke"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:312
+#: ../modules/calendar/e-task-shell-view-actions.c:311
 msgid "Task List Properties"
 msgstr "Osobine spiska zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:608
+#: ../modules/calendar/e-task-shell-view-actions.c:607
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -16054,99 +17368,99 @@ msgstr ""
 "\n"
 "Da obrišem ove zadatke?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:615
+#: ../modules/calendar/e-task-shell-view-actions.c:614
 msgid "Do not ask me again"
 msgstr "Ne pitaj me ponovo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:733
+#: ../modules/calendar/e-task-shell-view-actions.c:732
 msgid "_Delete Task"
 msgstr "_Obriši zadatak"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:739
 msgid "_Find in Task..."
 msgstr "_Pronađi u zadatku..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:742
+#: ../modules/calendar/e-task-shell-view-actions.c:741
 msgid "Search for text in the displayed task"
 msgstr "Pretraži tekst u prikazanom zadatku"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:754
+#: ../modules/calendar/e-task-shell-view-actions.c:753
 msgid "Copy..."
 msgstr "Umnoži..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:760
 msgid "D_elete Task List"
 msgstr "O_briši spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:763
+#: ../modules/calendar/e-task-shell-view-actions.c:762
 msgid "Delete the selected task list"
 msgstr "Obrišite izabrani spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:767
 msgid "_New Task List"
 msgstr "No_vi spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:784
+#: ../modules/calendar/e-task-shell-view-actions.c:783
 msgid "Refresh the selected task list"
 msgstr "Osvežite izabrani spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:791
+#: ../modules/calendar/e-task-shell-view-actions.c:790
 msgid "Rename the selected task list"
 msgstr "Preimenujte izabrani spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:796
+#: ../modules/calendar/e-task-shell-view-actions.c:795
 msgid "Show _Only This Task List"
 msgstr "Prikaži _samo ovaj spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:810
+#: ../modules/calendar/e-task-shell-view-actions.c:809
 msgid "Mar_k as Incomplete"
 msgstr "O_znači kao nezavršeno"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:840
+#: ../modules/calendar/e-task-shell-view-actions.c:839
 msgid "Delete completed tasks"
 msgstr "Obrišite završene zadatke"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:915
+#: ../modules/calendar/e-task-shell-view-actions.c:914
 msgid "Task _Preview"
 msgstr "Pregled za_dataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:917
+#: ../modules/calendar/e-task-shell-view-actions.c:916
 msgid "Show task preview pane"
 msgstr "Prikažite pregled zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:938
+#: ../modules/calendar/e-task-shell-view-actions.c:937
 msgid "Show task preview below the task list"
 msgstr "Prikažite pregled ispod spiska zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:945
+#: ../modules/calendar/e-task-shell-view-actions.c:944
 msgid "Show task preview alongside the task list"
 msgstr "Prikažite pregled pored spiska zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:953
+#: ../modules/calendar/e-task-shell-view-actions.c:952
 msgid "Active Tasks"
 msgstr "Aktivni zadaci"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:967
+#: ../modules/calendar/e-task-shell-view-actions.c:966
 msgid "Completed Tasks"
 msgstr "Završeni zadaci"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:974
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Next 7 Days' Tasks"
 msgstr "Zadaci za sledeću nedelju"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:981
+#: ../modules/calendar/e-task-shell-view-actions.c:980
 msgid "Overdue Tasks"
 msgstr "Prekoračeni zadaci"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:988
+#: ../modules/calendar/e-task-shell-view-actions.c:987
 msgid "Tasks with Attachments"
 msgstr "Zadaci sa prilozima"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1038
+#: ../modules/calendar/e-task-shell-view-actions.c:1037
 msgid "Print the list of tasks"
 msgstr "Štampajte spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1045
+#: ../modules/calendar/e-task-shell-view-actions.c:1044
 msgid "Preview the list of tasks to be printed"
 msgstr "Pregledajte spisak zadataka pred štampu"
 
@@ -16158,11 +17472,11 @@ msgstr "Obriši zadatke"
 msgid "Delete Task"
 msgstr "Obriši zadatak"
 
-#: ../modules/calendar/e-task-shell-view-private.c:502
+#: ../modules/calendar/e-task-shell-view-private.c:500
 msgid "Expunging"
 msgstr "Izbacivanje"
 
-#: ../modules/calendar/e-task-shell-view-private.c:609
+#: ../modules/calendar/e-task-shell-view-private.c:607
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -16171,100 +17485,59 @@ msgstr[1] "%d zadataka"
 msgstr[2] "%d zadataka"
 msgstr[3] "%d zadatak"
 
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:225
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:395
-msgid "IMAP Headers"
-msgstr "IMAP zaglavlja"
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:233
-msgid ""
-"Select a predefined set of IMAP headers to fetch.\n"
-"Note, larger sets of headers take longer to download."
-msgstr ""
-"Izaberite unapred određeni skup IMAP zaglavlja za dovlačenje.\n"
-"Znajte, da većim skupovima zaglavlja je potrebno više vremena za preuzimanje."
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:243
-msgid "_Fetch All Headers"
-msgstr "_Pribavi sva zaglavlja"
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:257
-msgid "_Basic Headers (fastest)"
-msgstr "_Osnovna zaglavlja (najbrže)"
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:271
-msgid "Use this if you are not filtering any mailing lists."
-msgstr "Koristite ovo ukoliko nemate filtere na dopisnim listama."
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:281
-msgid "Basic and _Mailing List Headers (default)"
-msgstr "Osnovna i zaglavlja _dopisnih listi (osnovno)"
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:330
-msgid "Custom Headers"
-msgstr "Prilagođena zaglavlja"
-
-#: ../modules/imap-features/e-mail-config-imap-headers-page.c:338
-msgid ""
-"Specify any extra headers to fetch in addition to the predefined set of "
-"headers selected above."
-msgstr ""
-"Navedite bilo koje dodatno zaglavlje za dovlačenje kao dodatak unapred "
-"određenom skupu zaglavlja gore izabranih."
-
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:137
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:145
 msgid "ITIP"
 msgstr "ITIP"
 
-#: ../modules/itip-formatter/e-mail-formatter-itip.c:143
+#: ../modules/itip-formatter/e-mail-formatter-itip.c:146
 msgid "Display part as an invitation"
 msgstr "Prikazuje delove kao pozivnicu"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:240
+#: ../modules/itip-formatter/itip-view.c:233
 msgid "Today %H:%M"
 msgstr "Danas u %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:244
+#: ../modules/itip-formatter/itip-view.c:237
 msgid "Today %H:%M:%S"
 msgstr "Danas u %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:253
+#: ../modules/itip-formatter/itip-view.c:246
 msgid "Today %l:%M:%S %p"
 msgstr "Danas u %l:%M:%S %p"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:268
+#: ../modules/itip-formatter/itip-view.c:261
 msgid "Tomorrow %H:%M"
 msgstr "Sutra u %H:%M"
 
 # strftime format of a time in 24-hour format.
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:272
+#: ../modules/itip-formatter/itip-view.c:265
 msgid "Tomorrow %H:%M:%S"
 msgstr "Sutra u %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:277
+#: ../modules/itip-formatter/itip-view.c:270
 msgid "Tomorrow %l:%M %p"
 msgstr "Sutra u %l:%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:281
+#: ../modules/itip-formatter/itip-view.c:274
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Sutra u %l:%M %S %p"
 
 #. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:300
+#: ../modules/itip-formatter/itip-view.c:293
 #, c-format
 msgid "%A"
 msgstr "%A"
@@ -16274,69 +17547,69 @@ msgstr "%A"
 # This is a strftime() format. %H = hour (0-23), %M = minute.
 #. strftime format of a weekday and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:305
+#: ../modules/itip-formatter/itip-view.c:298
 msgid "%A %H:%M"
 msgstr "%A %H:%M"
 
 # strftime format of a time in 24-hour format.
 #. strftime format of a weekday and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:309
+#: ../modules/itip-formatter/itip-view.c:302
 msgid "%A %H:%M:%S"
 msgstr "%A %H:%M:%S"
 
 #. strftime format of a weekday and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:314
+#: ../modules/itip-formatter/itip-view.c:307
 msgid "%A %l:%M %p"
 msgstr "%A %l:%M %p"
 
 # strftime format of a time in 12-hour format.
 #. strftime format of a weekday and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:318
+#: ../modules/itip-formatter/itip-view.c:311
 msgid "%A %l:%M:%S %p"
 msgstr "%A %l:%M:%S %p"
 
 #. strftime format of a weekday and a date
 #. * without a year.
-#: ../modules/itip-formatter/itip-view.c:327
+#: ../modules/itip-formatter/itip-view.c:320
 msgid "%A, %B %e"
 msgstr "%A, %B %e"
 
 #. strftime format of a weekday, a date
 #. * without a year and a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:333
+#: ../modules/itip-formatter/itip-view.c:326
 msgid "%A, %B %e %H:%M"
 msgstr "%A, %B %e %H:%M"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:337
+#: ../modules/itip-formatter/itip-view.c:330
 msgid "%A, %B %e %H:%M:%S"
 msgstr "%A, %B %e %H:%M:%S"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:342
+#: ../modules/itip-formatter/itip-view.c:335
 msgid "%A, %B %e %l:%M %p"
 msgstr "%A, %B %e %l:%M %p"
 
 #. strftime format of a weekday, a date without a year
 #. * and a time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:346
+#: ../modules/itip-formatter/itip-view.c:339
 msgid "%A, %B %e %l:%M:%S %p"
 msgstr "%A, %B %e %l:%M:%S %p"
 
 #. strftime format of a weekday and a date.
-#: ../modules/itip-formatter/itip-view.c:352
+#: ../modules/itip-formatter/itip-view.c:345
 msgid "%A, %B %e, %Y"
 msgstr "%A, %B %e, %Y."
 
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:357
+#: ../modules/itip-formatter/itip-view.c:350
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y. %H:%M"
 
@@ -16346,167 +17619,167 @@ msgstr "%A, %B %e, %Y. %H:%M"
 # time, in 24-hour format.
 #. strftime format of a weekday, a date and a
 #. * time, in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:361
+#: ../modules/itip-formatter/itip-view.c:354
 msgid "%A, %B %e, %Y %H:%M:%S"
 msgstr "%A, %B %e, %Y. %H:%M:%S"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:366
+#: ../modules/itip-formatter/itip-view.c:359
 msgid "%A, %B %e, %Y %l:%M %p"
 msgstr "%A, %B %e, %Y. %l:%M %p"
 
 #. strftime format of a weekday, a date and a
 #. * time, in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:370
+#: ../modules/itip-formatter/itip-view.c:363
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y. %l:%M:%S %p"
 
-#: ../modules/itip-formatter/itip-view.c:408
-#: ../modules/itip-formatter/itip-view.c:409
-#: ../modules/itip-formatter/itip-view.c:498
-#: ../modules/itip-formatter/itip-view.c:499
-#: ../modules/itip-formatter/itip-view.c:588
+#: ../modules/itip-formatter/itip-view.c:401
+#: ../modules/itip-formatter/itip-view.c:402
+#: ../modules/itip-formatter/itip-view.c:491
+#: ../modules/itip-formatter/itip-view.c:492
+#: ../modules/itip-formatter/itip-view.c:581
 msgid "An unknown person"
 msgstr "Nepoznata osoba"
 
-#: ../modules/itip-formatter/itip-view.c:413
-#: ../modules/itip-formatter/itip-view.c:503
-#: ../modules/itip-formatter/itip-view.c:592
+#: ../modules/itip-formatter/itip-view.c:406
+#: ../modules/itip-formatter/itip-view.c:496
+#: ../modules/itip-formatter/itip-view.c:585
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Odgovorite u ime %s"
 
-#: ../modules/itip-formatter/itip-view.c:415
-#: ../modules/itip-formatter/itip-view.c:505
-#: ../modules/itip-formatter/itip-view.c:594
+#: ../modules/itip-formatter/itip-view.c:408
+#: ../modules/itip-formatter/itip-view.c:498
+#: ../modules/itip-formatter/itip-view.c:587
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Primljeno u ime %s"
 
-#: ../modules/itip-formatter/itip-view.c:420
+#: ../modules/itip-formatter/itip-view.c:413
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s preko %s objavljuje sledeći podatak o sastanku:"
 
-#: ../modules/itip-formatter/itip-view.c:422
+#: ../modules/itip-formatter/itip-view.c:415
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s objavljuje sledeći podatak o sastanku:"
 
-#: ../modules/itip-formatter/itip-view.c:427
+#: ../modules/itip-formatter/itip-view.c:420
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s vam delegira sledeći sastanak:"
 
-#: ../modules/itip-formatter/itip-view.c:430
+#: ../modules/itip-formatter/itip-view.c:423
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s preko %s zahteva vaše prisustvo na sledećem sastanku:"
 
-#: ../modules/itip-formatter/itip-view.c:432
+#: ../modules/itip-formatter/itip-view.c:425
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s zahteva vaše prisustvo na sledećem sastanku:"
 
-#: ../modules/itip-formatter/itip-view.c:438
+#: ../modules/itip-formatter/itip-view.c:431
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s preko %s želi da doda postojećem sastanku:"
 
-#: ../modules/itip-formatter/itip-view.c:440
+#: ../modules/itip-formatter/itip-view.c:433
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s želi da doda postojećem sastanku:"
 
-#: ../modules/itip-formatter/itip-view.c:444
+#: ../modules/itip-formatter/itip-view.c:437
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
 "meeting:"
 msgstr "%s preko %s želi da primi najnovije informacije za sledeći sastanak:"
 
-#: ../modules/itip-formatter/itip-view.c:446
+#: ../modules/itip-formatter/itip-view.c:439
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s želi da primi najnoviji podatak za sledeći sastanak:"
 
-#: ../modules/itip-formatter/itip-view.c:450
+#: ../modules/itip-formatter/itip-view.c:443
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s preko %s šalje sledeći odgovor za sastanak:"
 
-#: ../modules/itip-formatter/itip-view.c:452
+#: ../modules/itip-formatter/itip-view.c:445
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s šalje sledeći odgovor za sastanak:"
 
-#: ../modules/itip-formatter/itip-view.c:456
+#: ../modules/itip-formatter/itip-view.c:449
 #, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "%s preko %s otkazuje sledeći sastanak:"
 
-#: ../modules/itip-formatter/itip-view.c:458
+#: ../modules/itip-formatter/itip-view.c:451
 #, c-format
 msgid "%s has canceled the following meeting:"
 msgstr "%s otkazuje sledeći sastanak:"
 
-#: ../modules/itip-formatter/itip-view.c:462
+#: ../modules/itip-formatter/itip-view.c:455
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s preko %s predlaže sledeće promene sastanka."
 
-#: ../modules/itip-formatter/itip-view.c:464
+#: ../modules/itip-formatter/itip-view.c:457
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s predlaže sledeće izmene sastanka:"
 
-#: ../modules/itip-formatter/itip-view.c:468
+#: ../modules/itip-formatter/itip-view.c:461
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s preko %s odbija sledeće promene sastanka:"
 
-#: ../modules/itip-formatter/itip-view.c:470
+#: ../modules/itip-formatter/itip-view.c:463
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s odbija sledeće izmene sastanka:"
 
-#: ../modules/itip-formatter/itip-view.c:510
+#: ../modules/itip-formatter/itip-view.c:503
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s preko %s objavljuje sledeći zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:512
+#: ../modules/itip-formatter/itip-view.c:505
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s objavi sledeće zaduženje:"
 
-#: ../modules/itip-formatter/itip-view.c:517
+#: ../modules/itip-formatter/itip-view.c:510
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s zahteva da %s preuzme sledeći zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:520
+#: ../modules/itip-formatter/itip-view.c:513
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s preko %s vam dodeljuje zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:522
+#: ../modules/itip-formatter/itip-view.c:515
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s vam dodeljuje zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:528
+#: ../modules/itip-formatter/itip-view.c:521
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s preko %s želi da doda postojećem zadatku:"
 
-#: ../modules/itip-formatter/itip-view.c:530
+#: ../modules/itip-formatter/itip-view.c:523
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s želi da doda postojećem zadatku:"
 
-#: ../modules/itip-formatter/itip-view.c:534
+#: ../modules/itip-formatter/itip-view.c:527
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -16514,336 +17787,344 @@ msgid ""
 msgstr ""
 "%s preko %s želi da dobije najnovije informacije za sledeći dodeljeni zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:536
+#: ../modules/itip-formatter/itip-view.c:529
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s želi da dobije najnovije informacije za sledeći dodeljeni zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:540
+#: ../modules/itip-formatter/itip-view.c:533
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s preko %s vraća sledeći odgovor na dodeljeni zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:542
+#: ../modules/itip-formatter/itip-view.c:535
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s šalje nazad sledeći odgovor na dodeljeni zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:546
+#: ../modules/itip-formatter/itip-view.c:539
 #, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "%s preko %s otkazuje sledeći dodeljeni zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:548
+#: ../modules/itip-formatter/itip-view.c:541
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "%s otkazuje sledeći dodeljeni zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:552
+#: ../modules/itip-formatter/itip-view.c:545
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s preko %s predlaže sledeće promene u dodeli zadatka:"
 
-#: ../modules/itip-formatter/itip-view.c:554
+#: ../modules/itip-formatter/itip-view.c:547
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s predlaže sledeće promene u dodeli zadatka:"
 
-#: ../modules/itip-formatter/itip-view.c:558
+#: ../modules/itip-formatter/itip-view.c:551
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s preko %s odbija sledeći dodeljeni zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:560
+#: ../modules/itip-formatter/itip-view.c:553
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s odbija sledeći dodeljeni zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:599
+#: ../modules/itip-formatter/itip-view.c:592
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s preko %s objavljuje sledeću belešku:"
 
-#: ../modules/itip-formatter/itip-view.c:601
+#: ../modules/itip-formatter/itip-view.c:594
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s objavljuje sledeću belešku:"
 
-#: ../modules/itip-formatter/itip-view.c:606
+#: ../modules/itip-formatter/itip-view.c:599
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s preko %s želi da doda postojećoj belešci:"
 
-#: ../modules/itip-formatter/itip-view.c:608
+#: ../modules/itip-formatter/itip-view.c:601
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s želi da doda postojećoj belešci:"
 
-#: ../modules/itip-formatter/itip-view.c:612
+#: ../modules/itip-formatter/itip-view.c:605
 #, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "%s preko %s otkazuje sledeću deljenu belešku:"
 
-#: ../modules/itip-formatter/itip-view.c:614
+#: ../modules/itip-formatter/itip-view.c:607
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "%s otkazuje sledeće deljenu belešku:"
 
-#: ../modules/itip-formatter/itip-view.c:687
+#: ../modules/itip-formatter/itip-view.c:680
 msgid "All day:"
 msgstr "Celodnevno:"
 
-#: ../modules/itip-formatter/itip-view.c:693
+#: ../modules/itip-formatter/itip-view.c:686
 msgid "Start day:"
 msgstr "Početak dana:"
 
-#: ../modules/itip-formatter/itip-view.c:693
-#: ../modules/itip-formatter/itip-view.c:1461
+#: ../modules/itip-formatter/itip-view.c:686
+#: ../modules/itip-formatter/itip-view.c:1465
 msgid "Start time:"
 msgstr "Vreme početka:"
 
-#: ../modules/itip-formatter/itip-view.c:702
+#: ../modules/itip-formatter/itip-view.c:695
 msgid "End day:"
 msgstr "Kraj dana:"
 
-#: ../modules/itip-formatter/itip-view.c:702
-#: ../modules/itip-formatter/itip-view.c:1462
+#: ../modules/itip-formatter/itip-view.c:695
+#: ../modules/itip-formatter/itip-view.c:1466
 msgid "End time:"
 msgstr "Vreme završetka:"
 
-#: ../modules/itip-formatter/itip-view.c:1010
-msgid "_Open Calendar"
+#: ../modules/itip-formatter/itip-view.c:1014
+#| msgid "_Open Calendar"
+msgid "Ope_n Calendar"
 msgstr "O_tvori kalendar"
 
-#: ../modules/itip-formatter/itip-view.c:1013
+#: ../modules/itip-formatter/itip-view.c:1017
 msgid "_Decline all"
 msgstr "Od_bij sve"
 
-#: ../modules/itip-formatter/itip-view.c:1016
+#: ../modules/itip-formatter/itip-view.c:1020
 msgid "_Decline"
 msgstr "_Odbij"
 
-#: ../modules/itip-formatter/itip-view.c:1019
+#: ../modules/itip-formatter/itip-view.c:1023
 msgid "_Tentative all"
 msgstr "Sve sa re_zervom"
 
-#: ../modules/itip-formatter/itip-view.c:1022
+#: ../modules/itip-formatter/itip-view.c:1026
 msgid "_Tentative"
 msgstr "Sa _rezervom"
 
-#: ../modules/itip-formatter/itip-view.c:1025
-msgid "A_ccept all"
+#: ../modules/itip-formatter/itip-view.c:1029
+#| msgid "A_ccept all"
+msgid "Acce_pt all"
 msgstr "P_rihvati sve"
 
-#: ../modules/itip-formatter/itip-view.c:1028
-msgid "A_ccept"
-msgstr "_Prihvati"
+#: ../modules/itip-formatter/itip-view.c:1032
+#| msgid "Accepted"
+msgid "Acce_pt"
+msgstr "Prih_vaćeno"
 
-#: ../modules/itip-formatter/itip-view.c:1031
-msgid "_Send Information"
-msgstr "Pošalji podat_ke"
+#: ../modules/itip-formatter/itip-view.c:1035
+#| msgid "_Send Information"
+msgid "Send _Information"
+msgstr "Pošalji _podatke"
 
-#: ../modules/itip-formatter/itip-view.c:1034
+#: ../modules/itip-formatter/itip-view.c:1038
 msgid "_Update Attendee Status"
 msgstr "Ažuriraj stanje učesni_ka"
 
-#: ../modules/itip-formatter/itip-view.c:1037
+#: ../modules/itip-formatter/itip-view.c:1041
 msgid "_Update"
 msgstr "_Osveži"
 
-#: ../modules/itip-formatter/itip-view.c:1464
-#: ../modules/itip-formatter/itip-view.c:1512
-#: ../modules/itip-formatter/itip-view.c:1581
+#: ../modules/itip-formatter/itip-view.c:1468
+#: ../modules/itip-formatter/itip-view.c:1516
+#: ../modules/itip-formatter/itip-view.c:1587
 msgid "Comment:"
 msgstr "Napomena:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1500
+#: ../modules/itip-formatter/itip-view.c:1504
 msgid "Send reply to sender"
 msgstr "Odgovori pošiljaocu"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1515
+#: ../modules/itip-formatter/itip-view.c:1519
 msgid "Send _updates to attendees"
 msgstr "Pošalji _ažurirane podatke učesnicima"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1518
+#: ../modules/itip-formatter/itip-view.c:1522
 msgid "_Apply to all instances"
 msgstr "Pri_meni na sve nivoe"
 
-#: ../modules/itip-formatter/itip-view.c:1519
+#: ../modules/itip-formatter/itip-view.c:1523
 msgid "Show time as _free"
 msgstr "Prikaži vreme kao _slobodno"
 
-#: ../modules/itip-formatter/itip-view.c:1520
+#: ../modules/itip-formatter/itip-view.c:1524
 msgid "_Preserve my reminder"
 msgstr "_Očuvaj moj podsetnik"
 
-#: ../modules/itip-formatter/itip-view.c:1521
+#: ../modules/itip-formatter/itip-view.c:1525
 msgid "_Inherit reminder"
 msgstr "_Nasledi podsetnik"
 
-#: ../modules/itip-formatter/itip-view.c:1845
+#: ../modules/itip-formatter/itip-view.c:1853
 msgid "_Tasks:"
 msgstr "_Zadaci:"
 
-#: ../modules/itip-formatter/itip-view.c:1848
+#: ../modules/itip-formatter/itip-view.c:1856
 msgid "_Memos:"
 msgstr "_Beleške:"
 
+#: ../modules/itip-formatter/itip-view.c:3086
+msgid "Sa_ve"
+msgstr "Sa_čuvaj"
+
 #. Translators: The first '%s' is replaced with a calendar name,
 #. * the second '%s' with an error message
-#: ../modules/itip-formatter/itip-view.c:3493
+#: ../modules/itip-formatter/itip-view.c:3503
 #, c-format
 msgid "Failed to load the calendar '%s' (%s)"
 msgstr "Ne mogu da učitam kalendara „%s“ (%s)"
 
-#: ../modules/itip-formatter/itip-view.c:3652
+#: ../modules/itip-formatter/itip-view.c:3662
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Jedno zakazivanje u kalendaru „%s“ je u isto vreme kad i ovaj sastanak"
 
-#: ../modules/itip-formatter/itip-view.c:3679
+#: ../modules/itip-formatter/itip-view.c:3691
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Pronašao sam zakazivanje u kalendaru „%s“"
 
-#: ../modules/itip-formatter/itip-view.c:3774
+#: ../modules/itip-formatter/itip-view.c:3804
 msgid "Unable to find any calendars"
 msgstr "Ne mogu da pronađem nijedan kalendar"
 
-#: ../modules/itip-formatter/itip-view.c:3782
+#: ../modules/itip-formatter/itip-view.c:3812
 msgid "Unable to find this meeting in any calendar"
 msgstr "Ne mogu da pronađem ovaj sastanak ni u jednom kalendaru"
 
-#: ../modules/itip-formatter/itip-view.c:3787
+#: ../modules/itip-formatter/itip-view.c:3817
 msgid "Unable to find this task in any task list"
 msgstr "Ne mogu da pronađem ovaj zadatak ni u jednom spisku zadataka"
 
-#: ../modules/itip-formatter/itip-view.c:3792
+#: ../modules/itip-formatter/itip-view.c:3822
 msgid "Unable to find this memo in any memo list"
 msgstr "Nijedan spisak beleški ne sadrži ovu belešku"
 
-#: ../modules/itip-formatter/itip-view.c:4132
+#: ../modules/itip-formatter/itip-view.c:4171
 msgid "Opening the calendar. Please wait..."
 msgstr "Otvaram kalendar. Molim sačekajte..."
 
-#: ../modules/itip-formatter/itip-view.c:4137
+#: ../modules/itip-formatter/itip-view.c:4176
 msgid "Searching for an existing version of this appointment"
 msgstr "Pretraga za jednom postojećom verzijom ovog zakazivanja je u toku"
 
-#: ../modules/itip-formatter/itip-view.c:4523
+#: ../modules/itip-formatter/itip-view.c:4568
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Ne mogu da pošaljem stavke kalendaru „%s“.  %s"
 
-#: ../modules/itip-formatter/itip-view.c:4538
+#: ../modules/itip-formatter/itip-view.c:4584
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Poslato kalendaru „%s“ kao prihvaćeno"
 
-#: ../modules/itip-formatter/itip-view.c:4543
+#: ../modules/itip-formatter/itip-view.c:4589
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Poslato kalendaru „%s“ kao pokušaj"
 
-#: ../modules/itip-formatter/itip-view.c:4549
+#: ../modules/itip-formatter/itip-view.c:4595
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Poslato kalendaru „%s“ kao odbijeno"
 
-#: ../modules/itip-formatter/itip-view.c:4555
+#: ../modules/itip-formatter/itip-view.c:4601
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Poslato kalendaru „%s“ kao otkazano"
 
-#: ../modules/itip-formatter/itip-view.c:4576
-#: ../modules/itip-formatter/itip-view.c:5016
-#: ../modules/itip-formatter/itip-view.c:5123
+#: ../modules/itip-formatter/itip-view.c:4622
+#: ../modules/itip-formatter/itip-view.c:5063
+#: ../modules/itip-formatter/itip-view.c:5170
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Čuvam izmene u kalendar. Molim sačekajte..."
 
-#: ../modules/itip-formatter/itip-view.c:4617
+#: ../modules/itip-formatter/itip-view.c:4663
 msgid "Unable to parse item"
 msgstr "Ne mogu da obradim stavku"
 
-#: ../modules/itip-formatter/itip-view.c:4807
+#: ../modules/itip-formatter/itip-view.c:4853
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizator je uklonio delegata „%s“ "
 
-#: ../modules/itip-formatter/itip-view.c:4822
+#: ../modules/itip-formatter/itip-view.c:4868
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Delegatu je poslato obaveštenje o otkazivanju"
 
-#: ../modules/itip-formatter/itip-view.c:4826
+#: ../modules/itip-formatter/itip-view.c:4872
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Ne mogu delegatu da pošaljem obaveštenje o otkazivanju"
 
-#: ../modules/itip-formatter/itip-view.c:4874
+#: ../modules/itip-formatter/itip-view.c:4922
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Ne mogu da ažuriram učesnika. %s"
 
-#: ../modules/itip-formatter/itip-view.c:4882
+#: ../modules/itip-formatter/itip-view.c:4929
 msgid "Attendee status updated"
 msgstr "Status učesnika je ažuriran"
 
-#: ../modules/itip-formatter/itip-view.c:4905
+#: ../modules/itip-formatter/itip-view.c:4952
 msgid "The meeting is invalid and cannot be updated"
 msgstr "Sastanak nije ispravan i ne može biti ažuriran"
 
-#: ../modules/itip-formatter/itip-view.c:4981
+#: ../modules/itip-formatter/itip-view.c:5028
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Status učesnika nije ažuriran zbog neispravnog stanja"
 
-#: ../modules/itip-formatter/itip-view.c:5053
-#: ../modules/itip-formatter/itip-view.c:5093
+#: ../modules/itip-formatter/itip-view.c:5100
+#: ../modules/itip-formatter/itip-view.c:5140
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Status učesnika nije osvežen jer stavka više ne postoji"
 
-#: ../modules/itip-formatter/itip-view.c:5156
+#: ../modules/itip-formatter/itip-view.c:5203
 msgid "Meeting information sent"
 msgstr "Podatak o sastanku je poslat"
 
-#: ../modules/itip-formatter/itip-view.c:5161
+#: ../modules/itip-formatter/itip-view.c:5208
 msgid "Task information sent"
 msgstr "Podatak o zadatku je poslat"
 
-#: ../modules/itip-formatter/itip-view.c:5166
+#: ../modules/itip-formatter/itip-view.c:5213
 msgid "Memo information sent"
 msgstr "Podatak o belešci je poslat"
 
-#: ../modules/itip-formatter/itip-view.c:5177
+#: ../modules/itip-formatter/itip-view.c:5224
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Ne mogu da pošaljem podatak o sastanku, sastanak ne postoji"
 
-#: ../modules/itip-formatter/itip-view.c:5182
+#: ../modules/itip-formatter/itip-view.c:5229
 msgid "Unable to send task information, the task does not exist"
 msgstr "Ne mogu da pošaljem podatak o zadatku, zaduženje ne postoji"
 
-#: ../modules/itip-formatter/itip-view.c:5187
+#: ../modules/itip-formatter/itip-view.c:5234
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Ne mogu da pošaljem podatak o belešci, beleška ne postoji"
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5252
+#: ../modules/itip-formatter/itip-view.c:5299
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5257
+#: ../modules/itip-formatter/itip-view.c:5304
 msgid "Save Calendar"
 msgstr "Sačuvaj kalendar"
 
-#: ../modules/itip-formatter/itip-view.c:5310
-#: ../modules/itip-formatter/itip-view.c:5323
+#: ../modules/itip-formatter/itip-view.c:5357
+#: ../modules/itip-formatter/itip-view.c:5370
 msgid "The calendar attached is not valid"
 msgstr "Priložen kalendar nije ispravan"
 
-#: ../modules/itip-formatter/itip-view.c:5311
-#: ../modules/itip-formatter/itip-view.c:5324
+#: ../modules/itip-formatter/itip-view.c:5358
+#: ../modules/itip-formatter/itip-view.c:5371
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -16851,15 +18132,15 @@ msgstr ""
 "Poruka prijavljuje da sadrži kalendar, ali taj kalendar nije ispravan "
 "iKalendar."
 
-#: ../modules/itip-formatter/itip-view.c:5366
-#: ../modules/itip-formatter/itip-view.c:5396
-#: ../modules/itip-formatter/itip-view.c:5496
+#: ../modules/itip-formatter/itip-view.c:5413
+#: ../modules/itip-formatter/itip-view.c:5443
+#: ../modules/itip-formatter/itip-view.c:5543
 msgid "The item in the calendar is not valid"
 msgstr "Stavka u kalendaru nije ispravna"
 
-#: ../modules/itip-formatter/itip-view.c:5367
-#: ../modules/itip-formatter/itip-view.c:5397
-#: ../modules/itip-formatter/itip-view.c:5497
+#: ../modules/itip-formatter/itip-view.c:5414
+#: ../modules/itip-formatter/itip-view.c:5444
+#: ../modules/itip-formatter/itip-view.c:5544
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -16867,11 +18148,11 @@ msgstr ""
 "Poruka sadrži kalendar, ali on ne sadrži događaje, zadatke ili podatke "
 "slobodno/zauzeto."
 
-#: ../modules/itip-formatter/itip-view.c:5412
+#: ../modules/itip-formatter/itip-view.c:5459
 msgid "The calendar attached contains multiple items"
 msgstr "Kalendar u prilogu sadrži više stavki"
 
-#: ../modules/itip-formatter/itip-view.c:5413
+#: ../modules/itip-formatter/itip-view.c:5460
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -16883,24 +18164,24 @@ msgstr ""
 # When "None" is selected we want the field to be cleared.
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
-#: ../modules/itip-formatter/itip-view.c:5937
+#: ../modules/itip-formatter/itip-view.c:5952
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ništa"
 
-#: ../modules/itip-formatter/itip-view.c:5953
+#: ../modules/itip-formatter/itip-view.c:5968
 msgid "Tentatively Accepted"
 msgstr "Prihvaćeno s rezervom"
 
-#: ../modules/itip-formatter/itip-view.c:6096
+#: ../modules/itip-formatter/itip-view.c:6111
 msgid "This meeting recurs"
 msgstr "Ovaj sastanak se ponavlja"
 
-#: ../modules/itip-formatter/itip-view.c:6099
+#: ../modules/itip-formatter/itip-view.c:6114
 msgid "This task recurs"
 msgstr "Ovaj zadatak se ponavlja"
 
-#: ../modules/itip-formatter/itip-view.c:6102
+#: ../modules/itip-formatter/itip-view.c:6117
 msgid "This memo recurs"
 msgstr "Ova beleška se ponavlja"
 
@@ -16996,43 +18277,78 @@ msgstr "Direktorijum _pripreme:"
 msgid "Choose a mbox spool directory"
 msgstr "Izaberite direktorijum mboks pripreme"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:149
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:82
-#: ../modules/plugin-manager/evolution-plugin-manager.c:160
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:137
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:53
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:80
+#: ../modules/plugin-manager/evolution-plugin-manager.c:159
 msgid "Configuration"
 msgstr "Podešavanje"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:167
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:100
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:155
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:98
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:193
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:229
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:169
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:111
+msgid "_Port:"
+msgstr "_Port:"
+
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:227
 msgid "User_name:"
 msgstr "Korisničko_ime:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:226
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:150
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:214
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:148
 msgid "Encryption _method:"
 msgstr "Način _šifrovanja:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:241
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:165
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:229
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:163
 msgid "STARTTLS after connecting"
 msgstr "STARTTLS nakon povezivanja"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:169
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:233
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:167
 msgid "SSL on a dedicated port"
 msgstr "SSL na odeđenom portu"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:125
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:69
+msgid "_Use custom binary, instead of 'sendmail'"
+msgstr "_Koristi proizvoljni izvršni, umesto „sendmail“"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:73
+#| msgid "Custom Reminder:"
+msgid "_Custom binary:"
+msgstr "_Proizvoljni izvršni:"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:90
+#| msgid "Use custom fonts"
+msgid "U_se custom arguments"
+msgstr "Koristi _proizvoljne argumente"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:94
+#| msgid "_Arguments:"
+msgid "Cus_tom arguments:"
+msgstr "Proizvoljni _argumenti:"
+
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:112
+msgid ""
+"Default arguments are '-i -f %F -- %R', where\n"
+"   %F - stands for the From address\n"
+"   %R - stands for the recipient addresses"
+msgstr ""
+"Osnovni argumenti su „-i -f %F -- %R“, gde\n"
+"   %F — označava adresu pošiljaoca\n"
+"   %R — označava adrese primalaca"
+
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver traži potvrđivanje identiteta"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:211
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:209
 msgid "T_ype:"
 msgstr "_Vrsta:"
 
@@ -17044,7 +18360,7 @@ msgstr "Jahu! mogućnosti"
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Dodaj Jahu! _kalendar i zadatke ovom nalogu"
 
-#: ../modules/mail/e-mail-attachment-handler.c:390
+#: ../modules/mail/e-mail-attachment-handler.c:404
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
@@ -17053,46 +18369,46 @@ msgstr[1] "%d priložene poruke"
 msgstr[2] "%d priloženih poruka"
 msgstr[3] "Jedna priložena poruka"
 
-#: ../modules/mail/e-mail-shell-backend.c:244
+#: ../modules/mail/e-mail-shell-backend.c:238
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Poruka"
 
-#: ../modules/mail/e-mail-shell-backend.c:246
+#: ../modules/mail/e-mail-shell-backend.c:240
 msgid "Compose a new mail message"
 msgstr "Sastavite novu poruku"
 
-#: ../modules/mail/e-mail-shell-backend.c:254
+#: ../modules/mail/e-mail-shell-backend.c:248
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "Poštanski _nalog"
 
-#: ../modules/mail/e-mail-shell-backend.c:256
+#: ../modules/mail/e-mail-shell-backend.c:250
 msgid "Create a new mail account"
 msgstr "Napravite novi nalog za poštu"
 
-#: ../modules/mail/e-mail-shell-backend.c:261
+#: ../modules/mail/e-mail-shell-backend.c:255
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Fascikla za poštu"
 
-#: ../modules/mail/e-mail-shell-backend.c:263
+#: ../modules/mail/e-mail-shell-backend.c:257
 msgid "Create a new mail folder"
 msgstr "Napravite novu fasciklu za poštu"
 
-#: ../modules/mail/e-mail-shell-backend.c:561
+#: ../modules/mail/e-mail-shell-backend.c:555
 msgid "Mail Accounts"
 msgstr "Poštanski nalozi"
 
-#: ../modules/mail/e-mail-shell-backend.c:570
+#: ../modules/mail/e-mail-shell-backend.c:564
 msgid "Mail Preferences"
 msgstr "Postavke pošte"
 
-#: ../modules/mail/e-mail-shell-backend.c:579
+#: ../modules/mail/e-mail-shell-backend.c:573
 msgid "Composer Preferences"
 msgstr "Postavke sastavljača"
 
-#: ../modules/mail/e-mail-shell-backend.c:588
+#: ../modules/mail/e-mail-shell-backend.c:582
 msgid "Network Preferences"
 msgstr "Postavke mreže"
 
@@ -17102,122 +18418,132 @@ msgstr "Postavke mreže"
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
 #. Translators: The first item in the list, to be able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:890
+#: ../modules/mail/e-mail-shell-backend.c:883
 msgctxt "label"
 msgid "None"
 msgstr "Ništa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1226
-#: ../modules/mail/e-mail-shell-view.c:975
+#: ../modules/mail/e-mail-shell-view-actions.c:1279
 msgid "_Disable Account"
 msgstr "_Onemogući nalog"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1228
+#: ../modules/mail/e-mail-shell-view-actions.c:1281
 msgid "Disable this account"
 msgstr "Isključite ovaj nalog"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1235
+#: ../modules/mail/e-mail-shell-view-actions.c:1288
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Trajno uklonite sve obrisane poruke iz svih fascikli"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1242
+#: ../modules/mail/e-mail-shell-view-actions.c:1295
 msgid "Edit properties of this account"
 msgstr "Izmenite osobine ovog naloga"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1247
+#: ../modules/mail/e-mail-shell-view-actions.c:1300
+#| msgctxt "Meeting"
+#| msgid "Refresh"
+msgid "_Refresh"
+msgstr "_Osveži"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1302
+#| msgid "Edit properties of this account"
+msgid "Refresh list of folders of this account"
+msgstr "Osvežite spisak fascikli za ovaj nalog"
+
+#: ../modules/mail/e-mail-shell-view-actions.c:1307
 msgid "_Download Messages for Offline Usage"
 msgstr "_Preuzmi poruke za rad van mreže"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1249
+#: ../modules/mail/e-mail-shell-view-actions.c:1309
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Preuzmite poruke za naloge i fascikle koje su označene za rad van mreže"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1254
+#: ../modules/mail/e-mail-shell-view-actions.c:1314
 msgid "Fl_ush Outbox"
 msgstr "Is_prazni „Za slanje“"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1261
+#: ../modules/mail/e-mail-shell-view-actions.c:1321
 msgid "_Copy Folder To..."
 msgstr "_Umnoži fasciklu u..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1263
+#: ../modules/mail/e-mail-shell-view-actions.c:1323
 msgid "Copy the selected folder into another folder"
 msgstr "Umnožite izabranu fasciklu u drugu fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1270
+#: ../modules/mail/e-mail-shell-view-actions.c:1330
 msgid "Permanently remove this folder"
 msgstr "Trajno uklonite ovu fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1275
+#: ../modules/mail/e-mail-shell-view-actions.c:1335
 msgid "E_xpunge"
 msgstr "Izba_ci"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1277
+#: ../modules/mail/e-mail-shell-view-actions.c:1337
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Trajno uklonite sve obrisane poruke iz ove fascikle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1282
+#: ../modules/mail/e-mail-shell-view-actions.c:1342
 msgid "Mar_k All Messages as Read"
 msgstr "Označi sve po_ruke kao pročitane"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1284
+#: ../modules/mail/e-mail-shell-view-actions.c:1344
 msgid "Mark all messages in the folder as read"
 msgstr "Označite sve poruke u fascikli kao pročitane"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1289
+#: ../modules/mail/e-mail-shell-view-actions.c:1349
 msgid "_Move Folder To..."
 msgstr "_Premesti fasciklu u..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1291
+#: ../modules/mail/e-mail-shell-view-actions.c:1351
 msgid "Move the selected folder into another folder"
 msgstr "Premestite izabranu fasciklu u drugu fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1296
+#: ../modules/mail/e-mail-shell-view-actions.c:1356
 msgid "_New..."
 msgstr "_Novo..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1298
+#: ../modules/mail/e-mail-shell-view-actions.c:1358
 msgid "Create a new folder for storing mail"
 msgstr "Napravite novu fasciklu za smeštaj pošte"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1305
+#: ../modules/mail/e-mail-shell-view-actions.c:1365
 msgid "Change the properties of this folder"
 msgstr "Izmenite osobine ove fascikle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1312
+#: ../modules/mail/e-mail-shell-view-actions.c:1372
 msgid "Refresh the folder"
 msgstr "Osvežite fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1319
+#: ../modules/mail/e-mail-shell-view-actions.c:1379
 msgid "Change the name of this folder"
 msgstr "Promenite naziv ove fascikle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1324
+#: ../modules/mail/e-mail-shell-view-actions.c:1384
 msgid "Select Message _Thread"
 msgstr "Izaberi _raspravu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1326
+#: ../modules/mail/e-mail-shell-view-actions.c:1386
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Označite sve poruke iste rasprave kao izabranu poruku"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1331
+#: ../modules/mail/e-mail-shell-view-actions.c:1391
 msgid "Select Message S_ubthread"
 msgstr "Izaberi p_odniz poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1333
+#: ../modules/mail/e-mail-shell-view-actions.c:1393
 msgid "Select all replies to the currently selected message"
 msgstr "Izaberite sve odgovore na trenutno izabranu poruku"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1345
+#: ../modules/mail/e-mail-shell-view-actions.c:1405
 msgid "Empty _Trash"
 msgstr "Izbaci _smeće"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1347
+#: ../modules/mail/e-mail-shell-view-actions.c:1407
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Trajno uklonite sve obrisane poruke sa svih naloga"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1352
+#: ../modules/mail/e-mail-shell-view-actions.c:1412
 msgid "_New Label"
 msgstr "_Nova oznaka"
 
@@ -17226,210 +18552,201 @@ msgstr "_Nova oznaka"
 # When "None" is selected we want the field to be cleared.
 # Note that we don't show this here, since by default a 'None' date
 # is not permitted.
-#: ../modules/mail/e-mail-shell-view-actions.c:1361
+#: ../modules/mail/e-mail-shell-view-actions.c:1421
 msgid "N_one"
 msgstr "N_išta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1375
+#: ../modules/mail/e-mail-shell-view-actions.c:1435
 msgid "_Manage Subscriptions"
 msgstr "_Upravljaj prijavama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1377
-#: ../modules/mail/e-mail-shell-view-actions.c:1454
+#: ../modules/mail/e-mail-shell-view-actions.c:1437
+#: ../modules/mail/e-mail-shell-view-actions.c:1514
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Prijavite se ili se odjavite sa fascikli na mrežnim serverima"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1382
-#: ../modules/mail/e-mail-shell-view-actions.c:1403
+#: ../modules/mail/e-mail-shell-view-actions.c:1442
+#: ../modules/mail/e-mail-shell-view-actions.c:1463
 msgid "Send / _Receive"
 msgstr "Slanje / p_rimanje"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1384
+#: ../modules/mail/e-mail-shell-view-actions.c:1444
 msgid "Send queued items and retrieve new items"
 msgstr "Pošaljite pripremljene i dovucite nove stavke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1389
+#: ../modules/mail/e-mail-shell-view-actions.c:1449
 msgid "R_eceive All"
 msgstr "P_rimi sve"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1391
+#: ../modules/mail/e-mail-shell-view-actions.c:1451
 msgid "Receive new items from all accounts"
 msgstr "Primite nove stavke sa svih naloga"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1396
+#: ../modules/mail/e-mail-shell-view-actions.c:1456
 msgid "_Send All"
 msgstr "P_ošalji sve"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1398
+#: ../modules/mail/e-mail-shell-view-actions.c:1458
 msgid "Send queued items in all accounts"
 msgstr "Pošaljite stavke na čekanju u svim nalozima"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1424
-#: ../widgets/misc/e-activity-proxy.c:313
-msgid "Cancel"
-msgstr "Otkaži"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1426
+#: ../modules/mail/e-mail-shell-view-actions.c:1486
 msgid "Cancel the current mail operation"
 msgstr "Otkažite trenutnu operaciju sa poštom"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1431
+#: ../modules/mail/e-mail-shell-view-actions.c:1491
 msgid "Collapse All _Threads"
 msgstr "Skupi sve _rasprave"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1433
+#: ../modules/mail/e-mail-shell-view-actions.c:1493
 msgid "Collapse all message threads"
 msgstr "Skupite celokupno grananje rasprava"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1438
+#: ../modules/mail/e-mail-shell-view-actions.c:1498
 msgid "E_xpand All Threads"
 msgstr "Razgranaj sve ra_sprave"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1440
+#: ../modules/mail/e-mail-shell-view-actions.c:1500
 msgid "Expand all message threads"
 msgstr "Razgranajte sve poruke u raspravama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1445
+#: ../modules/mail/e-mail-shell-view-actions.c:1505
 msgid "_Message Filters"
-msgstr "F_ilteri poruke"
+msgstr "_Propusnici poruka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1447
+#: ../modules/mail/e-mail-shell-view-actions.c:1507
 msgid "Create or edit rules for filtering new mail"
-msgstr "Napravite ili uredite pravila za filtriranje nove pošte"
+msgstr "Napravite ili uredite pravila za izdvajanje nove pošte"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1452
+#: ../modules/mail/e-mail-shell-view-actions.c:1512
 msgid "_Subscriptions..."
 msgstr "_Prijave..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1461
+#: ../modules/mail/e-mail-shell-view-actions.c:1521
 msgid "F_older"
 msgstr "_Fascikla"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1468
+#: ../modules/mail/e-mail-shell-view-actions.c:1528
 msgid "_Label"
 msgstr "_Natpis"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1485
+#: ../modules/mail/e-mail-shell-view-actions.c:1545
 msgid "C_reate Search Folder From Search..."
 msgstr "Napravi _fasciklu pretrage iz pretrage..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1492
+#: ../modules/mail/e-mail-shell-view-actions.c:1552
 msgid "Search F_olders"
 msgstr "Fas_cikle pretrage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1494
+#: ../modules/mail/e-mail-shell-view-actions.c:1554
 msgid "Create or edit search folder definitions"
 msgstr "Napravite ili uredite definicije fascikle pretrage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1529
+#: ../modules/mail/e-mail-shell-view-actions.c:1593
 msgid "_New Folder..."
 msgstr "_Nova fascikla..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1557
+#: ../modules/mail/e-mail-shell-view-actions.c:1621
 msgid "Show Message _Preview"
 msgstr "Prika_ži pregled poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1559
+#: ../modules/mail/e-mail-shell-view-actions.c:1623
 msgid "Show message preview pane"
 msgstr "Prikažite pregled poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1565
+#: ../modules/mail/e-mail-shell-view-actions.c:1629
 msgid "Show _Deleted Messages"
 msgstr "Prikaži o_brisane poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1567
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
 msgid "Show deleted messages with a line through them"
 msgstr "Prikažite obrisane poruke (kao precrtane)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1573
+#: ../modules/mail/e-mail-shell-view-actions.c:1637
 msgid "_Group By Threads"
 msgstr "Grupiši po _raspravama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1575
+#: ../modules/mail/e-mail-shell-view-actions.c:1639
 msgid "Threaded message list"
 msgstr "Spisak poruka po temama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1581
+#: ../modules/mail/e-mail-shell-view-actions.c:1645
 msgid "_Unmatched Folder Enabled"
 msgstr "Uključena _nepoklopljena fascikla"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1583
+#: ../modules/mail/e-mail-shell-view-actions.c:1647
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Okida prilikom uključivanja nepoklopljene fascikle pretrage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1603
+#: ../modules/mail/e-mail-shell-view-actions.c:1667
 msgid "Show message preview below the message list"
 msgstr "Prikažite pregled poruke ispod liste poruka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1610
+#: ../modules/mail/e-mail-shell-view-actions.c:1674
 msgid "Show message preview alongside the message list"
 msgstr "Prikažite pregled poruke pored spiska poruka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1618
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
 msgid "All Messages"
 msgstr "Sve poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1625
+#: ../modules/mail/e-mail-shell-view-actions.c:1689
 msgid "Important Messages"
 msgstr "Važne poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1632
+#: ../modules/mail/e-mail-shell-view-actions.c:1696
 msgid "Last 5 Days' Messages"
 msgstr "Poruke u zadnjih 5 dana"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1639
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
 msgid "Messages Not Junk"
 msgstr "Poruke nisu đubre"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1646
+#: ../modules/mail/e-mail-shell-view-actions.c:1710
 msgid "Messages with Attachments"
 msgstr "Poruke sa prilozima"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1653
+#: ../modules/mail/e-mail-shell-view-actions.c:1717
 msgid "No Label"
 msgstr "Bez oznake"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1660
+#: ../modules/mail/e-mail-shell-view-actions.c:1724
 msgid "Read Messages"
 msgstr "Pročitane poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1667
+#: ../modules/mail/e-mail-shell-view-actions.c:1731
 msgid "Unread Messages"
 msgstr "Nepročitane poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1719
+#: ../modules/mail/e-mail-shell-view-actions.c:1783
 msgid "Subject or Addresses contain"
 msgstr "Naslov ili adrese sadrže"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1729
+#: ../modules/mail/e-mail-shell-view-actions.c:1793
 msgid "All Accounts"
 msgstr "svim nalozima"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1736
+#: ../modules/mail/e-mail-shell-view-actions.c:1800
 msgid "Current Account"
 msgstr "tekućem nalogu"
 
 # #-#-#-#-#  evolution.gnome-3-4.sr.po (evolution)  #-#-#-#-#
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:1743
+#: ../modules/mail/e-mail-shell-view-actions.c:1807
 msgid "Current Folder"
 msgstr "tekućoj fascikli"
 
-#: ../modules/mail/e-mail-shell-view.c:613
+#: ../modules/mail/e-mail-shell-view.c:616
 msgid "All Account Search"
 msgstr "Pretraga svih naloga"
 
-#: ../modules/mail/e-mail-shell-view.c:710
+#: ../modules/mail/e-mail-shell-view.c:717
 msgid "Account Search"
 msgstr "Pretraga naloga"
 
-#: ../modules/mail/e-mail-shell-view.c:973
-msgid "Proxy _Logout"
-msgstr "_Odjava sa mrežnog posrednika"
-
-#: ../modules/mail/e-mail-shell-view-private.c:962
+#: ../modules/mail/e-mail-shell-view-private.c:1023
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -17438,7 +18755,7 @@ msgstr[1] "%d izabrane, "
 msgstr[2] "%d izabranih, "
 msgstr[3] "%d izabrana, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:973
+#: ../modules/mail/e-mail-shell-view-private.c:1034
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -17447,8 +18764,8 @@ msgstr[1] "%d obrisane"
 msgstr[2] "%d obrisanih"
 msgstr[3] "%d obrisana"
 
-#: ../modules/mail/e-mail-shell-view-private.c:979
-#: ../modules/mail/e-mail-shell-view-private.c:986
+#: ../modules/mail/e-mail-shell-view-private.c:1040
+#: ../modules/mail/e-mail-shell-view-private.c:1047
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -17457,7 +18774,7 @@ msgstr[1] "%d nepoželjne"
 msgstr[2] "%d nepoželjnih"
 msgstr[3] "%d nepoželjna"
 
-#: ../modules/mail/e-mail-shell-view-private.c:992
+#: ../modules/mail/e-mail-shell-view-private.c:1053
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -17466,7 +18783,7 @@ msgstr[1] "%d nacrta"
 msgstr[2] "%d nacrta"
 msgstr[3] "%d nacrt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:998
+#: ../modules/mail/e-mail-shell-view-private.c:1059
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -17475,7 +18792,7 @@ msgstr[1] "%d neposlate"
 msgstr[2] "%d neposlatih"
 msgstr[3] "%d neposlata"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1004
+#: ../modules/mail/e-mail-shell-view-private.c:1065
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -17484,7 +18801,7 @@ msgstr[1] "%d poslate"
 msgstr[2] "%d poslatih"
 msgstr[3] "%d poslata"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1016
+#: ../modules/mail/e-mail-shell-view-private.c:1077
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -17493,7 +18810,7 @@ msgstr[1] "%d nepročitane, "
 msgstr[2] "%d nepročitanih, "
 msgstr[3] "%d nepročitana, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1019
+#: ../modules/mail/e-mail-shell-view-private.c:1080
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -17502,53 +18819,61 @@ msgstr[1] "%d ukupno"
 msgstr[2] "%d ukupno"
 msgstr[3] "%d ukupno"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1042
+#: ../modules/mail/e-mail-shell-view-private.c:1103
 msgid "Trash"
 msgstr "Smeće"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1458
+#: ../modules/mail/e-mail-shell-view-private.c:1519
 msgid "Send / Receive"
 msgstr "Pošalji / Primi"
 
-#: ../modules/mail/em-composer-prefs.c:509
+#: ../modules/mail/em-composer-prefs.c:492
 msgid "Language(s)"
 msgstr "Jezik(ci)"
 
 # bug: requires a comment on usage
 # slično kao za mesece i nedelje
-#: ../modules/mail/em-mailer-prefs.c:86
-msgid "Every time"
-msgstr "svaki put"
+#: ../modules/mail/em-mailer-prefs.c:80
+#| msgid "Every time"
+msgid "On exit, every time"
+msgstr "Pri izlasku, svaki put"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:87
-msgid "Once per day"
-msgstr "jednom dnevno"
+#: ../modules/mail/em-mailer-prefs.c:81
+#| msgid "Once per day"
+msgid "On exit, once per day"
+msgstr "Pri izlasku, jednom dnevno"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:88
-msgid "Once per week"
-msgstr "jednom nedeljno"
+#: ../modules/mail/em-mailer-prefs.c:82
+#| msgid "Once per week"
+msgid "On exit, once per week"
+msgstr "Pri izlasku, jednom nedeljeno"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:89
-msgid "Once per month"
-msgstr "jednom mesečno"
+#: ../modules/mail/em-mailer-prefs.c:83
+#| msgid "Once per month"
+msgid "On exit, once per month"
+msgstr "Pri izlasku, jednom mesečno"
 
-#: ../modules/mail/em-mailer-prefs.c:318
+#: ../modules/mail/em-mailer-prefs.c:84
+msgid "Immediately, on folder leave"
+msgstr "Odmah, pri napuštanju fascikle"
+
+#: ../modules/mail/em-mailer-prefs.c:313
 msgid "Header"
 msgstr "Zaglavlje"
 
-#: ../modules/mail/em-mailer-prefs.c:322
+#: ../modules/mail/em-mailer-prefs.c:317
 msgid "Contains Value"
 msgstr "Sadrži vrednost"
 
 #. To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview
-#: ../modules/mail/em-mailer-prefs.c:1145
+#: ../modules/mail/em-mailer-prefs.c:1141
 msgid "_Date header:"
 msgstr "Zaglavlje _datuma:"
 
-#: ../modules/mail/em-mailer-prefs.c:1146
+#: ../modules/mail/em-mailer-prefs.c:1142
 msgid "Show _original header value"
 msgstr "Prikaži _originalnu vrednost zaglavlja"
 
@@ -17558,24 +18883,24 @@ msgstr "Da li želite da Evoluciju učinite podrazumevanim klijentom el. pošte?
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:323
+#: ../modules/mdn/evolution-mdn.c:311
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "Vaša poruka za %s na temu „%s“ na %s je pročitana."
 
 #. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:390
+#: ../modules/mdn/evolution-mdn.c:378
 #, c-format
 msgid "Delivery Notification for \"%s\""
 msgstr "Obaveštenje o prijemu za „%s“"
 
-#: ../modules/mdn/evolution-mdn.c:543
+#: ../modules/mdn/evolution-mdn.c:536
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "Pošalji povratnicu čitanja za „%s“"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:548
+#: ../modules/mdn/evolution-mdn.c:541
 msgid "_Notify Sender"
 msgstr "Obavesti _pošiljaoca"
 
@@ -17607,7 +18932,7 @@ msgstr ""
 "Evolucija će se vratiti u režim na mreži kada mrežna veza bude bila "
 "uspostavljena."
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:417
+#: ../modules/online-accounts/camel-sasl-xoauth.c:298
 msgid ""
 "Cannot find a corresponding account in the org.gnome.OnlineAccounts service "
 "from which to obtain an authentication token."
@@ -17615,43 +18940,43 @@ msgstr ""
 "Ne mogu da pronađem odgovarajući nalog na usluzi „org.gnom.Nalozi na mreži“ "
 "sa koje bih dobio pristup potvrđivanju identiteta."
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:504
+#: ../modules/online-accounts/camel-sasl-xoauth.c:377
 msgid "OAuth"
 msgstr "OAut"
 
-#: ../modules/online-accounts/camel-sasl-xoauth.c:506
+#: ../modules/online-accounts/camel-sasl-xoauth.c:379
 msgid ""
 "This option will connect to the server by way of the GNOME Online Accounts "
 "service"
 msgstr ""
 "Ova opcija će se povezati na server putem Gnomove usluge naloga na mreži"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Author(s)"
 msgstr "Autor(i)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:255
+#: ../modules/plugin-manager/evolution-plugin-manager.c:254
 msgid "Plugin Manager"
 msgstr "Upravnik priključaka"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:270
+#: ../modules/plugin-manager/evolution-plugin-manager.c:269
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Napomena: neke izmene neće biti uključene pre ponovnog pokretanja"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:299
+#: ../modules/plugin-manager/evolution-plugin-manager.c:298
 msgid "Overview"
 msgstr "Pregled"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:368
-#: ../modules/plugin-manager/evolution-plugin-manager.c:451
+#: ../modules/plugin-manager/evolution-plugin-manager.c:367
+#: ../modules/plugin-manager/evolution-plugin-manager.c:450
 msgid "Plugin"
 msgstr "Priključak"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:489
+#: ../modules/plugin-manager/evolution-plugin-manager.c:488
 msgid "_Plugins"
 msgstr "_Priključci"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:490
+#: ../modules/plugin-manager/evolution-plugin-manager.c:489
 msgid "Enable and disable plugins"
 msgstr "Uključuje i isključuje dodatke"
 
@@ -17671,23 +18996,23 @@ msgstr "Prikaži HTML izdanje"
 msgid "Display HTML version of multipart/alternative message"
 msgstr "Prikazuje izdanje HTML-a poruke iz više delova ili neke druge"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
-#: ../modules/prefer-plain/plugin/config-ui.c:46
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../modules/prefer-plain/plugin/config-ui.c:44
 msgid "Show HTML if present"
 msgstr "Prikaži HTML ako postoji"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
-#: ../modules/prefer-plain/plugin/config-ui.c:47
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
+#: ../modules/prefer-plain/plugin/config-ui.c:45
 msgid "Let Evolution choose the best part to show."
 msgstr "Pušta da Evolucija izabere najbolji deo za prikaz."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:86
-#: ../modules/prefer-plain/plugin/config-ui.c:50
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../modules/prefer-plain/plugin/config-ui.c:48
 msgid "Show plain text if present"
 msgstr "Prikaži običan tekst ako postoji"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
-#: ../modules/prefer-plain/plugin/config-ui.c:51
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
+#: ../modules/prefer-plain/plugin/config-ui.c:49
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -17695,13 +19020,13 @@ msgstr ""
 "Prikazuje deo sa običnim tekstom, ako postoji, inače pušta da Evolucija "
 "izabere najbolji deo za prikaz."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:91
-#: ../modules/prefer-plain/plugin/config-ui.c:55
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../modules/prefer-plain/plugin/config-ui.c:53
 msgid "Only ever show plain text"
 msgstr "Isključivo prikazuj običan tekst"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:92
-#: ../modules/prefer-plain/plugin/config-ui.c:56
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
+#: ../modules/prefer-plain/plugin/config-ui.c:54
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -17709,11 +19034,11 @@ msgstr ""
 "Uvek prikazuje deo sa običnim tekstom, prilažući ostale delove u poruku, po "
 "izboru."
 
-#: ../modules/prefer-plain/plugin/config-ui.c:107
+#: ../modules/prefer-plain/plugin/config-ui.c:105
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Prikaži po_tisnute HTML delove kao priloge"
 
-#: ../modules/prefer-plain/plugin/config-ui.c:129
+#: ../modules/prefer-plain/plugin/config-ui.c:127
 msgid "HTML _Mode"
 msgstr "HTML _režim"
 
@@ -17730,59 +19055,48 @@ msgstr "Model teksta"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "Pregleda poruke kao običan tekst, čak i ako sadrže HTML."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:192
+#: ../modules/spamassassin/evolution-spamassassin.c:184
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr "Nisam uspeo da izrodim Ubicu spama (%s): "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:215
+#: ../modules/spamassassin/evolution-spamassassin.c:207
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr "Nisam uspeo da pošaljem sadržaj poruke pošte do Ubice spama: "
 
 # bug: plural-forms
-#: ../modules/spamassassin/evolution-spamassassin.c:234
+#: ../modules/spamassassin/evolution-spamassassin.c:226
 #, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr "Nisam uspeo da zapišem „%s“ u Ubici spama: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:262
+#: ../modules/spamassassin/evolution-spamassassin.c:254
 msgid "Failed to read output from SpamAssassin: "
 msgstr "Nisam uspeo da pročitam izlaz iz Ubice spama: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:317
+#: ../modules/spamassassin/evolution-spamassassin.c:309
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr "Ili se Ubica spama urušio ili nije uspeo da analizira poruku pošte"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:885
+#: ../modules/spamassassin/evolution-spamassassin.c:747
 msgid "SpamAssassin Options"
 msgstr "Opcije Ubice spama"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:900
+#: ../modules/spamassassin/evolution-spamassassin.c:762
 msgid "I_nclude remote tests"
 msgstr "U_ključi mrežne provere"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:914
+#: ../modules/spamassassin/evolution-spamassassin.c:776
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "Ovo će Ubicu spama učiniti pouzdanijim , ali sporijim."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:1123
+#: ../modules/spamassassin/evolution-spamassassin.c:1033
 msgid "SpamAssassin"
 msgstr "Ubica spama"
 
-#: ../modules/startup-wizard/e-mail-config-import-page.c:204
-#: ../widgets/misc/e-import-assistant.c:403
-msgid "Please select the information that you would like to import:"
-msgstr "Izaberite podatke koje želite da uvezete:"
-
-#: ../modules/startup-wizard/e-mail-config-import-page.c:233
-#: ../widgets/misc/e-import-assistant.c:559
-#, c-format
-msgid "From %s:"
-msgstr "Od %s:"
-
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/startup-wizard/e-mail-config-import-page.c:264
+#: ../modules/startup-wizard/e-mail-config-import-page.c:262
 #: ../modules/startup-wizard/e-mail-config-import-progress-page.c:342
 msgid "Importing Files"
 msgstr "Uvozim datoteke"
@@ -17795,7 +19109,7 @@ msgstr "Uvoženje je otkazano."
 msgid "Import complete."
 msgstr "Uvoženje je završeno."
 
-#: ../modules/startup-wizard/e-startup-assistant.c:154
+#: ../modules/startup-wizard/e-startup-assistant.c:156
 msgid ""
 "Welcome to Evolution.\n"
 "\n"
@@ -17807,7 +19121,7 @@ msgstr ""
 "Nekoliko narednih ekrana će omogućiti Evoluciji da se poveže na vaše naloge "
 "el. pošte i da uveze datoteke iz drugih programa."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:242
+#: ../modules/startup-wizard/evolution-startup-wizard.c:239
 msgid "Loading accounts..."
 msgstr "Učitavam naloge..."
 
@@ -17819,11 +19133,11 @@ msgstr "Oblikuj _kao..."
 msgid "_Other languages"
 msgstr "_Drugi jezici"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:342
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:371
 msgid "Text Highlight"
 msgstr "Isticanje teksta"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:348
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:372
 msgid "Syntax highlighting of mail parts"
 msgstr "Isticanje sadržaja delova pošte"
 
@@ -18045,25 +19359,25 @@ msgstr "_TCSH"
 msgid "_VHDL"
 msgstr "_VHDL"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:118
-#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:201
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:126
+#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:195
 msgid "Show F_ull vCard"
 msgstr "Prikaži _punu vKartu"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:121
-#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:219
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:129
+#: ../modules/vcard-inline/e-mail-parser-vcard-inline.c:213
 msgid "Show Com_pact vCard"
 msgstr "Prikaži _sažetu vKartu"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:145
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:153
 msgid "Save _To Addressbook"
 msgstr "Sačuvaj _u adresar"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:165
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:173
 msgid "There is one other contact."
 msgstr "Postoji još jedan kontakt."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:171
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:179
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
@@ -18072,33 +19386,32 @@ msgstr[1] "Postoje još %d kontakta."
 msgstr[2] "Postoji još %d kontakta."
 msgstr[3] "Postoji još %d kontakt."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:196
-#| msgid "Addressbok Contact"
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:204
 msgid "Addressbook Contact"
 msgstr "Kontakt adresara"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:202
+#: ../modules/vcard-inline/e-mail-formatter-vcard-inline.c:205
 msgid "Display the part as an addressbook contact"
 msgstr "Prikažite delove kao kontakt adresara"
 
-#: ../modules/web-inspector/evolution-web-inspector.c:88
+#: ../modules/web-inspector/evolution-web-inspector.c:89
 msgid "_Inspect..."
 msgstr "_Nadgledaj..."
 
-#: ../modules/web-inspector/evolution-web-inspector.c:90
+#: ../modules/web-inspector/evolution-web-inspector.c:91
 msgid "Inspect the HTML content (debugging feature)"
 msgstr "Nadgledaj HTML sadržaj (uklanjanje grešaka)"
 
-#: ../modules/web-inspector/evolution-web-inspector.c:102
+#: ../modules/web-inspector/evolution-web-inspector.c:103
 msgid "Evolution Web Inspector"
 msgstr "Nadzornik veba Evolucije"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:128
+#: ../plugins/attachment-reminder/attachment-reminder.c:121
 msgid "_Do not show this message again."
 msgstr "_Ne prikazuj ponovo ovu poruku."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:590
-#: ../plugins/templates/templates.c:469
+#: ../plugins/attachment-reminder/attachment-reminder.c:583
+#: ../plugins/templates/templates.c:473
 msgid "Keywords"
 msgstr "Ključne reči"
 
@@ -18130,35 +19443,35 @@ msgstr "Podsetnik priloga"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "Podseća kada zaboravite da dodate prilog u poruku."
 
-#: ../plugins/bbdb/bbdb.c:650 ../plugins/bbdb/bbdb.c:659
+#: ../plugins/bbdb/bbdb.c:655 ../plugins/bbdb/bbdb.c:664
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatski kontakti"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:674
+#: ../plugins/bbdb/bbdb.c:679
 msgid "Create _address book entries when sending mails"
 msgstr "Napravi unose u _adresar pri slanju pošte"
 
-#: ../plugins/bbdb/bbdb.c:682
+#: ../plugins/bbdb/bbdb.c:687
 msgid "Select Address book for Automatic Contacts"
 msgstr "Izaberi adresar za Automatske kontakte"
 
-#: ../plugins/bbdb/bbdb.c:699
+#: ../plugins/bbdb/bbdb.c:704
 msgid "Instant Messaging Contacts"
 msgstr "Kontakti trenutnih poruka"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:714
+#: ../plugins/bbdb/bbdb.c:719
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "_Usklađuje slike i podatke kontakta sa listom drugara iz Pidžina"
 
-#: ../plugins/bbdb/bbdb.c:722
+#: ../plugins/bbdb/bbdb.c:727
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Bira adresar za listu prijatelja Pidžina"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:735
+#: ../plugins/bbdb/bbdb.c:740
 msgid "Synchronize with _buddy list now"
 msgstr "Uskladi sa _listom drugara sada"
 
@@ -18177,9 +19490,10 @@ msgstr ""
 "Oslobađa vas teškog rada u upravljanju adresarom.\n"
 "\n"
 "Automatski popunjava adresar imenima i adresama el. pošte kada odgovarate na "
-"poruke. Takođe popunjava podatke za kontakt brzim glasnikom iz spiska drugara."
+"poruke.  Takođe popunjava podatke za kontakt brzim glasnikom iz spiska "
+"drugara."
 
-#: ../plugins/dbx-import/dbx-importer.c:287
+#: ../plugins/dbx-import/dbx-importer.c:282
 msgid "Importing Outlook Express data"
 msgstr "Uvozim podatke Autluk Ekspresa"
 
@@ -18238,17 +19552,17 @@ msgstr "Strogo poverljivo"
 # 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.
-#: ../plugins/email-custom-header/email-custom-header.c:357
+#: ../plugins/email-custom-header/email-custom-header.c:360
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "Ništa"
 
-#: ../plugins/email-custom-header/email-custom-header.c:530
+#: ../plugins/email-custom-header/email-custom-header.c:534
 msgid "_Custom Header"
 msgstr "_Prilagođeno zaglavlje"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:799
+#: ../plugins/email-custom-header/email-custom-header.c:804
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -18256,12 +19570,12 @@ msgstr ""
 "Format za navođenje ključa prilagođenog zaglavlja je:\n"
 "Vrednosti naziv ključa prilagođenog zaglavlja su razdvojeni sa „;“."
 
-#: ../plugins/email-custom-header/email-custom-header.c:851
+#: ../plugins/email-custom-header/email-custom-header.c:857
 msgid "Key"
 msgstr "Ključ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:867
-#: ../plugins/templates/templates.c:477
+#: ../plugins/email-custom-header/email-custom-header.c:874
+#: ../plugins/templates/templates.c:482
 msgid "Values"
 msgstr "Vrednosti"
 
@@ -18278,11 +19592,11 @@ msgstr "Dodajte prilagođena zaglavlja odlaznim porukama."
 msgid "Email Custom Header"
 msgstr "Prilagođeno zaglavlje el. pošte"
 
-#: ../plugins/external-editor/external-editor.c:114
+#: ../plugins/external-editor/external-editor.c:112
 msgid "Command to be executed to launch the editor: "
 msgstr "Naredba za izvršavanje radi pokretanja uređivača: "
 
-#: ../plugins/external-editor/external-editor.c:115
+#: ../plugins/external-editor/external-editor.c:113
 msgid ""
 "For XEmacs use \"xemacs\"\n"
 "For Vim use \"gvim -f\""
@@ -18290,8 +19604,8 @@ msgstr ""
 "Za iKsEmaks koristite „xemacs“\n"
 "Za Vim koristite „gvim -f“"
 
-#: ../plugins/external-editor/external-editor.c:396
-#: ../plugins/external-editor/external-editor.c:398
+#: ../plugins/external-editor/external-editor.c:412
+#: ../plugins/external-editor/external-editor.c:414
 msgid "Compose in External Editor"
 msgstr "Sastavlja u spoljnom uređivaču"
 
@@ -18339,23 +19653,27 @@ msgstr ""
 "Pokrenut je spoljni uređivač. Prozor sastavljača poruke nije moguće zatvoriti "
 "dok je aktivan uređivač."
 
-#: ../plugins/face/face.c:292
+#: ../plugins/face/face.c:171 ../smime/gui/certificate-manager.c:322
+msgid "Unknown error"
+msgstr "Nepoznata greška"
+
+#: ../plugins/face/face.c:289
 msgid "Select a Face Picture"
 msgstr "Izaberite sliku lica"
 
-#: ../plugins/face/face.c:302
+#: ../plugins/face/face.c:299
 msgid "Image files"
 msgstr "Datoteke slika"
 
-#: ../plugins/face/face.c:361
+#: ../plugins/face/face.c:358
 msgid "_Insert Face picture by default"
 msgstr "_Unapred umetni sliku kontakta"
 
-#: ../plugins/face/face.c:374
+#: ../plugins/face/face.c:371
 msgid "Load new _Face picture"
 msgstr "Učitaj novu _sliku kontakta"
 
-#: ../plugins/face/face.c:435
+#: ../plugins/face/face.c:432
 msgid "Include _Face"
 msgstr "Uključi _sliku"
 
@@ -18396,55 +19714,55 @@ msgstr "Unutrašnja slika"
 msgid "View image attachments directly in mail messages."
 msgstr "Pregledajte priloge sa slikama direktno u porukama."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:365
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
 msgid "Get List _Archive"
 msgstr "Pribavi _arhivu liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:367
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:369
 msgid "Get an archive of the list this message belongs to"
 msgstr "Pribavlja arhivu liste kojoj ova poruka pripada"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:372
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
 msgid "Get List _Usage Information"
 msgstr "Pribavi podatke o _korišćenju liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:374
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:376
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Pribavlja podatke o korišćenju liste kojoj ova poruka pripada"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:379
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
 msgid "Contact List _Owner"
 msgstr "_Vlasnik kontakt liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:381
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:383
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Javite se vlasniku dopisne liste kojoj ova poruka pripada"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:386
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:388
 msgid "_Post Message to List"
 msgstr "_Pošalji poruku na listu"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:388
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:390
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Sastavite poruku za dopisnu listu kojoj ova poruka pripada"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:393
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:395
 msgid "_Subscribe to List"
 msgstr "Pri_javi se na listu"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:395
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:397
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Prijavite se na dopisnu listu kojoj ova poruka pripada"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:400
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:402
 msgid "_Unsubscribe from List"
 msgstr "O_djavi se sa liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:402
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:404
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Odjavite se sa dopisne liste kojoj ova poruka pripada"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:409
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:411
 msgid "Mailing _List"
 msgstr "Dopisna _lista"
 
@@ -18533,8 +19851,8 @@ msgstr ""
 "\n"
 "Zaglavlje: {0}"
 
-#: ../plugins/mail-notification/mail-notification.c:385
-#: ../plugins/mail-notification/mail-notification.c:421
+#: ../plugins/mail-notification/mail-notification.c:384
+#: ../plugins/mail-notification/mail-notification.c:420
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -18545,48 +19863,48 @@ msgstr[3] "Primili ste novu poruku."
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:410
+#: ../plugins/mail-notification/mail-notification.c:409
 #, c-format
 msgid "Subject: %s"
 msgstr "Naslov: %s"
 
 # shell:noshell-reason title
-#: ../plugins/mail-notification/mail-notification.c:427
+#: ../plugins/mail-notification/mail-notification.c:426
 msgid "New email in Evolution"
 msgstr "Nova pošta u Evoluciji"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:458
+#: ../plugins/mail-notification/mail-notification.c:461
 #, c-format
 msgid "Show %s"
 msgstr "Prikaži %s"
 
-#: ../plugins/mail-notification/mail-notification.c:658
+#: ../plugins/mail-notification/mail-notification.c:663
 msgid "_Play sound when a new message arrives"
 msgstr "Zvučno _obavesti kada stigne nova poruka"
 
-#: ../plugins/mail-notification/mail-notification.c:690
+#: ../plugins/mail-notification/mail-notification.c:695
 msgid "_Beep"
 msgstr "_Zapišti"
 
-#: ../plugins/mail-notification/mail-notification.c:703
+#: ../plugins/mail-notification/mail-notification.c:708
 msgid "Use sound _theme"
 msgstr "Koristi zvuk _teme"
 
-#: ../plugins/mail-notification/mail-notification.c:722
+#: ../plugins/mail-notification/mail-notification.c:727
 msgid "Play _file:"
 msgstr "Pusti zvučnu _datoteku:"
 
-#: ../plugins/mail-notification/mail-notification.c:731
+#: ../plugins/mail-notification/mail-notification.c:736
 msgid "Select sound file"
 msgstr "Izaberite zvučnu datoteku"
 
-#: ../plugins/mail-notification/mail-notification.c:787
+#: ../plugins/mail-notification/mail-notification.c:792
 msgid "Notify new messages for _Inbox only"
 msgstr "Obavesti o novim porukama samo za _Sanduče"
 
-#: ../plugins/mail-notification/mail-notification.c:797
+#: ../plugins/mail-notification/mail-notification.c:802
 msgid "Show _notification when a new message arrives"
 msgstr "Prikaži _obaveštenje kada pristigne nova poruka"
 
@@ -18599,12 +19917,12 @@ msgid "Notifies you when new mail messages arrive."
 msgstr "Obaveštava vas kada stigne nova poruka."
 
 #. To Translators: The full sentence looks like: "Created from a mail by John Doe <john.doe@myco.example>"
-#: ../plugins/mail-to-task/mail-to-task.c:239
+#: ../plugins/mail-to-task/mail-to-task.c:233
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Sačinjeno iz poruke koju šalje %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:622
+#: ../plugins/mail-to-task/mail-to-task.c:617
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -18613,7 +19931,7 @@ msgstr ""
 "Izabrani kalendar već sadrži događaj „%s“. Želite li da uredite stari "
 "događaj?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:625
+#: ../plugins/mail-to-task/mail-to-task.c:620
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -18621,7 +19939,7 @@ msgid ""
 msgstr ""
 "Izabrani spisak već sadrži zadatak „%s“. Želite li da uredite stari zadatak?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:628
+#: ../plugins/mail-to-task/mail-to-task.c:623
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -18629,8 +19947,7 @@ msgid ""
 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
-#: ../plugins/mail-to-task/mail-to-task.c:647
+#: ../plugins/mail-to-task/mail-to-task.c:643
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -18651,8 +19968,7 @@ msgstr[3] ""
 "Izabrali ste %d pošta da prevedete u događaje. Da li zaista želite sve da ih "
 "dodate?"
 
-#. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:653
+#: ../plugins/mail-to-task/mail-to-task.c:650
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -18673,8 +19989,7 @@ msgstr[3] ""
 "Izabrali ste %d pošta da prevedete u zadatke. Da li zaista želite sve da ih "
 "dodate?"
 
-#. Translators: Note there are always more than 10 mails selected
-#: ../plugins/mail-to-task/mail-to-task.c:659
+#: ../plugins/mail-to-task/mail-to-task.c:657
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -18695,11 +20010,11 @@ msgstr[3] ""
 "Izabrali ste %d pošta da prevedete u beleške. Da li zaista želite sve da ih "
 "dodate?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:680
+#: ../plugins/mail-to-task/mail-to-task.c:678
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Da li želite da nastavite sa prevođenjem preostalih pošta?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:755
+#: ../plugins/mail-to-task/mail-to-task.c:754
 msgid "[No Summary]"
 msgstr "[Bez sažetka]"
 
@@ -18707,77 +20022,82 @@ msgstr "[Bez sažetka]"
 msgid "Invalid object returned from a server"
 msgstr "Neispravan objekat vraćen sa servera"
 
-#: ../plugins/mail-to-task/mail-to-task.c:819
+#: ../plugins/mail-to-task/mail-to-task.c:820
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Došlo je do greške u obradi: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:844
+#: ../plugins/mail-to-task/mail-to-task.c:847
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Ne mogu da otvorim kalendar. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:844
-msgid "Unknown error."
-msgstr "Nepoznata greška."
-
-#: ../plugins/mail-to-task/mail-to-task.c:851
+#: ../plugins/mail-to-task/mail-to-task.c:854
+#| msgid ""
+#| "Selected source is read only, thus cannot create event there. Select "
+#| "other source, please."
 msgid ""
-"Selected source is read only, thus cannot create event there. Select other "
-"source, please."
+"Selected calendar is read only, thus cannot create event there. Select other "
+"calendar, please."
 msgstr ""
-"Izabrani izvor je samo za čitanje, stoga ne možete napraviti događaj. "
-"Izaberite drugi izvor."
+"Izabrani kalendar je samo za čitanje, stoga ne možete napraviti događaj. "
+"Izaberite drugi kalendar."
 
-#: ../plugins/mail-to-task/mail-to-task.c:854
+#: ../plugins/mail-to-task/mail-to-task.c:857
+#| msgid ""
+#| "Selected source is read only, thus cannot create task there. Select other "
+#| "source, please."
 msgid ""
-"Selected source is read only, thus cannot create task there. Select other "
-"source, please."
+"Selected task list is read only, thus cannot create task there. Select other "
+"task list, please."
 msgstr ""
-"Izabrani izvor je samo za čitanje, stoga ne možete napraviti zadatak. "
-"Izaberite drugi izvor."
+"Izabrani spisak zadataka je samo za čitanje, stoga ne možete napraviti "
+"zadatak. Izaberite drugi spisak zadataka."
 
-#: ../plugins/mail-to-task/mail-to-task.c:857
+#: ../plugins/mail-to-task/mail-to-task.c:860
+#| msgid ""
+#| "Selected source is read only, thus cannot create memo there. Select other "
+#| "source, please."
 msgid ""
-"Selected source is read only, thus cannot create memo there. Select other "
-"source, please."
+"Selected memo list is read only, thus cannot create memo there. Select other "
+"memo list, please."
 msgstr ""
-"Izabrani izvor je samo za čitanje, stoga ne možete napraviti belešku. "
-"Izaberite drugi izvor."
+"Izabrani spisak beleški je samo za čitanje, stoga ne možete napraviti "
+"belešku. Izaberite drugi spisak beleški."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1186
+#: ../plugins/mail-to-task/mail-to-task.c:1189
 msgid "No writable calendar is available."
-msgstr "Nema dostupnog kalendara za upisivanje"
+msgstr "Nema dostupnog kalendara za upisivanje."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1270
+#: ../plugins/mail-to-task/mail-to-task.c:1276
 msgid "Create an _Appointment"
 msgstr "Napravi _zakazivanje"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1272
+#: ../plugins/mail-to-task/mail-to-task.c:1278
 msgid "Create a new event from the selected message"
 msgstr "Pravi novi događaj od izabrane poruke"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1277
+#: ../plugins/mail-to-task/mail-to-task.c:1283
 msgid "Create a Mem_o"
 msgstr "Napravi belešk_u"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1279
+#: ../plugins/mail-to-task/mail-to-task.c:1285
 msgid "Create a new memo from the selected message"
 msgstr "Pravi novu belešku od izabrane poruke"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1284
+#: ../plugins/mail-to-task/mail-to-task.c:1290
 msgid "Create a _Task"
 msgstr "Napravi _zadatak"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1286
+#: ../plugins/mail-to-task/mail-to-task.c:1292
 msgid "Create a new task from the selected message"
 msgstr "Pravi novi zadatak od izabrane poruke"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1294
+#: ../plugins/mail-to-task/mail-to-task.c:1300
 msgid "Create a _Meeting"
 msgstr "Napravi _sastanak"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1296
+#: ../plugins/mail-to-task/mail-to-task.c:1302
 msgid "Create a new meeting from the selected message"
 msgstr "Pravi novi sastanak od izabrane poruke"
 
@@ -18785,11 +20105,11 @@ msgstr "Pravi novi sastanak od izabrane poruke"
 msgid "Convert a mail message to a task."
 msgstr "Pretvara poruku u zadatak."
 
-#: ../plugins/mark-all-read/mark-all-read.c:43
+#: ../plugins/mark-all-read/mark-all-read.c:42
 msgid "Also mark messages in subfolders?"
 msgstr "Da označim takođe i poruke u podfasciklama?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:45
+#: ../plugins/mark-all-read/mark-all-read.c:44
 msgid ""
 "Do you want to mark messages as read in the current folder only, or in the "
 "current folder as well as all subfolders?"
@@ -18797,16 +20117,16 @@ msgstr ""
 "Želite li da označite poruke kao pročitane samo u trenutnoj fascikli, ili i "
 "one u podfasciklama?"
 
-#: ../plugins/mark-all-read/mark-all-read.c:185
+#: ../plugins/mark-all-read/mark-all-read.c:184
 msgid "In Current Folder and _Subfolders"
 msgstr "U trenutnoj fascikli i _podfasciklama"
 
 # bug: requires a comment on usage
-#: ../plugins/mark-all-read/mark-all-read.c:199
+#: ../plugins/mark-all-read/mark-all-read.c:198
 msgid "In Current _Folder Only"
 msgstr "Samo u trenutnoj _fascikli"
 
-#: ../plugins/mark-all-read/mark-all-read.c:545
+#: ../plugins/mark-all-read/mark-all-read.c:544
 msgid "Mark Me_ssages as Read"
 msgstr "Označi po_ruke kao pročitane"
 
@@ -18830,37 +20150,37 @@ msgstr "Lične fascikle Autluka (.pst)"
 msgid "Import Outlook messages from PST file"
 msgstr "Uvozi Autluk poruke iz PST datoteke"
 
-#: ../plugins/pst-import/pst-importer.c:555
+#: ../plugins/pst-import/pst-importer.c:552
 msgid "_Mail"
 msgstr "_Pošta"
 
-#: ../plugins/pst-import/pst-importer.c:584
+#: ../plugins/pst-import/pst-importer.c:581
 msgid "Destination folder:"
 msgstr "Odredišna fascikla:"
 
-#: ../plugins/pst-import/pst-importer.c:594
+#: ../plugins/pst-import/pst-importer.c:591
 msgid "_Address Book"
 msgstr "_Adresar"
 
-#: ../plugins/pst-import/pst-importer.c:599
+#: ../plugins/pst-import/pst-importer.c:596
 msgid "A_ppointments"
 msgstr "Za_kazano"
 
-#: ../plugins/pst-import/pst-importer.c:604 ../views/tasks/galview.xml.h:1
+#: ../plugins/pst-import/pst-importer.c:601 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
 msgstr "_Zadaci"
 
-#: ../plugins/pst-import/pst-importer.c:609
+#: ../plugins/pst-import/pst-importer.c:606
 msgid "_Journal entries"
 msgstr "Unosi _dnevnika"
 
-#: ../plugins/pst-import/pst-importer.c:721
+#: ../plugins/pst-import/pst-importer.c:718
 msgid "Importing Outlook data"
 msgstr "Uvozim Autluk podatke"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:145
-#: ../plugins/publish-calendar/publish-calendar.c:152
+#: ../plugins/publish-calendar/publish-calendar.c:142
+#: ../plugins/publish-calendar/publish-calendar.c:149
 msgid "Calendar Publishing"
 msgstr "Objavljivanje kalendara"
 
@@ -18872,49 +20192,49 @@ msgstr "Mesta"
 msgid "Publish calendars to the web."
 msgstr "Objavite kalendare na veb."
 
-#: ../plugins/publish-calendar/publish-calendar.c:211
-#: ../plugins/publish-calendar/publish-calendar.c:463
+#: ../plugins/publish-calendar/publish-calendar.c:214
+#: ../plugins/publish-calendar/publish-calendar.c:472
 #, c-format
 msgid "Could not open %s:"
 msgstr "Ne mogu da otvorim %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:213
+#: ../plugins/publish-calendar/publish-calendar.c:216
 #, c-format
 msgid "Could not open %s: Unknown error"
 msgstr "Ne mogu da otvorim %s: nepoznata greška"
 
-#: ../plugins/publish-calendar/publish-calendar.c:233
+#: ../plugins/publish-calendar/publish-calendar.c:236
 #, c-format
 msgid "There was an error while publishing to %s:"
 msgstr "Došlo je do greške prilikom objavljivanja na %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:235
+#: ../plugins/publish-calendar/publish-calendar.c:238
 #, c-format
 msgid "Publishing to %s finished successfully"
 msgstr "Objavljivanje na %s je uspešno završeno"
 
-#: ../plugins/publish-calendar/publish-calendar.c:279
+#: ../plugins/publish-calendar/publish-calendar.c:282
 #, c-format
 msgid "Mount of %s failed:"
 msgstr "Nisam uspeo da montiram %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:626
+#: ../plugins/publish-calendar/publish-calendar.c:635
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
 msgid "E_nable"
 msgstr "O_mogući"
 
-#: ../plugins/publish-calendar/publish-calendar.c:774
+#: ../plugins/publish-calendar/publish-calendar.c:785
 msgid "Are you sure you want to remove this location?"
 msgstr "Sigurno želite da uklonite ovu lokaciju?"
 
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1104
+#: ../plugins/publish-calendar/publish-calendar.c:1124
 msgid "Could not create publish thread."
 msgstr "Ne mogu da objavim raspravu."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1112
+#: ../plugins/publish-calendar/publish-calendar.c:1134
 msgid "_Publish Calendar Information"
 msgstr "Objavi raspored iz _kalendara"
 
@@ -18968,7 +20288,7 @@ msgstr "O_bjavi kao:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:18
 msgid "Publishing _Frequency:"
-msgstr "Učesta_lost objavljivanja"
+msgstr "Učestalost _objavljivanja:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:19
 msgid "Time _duration:"
@@ -19012,11 +20332,11 @@ msgstr "Mesto objavljivanja"
 msgid "Could not publish calendar: Calendar backend no longer exists"
 msgstr "Ne mogu da objavim kalendar: pozadinski proces više ne postoji"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:539
+#: ../plugins/publish-calendar/url-editor-dialog.c:540
 msgid "New Location"
 msgstr "Novo mesto"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:541
+#: ../plugins/publish-calendar/url-editor-dialog.c:542
 msgid "Edit Location"
 msgstr "Izmenite mesto"
 
@@ -19099,7 +20419,7 @@ msgstr "_Obavij vrednosti sa:"
 msgid "Comma separated values (.csv)"
 msgstr "Vrednosti razdvojene zarezom (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:165 ../shell/e-shell-utils.c:199
+#: ../plugins/save-calendar/ical-format.c:165 ../shell/e-shell-utils.c:197
 msgid "iCalendar (.ics)"
 msgstr "iKalendar (.ics)"
 
@@ -19116,31 +20436,31 @@ msgstr "Čuva kalendar ili spisak zadataka na disk."
 #. * It lets you define the formatting of the date in the rdf-file.
 #. * Also check out http://www.w3.org/2002/12/cal/tzd
 #. *
-#: ../plugins/save-calendar/rdf-format.c:146
+#: ../plugins/save-calendar/rdf-format.c:147
 msgid "%FT%T"
 msgstr "%FT%T"
 
-#: ../plugins/save-calendar/rdf-format.c:377
+#: ../plugins/save-calendar/rdf-format.c:378
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:123
+#: ../plugins/save-calendar/save-calendar.c:121
 msgid "_Format:"
 msgstr "_Format:"
 
-#: ../plugins/save-calendar/save-calendar.c:185
+#: ../plugins/save-calendar/save-calendar.c:187
 msgid "Select destination file"
 msgstr "Izaberite odredišnu datoteku"
 
-#: ../plugins/save-calendar/save-calendar.c:340
+#: ../plugins/save-calendar/save-calendar.c:343
 msgid "Save the selected calendar to disk"
 msgstr "Sačuvaj izabrani kalendar na disk"
 
-#: ../plugins/save-calendar/save-calendar.c:371
+#: ../plugins/save-calendar/save-calendar.c:374
 msgid "Save the selected memo list to disk"
 msgstr "Sačuvaj izabranu belešku na disk"
 
-#: ../plugins/save-calendar/save-calendar.c:402
+#: ../plugins/save-calendar/save-calendar.c:405
 msgid "Save the selected task list to disk"
 msgstr "Sačuvaj izabrani spisak zadataka na disk"
 
@@ -19154,35 +20474,40 @@ msgstr ""
 "[tema], $ORIG[šalje], $ORIG[prima] or $ORIG[poruka], koje će biti zamenjene "
 "vrednostima iz el. pošte na koju odgovarate."
 
-#: ../plugins/templates/templates.c:1112
+#: ../plugins/templates/templates.c:1135
 msgid "No Title"
 msgstr "Bez zvanja"
 
-#: ../plugins/templates/templates.c:1221
+#: ../plugins/templates/templates.c:1244
 msgid "Save as _Template"
 msgstr "Sačuvaj kao _šablon"
 
-#: ../plugins/templates/templates.c:1223
+#: ../plugins/templates/templates.c:1246
 msgid "Save as Template"
 msgstr "Čuva kao šablon"
 
-#: ../shell/e-shell.c:313
+#: ../shell/e-shell.c:303
 msgid "Preparing to go offline..."
 msgstr "Pripremam se za rad van mreže..."
 
-#: ../shell/e-shell.c:366
+#: ../shell/e-shell.c:356
 msgid "Preparing to go online..."
 msgstr "Pripremam se za rad na mreži..."
 
-#: ../shell/e-shell.c:437
+#: ../shell/e-shell.c:430
+#| msgid "Preparing to quit..."
+msgid "Preparing to quit"
+msgstr "Pripremam se da izađem"
+
+#: ../shell/e-shell.c:436
 msgid "Preparing to quit..."
 msgstr "Pripremam se da izađem..."
 
-#: ../shell/e-shell-content.c:727 ../shell/e-shell-content.c:728
+#: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
 msgid "Searches"
 msgstr "Pretrage"
 
-#: ../shell/e-shell-content.c:771
+#: ../shell/e-shell-content.c:764
 msgid "Save Search"
 msgstr "Sačuvaj pretragu"
 
@@ -19190,306 +20515,306 @@ msgstr "Sačuvaj pretragu"
 #. * allows the user to filter the current view.  Examples of
 #. * items that appear in the combo box are "Unread Messages",
 #. * "Important Messages", or "Active Appointments".
-#: ../shell/e-shell-searchbar.c:940
+#: ../shell/e-shell-searchbar.c:1143
 msgid "Sho_w:"
 msgstr "Prika_ži:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:973
+#: ../shell/e-shell-searchbar.c:1186
 msgid "Sear_ch:"
 msgstr "P_retraži:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1036
+#: ../shell/e-shell-searchbar.c:1272
 msgid "i_n"
 msgstr " _u "
 
-#: ../shell/e-shell-utils.c:197
+#: ../shell/e-shell-utils.c:195
 msgid "vCard (.vcf)"
 msgstr "vKarta (.vcf)"
 
-#: ../shell/e-shell-utils.c:220
+#: ../shell/e-shell-utils.c:218
 msgid "All Files (*)"
 msgstr "Sve datoteke (*)"
 
-#: ../shell/e-shell-view.c:304
+#: ../shell/e-shell-view.c:295
 msgid "Saving user interface state"
 msgstr "Čuvam stanje korisničkog sučelja"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:642
+#: ../shell/e-shell-window-actions.c:74
 msgid "translator-credits"
 msgstr ""
 "Igor Nestorović <igor@prevod.org>\n"
 "Slobodan D, Sredojević <slobo@akrep.be>\n"
+"Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
 "\n"
 "http://prevod.org — prevod na srpski jezik."
 
-#: ../shell/e-shell-window-actions.c:653
+#: ../shell/e-shell-window-actions.c:85
 msgid "Evolution Website"
 msgstr "Veb stranica Evolucije"
 
-#: ../shell/e-shell-window-actions.c:891
+#: ../shell/e-shell-window-actions.c:323
 msgid "Categories Editor"
 msgstr "Uređivač kategorija"
 
-#: ../shell/e-shell-window-actions.c:1228
+#: ../shell/e-shell-window-actions.c:660
 msgid "Bug Buddy is not installed."
 msgstr "Bubaždajin pomoćnik nije instaliran."
 
-#: ../shell/e-shell-window-actions.c:1230
+#: ../shell/e-shell-window-actions.c:661
 msgid "Bug Buddy could not be run."
 msgstr "Bubaždajin pomoćnik ne može biti pokrenut."
 
-#: ../shell/e-shell-window-actions.c:1411
+#: ../shell/e-shell-window-actions.c:841
 msgid "Show information about Evolution"
 msgstr "Prikazuje podatke o Evoluciji"
 
-#: ../shell/e-shell-window-actions.c:1416
-#: ../shell/e-shell-window-actions.c:1430
+#: ../shell/e-shell-window-actions.c:846 ../shell/e-shell-window-actions.c:860
 msgid "_Close Window"
 msgstr "_Zatvori prozor"
 
-#: ../shell/e-shell-window-actions.c:1437
+#: ../shell/e-shell-window-actions.c:867
 msgid "_Contents"
 msgstr "_Sadržaj"
 
-#: ../shell/e-shell-window-actions.c:1439
+#: ../shell/e-shell-window-actions.c:869
 msgid "Open the Evolution User Guide"
 msgstr "Otvorite korisničko uputstvo Evolucije"
 
-#: ../shell/e-shell-window-actions.c:1465
+#: ../shell/e-shell-window-actions.c:895
 msgid "I_mport..."
 msgstr "_Uvezi..."
 
-#: ../shell/e-shell-window-actions.c:1467
+#: ../shell/e-shell-window-actions.c:897
 msgid "Import data from other programs"
 msgstr "Uvezite podatke iz drugih programa"
 
-#: ../shell/e-shell-window-actions.c:1472
+#: ../shell/e-shell-window-actions.c:902
 msgid "New _Window"
 msgstr "Novi _prozor"
 
-#: ../shell/e-shell-window-actions.c:1474
+#: ../shell/e-shell-window-actions.c:904
 msgid "Create a new window displaying this view"
 msgstr "Otvorite nov prozor za prikaz ovog pregleda"
 
-#: ../shell/e-shell-window-actions.c:1486
+#: ../shell/e-shell-window-actions.c:916
 msgid "Available Cate_gories"
 msgstr "Dostupne _kategorije"
 
-#: ../shell/e-shell-window-actions.c:1488
+#: ../shell/e-shell-window-actions.c:918
 msgid "Manage available categories"
 msgstr "Upravljajte dostupnim kategorijama"
 
-#: ../shell/e-shell-window-actions.c:1500
+#: ../shell/e-shell-window-actions.c:930
 msgid "_Quick Reference"
 msgstr "_Kratak podsetnik"
 
-#: ../shell/e-shell-window-actions.c:1502
+#: ../shell/e-shell-window-actions.c:932
 msgid "Show Evolution's shortcut keys"
 msgstr "Prikažite prečice tastature Evolucije"
 
-#: ../shell/e-shell-window-actions.c:1509
+#: ../shell/e-shell-window-actions.c:939
 msgid "Exit the program"
 msgstr "Izađite iz programa"
 
-#: ../shell/e-shell-window-actions.c:1514
+#: ../shell/e-shell-window-actions.c:944
 msgid "_Advanced Search..."
 msgstr "_Napredna pretraga..."
 
-#: ../shell/e-shell-window-actions.c:1516
+#: ../shell/e-shell-window-actions.c:946
 msgid "Construct a more advanced search"
 msgstr "Obrazujte napredniju pretragu"
 
-#: ../shell/e-shell-window-actions.c:1523
+#: ../shell/e-shell-window-actions.c:953
 msgid "Clear the current search parameters"
 msgstr "Očistite parametre trenutne pretrage"
 
-#: ../shell/e-shell-window-actions.c:1528
+#: ../shell/e-shell-window-actions.c:958
 msgid "_Edit Saved Searches..."
 msgstr "_Uredi sačuvane pretrage..."
 
-#: ../shell/e-shell-window-actions.c:1530
+#: ../shell/e-shell-window-actions.c:960
 msgid "Manage your saved searches"
 msgstr "Upravljajte vašim sačuvanim pretragama"
 
-#: ../shell/e-shell-window-actions.c:1537
+#: ../shell/e-shell-window-actions.c:967
 msgid "Click here to change the search type"
 msgstr "Kliknite ovde da promenite vrstu pretrage"
 
-#: ../shell/e-shell-window-actions.c:1542
+#: ../shell/e-shell-window-actions.c:972
 msgid "_Find Now"
 msgstr "Pro_nađi sada"
 
 #. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:1544
+#: ../shell/e-shell-window-actions.c:974
 msgid "Execute the current search parameters"
 msgstr "Izvršite parametre trenutne pretrage"
 
-#: ../shell/e-shell-window-actions.c:1549
+#: ../shell/e-shell-window-actions.c:979
 msgid "_Save Search..."
 msgstr "_Sačuvaj pretragu..."
 
-#: ../shell/e-shell-window-actions.c:1551
+#: ../shell/e-shell-window-actions.c:981
 msgid "Save the current search parameters"
 msgstr "Sačuvajte parametre trenutne pretrage"
 
-#: ../shell/e-shell-window-actions.c:1563
+#: ../shell/e-shell-window-actions.c:993
 msgid "Submit _Bug Report..."
 msgstr "Pošalji izveštaj o _grešci..."
 
-#: ../shell/e-shell-window-actions.c:1565
+#: ../shell/e-shell-window-actions.c:995
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Pošaljite izveštaj o grešci Bubaždajinim pomoćnikom"
 
-#: ../shell/e-shell-window-actions.c:1570
+#: ../shell/e-shell-window-actions.c:1000
 msgid "_Work Offline"
 msgstr "Rad _van mreže"
 
-#: ../shell/e-shell-window-actions.c:1572
+#: ../shell/e-shell-window-actions.c:1002
 msgid "Put Evolution into offline mode"
 msgstr "Postavite Evoluciju u rad van mreže"
 
-#: ../shell/e-shell-window-actions.c:1577
+#: ../shell/e-shell-window-actions.c:1007
 msgid "_Work Online"
 msgstr "_Rad na mreži"
 
-#: ../shell/e-shell-window-actions.c:1579
+#: ../shell/e-shell-window-actions.c:1009
 msgid "Put Evolution into online mode"
 msgstr "Postavite Evoluciju u rad na mreži"
 
-#: ../shell/e-shell-window-actions.c:1607
+#: ../shell/e-shell-window-actions.c:1037
 msgid "Lay_out"
 msgstr "_Raspored"
 
-#: ../shell/e-shell-window-actions.c:1614
+#: ../shell/e-shell-window-actions.c:1044
 msgid "_New"
 msgstr "_Novo"
 
-#: ../shell/e-shell-window-actions.c:1621
+#: ../shell/e-shell-window-actions.c:1051
 msgid "_Search"
 msgstr "Pre_traži"
 
-#: ../shell/e-shell-window-actions.c:1628
+#: ../shell/e-shell-window-actions.c:1058
 msgid "_Switcher Appearance"
 msgstr "_Izgled prebacivača"
 
-#: ../shell/e-shell-window-actions.c:1642
+#: ../shell/e-shell-window-actions.c:1072
 msgid "_Window"
 msgstr "Pro_zor"
 
-#: ../shell/e-shell-window-actions.c:1671
+#: ../shell/e-shell-window-actions.c:1101
 msgid "Show Side _Bar"
 msgstr "Prikaži _bočnu površ"
 
-#: ../shell/e-shell-window-actions.c:1673
+#: ../shell/e-shell-window-actions.c:1103
 msgid "Show the side bar"
 msgstr "Prikažite bočnu površ"
 
-#: ../shell/e-shell-window-actions.c:1679
+#: ../shell/e-shell-window-actions.c:1109
 msgid "Show _Buttons"
 msgstr "Prikaži _dugmad"
 
-#: ../shell/e-shell-window-actions.c:1681
+#: ../shell/e-shell-window-actions.c:1111
 msgid "Show the switcher buttons"
 msgstr "Prikažite dugmad prebacivača"
 
-#: ../shell/e-shell-window-actions.c:1687
+#: ../shell/e-shell-window-actions.c:1117
 msgid "Show _Status Bar"
 msgstr "Prikaži traku _stanja"
 
-#: ../shell/e-shell-window-actions.c:1689
+#: ../shell/e-shell-window-actions.c:1119
 msgid "Show the status bar"
 msgstr "Prikažite traku stanja"
 
-#: ../shell/e-shell-window-actions.c:1695
+#: ../shell/e-shell-window-actions.c:1125
 msgid "Show _Tool Bar"
 msgstr "Prikaži traku _alata"
 
-#: ../shell/e-shell-window-actions.c:1697
+#: ../shell/e-shell-window-actions.c:1127
 msgid "Show the tool bar"
 msgstr "Prikažite traku alata"
 
-#: ../shell/e-shell-window-actions.c:1719
+#: ../shell/e-shell-window-actions.c:1149
 msgid "_Icons Only"
 msgstr "Samo _ikonice"
 
-#: ../shell/e-shell-window-actions.c:1721
+#: ../shell/e-shell-window-actions.c:1151
 msgid "Display window buttons with icons only"
 msgstr "Prikažite dugmad prozora samo sa ikonicama"
 
-#: ../shell/e-shell-window-actions.c:1726
+#: ../shell/e-shell-window-actions.c:1156
 msgid "_Text Only"
 msgstr "Samo _tekst"
 
-#: ../shell/e-shell-window-actions.c:1728
+#: ../shell/e-shell-window-actions.c:1158
 msgid "Display window buttons with text only"
 msgstr "Prikažite dugmad prozora samo sa tekstom"
 
-#: ../shell/e-shell-window-actions.c:1733
+#: ../shell/e-shell-window-actions.c:1163
 msgid "Icons _and Text"
 msgstr "Ikonice _i tekst"
 
-#: ../shell/e-shell-window-actions.c:1735
+#: ../shell/e-shell-window-actions.c:1165
 msgid "Display window buttons with icons and text"
 msgstr "Prikažite dugmad prozora sa ikonicama i tekstom"
 
-#: ../shell/e-shell-window-actions.c:1740
+#: ../shell/e-shell-window-actions.c:1170
 msgid "Tool_bar Style"
 msgstr "Stil tra_ke alata"
 
-#: ../shell/e-shell-window-actions.c:1742
+#: ../shell/e-shell-window-actions.c:1172
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Prikažite dugmad prozora koristeći podešavanja trake alata radne površi"
 
-#: ../shell/e-shell-window-actions.c:1750
+#: ../shell/e-shell-window-actions.c:1180
 msgid "Define Views..."
 msgstr "Odredi preglede..."
 
-#: ../shell/e-shell-window-actions.c:1752
+#: ../shell/e-shell-window-actions.c:1182
 msgid "Create or edit views"
 msgstr "Napravite ili izmenite preglede"
 
-#: ../shell/e-shell-window-actions.c:1757
+#: ../shell/e-shell-window-actions.c:1187
 msgid "Save Custom View..."
 msgstr "Sačuvaj prilagođen pregled..."
 
-#: ../shell/e-shell-window-actions.c:1759
+#: ../shell/e-shell-window-actions.c:1189
 msgid "Save current custom view"
 msgstr "Sačuvajte trenutni korisnički pregled"
 
-#: ../shell/e-shell-window-actions.c:1766
+#: ../shell/e-shell-window-actions.c:1196
 msgid "C_urrent View"
 msgstr "T_renutni pregled"
 
-#: ../shell/e-shell-window-actions.c:1776
+#: ../shell/e-shell-window-actions.c:1206
 msgid "Custom View"
 msgstr "Prilagođen pregled"
 
-#: ../shell/e-shell-window-actions.c:1778
+#: ../shell/e-shell-window-actions.c:1208
 msgid "Current view is a customized view"
 msgstr "Trenutan pregled je podesio korisnik"
 
-#: ../shell/e-shell-window-actions.c:1788
+#: ../shell/e-shell-window-actions.c:1218
 msgid "Change the page settings for your current printer"
 msgstr "Izmenite postavke stranice za trenutni štampač"
 
-#: ../shell/e-shell-window-actions.c:2178
+#: ../shell/e-shell-window-actions.c:1608
 #, c-format
 msgid "Switch to %s"
 msgstr "Pređi na %s"
 
-#: ../shell/e-shell-window-actions.c:2299
+#: ../shell/e-shell-window-actions.c:1729
 #, c-format
 msgid "Select view: %s"
 msgstr "Izaberi pregled: %s"
 
-#: ../shell/e-shell-window-actions.c:2400
+#: ../shell/e-shell-window-actions.c:1830
 msgid "Execute these search parameters"
 msgstr "Izvršite ove parametre pretrage"
 
@@ -19504,7 +20829,7 @@ msgid "%s - Evolution"
 msgstr "%s — Evolucija"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:184
+#: ../shell/main.c:182
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -19529,17 +20854,17 @@ msgstr ""
 "Ova verzija Evolucije još nije potpuna. Sve je bliža,\n"
 "ali neke mogućnosti ili nisu završene ili ne rade ispravno.\n"
 "\n"
-"Ukoliko želite stabilnu verziju Evolucije, uklonite ovu verziju,\n"
-"i instalirajte verziju %s.\n"
+"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 „bugzilla.gnome.org“.\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"
 
-#: ../shell/main.c:208
+#: ../shell/main.c:206
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -19547,13 +20872,13 @@ msgstr ""
 "Hvala\n"
 "Tim Evolucije\n"
 
-#: ../shell/main.c:214
+#: ../shell/main.c:212
 msgid "Do not tell me again"
 msgstr "Nemoj mi ponovo reći"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:305
+#: ../shell/main.c:303
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -19561,48 +20886,57 @@ msgstr ""
 "Pokreće Evoluciju prikazujući određene komponente. Dostupne opcije su: "
 "„mail“, „calendar“, „contacts“, „tasks“ i „memos“"
 
-#: ../shell/main.c:309
+#: ../shell/main.c:307
 msgid "Apply the given geometry to the main window"
 msgstr "Primeni datu geometriju na glavni prozor"
 
-#: ../shell/main.c:313
+#: ../shell/main.c:311
 msgid "Start in online mode"
 msgstr "Počni rad na mreži"
 
-#: ../shell/main.c:315
+#: ../shell/main.c:313
 msgid "Ignore network availability"
 msgstr "Zanemari dostupnost mreže"
 
-#: ../shell/main.c:317
+#: ../shell/main.c:315
 msgid "Start in \"express\" mode"
 msgstr "Počni u „ekspresnom“ režimu"
 
-#: ../shell/main.c:320
+#: ../shell/main.c:318
 msgid "Forcibly shut down Evolution"
 msgstr "Silom ugasi Evoluciju"
 
-#: ../shell/main.c:323
+#: ../shell/main.c:321
 msgid "Disable loading of any plugins."
 msgstr "Isključi učitavanje svih dodataka."
 
-#: ../shell/main.c:325
+#: ../shell/main.c:323
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Isključi okno za pregled pošte, kontakta i zadataka."
 
-#: ../shell/main.c:329
+#: ../shell/main.c:327
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Uvozi adrese datoteka datih kao ostatak argumenata."
 
 # shell:noshell-reason title
-#: ../shell/main.c:331
+#: ../shell/main.c:329
 msgid "Request a running Evolution process to quit"
 msgstr "Zahteva kraj pokrenutog procesa Evolucije"
 
-#: ../shell/main.c:504
+#: ../shell/main.c:419
+#, c-format
+msgid ""
+"Cannot start Evolution.  Another Evolution instance may be unresponsive. "
+"System error: %s"
+msgstr ""
+"Ne mogu da pokrenem Evoluciju.  Drugi primerak Evolucije možda ne odgovara. "
+"Greška sistema: %s"
+
+#: ../shell/main.c:515 ../shell/main.c:520
 msgid "- The Evolution PIM and Email Client"
 msgstr "— Evolucija rukovodilac ličnim podatacima i klijent el. pošte"
 
-#: ../shell/main.c:569
+#: ../shell/main.c:587
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19611,7 +20945,7 @@ msgstr ""
 "%s: „--online“ i „--offline“ se ne mogu koristiti zajedno.\n"
 "  Pokrenite „%s --help“ za više podataka.\n"
 
-#: ../shell/main.c:575
+#: ../shell/main.c:593
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -19659,70 +20993,7 @@ msgstr ""
 "rešenje možete prvo da pokušate da nadogradite na Evoluciju 2, a zatim na "
 "Evoluciju 3."
 
-#: ../smclient/eggdesktopfile.c:166
-#, c-format
-msgid "File is not a valid .desktop file"
-msgstr "Ovo nije ispravna „.desktop“ datoteka"
-
-#: ../smclient/eggdesktopfile.c:189
-#, c-format
-msgid "Unrecognized desktop file Version '%s'"
-msgstr "Neprepoznato izdanje datoteke radne površi „%s“"
-
-#: ../smclient/eggdesktopfile.c:959
-#, c-format
-msgid "Starting %s"
-msgstr "Pokrećem %s"
-
-#: ../smclient/eggdesktopfile.c:1102
-#, c-format
-msgid "Application does not accept documents on command line"
-msgstr "Program ne prihvata dokumente iz linije naredbi"
-
-#: ../smclient/eggdesktopfile.c:1170
-#, c-format
-msgid "Unrecognized launch option: %d"
-msgstr "Nepoznata opcija pokretanja: %d"
-
-#: ../smclient/eggdesktopfile.c:1370
-#, c-format
-msgid "Can't pass document URIs to a 'Type=Link' desktop entry"
-msgstr "Ne mogu da prosledim adrese dokumenata na „Type=Link“ unos"
-
-#: ../smclient/eggdesktopfile.c:1391
-#, c-format
-msgid "Not a launchable item"
-msgstr "Nije stavka za pokretanje"
-
-#: ../smclient/eggsmclient.c:229
-msgid "Disable connection to session manager"
-msgstr "Isključuje vezu sa upravnikom sesije"
-
-#: ../smclient/eggsmclient.c:232
-msgid "Specify file containing saved configuration"
-msgstr "Navodi datoteku koja sadrži sačuvana podešavanja"
-
-#: ../smclient/eggsmclient.c:232
-msgid "FILE"
-msgstr "DATOTEKA"
-
-#: ../smclient/eggsmclient.c:235
-msgid "Specify session management ID"
-msgstr "Navodi IB upravnika sesije"
-
-#: ../smclient/eggsmclient.c:235
-msgid "ID"
-msgstr "IB"
-
-#: ../smclient/eggsmclient.c:256
-msgid "Session management options:"
-msgstr "Mogućnosti upravljanja sesijom:"
-
-#: ../smclient/eggsmclient.c:257
-msgid "Show session management options"
-msgstr "Prikazuje mogućnosti upravljanja sesijom"
-
-#: ../smime/gui/ca-trust-dialog.c:107
+#: ../smime/gui/ca-trust-dialog.c:109
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -19733,109 +21004,176 @@ msgstr ""
 "\n"
 "Uredite postavke poverenja:"
 
-#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:96
-#: ../smime/gui/certificate-manager.c:116
+#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
 msgid "Certificate Name"
 msgstr "Naziv uverenja"
 
-#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
+#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
 msgid "Issued To Organization"
 msgstr "Izdato je organizaciji"
 
-#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
 msgid "Issued To Organizational Unit"
 msgstr "Izdato je organizacionoj jedinici"
 
-#: ../smime/gui/certificate-manager.c:80
-#: ../smime/gui/certificate-manager.c:100
-#: ../smime/gui/certificate-manager.c:118 ../smime/gui/smime-ui.ui.h:12
-#: ../smime/lib/e-cert.c:542
+#: ../smime/gui/certificate-manager.c:76 ../smime/gui/certificate-manager.c:96
+#: ../smime/gui/certificate-manager.c:114
+#: ../smime/gui/certificate-viewer.c:638 ../smime/lib/e-asn1-object.c:134
 msgid "Serial Number"
 msgstr "Serijski broj"
 
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:101
-#: ../smime/gui/certificate-manager.c:119
+#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
+#: ../smime/gui/certificate-manager.c:115
 msgid "Purposes"
 msgstr "Namene"
 
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:102
-#: ../smime/gui/certificate-manager.c:120 ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
+#: ../smime/gui/certificate-manager.c:116
+#: ../smime/gui/certificate-viewer.c:640
 msgid "Issued By"
 msgstr "Izdavač"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121
+#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:117
 msgid "Issued By Organization"
 msgstr "Izdala je organizacija"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122
+#: ../smime/gui/certificate-manager.c:80
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:118
 msgid "Issued By Organizational Unit"
 msgstr "Izdala je organizaciona jedinica"
 
-#: ../smime/gui/certificate-manager.c:85
-#: ../smime/gui/certificate-manager.c:105
-#: ../smime/gui/certificate-manager.c:123
+#: ../smime/gui/certificate-manager.c:81
+#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:119
 msgid "Issued"
 msgstr "Izdato"
 
-#: ../smime/gui/certificate-manager.c:86
-#: ../smime/gui/certificate-manager.c:106
-#: ../smime/gui/certificate-manager.c:124
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:120
 msgid "Expires"
 msgstr "Ističe"
 
-#: ../smime/gui/certificate-manager.c:87
-#: ../smime/gui/certificate-manager.c:107
-#: ../smime/gui/certificate-manager.c:125 ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/certificate-manager.c:83
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:121
+#: ../smime/gui/certificate-viewer.c:650
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 otisak"
 
-#: ../smime/gui/certificate-manager.c:88
-#: ../smime/gui/certificate-manager.c:108
-#: ../smime/gui/certificate-manager.c:126 ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:122
+#: ../smime/gui/certificate-viewer.c:651
 msgid "MD5 Fingerprint"
 msgstr "MD5 Otisak"
 
-#: ../smime/gui/certificate-manager.c:97
-#: ../smime/gui/certificate-manager.c:117
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
 msgid "Email Address"
 msgstr "Adresa el. pošte"
 
-#: ../smime/gui/certificate-manager.c:589
+#: ../smime/gui/certificate-manager.c:614
 msgid "Select a certificate to import..."
 msgstr "Izaberite uverenje za uvoz..."
 
-#: ../smime/gui/certificate-manager.c:602
+#: ../smime/gui/certificate-manager.c:628
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: ../smime/gui/certificate-manager.c:637
+#: ../smime/gui/certificate-manager.c:664
 msgid "Failed to import certificate"
 msgstr "Nisam uspeo da uvezem uverenje"
 
-#: ../smime/gui/certificate-manager.c:1013
+#: ../smime/gui/certificate-manager.c:1046
 msgid "All PKCS12 files"
 msgstr "Sve PKCS12 datoteke"
 
-#: ../smime/gui/certificate-manager.c:1030
+#: ../smime/gui/certificate-manager.c:1063
 msgid "All email certificate files"
 msgstr "Sve datoteke uverenja pošte"
 
-#: ../smime/gui/certificate-manager.c:1047
+#: ../smime/gui/certificate-manager.c:1080
 msgid "All CA certificate files"
 msgstr "Sve datoteke CA uverenja"
 
-#: ../smime/gui/certificate-viewer.c:349
-#, c-format
-msgid "Certificate Viewer: %s"
-msgstr "Pregledač uverenja: %s"
+#: ../smime/gui/certificate-viewer.c:292
+#| msgid "<Not Part of Certificate>"
+msgid "Not part of certificate"
+msgstr "Nije deo uverenja"
+
+#: ../smime/gui/certificate-viewer.c:600
+msgid "This certificate has been verified for the following uses:"
+msgstr "Ovo uverenje je provereno za sledeće potrebe:"
 
-#: ../smime/gui/cert-trust-dialog.c:148
+#: ../smime/gui/certificate-viewer.c:604 ../smime/lib/e-asn1-object.c:387
+msgid "SSL Client Certificate"
+msgstr "Uverenje SSL klijenta"
+
+#: ../smime/gui/certificate-viewer.c:609 ../smime/lib/e-asn1-object.c:391
+msgid "SSL Server Certificate"
+msgstr "Uverenje SSL servera"
+
+#: ../smime/gui/certificate-viewer.c:614
+msgid "Email Signer Certificate"
+msgstr "Uverenje potpisnika el. poruke"
+
+#: ../smime/gui/certificate-viewer.c:619
+msgid "Email Recipient Certificate"
+msgstr "Uverenje primaoca el. poruke"
+
+#: ../smime/gui/certificate-viewer.c:634
+msgid "Issued To"
+msgstr "Kome je izdato"
+
+#: ../smime/gui/certificate-viewer.c:635 ../smime/gui/certificate-viewer.c:641
+msgid "Common Name (CN)"
+msgstr "Zajedničko ime (CN)"
+
+#: ../smime/gui/certificate-viewer.c:636 ../smime/gui/certificate-viewer.c:642
+msgid "Organization (O)"
+msgstr "Organizacija (O)"
+
+#: ../smime/gui/certificate-viewer.c:637 ../smime/gui/certificate-viewer.c:643
+msgid "Organizational Unit (OU)"
+msgstr "Organizaciona jedinica (OU)"
+
+#: ../smime/gui/certificate-viewer.c:645
+msgid "Validity"
+msgstr "Ispravnost"
+
+#: ../smime/gui/certificate-viewer.c:646
+msgid "Issued On"
+msgstr "Izdato je"
+
+#: ../smime/gui/certificate-viewer.c:647
+msgid "Expires On"
+msgstr "Ističe"
+
+#: ../smime/gui/certificate-viewer.c:649
+msgid "Fingerprints"
+msgstr "Otisci"
+
+#: ../smime/gui/certificate-viewer.c:671
+msgid "Certificate Hierarchy"
+msgstr "Hijerarhija uverenja"
+
+#: ../smime/gui/certificate-viewer.c:674
+msgid "Certificate Fields"
+msgstr "Polja uverenja"
+
+#: ../smime/gui/certificate-viewer.c:677
+msgid "Field Value"
+msgstr "Vrednost polja"
+
+#: ../smime/gui/certificate-viewer.c:679
+msgid "Details"
+msgstr "Pojedinosti"
+
+#: ../smime/gui/cert-trust-dialog.c:153
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -19844,7 +21182,7 @@ msgstr ""
 "Pošto verujete izdavaocu ovog uverenja, onda verujete i u autentičnost ovog "
 "uverenja osim ako ovde ne naznačite drugačije"
 
-#: ../smime/gui/cert-trust-dialog.c:152
+#: ../smime/gui/cert-trust-dialog.c:158
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -19853,17 +21191,17 @@ msgstr ""
 "Pošto ne verujete izdavaocu ovog uverenja, onda ne verujete ni u autentičnost "
 "ovog uverenja osim ako ovde ne naznačite drugačije"
 
-#: ../smime/gui/component.c:50
+#: ../smime/gui/component.c:51
 #, c-format
 msgid "Enter the password for '%s'"
 msgstr "Unesite lozinku za „%s“"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:76
+#: ../smime/gui/component.c:77
 msgid "Enter new password for certificate database"
 msgstr "Unesite novu lozinku za bazu uverenja"
 
-#: ../smime/gui/component.c:79
+#: ../smime/gui/component.c:80
 msgid "Enter new password"
 msgstr "Unesite novu lozinku"
 
@@ -19890,133 +21228,61 @@ msgstr ""
 msgid "Select certificate"
 msgstr "Izaberite uverenje"
 
-#: ../smime/gui/smime-ui.ui.h:3 ../smime/lib/e-cert.c:802
-msgid "SSL Client Certificate"
-msgstr "Uverenje SSL klijenta"
-
-#: ../smime/gui/smime-ui.ui.h:4 ../smime/lib/e-cert.c:806
-msgid "SSL Server Certificate"
-msgstr "Uverenje SSL servera"
-
-#: ../smime/gui/smime-ui.ui.h:5
-msgid "Email Signer Certificate"
-msgstr "Uverenje potpisnika el. poruke"
-
-#: ../smime/gui/smime-ui.ui.h:6
-msgid "Email Recipient Certificate"
-msgstr "Uverenje primaoca el. poruke"
-
-#: ../smime/gui/smime-ui.ui.h:7
-msgid "This certificate has been verified for the following uses:"
-msgstr "Ovo uverenje je provereno za sledeće potrebe:"
-
-#: ../smime/gui/smime-ui.ui.h:8
-msgid "Issued To"
-msgstr "Kome je izdato"
-
-#: ../smime/gui/smime-ui.ui.h:9
-msgid "Common Name (CN)"
-msgstr "Zajedničko ime (CN)"
-
-#: ../smime/gui/smime-ui.ui.h:10
-msgid "Organization (O)"
-msgstr "Organizacija (O)"
-
-#: ../smime/gui/smime-ui.ui.h:11
-msgid "Organizational Unit (OU)"
-msgstr "Organizaciona jedinica (OU)"
-
-#: ../smime/gui/smime-ui.ui.h:13
-msgid "Issued On"
-msgstr "Izdato je"
-
-#: ../smime/gui/smime-ui.ui.h:14
-msgid "Expires On"
-msgstr "Ističe"
-
-#: ../smime/gui/smime-ui.ui.h:16
-msgid "Fingerprints"
-msgstr "Otisci"
-
-#: ../smime/gui/smime-ui.ui.h:19
-msgid "<Not Part of Certificate>"
-msgstr "<nije deo uverenja>"
-
-#: ../smime/gui/smime-ui.ui.h:20
-msgid "Validity"
-msgstr "Ispravnost"
-
-#: ../smime/gui/smime-ui.ui.h:22
-msgid "Certificate Hierarchy"
-msgstr "Hijerarhija uverenja"
-
-#: ../smime/gui/smime-ui.ui.h:23
-msgid "Certificate Fields"
-msgstr "Polja uverenja"
-
-#: ../smime/gui/smime-ui.ui.h:24
-msgid "Field Value"
-msgstr "Vrednost polja"
-
-#: ../smime/gui/smime-ui.ui.h:25
-msgid "Details"
-msgstr "Pojedinosti"
-
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:3
 msgid "You have certificates from these organizations that identify you:"
 msgstr "Posedujete uverenja ovih organizacija koja vas određuju:"
 
-#: ../smime/gui/smime-ui.ui.h:27
+#: ../smime/gui/smime-ui.ui.h:4
 msgid "Certificates Table"
 msgstr "Tabela uverenja"
 
 #. This is a verb, as in "make a backup".
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:7
 msgid "_Backup"
 msgstr "Napravi _rezervu"
 
-#: ../smime/gui/smime-ui.ui.h:31
+#: ../smime/gui/smime-ui.ui.h:8
 msgid "Backup _All"
 msgstr "Napravi rezervu _svega"
 
-#: ../smime/gui/smime-ui.ui.h:33
+#: ../smime/gui/smime-ui.ui.h:10
 msgid "Your Certificates"
 msgstr "Vaša uverenja"
 
-#: ../smime/gui/smime-ui.ui.h:34
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "You have certificates on file that identify these people:"
 msgstr "Posedujete uverenja koja određuju ove osobe:"
 
-#: ../smime/gui/smime-ui.ui.h:35
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "Contact Certificates"
 msgstr "Uverenja kontakta"
 
-#: ../smime/gui/smime-ui.ui.h:36
+#: ../smime/gui/smime-ui.ui.h:13
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "Posedujete uverenja koja određuju ove izdavaoce uverenja:"
 
-#: ../smime/gui/smime-ui.ui.h:37
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Authorities"
 msgstr "Izdavaoci"
 
-#: ../smime/gui/smime-ui.ui.h:38
+#: ../smime/gui/smime-ui.ui.h:15
 msgid "Certificate Authority Trust"
 msgstr "Poverenje izdavaocu uverenja"
 
-#: ../smime/gui/smime-ui.ui.h:39
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Trust this CA to identify _websites."
 msgstr "Veruj ovom izdavaocu uverenja za prepoznavanje _veb stranica."
 
-#: ../smime/gui/smime-ui.ui.h:40
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Trust this CA to identify _email users."
 msgstr "Veruj ovom izdavaocu uverenja za prepoznavanje _el. adresa."
 
-#: ../smime/gui/smime-ui.ui.h:41
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Trust this CA to identify _software developers."
 msgstr "Veruj ovom izdavaocu uverenja za prepoznavanje _programera."
 
-#: ../smime/gui/smime-ui.ui.h:42
+#: ../smime/gui/smime-ui.ui.h:19
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -20024,177 +21290,164 @@ msgstr ""
 "Pre verovanja ovom izdavaocu uverenja, prvo pregledajte njegovo uverenje, "
 "politiku i procedure (ako su dostupni)."
 
-#: ../smime/gui/smime-ui.ui.h:44 ../smime/lib/e-cert.c:1071
+#: ../smime/gui/smime-ui.ui.h:21 ../smime/lib/e-asn1-object.c:658
 msgid "Certificate"
 msgstr "Uverenje"
 
-#: ../smime/gui/smime-ui.ui.h:45
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "Certificate details"
 msgstr "Detalji uverenja"
 
-#: ../smime/gui/smime-ui.ui.h:46
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "Email Certificate Trust Settings"
 msgstr "Podešavanja poverenja u uverenja el. pošte"
 
-#: ../smime/gui/smime-ui.ui.h:47
+#: ../smime/gui/smime-ui.ui.h:24
 msgid "Trust the authenticity of this certificate"
 msgstr "Veruj u verodostojnost ovog uverenja"
 
-#: ../smime/gui/smime-ui.ui.h:48
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Ne veruj u verodostojnost ovog uverenja"
 
-#: ../smime/gui/smime-ui.ui.h:49
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "_Edit CA Trust"
 msgstr "_Uredi CA poverenje"
 
-#: ../smime/lib/e-cert.c:201 ../smime/lib/e-cert.c:213
-msgid "%d/%m/%Y"
-msgstr "%d. %m. %Y."
-
-#. x509 certificate usage types
-#: ../smime/lib/e-cert.c:390
-msgid "Sign"
-msgstr "Potpiši"
-
-#: ../smime/lib/e-cert.c:391
-msgid "Encrypt"
-msgstr "Šifruj"
-
-#: ../smime/lib/e-cert.c:503
+#: ../smime/lib/e-asn1-object.c:95
 msgid "Version"
 msgstr "Izdanje"
 
-#: ../smime/lib/e-cert.c:518
+#: ../smime/lib/e-asn1-object.c:110
 msgid "Version 1"
 msgstr "Izdanje 1"
 
-#: ../smime/lib/e-cert.c:521
+#: ../smime/lib/e-asn1-object.c:113
 msgid "Version 2"
 msgstr "Izdanje 2"
 
-#: ../smime/lib/e-cert.c:524
+#: ../smime/lib/e-asn1-object.c:116
 msgid "Version 3"
 msgstr "Izdanje 3"
 
-#: ../smime/lib/e-cert.c:607
+#: ../smime/lib/e-asn1-object.c:192
 msgid "PKCS #1 MD2 With RSA Encryption"
 msgstr "PKCS #1 MD2 sa RSA šifrovanjem"
 
-#: ../smime/lib/e-cert.c:610
+#: ../smime/lib/e-asn1-object.c:195
 msgid "PKCS #1 MD5 With RSA Encryption"
 msgstr "PKCS #1 MD5 sa RSA šifrovanjem"
 
-#: ../smime/lib/e-cert.c:613
+#: ../smime/lib/e-asn1-object.c:198
 msgid "PKCS #1 SHA-1 With RSA Encryption"
 msgstr "PKCS #1 SHA-1 sa RSA šifrovanjem"
 
-#: ../smime/lib/e-cert.c:616
+#: ../smime/lib/e-asn1-object.c:201
 msgid "PKCS #1 SHA-256 With RSA Encryption"
 msgstr "PKCS #1 SHA-256 sa RSA šifrovanjem"
 
-#: ../smime/lib/e-cert.c:619
+#: ../smime/lib/e-asn1-object.c:204
 msgid "PKCS #1 SHA-384 With RSA Encryption"
 msgstr "PKCS #1 SHA-384 sa RSA šifrovanjem"
 
-#: ../smime/lib/e-cert.c:622
+#: ../smime/lib/e-asn1-object.c:207
 msgid "PKCS #1 SHA-512 With RSA Encryption"
 msgstr "PKCS #1 SHA-512 sa RSA šifrovanjem"
 
-#: ../smime/lib/e-cert.c:649
+#: ../smime/lib/e-asn1-object.c:234
 msgid "PKCS #1 RSA Encryption"
 msgstr "PKCS #1 RSA šifrovanje"
 
-#: ../smime/lib/e-cert.c:652
+#: ../smime/lib/e-asn1-object.c:237
 msgid "Certificate Key Usage"
 msgstr "Upotreba ključa uverenja"
 
-#: ../smime/lib/e-cert.c:655
+#: ../smime/lib/e-asn1-object.c:240
 msgid "Netscape Certificate Type"
 msgstr "Vrsta Netskejp uverenja"
 
-#: ../smime/lib/e-cert.c:658
+#: ../smime/lib/e-asn1-object.c:243
 msgid "Certificate Authority Key Identifier"
 msgstr "Određivač ključa izdavaoca uverenja"
 
-#: ../smime/lib/e-cert.c:670
+#: ../smime/lib/e-asn1-object.c:255
 #, c-format
 msgid "Object Identifier (%s)"
 msgstr "Određivač predmeta (%s)"
 
-#: ../smime/lib/e-cert.c:722
+#: ../smime/lib/e-asn1-object.c:306
 msgid "Algorithm Identifier"
 msgstr "Određivač algoritma"
 
-#: ../smime/lib/e-cert.c:730
+#: ../smime/lib/e-asn1-object.c:314
 msgid "Algorithm Parameters"
 msgstr "Parametri algoritma"
 
-#: ../smime/lib/e-cert.c:752
+#: ../smime/lib/e-asn1-object.c:336
 msgid "Subject Public Key Info"
 msgstr "Podaci o javnom ključu subjekta"
 
-#: ../smime/lib/e-cert.c:757
+#: ../smime/lib/e-asn1-object.c:341
 msgid "Subject Public Key Algorithm"
 msgstr "Algoritam javnog ključa subjekta"
 
-#: ../smime/lib/e-cert.c:772
+#: ../smime/lib/e-asn1-object.c:356
 msgid "Subject's Public Key"
 msgstr "Javni ključ subjekta"
 
-#: ../smime/lib/e-cert.c:793 ../smime/lib/e-cert.c:843
+#: ../smime/lib/e-asn1-object.c:378 ../smime/lib/e-asn1-object.c:428
 msgid "Error: Unable to process extension"
 msgstr "Greška: ne mogu da obradim proširenje"
 
-#: ../smime/lib/e-cert.c:814 ../smime/lib/e-cert.c:826
+#: ../smime/lib/e-asn1-object.c:399 ../smime/lib/e-asn1-object.c:411
 msgid "Object Signer"
 msgstr "Potpisnik predmeta"
 
-#: ../smime/lib/e-cert.c:818
+#: ../smime/lib/e-asn1-object.c:403
 msgid "SSL Certificate Authority"
 msgstr "Izdavač SSL uverenja"
 
-#: ../smime/lib/e-cert.c:822
+#: ../smime/lib/e-asn1-object.c:407
 msgid "Email Certificate Authority"
 msgstr "Izdavač uverenja el. pošte"
 
-#: ../smime/lib/e-cert.c:851
+#: ../smime/lib/e-asn1-object.c:436
 msgid "Signing"
 msgstr "Potpisivanje"
 
-#: ../smime/lib/e-cert.c:855
+#: ../smime/lib/e-asn1-object.c:440
 msgid "Non-repudiation"
 msgstr "Bez odricanja"
 
-#: ../smime/lib/e-cert.c:859
+#: ../smime/lib/e-asn1-object.c:444
 msgid "Key Encipherment"
 msgstr "Zamućivanje ključa"
 
-#: ../smime/lib/e-cert.c:863
+#: ../smime/lib/e-asn1-object.c:448
 msgid "Data Encipherment"
 msgstr "Zamućivanje podataka"
 
-#: ../smime/lib/e-cert.c:867
+#: ../smime/lib/e-asn1-object.c:452
 msgid "Key Agreement"
 msgstr "Saglasnost ključa"
 
-#: ../smime/lib/e-cert.c:871
+#: ../smime/lib/e-asn1-object.c:456
 msgid "Certificate Signer"
 msgstr "Potpisnik uverenja"
 
-#: ../smime/lib/e-cert.c:875
+#: ../smime/lib/e-asn1-object.c:460
 msgid "CRL Signer"
 msgstr "CRL potpisnik"
 
-#: ../smime/lib/e-cert.c:924
+#: ../smime/lib/e-asn1-object.c:509
 msgid "Critical"
 msgstr "Kritično"
 
-#: ../smime/lib/e-cert.c:926 ../smime/lib/e-cert.c:929
+#: ../smime/lib/e-asn1-object.c:511 ../smime/lib/e-asn1-object.c:514
 msgid "Not Critical"
 msgstr "Nije kritično"
 
-#: ../smime/lib/e-cert.c:950
+#: ../smime/lib/e-asn1-object.c:535
 msgid "Extensions"
 msgstr "Proširenja"
 
@@ -20206,40 +21459,53 @@ msgstr "Proširenja"
 #. * change this string, unless changing the order of
 #. * name and value.  As a result example:
 #. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-cert.c:1029
+#: ../smime/lib/e-asn1-object.c:615
 #, c-format
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: ../smime/lib/e-cert.c:1085 ../smime/lib/e-cert.c:1208
+#: ../smime/lib/e-asn1-object.c:672 ../smime/lib/e-asn1-object.c:807
 msgid "Certificate Signature Algorithm"
 msgstr "Algoritam potpisa uverenja"
 
-#: ../smime/lib/e-cert.c:1094
+#: ../smime/lib/e-asn1-object.c:681
 msgid "Issuer"
 msgstr "Izdavač"
 
-#: ../smime/lib/e-cert.c:1149
+#: ../smime/lib/e-asn1-object.c:735
 msgid "Issuer Unique ID"
 msgstr "Jedinstveni IB izdavača"
 
-#: ../smime/lib/e-cert.c:1168
+#: ../smime/lib/e-asn1-object.c:754
 msgid "Subject Unique ID"
 msgstr "Jedinstveni IB subjekta"
 
-#: ../smime/lib/e-cert.c:1214
+#: ../smime/lib/e-asn1-object.c:813
 msgid "Certificate Signature Value"
 msgstr "Vrednost potpisa uverenja"
 
-#: ../smime/lib/e-cert-db.c:860
+#: ../smime/lib/e-cert.c:201 ../smime/lib/e-cert.c:213
+msgid "%d/%m/%Y"
+msgstr "%d. %m. %Y."
+
+#. x509 certificate usage types
+#: ../smime/lib/e-cert.c:392
+msgid "Sign"
+msgstr "Potpiši"
+
+#: ../smime/lib/e-cert.c:393
+msgid "Encrypt"
+msgstr "Šifruj"
+
+#: ../smime/lib/e-cert-db.c:864
 msgid "Certificate already exists"
 msgstr "Uverenje već postoji"
 
-#: ../smime/lib/e-pkcs12.c:200
+#: ../smime/lib/e-pkcs12.c:199
 msgid "PKCS12 File Password"
 msgstr "PKCS12 lozinka datoteke"
 
-#: ../smime/lib/e-pkcs12.c:201
+#: ../smime/lib/e-pkcs12.c:200
 msgid "Enter password for PKCS12 file:"
 msgstr "Unesite lozinku za PKCS12 datoteku:"
 
@@ -20318,1494 +21584,3 @@ msgstr "Sa _rokom"
 #: ../views/tasks/galview.xml.h:3
 msgid "With _Status"
 msgstr "Sa _stanjem"
-
-# Univerzalno vreme, ili UT
-# Valjda UV?
-#. Put the "UTC" entry at the top of the combo's list.
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:202
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:416
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:420
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:424
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.c:770
-msgid "UTC"
-msgstr "KUV"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:1
-msgid "Select a Time Zone"
-msgstr "Izaberite vremensku zonu"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:2
-msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-"Use the right mouse button to zoom out."
-msgstr ""
-"Koristite levi taster miša da uvećate mapu i izaberete vremensku zonu.\n"
-"Koristite desni taster miša za umanjivanje."
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:4
-msgid "Time Zones"
-msgstr "Vremenske zone"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:5
-msgid "_Selection"
-msgstr "_Izbor"
-
-#: ../widgets/e-timezone-dialog/e-timezone-dialog.ui.h:6
-msgid "Timezone drop-down combination box"
-msgstr "Prozorče za podešavanje vremenske zone"
-
-#: ../widgets/menus/gal-define-views-dialog.c:364
-#: ../widgets/menus/gal-define-views.ui.h:4
-#, no-c-format
-msgid "Define Views for %s"
-msgstr "Odredi preglede za %s"
-
-#: ../widgets/menus/gal-define-views-dialog.c:372
-#: ../widgets/menus/gal-define-views-dialog.c:374
-msgid "Define Views"
-msgstr "Odredi preglede"
-
-#: ../widgets/menus/gal-define-views.ui.h:2
-#, no-c-format
-msgid "Define Views for \"%s\""
-msgstr "Odredi preglede za „%s“"
-
-#: ../widgets/menus/gal-view-factory-etable.c:115
-msgid "Table"
-msgstr "Tabela"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.c:288
-msgid "Save Current View"
-msgstr "Sačuvaj trenutni pregled"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:1
-msgid "_Create new view"
-msgstr "_Napravi novi pregled"
-
-#: ../widgets/menus/gal-view-instance-save-as-dialog.ui.h:3
-msgid "_Replace existing view"
-msgstr "_Zameni postojeći pregled"
-
-#: ../widgets/menus/gal-view-new-dialog.c:172
-msgid "Define New View"
-msgstr "Odredi novi pregled"
-
-#: ../widgets/menus/gal-view-new-dialog.ui.h:1
-msgid "Name of new view:"
-msgstr "Naziv novog pregleda:"
-
-#: ../widgets/menus/gal-view-new-dialog.ui.h:2
-msgid "Type of view:"
-msgstr "Vrsta pregleda:"
-
-#: ../widgets/menus/gal-view-new-dialog.ui.h:3
-msgid "Type of View"
-msgstr "Vrsta pregleda"
-
-#: ../widgets/misc/ea-calendar-item.c:308
-#: ../widgets/misc/ea-calendar-item.c:317
-msgid "%d %B %Y"
-msgstr "%d %B %Y."
-
-#: ../widgets/misc/ea-calendar-item.c:320
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "Kalendar: od %s do %s"
-
-#: ../widgets/misc/ea-calendar-item.c:356
-msgid "evolution calendar item"
-msgstr "stavka kalendara evolucije"
-
-#: ../widgets/misc/e-alert-bar.c:120
-msgid "Close this message"
-msgstr "Zatvorite ovu poruku"
-
-#: ../widgets/misc/e-attachment-bar.c:658
-#: ../widgets/misc/e-attachment-paned.c:703
-msgid "Icon View"
-msgstr "Pregled ikonicama"
-
-#: ../widgets/misc/e-attachment-bar.c:660
-#: ../widgets/misc/e-attachment-paned.c:705
-msgid "List View"
-msgstr "Pregled spiskom"
-
-#. To Translators: This text is set as a description of an attached
-#. * message when, for example, attaching it to a composer. When the
-#. * message to be attached has also filled Subject, then this text is
-#. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../widgets/misc/e-attachment.c:966
-msgid "Attached message"
-msgstr "Priložena poruka"
-
-#. Translators: Default attachment filename.
-#: ../widgets/misc/e-attachment.c:1829 ../widgets/misc/e-attachment.c:2384
-#: ../widgets/misc/e-attachment-store.c:525
-msgid "attachment.dat"
-msgstr "attachment.dat"
-
-#: ../widgets/misc/e-attachment.c:1874 ../widgets/misc/e-attachment.c:2686
-msgid "A load operation is already in progress"
-msgstr "Operacija učitavanja je već u toku"
-
-#: ../widgets/misc/e-attachment.c:1882 ../widgets/misc/e-attachment.c:2694
-msgid "A save operation is already in progress"
-msgstr "Operacija čuvanja je već u toku"
-
-#: ../widgets/misc/e-attachment.c:1989
-#, c-format
-msgid "Could not load '%s'"
-msgstr "Ne mogu da učitam „%s“"
-
-#: ../widgets/misc/e-attachment.c:1992
-#, c-format
-msgid "Could not load the attachment"
-msgstr "Ne mogu da učitam prilog"
-
-#: ../widgets/misc/e-attachment.c:2265
-#, c-format
-msgid "Could not open '%s'"
-msgstr "Ne mogu da otvorim „%s“"
-
-#: ../widgets/misc/e-attachment.c:2268
-#, c-format
-msgid "Could not open the attachment"
-msgstr "Ne mogu da otvorim prilog"
-
-#: ../widgets/misc/e-attachment.c:2702
-msgid "Attachment contents not loaded"
-msgstr "Sadržaj priloga nije učitan"
-
-# * found, so just bail completely.
-#: ../widgets/misc/e-attachment.c:2778
-#, c-format
-msgid "Could not save '%s'"
-msgstr "Ne mogu da sačuvam „%s“"
-
-#: ../widgets/misc/e-attachment.c:2781
-#, c-format
-msgid "Could not save the attachment"
-msgstr "Ne mogu da sačuvam prilog"
-
-#: ../widgets/misc/e-attachment-dialog.c:311
-msgid "Attachment Properties"
-msgstr "Osobine priloga"
-
-#: ../widgets/misc/e-attachment-dialog.c:333
-#: ../widgets/misc/e-import-assistant.c:273
-msgid "F_ilename:"
-msgstr "_Naziv datoteke:"
-
-#: ../widgets/misc/e-attachment-dialog.c:368
-msgid "MIME Type:"
-msgstr "MIME vrsta:"
-
-#: ../widgets/misc/e-attachment-dialog.c:376
-#: ../widgets/misc/e-attachment-store.c:442
-msgid "_Suggest automatic display of attachment"
-msgstr "_Predloži automatski prikaz priloga"
-
-#: ../widgets/misc/e-attachment-handler-image.c:99
-msgid "Could not set as background"
-msgstr "Ne mogu da postavim kao pozadinu"
-
-#: ../widgets/misc/e-attachment-handler-image.c:149
-msgid "Set as _Background"
-msgstr "Postavi kao _pozadinu"
-
-#: ../widgets/misc/e-attachment-handler-sendto.c:93
-msgid "Could not send attachment"
-msgid_plural "Could not send attachments"
-msgstr[0] "Ne mogu da pošaljem prilog"
-msgstr[1] "Ne mogu da pošaljem priloge"
-msgstr[2] "Ne mogu da pošaljem priloge"
-msgstr[3] "Ne mogu da pošaljem prilog"
-
-#: ../widgets/misc/e-attachment-handler-sendto.c:135
-msgid "_Send To..."
-msgstr "_Pošalji za..."
-
-#: ../widgets/misc/e-attachment-handler-sendto.c:137
-msgid "Send the selected attachments somewhere"
-msgstr "Pošaljite izabrane priloge negde"
-
-#: ../widgets/misc/e-attachment-icon-view.c:166
-#: ../widgets/misc/e-attachment-tree-view.c:549
-msgid "Loading"
-msgstr "Učitavam"
-
-#: ../widgets/misc/e-attachment-icon-view.c:178
-#: ../widgets/misc/e-attachment-tree-view.c:561
-msgid "Saving"
-msgstr "Čuvam"
-
-#: ../widgets/misc/e-attachment-paned.c:104
-msgid "Hide Attachment _Bar"
-msgstr "Sakrij liniju pri_loga"
-
-#: ../widgets/misc/e-attachment-paned.c:106
-#: ../widgets/misc/e-attachment-paned.c:719
-msgid "Show Attachment _Bar"
-msgstr "Prikaži liniju p_riloga"
-
-#: ../widgets/misc/e-attachment-store.c:430
-msgid "Add Attachment"
-msgstr "Dodaj prilog"
-
-#: ../widgets/misc/e-attachment-store.c:433
-msgid "A_ttach"
-msgstr "Pri_loži"
-
-#: ../widgets/misc/e-attachment-store.c:496
-msgid "Save Attachment"
-msgid_plural "Save Attachments"
-msgstr[0] "Sačuvaj prilog"
-msgstr[1] "Sačuvaj priloge"
-msgstr[2] "Sačuvaj priloge"
-msgstr[3] "Sačuvaj prilog"
-
-#: ../widgets/misc/e-attachment-view.c:379
-msgid "Open With Other Application..."
-msgstr "Otvori drugim programom..."
-
-#: ../widgets/misc/e-attachment-view.c:386
-msgid "S_ave All"
-msgstr "Sač_uvaj sve"
-
-#: ../widgets/misc/e-attachment-view.c:412
-msgid "A_dd Attachment..."
-msgstr "Do_daj prilog..."
-
-#: ../widgets/misc/e-attachment-view.c:436
-msgid "_Hide"
-msgstr "_Sakrij"
-
-#: ../widgets/misc/e-attachment-view.c:443
-msgid "Hid_e All"
-msgstr "Sak_rij sve"
-
-#: ../widgets/misc/e-attachment-view.c:450
-msgid "_View Inline"
-msgstr "Pre_gledaj unutar"
-
-#: ../widgets/misc/e-attachment-view.c:457
-msgid "Vie_w All Inline"
-msgstr "Pre_gledaj sve unutar"
-
-#: ../widgets/misc/e-attachment-view.c:778
-#, c-format
-msgid "Open With \"%s\""
-msgstr "Otvori programom „%s“"
-
-#: ../widgets/misc/e-attachment-view.c:781
-#, c-format
-msgid "Open this attachment in %s"
-msgstr "Otvori ovaj prilog u „%s“"
-
-#: ../widgets/misc/e-book-source-config.c:98
-msgid "Mark as default address book"
-msgstr "Označava kao podrazumevan adresar"
-
-#: ../widgets/misc/e-book-source-config.c:103
-msgid "Autocomplete with this address book"
-msgstr "Sam dopunjava ovim adresarom"
-
-#: ../widgets/misc/e-book-source-config.c:277
-msgid "Copy book content locally for offline operation"
-msgstr "Umnožava sadržaj knjige lokalno za rad van mreže"
-
-#. To Translators: The text is concatenated to a form: "Ctrl-click to open a link http://www.example.com"
-#: ../widgets/misc/e-buffer-tagger.c:389
-msgid "Ctrl-click to open a link"
-msgstr "Pritisnite taster Ktrl i kliknite da otvorite vezu"
-
-#: ../widgets/misc/e-calendar.c:187
-msgid "Previous month"
-msgstr "Prethodni mesec"
-
-#: ../widgets/misc/e-calendar.c:211
-msgid "Next month"
-msgstr "Sledeći mesec"
-
-#: ../widgets/misc/e-calendar.c:233
-msgid "Previous year"
-msgstr "Prethodna godina"
-
-#: ../widgets/misc/e-calendar.c:254
-msgid "Next year"
-msgstr "Sledeća godina"
-
-#: ../widgets/misc/e-calendar.c:278
-msgid "Month Calendar"
-msgstr "Mesečni kalendar"
-
-#. This is a strftime() format. %B = Month name.
-#: ../widgets/misc/e-calendar-item.c:1283
-#: ../widgets/misc/e-calendar-item.c:2136
-msgctxt "CalItem"
-msgid "%B"
-msgstr "%B"
-
-#. This is a strftime() format. %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1285
-msgctxt "CalItem"
-msgid "%Y"
-msgstr "%Y"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../widgets/misc/e-calendar-item.c:1322
-msgctxt "CalItem"
-msgid "%B %Y"
-msgstr "%B %Y."
-
-#: ../widgets/misc/e-cal-source-config.c:170
-msgid "Mark as default calendar"
-msgstr "Označava kao osnovni kalendar"
-
-#: ../widgets/misc/e-cal-source-config.c:173
-msgid "Mark as default task list"
-msgstr "Označava kao osnovni spisak zadataka"
-
-#: ../widgets/misc/e-cal-source-config.c:176
-msgid "Mark as default memo list"
-msgstr "Označava kao osnovni spisak beleški"
-
-#: ../widgets/misc/e-cal-source-config.c:201
-msgid "Color:"
-msgstr "Boja:"
-
-#: ../widgets/misc/e-cal-source-config.c:406
-msgid "Copy calendar contents locally for offline operation"
-msgstr "Umnožava sadržaj kalendara lokalno za rad van mreže"
-
-#: ../widgets/misc/e-cal-source-config.c:410
-msgid "Copy task list contents locally for offline operation"
-msgstr "Umnožava sadržaj spiska zadataka lokalno za rad van mreže"
-
-#: ../widgets/misc/e-cal-source-config.c:414
-msgid "Copy memo list contents locally for offline operation"
-msgstr "Umnožava sadržaj spiska beleški lokalno za rad van mreže"
-
-#: ../widgets/misc/e-charset-combo-box.c:100
-msgid "Character Encoding"
-msgstr "Kodna strana"
-
-#: ../widgets/misc/e-charset-combo-box.c:123
-msgid "Enter the character set to use"
-msgstr "Izaberite kodnu stranu za korišćenje"
-
-#: ../widgets/misc/e-charset-combo-box.c:342
-msgid "Other..."
-msgstr "Drugo..."
-
-#: ../widgets/misc/e-contact-map-window.c:356
-msgid "Contacts Map"
-msgstr "Karta kontakata"
-
-#: ../widgets/misc/e-dateedit.c:504
-msgid "Date and Time"
-msgstr "Datum i vreme"
-
-#: ../widgets/misc/e-dateedit.c:525
-msgid "Text entry to input date"
-msgstr "Deo teksta za unos datuma"
-
-#: ../widgets/misc/e-dateedit.c:547
-msgid "Click this button to show a calendar"
-msgstr "Pritisnite na ovo dugme da prikažete kalendar"
-
-#: ../widgets/misc/e-dateedit.c:594
-msgid "Drop-down combination box to select time"
-msgstr "Prozorče za izbor vremena"
-
-#: ../widgets/misc/e-dateedit.c:666
-msgid "No_w"
-msgstr "_Sada"
-
-#: ../widgets/misc/e-dateedit.c:673
-msgid "_Today"
-msgstr "_Danas"
-
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# When "None" is selected we want the field to be cleared.
-# Note that we don't show this here, since by default a 'None' date
-# is not permitted.
-#. Note that we don't show this here, since by default a 'None' date
-#. * is not permitted.
-#: ../widgets/misc/e-dateedit.c:682
-msgid "_None"
-msgstr "_Ništa"
-
-# 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 date field of a date edit, shown when
-#. * there is no date set.
-#: ../widgets/misc/e-dateedit.c:1697 ../widgets/misc/e-dateedit.c:1930
-msgctxt "date"
-msgid "None"
-msgstr "Ništa"
-
-#: ../widgets/misc/e-dateedit.c:1824
-msgid "Invalid Date Value"
-msgstr "Neispravan datum"
-
-#: ../widgets/misc/e-dateedit.c:1868
-msgid "Invalid Time Value"
-msgstr "Neispravno vreme"
-
-#: ../widgets/misc/e-import-assistant.c:256
-msgid ""
-"Choose the file that you want to import into Evolution, and select what type "
-"of file it is from the list."
-msgstr ""
-"Izaberite datoteku koju želite da uvezete u Evoluciju i iz liste izaberite "
-"kojeg je tipa ta datoteka."
-
-#: ../widgets/misc/e-import-assistant.c:283
-msgid "Select a file"
-msgstr "Izaberite datoteku"
-
-#: ../widgets/misc/e-import-assistant.c:297
-#: ../widgets/misc/e-import-assistant.c:472
-msgid "File _type:"
-msgstr "_Vrsta datoteke:"
-
-#: ../widgets/misc/e-import-assistant.c:340
-#: ../widgets/misc/e-import-assistant.c:920
-msgid "Choose the destination for this import"
-msgstr "Izaberite odredište za ovaj uvoz"
-
-#: ../widgets/misc/e-import-assistant.c:365
-msgid "Choose the type of importer to run:"
-msgstr "Izaberite tip uvoznika:"
-
-#: ../widgets/misc/e-import-assistant.c:373
-msgid "Import data and settings from _older programs"
-msgstr "Uvezi podatke i podešavanja iz _starijih programa"
-
-#: ../widgets/misc/e-import-assistant.c:381
-msgid "Import a _single file"
-msgstr "Uvezi _jednu datoteku"
-
-#: ../widgets/misc/e-import-assistant.c:533
-msgid ""
-"Evolution checked for settings to import from the following applications: "
-"Pine, Netscape, Elm, iCalendar. No importable settings found. If you would "
-"like to try again, please click the \"Back\" button."
-msgstr ""
-"Evolucija je proverila podešavanja za uvoz sledećih programa: Pine, Netskejp, "
-"Elm, iKalendar. Nema podešavanja za uvoženje. Ukoliko želite da pokušate "
-"ponovo, kliknite na dugme „Nazad“."
-
-#. Install a custom "Cancel Import" button.
-#: ../widgets/misc/e-import-assistant.c:775
-msgid "_Cancel Import"
-msgstr "_Otkaži uvoženje"
-
-#: ../widgets/misc/e-import-assistant.c:919
-msgid "Preview data to be imported"
-msgstr "Pregledaj podatke koji se uvoze"
-
-#: ../widgets/misc/e-import-assistant.c:925
-#: ../widgets/misc/e-import-assistant.c:938
-#: ../widgets/misc/e-import-assistant.c:1291
-#: ../widgets/misc/e-import-assistant.c:1367
-#: ../widgets/misc/e-import-assistant.c:1376
-msgid "Import Data"
-msgstr "Uvezi podatke"
-
-#: ../widgets/misc/e-import-assistant.c:933
-msgid "Select what type of file you want to import from the list."
-msgstr "Izaberite sa spiska koje vrste datoteka želite da uvezete."
-
-#: ../widgets/misc/e-import-assistant.c:1281
-#: ../widgets/misc/e-import-assistant.c:1316
-msgid "Evolution Import Assistant"
-msgstr "Pomoćnik Evolucije za uvoz"
-
-#: ../widgets/misc/e-import-assistant.c:1298
-#: ../widgets/misc/e-import-assistant.c:1354
-msgid "Import Location"
-msgstr "Uvezi lokaciju"
-
-#: ../widgets/misc/e-import-assistant.c:1309
-msgid ""
-"Welcome to the Evolution Import Assistant.\n"
-"With this assistant you will be guided through the process of importing "
-"external files into Evolution."
-msgstr ""
-"Dobro došli u Pomoćnika Evolucije za uvoz.\n"
-"Ovaj pomoćnik će vas provesti kroz postupak uvoza spoljnih datoteka u "
-"Evoluciju."
-
-#: ../widgets/misc/e-import-assistant.c:1326
-msgid "Importer Type"
-msgstr "Vrsta uvoznika"
-
-#: ../widgets/misc/e-import-assistant.c:1336
-msgid "Select Information to Import"
-msgstr "Izaberite informaciju za uvoz"
-
-#: ../widgets/misc/e-import-assistant.c:1345
-msgid "Select a File"
-msgstr "Izaberite datoteku"
-
-#: ../widgets/misc/e-import-assistant.c:1362
-msgid "Click \"Apply\" to begin importing the file into Evolution."
-msgstr "Kliknite na „Primeni“ da započnete uvoz datoteke u Evoluciju."
-
-#: ../widgets/misc/e-mail-signature-combo-box.c:378
-msgid "Autogenerated"
-msgstr "Automatski sastavljeno"
-
-#: ../widgets/misc/e-mail-signature-editor.c:287
-msgid "Close"
-msgstr "Zatvori"
-
-#: ../widgets/misc/e-mail-signature-editor.c:292
-msgid "_Save and Close"
-msgstr "_Sačuvaj i zatvori"
-
-#: ../widgets/misc/e-mail-signature-editor.c:506
-msgid "Edit Signature"
-msgstr "Uredi potpis"
-
-#: ../widgets/misc/e-mail-signature-editor.c:526
-msgid "_Signature Name:"
-msgstr "Naziv _potpisa:"
-
-#: ../widgets/misc/e-mail-signature-editor.c:572
-msgid "Unnamed"
-msgstr "Bez imena"
-
-#: ../widgets/misc/e-mail-signature-manager.c:337
-msgid "Add _Script"
-msgstr "Dodaj sk_riptu"
-
-#: ../widgets/misc/e-mail-signature-manager.c:421
-msgid "Add Signature Script"
-msgstr "Dodaj skriptu za potpis"
-
-#: ../widgets/misc/e-mail-signature-manager.c:491
-msgid "Edit Signature Script"
-msgstr "Uredi skriptu potpisa"
-
-#: ../widgets/misc/e-mail-signature-script-dialog.c:395
-msgid ""
-"The output of this script will be used as your\n"
-"signature. The name you specify will be used\n"
-"for display purposes only."
-msgstr ""
-"Izlaz ove skripte će biti korišćen kao\n"
-"potpis. Naziv koji ste dali će biti korišćen\n"
-"samo za prikaz."
-
-#: ../widgets/misc/e-mail-signature-script-dialog.c:446
-msgid "S_cript:"
-msgstr "S_kripta:"
-
-#: ../widgets/misc/e-mail-signature-script-dialog.c:477
-msgid "Script file must be executable."
-msgstr "Datoteka skripte mora biti izvršna."
-
-#: ../widgets/misc/e-map.c:886
-msgid "World Map"
-msgstr "Karta sveta"
-
-#: ../widgets/misc/e-map.c:889
-msgid ""
-"Mouse-based interactive map widget for selecting timezone. Keyboard users "
-"should instead select the timezone from the drop-down combination box below."
-msgstr ""
-"Alat za izbor vremenske zone pomoću miša. Tastaturom se izbor vremenske zone "
-"vrši iz donjeg okvira."
-
-#: ../widgets/misc/e-online-button.c:31
-msgid "Evolution is currently online.  Click this button to work offline."
-msgstr ""
-"Evolucija je trenutno na mreži.  Kliknite na ovo dugme za rad van mreže."
-
-#: ../widgets/misc/e-online-button.c:34
-msgid "Evolution is currently offline.  Click this button to work online."
-msgstr ""
-"Evolucija trenutno nije na mreži.  Kliknite na ovo dugme da se povežete."
-
-#: ../widgets/misc/e-online-button.c:37
-msgid "Evolution is currently offline because the network is unavailable."
-msgstr "Evolucija trenutno nije na mreži jer mreža nije dostupna."
-
-#: ../widgets/misc/e-preferences-window.c:317
-msgid "Evolution Preferences"
-msgstr "Podešavanja Evolucije"
-
-# bug: plural-forms if put as "%d matches"
-#: ../widgets/misc/e-search-bar.c:79
-#, c-format
-msgid "Matches: %u"
-msgstr "Poklapanja: %u"
-
-#: ../widgets/misc/e-search-bar.c:527
-msgid "Close the find bar"
-msgstr "Zatvori traku pretrage"
-
-#: ../widgets/misc/e-search-bar.c:535
-msgid "Fin_d:"
-msgstr "Pro_nađi:"
-
-#: ../widgets/misc/e-search-bar.c:547
-msgid "Clear the search"
-msgstr "Očisti pretragu"
-
-#: ../widgets/misc/e-search-bar.c:571
-msgid "_Previous"
-msgstr "_Prethodno"
-
-#: ../widgets/misc/e-search-bar.c:577
-msgid "Find the previous occurrence of the phrase"
-msgstr "Nađi prethodno pojavljivanje izraza"
-
-#: ../widgets/misc/e-search-bar.c:590
-msgid "_Next"
-msgstr "_Sledeće"
-
-#: ../widgets/misc/e-search-bar.c:596
-msgid "Find the next occurrence of the phrase"
-msgstr "Nađi sledeće pojavljivanje izraza"
-
-#: ../widgets/misc/e-search-bar.c:609
-msgid "Mat_ch case"
-msgstr "_Uporedi veličinu slova"
-
-#: ../widgets/misc/e-search-bar.c:637
-msgid "Reached bottom of page, continued from top"
-msgstr "Stigao sam do dna stranice, nastavljam sa vrha"
-
-#: ../widgets/misc/e-search-bar.c:659
-msgid "Reached top of page, continued from bottom"
-msgstr "Stigao sam do vrha stranice, nastavljam sa dna"
-
-#: ../widgets/misc/e-send-options.c:570
-msgid "When de_leted:"
-msgstr "Kada je obri_sano:"
-
-#: ../widgets/misc/e-send-options.ui.h:3
-msgid "Standard"
-msgstr "Obično"
-
-#: ../widgets/misc/e-send-options.ui.h:6
-msgid "Proprietary"
-msgstr "Vlasničko"
-
-#: ../widgets/misc/e-send-options.ui.h:8
-msgid "Secret"
-msgstr "Tajno"
-
-#: ../widgets/misc/e-send-options.ui.h:9
-msgid "Top Secret"
-msgstr "Strogo poverljivo"
-
-#: ../widgets/misc/e-send-options.ui.h:10
-msgid "For Your Eyes Only"
-msgstr "Samo za vaše oči"
-
-# add a "None" option to the stores menu
-# Put the "None" and "UTC" entries at the top of the combo's list.
-# When "None" is selected we want the field to be cleared.
-# Note that we don't show this here, since by default a 'None' date
-# is not permitted.
-#. Translators: Used in send options dialog
-#: ../widgets/misc/e-send-options.ui.h:12
-msgctxt "send-options"
-msgid "None"
-msgstr "Ništa"
-
-#: ../widgets/misc/e-send-options.ui.h:13
-msgid "Mail Receipt"
-msgstr "Priznanica pošte"
-
-#: ../widgets/misc/e-send-options.ui.h:15
-msgid "R_eply requested"
-msgstr "Zahtevan je o_dgovor"
-
-#: ../widgets/misc/e-send-options.ui.h:16
-msgctxt "ESendOptionsWithin"
-msgid "Wi_thin"
-msgstr "Un_utar"
-
-#: ../widgets/misc/e-send-options.ui.h:17
-msgctxt "ESendOptionsWithin"
-msgid "days"
-msgstr "dana"
-
-#: ../widgets/misc/e-send-options.ui.h:18
-msgid "_When convenient"
-msgstr "Kada je z_godno"
-
-#: ../widgets/misc/e-send-options.ui.h:20
-msgid "_Delay message delivery"
-msgstr "_Odloži isporuku poruke"
-
-#: ../widgets/misc/e-send-options.ui.h:21
-msgctxt "ESendOptionsAfter"
-msgid "_After"
-msgstr "_Posle"
-
-#: ../widgets/misc/e-send-options.ui.h:22
-msgctxt "ESendOptionsAfter"
-msgid "days"
-msgstr "dana"
-
-#: ../widgets/misc/e-send-options.ui.h:23
-msgid "_Set expiration date"
-msgstr "Postavi _rok"
-
-#: ../widgets/misc/e-send-options.ui.h:24
-msgctxt "ESendOptions"
-msgid "_Until"
-msgstr "_Do"
-
-#: ../widgets/misc/e-send-options.ui.h:25
-msgid "Delivery Options"
-msgstr "Opcije isporuke"
-
-#: ../widgets/misc/e-send-options.ui.h:27
-msgid "_Classification:"
-msgstr "_Klasifikacija:"
-
-#: ../widgets/misc/e-send-options.ui.h:28
-msgid "Gene_ral Options"
-msgstr "Opš_te opcije"
-
-#: ../widgets/misc/e-send-options.ui.h:29
-msgid "Creat_e a sent item to track information"
-msgstr "Na_pravi poslatu stavku za praćenje podatka"
-
-#: ../widgets/misc/e-send-options.ui.h:30
-msgid "_Delivered"
-msgstr "_Isporučeno"
-
-#: ../widgets/misc/e-send-options.ui.h:31
-msgid "Deli_vered and opened"
-msgstr "Ispo_ručeno i otvoreno"
-
-#: ../widgets/misc/e-send-options.ui.h:32
-msgid "_All information"
-msgstr "_Svi podaci"
-
-#: ../widgets/misc/e-send-options.ui.h:33
-msgid "A_uto-delete sent item"
-msgstr "A_utomatski obriši poslatu stavku"
-
-#: ../widgets/misc/e-send-options.ui.h:34
-msgid "Status Tracking"
-msgstr "Praćenje statusa"
-
-#: ../widgets/misc/e-send-options.ui.h:35
-msgid "_When opened:"
-msgstr "Kada je o_tvoreno:"
-
-#: ../widgets/misc/e-send-options.ui.h:36
-msgid "When decli_ned:"
-msgstr "Kada je _odbijeno:"
-
-#: ../widgets/misc/e-send-options.ui.h:37
-msgid "When co_mpleted:"
-msgstr "Kad je _završeno:"
-
-#: ../widgets/misc/e-send-options.ui.h:38
-msgid "When acce_pted:"
-msgstr "Kada je _prihvaćeno:"
-
-#: ../widgets/misc/e-send-options.ui.h:39
-msgid "Return Notification"
-msgstr "Povratno obaveštenje"
-
-#: ../widgets/misc/e-send-options.ui.h:40
-msgid "Sta_tus Tracking"
-msgstr "Praćenje sta_tusa"
-
-#: ../widgets/misc/e-source-config.c:675 ../widgets/misc/e-source-config.c:679
-msgid "Type:"
-msgstr "Vrsta:"
-
-#: ../widgets/misc/e-source-config.c:687 ../widgets/misc/e-source-config.c:691
-msgid "Name:"
-msgstr "Ime:"
-
-#. Translators: This is the first of a sequence of widgets:
-#. * "Refresh every [NUMERIC_ENTRY] [TIME_UNITS_COMBO]"
-#: ../widgets/misc/e-source-config.c:1289
-msgid "Refresh every"
-msgstr "Osveži na svakih"
-
-#: ../widgets/misc/e-source-config.c:1319
-#: ../widgets/misc/e-source-config.c:1347
-msgid "Use a secure connection"
-msgstr "Koristi bezbednu vezu"
-
-#: ../widgets/misc/e-source-config.c:1361
-msgid "Ignore invalid SSL certificate"
-msgstr "Zanemari neispravno SSL uverenje"
-
-#: ../widgets/misc/e-source-config.c:1398
-msgid "User"
-msgstr "Korisnik"
-
-#. no suggestions. Put something in the menu anyway...
-#: ../widgets/misc/e-spell-entry.c:351
-msgid "(no suggestions)"
-msgstr "(nema predloga)"
-
-#: ../widgets/misc/e-spell-entry.c:375
-msgid "More..."
-msgstr "Dalje..."
-
-#. + Add to Dictionary
-#: ../widgets/misc/e-spell-entry.c:444
-#, c-format
-msgid "Add \"%s\" to Dictionary"
-msgstr "Dodaj „%s“ u rečnik"
-
-#. - Ignore All
-#: ../widgets/misc/e-spell-entry.c:487
-msgid "Ignore All"
-msgstr "Zanemari sve"
-
-#: ../widgets/misc/e-spell-entry.c:513
-msgid "Spelling Suggestions"
-msgstr "Predlozi pravopisa"
-
-#: ../widgets/misc/e-url-entry.c:78
-msgid "Click here to go to URL"
-msgstr "Kliknite ovde da posetite adresu"
-
-#: ../widgets/misc/e-web-view.c:274 ../widgets/misc/e-web-view-gtkhtml.c:407
-msgid "_Copy Link Location"
-msgstr "_Umnoži mesto veze"
-
-#: ../widgets/misc/e-web-view.c:276 ../widgets/misc/e-web-view-gtkhtml.c:409
-msgid "Copy the link to the clipboard"
-msgstr "Umnožava vezu u spisak isečaka"
-
-#: ../widgets/misc/e-web-view.c:284 ../widgets/misc/e-web-view-gtkhtml.c:417
-msgid "_Open Link in Browser"
-msgstr "_Otvori vezu u pregledniku"
-
-#: ../widgets/misc/e-web-view.c:286 ../widgets/misc/e-web-view-gtkhtml.c:419
-msgid "Open the link in a web browser"
-msgstr "Otvori vezu u veb pretraživaču"
-
-#: ../widgets/misc/e-web-view.c:294 ../widgets/misc/e-web-view-gtkhtml.c:427
-msgid "_Copy Email Address"
-msgstr "_Umnoži adresu el. pošte"
-
-#: ../widgets/misc/e-web-view.c:311 ../widgets/misc/e-web-view-gtkhtml.c:444
-msgid "_Copy Image"
-msgstr "_Umnoži sliku"
-
-#: ../widgets/misc/e-web-view.c:313 ../widgets/misc/e-web-view-gtkhtml.c:446
-msgid "Copy the image to the clipboard"
-msgstr "Umnožite sliku u ostavu"
-
-#: ../widgets/misc/e-web-view.c:333 ../widgets/misc/e-web-view.c:1440
-#: ../widgets/misc/e-web-view-gtkhtml.c:466
-#: ../widgets/misc/e-web-view-gtkhtml.c:1311
-msgid "Select all text and images"
-msgstr "Izaberi sav tekst i slike"
-
-#: ../widgets/misc/e-web-view.c:1104 ../widgets/misc/e-web-view.c:1106
-#: ../widgets/misc/e-web-view.c:1108 ../widgets/misc/e-web-view-gtkhtml.c:975
-#: ../widgets/misc/e-web-view-gtkhtml.c:977
-#: ../widgets/misc/e-web-view-gtkhtml.c:979
-#, c-format
-msgid "Click to call %s"
-msgstr "Kliknite da pozovete %s"
-
-#: ../widgets/misc/e-web-view.c:1110 ../widgets/misc/e-web-view-gtkhtml.c:981
-msgid "Click to hide/unhide addresses"
-msgstr "Kliknite da sakrijete/otkrijete adrese"
-
-#: ../widgets/misc/e-web-view.c:1112 ../widgets/misc/e-web-view-gtkhtml.c:983
-#, c-format
-msgid "Click to open %s"
-msgstr "Kliknite da otvorite %s"
-
-#: ../widgets/misc/widgets.error.xml.h:1
-msgid "Do you wish to save your changes?"
-msgstr "Da li želite da sačuvate izmene?"
-
-#: ../widgets/misc/widgets.error.xml.h:2
-msgid "This signature has been changed, but has not been saved."
-msgstr "Ovaj potpis je promenjen, ali nije sačuvan."
-
-#: ../widgets/misc/widgets.error.xml.h:3
-msgid "_Discard changes"
-msgstr "_Odbaci izmene"
-
-#: ../widgets/misc/widgets.error.xml.h:4
-msgid "Blank Signature"
-msgstr "Prazan potpis"
-
-#: ../widgets/misc/widgets.error.xml.h:5
-msgid "Please provide an unique name to identify this signature."
-msgstr "Dajte jedno jedinstveno ime koje predstavlja ovaj potpis."
-
-#: ../widgets/misc/widgets.error.xml.h:6
-msgid "Could not load signature."
-msgstr "Ne mogu da učitam potpis."
-
-#: ../widgets/misc/widgets.error.xml.h:7
-msgid "Could not save signature."
-msgstr "Ne mogu da sačuvam potpis."
-
-#: ../widgets/table/e-cell-combo.c:187
-msgid "popup list"
-msgstr "iskačuća lista"
-
-#: ../widgets/table/e-cell-date-edit.c:299
-msgid "Now"
-msgstr "Sada"
-
-# 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" as a label of a button to unset date in a
-#. * date table cell.
-#: ../widgets/table/e-cell-date-edit.c:317
-msgctxt "table-date"
-msgid "None"
-msgstr "Ništa"
-
-#: ../widgets/table/e-cell-date-edit.c:325
-msgid "OK"
-msgstr "U redu"
-
-#: ../widgets/table/e-cell-date-edit.c:873
-#, c-format
-msgid "The time must be in the format: %s"
-msgstr "Vreme mora biti u formatu: %s"
-
-#: ../widgets/table/e-cell-percent.c:80
-msgid "The percent value must be between 0 and 100, inclusive"
-msgstr "Vrednost procenta mora biti između 0 i 100"
-
-#: ../widgets/table/e-table-click-to-add.c:609
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:62
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:143
-msgid "click to add"
-msgstr "kliknite da dodate"
-
-#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
-msgid "(Ascending)"
-msgstr "(Rastuće)"
-
-#: ../widgets/table/e-table-config.c:393 ../widgets/table/e-table-config.c:435
-msgid "(Descending)"
-msgstr "(Opadajuće)"
-
-#: ../widgets/table/e-table-config.c:400
-msgid "Not sorted"
-msgstr "Nije razvrstano"
-
-#: ../widgets/table/e-table-config.c:441
-msgid "No grouping"
-msgstr "Bez grupisanja"
-
-#: ../widgets/table/e-table-config.c:666
-#: ../widgets/table/e-table-config.ui.h:1
-msgid "Show Fields"
-msgstr "Prikaži polja"
-
-#: ../widgets/table/e-table-config.c:686
-msgid "Available Fields"
-msgstr "Dostupna polja"
-
-#: ../widgets/table/e-table-config.ui.h:2
-msgid "A_vailable Fields:"
-msgstr "Do_stupna polja:"
-
-#: ../widgets/table/e-table-config.ui.h:3
-msgid "_Show these fields in order:"
-msgstr "_Prikaži ova polja po redu:"
-
-#: ../widgets/table/e-table-config.ui.h:4
-msgid "Move _Up"
-msgstr "Premesti na _gore"
-
-#: ../widgets/table/e-table-config.ui.h:5
-msgid "Move _Down"
-msgstr "Pomeri na _dole"
-
-#: ../widgets/table/e-table-config.ui.h:7
-msgid "_Remove"
-msgstr "_Ukloni"
-
-#: ../widgets/table/e-table-config.ui.h:9
-msgid "_Show field in View"
-msgstr "_Prikaži polje u pregledu"
-
-#: ../widgets/table/e-table-config.ui.h:10
-#: ../widgets/table/e-table-header-item.c:1736
-msgid "Ascending"
-msgstr "Rastuće"
-
-#: ../widgets/table/e-table-config.ui.h:11
-#: ../widgets/table/e-table-header-item.c:1736
-msgid "Descending"
-msgstr "Opadajuće"
-
-#: ../widgets/table/e-table-config.ui.h:12
-msgid "Group Items By"
-msgstr "Grupiši stavke po"
-
-#: ../widgets/table/e-table-config.ui.h:13
-msgid "Show _field in View"
-msgstr "Prikaži _polje u pregledu"
-
-#: ../widgets/table/e-table-config.ui.h:14
-msgid "Then By"
-msgstr "Onda po"
-
-#: ../widgets/table/e-table-config.ui.h:15
-msgid "Show field i_n View"
-msgstr "Prikaži polje _u pregledu"
-
-#: ../widgets/table/e-table-config.ui.h:16
-msgid "Show field in _View"
-msgstr "Prikaži polje u p_regledu"
-
-#: ../widgets/table/e-table-config.ui.h:17
-msgid "Clear _All"
-msgstr "Očisti _sve"
-
-#: ../widgets/table/e-table-config.ui.h:18
-msgid "Sort"
-msgstr "Razvrstaj"
-
-#: ../widgets/table/e-table-config.ui.h:19
-msgid "Sort Items By"
-msgstr "Razvrstaj stavke po"
-
-#: ../widgets/table/e-table-config.ui.h:20
-msgid "Clear All"
-msgstr "Očisti sve"
-
-#: ../widgets/table/e-table-config.ui.h:21
-msgid "_Sort..."
-msgstr "_Razvrstaj..."
-
-#: ../widgets/table/e-table-config.ui.h:22
-msgid "_Group By..."
-msgstr "_Grupiši po..."
-
-#: ../widgets/table/e-table-config.ui.h:23
-msgid "_Fields Shown..."
-msgstr "Prikazana _polja..."
-
-#: ../widgets/table/e-table-field-chooser.c:152
-msgid ""
-"To add a column to your table, drag it into\n"
-"the location in which you want it to appear."
-msgstr ""
-"Za dodavanje kolone u tabelu, prevucite\n"
-"je na mesto gde želite da se pojavi."
-
-#: ../widgets/table/e-table-field-chooser-dialog.c:224
-msgid "Add a Column"
-msgstr "Dodaj kolonu"
-
-#. Translators: This text is used as a special row when an ETable
-#. * has turned on grouping on a column, which has set a title.
-#. * The first %s is replaced with a column title.
-#. * The second %s is replaced with an actual  group value.
-#. * Finally the %d is replaced with count of items in this group.
-#. * Example: "Family name: Smith (13 items)"
-#.
-#: ../widgets/table/e-table-group-container.c:360
-#, c-format
-msgid "%s: %s (%d item)"
-msgid_plural "%s: %s (%d items)"
-msgstr[0] "%s: %s (%d stavka)"
-msgstr[1] "%s: %s (%d stavke)"
-msgstr[2] "%s: %s (%d stavki)"
-msgstr[3] "%s: %s (jedna stavka)"
-
-#. Translators: This text is used as a special row when an ETable
-#. * has turned on grouping on a column, which doesn't have set a title.
-#. * The %s is replaced with an actual group value.
-#. * The %d is replaced with count of items in this group.
-#. * Example: "Smith (13 items)"
-#.
-#: ../widgets/table/e-table-group-container.c:372
-#, c-format
-msgid "%s (%d item)"
-msgid_plural "%s (%d items)"
-msgstr[0] "%s (%d stavka)"
-msgstr[1] "%s (%d stavke)"
-msgstr[2] "%s (%d stavki)"
-msgstr[3] "%s (jedna stavka)"
-
-#: ../widgets/table/e-table-header-item.c:1574
-msgid "Customize Current View"
-msgstr "Prilagodite trenutni pregled"
-
-#: ../widgets/table/e-table-header-item.c:1596
-msgid "Sort _Ascending"
-msgstr "Razvrstaj _rastuće"
-
-#: ../widgets/table/e-table-header-item.c:1599
-msgid "Sort _Descending"
-msgstr "Razvrstaj _opadajuće"
-
-#: ../widgets/table/e-table-header-item.c:1602
-msgid "_Unsort"
-msgstr "_Ne razvrstavaj"
-
-#: ../widgets/table/e-table-header-item.c:1605
-msgid "Group By This _Field"
-msgstr "Grupiši po ovome _polju"
-
-#: ../widgets/table/e-table-header-item.c:1608
-msgid "Group By _Box"
-msgstr "Grupiši po _okviru"
-
-#: ../widgets/table/e-table-header-item.c:1612
-msgid "Remove This _Column"
-msgstr "Ukloni ovu _kolonu"
-
-#: ../widgets/table/e-table-header-item.c:1615
-msgid "Add a C_olumn..."
-msgstr "Dodaj ko_lonu..."
-
-#: ../widgets/table/e-table-header-item.c:1619
-msgid "A_lignment"
-msgstr "Po_ravnanje"
-
-#: ../widgets/table/e-table-header-item.c:1622
-msgid "B_est Fit"
-msgstr "Na_jbolje uklapanje"
-
-#: ../widgets/table/e-table-header-item.c:1625
-msgid "Format Column_s..."
-msgstr "Oblikuj kolo_ne..."
-
-#: ../widgets/table/e-table-header-item.c:1629
-msgid "Custo_mize Current View..."
-msgstr "Prila_godi trenutni pregled..."
-
-#: ../widgets/table/e-table-header-item.c:1691
-msgid "_Sort By"
-msgstr "_Poređaj po"
-
-#. Custom
-#: ../widgets/table/e-table-header-item.c:1709
-msgid "_Custom"
-msgstr "_Proizvoljno"
-
-#: ../widgets/table/gal-a11y-e-cell.c:123
-msgid "Table Cell"
-msgstr "Ćelija tabele"
-
-#. Translators: description of a "popup" action
-#: ../widgets/table/gal-a11y-e-cell-popup.c:125
-msgid "popup a child"
-msgstr "iskačuće izvedeno"
-
-#. Translators: description of a "toggle" action
-#: ../widgets/table/gal-a11y-e-cell-toggle.c:178
-msgid "toggle the cell"
-msgstr "biranje ćelije"
-
-#. Translators: description of an "expand" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:214
-msgid "expands the row in the ETree containing this cell"
-msgstr "razgranava red u Establo koje sdrži ovu ćeliju"
-
-#. Translators: description of a "collapse" action
-#: ../widgets/table/gal-a11y-e-cell-tree.c:221
-msgid "collapses the row in the ETree containing this cell"
-msgstr "skuplja red u Establo koje sadrži ovu ćeliju"
-
-#: ../widgets/table/gal-a11y-e-table-click-to-add.c:72
-msgid "click"
-msgstr "klik"
-
-#: ../widgets/table/gal-a11y-e-table-column-header.c:161
-msgid "sort"
-msgstr "razvrstavanje"
-
-#: ../widgets/text/e-text.c:2074
-msgid "Select All"
-msgstr "Izaberi sve"
-
-#: ../widgets/text/e-text.c:2087
-msgid "Input Methods"
-msgstr "Načini unosa"
-
-#~ msgctxt "New"
-#~ msgid "_Test Item"
-#~ msgstr "_Probna stavka"
-
-#~ msgid "Create a new test item"
-#~ msgstr "Napravite novu probnu stavku"
-
-#~ msgctxt "New"
-#~ msgid "Test _Source"
-#~ msgstr "Probni _izvor"
-
-#~ msgid "Create a new test source"
-#~ msgstr "Napravite novi probni izvor"
-
-#~ msgid "ID of the socket to embed in"
-#~ msgstr "IB priključka za umetanje"
-
-#~ msgid "socket"
-#~ msgstr "utičnica"
-
-#~ msgid "Please enter your full name."
-#~ msgstr "Unesite vaše puno ime."
-
-#~ msgid "Please enter your email address."
-#~ msgstr "Unesite adresu el. pošte."
-
-#~ msgid "The email address you have entered is invalid."
-#~ msgstr "Uneta adresa el. pošte nije ispravna."
-
-#~ msgid "Please enter your password."
-#~ msgstr "Unesite vašu lozinku."
-
-#~ msgid "CalDAV"
-#~ msgstr "KolDAV"
-
-#~ msgid "Google"
-#~ msgstr "Gugl"
-
-#~ msgid "Always (SSL)"
-#~ msgstr "Uvek (SSL)"
-
-#~ msgid "When possible (TLS)"
-#~ msgstr "Kada je moguće (TLS)"
-
-# Create the default Person calendar
-# Create the default Person task list
-# orange
-#~ msgid "Personal details:"
-#~ msgstr "Lični podaci:"
-
-#~ msgid "Email address:"
-#~ msgstr "Adresa el. pošte:"
-
-#~ msgid "Details:"
-#~ msgstr "Detalji:"
-
-#~ msgid "Server type:"
-#~ msgstr "Vrsta servera:"
-
-#~ msgid "Server address:"
-#~ msgstr "Adresa servera:"
-
-#~ msgid "Use encryption:"
-#~ msgstr "Koristi šifrovanje:"
-
-#~ msgid ""
-#~ "To use the email application you'll need to setup an account. Put your "
-#~ "email address and password in below and we'll try and work out all the "
-#~ "settings. If we can't do it automatically you'll need your server details "
-#~ "as well."
-#~ msgstr ""
-#~ "Da koristite program za poštu potrebno je da podesite nalog. Unesite "
-#~ "adresu el. pošte i lozinku da pokušamo da prepoznamo postavke. Ukoliko to "
-#~ "nije moguće automatski, moraćete da dodate i podatke o serveru."
-
-#~ msgid ""
-#~ "Sorry, we can't work out the settings to get your mail automatically. "
-#~ "Please enter them below. We've tried to make a start with the details you "
-#~ "just entered but you may need to change them."
-#~ msgstr ""
-#~ "Žao nam je, ne možemo automatski da prepoznamo postavke. Unesite ih dole. "
-#~ "Pokušali smo da sa podacima koje ste uneli započnemo podešavanje, ali "
-#~ "možda će biti potrebno da ih izmenite."
-
-#~ msgid "You can specify more options to configure the account."
-#~ msgstr "Možete da navedete još opcija za podešavanje naloga."
-
-#~ msgid ""
-#~ "Now we need your settings for sending mail. We've tried to make some "
-#~ "guesses but you should check them over to make sure."
-#~ msgstr ""
-#~ "Sada su nam potrebne postavke za slanje pošte. Pokušali smo da pogodimo "
-#~ "postavke, ali je potrebno da ih proverite."
-
-#~ msgid "You can specify your default settings for your account."
-#~ msgstr "Možete odrediti podrazumevane postavke naloga."
-
-#~ msgid ""
-#~ "Time to check things over before we try and connect to the server and "
-#~ "fetch your mail."
-#~ msgstr ""
-#~ "Vreme je da proverimo postavke pre nego što pokušamo da se povežemo na "
-#~ "server da bismo dobavili vašu poštu."
-
-#~ msgid "Next - Receiving mail"
-#~ msgstr "Napred — Primanje pošte"
-
-#~ msgid "Receiving mail"
-#~ msgstr "Primanje pošte"
-
-#~ msgid "Next - Sending mail"
-#~ msgstr "Napred — Slanje pošte"
-
-#~ msgid "Back - Identity"
-#~ msgstr "Nazad — Identitet"
-
-#~ msgid "Next - Receiving options"
-#~ msgstr "Napred — Opcije za primanje"
-
-#~ msgid "Receiving options"
-#~ msgstr "Opcije za primanje"
-
-#~ msgid "Back - Receiving mail"
-#~ msgstr "Nazad — Primanje pošte"
-
-#~ msgid "Sending mail"
-#~ msgstr "Slanje pošte"
-
-#~ msgid "Next - Review account"
-#~ msgstr "Napred — Pregled postavki naloga"
-
-#~ msgid "Next - Defaults"
-#~ msgstr "Napred — Podrazumevano"
-
-#~ msgid "Back - Receiving options"
-#~ msgstr "Nazad — Opcije za primanje"
-
-#~ msgid "Back - Sending mail"
-#~ msgstr "Nazad — Slanje pošte"
-
-#~ msgid "Review account"
-#~ msgstr "Pregled postavki naloga"
-
-#~ msgid "Finish"
-#~ msgstr "Završetak"
-
-#~ msgid "Back - Sending"
-#~ msgstr "Nazad — Slanje"
-
-#~ msgid "Setup Google contacts with Evolution"
-#~ msgstr "Podesite Gugl kontakte sa Evolucijom"
-
-#~ msgid "Setup Google calendar with Evolution"
-#~ msgstr "Podesite Gugl kalendar sa Evolucijom"
-
-#~ msgid "You may need to enable IMAP access."
-#~ msgstr "Možda ćete morati da omogućite IMAP pristup."
-
-#~ msgid "Google account settings:"
-#~ msgstr "Podešavanja Gugl naloga:"
-
-#~ msgid "Setup Yahoo calendar with Evolution"
-#~ msgstr "Podesite Jahu kalendar sa Evolucijom"
-
-#~ msgid ""
-#~ "Yahoo calendars are named as firstname_lastname. We have tried to form "
-#~ "the calendar name. So please confirm and re-enter the calendar name if it "
-#~ "is not correct."
-#~ msgstr ""
-#~ "Jahu kalendarima se dodeljuju imena oblika „ime_prezime“. Pokušali smo da "
-#~ "formiramo ime kalendara. Potvrdite ili unesite drugo ukoliko predloženo "
-#~ "nije ispravno."
-
-#~ msgid "Yahoo account settings:"
-#~ msgstr "Podešavanja Jahu naloga:"
-
-#~ msgid "Yahoo Calendar name:"
-#~ msgstr "Naziv Jahu kalendara:"
-
-#~ msgid "Password:"
-#~ msgstr "Lozinka:"
-
-#~ msgid "Close Tab"
-#~ msgstr "Zatvori jezičak"
-
-#~ msgid "Account Wizard"
-#~ msgstr "Čarobnjak naloga"
-
-#~ msgid "Evolution account assistant"
-#~ msgstr "Pomoćnik naloga Evolucije"
-
-#~ msgid "Modify %s..."
-#~ msgstr "Izmeni %s..."
-
-#~ msgid "Add a new account"
-#~ msgstr "Dodajte novi nalog"
-
-#~ msgid "Account management"
-#~ msgstr "Upravljanje nalozima"
-
-#~ msgid "Settings"
-#~ msgstr "Podešavanja"
-
-#~ msgid "Cannot get transport for account '%s'"
-#~ msgstr "Ne mogu da dobijem prenos za nalog „%s“"
-
-#~ msgid "Some features may not work properly with your current server"
-#~ msgstr "Neke opcije neće ispravno raditi na vašem trenutnom serveru"
-
-#~ msgid ""
-#~ "You are connecting to an unsupported GroupWise server and may encounter "
-#~ "problems using Evolution. For best results the server should be upgraded "
-#~ "to a supported version"
-#~ msgstr ""
-#~ "Povezujete se na nepodržan GroupVajz server što može da dovede do "
-#~ "problema u radu Evolucije. Najbolje je da server bude nadograđen na "
-#~ "podržanu verziju."
-
-#~ msgid "GroupWise Address book creation:"
-#~ msgstr "Stvaranje GroupVajz adresara:"
-
-#~ msgid ""
-#~ "Currently you can only access the GroupWise System Address Book from "
-#~ "Evolution. Please use some other GroupWise mail client once to get your "
-#~ "GroupWise Frequent Contacts and Groupwise Personal Contacts folders."
-#~ msgstr ""
-#~ "Trenutno iz Evolucije možete pristupiti samo sistemskom adresaru "
-#~ "GroupVajza. Koristite neki drugi GroupVajz klijent za elektronsku poštu "
-#~ "da dobavite česte kontakte i fascikle sa ličnim kontaktima GroupVajza."
-
-#~ msgid "Some features may not work properly with your current server."
-#~ msgstr ""
-#~ "Na tekućoj verziji servera neke mogućnosti možda neće ispravno raditi."
-
-#~ msgid ""
-#~ "You are connecting to an unsupported GroupWise server and may encounter "
-#~ "problems using Evolution. For best results, the server should be upgraded "
-#~ "to a supported version."
-#~ msgstr ""
-#~ "Povezujete se na nepodržan GroupVajz server što može da dovede do "
-#~ "problema u radu Evolucije. Najbolje je da server bude nadograđen na "
-#~ "podržanu verziju."
-
-#~ msgid "Undo the last action"
-#~ msgstr "Opoziva poslednju radnju"
-
-#~ msgid "Redo the last undone action"
-#~ msgstr "Ponovo vrši opozvanu radnju"
-
-#~ msgid "Search for text"
-#~ msgstr "Pretražuje tekst"
-
-#~ msgid "Search for and replace text"
-#~ msgstr "Pretražuje i zamenjuje tekst"
-
-#~ msgid "Unable to connect to the GroupWise server."
-#~ msgstr "Nisam uspeo da se povežem na GroupVajz server."
-
-#~ msgid "Please check your account settings and try again."
-#~ msgstr "Proverite podešavanja naloga i pokušajte ponovo."
author	Мирослав Николић <miroslavnikolic@rocketmail.com>	2013-01-26 16:15:01 +0800
committer	Мирослав Николић <miroslavnikolic@rocketmail.com>	2013-01-26 16:15:01 +0800
commit	8da8f425c2aff866a1b31dc68bfaf33330cea29c (patch)
tree	889510233e7a8da32307db0afb640345ab92b590 /po
parent	3fa4dfc54dd08d75076d4881207bdc45c3ee29ee (diff)
download	gsoc2013-evolution-8da8f425c2aff866a1b31dc68bfaf33330cea29c.tar gsoc2013-evolution-8da8f425c2aff866a1b31dc68bfaf33330cea29c.tar.gz gsoc2013-evolution-8da8f425c2aff866a1b31dc68bfaf33330cea29c.tar.bz2 gsoc2013-evolution-8da8f425c2aff866a1b31dc68bfaf33330cea29c.tar.lz gsoc2013-evolution-8da8f425c2aff866a1b31dc68bfaf33330cea29c.tar.xz gsoc2013-evolution-8da8f425c2aff866a1b31dc68bfaf33330cea29c.tar.zst gsoc2013-evolution-8da8f425c2aff866a1b31dc68bfaf33330cea29c.zip