Updated Serbian translation

author: Мирослав Николић <miroslavnikolic@rocketmail.com> 2014-03-18 05:19:53 +0800
committer: Мирослав Николић <miroslavnikolic@rocketmail.com> 2014-03-18 05:19:53 +0800
commit: 3ab4126820c4521fa07bbdeb0489a1b3fb20f9de (patch)
tree: bc260a78617fb43d3c3fcf79817425b5442e32fa /po
parent: 28bed602297d0c62a7012f6707caa74ba3b301d9 (diff)
download: gsoc2013-evolution-3ab4126820c4521fa07bbdeb0489a1b3fb20f9de.tar
gsoc2013-evolution-3ab4126820c4521fa07bbdeb0489a1b3fb20f9de.tar.gz
gsoc2013-evolution-3ab4126820c4521fa07bbdeb0489a1b3fb20f9de.tar.bz2
gsoc2013-evolution-3ab4126820c4521fa07bbdeb0489a1b3fb20f9de.tar.lz
gsoc2013-evolution-3ab4126820c4521fa07bbdeb0489a1b3fb20f9de.tar.xz
gsoc2013-evolution-3ab4126820c4521fa07bbdeb0489a1b3fb20f9de.tar.zst
gsoc2013-evolution-3ab4126820c4521fa07bbdeb0489a1b3fb20f9de.zip
2 files changed, 9534 insertions, 8472 deletions
diff --git a/po/sr.po b/po/sr.po
index a1bf534de6..bc09b8cec3 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -4,17 +4,17 @@
 # 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, 2013.
-#: ../shell/main.c:557
+# Мирослав Николић <miroslavnikolic@rocketmail.com>, 2011—2014.
+#: ../shell/main.c:554
 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: 2013-11-17 00:25+0000\n"
-"PO-Revision-Date: 2013-11-30 10:04+0200\n"
+"POT-Creation-Date: 2014-03-16 05:28+0000\n"
+"PO-Revision-Date: 2014-03-16 11:14+0200\n"
 "Last-Translator: Мирослав Николић <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"Language-Team: Serbian <gnom@prevod.org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -116,8 +116,9 @@ msgid "Category editor not available."
 msgstr "Уређивач категорија није доступан."
 
 #: ../addressbook/addressbook.error.xml.h:18
-msgid "Unable to open address book"
-msgstr "Не могу да отворим адресар"
+#| msgid "Unable to open address book"
+msgid "Unable to open address book '{0}'"
+msgstr "Не могу да отворим адресар „{0}“"
 
 #: ../addressbook/addressbook.error.xml.h:19
 msgid "Unable to perform search."
@@ -189,7 +190,21 @@ msgstr ""
 "истом адресом?"
 
 #: ../addressbook/addressbook.error.xml.h:33
-#: ../e-util/e-name-selector-dialog.c:997 ../mail/em-vfolder-editor-rule.c:397
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
+#: ../addressbook/gui/widgets/eab-contact-merging.c:626
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:19
+#: ../calendar/gui/dialogs/task-page.ui.h:30 ../e-util/filter.ui.h:16
+#: ../e-util/e-mail-signature-manager.c:327
+#: ../e-util/e-name-selector-dialog.c:995 ../mail/e-mail-account-manager.c:719
+#: ../mail/e-mail-label-manager.c:373 ../mail/em-vfolder-editor-rule.c:392
+#: ../mail/em-vfolder-editor-rule.c:622 ../mail/mail-config.ui.h:51
+#: ../modules/mail/em-composer-prefs.c:443
+#: ../plugins/attachment-reminder/attachment-reminder.c:557
+#: ../plugins/email-custom-header/email-custom-header.c:838
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
+#: ../plugins/templates/templates.c:453
 msgid "_Add"
 msgstr "_Додај"
 
@@ -226,7 +241,7 @@ msgstr ""
 "желите да га додате?"
 
 #: ../addressbook/addressbook.error.xml.h:40
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1251
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1250
 msgid "Failed to delete contact"
 msgstr "Нисам успео да обришем контакт"
 
@@ -247,10 +262,23 @@ msgstr ""
 "Адресар „{0}“ је само за читање и није подложан изменама. Изаберите други "
 "адресар са бочне траке у прегледу Контакти."
 
+#: ../addressbook/addressbook.error.xml.h:45
+msgid "Cannot save a contact, address book is still opening"
+msgstr "Не могу да сачувам контакт, адресар се још увек отвара"
+
+#. For Translators: {0} is the name of the address book source
+#: ../addressbook/addressbook.error.xml.h:47
+msgid ""
+"Cannot save a contact to the address book '{0}', because it is still "
+"opening. Either wait till it's opened, or select a different address book."
+msgstr ""
+"Не могу да сачувам контакт у адресар „{0}“, јер се још увек отвара. Или "
+"сачекајте док се не отвори, или изаберите неки други адресар."
+
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:650
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:672
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2958
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:734
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:756
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3037
 msgid "Contact Editor"
 msgstr "Уређивач за контакте"
 
@@ -287,11 +315,10 @@ msgid "_Wants to receive HTML mail"
 msgstr "_Жели да прима ХТМЛ пошту"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:409
+#: ../addressbook/gui/widgets/eab-contact-merging.c:408
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:590
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:942
-#: ../smime/lib/e-asn1-object.c:395
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:980
 msgid "Email"
 msgstr "Ел. пошта"
 
@@ -304,7 +331,7 @@ msgid "Instant Messaging"
 msgstr "Тренутне поруке"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/importers/evolution-vcard-importer.c:1003
+#: ../addressbook/importers/evolution-vcard-importer.c:971
 msgid "Contact"
 msgstr "Контакт"
 
@@ -314,8 +341,8 @@ msgstr "_Лична страна:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 #: ../calendar/gui/dialogs/event-page.c:709
-#: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../modules/itip-formatter/itip-view.c:1889
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+#: ../modules/itip-formatter/itip-view.c:1891
 msgid "_Calendar:"
 msgstr "_Календар:"
 
@@ -332,7 +359,7 @@ msgid "Home Page:"
 msgstr "Матична страна:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../modules/cal-config-google/evolution-cal-config-google.c:97
+#: ../modules/cal-config-google/evolution-cal-config-google.c:96
 msgid "Calendar:"
 msgstr "Календар:"
 
@@ -379,21 +406,21 @@ msgid "_Department:"
 msgstr "_Одељење:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+msgid "_Office:"
+msgstr "_Канцеларија:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_Manager:"
 msgstr "_Руководилац:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 msgid "_Assistant:"
 msgstr "_Помоћник:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "Job"
 msgstr "Посао"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-msgid "_Office:"
-msgstr "_Канцеларија:"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Spouse:"
 msgstr "С_упружник:"
@@ -407,8 +434,8 @@ msgid "_Anniversary:"
 msgstr "_Годишњица:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:685
-#: ../calendar/gui/e-calendar-view.c:2278
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:692
+#: ../calendar/gui/e-calendar-view.c:2288
 msgid "Anniversary"
 msgstr "Годишњица"
 
@@ -418,8 +445,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:684
-#: ../calendar/gui/e-calendar-view.c:2277 ../shell/main.c:128
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:691
+#: ../calendar/gui/e-calendar-view.c:2287 ../shell/main.c:127
 msgid "Birthday"
 msgstr "Рођендан"
 
@@ -456,27 +483,28 @@ msgid "_Address:"
 msgstr "_Адреса:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/e-contact-map.c:372
-#: ../addressbook/gui/widgets/eab-contact-display.c:357
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/widgets/e-contact-map.c:371
+#: ../addressbook/gui/widgets/eab-contact-display.c:356
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:80
 msgid "Home"
 msgstr "Кућа"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/e-contact-map.c:385
-#: ../addressbook/gui/widgets/eab-contact-display.c:354
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:80
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/widgets/e-contact-map.c:384
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:79
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:673
 msgid "Work"
 msgstr "Посао"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:82
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:368
-#: ../calendar/gui/e-cal-model.c:3963
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:367
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:726
+#: ../calendar/gui/e-cal-model.c:3957
 msgid "Other"
 msgstr "Друго"
 
@@ -488,79 +516,170 @@ msgstr "Адреса становања"
 msgid "Notes"
 msgstr "Напомене"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:593
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:52
+#: ../calendar/gui/dialogs/comp-editor.c:1250
+#: ../calendar/gui/dialogs/comp-editor.c:1336 ../e-util/e-send-options.ui.h:41
+#: ../e-util/e-preferences-window.c:379
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
+#: ../shell/e-shell-window-actions.c:1086
+msgid "_Help"
+msgstr "По_моћ"
+
+#. This is only shown if the EActivity has a GCancellable.
+#. no flags
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3575
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:223
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
+#: ../addressbook/gui/widgets/eab-contact-merging.c:362
+#: ../addressbook/gui/widgets/eab-contact-merging.c:621
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+#: ../addressbook/gui/widgets/eab-gui-util.c:318
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:15
+#: ../calendar/gui/dialogs/recurrence-page.c:2322
+#: ../composer/e-composer-actions.c:204 ../e-util/e-send-options.ui.h:42
+#: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
+#: ../e-util/e-activity-bar.c:299 ../e-util/e-attachment-dialog.c:311
+#: ../e-util/e-attachment-store.c:464 ../e-util/e-attachment-store.c:545
+#: ../e-util/e-attachment-view.c:370 ../e-util/e-categories-dialog.c:82
+#: ../e-util/e-category-editor.c:138 ../e-util/e-category-editor.c:208
+#: ../e-util/e-charset-combo-box.c:101 ../e-util/e-filter-datespec.c:291
+#: ../e-util/e-mail-signature-script-dialog.c:366 ../e-util/e-passwords.c:468
+#: ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180
+#: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:776
+#: ../e-util/e-source-config-dialog.c:375
+#: ../e-util/e-source-selector-dialog.c:348 ../e-util/e-table-config.c:548
+#: ../e-util/e-web-view.c:3092 ../e-util/evolution-source-viewer.c:832
+#: ../e-util/gal-view-instance-save-as-dialog.c:269
+#: ../mail/e-mail-config-window.c:331 ../mail/e-mail-label-dialog.c:196
+#: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:278
+#: ../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:635
+#: ../mail/mail-send-recv.c:717 ../mail/mail-vfolder-ui.c:148
+#: ../mail/mail-vfolder-ui.c:270
+#: ../modules/backup-restore/evolution-backup-tool.c:949
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:278
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:188
+#: ../modules/calendar/e-cal-attachment-handler.c:317
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
+#: ../plugins/face/face.c:291 ../plugins/mail-to-task/mail-to-task.c:593
+#: ../plugins/publish-calendar/publish-calendar.c:806
+#: ../plugins/publish-calendar/url-editor-dialog.c:421
+#: ../plugins/save-calendar/save-calendar.c:189 ../shell/e-shell-content.c:659
+#: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:70
+#: ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:623
+#: ../smime/gui/e-cert-selector.c:232 ../smime/gui/smime-ui.ui.h:23
+#| msgid "Cancel"
+msgid "_Cancel"
+msgstr "_Откажи"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
+#: ../addressbook/gui/widgets/eab-contact-merging.c:624
+#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/gui/dialogs/comp-editor.c:1278
+#: ../composer/e-composer-actions.c:205 ../composer/e-composer-actions.c:296
+#: ../e-util/e-attachment-store.c:546
+#: ../e-util/e-mail-signature-script-dialog.c:370 ../e-util/e-web-view.c:3093
+#: ../e-util/gal-view-instance-save-as-dialog.c:270
+#: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:135
+msgid "_Save"
+msgstr "_Сачувај"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:599
 msgid "AIM"
 msgstr "АИМ"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:602
 msgid "Jabber"
 msgstr "Џабер"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:604
 msgid "Yahoo"
 msgstr "Јаху"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:599
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:605
 msgid "Gadu-Gadu"
 msgstr "Гаду-Гаду"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:597
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:603
 msgid "MSN"
 msgstr "МСН"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:595
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:601
 msgid "ICQ"
 msgstr "ИЦКу"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:594
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
 msgid "GroupWise"
 msgstr "ГроупВајз"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:606
 msgid "Skype"
 msgstr "Скајп"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:601
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:607
 msgid "Twitter"
 msgstr "Твитер"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
+#: ../calendar/gui/dialogs/comp-editor.c:1301 ../e-util/e-focus-tracker.c:121
+msgid "Undo"
+msgstr "Опозови"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:278
+#: ../calendar/gui/dialogs/comp-editor.c:1308 ../e-util/e-focus-tracker.c:137
+msgid "Redo"
+msgstr "Врати"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
 #: ../addressbook/gui/widgets/eab-gui-util.c:503
 msgid "Error adding contact"
 msgstr "Грешка при додавању контакта"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:330
 msgid "Error modifying contact"
 msgstr "Грешка при измени контакта"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:350
 msgid "Error removing contact"
 msgstr "Грешка при уклањању контакта"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:666
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2952
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:750
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3031
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Уређивач за контакте — %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3485
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3572
 msgid "Please select an image for this contact"
 msgstr "Изаберите слику за овај контакт"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3486
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3576
+#: ../e-util/e-category-editor.c:146 ../plugins/face/face.c:292
+#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:624
+#| msgid "Open"
+msgid "_Open"
+msgstr "_Отвори"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3577
 msgid "_No image"
 msgstr "_Без слике"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3827
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3926
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -568,48 +687,77 @@ msgstr ""
 "Подаци о контакту нису исправни:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3833
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3932
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "„%s“ има неисправан формат"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3841
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3940
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "„%s“ не може бити будући датум"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3849
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3948
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s„%s“ има неисправан формат"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3862
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3876
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3961
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3975
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s„%s“ је празан"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3990
 msgid "Invalid contact."
 msgstr "Неисправан контакт."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:224
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:456
+#: ../addressbook/gui/contact-editor/fullname.ui.h:13
+#: ../addressbook/gui/widgets/eab-gui-util.c:319
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
+#: ../calendar/gui/dialogs/recurrence-page.c:2323
+#: ../e-util/e-send-options.ui.h:43 ../e-util/e-table-config.ui.h:3
+#: ../e-util/e-timezone-dialog.ui.h:3 ../e-util/e-attachment-dialog.c:313
+#: ../e-util/e-categories-dialog.c:83 ../e-util/e-category-editor.c:209
+#: ../e-util/e-charset-combo-box.c:102 ../e-util/e-filter-datespec.c:292
+#: ../e-util/e-passwords.c:469 ../e-util/e-rule-context.c:816
+#: ../e-util/e-rule-editor.c:181 ../e-util/e-rule-editor.c:283
+#: ../e-util/e-rule-editor.c:777 ../e-util/e-source-config-dialog.c:376
+#: ../e-util/e-source-selector-dialog.c:349 ../e-util/e-table-config.c:549
+#: ../mail/e-mail-config-window.c:332 ../mail/e-mail-tag-editor.c:243
+#: ../mail/em-folder-selector.c:279 ../mail/mail-config.ui.h:3
+#: ../mail/mail-dialogs.ui.h:26 ../mail/mail-vfolder-ui.c:149
+#: ../mail/mail-vfolder-ui.c:271
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
+#: ../plugins/publish-calendar/url-editor-dialog.c:422
+#: ../shell/e-shell-content.c:661 ../shell/e-shell-content.c:767
+#: ../shell/main.c:167 ../smime/gui/e-cert-selector.c:233
+#: ../smime/gui/smime-ui.ui.h:24
+#| msgid "OK"
+msgid "_OK"
+msgstr "У _реду"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:451
 msgid "Contact Quick-Add"
 msgstr "Брзо додавање контакта"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:454
 msgid "_Edit Full"
 msgstr "_Уреди потпуно"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:508
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:507
 msgid "_Full name"
 msgstr "_Име и презиме"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:521
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:520
 msgid "E_mail"
 msgstr "Е-_пошта"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:534
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:533
 msgid "_Select Address Book"
 msgstr "_Изабери адресар"
 
@@ -662,29 +810,29 @@ msgstr "Пош."
 msgid "Full Name"
 msgstr "Име и презиме"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:13
+#: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_First:"
 msgstr "_Име:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+#: ../addressbook/gui/contact-editor/fullname.ui.h:16
 msgctxt "FullName"
 msgid "_Title:"
 msgstr "_Звање:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:15
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Middle:"
 msgstr "_Средње:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:16
+#: ../addressbook/gui/contact-editor/fullname.ui.h:18
 msgid "_Last:"
 msgstr "_Презиме:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:17
+#: ../addressbook/gui/contact-editor/fullname.ui.h:19
 msgid "_Suffix:"
 msgstr "_Суфикс:"
 
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:1
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:818
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:817
 msgid "Contact List Editor"
 msgstr "Уређивач контакт листе"
 
@@ -708,115 +856,159 @@ msgstr "_Сакриј адресе када шаљеш пошту на овна
 msgid "Add an email to the List"
 msgstr "Додајте ел. пошту на списак"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
 msgid "Remove an email address from the List"
 msgstr "Уклоните адресу ел. поште са списка"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:23
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:21
+#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/filter.ui.h:18
+#: ../e-util/e-attachment-view.c:424 ../e-util/e-filter-rule.c:224
+#: ../e-util/e-mail-signature-manager.c:367
+#: ../e-util/e-name-selector-dialog.c:999 ../mail/e-mail-label-manager.c:391
+#: ../mail/em-filter-rule.c:440 ../mail/em-vfolder-editor-rule.c:627
+#: ../mail/mail-config.ui.h:52
+#: ../plugins/attachment-reminder/attachment-reminder.c:567
+#: ../plugins/email-custom-header/email-custom-header.c:848
+#: ../plugins/publish-calendar/publish-calendar.c:807
+#: ../plugins/publish-calendar/publish-calendar.ui.h:34
+#: ../plugins/templates/templates.c:463
+msgid "_Remove"
+msgstr "_Уклони"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
 msgid "Insert email addresses from Address Book"
 msgstr "Уметните адресе ел. поште из адресара"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:12
 msgid "_Select..."
 msgstr "_Изабери..."
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:941
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:13
+#: ../e-util/filter.ui.h:19
+msgid "_Top"
+msgstr "_Врх"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:14
+#: ../e-util/filter.ui.h:20
+#| msgid "_Update"
+msgid "_Up"
+msgstr "_Горе"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
+#: ../e-util/filter.ui.h:21
+msgid "_Down"
+msgstr "До_ле"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
+#: ../e-util/filter.ui.h:22
+msgid "_Bottom"
+msgstr "Д_но"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:942
 msgid "Contact List Members"
 msgstr "Чланови контакт листе"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1475
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1486
 msgid "_Members"
 msgstr "_Чланови"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1597
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1626
 msgid "Error adding list"
 msgstr "Грешка при додавању листе"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1617
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1646
 msgid "Error modifying list"
 msgstr "Грешка при измени листе"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1637
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1666
 msgid "Error removing list"
 msgstr "Грешка при уклањању листе"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
+#: ../addressbook/gui/widgets/eab-contact-merging.c:243
+#: ../calendar/gui/tasktypes.xml.h:14
+msgid "Cancelled"
+msgstr "Отказано"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:345
+msgid "Merge Contact"
+msgstr "Припоји контакт"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:363
+#: ../addressbook/gui/widgets/eab-contact-merging.c:627
+msgid "_Merge"
+msgstr "_Стопи"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:616
 msgid "Duplicate Contact Detected"
 msgstr "Откривен дупли контакт"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
+#: ../addressbook/gui/widgets/eab-contact-merging.c:674
+#| msgid ""
+#| "The name or email of this contact already exists in this folder. Would "
+#| "you like to save the changes anyway?"
 msgid ""
-"The name or email of this contact already exists in this folder. Would you "
-"like to save the changes anyway?"
+"The name or email address of this contact already exists\n"
+"in this folder. Would you like to save the changes anyway?"
 msgstr ""
-"Назив или ел. пошта овог контакта већ постоји у овој фасцикли. Да ли желите "
-"ипак да га додате?"
+"Назив или адреса ел. поште овог контакта већ постоји у\n"
+"овој фасцикли. Да ли ипак желите да сачувате измене?"
 
-#. Translators: Heading of the contact which has same name or email address in this folder already.
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
-msgid "Conflicting Contact:"
-msgstr "Споран контакт:"
-
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
-msgid "Changed Contact:"
-msgstr "Измењен контакт:"
-
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
-#: ../addressbook/gui/merging/eab-contact-merging.c:364
-msgid "_Merge"
-msgstr "_Стопи"
-
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
+#: ../addressbook/gui/widgets/eab-contact-merging.c:677
+#| msgid ""
+#| "The name or email address of this contact already exists\n"
+#| "in this folder.  Would you like to add it anyway?"
 msgid ""
 "The name or email address of this contact already exists\n"
-"in this folder.  Would you like to add it anyway?"
+"in this folder. Would you like to add it anyway?"
 msgstr ""
-"Назив или електронска адреса овог контакта већ постоји\n"
-"у овој фасцикли. Да ли желите ипак да  га додате?"
+"Назив или адреса ел. поште овог контакта већ постоји\n"
+"у овој фасцикли. Да ли ипак желите да га додате?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:5
-msgid "Original Contact:"
-msgstr "Оригиналан контакт:"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:692
+msgid "Changed Contact:"
+msgstr "Измењен контакт:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
+#: ../addressbook/gui/widgets/eab-contact-merging.c:694
 msgid "New Contact:"
 msgstr "Нови контакт:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:244
-#: ../calendar/gui/tasktypes.xml.h:14
-msgid "Cancelled"
-msgstr "Отказано"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:733
+msgid "Conflicting Contact:"
+msgstr "Споран контакт:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:346
-msgid "Merge Contact"
-msgstr "Припоји контакт"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:735
+#| msgid "Contact: "
+msgid "Old Contact:"
+msgstr "Стари контакт: "
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1151
+#: ../modules/addressbook/e-book-shell-view-actions.c:1150
 msgid "Name contains"
 msgstr "Назив садржи"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1144
+#: ../modules/addressbook/e-book-shell-view-actions.c:1143
 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:1137
-#: ../modules/calendar/e-cal-shell-view-actions.c:1771
-#: ../modules/calendar/e-memo-shell-view-actions.c:791
-#: ../modules/calendar/e-task-shell-view-actions.c:990
+#: ../modules/addressbook/e-book-shell-view-actions.c:1136
+#: ../modules/calendar/e-cal-shell-view-actions.c:1770
+#: ../modules/calendar/e-memo-shell-view-actions.c:790
+#: ../modules/calendar/e-task-shell-view-actions.c:989
 msgid "Any field contains"
 msgstr "Поље које садржи"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
 msgstr "Нема контакта"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:167
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
@@ -825,67 +1017,81 @@ msgstr[1] "%d контакта"
 msgstr[2] "%d контаката"
 msgstr[3] "један контакт"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:373
+#: ../addressbook/gui/widgets/e-addressbook-model.c:372
 msgid "Error getting book view"
 msgstr "Грешка при учитавању прегледа књиге"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:820
+#: ../addressbook/gui/widgets/e-addressbook-model.c:819
 msgid "Search Interrupted"
 msgstr "Претрага је прекинута"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:204
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:203
 msgid "Error modifying card"
 msgstr "Грешка при измени карте"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:649
+#: ../addressbook/gui/widgets/e-addressbook-view.c:648
 msgid "Cut selected contacts to the clipboard"
 msgstr "Сече означене контакте у списак исечака"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:655
+#: ../addressbook/gui/widgets/e-addressbook-view.c:654
 msgid "Copy selected contacts to the clipboard"
 msgstr "Умножава означене контакте у списак исечака"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:661
+#: ../addressbook/gui/widgets/e-addressbook-view.c:660
 msgid "Paste contacts from the clipboard"
 msgstr "Убацује контакте из списка исечака"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:667
-#: ../modules/addressbook/e-book-shell-view-actions.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:666
+#: ../modules/addressbook/e-book-shell-view-actions.c:950
 msgid "Delete selected contacts"
 msgstr "Брише изабране контакте"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:673
+#: ../addressbook/gui/widgets/e-addressbook-view.c:672
 msgid "Select all visible contacts"
 msgstr "Означава све видљиве контакте"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
 msgid "Are you sure you want to delete these contact lists?"
 msgstr "Сигурно желите да обришете ове листе контакта?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1303
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
 msgid "Are you sure you want to delete this contact list?"
 msgstr "Сигурно желите да обришете овај списак контакта?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1307
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Сигурно желите да обришете овај списак контакта (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
 msgid "Are you sure you want to delete these contacts?"
 msgstr "Сигурно желите да обришете ове контакте?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1317
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
 msgid "Are you sure you want to delete this contact?"
 msgstr "Сигурно желите да обришете овај контакт?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1321
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Сигурно желите да обришете овај контакт (%s)?"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1331
+#: ../calendar/gui/dialogs/comp-editor.c:1243
+#: ../e-util/e-categories-editor.c:282 ../e-util/e-focus-tracker.c:740
+#: ../e-util/evolution-source-viewer.c:803
+#: ../mail/e-mail-account-manager.c:737
+#: ../modules/addressbook/e-book-shell-view-actions.c:1022
+#: ../modules/calendar/e-cal-shell-view-actions.c:1593
+#: ../modules/calendar/e-memo-shell-view-actions.c:692
+#: ../modules/calendar/e-task-shell-view-actions.c:844
+#: ../modules/mail/e-mail-shell-view-actions.c:1561
+#: ../shell/e-shell-window-actions.c:944 ../smime/gui/smime-ui.ui.h:10
+msgid "_Delete"
+msgstr "_Обриши"
+
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1476
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -906,11 +1112,11 @@ msgstr[3] ""
 "Отварање једног контакта ће такође отворити један нови прозор.\n"
 "Да ли заиста желите да прикажете све ове контакте?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
 msgid "_Don't Display"
 msgstr "_Не приказуј"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1486
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
 msgid "Display _All Contacts"
 msgstr "Прикажи _све контакте"
 
@@ -927,7 +1133,7 @@ msgid "Family Name"
 msgstr "Презиме"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:592
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
 msgid "Nickname"
 msgstr "Надимак"
 
@@ -984,7 +1190,7 @@ msgid "ISDN Phone"
 msgstr "ИСДН телефон"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:682
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:689
 msgid "Mobile Phone"
 msgstr "Мобилни телефон"
 
@@ -1023,7 +1229,7 @@ msgid "TTYTDD"
 msgstr "ТТУТДД"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:645
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
 msgid "Company"
 msgstr "Предузеће"
 
@@ -1032,6 +1238,7 @@ msgid "Unit"
 msgstr "Јединица"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
 msgid "Office"
 msgstr "Канцеларија"
 
@@ -1046,12 +1253,12 @@ msgid "Role"
 msgstr "Улога"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:649
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
 msgid "Manager"
 msgstr "Руководилац"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:650
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:657
 msgid "Assistant"
 msgstr "Помоћник"
 
@@ -1067,25 +1274,44 @@ 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 ../e-util/e-categories-dialog.c:89
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../e-util/e-categories-dialog.c:87
 msgid "Categories"
 msgstr "Категорије"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:693
 msgid "Spouse"
 msgstr "Супружник"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:718
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:748
 msgid "Note"
 msgstr "Напомена"
 
-#: ../addressbook/gui/widgets/e-contact-map-window.c:374
+#: ../addressbook/gui/widgets/e-contact-map-window.c:375
 msgid "Contacts Map"
 msgstr "Карта контаката"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#. Zoom-in button
+#: ../addressbook/gui/widgets/e-contact-map-window.c:410
+#| msgid "_Zoom In"
+msgid "Zoom _In"
+msgstr "У_већај"
+
+#. Zoom-out button
+#: ../addressbook/gui/widgets/e-contact-map-window.c:418
+#: ../mail/e-mail-reader.c:2226
+msgid "Zoom _Out"
+msgstr "У_мањи"
+
+#. Search button
+#: ../addressbook/gui/widgets/e-contact-map-window.c:448
+#: ../shell/e-shell-window-actions.c:1021
+#| msgid "_Find Now"
+msgid "_Find"
+msgstr "_Нађи"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -1095,7 +1321,7 @@ msgstr ""
 "\n"
 "Тражим контакте..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:194
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1109,7 +1335,7 @@ msgstr ""
 "\n"
 "или кликните двапут овде да направите нови контакт."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:197
+#: ../addressbook/gui/widgets/e-minicard-view.c:196
 msgid ""
 "\n"
 "\n"
@@ -1123,7 +1349,7 @@ msgstr ""
 "\n"
 "Кликните двапут да направите нов контакт."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:201
+#: ../addressbook/gui/widgets/e-minicard-view.c:200
 msgid ""
 "\n"
 "\n"
@@ -1133,7 +1359,7 @@ msgstr ""
 "\n"
 "Претрага за контактима."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:203
+#: ../addressbook/gui/widgets/e-minicard-view.c:202
 msgid ""
 "\n"
 "\n"
@@ -1143,16 +1369,16 @@ msgstr ""
 "\n"
 "Нема ставки за приказивање."
 
-#: ../addressbook/gui/widgets/e-minicard.c:93
+#: ../addressbook/gui/widgets/e-minicard.c:92
 msgid "Work Email"
 msgstr "Пословна ел. пошта"
 
-#: ../addressbook/gui/widgets/e-minicard.c:94
+#: ../addressbook/gui/widgets/e-minicard.c:93
 msgid "Home Email"
 msgstr "Кућна ел. пошта"
 
-#: ../addressbook/gui/widgets/e-minicard.c:95
-#: ../addressbook/gui/widgets/e-minicard.c:828
+#: ../addressbook/gui/widgets/e-minicard.c:94
+#: ../addressbook/gui/widgets/e-minicard.c:827
 msgid "Other Email"
 msgstr "Друга ел. пошта"
 
@@ -1164,21 +1390,21 @@ msgstr "Друга ел. пошта"
 # 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
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:94
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:103
+#: ../addressbook/gui/widgets/ea-minicard-view.c:193
 msgid "evolution address book"
 msgstr "Адресар Еволуције"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+#: ../addressbook/gui/widgets/ea-minicard-view.c:35
 msgid "New Contact"
 msgstr "Нови контакт"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:37
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
 msgid "New Contact List"
 msgstr "Нова контакт листа"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:177
+#: ../addressbook/gui/widgets/ea-minicard-view.c:176
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -1187,133 +1413,134 @@ msgstr[1] "тренутна фасцикла адресара %s има %d ка�
 msgstr[2] "тренутна фасцикла адресара %s има %d карти"
 msgstr[3] "тренутна фасцикла адресара %s има једну карту"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:34
+#: ../addressbook/gui/widgets/ea-minicard.c:33
 msgid "Open"
 msgstr "Отвори"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:160
+#: ../addressbook/gui/widgets/ea-minicard.c:159
 msgid "Contact List: "
 msgstr "Списак контакта: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:161
+#: ../addressbook/gui/widgets/ea-minicard.c:160
 msgid "Contact: "
 msgstr "Контакт: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:188
+#: ../addressbook/gui/widgets/ea-minicard.c:187
 msgid "evolution minicard"
 msgstr "миникарта еволуције"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:150
+#: ../addressbook/gui/widgets/eab-contact-display.c:149
 msgid "Copy _Email Address"
 msgstr "Умножи електронску _адресу"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:152
-#: ../e-util/e-web-view-gtkhtml.c:428 ../e-util/e-web-view.c:307
+#: ../addressbook/gui/widgets/eab-contact-display.c:151
+#: ../e-util/e-web-view-gtkhtml.c:427 ../e-util/e-web-view.c:304
 msgid "Copy the email address to the clipboard"
 msgstr "Умножава адресе у списак исечака"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:157
-#: ../e-util/e-web-view-gtkhtml.c:433 ../e-util/e-web-view.c:312
+#: ../addressbook/gui/widgets/eab-contact-display.c:156
+#: ../e-util/e-web-view-gtkhtml.c:432 ../e-util/e-web-view.c:309
 msgid "_Send New Message To..."
 msgstr "_Пошаљи поруку за..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:159
-#: ../e-util/e-web-view-gtkhtml.c:435 ../e-util/e-web-view.c:314
+#: ../addressbook/gui/widgets/eab-contact-display.c:158
+#: ../e-util/e-web-view-gtkhtml.c:434 ../e-util/e-web-view.c:311
 msgid "Send a mail message to this address"
 msgstr "Шаље поруку на ову адресу"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:291
-#: ../e-util/e-web-view-gtkhtml.c:970 ../e-util/e-web-view.c:990
+#: ../addressbook/gui/widgets/eab-contact-display.c:290
+#: ../e-util/e-web-view-gtkhtml.c:969 ../e-util/e-web-view.c:992
 #, c-format
 msgid "Click to mail %s"
 msgstr "Кликните да пошаљете %s"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:137
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:136
 msgid "Open map"
 msgstr "Отворите мапу"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:529
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:535
 msgid "List Members:"
 msgstr "Чланови листе:"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:646
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
 msgid "Department"
 msgstr "Одељење"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:647
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
 msgid "Profession"
 msgstr "Занимање"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:648
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
 msgid "Position"
 msgstr "Положај"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:658
 msgid "Video Chat"
 msgstr "Видео разговор"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
-#: ../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:591
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:659
+#: ../e-util/e-send-options.c:545
+#: ../modules/calendar/e-cal-shell-view-actions.c:215
+#: ../modules/calendar/e-cal-shell-view-actions.c:244
+#: ../modules/calendar/e-cal-shell-view.c:590
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 msgid "Calendar"
 msgstr "Календар"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
-#: ../calendar/gui/dialogs/event-editor.c:116
-#: ../calendar/gui/dialogs/event-editor.c:343
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:660
+#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:342
 #: ../plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Слободно/заузето"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:661
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:688
 msgid "Phone"
 msgstr "Телефон"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:662
 msgid "Fax"
 msgstr "Факс"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:683
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:663
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:690
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:716
 msgid "Address"
 msgstr "Адреса"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:679
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
 msgid "Home Page"
 msgstr "Матична страница"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:680
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:687
 msgid "Web Log"
 msgstr "Веб лог"
 
 # Create the default Person calendar
 # Create the default Person task list
 # orange
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:696
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
 msgid "Personal"
 msgstr "Лично"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:906
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:944
 msgid "List Members"
 msgstr "Чланови листе"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:927
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:965
 msgid "Job Title"
 msgstr "Звање на послу"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:968
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1006
 msgid "Home page"
 msgstr "Матична страница"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:978
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1016
 msgid "Blog"
 msgstr "Блог"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:123
+#: ../addressbook/gui/widgets/eab-gui-util.c:121
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -1323,7 +1550,7 @@ msgstr ""
 "коришћење ван мреже или да још није преузет за рад ван мреже. Учитајте "
 "адресар када се повежете ради преузимања његовог садржаја."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:142
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1332,7 +1559,7 @@ msgstr ""
 "Не могу да отворим овај адресар.  Проверите да ли постоји путања %s и да ли "
 "имате права приступа."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:155
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1341,7 +1568,7 @@ msgstr ""
 "користите ЛДАП у Еволуцији, морате да инсталирате пакет Еволуције са "
 "подршком за ЛДАП."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1349,7 +1576,7 @@ msgstr ""
 "Не могу да отворим овај адресар.  То значи да сте или унели погрешну адресу, "
 "или је сервер недоступан."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:174
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 msgid "Detailed error message:"
 msgstr "Детаљи грешке:"
 
@@ -1425,108 +1652,108 @@ msgstr "Премести контакте у"
 msgid "Copy contacts to"
 msgstr "Умножи контакте у"
 
-#: ../addressbook/importers/evolution-csv-importer.c:747
-#: ../addressbook/importers/evolution-ldif-importer.c:549
-#: ../addressbook/importers/evolution-vcard-importer.c:281
-#: ../calendar/importers/icalendar-importer.c:440
-#: ../calendar/importers/icalendar-importer.c:935
-#: ../calendar/importers/icalendar-importer.c:974 ../shell/shell.error.xml.h:1
+#: ../addressbook/importers/evolution-csv-importer.c:746
+#: ../addressbook/importers/evolution-ldif-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:249
+#: ../calendar/importers/icalendar-importer.c:439
+#: ../calendar/importers/icalendar-importer.c:934
+#: ../calendar/importers/icalendar-importer.c:973 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Увозим..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1082
+#: ../addressbook/importers/evolution-csv-importer.c:1081
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Аутлук контакти ЦСВ или Таб (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1083
+#: ../addressbook/importers/evolution-csv-importer.c:1082
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Аутлуков увозник ЦСВ и Таб контаката"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1091
+#: ../addressbook/importers/evolution-csv-importer.c:1090
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Мозила контакти ЦСВ или Таб (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1092
+#: ../addressbook/importers/evolution-csv-importer.c:1091
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Мозилин увозник ЦСВ и Таб контаката"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1100
+#: ../addressbook/importers/evolution-csv-importer.c:1099
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Еволуција контакти ЦСВ или Таб (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1101
+#: ../addressbook/importers/evolution-csv-importer.c:1100
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Еволуцијин увозник ЦСВ и Таб контаката"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:807
+#: ../addressbook/importers/evolution-ldif-importer.c:806
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "ЛДАП облик размене података (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:808
+#: ../addressbook/importers/evolution-ldif-importer.c:807
 msgid "Evolution LDIF importer"
 msgstr "Еволуцијин ЛДИФ увозник"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:666
+#: ../addressbook/importers/evolution-vcard-importer.c:634
 msgid "vCard (.vcf, .gcrd)"
 msgstr "вКарта (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:667
+#: ../addressbook/importers/evolution-vcard-importer.c:635
 msgid "Evolution vCard Importer"
 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:764
+#: ../addressbook/printing/e-contact-print.c:763
 #, c-format
 msgid "Page %d"
 msgstr "%d. страница"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:58
 msgid "Specify the output file instead of standard output"
 msgstr "Наведите излазну датотеку уместо стандардног излаза"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "OUTPUTFILE"
 msgstr "ИЗЛАЗНА-ДАТОТЕКА"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid "List local address book folders"
 msgstr "Наводи фасцикле локалног адресара"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:66
+#: ../addressbook/tools/evolution-addressbook-export.c:65
 msgid "Show cards as vcard or csv file"
 msgstr "Приказује карте као вкарту или цсв датотеку"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:67
+#: ../addressbook/tools/evolution-addressbook-export.c:66
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:136
+#: ../addressbook/tools/evolution-addressbook-export.c:133
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Грешка у аргументима наредбе, користите опцију „--help“ да видите како се "
 "користи."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:150
+#: ../addressbook/tools/evolution-addressbook-export.c:147
 msgid "Only support csv or vcard format."
 msgstr "Подржава само цсв или вкард облик."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:181
+#: ../addressbook/tools/evolution-addressbook-export.c:178
 msgid "Unhandled error"
 msgstr "Непозната грешка"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:625
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:46
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:624
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
 msgid "Can not open file"
 msgstr "Не могу да отворим датотеку"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:76
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:75
 #, c-format
 msgid "Failed to open client '%s': %s"
 msgstr "Нисам успео да отворим „%s“: %s"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:106
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "минут"
@@ -1534,7 +1761,7 @@ msgstr[1] "минута"
 msgstr[2] "минута"
 msgstr[3] "минут"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:119
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:118
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "сат"
@@ -1545,8 +1772,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:132
-#: ../calendar/gui/dialogs/recurrence-page.c:1248
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/dialogs/recurrence-page.c:1249
 msgid "day"
 msgid_plural "days"
 msgstr[0] "дан"
@@ -1554,7 +1781,7 @@ msgstr[1] "дана"
 msgstr[2] "дана"
 msgstr[3] "дан"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:329
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:343
 msgid "Start time"
 msgstr "Време почетка"
 
@@ -1570,74 +1797,98 @@ msgstr "Занемари _све"
 msgid "_Snooze"
 msgstr "_Дремање"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../e-util/e-alert-dialog.c:166
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:6
+#: ../calendar/gui/dialogs/comp-editor.c:1322
+#: ../calendar/gui/dialogs/event-page.ui.h:24
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
+#: ../calendar/gui/dialogs/task-page.ui.h:32 ../e-util/filter.ui.h:17
+#: ../e-util/e-categories-editor.c:278
+#: ../e-util/e-mail-signature-manager.c:357
+#: ../mail/e-mail-account-manager.c:728 ../mail/e-mail-browser.c:170
+#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:56
+#: ../plugins/attachment-reminder/attachment-reminder.c:562
+#: ../plugins/email-custom-header/email-custom-header.c:843
+#: ../plugins/mail-to-task/mail-to-task.c:594
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1072
+#: ../smime/gui/smime-ui.ui.h:13
+msgid "_Edit"
+msgstr "_Уређивање"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#| msgid "Print"
+msgid "_Print"
+msgstr "_Штампај"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:165
 msgid "_Dismiss"
 msgstr "_Занемари"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#: ../calendar/alarm-notify/alarm-notify.ui.h:7
 #: ../calendar/alarm-notify/alarm-queue.c:1835
 #: ../calendar/alarm-notify/alarm-queue.c:1845
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:190
-#: ../modules/itip-formatter/itip-view.c:1501
-#: ../modules/itip-formatter/itip-view.c:1612
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:249
+#: ../modules/itip-formatter/itip-view.c:1503
+#: ../modules/itip-formatter/itip-view.c:1614
 msgid "Location:"
 msgstr "Место:"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/alarm-notify/alarm-notify.ui.h:8
 msgid "location of appointment"
 msgstr "место састанка"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/alarm-notify/alarm-notify.ui.h:9
 msgid "Snooze _time:"
 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/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../e-util/filter.ui.h:8
-#: ../e-util/e-interval-chooser.c:143
-#: ../modules/calendar/e-cal-shell-view-actions.c:352
+#: ../e-util/e-interval-chooser.c:142
+#: ../modules/calendar/e-cal-shell-view-actions.c:351
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "days"
 msgstr "дана"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/alarm-notify/alarm-notify.ui.h:11
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/filter.ui.h:7
-#: ../e-util/e-interval-chooser.c:141
+#: ../e-util/e-interval-chooser.c:140
 msgid "hours"
 msgstr "сати"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:10
+#: ../calendar/alarm-notify/alarm-notify.ui.h:12
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 #: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/filter.ui.h:6
-#: ../e-util/e-interval-chooser.c:139
-#: ../mail/e-mail-config-provider-page.c:527
+#: ../e-util/e-interval-chooser.c:138
+#: ../mail/e-mail-config-provider-page.c:526
 msgid "minutes"
 msgstr "минута"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1679
+#: ../calendar/alarm-notify/alarm-queue.c:1678
 #: ../calendar/alarm-notify/alarm-queue.c:1815
 msgid "No summary available."
 msgstr "Нема доступног сажетка."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1688
-#: ../calendar/alarm-notify/alarm-queue.c:1690
+#: ../calendar/alarm-notify/alarm-queue.c:1687
+#: ../calendar/alarm-notify/alarm-queue.c:1689
 msgid "No description available."
 msgstr "Нема доступног описа."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1698
+#: ../calendar/alarm-notify/alarm-queue.c:1697
 msgid "No location information available."
 msgstr "Нема доступног податка о локацији."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1703
+#: ../calendar/alarm-notify/alarm-queue.c:1702
 #: ../calendar/alarm-notify/alarm-queue.c:1806
-#: ../calendar/alarm-notify/alarm-queue.c:2145
+#: ../calendar/alarm-notify/alarm-queue.c:2147
 msgid "Evolution Reminders"
 msgstr "Подсетници Еволуције"
 
 # bug(slobo): plural-forms. Report this one to bugzilla.gnome.org
-#: ../calendar/alarm-notify/alarm-queue.c:1747
+#: ../calendar/alarm-notify/alarm-queue.c:1746
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
@@ -1650,6 +1901,17 @@ msgstr[3] "Имате један потсетник"
 msgid "Warning"
 msgstr "Упозорење"
 
+#: ../calendar/alarm-notify/alarm-queue.c:1966 ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail.error.xml.h:139
+#: ../modules/mailto-handler/evolution-mailto-handler.c:114
+msgid "_No"
+msgstr "_Не"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1967 ../mail/mail.error.xml.h:138
+#: ../modules/mailto-handler/evolution-mailto-handler.c:115
+msgid "_Yes"
+msgstr "_Да"
+
 #: ../calendar/alarm-notify/alarm-queue.c:1971
 #, c-format
 msgid ""
@@ -1671,13 +1933,13 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Не питај ме поново за овај програм."
 
-#: ../calendar/alarm-notify/util.c:44
+#: ../calendar/alarm-notify/util.c:43
 msgid "invalid time"
 msgstr "неисправно време"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/alarm-notify/util.c:70 ../calendar/gui/e-alarm-list.c:370
-#: ../calendar/gui/misc.c:96
+#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:369
+#: ../calendar/gui/misc.c:103
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1687,8 +1949,8 @@ msgstr[2] "%d сати"
 msgstr[3] "Један сат"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:376
-#: ../calendar/gui/misc.c:102
+#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:375
+#: ../calendar/gui/misc.c:109
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1700,8 +1962,8 @@ msgstr[3] "Један минут"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/alarm-notify/util.c:80 ../calendar/gui/e-alarm-list.c:382
-#: ../calendar/gui/misc.c:106
+#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:381
+#: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1732,7 +1994,7 @@ msgid "_Send Notice"
 msgstr "Пошаљи по_дсетник"
 
 #: ../calendar/calendar.error.xml.h:5
-#: ../calendar/gui/dialogs/delete-comp.c:193
+#: ../calendar/gui/dialogs/delete-comp.c:192
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Сигурно желите да обришете овај састанак?"
@@ -1752,7 +2014,7 @@ msgstr ""
 "знати да је задатак обрисан."
 
 #: ../calendar/calendar.error.xml.h:9
-#: ../calendar/gui/dialogs/delete-comp.c:196
+#: ../calendar/gui/dialogs/delete-comp.c:195
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Сигурно желите да обришете овај задатак?"
@@ -1777,7 +2039,7 @@ msgstr ""
 "знати да је белешка обрисана."
 
 #: ../calendar/calendar.error.xml.h:13
-#: ../calendar/gui/dialogs/delete-comp.c:199
+#: ../calendar/gui/dialogs/delete-comp.c:198
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Сигурно желите да обришете ову белешку?"
@@ -1946,10 +2208,6 @@ msgstr ""
 "Преузимање неколико прилога је у току. Уколико сада сачувате задатак ови "
 "прилози неће бити сачувани са њим."
 
-#: ../calendar/calendar.error.xml.h:47 ../composer/e-composer-actions.c:297
-msgid "_Save"
-msgstr "_Сачувај"
-
 #: ../calendar/calendar.error.xml.h:48
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Преузимање је у току. Желите ли да сачувате заказивање?"
@@ -2182,24 +2440,24 @@ msgstr "Премештам белешку у списак белешки „{0}�
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
-#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:376
+#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:375
 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:11
+#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:55
 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:17
+#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:56
 msgid "does not contain"
 msgstr "не садржи"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../e-util/e-table-config.ui.h:4 ../e-util/e-attachment-tree-view.c:528
-#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+#: ../e-util/e-table-config.ui.h:7 ../e-util/e-attachment-tree-view.c:527
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Description"
 msgstr "Опис"
 
@@ -2213,34 +2471,34 @@ 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:34
+#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:75
 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:40
+#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:73
 msgid "is not"
 msgstr "није"
 
 #. To Translators: This is task classification
 #: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2
-#: ../calendar/gui/e-cal-list-view.c:250 ../calendar/gui/e-cal-model.c:454
-#: ../calendar/gui/e-cal-model.c:461 ../calendar/gui/e-task-table.c:547
+#: ../calendar/gui/e-cal-list-view.c:249 ../calendar/gui/e-cal-model.c:453
+#: ../calendar/gui/e-cal-model.c:460 ../calendar/gui/e-task-table.c:546
 #: ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "Јавно"
 
 #. To Translators: This is task classification
 #: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4
-#: ../calendar/gui/e-cal-list-view.c:251 ../calendar/gui/e-cal-model.c:463
-#: ../calendar/gui/e-task-table.c:548 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/e-cal-list-view.c:250 ../calendar/gui/e-cal-model.c:462
+#: ../calendar/gui/e-task-table.c:547 ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "Лично"
 
 #. To Translators: This is task classification
 #: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
-#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:465
-#: ../calendar/gui/e-task-table.c:549 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/e-cal-list-view.c:251 ../calendar/gui/e-cal-model.c:464
+#: ../calendar/gui/e-task-table.c:548 ../calendar/gui/memotypes.xml.h:12
 #: ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Поверљиво"
@@ -2258,37 +2516,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:897
+#: ../plugins/publish-calendar/publish-calendar.c:903
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:389
 msgid "Location"
 msgstr "Место"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:328
+#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:326
 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:54
-#: ../em-format/e-mail-formatter-print-headers.c:204
+#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
+#: ../em-format/e-mail-formatter-print-headers.c:203
 #: ../mail/em-filter-i18n.h:6
 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:27
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:18
 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:24
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:16
 msgid "Do Not Exist"
 msgstr "Не постоји"
 
 #: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/dialogs/event-editor.c:310
-#: ../calendar/gui/dialogs/event-editor.c:331
+#: ../calendar/gui/dialogs/event-editor.c:309
+#: ../calendar/gui/dialogs/event-editor.c:330
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:15
 msgid "Recurrence"
 msgstr "Понављање"
@@ -2319,43 +2577,43 @@ msgstr "Сажетак садржи"
 msgid "Description Contains"
 msgstr "Описи"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:669
+#: ../calendar/gui/dialogs/alarm-dialog.c:668
 msgid "Edit Reminder"
 msgstr "Уреди подсетник"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:897
-#: ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/dialogs/alarm-dialog.c:896
+#: ../calendar/gui/e-alarm-list.c:411
 msgid "Pop up an alert"
 msgstr "Искачуће упозорење"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:898
-#: ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/dialogs/alarm-dialog.c:897
+#: ../calendar/gui/e-alarm-list.c:407
 msgid "Play a sound"
 msgstr "Пушта звук"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:899
-#: ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/dialogs/alarm-dialog.c:898
+#: ../calendar/gui/e-alarm-list.c:419
 msgid "Run a program"
 msgstr "Покреће програм"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:900
-#: ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/dialogs/alarm-dialog.c:899
+#: ../calendar/gui/e-alarm-list.c:415
 msgid "Send an email"
 msgstr "Шаље електронску поруку"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:909
+#: ../calendar/gui/dialogs/alarm-dialog.c:908
 msgid "before"
 msgstr "пре"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:910
+#: ../calendar/gui/dialogs/alarm-dialog.c:909
 msgid "after"
 msgstr "после"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:919
+#: ../calendar/gui/dialogs/alarm-dialog.c:918
 msgid "start of appointment"
 msgstr "заказани почетак"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:920
+#: ../calendar/gui/dialogs/alarm-dialog.c:919
 msgid "end of appointment"
 msgstr "крај састанка"
 
@@ -2376,453 +2634,499 @@ msgstr "дан(и)"
 msgid "Add Reminder"
 msgstr "Додај подсетник"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-#: ../calendar/gui/dialogs/event-editor.c:353
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
+#: ../calendar/gui/dialogs/event-editor.c:352
 msgid "Reminder"
 msgstr "Подсетник"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
 msgid "Repeat"
 msgstr "Понови"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "_Repeat the reminder"
 msgstr "По_нови подсетник"
 
 #. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
 msgid "extra times every"
 msgstr "прикажи још на сваких"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13 ../mail/mail-config.ui.h:30
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:32
 msgid "Options"
 msgstr "Могућности"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
 msgid "Custom _message"
 msgstr "Произвољна _порука"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
 msgid "Mes_sage:"
 msgstr "По_рука:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
 msgid "Custom reminder sound"
 msgstr "Произвољан звук подсетника"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
 msgid "_Sound:"
 msgstr "_Звук:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "Select A File"
 msgstr "Изаберите датотеку"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "_Program:"
 msgstr "_Програм:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
 msgid "_Arguments:"
 msgstr "_Аргументи:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "Send To:"
 msgstr "Пошаљи:"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:240
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:239
 msgid "Action/Trigger"
 msgstr "Радња/покретач"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
-#: ../calendar/gui/dialogs/event-page.ui.h:25
+#: ../calendar/gui/dialogs/event-page.ui.h:28
 #: ../modules/calendar/e-calendar-preferences.ui.h:62
 msgid "Reminders"
 msgstr "Подсетници"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-msgid "A_dd"
-msgstr "_Додај"
-
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Овај догађај је обрисан."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Овај задатак је обрисан."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:67
 msgid "This memo has been deleted."
 msgstr "Ова белешка је обрисана."
 
-#: ../calendar/gui/dialogs/changed-comp.c:78
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, c-format
 msgid "%s  You have made changes. Forget those changes and close the editor?"
 msgstr ""
 "%s  Начинили сте измене. Да занемарим те измене и да затворим уређивач?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:80
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, c-format
 msgid "%s  You have made no changes, close the editor?"
 msgstr "%s  Нисте начинили измене, да затворим уређивач?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:85
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Овај догађај је измењен."
 
-#: ../calendar/gui/dialogs/changed-comp.c:89
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Овај задатак је измењен."
 
-#: ../calendar/gui/dialogs/changed-comp.c:93
+#: ../calendar/gui/dialogs/changed-comp.c:92
 msgid "This memo has been changed."
 msgstr "Ова белешка је измењена."
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:102
 #, c-format
 msgid "%s  You have made changes. Forget those changes and update the editor?"
 msgstr "%s  Начинили сте измене. Да занемарим те измене и да освежим уређивач?"
 
-#: ../calendar/gui/dialogs/changed-comp.c:105
+#: ../calendar/gui/dialogs/changed-comp.c:104
 #, c-format
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Нисте начинили измене, да освежим уређивач?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:266
+#: ../calendar/gui/dialogs/comp-editor.c:271
 msgid "Could not save attachments"
 msgstr "Не могу да сачувам прилоге"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:626
 msgid "Could not update object"
 msgstr "Не могу да освежим објекат"
 
-#: ../calendar/gui/dialogs/comp-editor.c:754
+#: ../calendar/gui/dialogs/comp-editor.c:760
 msgid "Edit Appointment"
 msgstr "Уреди заказивање"
 
-#: ../calendar/gui/dialogs/comp-editor.c:761
+#: ../calendar/gui/dialogs/comp-editor.c:767
 #, c-format
 msgid "Meeting - %s"
 msgstr "Састанак — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:763
+#: ../calendar/gui/dialogs/comp-editor.c:769
 #, c-format
 msgid "Appointment - %s"
 msgstr "Заказивање — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:769
+#: ../calendar/gui/dialogs/comp-editor.c:775
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Додељен задатак — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:771
+#: ../calendar/gui/dialogs/comp-editor.c:777
 #, c-format
 msgid "Task - %s"
 msgstr "Задатак — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:776
+#: ../calendar/gui/dialogs/comp-editor.c:782
 #, c-format
 msgid "Memo - %s"
 msgstr "Белешка — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:792
+#: ../calendar/gui/dialogs/comp-editor.c:798
 msgid "No Summary"
 msgstr "Без сажетка"
 
-#: ../calendar/gui/dialogs/comp-editor.c:913
+#: ../calendar/gui/dialogs/comp-editor.c:919
 msgid "Keep original item?"
 msgstr "Задржати оригиналну ставку?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1080
-#: ../calendar/gui/dialogs/comp-editor.c:1108
+#: ../calendar/gui/dialogs/comp-editor.c:1082
+#: ../calendar/gui/dialogs/comp-editor.c:1110
 msgid "Unable to synchronize with the server"
 msgstr "Не могу да се усагласим са сервером"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1222
+#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../calendar/gui/dialogs/event-editor.c:310
+#: ../calendar/gui/dialogs/event-page.ui.h:29
+#: ../composer/e-composer-actions.c:275
+#: ../e-util/e-mail-signature-editor.c:307
+#: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:388
+#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:126
+#: ../mail/em-folder-properties.c:418 ../mail/em-subscription-editor.c:1714
+#: ../modules/plugin-manager/evolution-plugin-manager.c:256
+#: ../shell/e-shell-window-actions.c:343 ../shell/e-shell-window-actions.c:909
+#: ../smime/gui/certificate-manager.c:1182
+msgid "_Close"
+msgstr "_Затвори"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1224
 msgid "Close the current window"
 msgstr "Затворите тренутни прозор"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1229 ../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:1296 ../e-util/e-web-view.c:341
-#: ../e-util/e-web-view.c:1305 ../mail/e-mail-browser.c:136
-#: ../shell/e-shell-window-actions.c:888
+#. copy menu item
+#: ../calendar/gui/dialogs/comp-editor.c:1229 ../e-util/e-focus-tracker.c:730
+#: ../e-util/e-text.c:2085 ../e-util/e-web-view-gtkhtml.c:452
+#: ../e-util/e-web-view.c:336 ../mail/e-mail-browser.c:133
+#: ../shell/e-shell-window-actions.c:930
+#| msgid "_Copy..."
+msgid "_Copy"
+msgstr "_Умножи"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1231 ../e-util/e-focus-tracker.c:174
+#: ../e-util/e-focus-tracker.c:230 ../e-util/e-focus-tracker.c:731
+#: ../e-util/e-web-view-gtkhtml.c:454 ../e-util/e-web-view-gtkhtml.c:1295
+#: ../e-util/e-web-view.c:338 ../e-util/e-web-view.c:1307
+#: ../mail/e-mail-browser.c:135 ../shell/e-shell-window-actions.c:932
 msgid "Copy the selection"
 msgstr "Умножите изабрано"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1236 ../e-util/e-focus-tracker.c:114
-#: ../e-util/e-focus-tracker.c:553 ../e-util/e-web-view-gtkhtml.c:1290
-#: ../e-util/e-web-view.c:1299 ../mail/e-mail-browser.c:143
-#: ../shell/e-shell-window-actions.c:895
+#. cut menu item
+#: ../calendar/gui/dialogs/comp-editor.c:1236 ../e-util/e-focus-tracker.c:725
+#: ../e-util/e-text.c:2071 ../mail/e-mail-browser.c:140
+#: ../shell/e-shell-window-actions.c:937
+msgid "Cu_t"
+msgstr "_Исеци"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1238 ../e-util/e-focus-tracker.c:167
+#: ../e-util/e-focus-tracker.c:223 ../e-util/e-focus-tracker.c:726
+#: ../e-util/e-web-view-gtkhtml.c:1289 ../e-util/e-web-view.c:1301
+#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:939
 msgid "Cut the selection"
 msgstr "Исеците изабрано"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1243 ../e-util/e-focus-tracker.c:135
-#: ../e-util/e-focus-tracker.c:568 ../shell/e-shell-window-actions.c:902
+#: ../calendar/gui/dialogs/comp-editor.c:1245 ../e-util/e-focus-tracker.c:188
+#: ../e-util/e-focus-tracker.c:244 ../e-util/e-focus-tracker.c:741
+#: ../shell/e-shell-window-actions.c:946
 msgid "Delete the selection"
 msgstr "Обришите избор"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1250
+#: ../calendar/gui/dialogs/comp-editor.c:1252
 msgid "View help"
 msgstr "Погледај помоћ"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1257 ../e-util/e-focus-tracker.c:128
-#: ../e-util/e-focus-tracker.c:563 ../e-util/e-web-view-gtkhtml.c:1302
-#: ../e-util/e-web-view.c:1311 ../mail/e-mail-browser.c:150
-#: ../shell/e-shell-window-actions.c:923
+#. paste menu item
+#: ../calendar/gui/dialogs/comp-editor.c:1257 ../e-util/e-focus-tracker.c:735
+#: ../e-util/e-text.c:2097 ../mail/e-mail-browser.c:147
+#: ../shell/e-shell-window-actions.c:965
+#| msgid "_Pascal"
+msgid "_Paste"
+msgstr "_Убаци"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1259 ../e-util/e-focus-tracker.c:181
+#: ../e-util/e-focus-tracker.c:237 ../e-util/e-focus-tracker.c:736
+#: ../e-util/e-web-view-gtkhtml.c:1301 ../e-util/e-web-view.c:1313
+#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:967
 msgid "Paste the clipboard"
 msgstr "Убаците из списка исечака"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1278
+#: ../calendar/gui/dialogs/comp-editor.c:1264
+#: ../composer/e-composer-actions.c:329 ../mail/e-mail-reader.c:2128
+#: ../modules/addressbook/e-book-shell-view-actions.c:1160
+#: ../modules/addressbook/e-book-shell-view-actions.c:1174
+msgid "_Print..."
+msgstr "_Штампај..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1271 ../mail/e-mail-reader.c:2135
+#: ../modules/addressbook/e-book-shell-view-actions.c:1167
+#: ../modules/calendar/e-cal-shell-view-actions.c:1801
+#: ../modules/calendar/e-memo-shell-view-actions.c:821
+#: ../modules/calendar/e-task-shell-view-actions.c:1020
+#| msgid "Preview"
+msgid "Pre_view..."
+msgstr "_Преглед..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1280
 msgid "Save current changes"
 msgstr "Сачувајте текуће измене"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1283
-#: ../e-util/e-mail-signature-editor.c:317
+#: ../calendar/gui/dialogs/comp-editor.c:1285
+#: ../e-util/e-mail-signature-editor.c:316
 msgid "Save and Close"
 msgstr "Сачувај и затвори"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1285
+#: ../calendar/gui/dialogs/comp-editor.c:1287
 msgid "Save current changes and close editor"
 msgstr "Сачувајте текуће измене и затворите уређивач"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292 ../e-util/e-focus-tracker.c:142
-#: ../e-util/e-focus-tracker.c:573 ../mail/e-mail-browser.c:157
-#: ../shell/e-shell-window-actions.c:1000
+#: ../calendar/gui/dialogs/comp-editor.c:1292 ../e-util/e-focus-tracker.c:745
+#: ../e-util/e-web-view-gtkhtml.c:462 ../e-util/e-web-view.c:346
+#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1042
+#| msgid "Select All"
+msgid "Select _All"
+msgstr "Изабери _све"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1294 ../e-util/e-focus-tracker.c:195
+#: ../e-util/e-focus-tracker.c:251 ../e-util/e-focus-tracker.c:746
+#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:1044
 msgid "Select all text"
 msgstr "Изаберите сав текст"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1299
+#: ../calendar/gui/dialogs/comp-editor.c:1315
 msgid "_Classification"
 msgstr "_Разврставање"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1306
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../e-util/filter.ui.h:16
-#: ../mail/e-mail-browser.c:171
-#: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../shell/e-shell-window-actions.c:1028
-msgid "_Edit"
-msgstr "_Уређивање"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1313
-#: ../e-util/e-mail-signature-editor.c:322 ../mail/e-mail-browser.c:164
-#: ../shell/e-shell-window-actions.c:1035
+#: ../calendar/gui/dialogs/comp-editor.c:1329
+#: ../e-util/e-mail-signature-editor.c:321 ../mail/e-mail-browser.c:163
+#: ../shell/e-shell-window-actions.c:1079
 msgid "_File"
 msgstr "_Датотека"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1320
-#: ../shell/e-shell-window-actions.c:1042
-msgid "_Help"
-msgstr "По_моћ"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1327
+#: ../calendar/gui/dialogs/comp-editor.c:1343
 msgid "_Insert"
 msgstr "_Уметни"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1334
-#: ../composer/e-composer-actions.c:320
+#: ../calendar/gui/dialogs/comp-editor.c:1350
+#: ../composer/e-composer-actions.c:319
 msgid "_Options"
 msgstr "_Могућности"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1341 ../mail/e-mail-browser.c:178
-#: ../shell/e-shell-window-actions.c:1077 ../smime/gui/smime-ui.ui.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1357 ../mail/e-mail-browser.c:177
+#: ../shell/e-shell-window-actions.c:1121 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "П_реглед"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1351
-#: ../composer/e-composer-actions.c:269
+#: ../calendar/gui/dialogs/comp-editor.c:1367
+#: ../composer/e-composer-actions.c:268
 msgid "_Attachment..."
 msgstr "_Прилог..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1353
-#: ../composer/e-composer-actions.c:271 ../e-util/e-attachment-view.c:413
+#: ../calendar/gui/dialogs/comp-editor.c:1369
+#: ../composer/e-composer-actions.c:270 ../e-util/e-attachment-view.c:412
 msgid "Attach a file"
 msgstr "Приложите датотеку"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../calendar/gui/dialogs/comp-editor.c:1377
 msgid "_Categories"
 msgstr "_Категорије"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1363
+#: ../calendar/gui/dialogs/comp-editor.c:1379
 msgid "Toggles whether to display categories"
 msgstr "Пребацује приказивање категорија"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1369
+#: ../calendar/gui/dialogs/comp-editor.c:1385
 msgid "Time _Zone"
 msgstr "Временска _зона"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1371
+#: ../calendar/gui/dialogs/comp-editor.c:1387
 msgid "Toggles whether the time zone is displayed"
 msgstr "Пребацује приказивање временске зоне"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1380
+#: ../calendar/gui/dialogs/comp-editor.c:1396
 msgid "Pu_blic"
 msgstr "_Јавно"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1382
+#: ../calendar/gui/dialogs/comp-editor.c:1398
 msgid "Classify as public"
 msgstr "Означите као јавно"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1403
 msgid "_Private"
 msgstr "Л_ично"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
+#: ../calendar/gui/dialogs/comp-editor.c:1405
 msgid "Classify as private"
 msgstr "Означите као лично"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1394
+#: ../calendar/gui/dialogs/comp-editor.c:1410
 msgid "_Confidential"
 msgstr "Пове_рљиво"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1412
 msgid "Classify as confidential"
 msgstr "Означите као поверљиво"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1404
+#: ../calendar/gui/dialogs/comp-editor.c:1420
 msgid "R_ole Field"
 msgstr "Поље _улоге"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1406
+#: ../calendar/gui/dialogs/comp-editor.c:1422
 msgid "Toggles whether the Role field is displayed"
 msgstr "Пребацује приказивање поља Улога"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1412
+#: ../calendar/gui/dialogs/comp-editor.c:1428
 msgid "_RSVP"
 msgstr "_Молим одговорите"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1414
+#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Пребацује приказивање поља Молим одговорите"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1436
 msgid "_Status Field"
 msgstr "Поље _стања"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1438
 msgid "Toggles whether the Status field is displayed"
 msgstr "Пребацује приказивање поља Стања"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1428
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "_Type Field"
 msgstr "Поље _типа"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1446
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Пребацује приказивање поља Типа"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2211
-#: ../composer/e-composer-actions.c:488
+#: ../calendar/gui/dialogs/comp-editor.c:2233
+#: ../composer/e-composer-actions.c:487
 msgid "Attach"
 msgstr "Приложи"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2541
-#: ../calendar/gui/dialogs/comp-editor.c:2751
-#: ../calendar/gui/dialogs/comp-editor.c:3764
+#: ../calendar/gui/dialogs/comp-editor.c:2563
+#: ../calendar/gui/dialogs/comp-editor.c:2773
+#: ../calendar/gui/dialogs/comp-editor.c:3786
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Промене начињене на овој ставки могу бити занемарене ако буде ажурирано"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3726
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
+#: ../calendar/gui/dialogs/comp-editor.c:3748
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:120
 msgid "attachment"
 msgstr "прилог"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3796
+#: ../calendar/gui/dialogs/comp-editor.c:3818
 msgid "Unable to use current version!"
 msgstr "Не могу да користим тренутно издање!"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:441
+#: ../calendar/gui/dialogs/comp-editor-page.c:440
 #, c-format
 msgid "Validation error: %s"
 msgstr "Грешка провере: %s"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:121
+#: ../calendar/gui/dialogs/copy-source-dialog.c:120
 msgid "Could not open destination"
 msgstr "Не могу да отворим одредиште"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:131
+#: ../calendar/gui/dialogs/copy-source-dialog.c:130
 msgid "Destination is read only"
 msgstr "Одредиште је само за читање"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:173
+#: ../calendar/gui/dialogs/copy-source-dialog.c:172
 msgid "Cannot create object"
 msgstr "Не могу да направим објекат"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:204
+#: ../calendar/gui/dialogs/copy-source-dialog.c:203
 msgid "Could not open source"
 msgstr "Не могу да отворим извор"
 
-#: ../calendar/gui/dialogs/delete-comp.c:216
+#: ../calendar/gui/dialogs/delete-comp.c:215
 msgid "_Delete this item from all other recipient's mailboxes?"
 msgstr ""
 "Да ли да _избришем ову ставку из свих осталих поштанских сандучића примаоца?"
 
-#: ../calendar/gui/dialogs/delete-comp.c:219
+#: ../calendar/gui/dialogs/delete-comp.c:218
 msgid "_Retract comment"
 msgstr "_Увуци коментар"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:55
+#: ../calendar/gui/dialogs/delete-error.c:54
 #, c-format
 msgid "The event could not be deleted due to a dbus error: %s"
 msgstr "Догађај не може бити обрисан због дбас грешке: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:59
+#: ../calendar/gui/dialogs/delete-error.c:58
 #, c-format
 msgid "The task could not be deleted due to a dbus error: %s"
 msgstr "Задатак не може бити обрисан због дбас грешке: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:62
 #, c-format
 msgid "The memo could not be deleted due to a dbus error: %s"
 msgstr "Белешка не може бити обрисана због дбас грешке: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:67
+#: ../calendar/gui/dialogs/delete-error.c:66
 #, c-format
 msgid "The item could not be deleted due to a dbus error: %s"
 msgstr "Ставка не може бити обрисана због дбас грешке: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:73
 msgid "The event could not be deleted because permission was denied"
 msgstr "Догађај не може бити обрисан јер је одбијена дозвола"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:76
 msgid "The task could not be deleted because permission was denied"
 msgstr "Задатак не може бити обрисан јер је одбијена дозвола"
 
-#: ../calendar/gui/dialogs/delete-error.c:80
+#: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Белешка не може бити обрисана јер је одбијена дозвола"
 
-#: ../calendar/gui/dialogs/delete-error.c:83
+#: ../calendar/gui/dialogs/delete-error.c:82
 msgid "The item could not be deleted because permission was denied"
 msgstr "Ставка не може бити обрисана јер је одбијена дозвола"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:91
+#: ../calendar/gui/dialogs/delete-error.c:90
 #, c-format
 msgid "The event could not be deleted due to an error: %s"
 msgstr "Догађај не може бити обрисан због грешке: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:94
 #, c-format
 msgid "The task could not be deleted due to an error: %s"
 msgstr "Задатак не може бити обрисан због грешке: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:99
+#: ../calendar/gui/dialogs/delete-error.c:98
 #, c-format
 msgid "The memo could not be deleted due to an error: %s"
 msgstr "Белешка не може бити обрисана због грешке: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:103
+#: ../calendar/gui/dialogs/delete-error.c:102
 #, c-format
 msgid "The item could not be deleted due to an error: %s"
 msgstr "Ставка не може бити обрисана због грешке: %s"
@@ -2831,74 +3135,74 @@ msgstr "Ставка не може бити обрисана због грешк
 msgid "Enter Delegate"
 msgstr "Унеси делегата"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:4
 msgid "Delegate To:"
 msgstr "Делегирај на:"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:5
 msgid "Contacts..."
 msgstr "Контакти..."
 
-#: ../calendar/gui/dialogs/event-editor.c:205
+#: ../calendar/gui/dialogs/event-editor.c:204
 msgid "_Reminders"
 msgstr "_Подсетници"
 
-#: ../calendar/gui/dialogs/event-editor.c:207
+#: ../calendar/gui/dialogs/event-editor.c:206
 msgid "Set or unset reminders for this event"
 msgstr "Поставља или искључује подсетнике за овај догађај"
 
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:214
 msgid "Show Time as _Busy"
 msgstr "Прикажи време као _заузето"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/event-editor.c:216
 msgid "Toggles whether to show time as busy"
 msgstr "Пребацује приказивање времена као заузето"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:225
 msgid "_Recurrence"
 msgstr "_Понављање"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:227
 msgid "Make this a recurring event"
 msgstr "Нека се овај догађај понавља"
 
-#: ../calendar/gui/dialogs/event-editor.c:233 ../e-util/e-send-options.ui.h:14
+#: ../calendar/gui/dialogs/event-editor.c:232 ../e-util/e-send-options.ui.h:14
 msgid "Send Options"
 msgstr "Опције слања"
 
-#: ../calendar/gui/dialogs/event-editor.c:235
-#: ../calendar/gui/dialogs/task-editor.c:96
+#: ../calendar/gui/dialogs/event-editor.c:234
+#: ../calendar/gui/dialogs/task-editor.c:95
 msgid "Insert advanced send options"
 msgstr "Уметните напредне опције слања"
 
-#: ../calendar/gui/dialogs/event-editor.c:243
+#: ../calendar/gui/dialogs/event-editor.c:242
 msgid "All _Day Event"
 msgstr "Целодневни догађа_ј"
 
-#: ../calendar/gui/dialogs/event-editor.c:245
+#: ../calendar/gui/dialogs/event-editor.c:244
 msgid "Toggles whether to have All Day Event"
 msgstr "Бира да ли дозвољава целодневне догађаје"
 
-#: ../calendar/gui/dialogs/event-editor.c:254
+#: ../calendar/gui/dialogs/event-editor.c:253
 msgid "_Free/Busy"
 msgstr "С_лободно/заузето"
 
-#: ../calendar/gui/dialogs/event-editor.c:256
+#: ../calendar/gui/dialogs/event-editor.c:255
 msgid "Query free / busy information for the attendees"
 msgstr "Затражи податак за слободно/заузето време за ове учеснике"
 
-#: ../calendar/gui/dialogs/event-editor.c:307 ../calendar/gui/print.c:3505
+#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3496
 msgid "Appointment"
 msgstr "Заказивање"
 
-#: ../calendar/gui/dialogs/event-editor.c:377
-#: ../calendar/gui/dialogs/event-page.ui.h:24
-#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/dialogs/event-editor.c:376
+#: ../calendar/gui/dialogs/event-page.ui.h:27
+#: ../calendar/gui/e-meeting-list-view.c:164
 msgid "Attendees"
 msgstr "Учесници"
 
-#: ../calendar/gui/dialogs/event-editor.c:574
+#: ../calendar/gui/dialogs/event-editor.c:573
 msgid "Print this event"
 msgstr "Штампајте ову поруку"
 
@@ -2916,7 +3220,7 @@ msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Догађај није могуће потпуно уредити, пошто нисте организатор"
 
 #: ../calendar/gui/dialogs/event-page.c:650
-#: ../calendar/gui/dialogs/event-page.c:3168
+#: ../calendar/gui/dialogs/event-page.c:3171
 msgid "This event has reminders"
 msgstr "Овај догађај има подсетнике"
 
@@ -2925,52 +3229,52 @@ msgstr "Овај догађај има подсетнике"
 msgid "Or_ganizer:"
 msgstr "Ор_ганизатор:"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
+#: ../calendar/gui/dialogs/event-page.c:1302
 msgid "Event with no start date"
 msgstr "Догађај без датума почетка"
 
-#: ../calendar/gui/dialogs/event-page.c:1306
+#: ../calendar/gui/dialogs/event-page.c:1305
 msgid "Event with no end date"
 msgstr "Догађај без датума завршетка"
 
-#: ../calendar/gui/dialogs/event-page.c:1479
-#: ../calendar/gui/dialogs/memo-page.c:726
-#: ../calendar/gui/dialogs/task-page.c:1026
+#: ../calendar/gui/dialogs/event-page.c:1483
+#: ../calendar/gui/dialogs/memo-page.c:732
+#: ../calendar/gui/dialogs/task-page.c:1030
 msgid "Start date is wrong"
 msgstr "Датум почетка је погрешан"
 
-#: ../calendar/gui/dialogs/event-page.c:1490
+#: ../calendar/gui/dialogs/event-page.c:1494
 msgid "End date is wrong"
 msgstr "Датум завршетка је погрешан"
 
-#: ../calendar/gui/dialogs/event-page.c:1514
+#: ../calendar/gui/dialogs/event-page.c:1518
 msgid "Start time is wrong"
 msgstr "Време почетка је погрешно"
 
-#: ../calendar/gui/dialogs/event-page.c:1522
+#: ../calendar/gui/dialogs/event-page.c:1526
 msgid "End time is wrong"
 msgstr "Време завршетка је погрешно"
 
-#: ../calendar/gui/dialogs/event-page.c:1686
-#: ../calendar/gui/dialogs/memo-page.c:765
-#: ../calendar/gui/dialogs/task-page.c:1080
+#: ../calendar/gui/dialogs/event-page.c:1690
+#: ../calendar/gui/dialogs/memo-page.c:771
+#: ../calendar/gui/dialogs/task-page.c:1084
 msgid "An organizer is required."
 msgstr "Потребан је организатор."
 
-#: ../calendar/gui/dialogs/event-page.c:1721
-#: ../calendar/gui/dialogs/task-page.c:1115
+#: ../calendar/gui/dialogs/event-page.c:1725
+#: ../calendar/gui/dialogs/task-page.c:1119
 msgid "At least one attendee is required."
 msgstr "Најмање један учесник је потребан."
 
-#: ../calendar/gui/dialogs/event-page.c:1927
+#: ../calendar/gui/dialogs/event-page.c:1931
 msgid "_Delegatees"
 msgstr "Делегат_и"
 
-#: ../calendar/gui/dialogs/event-page.c:1929
+#: ../calendar/gui/dialogs/event-page.c:1933
 msgid "Atte_ndees"
 msgstr "Уч_есници"
 
-#: ../calendar/gui/dialogs/event-page.c:3448
+#: ../calendar/gui/dialogs/event-page.c:3451
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -2979,7 +3283,7 @@ msgstr[1] "%d дана пре заказаног"
 msgstr[2] "%d дана пре заказаног"
 msgstr[3] "%d дан пре заказаног"
 
-#: ../calendar/gui/dialogs/event-page.c:3454
+#: ../calendar/gui/dialogs/event-page.c:3457
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -2988,7 +3292,7 @@ msgstr[1] "%d сата пре заказаног"
 msgstr[2] "%d сати пре заказаног"
 msgstr[3] "%d сат пре заказаног"
 
-#: ../calendar/gui/dialogs/event-page.c:3460
+#: ../calendar/gui/dialogs/event-page.c:3463
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -2997,7 +3301,7 @@ msgstr[1] "%d минута пре заказаног"
 msgstr[2] "%d минута пре заказаног"
 msgstr[3] "%d минут пре заказаног"
 
-#: ../calendar/gui/dialogs/event-page.c:3481
+#: ../calendar/gui/dialogs/event-page.c:3484
 msgid "Customize"
 msgstr "Прилагоди"
 
@@ -3007,7 +3311,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:3488
+#: ../calendar/gui/dialogs/event-page.c:3491
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ништа"
@@ -3049,7 +3353,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:29
-#: ../e-util/e-attachment-dialog.c:357
+#: ../e-util/e-attachment-dialog.c:356
 msgid "_Description:"
 msgstr "_Опис:"
 
@@ -3071,17 +3375,17 @@ msgstr "_Сажетак:"
 msgid "Event Description"
 msgstr "Опис догађаја"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/task-page.ui.h:30
+#: ../calendar/gui/dialogs/event-page.ui.h:26
+#: ../calendar/gui/dialogs/task-page.ui.h:33
 #: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Atte_ndees..."
 msgstr "Уч_есници..."
 
-#: ../calendar/gui/dialogs/event-page.ui.h:26
+#: ../calendar/gui/dialogs/event-page.ui.h:30
 msgid "_Reminder"
 msgstr "_Подсетник"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:27
+#: ../calendar/gui/dialogs/event-page.ui.h:31
 msgid "Custom Reminder:"
 msgstr "Произвољан подсетник:"
 
@@ -3138,41 +3442,41 @@ msgid "Select Date"
 msgstr "Изаберите датум"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
 msgid "Select _Today"
 msgstr "Изабери _данашњи дан"
 
-#: ../calendar/gui/dialogs/memo-editor.c:106 ../calendar/gui/print.c:3509
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3500
 msgid "Memo"
 msgstr "Белешка"
 
-#: ../calendar/gui/dialogs/memo-editor.c:156
+#: ../calendar/gui/dialogs/memo-editor.c:155
 msgid "Print this memo"
 msgstr "Штампајте ову белешку"
 
-#: ../calendar/gui/dialogs/memo-page.c:421
+#: ../calendar/gui/dialogs/memo-page.c:424
 msgid "Memo's start date is in the past"
 msgstr "Почетак белешке је у прошлости"
 
-#: ../calendar/gui/dialogs/memo-page.c:457
+#: ../calendar/gui/dialogs/memo-page.c:460
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "Белешку није могуће уређивати, пошто је изабран списак само за читање"
 
-#: ../calendar/gui/dialogs/memo-page.c:461
+#: ../calendar/gui/dialogs/memo-page.c:464
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Белешку није могуће потпуно уредити, пошто нисте организатор"
 
-#: ../calendar/gui/dialogs/memo-page.c:1160
-#: ../em-format/e-mail-formatter-utils.c:203
-#: ../em-format/e-mail-formatter-utils.c:220
-#: ../em-format/e-mail-part-headers.c:49 ../mail/em-filter-i18n.h:78
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:66
+#: ../calendar/gui/dialogs/memo-page.c:1166
+#: ../em-format/e-mail-formatter-utils.c:201
+#: ../em-format/e-mail-formatter-utils.c:218
+#: ../em-format/e-mail-part-headers.c:48 ../mail/em-filter-i18n.h:52
+#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:65
 msgid "To"
 msgstr "Прима"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
 #: ../calendar/gui/dialogs/task-page.c:426
-#: ../calendar/gui/dialogs/task-page.ui.h:31
+#: ../calendar/gui/dialogs/task-page.ui.h:34
 msgid "_List:"
 msgstr "_Списак:"
 
@@ -3196,57 +3500,57 @@ msgstr "Датум п_очетка:"
 msgid "Su_mmary:"
 msgstr "Саже_так:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Мењате повратни догађај. Шта желите да измените?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Делегирате повратни догађај. Шта желите да делегирате?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:58
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Мењате повратни задатак. Шта желите да измените?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:62
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Мењате повратну белешку. Шта желите да измените?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
 msgstr "Само овај унос"
 
-#: ../calendar/gui/dialogs/recur-comp.c:93
+#: ../calendar/gui/dialogs/recur-comp.c:92
 msgid "This and Prior Instances"
 msgstr "Овај и претходне уносе"
 
-#: ../calendar/gui/dialogs/recur-comp.c:99
+#: ../calendar/gui/dialogs/recur-comp.c:98
 msgid "This and Future Instances"
 msgstr "Овај и будуће уносе"
 
-#: ../calendar/gui/dialogs/recur-comp.c:104
+#: ../calendar/gui/dialogs/recur-comp.c:103
 msgid "All Instances"
 msgstr "Све уносе"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:575
+#: ../calendar/gui/dialogs/recurrence-page.c:574
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ово заказивање садржи понављања која Еволуција не може да уреди."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1000
+#: ../calendar/gui/dialogs/recurrence-page.c:1001
 msgid "Recurrence date is invalid"
 msgstr "Датум понављања није исправан"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
 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:1073
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "on"
 msgstr "у"
 
@@ -3254,7 +3558,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:1154
+#: ../calendar/gui/dialogs/recurrence-page.c:1155
 msgid "first"
 msgstr "првом"
 
@@ -3263,7 +3567,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:1160
+#: ../calendar/gui/dialogs/recurrence-page.c:1161
 msgid "second"
 msgstr "другом"
 
@@ -3271,7 +3575,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:1165
+#: ../calendar/gui/dialogs/recurrence-page.c:1166
 msgid "third"
 msgstr "трећем"
 
@@ -3279,7 +3583,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:1170
+#: ../calendar/gui/dialogs/recurrence-page.c:1171
 msgid "fourth"
 msgstr "четвртом"
 
@@ -3287,7 +3591,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:1175
+#: ../calendar/gui/dialogs/recurrence-page.c:1176
 msgid "fifth"
 msgstr "петом"
 
@@ -3295,13 +3599,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:1180
+#: ../calendar/gui/dialogs/recurrence-page.c:1181
 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:1204
+#: ../calendar/gui/dialogs/recurrence-page.c:1205
 msgid "Other Date"
 msgstr "Други датум"
 
@@ -3309,7 +3613,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:1210
+#: ../calendar/gui/dialogs/recurrence-page.c:1211
 msgid "1st to 10th"
 msgstr "од првог до десетог"
 
@@ -3317,7 +3621,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:1216
+#: ../calendar/gui/dialogs/recurrence-page.c:1217
 msgid "11th to 20th"
 msgstr "од једанаестог до двадесетог"
 
@@ -3325,41 +3629,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:1222
+#: ../calendar/gui/dialogs/recurrence-page.c:1223
 msgid "21st to 31st"
 msgstr "од двадесет првог до тридесет првог"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1249
+#: ../calendar/gui/dialogs/recurrence-page.c:1250
 #: ../modules/calendar/e-calendar-preferences.ui.h:25
 msgid "Monday"
 msgstr "Понедељак"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1250
+#: ../calendar/gui/dialogs/recurrence-page.c:1251
 #: ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Tuesday"
 msgstr "Уторак"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1251
+#: ../calendar/gui/dialogs/recurrence-page.c:1252
 #: ../modules/calendar/e-calendar-preferences.ui.h:31
 msgid "Wednesday"
 msgstr "Среда"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1252
+#: ../calendar/gui/dialogs/recurrence-page.c:1253
 #: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Thursday"
 msgstr "Четвртак"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1253
+#: ../calendar/gui/dialogs/recurrence-page.c:1254
 #: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Friday"
 msgstr "Петак"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1254
+#: ../calendar/gui/dialogs/recurrence-page.c:1255
 #: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Saturday"
 msgstr "Субота"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1255
+#: ../calendar/gui/dialogs/recurrence-page.c:1256
 #: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Sunday"
 msgstr "Недеља"
@@ -3367,31 +3671,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:1386
+#: ../calendar/gui/dialogs/recurrence-page.c:1387
 msgid "on the"
 msgstr "на"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1571
+#: ../calendar/gui/dialogs/recurrence-page.c:1572
 msgid "occurrences"
 msgstr "појаве"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2341
+#: ../calendar/gui/dialogs/recurrence-page.c:2342
 msgid "Add exception"
 msgstr "Додај изузетак"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2383
+#: ../calendar/gui/dialogs/recurrence-page.c:2384
 msgid "Could not get a selection to modify."
 msgstr "Не могу да нађем избор ради мењања."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2389
+#: ../calendar/gui/dialogs/recurrence-page.c:2390
 msgid "Modify exception"
 msgstr "Измените изузетак"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2435
+#: ../calendar/gui/dialogs/recurrence-page.c:2436
 msgid "Could not get a selection to delete."
 msgstr "Не могу да нађем избор ради брисања."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2576
+#: ../calendar/gui/dialogs/recurrence-page.c:2577
 msgid "Date/Time"
 msgstr "Датум/време"
 
@@ -3449,30 +3753,30 @@ msgstr "Сваких"
 msgid "Exceptions"
 msgstr "Изузеци"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:22
 msgid "Preview"
 msgstr "Преглед"
 
-#: ../calendar/gui/dialogs/send-comp.c:173
-#: ../calendar/gui/dialogs/send-comp.c:255
+#: ../calendar/gui/dialogs/send-comp.c:172
+#: ../calendar/gui/dialogs/send-comp.c:254
 msgid "Send my reminders with this event"
 msgstr "Пошаљи моје подсетнике са овим догађајем"
 
-#: ../calendar/gui/dialogs/send-comp.c:175
-#: ../calendar/gui/dialogs/send-comp.c:257
+#: ../calendar/gui/dialogs/send-comp.c:174
+#: ../calendar/gui/dialogs/send-comp.c:256
 msgid "Notify new attendees _only"
 msgstr "Обавести _само нове учеснике"
 
-#: ../calendar/gui/dialogs/task-editor.c:94
+#: ../calendar/gui/dialogs/task-editor.c:93
 msgid "_Send Options"
 msgstr "Могућности _слања"
 
-#: ../calendar/gui/dialogs/task-editor.c:149 ../calendar/gui/print.c:3507
-#: ../e-util/e-send-options.c:553
+#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3498
+#: ../e-util/e-send-options.c:552
 msgid "Task"
 msgstr "Задатак"
 
-#: ../calendar/gui/dialogs/task-editor.c:286
+#: ../calendar/gui/dialogs/task-editor.c:285
 msgid "Print this task"
 msgstr "Одштампајте овај задатак"
 
@@ -3500,89 +3804,89 @@ msgstr ""
 "Задатак није могуће уређивати, зато што изабрани списак задатака не подржава "
 "додељене задатке"
 
-#: ../calendar/gui/dialogs/task-page.c:1007
+#: ../calendar/gui/dialogs/task-page.c:1011
 msgid "Due date is wrong"
 msgstr "Крајњи рок је погрешан"
 
-#: ../calendar/gui/dialogs/task-page.c:1175
-#: ../calendar/gui/dialogs/task-page.c:1200
+#: ../calendar/gui/dialogs/task-page.c:1179
+#: ../calendar/gui/dialogs/task-page.c:1204
 msgid "Completed date is wrong"
 msgstr "Датум завршетка је погрешан"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-task-table.c:573 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:320
+#: ../calendar/gui/e-cal-component-preview.c:336
+#: ../calendar/gui/e-task-table.c:572 ../calendar/gui/tasktypes.xml.h:19
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:309
 msgid "High"
 msgstr "Висок"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:339
-#: ../calendar/gui/e-cal-model.c:1666 ../calendar/gui/e-task-table.c:574
+#: ../calendar/gui/e-cal-component-preview.c:338
+#: ../calendar/gui/e-cal-model.c:1665 ../calendar/gui/e-task-table.c:573
 #: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:319
+#: ../mail/message-list.c:308
 msgid "Normal"
 msgstr "Обичан"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:341
-#: ../calendar/gui/e-task-table.c:575 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:318
+#: ../calendar/gui/e-cal-component-preview.c:340
+#: ../calendar/gui/e-task-table.c:574 ../calendar/gui/tasktypes.xml.h:21
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:307
 msgid "Low"
 msgstr "Низак"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:14
-#: ../calendar/gui/e-task-table.c:576 ../calendar/gui/tasktypes.xml.h:22
+#: ../calendar/gui/e-task-table.c:575 ../calendar/gui/tasktypes.xml.h:22
 #: ../e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "Неодређен"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:322
-#: ../calendar/gui/e-cal-model-tasks.c:311
-#: ../calendar/gui/e-cal-model-tasks.c:553 ../calendar/gui/e-task-table.c:214
-#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:656
-#: ../calendar/gui/print.c:3591 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-model-tasks.c:310
+#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:655
+#: ../calendar/gui/print.c:3582 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "Није започет"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:18
-#: ../calendar/gui/e-cal-component-preview.c:312
-#: ../calendar/gui/e-cal-model-tasks.c:313
-#: ../calendar/gui/e-cal-model-tasks.c:555
-#: ../calendar/gui/e-cal-model-tasks.c:633 ../calendar/gui/e-task-table.c:216
-#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:657
-#: ../calendar/gui/print.c:3594
+#: ../calendar/gui/e-cal-component-preview.c:311
+#: ../calendar/gui/e-cal-model-tasks.c:312
+#: ../calendar/gui/e-cal-model-tasks.c:554
+#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:656
+#: ../calendar/gui/print.c:3585
 msgid "In Progress"
 msgstr "У току"
 
 # timezone.
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:20
-#: ../calendar/gui/e-cal-component-preview.c:315
-#: ../calendar/gui/e-cal-model-tasks.c:315
-#: ../calendar/gui/e-cal-model-tasks.c:557
-#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
-#: ../calendar/gui/e-task-table.c:218 ../calendar/gui/e-task-table.c:233
-#: ../calendar/gui/e-task-table.c:658 ../calendar/gui/print.c:3597
+#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-cal-model-tasks.c:314
+#: ../calendar/gui/e-cal-model-tasks.c:556
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../calendar/gui/e-task-table.c:217 ../calendar/gui/e-task-table.c:232
+#: ../calendar/gui/e-task-table.c:657 ../calendar/gui/print.c:3588
 #: ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:380
+#: ../plugins/save-calendar/csv-format.c:379
 msgid "Completed"
 msgstr "Завршено"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:22
-#: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-cal-model-tasks.c:317
-#: ../calendar/gui/e-cal-model-tasks.c:559 ../calendar/gui/e-task-table.c:220
-#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:659
-#: ../calendar/gui/print.c:3600 ../mail/mail-send-recv.c:878
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-cal-model-tasks.c:316
+#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:219
+#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:658
+#: ../calendar/gui/print.c:3591 ../mail/mail-send-recv.c:855
 msgid "Canceled"
 msgstr "Отказано"
 
@@ -3594,80 +3898,80 @@ msgstr "Крајњи _рок:"
 msgid "Time zone:"
 msgstr "Временска зона:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:32
+#: ../calendar/gui/dialogs/task-page.ui.h:35
 msgid "_Status:"
 msgstr "_Стање:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:33
+#: ../calendar/gui/dialogs/task-page.ui.h:36
 msgid "Date _completed:"
 msgstr "_Датум завршетка:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:34
+#: ../calendar/gui/dialogs/task-page.ui.h:37
 msgid "_Percent complete:"
 msgstr "П_роценат завршеног:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:35
+#: ../calendar/gui/dialogs/task-page.ui.h:38
 msgid "Priorit_y:"
 msgstr "_Важност:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:36
+#: ../calendar/gui/dialogs/task-page.ui.h:39
 msgid "C_lassification:"
 msgstr "_Разврставање:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:37
+#: ../calendar/gui/dialogs/task-page.ui.h:40
 msgid "_Web Page:"
 msgstr "_Веб страница:"
 
-#: ../calendar/gui/ea-cal-view.c:324
+#: ../calendar/gui/ea-cal-view.c:281
 msgid "New Appointment"
 msgstr "Ново заказивање"
 
-#: ../calendar/gui/ea-cal-view.c:325
+#: ../calendar/gui/ea-cal-view.c:282
 msgid "New All Day Event"
 msgstr "Нови целодневни догађај"
 
-#: ../calendar/gui/ea-cal-view.c:326
+#: ../calendar/gui/ea-cal-view.c:283
 msgid "New Meeting"
 msgstr "Нови састанак"
 
-#: ../calendar/gui/ea-cal-view.c:327
+#: ../calendar/gui/ea-cal-view.c:284
 msgid "Go to Today"
 msgstr "Иди на данашњи дан"
 
-#: ../calendar/gui/ea-cal-view.c:328
+#: ../calendar/gui/ea-cal-view.c:285
 msgid "Go to Date"
 msgstr "Иди на датум"
 
-#: ../calendar/gui/ea-cal-view-event.c:298
+#: ../calendar/gui/ea-cal-view-event.c:297
 msgid "It has reminders."
 msgstr "Има подсетнике."
 
-#: ../calendar/gui/ea-cal-view-event.c:301
+#: ../calendar/gui/ea-cal-view-event.c:300
 msgid "It has recurrences."
 msgstr "Има понављања."
 
-#: ../calendar/gui/ea-cal-view-event.c:304
+#: ../calendar/gui/ea-cal-view-event.c:303
 msgid "It is a meeting."
 msgstr "То је састанак."
 
-#: ../calendar/gui/ea-cal-view-event.c:311
+#: ../calendar/gui/ea-cal-view-event.c:310
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Календарски догађај: сажетак је %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:314
+#: ../calendar/gui/ea-cal-view-event.c:313
 msgid "Calendar Event: It has no summary."
 msgstr "Календарски догађај: нема сажетка."
 
-#: ../calendar/gui/ea-cal-view-event.c:337
+#: ../calendar/gui/ea-cal-view-event.c:336
 msgid "calendar view event"
 msgstr "догађај прегледа календара"
 
-#: ../calendar/gui/ea-cal-view-event.c:569
+#: ../calendar/gui/ea-cal-view-event.c:568
 msgid "Grab Focus"
 msgstr "Фокусирај"
 
-#: ../calendar/gui/ea-day-view.c:154 ../calendar/gui/ea-week-view.c:154
+#: ../calendar/gui/ea-day-view.c:111 ../calendar/gui/ea-week-view.c:110
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -3678,41 +3982,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:161 ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-day-view.c:118 ../calendar/gui/ea-week-view.c:113
 msgid "It has no events."
 msgstr "Нема догађаја."
 
-#: ../calendar/gui/ea-day-view.c:169
+#: ../calendar/gui/ea-day-view.c:126
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Преглед радне недеље: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:176
+#: ../calendar/gui/ea-day-view.c:133
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Дневни преглед: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:210
+#: ../calendar/gui/ea-day-view.c:167
 msgid "calendar view for a work week"
 msgstr "преглед календара за радну недељу"
 
-#: ../calendar/gui/ea-day-view.c:212
+#: ../calendar/gui/ea-day-view.c:169
 msgid "calendar view for one or more days"
 msgstr "преглед календара за један или више дана"
 
-#: ../calendar/gui/ea-day-view-main-item.c:327
-#: ../calendar/gui/ea-week-view-main-item.c:354
+#: ../calendar/gui/ea-day-view-main-item.c:266
+#: ../calendar/gui/ea-week-view-main-item.c:293
 msgid "a table to view and select the current time range"
 msgstr "табела за приказ и избор текућег временског распона"
 
-#: ../calendar/gui/ea-gnome-calendar.c:48
-#: ../calendar/gui/ea-gnome-calendar.c:56
-#: ../calendar/importers/icalendar-importer.c:1114
+#: ../calendar/gui/ea-gnome-calendar.c:47
+#: ../calendar/gui/ea-gnome-calendar.c:55
+#: ../calendar/importers/icalendar-importer.c:1107
 msgid "Gnome Calendar"
 msgstr "Гномов календар"
 
-#: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../modules/calendar/e-cal-shell-view-private.c:1191
+#: ../calendar/gui/ea-gnome-calendar.c:206
+#: ../modules/calendar/e-cal-shell-view-private.c:1190
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y."
 
@@ -3727,30 +4031,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:208 ../calendar/gui/e-day-view.c:2793
-#: ../calendar/gui/e-day-view-top-item.c:859
-#: ../calendar/gui/e-week-view-main-item.c:219
-#: ../modules/calendar/e-cal-shell-view-private.c:1195
+#: ../calendar/gui/ea-gnome-calendar.c:210 ../calendar/gui/e-day-view.c:2796
+#: ../calendar/gui/e-day-view-top-item.c:858
+#: ../calendar/gui/e-week-view-main-item.c:218
+#: ../modules/calendar/e-cal-shell-view-private.c:1194
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../calendar/gui/ea-gnome-calendar.c:211
-#: ../calendar/gui/ea-gnome-calendar.c:217
-#: ../calendar/gui/ea-gnome-calendar.c:220
-#: ../modules/calendar/e-cal-shell-view-private.c:1198
-#: ../modules/calendar/e-cal-shell-view-private.c:1204
-#: ../modules/calendar/e-cal-shell-view-private.c:1207
+#: ../calendar/gui/ea-gnome-calendar.c:213
+#: ../calendar/gui/ea-gnome-calendar.c:219
+#: ../calendar/gui/ea-gnome-calendar.c:222
+#: ../modules/calendar/e-cal-shell-view-private.c:1197
+#: ../modules/calendar/e-cal-shell-view-private.c:1203
+#: ../modules/calendar/e-cal-shell-view-private.c:1206
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y."
 
-#: ../calendar/gui/ea-gnome-calendar.c: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:1224
-#: ../modules/calendar/e-cal-shell-view-private.c:1235
-#: ../modules/calendar/e-cal-shell-view-private.c:1242
-#: ../modules/calendar/e-cal-shell-view-private.c:1245
+#: ../calendar/gui/ea-gnome-calendar.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:249
+#: ../calendar/gui/ea-gnome-calendar.c:256
+#: ../calendar/gui/ea-gnome-calendar.c:259
+#: ../modules/calendar/e-cal-shell-view-private.c:1223
+#: ../modules/calendar/e-cal-shell-view-private.c:1234
+#: ../modules/calendar/e-cal-shell-view-private.c:1241
+#: ../modules/calendar/e-cal-shell-view-private.c:1244
 msgid "%d %b %Y"
 msgstr "%d. %b %Y."
 
@@ -3763,23 +4067,23 @@ 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:244 ../calendar/gui/e-day-view.c:2809
-#: ../calendar/gui/e-day-view-top-item.c:863
-#: ../calendar/gui/e-week-view-main-item.c:233
-#: ../modules/calendar/e-cal-shell-view-private.c:1231
+#: ../calendar/gui/ea-gnome-calendar.c:246 ../calendar/gui/e-day-view.c:2812
+#: ../calendar/gui/e-day-view-top-item.c:862
+#: ../calendar/gui/e-week-view-main-item.c:232
+#: ../modules/calendar/e-cal-shell-view-private.c:1230
 msgid "%d %b"
 msgstr "%d. %b"
 
-#: ../calendar/gui/ea-jump-button.c:151
+#: ../calendar/gui/ea-jump-button.c:150
 msgid "Jump button"
 msgstr "Дугме за прескакање"
 
-#: ../calendar/gui/ea-jump-button.c:160
+#: ../calendar/gui/ea-jump-button.c:159
 msgid "Click here, you can find more events."
 msgstr "Кликните овде, можете наћи још догађаја."
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:358
+#: ../calendar/gui/e-alarm-list.c:357 ../calendar/gui/misc.c:97
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -3789,7 +4093,7 @@ msgstr[2] "%d дана"
 msgstr[3] "%d дан"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:364
+#: ../calendar/gui/e-alarm-list.c:363
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -3798,131 +4102,129 @@ msgstr[1] "%d недеље"
 msgstr[2] "%d недеља"
 msgstr[3] "%d недеља"
 
-#: ../calendar/gui/e-alarm-list.c:426
+#: ../calendar/gui/e-alarm-list.c:425
 msgid "Unknown action to be performed"
 msgstr "Извршиће се непозната радња"
 
-#: ../calendar/gui/e-alarm-list.c:441
+#: ../calendar/gui/e-alarm-list.c:440
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s пре почетка састанка"
 
-#: ../calendar/gui/e-alarm-list.c:447
+#: ../calendar/gui/e-alarm-list.c:446
 #, 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:454
+#: ../calendar/gui/e-alarm-list.c:453
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s на почетку састанка"
 
-#: ../calendar/gui/e-alarm-list.c:466
+#: ../calendar/gui/e-alarm-list.c:465
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s пре краја састанка"
 
-#: ../calendar/gui/e-alarm-list.c:472
+#: ../calendar/gui/e-alarm-list.c:471
 #, 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:479
+#: ../calendar/gui/e-alarm-list.c:478
 #, 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:503
+#: ../calendar/gui/e-alarm-list.c:502
 #, 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:511
+#: ../calendar/gui/e-alarm-list.c:510
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s за непознат тип покретача"
 
-#: ../calendar/gui/ea-week-view.c:163
+#: ../calendar/gui/ea-week-view.c:119
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Месечни преглед: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:168
+#: ../calendar/gui/ea-week-view.c:124
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Недељни преглед: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:202
+#: ../calendar/gui/ea-week-view.c:158
 msgid "calendar view for a month"
 msgstr "преглед календара за месец"
 
-#: ../calendar/gui/ea-week-view.c:204
+#: ../calendar/gui/ea-week-view.c:160
 msgid "calendar view for one or more weeks"
 msgstr "преглед календара за једну или више недеља"
 
-#: ../calendar/gui/e-cal-component-preview.c:223 ../e-util/e-filter-rule.c:750
-#: ../mail/e-mail-config-page.c:126
+#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:757
+#: ../mail/e-mail-config-page.c:125
 msgid "Untitled"
 msgstr "Неименовано"
 
-#: ../calendar/gui/e-cal-component-preview.c:231
+#: ../calendar/gui/e-cal-component-preview.c:230
 msgid "Categories:"
 msgstr "Категорије:"
 
-#: ../calendar/gui/e-cal-component-preview.c:263
+#: ../calendar/gui/e-cal-component-preview.c:262
 msgid "Summary:"
 msgstr "Сажетак:"
 
-#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-cal-component-preview.c:271
 msgid "Start Date:"
 msgstr "Датум почетка:"
 
-#: ../calendar/gui/e-cal-component-preview.c:284
+#: ../calendar/gui/e-cal-component-preview.c:283
 msgid "End Date:"
 msgstr "Датум завршетка:"
 
-#: ../calendar/gui/e-cal-component-preview.c:296
+#: ../calendar/gui/e-cal-component-preview.c:295
 msgid "Due Date:"
 msgstr "Крајњи рок:"
 
-#: ../calendar/gui/e-cal-component-preview.c:308
-#: ../modules/itip-formatter/itip-view.c:1504
-#: ../modules/itip-formatter/itip-view.c:1621
+#: ../calendar/gui/e-cal-component-preview.c:307
+#: ../modules/itip-formatter/itip-view.c:1506
+#: ../modules/itip-formatter/itip-view.c:1623
 msgid "Status:"
 msgstr "Стање:"
 
-#: ../calendar/gui/e-cal-component-preview.c:335
+#: ../calendar/gui/e-cal-component-preview.c:334
 msgid "Priority:"
 msgstr "Важност:"
 
-#: ../calendar/gui/e-cal-component-preview.c:360
-#: ../mail/e-mail-config-service-page.c:672
+#: ../calendar/gui/e-cal-component-preview.c:359
+#: ../mail/e-mail-config-service-page.c:671
 msgid "Description:"
 msgstr "Опис:"
 
-#: ../calendar/gui/e-cal-component-preview.c:391
+#: ../calendar/gui/e-cal-component-preview.c:390
 msgid "Web Page:"
 msgstr "Веб страница:"
 
-#: ../calendar/gui/e-calendar-selector.c:358
-#: ../modules/calendar/e-cal-shell-view-private.c:1097
+#: ../calendar/gui/e-calendar-selector.c:356
+#: ../modules/calendar/e-cal-shell-view-private.c:1096
 #, c-format
-#| msgid "Copying an event into the calendar '{0}'"
 msgid "Copying an event into the calendar %s"
 msgstr "Умножавам догађај у календар „%s“"
 
-#: ../calendar/gui/e-calendar-selector.c:359
-#: ../modules/calendar/e-cal-shell-view-private.c:1096
+#: ../calendar/gui/e-calendar-selector.c:357
+#: ../modules/calendar/e-cal-shell-view-private.c:1095
 #, c-format
-#| msgid "Moving an event into the calendar '{0}'"
 msgid "Moving an event into the calendar %s"
 msgstr "Премештам догађај у календар „%s“"
 
@@ -3938,8 +4240,8 @@ msgstr "Датум почетка"
 #: ../calendar/gui/e-meeting-list-view.c:652
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../e-util/e-attachment-tree-view.c:586
-#: ../mail/e-mail-account-tree-view.c:159
+#: ../e-util/e-attachment-tree-view.c:585
+#: ../mail/e-mail-account-tree-view.c:158
 msgid "Type"
 msgstr "Врста"
 
@@ -3947,7 +4249,7 @@ msgstr "Врста"
 msgid "Completion date"
 msgstr "Датум завршетка"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:880
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:857
 msgid "Complete"
 msgstr "Завршено"
 
@@ -3962,17 +4264,17 @@ msgstr "% је завршено"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:18
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Priority"
 msgstr "Важност"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:4017
+#: ../calendar/gui/e-cal-model.c:4011
 #: ../calendar/gui/e-meeting-list-view.c:695
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:75
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:49
 #: ../mail/message-list.etspec.h:1
 msgid "Status"
 msgstr "Стање"
@@ -3980,7 +4282,7 @@ msgstr "Стање"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:380
 msgid "Created"
 msgstr "Направљено"
 
@@ -3990,37 +4292,37 @@ msgstr "Направљено"
 msgid "Last modified"
 msgstr "Последње измене"
 
-#: ../calendar/gui/e-calendar-view.c:446
+#: ../calendar/gui/e-calendar-view.c:448
 msgid "Cut selected events to the clipboard"
 msgstr "Сече изабране догађаје у списак исечака"
 
-#: ../calendar/gui/e-calendar-view.c:452
+#: ../calendar/gui/e-calendar-view.c:454
 msgid "Copy selected events to the clipboard"
 msgstr "Умножава изабране догађаје у списак исечака"
 
-#: ../calendar/gui/e-calendar-view.c:458
+#: ../calendar/gui/e-calendar-view.c:460
 msgid "Paste events from the clipboard"
 msgstr "Убацује догађаје из списка исечака"
 
-#: ../calendar/gui/e-calendar-view.c:464
+#: ../calendar/gui/e-calendar-view.c:466
 msgid "Delete selected events"
 msgstr "Брише изабране догађаје"
 
-#: ../calendar/gui/e-calendar-view.c:484 ../calendar/gui/e-memo-table.c:183
-#: ../calendar/gui/e-task-table.c:270
+#: ../calendar/gui/e-calendar-view.c:486 ../calendar/gui/e-memo-table.c:182
+#: ../calendar/gui/e-task-table.c:269
 msgid "Deleting selected objects"
 msgstr "Бришем изабране објекте"
 
-#: ../calendar/gui/e-calendar-view.c:646 ../calendar/gui/e-memo-table.c:878
-#: ../calendar/gui/e-task-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:648 ../calendar/gui/e-memo-table.c:877
+#: ../calendar/gui/e-task-table.c:1175
 msgid "Updating objects"
 msgstr "Ажурирам објекат"
 
 #. 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:2084 ../calendar/gui/e-memo-table.c:553
-#: ../calendar/gui/e-task-table.c:840
+#: ../calendar/gui/e-calendar-view.c:2094 ../calendar/gui/e-memo-table.c:552
+#: ../calendar/gui/e-task-table.c:839
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Организатор: %s <%s>"
@@ -4028,21 +4330,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:2088 ../calendar/gui/e-memo-table.c:558
-#: ../calendar/gui/e-task-table.c:844
+#: ../calendar/gui/e-calendar-view.c:2098 ../calendar/gui/e-memo-table.c:557
+#: ../calendar/gui/e-task-table.c:843
 #, c-format
 msgid "Organizer: %s"
 msgstr "Организатор: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2104
-#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3545
+#: ../calendar/gui/e-calendar-view.c:2114
+#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3536
 #, c-format
 msgid "Location: %s"
 msgstr "Место: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2135
+#: ../calendar/gui/e-calendar-view.c:2145
 #, c-format
 msgid "Time: %s %s"
 msgstr "Време: %s %s"
@@ -4056,81 +4358,81 @@ msgstr "Датум почетка"
 msgid "End Date"
 msgstr "Датум завршетка"
 
-#: ../calendar/gui/e-cal-model.c:467 ../calendar/gui/e-meeting-list-view.c:185
-#: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:170
-#: ../calendar/gui/e-meeting-store.c:233 ../calendar/gui/print.c:1251
-#: ../calendar/gui/print.c:1268 ../e-util/e-charset.c:52
-#: ../modules/itip-formatter/itip-view.c:3508
-#: ../modules/itip-formatter/itip-view.c:6092
-#: ../modules/plugin-manager/evolution-plugin-manager.c:100
+#: ../calendar/gui/e-cal-model.c:466 ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:169
+#: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1250
+#: ../calendar/gui/print.c:1267 ../e-util/e-charset.c:51
+#: ../modules/itip-formatter/itip-view.c:3510
+#: ../modules/itip-formatter/itip-view.c:6097
+#: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "Непознато"
 
-#: ../calendar/gui/e-cal-model.c:1668
+#: ../calendar/gui/e-cal-model.c:1667
 msgid "Recurring"
 msgstr "Периодичност"
 
-#: ../calendar/gui/e-cal-model.c:1670
+#: ../calendar/gui/e-cal-model.c:1669
 msgid "Assigned"
 msgstr "Додељено"
 
-#: ../calendar/gui/e-cal-model.c:1672 ../calendar/gui/e-cal-model-tasks.c:1163
-#: ../calendar/gui/e-meeting-list-view.c:209
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:187
-#: ../calendar/gui/e-meeting-store.c:1024
+#: ../calendar/gui/e-cal-model.c:1671 ../calendar/gui/e-cal-model-tasks.c:1165
+#: ../calendar/gui/e-meeting-list-view.c:208
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:186
+#: ../calendar/gui/e-meeting-store.c:1023
 msgid "Yes"
 msgstr "Да"
 
-#: ../calendar/gui/e-cal-model.c:1672 ../calendar/gui/e-cal-model-tasks.c:1163
-#: ../calendar/gui/e-meeting-list-view.c:210
-#: ../calendar/gui/e-meeting-store.c:189
+#: ../calendar/gui/e-cal-model.c:1671 ../calendar/gui/e-cal-model-tasks.c:1165
+#: ../calendar/gui/e-meeting-list-view.c:209
+#: ../calendar/gui/e-meeting-store.c:188
 msgid "No"
 msgstr "Не"
 
-#: ../calendar/gui/e-cal-model.c:3958
-#: ../calendar/gui/e-meeting-list-view.c:221
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
-#: ../modules/itip-formatter/itip-view.c:6080
+#: ../calendar/gui/e-cal-model.c:3952
+#: ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../modules/itip-formatter/itip-view.c:6085
 msgid "Accepted"
 msgstr "Прихваћено"
 
-#: ../calendar/gui/e-cal-model.c:3959
-#: ../calendar/gui/e-meeting-list-view.c:222
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
-#: ../modules/itip-formatter/itip-view.c:6086
+#: ../calendar/gui/e-cal-model.c:3953
+#: ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../modules/itip-formatter/itip-view.c:6091
 msgid "Declined"
 msgstr "Одбијено"
 
-#: ../calendar/gui/e-cal-model.c:3960
-#: ../calendar/gui/e-meeting-list-view.c:223
-#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-cal-model.c:3954
+#: ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
+#: ../calendar/gui/e-meeting-time-sel.c:527
 msgid "Tentative"
 msgstr "Са резервом"
 
-#: ../calendar/gui/e-cal-model.c:3961
-#: ../calendar/gui/e-meeting-list-view.c:224
-#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
-#: ../modules/itip-formatter/itip-view.c:6089
+#: ../calendar/gui/e-cal-model.c:3955
+#: ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
+#: ../modules/itip-formatter/itip-view.c:6094
 msgid "Delegated"
 msgstr "Делегирано"
 
-#: ../calendar/gui/e-cal-model.c:3962
+#: ../calendar/gui/e-cal-model.c:3956
 msgid "Needs action"
 msgstr "Захтева радњу"
 
-#: ../calendar/gui/e-cal-model-calendar.c:125
-#: ../calendar/gui/e-task-table.c:631
+#: ../calendar/gui/e-cal-model-calendar.c:124
+#: ../calendar/gui/e-task-table.c:630
 msgid "Free"
 msgstr "Слободно"
 
-#: ../calendar/gui/e-cal-model-calendar.c:128
-#: ../calendar/gui/e-meeting-time-sel.c:527 ../calendar/gui/e-task-table.c:632
+#: ../calendar/gui/e-cal-model-calendar.c:127
+#: ../calendar/gui/e-meeting-time-sel.c:528 ../calendar/gui/e-task-table.c:631
 msgid "Busy"
 msgstr "Заузето"
 
-#: ../calendar/gui/e-cal-model-tasks.c:499
+#: ../calendar/gui/e-cal-model-tasks.c:498
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4146,7 +4448,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:551
+#: ../calendar/gui/e-cal-model-tasks.c:550
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ништа"
@@ -4156,7 +4458,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:159
+#: ../calendar/gui/e-cell-date-edit-text.c:158
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d. %m. %Y. %H:%M:%S"
 
@@ -4165,11 +4467,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:162
+#: ../calendar/gui/e-cell-date-edit-text.c:161
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:170
+#: ../calendar/gui/e-cell-date-edit-text.c:169
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4179,16 +4481,16 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1983 ../calendar/gui/e-week-view.c:1554
-#: ../calendar/gui/print.c:1074 ../calendar/gui/print.c:1093
-#: ../calendar/gui/print.c:2637 ../calendar/gui/print.c:2657
+#: ../calendar/gui/e-day-view.c:1986 ../calendar/gui/e-week-view.c:1540
+#: ../calendar/gui/print.c:1073 ../calendar/gui/print.c:1092
+#: ../calendar/gui/print.c:2633 ../calendar/gui/print.c:2653
 msgid "am"
 msgstr "прп"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1986 ../calendar/gui/e-week-view.c:1557
-#: ../calendar/gui/print.c:1079 ../calendar/gui/print.c:1095
-#: ../calendar/gui/print.c:2642 ../calendar/gui/print.c:2659
+#: ../calendar/gui/e-day-view.c:1989 ../calendar/gui/e-week-view.c:1543
+#: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
+#: ../calendar/gui/print.c:2638 ../calendar/gui/print.c:2655
 msgid "pm"
 msgstr "поп"
 
@@ -4203,13 +4505,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:2776 ../calendar/gui/e-day-view-top-item.c:855
-#: ../calendar/gui/e-week-view-main-item.c:210 ../calendar/gui/print.c:2093
+#: ../calendar/gui/e-day-view.c:2779 ../calendar/gui/e-day-view-top-item.c:854
+#: ../calendar/gui/e-week-view-main-item.c:209 ../calendar/gui/print.c:2089
 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:3433
+#: ../calendar/gui/e-day-view.c:3443
 #, c-format
 msgid "Week %d"
 msgstr "%d. недеља"
@@ -4220,12 +4522,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:801
+#: ../calendar/gui/e-day-view-time-item.c:800
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i минутни размаци"
 
-#: ../calendar/gui/e-day-view-time-item.c:826
+#: ../calendar/gui/e-day-view-time-item.c:825
 msgid "Show the second time zone"
 msgstr "Прикажи другу временску зону"
 
@@ -4235,87 +4537,87 @@ 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:843
-#: ../modules/calendar/e-calendar-preferences.c:306
-#: ../modules/calendar/e-calendar-preferences.c:358
+#: ../calendar/gui/e-day-view-time-item.c:842
+#: ../modules/calendar/e-calendar-preferences.c:305
+#: ../modules/calendar/e-calendar-preferences.c:357
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ништа"
 
-#: ../calendar/gui/e-day-view-time-item.c:877
-#: ../calendar/gui/e-timezone-entry.c:324
-#: ../modules/calendar/e-calendar-preferences.c:389
+#: ../calendar/gui/e-day-view-time-item.c:876
+#: ../calendar/gui/e-timezone-entry.c:323
+#: ../modules/calendar/e-calendar-preferences.c:388
 msgid "Select..."
 msgstr "Изабери..."
 
-#: ../calendar/gui/e-meeting-list-view.c:64
+#: ../calendar/gui/e-meeting-list-view.c:63
 msgid "Chair Persons"
 msgstr "Председавајући"
 
-#: ../calendar/gui/e-meeting-list-view.c:65
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Required Participants"
 msgstr "Обавезни учесници"
 
-#: ../calendar/gui/e-meeting-list-view.c:66
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Optional Participants"
 msgstr "Могући учесници"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Resources"
 msgstr "Извори"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:127
-#: ../calendar/gui/e-meeting-store.c:1018 ../calendar/gui/print.c:1247
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:126
+#: ../calendar/gui/e-meeting-store.c:1017 ../calendar/gui/print.c:1246
 msgid "Individual"
 msgstr "Појединац"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:129
-#: ../calendar/gui/print.c:1248 ../e-util/e-table-config.ui.h:5
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
+#: ../calendar/gui/print.c:1247 ../e-util/e-table-config.ui.h:8
 msgid "Group"
 msgstr "Група"
 
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/print.c:1249
+#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
+#: ../calendar/gui/print.c:1248
 msgid "Resource"
 msgstr "Извор"
 
-#: ../calendar/gui/e-meeting-list-view.c:184
-#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
-#: ../calendar/gui/print.c:1250
+#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
+#: ../calendar/gui/print.c:1249
 msgid "Room"
 msgstr "Соба"
 
-#: ../calendar/gui/e-meeting-list-view.c:195
-#: ../calendar/gui/e-meeting-store.c:145 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/print.c:1264
+#: ../calendar/gui/e-meeting-list-view.c:194
+#: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:161
+#: ../calendar/gui/print.c:1263
 msgid "Chair"
 msgstr "Столица"
 
-#: ../calendar/gui/e-meeting-list-view.c:196
-#: ../calendar/gui/e-meeting-store.c:147 ../calendar/gui/e-meeting-store.c:164
-#: ../calendar/gui/e-meeting-store.c:1021 ../calendar/gui/print.c:1265
+#: ../calendar/gui/e-meeting-list-view.c:195
+#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-meeting-store.c:1020 ../calendar/gui/print.c:1264
 msgid "Required Participant"
 msgstr "Обавезан учесник"
 
-#: ../calendar/gui/e-meeting-list-view.c:197
-#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/print.c:1266
+#: ../calendar/gui/e-meeting-list-view.c:196
+#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/print.c:1265
 msgid "Optional Participant"
 msgstr "Могући учесник"
 
-#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/print.c:1267
+#: ../calendar/gui/e-meeting-list-view.c:197
+#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
+#: ../calendar/gui/print.c:1266
 msgid "Non-Participant"
 msgstr "Не-учесник"
 
-#: ../calendar/gui/e-meeting-list-view.c:220
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../calendar/gui/e-meeting-store.c:1031
+#: ../calendar/gui/e-meeting-list-view.c:219
+#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-store.c:1030
 msgid "Needs Action"
 msgstr "Потребна радња"
 
@@ -4328,85 +4630,85 @@ msgstr "Учесник                          "
 msgid "RSVP"
 msgstr "МВОМ"
 
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
+#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
 msgid "In Process"
 msgstr "У току"
 
-#: ../calendar/gui/e-meeting-store.c:1910
+#: ../calendar/gui/e-meeting-store.c:1909
 #, 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:1920
+#: ../calendar/gui/e-meeting-store.c:1919
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Разлог неуспеха: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1925
+#: ../calendar/gui/e-meeting-store.c:1924
 #: ../plugins/publish-calendar/publish-calendar.c:351
-#: ../smime/gui/component.c:64
+#: ../smime/gui/component.c:63
 msgid "Enter password"
 msgstr "Упишите лозинку"
 
-#: ../calendar/gui/e-meeting-time-sel.c:528
+#: ../calendar/gui/e-meeting-time-sel.c:529
 msgid "Out of Office"
 msgstr "Ван канцеларије"
 
-#: ../calendar/gui/e-meeting-time-sel.c:530
+#: ../calendar/gui/e-meeting-time-sel.c:531
 msgid "No Information"
 msgstr "Нема податка"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:566
 msgid "O_ptions"
 msgstr "_Могућности"
 
-#: ../calendar/gui/e-meeting-time-sel.c:590
+#: ../calendar/gui/e-meeting-time-sel.c:586
 msgid "Show _only working hours"
 msgstr "Прикажи _само радне сате"
 
-#: ../calendar/gui/e-meeting-time-sel.c:603
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "Show _zoomed out"
 msgstr "Прикажи _умањено"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "_Update free/busy"
 msgstr "_Ажурирај слободно/заузето"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:634
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:658
+#: ../calendar/gui/e-meeting-time-sel.c:654
 msgid "_Autopick"
 msgstr "_Самоизбор"
 
-#: ../calendar/gui/e-meeting-time-sel.c:675
+#: ../calendar/gui/e-meeting-time-sel.c:671
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:696
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid "_All people and resources"
 msgstr "_Све људе и изворе"
 
-#: ../calendar/gui/e-meeting-time-sel.c:707
+#: ../calendar/gui/e-meeting-time-sel.c:703
 msgid "All _people and one resource"
 msgstr "Све _људе и један извор"
 
-#: ../calendar/gui/e-meeting-time-sel.c:718
+#: ../calendar/gui/e-meeting-time-sel.c:714
 msgid "_Required people"
 msgstr "_Обавезне људе"
 
-#: ../calendar/gui/e-meeting-time-sel.c:728
+#: ../calendar/gui/e-meeting-time-sel.c:724
 msgid "Required people and _one resource"
 msgstr "Обавезне људе и _један извор"
 
-#: ../calendar/gui/e-meeting-time-sel.c:767
+#: ../calendar/gui/e-meeting-time-sel.c:763
 msgid "_Start time:"
 msgstr "_Време почетка:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:796
+#: ../calendar/gui/e-meeting-time-sel.c:792
 msgid "_End time:"
 msgstr "Време _завршетка:"
 
@@ -4419,7 +4721,7 @@ msgstr ""
 "Сажетак: %s\n"
 "Место: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3534
+#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3525
 #, c-format
 msgid "Summary: %s"
 msgstr "Сажетак: %s"
@@ -4448,46 +4750,46 @@ msgstr "Заједничко име"
 msgid "Language"
 msgstr "Језик"
 
-#: ../calendar/gui/e-memo-table.c:434
-#: ../modules/calendar/e-cal-shell-content.c:482
-#: ../modules/calendar/e-memo-shell-view-actions.c:212
-#: ../modules/calendar/e-memo-shell-view-actions.c:227
-#: ../modules/calendar/e-memo-shell-view.c:307
+#: ../calendar/gui/e-memo-table.c:433
+#: ../modules/calendar/e-cal-shell-content.c:481
+#: ../modules/calendar/e-memo-shell-view-actions.c:211
+#: ../modules/calendar/e-memo-shell-view-actions.c:226
+#: ../modules/calendar/e-memo-shell-view.c:306
 msgid "Memos"
 msgstr "Белешке"
 
-#: ../calendar/gui/e-memo-table.c:515 ../calendar/gui/e-task-table.c:803
+#: ../calendar/gui/e-memo-table.c:514 ../calendar/gui/e-task-table.c:802
 msgid "* No Summary *"
 msgstr "* Без сажетка *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:602 ../calendar/gui/e-task-table.c:887
+#: ../calendar/gui/e-memo-table.c:601 ../calendar/gui/e-task-table.c:886
 msgid "Start: "
 msgstr "Почетак: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:621 ../calendar/gui/e-task-table.c:905
+#: ../calendar/gui/e-memo-table.c:620 ../calendar/gui/e-task-table.c:904
 msgid "Due: "
 msgstr "Рок: "
 
-#: ../calendar/gui/e-memo-table.c:742
+#: ../calendar/gui/e-memo-table.c:741
 msgid "Cut selected memos to the clipboard"
 msgstr "Сече изабране белешке у списак исечака"
 
-#: ../calendar/gui/e-memo-table.c:748
+#: ../calendar/gui/e-memo-table.c:747
 msgid "Copy selected memos to the clipboard"
 msgstr "Умножава изабране белешке у списак исечака"
 
-#: ../calendar/gui/e-memo-table.c:754
+#: ../calendar/gui/e-memo-table.c:753
 msgid "Paste memos from the clipboard"
 msgstr "Убацује белешке из списка исечака"
 
-#: ../calendar/gui/e-memo-table.c:760
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#: ../calendar/gui/e-memo-table.c:759
+#: ../modules/calendar/e-memo-shell-view-actions.c:588
 msgid "Delete selected memos"
 msgstr "Брише изабране белешке"
 
-#: ../calendar/gui/e-memo-table.c:766
+#: ../calendar/gui/e-memo-table.c:765
 msgid "Select all visible memos"
 msgstr "Бира све видљиве белешке"
 
@@ -4503,44 +4805,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:604
+#: ../calendar/gui/e-task-table.c:603
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:721 ../calendar/gui/print.c:2418
-#: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:1078
+#: ../calendar/gui/e-task-table.c:720 ../calendar/gui/print.c:2414
+#: ../calendar/importers/icalendar-importer.c:78
+#: ../calendar/importers/icalendar-importer.c:1071
 #: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:439
-#: ../modules/calendar/e-task-shell-view-actions.c:235
-#: ../modules/calendar/e-task-shell-view-actions.c:250
-#: ../modules/calendar/e-task-shell-view.c:462
+#: ../modules/calendar/e-cal-shell-content.c:438
+#: ../modules/calendar/e-task-shell-view-actions.c:234
+#: ../modules/calendar/e-task-shell-view-actions.c:249
+#: ../modules/calendar/e-task-shell-view.c:461
 msgid "Tasks"
 msgstr "Задаци"
 
-#: ../calendar/gui/e-task-table.c:1040
+#: ../calendar/gui/e-task-table.c:1039
 msgid "Cut selected tasks to the clipboard"
 msgstr "Сече изабране задатке у списак исечака"
 
-#: ../calendar/gui/e-task-table.c:1046
+#: ../calendar/gui/e-task-table.c:1045
 msgid "Copy selected tasks to the clipboard"
 msgstr "Умножава изабране задатке у списак исечака"
 
-#: ../calendar/gui/e-task-table.c:1052
+#: ../calendar/gui/e-task-table.c:1051
 msgid "Paste tasks from the clipboard"
 msgstr "Убацује задатке из списка исечака"
 
-#: ../calendar/gui/e-task-table.c:1058
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../calendar/gui/e-task-table.c:1057
+#: ../modules/calendar/e-task-shell-view-actions.c:712
 msgid "Delete selected tasks"
 msgstr "Брише изабране задатке"
 
-#: ../calendar/gui/e-task-table.c:1064
+#: ../calendar/gui/e-task-table.c:1063
 msgid "Select all visible tasks"
 msgstr "Бира све видљиве задатке"
 
-#: ../calendar/gui/e-timezone-entry.c:335
+#: ../calendar/gui/e-timezone-entry.c:334
 msgid "Select Timezone"
 msgstr "Изабери временску зону"
 
@@ -4549,40 +4851,40 @@ 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:227 ../calendar/gui/print.c:2072
+#: ../calendar/gui/e-week-view-main-item.c:226 ../calendar/gui/print.c:2068
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2369
+#: ../calendar/gui/gnome-cal.c:2371
 msgid "Purging"
 msgstr "Брисање"
 
-#: ../calendar/gui/itip-utils.c:646 ../calendar/gui/itip-utils.c:704
-#: ../calendar/gui/itip-utils.c:838
+#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
+#: ../calendar/gui/itip-utils.c:841
 msgid "An organizer must be set."
 msgstr "Организатор мора бити одређен."
 
-#: ../calendar/gui/itip-utils.c:695
+#: ../calendar/gui/itip-utils.c:698
 msgid "At least one attendee is necessary"
 msgstr "Најмање један учесник је неопходан"
 
-#: ../calendar/gui/itip-utils.c:926 ../calendar/gui/itip-utils.c:1087
+#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
 msgid "Event information"
 msgstr "Подаци о догађају"
 
-#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
+#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
 msgid "Task information"
 msgstr "Подаци о задатку"
 
-#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
+#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1096
 msgid "Memo information"
 msgstr "Подаци о белешци"
 
-#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1111
+#: ../calendar/gui/itip-utils.c:938 ../calendar/gui/itip-utils.c:1114
 msgid "Free/Busy information"
 msgstr "Подаци слободно/заузето"
 
-#: ../calendar/gui/itip-utils.c:938
+#: ../calendar/gui/itip-utils.c:941
 msgid "Calendar information"
 msgstr "Подаци о календару"
 
@@ -4590,7 +4892,7 @@ msgstr "Подаци о календару"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Accepted: Meeting Name".
-#: ../calendar/gui/itip-utils.c:975
+#: ../calendar/gui/itip-utils.c:978
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Прихваћено"
@@ -4599,7 +4901,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:982
+#: ../calendar/gui/itip-utils.c:985
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Прихваћено с резервом"
@@ -4611,7 +4913,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:989 ../calendar/gui/itip-utils.c:1037
+#: ../calendar/gui/itip-utils.c:992 ../calendar/gui/itip-utils.c:1040
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Одбијено"
@@ -4620,7 +4922,7 @@ msgstr "Одбијено"
 #. * line of a meeting request or update email.
 #. * The full subject line would be:
 #. * "Delegated: Meeting Name".
-#: ../calendar/gui/itip-utils.c:996
+#: ../calendar/gui/itip-utils.c:999
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Делегирано"
@@ -4628,7 +4930,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:1009
+#: ../calendar/gui/itip-utils.c:1012
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Освежено"
@@ -4636,7 +4938,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:1016
+#: ../calendar/gui/itip-utils.c:1019
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Откажи"
@@ -4644,7 +4946,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:1023
+#: ../calendar/gui/itip-utils.c:1026
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Освежи"
@@ -4652,154 +4954,154 @@ 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:1030
+#: ../calendar/gui/itip-utils.c:1033
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Против-предлог"
 
-#: ../calendar/gui/itip-utils.c:1108
+#: ../calendar/gui/itip-utils.c:1111
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Подаци слободно/заузето (%s до %s)"
 
-#: ../calendar/gui/itip-utils.c:1116
+#: ../calendar/gui/itip-utils.c:1119
 msgid "iCalendar information"
 msgstr "Подаци иКалендара"
 
-#: ../calendar/gui/itip-utils.c:1144
+#: ../calendar/gui/itip-utils.c:1147
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "Не могу да сачувам унос, нови догађај се сукобљава са неким другим."
 
-#: ../calendar/gui/itip-utils.c:1152
+#: ../calendar/gui/itip-utils.c:1155
 #, c-format
 msgid "Unable to book a resource, error: %s"
 msgstr "Не могу да сачувам унос, грешка: %s"
 
-#: ../calendar/gui/itip-utils.c:1324
+#: ../calendar/gui/itip-utils.c:1327
 msgid "You must be an attendee of the event."
 msgstr "Морате бити учесник догађаја."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:660
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:660
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:660
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:660
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:660
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:661
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:661
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:661
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:661
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:661
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:662
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:662
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:662
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:662
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:662
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "31st"
 msgstr "31."
 
@@ -4807,102 +5109,102 @@ msgstr "31."
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_BAD_WEEKDAY
 #. G_DATE_MONDAY
-#: ../calendar/gui/print.c:727
+#: ../calendar/gui/print.c:726
 msgid "Mo"
 msgstr "По"
 
 #. G_DATE_TUESDAY
-#: ../calendar/gui/print.c:728
+#: ../calendar/gui/print.c:727
 msgid "Tu"
 msgstr "Ут"
 
 #. G_DATE_WEDNESDAY
-#: ../calendar/gui/print.c:729
+#: ../calendar/gui/print.c:728
 msgid "We"
 msgstr "Ср"
 
 #. G_DATE_THURSDAY
-#: ../calendar/gui/print.c:730
+#: ../calendar/gui/print.c:729
 msgid "Th"
 msgstr "Че"
 
 #. G_DATE_FRIDAY
-#: ../calendar/gui/print.c:731
+#: ../calendar/gui/print.c:730
 msgid "Fr"
 msgstr "Пе"
 
 #. G_DATE_SATURDAY
-#: ../calendar/gui/print.c:732
+#: ../calendar/gui/print.c:731
 msgid "Sa"
 msgstr "Су"
 
 #. G_DATE_SUNDAY
-#: ../calendar/gui/print.c:733
+#: ../calendar/gui/print.c:732
 msgid "Su"
 msgstr "Не"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3328
+#: ../calendar/gui/print.c:3319
 msgid " to "
 msgstr " до "
 
 #. Translators: This is part of "START to END
 #. * (Completed COMPLETED)", where COMPLETED is a
 #. * completed date/time.
-#: ../calendar/gui/print.c:3338
+#: ../calendar/gui/print.c:3329
 msgid " (Completed "
 msgstr " (Завршено је "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3344
+#: ../calendar/gui/print.c:3335
 msgid "Completed "
 msgstr "Завршено је "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3354
+#: ../calendar/gui/print.c:3345
 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:3361
+#: ../calendar/gui/print.c:3352
 msgid "Due "
 msgstr "Рок "
 
-#: ../calendar/gui/print.c:3564
+#: ../calendar/gui/print.c:3555
 msgid "Attendees: "
 msgstr "Присутни: "
 
-#: ../calendar/gui/print.c:3608
+#: ../calendar/gui/print.c:3599
 #, c-format
 msgid "Status: %s"
 msgstr "Стање: %s"
 
-#: ../calendar/gui/print.c:3624
+#: ../calendar/gui/print.c:3615
 #, c-format
 msgid "Priority: %s"
 msgstr "Важност: %s"
 
-#: ../calendar/gui/print.c:3642
+#: ../calendar/gui/print.c:3633
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Постотак завршеног: %i"
 
-#: ../calendar/gui/print.c:3656
+#: ../calendar/gui/print.c:3647
 #, c-format
 msgid "URL: %s"
 msgstr "Адреса: %s"
 
-#: ../calendar/gui/print.c:3670
+#: ../calendar/gui/print.c:3661
 #, c-format
 msgid "Categories: %s"
 msgstr "Категорије: %s"
 
-#: ../calendar/gui/print.c:3681
+#: ../calendar/gui/print.c:3672
 msgid "Contacts: "
 msgstr "Контакти: "
 
@@ -4915,190 +5217,190 @@ msgstr "У току"
 msgid "% Completed"
 msgstr "% је завршено"
 
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:38
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:69
 msgid "is greater than"
 msgstr "је веће од"
 
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:39
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:70
 msgid "is less than"
 msgstr "је мање од"
 
-#: ../calendar/importers/icalendar-importer.c:78
+#: ../calendar/importers/icalendar-importer.c:77
 msgid "Appointments and Meetings"
 msgstr "Заказивање и састанци"
 
-#: ../calendar/importers/icalendar-importer.c:462
-#: ../calendar/importers/icalendar-importer.c:901
+#: ../calendar/importers/icalendar-importer.c:461
+#: ../calendar/importers/icalendar-importer.c:900
 msgid "Opening calendar"
 msgstr "Отварање календара"
 
-#: ../calendar/importers/icalendar-importer.c:610
+#: ../calendar/importers/icalendar-importer.c:609
 msgid "iCalendar files (.ics)"
 msgstr "Датотеке иКалендара (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:611
+#: ../calendar/importers/icalendar-importer.c:610
 msgid "Evolution iCalendar importer"
 msgstr "Увозник иКалендара Еволуције"
 
-#: ../calendar/importers/icalendar-importer.c:703
+#: ../calendar/importers/icalendar-importer.c:702
 msgid "Reminder!"
 msgstr "Подсетник!"
 
-#: ../calendar/importers/icalendar-importer.c:787
+#: ../calendar/importers/icalendar-importer.c:786
 msgid "vCalendar files (.vcs)"
 msgstr "Датотеке вКалендара (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:788
+#: ../calendar/importers/icalendar-importer.c:787
 msgid "Evolution vCalendar importer"
 msgstr "Увозник вКалендара Еволуције"
 
-#: ../calendar/importers/icalendar-importer.c:1071
+#: ../calendar/importers/icalendar-importer.c:1064
 msgid "Calendar Events"
 msgstr "Догађаји календара"
 
-#: ../calendar/importers/icalendar-importer.c:1115
+#: ../calendar/importers/icalendar-importer.c:1108
 msgid "Evolution Calendar intelligent importer"
 msgstr "Интелигентни увозник календара Еволуције"
 
-#: ../calendar/importers/icalendar-importer.c:1186
-#: ../calendar/importers/icalendar-importer.c:1500
+#: ../calendar/importers/icalendar-importer.c:1179
+#: ../calendar/importers/icalendar-importer.c:1493
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Састанак"
 
-#: ../calendar/importers/icalendar-importer.c:1186
-#: ../calendar/importers/icalendar-importer.c:1500
+#: ../calendar/importers/icalendar-importer.c:1179
+#: ../calendar/importers/icalendar-importer.c:1493
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Догађај"
 
-#: ../calendar/importers/icalendar-importer.c:1189
-#: ../calendar/importers/icalendar-importer.c:1501
+#: ../calendar/importers/icalendar-importer.c:1182
+#: ../calendar/importers/icalendar-importer.c:1494
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Задатак"
 
-#: ../calendar/importers/icalendar-importer.c:1192
-#: ../calendar/importers/icalendar-importer.c:1502
+#: ../calendar/importers/icalendar-importer.c:1185
+#: ../calendar/importers/icalendar-importer.c:1495
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Белешка"
 
-#: ../calendar/importers/icalendar-importer.c:1201
+#: ../calendar/importers/icalendar-importer.c:1194
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "има понављања"
 
-#: ../calendar/importers/icalendar-importer.c:1206
+#: ../calendar/importers/icalendar-importer.c:1199
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "је примерак"
 
-#: ../calendar/importers/icalendar-importer.c:1211
+#: ../calendar/importers/icalendar-importer.c:1204
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "има подсетнике"
 
-#: ../calendar/importers/icalendar-importer.c:1216
+#: ../calendar/importers/icalendar-importer.c:1209
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "има прилоге"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1229
+#: ../calendar/importers/icalendar-importer.c:1222
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Јавно"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1232
+#: ../calendar/importers/icalendar-importer.c:1225
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Лично"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1235
+#: ../calendar/importers/icalendar-importer.c:1228
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Поверљиво"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1239
+#: ../calendar/importers/icalendar-importer.c:1232
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Разврставање"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1244
-#: ../calendar/importers/icalendar-importer.c:1544
+#: ../calendar/importers/icalendar-importer.c:1237
+#: ../calendar/importers/icalendar-importer.c:1537
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Сажетак"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1250
+#: ../calendar/importers/icalendar-importer.c:1243
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Место"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1258
-#: ../calendar/importers/icalendar-importer.c:1539
+#: ../calendar/importers/icalendar-importer.c:1251
+#: ../calendar/importers/icalendar-importer.c:1532
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Почетак"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1269
+#: ../calendar/importers/icalendar-importer.c:1262
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Рок"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1281
+#: ../calendar/importers/icalendar-importer.c:1274
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Крај"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1291
+#: ../calendar/importers/icalendar-importer.c:1284
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Категорије"
 
 # timezone.
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1315
+#: ../calendar/importers/icalendar-importer.c:1308
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Завршено"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1323
+#: ../calendar/importers/icalendar-importer.c:1316
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "Адреса"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1334
-#: ../calendar/importers/icalendar-importer.c:1337
+#: ../calendar/importers/icalendar-importer.c:1327
+#: ../calendar/importers/icalendar-importer.c:1330
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Организатор"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1357
-#: ../calendar/importers/icalendar-importer.c:1360
+#: ../calendar/importers/icalendar-importer.c:1350
+#: ../calendar/importers/icalendar-importer.c:1353
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Учесници"
 
-#: ../calendar/importers/icalendar-importer.c:1374
+#: ../calendar/importers/icalendar-importer.c:1367
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Опис"
 
-#: ../calendar/importers/icalendar-importer.c:1534
+#: ../calendar/importers/icalendar-importer.c:1527
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Врста"
@@ -5107,18 +5409,17 @@ msgstr "Врста"
 # * Don't include in any C files.
 #.
 #. *
-#. * This program is free software; you can redistribute it and/or
-#. * modify it under the terms of the GNU Lesser General Public
-#. * License as published by the Free Software Foundation; either
-#. * version 2 of the License, or (at your option) version 3.
+#. * This program is free software; you can redistribute it and/or modify it
+#. * under the terms of the GNU Lesser General Public License as published by
+#. * the Free Software Foundation.
 #. *
-#. * This program is distributed in the hope that it will be useful,
-#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
-#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#. * Lesser General Public License for more details.
+#. * This program is distributed in the hope that it will be useful, but
+#. * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+#. * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#. * for more details.
 #. *
-#. * You should have received a copy of the GNU Lesser General Public
-#. * License along with the program; if not, see <http://www.gnu.org/licenses/>
+#. * You should have received a copy of the GNU Lesser General Public License
+#. * along with this program; if not, see <http://www.gnu.org/licenses/>.
 #. *
 #. *
 #. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -5129,1688 +5430,1684 @@ msgstr "Врста"
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:25
 msgid "Africa/Abidjan"
 msgstr "Африка/Абиџан"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:26
 msgid "Africa/Accra"
 msgstr "Африка/Акра"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:27
 msgid "Africa/Addis_Ababa"
 msgstr "Африка/Адис_Абеба"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:28
 msgid "Africa/Algiers"
 msgstr "Африка/Алжир"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:29
 msgid "Africa/Asmera"
 msgstr "Африка/Асмера"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:30
 msgid "Africa/Bamako"
 msgstr "Африка/Бамако"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:31
 msgid "Africa/Bangui"
 msgstr "Африка/Бангуи"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:32
 msgid "Africa/Banjul"
 msgstr "Африка/Банжул"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:33
 msgid "Africa/Bissau"
 msgstr "Африка/Бисао"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:34
 msgid "Africa/Blantyre"
 msgstr "Африка/Блантир"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:35
 msgid "Africa/Brazzaville"
 msgstr "Африка/Бразавил"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:36
 msgid "Africa/Bujumbura"
 msgstr "Африка/Буџумбура"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:37
 msgid "Africa/Cairo"
 msgstr "Африка/Каиро"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:38
 msgid "Africa/Casablanca"
 msgstr "Африка/Казабланка"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:39
 msgid "Africa/Ceuta"
 msgstr "Африка/Кеута"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:40
 msgid "Africa/Conakry"
 msgstr "Африка/Конакри"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:41
 msgid "Africa/Dakar"
 msgstr "Африка/Дакар"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:42
 msgid "Africa/Dar_es_Salaam"
 msgstr "Африка/Дар_ес_Салам"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:43
 msgid "Africa/Djibouti"
 msgstr "Африка/Џибути"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:44
 msgid "Africa/Douala"
 msgstr "Африка/Дуала"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:45
 msgid "Africa/El_Aaiun"
 msgstr "Африка/Ел_Ајун"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:46
 msgid "Africa/Freetown"
 msgstr "Африка/Фритаун"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:47
 msgid "Africa/Gaborone"
 msgstr "Африка/Габорон"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:48
 msgid "Africa/Harare"
 msgstr "Африка/Хараре"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:49
 msgid "Africa/Johannesburg"
 msgstr "Африка/Јоханесбург"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:50
 msgid "Africa/Kampala"
 msgstr "Африка/Кампала"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:51
 msgid "Africa/Khartoum"
 msgstr "Африка/Картум"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:52
 msgid "Africa/Kigali"
 msgstr "Африка/Кигали"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:53
 msgid "Africa/Kinshasa"
 msgstr "Африка/Киншаса"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:54
 msgid "Africa/Lagos"
 msgstr "Африка/Лагос"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:55
 msgid "Africa/Libreville"
 msgstr "Африка/Либревил"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:56
 msgid "Africa/Lome"
 msgstr "Африка/Ломе"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:57
 msgid "Africa/Luanda"
 msgstr "Африка/Луанда"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:58
 msgid "Africa/Lubumbashi"
 msgstr "Африка/Лубумбаши"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:59
 msgid "Africa/Lusaka"
 msgstr "Африка/Лусака"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:60
 msgid "Africa/Malabo"
 msgstr "Африка/Малабо"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:61
 msgid "Africa/Maputo"
 msgstr "Африка/Мапуто"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:62
 msgid "Africa/Maseru"
 msgstr "Африка/Масеру"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:63
 msgid "Africa/Mbabane"
 msgstr "Африка/Мбабане"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:64
 msgid "Africa/Mogadishu"
 msgstr "Африка/Могадишо"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:65
 msgid "Africa/Monrovia"
 msgstr "Африка/Монровија"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:66
 msgid "Africa/Nairobi"
 msgstr "Африка/Најроби"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:67
 msgid "Africa/Ndjamena"
 msgstr "Африка/Нџамена"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:68
 msgid "Africa/Niamey"
 msgstr "Африка/Ниамеј"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:69
 msgid "Africa/Nouakchott"
 msgstr "Африка/Нуакшот"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:70
 msgid "Africa/Ouagadougou"
 msgstr "Африка/Уагадугу"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:71
 msgid "Africa/Porto-Novo"
 msgstr "Африка/Порто-Ново"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:72
 msgid "Africa/Sao_Tome"
 msgstr "Африка/Сао_Томе"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:73
 msgid "Africa/Timbuktu"
 msgstr "Африка/Тимбукту"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:74
 msgid "Africa/Tripoli"
 msgstr "Африка/Триполи"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:75
 msgid "Africa/Tunis"
 msgstr "Африка/Тунис"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:76
 msgid "Africa/Windhoek"
 msgstr "Африка/Виндоек"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:77
 msgid "America/Adak"
 msgstr "Америка/Адак"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:78
 msgid "America/Anchorage"
 msgstr "Америка/Анкорејџ"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:79
 msgid "America/Anguilla"
 msgstr "Америка/Ангила"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:80
 msgid "America/Antigua"
 msgstr "Америка/Антигва"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:81
 msgid "America/Araguaina"
 msgstr "Америка/Арагвајна"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:82
 msgid "America/Aruba"
 msgstr "Америка/Аруба"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:83
 msgid "America/Asuncion"
 msgstr "Америка/Асунсион"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:84
 msgid "America/Barbados"
 msgstr "Америка/Барбадос"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:85
 msgid "America/Belem"
 msgstr "Америка/Белем"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:86
 msgid "America/Belize"
 msgstr "Америка/Белиз"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:87
 msgid "America/Boa_Vista"
 msgstr "Америка/Боа_Виста"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:88
 msgid "America/Bogota"
 msgstr "Америка/Богота"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:89
 msgid "America/Boise"
 msgstr "Америка/Буаз"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:90
 msgid "America/Buenos_Aires"
 msgstr "Америка/Буенос_Аирес"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:91
 msgid "America/Cambridge_Bay"
 msgstr "Америка/Кејмбриџ_залив"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:92
 msgid "America/Cancun"
 msgstr "Америка/Канкун"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:93
 msgid "America/Caracas"
 msgstr "Америка/Каракас"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:94
 msgid "America/Catamarca"
 msgstr "Америка/Катамарка"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:95
 msgid "America/Cayenne"
 msgstr "Америка/Кајен"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:96
 msgid "America/Cayman"
 msgstr "Америка/Кајман"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:97
 msgid "America/Chicago"
 msgstr "Америка/Чикаго"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:98
 msgid "America/Chihuahua"
 msgstr "Америка/Чиуауа"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:99
 msgid "America/Cordoba"
 msgstr "Америка/Кордоба"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:100
 msgid "America/Costa_Rica"
 msgstr "Америка/Костарика"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:101
 msgid "America/Cuiaba"
 msgstr "Америка/Кујаба"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:102
 msgid "America/Curacao"
 msgstr "Америка/Куракао"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:103
 msgid "America/Danmarkshavn"
 msgstr "Америка/Денмаркшон"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:104
 msgid "America/Dawson"
 msgstr "Америка/Досон"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:105
 msgid "America/Dawson_Creek"
 msgstr "Америка/Досон_Крик"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:106
 msgid "America/Denver"
 msgstr "Америка/Денвер"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:107
 msgid "America/Detroit"
 msgstr "Америка/Детроит"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:108
 msgid "America/Dominica"
 msgstr "Америка/Доминика"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:109
 msgid "America/Edmonton"
 msgstr "Америка/Едмонтон"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:110
 msgid "America/Eirunepe"
 msgstr "Америка/Ејрунепе"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:111
 msgid "America/El_Salvador"
 msgstr "Америка/Ел_Салвадор"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:112
 msgid "America/Fortaleza"
 msgstr "Америка/Форталеза"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:113
 msgid "America/Glace_Bay"
 msgstr "Америка/Глас_Беј"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:114
 msgid "America/Godthab"
 msgstr "Америка/Готаб"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:115
 msgid "America/Goose_Bay"
 msgstr "Америка/Гус_Беј"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:116
 msgid "America/Grand_Turk"
 msgstr "Америка/Велики_Турк"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:117
 msgid "America/Grenada"
 msgstr "Америка/Гренада"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:118
 msgid "America/Guadeloupe"
 msgstr "Америка/Гвадалупа"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:119
 msgid "America/Guatemala"
 msgstr "Америка/Гватемала"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:120
 msgid "America/Guayaquil"
 msgstr "Америка/Гвајакил"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:121
 msgid "America/Guyana"
 msgstr "Америка/Гвајана"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:122
 msgid "America/Halifax"
 msgstr "Америка/Халифакс"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:123
 msgid "America/Havana"
 msgstr "Америка/Хавана"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:124
 msgid "America/Hermosillo"
 msgstr "Америка/Ермосиљо"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:125
 msgid "America/Indiana/Indianapolis"
 msgstr "Америка/Индијана/Индијанаполис"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Knox"
 msgstr "Америка/Индијана/Нокс"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Marengo"
 msgstr "Америка/Индијана/Маренго"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Vevay"
 msgstr "Америка/Индијана/Вивеј"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:129
 msgid "America/Indianapolis"
 msgstr "Америка/Индијанаполис"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:130
 msgid "America/Inuvik"
 msgstr "Америка/Инувик"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:131
 msgid "America/Iqaluit"
 msgstr "Америка/Икалуит"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:132
 msgid "America/Jamaica"
 msgstr "Америка/Јамајка"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:133
 msgid "America/Jujuy"
 msgstr "Америка/Хухуи"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:134
 msgid "America/Juneau"
 msgstr "Америка/Џуно"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:135
 msgid "America/Kentucky/Louisville"
 msgstr "Америка/Кентаки/Лиусвил"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Monticello"
 msgstr "Америка/Кентаки/Монтићело"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:137
 msgid "America/La_Paz"
 msgstr "Америка/Ла_Паз"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:138
 msgid "America/Lima"
 msgstr "Америка/Лима"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:139
 msgid "America/Los_Angeles"
 msgstr "Америка/Лос_Анђелес"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:140
 msgid "America/Louisville"
 msgstr "Америка/Луисвил"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:141
 msgid "America/Maceio"
 msgstr "Америка/Маћејо"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:142
 msgid "America/Managua"
 msgstr "Америка/Манагва"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:143
 msgid "America/Manaus"
 msgstr "Америка/Манаус"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:144
 msgid "America/Martinique"
 msgstr "Америка/Мартиник"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:145
 msgid "America/Mazatlan"
 msgstr "Америка/Мацатлан"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:146
 msgid "America/Mendoza"
 msgstr "Америка/Мендоза"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:147
 msgid "America/Menominee"
 msgstr "Америка/Меномини"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:148
 msgid "America/Merida"
 msgstr "Америка/Мерида"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:149
 msgid "America/Mexico_City"
 msgstr "Америка/Мексико_Сити"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:150
 msgid "America/Miquelon"
 msgstr "Америка/Микелон"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:151
 msgid "America/Monterrey"
 msgstr "Америка/Монтереј"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:152
 msgid "America/Montevideo"
 msgstr "Америка/Монтевидео"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:153
 msgid "America/Montreal"
 msgstr "Америка/Монтреал"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:154
 msgid "America/Montserrat"
 msgstr "Америка/Монсерат"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:155
 msgid "America/Nassau"
 msgstr "Америка/Насау"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:156
 msgid "America/New_York"
 msgstr "Америка/Њујорк"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:157
 msgid "America/Nipigon"
 msgstr "Америка/Нипигон"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:158
 msgid "America/Nome"
 msgstr "Америка/Ном"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:159
 msgid "America/Noronha"
 msgstr "Америна/Норона"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:160
 msgid "America/North_Dakota/Center"
 msgstr "Америка/Северна_Дакота/Центар"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:161
 msgid "America/Panama"
 msgstr "Америка/Панама"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:162
 msgid "America/Pangnirtung"
 msgstr "Америка/Пангниртунг"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:163
 msgid "America/Paramaribo"
 msgstr "Америка/Парамарибо"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:164
 msgid "America/Phoenix"
 msgstr "Америка/Феникс"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:165
 msgid "America/Port-au-Prince"
 msgstr "Америка/Портопренс"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:166
 msgid "America/Port_of_Spain"
 msgstr "Америка/Порт_Оф_Спејн"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:167
 msgid "America/Porto_Velho"
 msgstr "Америка/Портовело"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:168
 msgid "America/Puerto_Rico"
 msgstr "Америка/Порторико"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:169
 msgid "America/Rainy_River"
 msgstr "Америка/Рејни_Ривер"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:170
 msgid "America/Rankin_Inlet"
 msgstr "Америка/Ренкин_Инлет"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:171
 msgid "America/Recife"
 msgstr "Америка/Ресифи"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:172
 msgid "America/Regina"
 msgstr "Америка/Регина"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:173
 msgid "America/Rio_Branco"
 msgstr "Америка/Рио_Бранко"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:174
 msgid "America/Rosario"
 msgstr "Америка/Розарио"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:175
 msgid "America/Santiago"
 msgstr "Америка/Сантјаго"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:176
 msgid "America/Santo_Domingo"
 msgstr "Америка/Санто_Доминго"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:177
 msgid "America/Sao_Paulo"
 msgstr "Америка/Сао_Паоло"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:178
 msgid "America/Scoresbysund"
 msgstr "Америка/Скорсбајсанд"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:179
 msgid "America/Shiprock"
 msgstr "Америка/Шипрок"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:180
 msgid "America/St_Johns"
 msgstr "Америка/Св_Џонс"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:181
 msgid "America/St_Kitts"
 msgstr "Америка/Св_Китс"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:182
 msgid "America/St_Lucia"
 msgstr "Америка/Св_Луција"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:183
 msgid "America/St_Thomas"
 msgstr "Америка/Св_Томас"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:184
 msgid "America/St_Vincent"
 msgstr "Америка/Св_Винсент"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:185
 msgid "America/Swift_Current"
 msgstr "Америка/Свифт_Карент"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:186
 msgid "America/Tegucigalpa"
 msgstr "Америка/Тегусигалпа"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:187
 msgid "America/Thule"
 msgstr "Америка/Тула"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:188
 msgid "America/Thunder_Bay"
 msgstr "Америка/Тандер_Беј"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:189
 msgid "America/Tijuana"
 msgstr "Америка/Тихуана"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:190
 msgid "America/Tortola"
 msgstr "Америка/Тортола"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:191
 msgid "America/Vancouver"
 msgstr "Америка/Ванкувер"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:192
 msgid "America/Whitehorse"
 msgstr "Америка/Вајтхорс"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:193
 msgid "America/Winnipeg"
 msgstr "Америка/Винипег"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:194
 msgid "America/Yakutat"
 msgstr "Америка/Јакутат"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:195
 msgid "America/Yellowknife"
 msgstr "Америка/Јелоунајф"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:196
 msgid "Antarctica/Casey"
 msgstr "Антарктик/Кејси"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:197
 msgid "Antarctica/Davis"
 msgstr "Антарктик/Дејвис"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:198
 msgid "Antarctica/DumontDUrville"
 msgstr "Антарктик/Димондирвиј"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:199
 msgid "Antarctica/Mawson"
 msgstr "Антарктик/Мосон"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:200
 msgid "Antarctica/McMurdo"
 msgstr "Антарктик/Мекмардо"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:201
 msgid "Antarctica/Palmer"
 msgstr "Антарктик/Палмер"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:202
 msgid "Antarctica/South_Pole"
 msgstr "Антарктик/Јужни_пол"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:203
 msgid "Antarctica/Syowa"
 msgstr "Антарктик/Сијова"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:204
 msgid "Antarctica/Vostok"
 msgstr "Антарктик/Восток"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:205
 msgid "Arctic/Longyearbyen"
 msgstr "Арктик/Лонгјербјен"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:206
 msgid "Asia/Aden"
 msgstr "Азија/Аден"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:207
 msgid "Asia/Almaty"
 msgstr "Азија/Алмати"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:208
 msgid "Asia/Amman"
 msgstr "Азија/Аман"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:209
 msgid "Asia/Anadyr"
 msgstr "Азија/Анадир"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:210
 msgid "Asia/Aqtau"
 msgstr "Азија/Акто"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtobe"
 msgstr "Азија/Актобе"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:212
 msgid "Asia/Ashgabat"
 msgstr "Азија/Ашгабат"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:213
 msgid "Asia/Baghdad"
 msgstr "Азија/Багдад"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:214
 msgid "Asia/Bahrain"
 msgstr "Азија/Бахреин"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:215
 msgid "Asia/Baku"
 msgstr "Азија/Баку"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:216
 msgid "Asia/Bangkok"
 msgstr "Азија/Бангкок"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:217
 msgid "Asia/Beirut"
 msgstr "Азија/Бејрут"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:218
 msgid "Asia/Bishkek"
 msgstr "Азија/Бишкек"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:219
 msgid "Asia/Brunei"
 msgstr "Азија/Брунеј"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:220
 msgid "Asia/Calcutta"
 msgstr "Азија/Калкута"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:221
 msgid "Asia/Choibalsan"
 msgstr "Азија/Кобајсан"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:222
 msgid "Asia/Chongqing"
 msgstr "Азија/Чонгкинг"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:223
 msgid "Asia/Colombo"
 msgstr "Азија/Коломбо"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:224
 msgid "Asia/Damascus"
 msgstr "Азија/Дамаск"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:225
 msgid "Asia/Dhaka"
 msgstr "Азија/Дака"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:226
 msgid "Asia/Dili"
 msgstr "Азија/Дили"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:227
 msgid "Asia/Dubai"
 msgstr "Азија/Дубаи"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:228
 msgid "Asia/Dushanbe"
 msgstr "Азија/Душанбе"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:229
 msgid "Asia/Gaza"
 msgstr "Азија/Газа"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:230
 msgid "Asia/Harbin"
 msgstr "Азија/Харбин"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:231
 msgid "Asia/Hong_Kong"
 msgstr "Азија/Хонгконг"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:232
 msgid "Asia/Hovd"
 msgstr "Азија/Хоуд"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:233
 msgid "Asia/Irkutsk"
 msgstr "Азија/Иркутск"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:234
 msgid "Asia/Istanbul"
 msgstr "Азија/Истанбул"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:235
 msgid "Asia/Jakarta"
 msgstr "Азија/Џакарта"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:236
 msgid "Asia/Jayapura"
 msgstr "Азија/Џајапура"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:237
 msgid "Asia/Jerusalem"
 msgstr "Азија/Јерусалим"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:238
 msgid "Asia/Kabul"
 msgstr "Азија/Кабул"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:239
 msgid "Asia/Kamchatka"
 msgstr "Азија/Камчатка"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:240
 msgid "Asia/Karachi"
 msgstr "Азија/Карачи"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:241
 msgid "Asia/Kashgar"
 msgstr "Азија/Кашгар"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:242
 msgid "Asia/Katmandu"
 msgstr "Азија/Катманду"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:243
 msgid "Asia/Krasnoyarsk"
 msgstr "Азија/Краснојарск"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:244
 msgid "Asia/Kuala_Lumpur"
 msgstr "Азија/Куала_Лумпур"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:245
 msgid "Asia/Kuching"
 msgstr "Азија/Кучинг"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:246
 msgid "Asia/Kuwait"
 msgstr "Азија/Кувајт"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:247
 msgid "Asia/Macao"
 msgstr "Азија/Макао"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:248
 msgid "Asia/Macau"
 msgstr "Азија/Макау"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:249
 msgid "Asia/Magadan"
 msgstr "Азија/Магадан"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:250
 msgid "Asia/Makassar"
 msgstr "Азија/Макасар"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:251
 msgid "Asia/Manila"
 msgstr "Азија/Манила"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:252
 msgid "Asia/Muscat"
 msgstr "Азија/Мускат"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:253
 msgid "Asia/Nicosia"
 msgstr "Азија/Никозија"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:254
 msgid "Asia/Novosibirsk"
 msgstr "Азија/Новосибирск"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:255
 msgid "Asia/Omsk"
 msgstr "Азија/Омск"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:256
 msgid "Asia/Oral"
 msgstr "Азија/Орал"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:257
 msgid "Asia/Phnom_Penh"
 msgstr "Азија/Пном_Пен"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:258
 msgid "Asia/Pontianak"
 msgstr "Азија/Понтианак"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:259
 msgid "Asia/Pyongyang"
 msgstr "Азија/Пјонгјанг"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:260
 msgid "Asia/Qatar"
 msgstr "Азија/Катар"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:261
 msgid "Asia/Qyzylorda"
 msgstr "Азија/Кзил-Орда"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:262
 msgid "Asia/Rangoon"
 msgstr "Азија/Рангун"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:263
 msgid "Asia/Riyadh"
 msgstr "Азија/Ријад"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:264
 msgid "Asia/Saigon"
 msgstr "Азија/Сајгон"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:265
 msgid "Asia/Sakhalin"
 msgstr "Азија/Сахалин"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:266
 msgid "Asia/Samarkand"
 msgstr "Азија/Самарканд"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:267
 msgid "Asia/Seoul"
 msgstr "Азија/Сеул"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:268
 msgid "Asia/Shanghai"
 msgstr "Азија/Шангај"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:269
 msgid "Asia/Singapore"
 msgstr "Азија/Сингапур"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:270
 msgid "Asia/Taipei"
 msgstr "Азија/Тајпеј"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:271
 msgid "Asia/Tashkent"
 msgstr "Азија/Ташкент"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:272
 msgid "Asia/Tbilisi"
 msgstr "Азија/Тбилиси"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:273
 msgid "Asia/Tehran"
 msgstr "Азија/Техеран"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:274
 msgid "Asia/Thimphu"
 msgstr "Азија/Тимфу"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:275
 msgid "Asia/Tokyo"
 msgstr "Азија/Токио"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:276
 msgid "Asia/Ujung_Pandang"
 msgstr "Азија/Ујунг_Панданг"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:277
 msgid "Asia/Ulaanbaatar"
 msgstr "Азија/Улан_Батор"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:278
 msgid "Asia/Urumqi"
 msgstr "Азија/Урумки"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:279
 msgid "Asia/Vientiane"
 msgstr "Азија/Вијентан"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:280
 msgid "Asia/Vladivostok"
 msgstr "Азија/Владивосток"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:281
 msgid "Asia/Yakutsk"
 msgstr "Азија/Јакутск"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:282
 msgid "Asia/Yekaterinburg"
 msgstr "Азија/Јекатеринбург"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:283
 msgid "Asia/Yerevan"
 msgstr "Азија/Јереван"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:284
 msgid "Atlantic/Azores"
 msgstr "Атлантик/Азори"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:285
 msgid "Atlantic/Bermuda"
 msgstr "Атлантик/Бермуда"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:286
 msgid "Atlantic/Canary"
 msgstr "Атлантик/Канари"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:287
 msgid "Atlantic/Cape_Verde"
 msgstr "Атлантик/Зеленортска_Острва"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:288
 msgid "Atlantic/Faeroe"
 msgstr "Атлантик/Фарска_острва"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:289
 msgid "Atlantic/Jan_Mayen"
 msgstr "Атлантик/Јан_Мајен"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:290
 msgid "Atlantic/Madeira"
 msgstr "Атлантик/Мадејра"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:291
 msgid "Atlantic/Reykjavik"
 msgstr "Атлантик/Рејкјавик"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:292
 msgid "Atlantic/South_Georgia"
 msgstr "Атлантик/Јужна_Џорџија"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:293
 msgid "Atlantic/St_Helena"
 msgstr "Атлантик/Св_Јелена"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:294
 msgid "Atlantic/Stanley"
 msgstr "Атлантик/Стенли"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:295
 msgid "Australia/Adelaide"
 msgstr "Аустралија/Аделејд"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:296
 msgid "Australia/Brisbane"
 msgstr "Аустралија/Бризбејн"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:297
 msgid "Australia/Broken_Hill"
 msgstr "Аустралија/Броукен_Хил"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:298
 msgid "Australia/Darwin"
 msgstr "Аустралија/Дарвин"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:299
 msgid "Australia/Hobart"
 msgstr "Аустралија/Хобарт"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:300
 msgid "Australia/Lindeman"
 msgstr "Аустралија/Линдман"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:301
 msgid "Australia/Lord_Howe"
 msgstr "Аустралија/Лорд_Ов"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:302
 msgid "Australia/Melbourne"
 msgstr "Аустралија/Мелбурн"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:303
 msgid "Australia/Perth"
 msgstr "Аустралија/Перт"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:304
 msgid "Australia/Sydney"
 msgstr "Аустралија/Сиднеј"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:305
 msgid "Europe/Amsterdam"
 msgstr "Европа/Амстердам"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:306
 msgid "Europe/Andorra"
 msgstr "Европа/Андора"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:307
 msgid "Europe/Athens"
 msgstr "Европа/Атина"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:308
 msgid "Europe/Belfast"
 msgstr "Европа/Белфаст"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:309
 msgid "Europe/Belgrade"
 msgstr "Европа/Београд"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:310
 msgid "Europe/Berlin"
 msgstr "Европа/Берлин"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:311
 msgid "Europe/Bratislava"
 msgstr "Европа/Братислава"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:312
 msgid "Europe/Brussels"
 msgstr "Европа/Брисел"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:313
 msgid "Europe/Bucharest"
 msgstr "Европа/Букурешт"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:314
 msgid "Europe/Budapest"
 msgstr "Европа/Будимпешта"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:315
 msgid "Europe/Chisinau"
 msgstr "Европа/Чисинау"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:316
 msgid "Europe/Copenhagen"
 msgstr "Европа/Копенхаген"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:317
 msgid "Europe/Dublin"
 msgstr "Европа/Даблин"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:318
 msgid "Europe/Gibraltar"
 msgstr "Европа/Гибралтар"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:319
 msgid "Europe/Helsinki"
 msgstr "Европа/Хелсинки"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:320
 msgid "Europe/Istanbul"
 msgstr "Европа/Истамбул"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:321
 msgid "Europe/Kaliningrad"
 msgstr "Европа/Калињинград"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:322
 msgid "Europe/Kiev"
 msgstr "Европа/Кијев"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:323
 msgid "Europe/Lisbon"
 msgstr "Европа/Лисабон"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:324
 msgid "Europe/Ljubljana"
 msgstr "Европа/Љубљана"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:325
 msgid "Europe/London"
 msgstr "Европа/Лондон"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:326
 msgid "Europe/Luxembourg"
 msgstr "Европа/Луксембург"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:327
 msgid "Europe/Madrid"
 msgstr "Европа/Мадрид"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:328
 msgid "Europe/Malta"
 msgstr "Европа/Малта"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:329
 msgid "Europe/Minsk"
 msgstr "Европа/Минск"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:330
 msgid "Europe/Monaco"
 msgstr "Европа/Монако"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:331
 msgid "Europe/Moscow"
 msgstr "Европа/Москва"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:332
 msgid "Europe/Nicosia"
 msgstr "Европа/Никозија"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:333
 msgid "Europe/Oslo"
 msgstr "Европа/Осло"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:334
 msgid "Europe/Paris"
 msgstr "Европа/Париз"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:335
 msgid "Europe/Prague"
 msgstr "Европа/Праг"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:336
 msgid "Europe/Riga"
 msgstr "Европа/Рига"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:337
 msgid "Europe/Rome"
 msgstr "Европа/Рим"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:338
 msgid "Europe/Samara"
 msgstr "Европа/Самара"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:339
 msgid "Europe/San_Marino"
 msgstr "Европа/Сан_Марино"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:340
 msgid "Europe/Sarajevo"
 msgstr "Европа/Сарајево"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:341
 msgid "Europe/Simferopol"
 msgstr "Европа/Севастопољ"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:342
 msgid "Europe/Skopje"
 msgstr "Европа/Скопље"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:343
 msgid "Europe/Sofia"
 msgstr "Европа/Софија"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:344
 msgid "Europe/Stockholm"
 msgstr "Европа/Стокхолм"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:345
 msgid "Europe/Tallinn"
 msgstr "Европа/Талин"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:346
 msgid "Europe/Tirane"
 msgstr "Европа/Тирана"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:347
 msgid "Europe/Uzhgorod"
 msgstr "Европа/Ужгород"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:348
 msgid "Europe/Vaduz"
 msgstr "Европа/Вадуз"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:349
 msgid "Europe/Vatican"
 msgstr "Европа/Ватикан"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:350
 msgid "Europe/Vienna"
 msgstr "Европа/Беч"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:351
 msgid "Europe/Vilnius"
 msgstr "Европа/Вилнус"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:352
 msgid "Europe/Warsaw"
 msgstr "Европа/Варшава"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:353
 msgid "Europe/Zagreb"
 msgstr "Европа/Загреб"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:354
 msgid "Europe/Zaporozhye"
 msgstr "Европа/Запорожје"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:355
 msgid "Europe/Zurich"
 msgstr "Европа/Цирих"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:356
 msgid "Indian/Antananarivo"
 msgstr "Индијски/Антананариво"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:357
 msgid "Indian/Chagos"
 msgstr "Индијски_океан/Чагос"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:358
 msgid "Indian/Christmas"
 msgstr "Индијски_океан/Божићна_острва"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:359
 msgid "Indian/Cocos"
 msgstr "Индијски_океан/Кокос"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:360
 msgid "Indian/Comoro"
 msgstr "Индијски_океан/Коморо"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:361
 msgid "Indian/Kerguelen"
 msgstr "Индијски/Кергуелен"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:362
 msgid "Indian/Mahe"
 msgstr "Индијски_океан/Махе"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:363
 msgid "Indian/Maldives"
 msgstr "Индијски_океан/Малдиви"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:364
 msgid "Indian/Mauritius"
 msgstr "Индијски_океан/Маурицијус"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:365
 msgid "Indian/Mayotte"
 msgstr "Индијски_океан/Мајот"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:366
 msgid "Indian/Reunion"
 msgstr "Индијски_океан/Реунион"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:367
 msgid "Pacific/Apia"
 msgstr "Пацифик/Апиа"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:368
 msgid "Pacific/Auckland"
 msgstr "Пацифик/Окленд"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:369
 msgid "Pacific/Chatham"
 msgstr "Пацифик/Чатам"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:370
 msgid "Pacific/Easter"
 msgstr "Пацифик/Ускршња_острва"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:371
 msgid "Pacific/Efate"
 msgstr "Пацифик/Ефат"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:372
 msgid "Pacific/Enderbury"
 msgstr "Пацифик/Ендербури"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:373
 msgid "Pacific/Fakaofo"
 msgstr "Пацифик/Факаофо"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:374
 msgid "Pacific/Fiji"
 msgstr "Пацифик/Фиџи"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:375
 msgid "Pacific/Funafuti"
 msgstr "Пацифик/Фунафути"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:376
 msgid "Pacific/Galapagos"
 msgstr "Пацифик/Галапагос"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:377
 msgid "Pacific/Gambier"
 msgstr "Пацифик/Гамбјер"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:378
 msgid "Pacific/Guadalcanal"
 msgstr "Пацифик/Гвадалканал"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:379
 msgid "Pacific/Guam"
 msgstr "Пацифик/Гуам"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:380
 msgid "Pacific/Honolulu"
 msgstr "Пацифик/Хонолулу"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:381
 msgid "Pacific/Johnston"
 msgstr "Пацифик/Џонстон"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:382
 msgid "Pacific/Kiritimati"
 msgstr "Пацифик/Киритимати"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:383
 msgid "Pacific/Kosrae"
 msgstr "Пацифик/Косре"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:384
 msgid "Pacific/Kwajalein"
 msgstr "Пацифик/Квајалајн"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:385
 msgid "Pacific/Majuro"
 msgstr "Пацифик/Маџуро"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:386
 msgid "Pacific/Marquesas"
 msgstr "Пацифик/Маркесас"
 
-#: ../calendar/zones.h:388
+#: ../calendar/zones.h:387
 msgid "Pacific/Midway"
 msgstr "Пацифик/Мидвеј"
 
-#: ../calendar/zones.h:389
+#: ../calendar/zones.h:388
 msgid "Pacific/Nauru"
 msgstr "Пацифик/Науру"
 
-#: ../calendar/zones.h:390
+#: ../calendar/zones.h:389
 msgid "Pacific/Niue"
 msgstr "Пацифик/Нјуе"
 
-#: ../calendar/zones.h:391
+#: ../calendar/zones.h:390
 msgid "Pacific/Norfolk"
 msgstr "Пацифик/Норфолк"
 
-#: ../calendar/zones.h:392
+#: ../calendar/zones.h:391
 msgid "Pacific/Noumea"
 msgstr "Пацифик/Нумеа"
 
-#: ../calendar/zones.h:393
+#: ../calendar/zones.h:392
 msgid "Pacific/Pago_Pago"
 msgstr "Пацифик/Паго_Паго"
 
-#: ../calendar/zones.h:394
+#: ../calendar/zones.h:393
 msgid "Pacific/Palau"
 msgstr "Пацифик/Палау"
 
-#: ../calendar/zones.h:395
+#: ../calendar/zones.h:394
 msgid "Pacific/Pitcairn"
 msgstr "Пацифик/Питкерн"
 
-#: ../calendar/zones.h:396
+#: ../calendar/zones.h:395
 msgid "Pacific/Ponape"
 msgstr "Пацифик/Понапе"
 
-#: ../calendar/zones.h:397
+#: ../calendar/zones.h:396
 msgid "Pacific/Port_Moresby"
 msgstr "Пацифик/Порт_Моресби"
 
-#: ../calendar/zones.h:398
+#: ../calendar/zones.h:397
 msgid "Pacific/Rarotonga"
 msgstr "Пацифик/Раротонга"
 
-#: ../calendar/zones.h:399
+#: ../calendar/zones.h:398
 msgid "Pacific/Saipan"
 msgstr "Пацифик/Сајпан"
 
-#: ../calendar/zones.h:400
+#: ../calendar/zones.h:399
 msgid "Pacific/Tahiti"
 msgstr "Пацифик/Тахити"
 
-#: ../calendar/zones.h:401
+#: ../calendar/zones.h:400
 msgid "Pacific/Tarawa"
 msgstr "Пацифик/Тарава"
 
-#: ../calendar/zones.h:402
+#: ../calendar/zones.h:401
 msgid "Pacific/Tongatapu"
 msgstr "Пацифик/Тонгатапу"
 
-#: ../calendar/zones.h:403
+#: ../calendar/zones.h:402
 msgid "Pacific/Truk"
 msgstr "Пацифик/Трук"
 
-#: ../calendar/zones.h:404
+#: ../calendar/zones.h:403
 msgid "Pacific/Wake"
 msgstr "Пацифик/Вејк"
 
-#: ../calendar/zones.h:405
+#: ../calendar/zones.h:404
 msgid "Pacific/Wallis"
 msgstr "Пацифик/Волис"
 
-#: ../calendar/zones.h:406
+#: ../calendar/zones.h:405
 msgid "Pacific/Yap"
 msgstr "Пацифик/Јап"
 
-#: ../composer/e-composer-actions.c:203
+#: ../composer/e-composer-actions.c:202
 msgid "Save as..."
 msgstr "Сачувај као..."
 
-#: ../composer/e-composer-actions.c:276
-#: ../e-util/e-mail-signature-editor.c:308
-msgid "_Close"
-msgstr "_Затвори"
-
-#: ../composer/e-composer-actions.c:278
+#: ../composer/e-composer-actions.c:277
 msgid "Close the current file"
 msgstr "Затворите тренутну датотеку"
 
-#: ../composer/e-composer-actions.c:283
+#: ../composer/e-composer-actions.c:282
 msgid "New _Message"
 msgstr "Нова _порука"
 
-#: ../composer/e-composer-actions.c:285
+#: ../composer/e-composer-actions.c:284
 msgid "Open New Message window"
 msgstr "Отвара прозор за нову поруку"
 
-#: ../composer/e-composer-actions.c:292 ../shell/e-shell-window-actions.c:937
+#: ../composer/e-composer-actions.c:289 ../shell/e-shell-window-actions.c:979
+#| msgid "Mail Preferences"
+msgid "_Preferences"
+msgstr "_Поставке"
+
+#: ../composer/e-composer-actions.c:291 ../shell/e-shell-window-actions.c:981
 msgid "Configure Evolution"
 msgstr "Подеси Еволуцију"
 
-#: ../composer/e-composer-actions.c:299
+#: ../composer/e-composer-actions.c:298
 msgid "Save the current file"
 msgstr "Сачувајте тренутну датотеку"
 
-#: ../composer/e-composer-actions.c:304
+#: ../composer/e-composer-actions.c:303
 msgid "Save _As..."
 msgstr "Сачувај _као..."
 
-#: ../composer/e-composer-actions.c:306
+#: ../composer/e-composer-actions.c:305
 msgid "Save the current file with a different name"
 msgstr "Сачувајте тренутну датотеку под другим именом"
 
-#: ../composer/e-composer-actions.c:313
+#: ../composer/e-composer-actions.c:312
 msgid "Character _Encoding"
 msgstr "Ко_дна страна"
 
-#: ../composer/e-composer-actions.c:330
-msgid "_Print..."
-msgstr "_Штампај..."
-
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:336
 msgid "Print Pre_view"
 msgstr "Преглед пред _штампу"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:343
 msgid "Save as _Draft"
 msgstr "Сачувај као _нацрт"
 
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:345
 msgid "Save as draft"
 msgstr "Сачувајте као нацрт"
 
-#: ../composer/e-composer-actions.c:351
+#: ../composer/e-composer-actions.c:350
 msgid "S_end"
 msgstr "Пош_аљи"
 
-#: ../composer/e-composer-actions.c:353
+#: ../composer/e-composer-actions.c:352
 msgid "Send this message"
 msgstr "Пошаљите ову поруку"
 
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:360
 msgid "PGP _Encrypt"
 msgstr "ПГП _шифруј"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:362
 msgid "Encrypt this message with PGP"
 msgstr "Шифрујте ову поруку помоћу ПГП-а"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:368
 msgid "PGP _Sign"
 msgstr "ПГП _потпиши"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:370
 msgid "Sign this message with your PGP key"
 msgstr "Потпишите ову поруку помоћу ПГП кључа"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:376
 msgid "_Picture Gallery"
 msgstr "Галерија _слика"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:378
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Приказује збирку слика које можете да превучете у вашу поруку"
 
-#: ../composer/e-composer-actions.c:385
+#: ../composer/e-composer-actions.c:384
 msgid "_Prioritize Message"
 msgstr "В_ажност поруке"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:386
 msgid "Set the message priority to high"
 msgstr "Поставља важност поруке на високо"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:392
 msgid "Re_quest Read Receipt"
 msgstr "Т_ражи повратницу"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:394
 msgid "Get delivery notification when your message is read"
 msgstr "Прима извештај о достави када је порука прочитана"
 
-#: ../composer/e-composer-actions.c:401
+#: ../composer/e-composer-actions.c:400
 msgid "S/MIME En_crypt"
 msgstr "С/МИМЕ _шифруј"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:402
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Шифрује ову поруку помоћу С/МИМЕ уверења за шифровање"
 
-#: ../composer/e-composer-actions.c:409
+#: ../composer/e-composer-actions.c:408
 msgid "S/MIME Sig_n"
 msgstr "С/МИМЕ _потпиши"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:410
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Потписује ову поруку С/МИМЕ уверењем"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:416
 msgid "_Bcc Field"
 msgstr "_Бцц поље"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:418
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Бира да ли је поље Бцц приказано"
 
-#: ../composer/e-composer-actions.c:425
+#: ../composer/e-composer-actions.c:424
 msgid "_Cc Field"
 msgstr "_Цц поље"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:426
 msgid "Toggles whether the CC field is displayed"
 msgstr "Бира да ли је поље ЦЦ приказано"
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:432
 msgid "_Reply-To Field"
 msgstr "Поље Одго_вор-за"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:434
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Бира да ли је поље Одговор-за приказано"
 
-#: ../composer/e-composer-actions.c:494
+#: ../composer/e-composer-actions.c:493
 msgid "Save Draft"
 msgstr "Сачувај нацрт"
 
-#: ../composer/e-composer-header-table.c:39
+#: ../composer/e-composer-header-table.c:38
 msgid "Enter the recipients of the message"
 msgstr "Унесите примаоце поруке"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:40
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Унесите адресе које ће примити графитну копију (cc) поруке"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -6818,7 +7115,7 @@ msgstr ""
 "Унесите адресе које ће примити графитну копију поруке без појављивања у "
 "листи прималаца поруке"
 
-#: ../composer/e-composer-header-table.c:772
+#: ../composer/e-composer-header-table.c:771
 msgid "Fr_om:"
 msgstr "Ш_аље:"
 
@@ -6826,44 +7123,44 @@ msgstr "Ш_аље:"
 # * Create this before we call create_from_optionmenu,
 # * because that causes from_changed to be called, which
 # * expects the reply_to fields to be initialized.
-#: ../composer/e-composer-header-table.c:779
+#: ../composer/e-composer-header-table.c:778
 msgid "_Reply-To:"
 msgstr "_Одговор-за:"
 
-#: ../composer/e-composer-header-table.c:784
+#: ../composer/e-composer-header-table.c:783
 msgid "_To:"
 msgstr "_Прима:"
 
-#: ../composer/e-composer-header-table.c:790
+#: ../composer/e-composer-header-table.c:789
 msgid "_Cc:"
 msgstr "_Цц:"
 
-#: ../composer/e-composer-header-table.c:796
+#: ../composer/e-composer-header-table.c:795
 msgid "_Bcc:"
 msgstr "_Бцц:"
 
-#: ../composer/e-composer-header-table.c:801
+#: ../composer/e-composer-header-table.c:800
 msgid "_Post To:"
 msgstr "Објави _на:"
 
-#: ../composer/e-composer-header-table.c:805
+#: ../composer/e-composer-header-table.c:804
 msgid "S_ubject:"
 msgstr "На_слов:"
 
-#: ../composer/e-composer-header-table.c:813
-#: ../mail/e-mail-config-identity-page.c:489
+#: ../composer/e-composer-header-table.c:812
+#: ../mail/e-mail-config-identity-page.c:488
 msgid "Si_gnature:"
 msgstr "Потп_ис:"
 
-#: ../composer/e-composer-name-header.c:235
+#: ../composer/e-composer-name-header.c:234
 msgid "Click here for the address book"
 msgstr "Кликните овде за адресар."
 
-#: ../composer/e-composer-post-header.c:184
+#: ../composer/e-composer-post-header.c:183
 msgid "Click here to select folders to post to"
 msgstr "Кликните овде да изаберете фасцикле за слање"
 
-#: ../composer/e-msg-composer.c:878
+#: ../composer/e-msg-composer.c:879
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -6871,7 +7168,7 @@ msgstr ""
 "Није могуће потписивање одлазеће поруке: није постављено уверење за "
 "потписивање за овај налог"
 
-#: ../composer/e-msg-composer.c:887
+#: ../composer/e-msg-composer.c:888
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -6880,15 +7177,15 @@ msgstr ""
 "Није могуће шифровање одлазеће поруке: није постављено уверење за шифровање "
 "за овај налог"
 
-#: ../composer/e-msg-composer.c:1566 ../composer/e-msg-composer.c:1967
+#: ../composer/e-msg-composer.c:1569 ../composer/e-msg-composer.c:1981
 msgid "Compose Message"
 msgstr "Састави поруку"
 
-#: ../composer/e-msg-composer.c:4235
+#: ../composer/e-msg-composer.c:4243
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr "Састављач у телу поруке не садржи текст, што не може бити измењено."
 
-#: ../composer/e-msg-composer.c:4908
+#: ../composer/e-msg-composer.c:4943
 msgid "Untitled Message"
 msgstr "Неименована порука"
 
@@ -7058,16 +7355,36 @@ msgstr "Обавештење аларма Еволуције"
 msgid "Calendar event notifications"
 msgstr "Обавештења о догађајима календара"
 
-#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1033
-#: ../modules/mailto-handler/evolution-mailto-handler.c:212
-#: ../shell/e-shell-window-private.c:243
+#: ../data/evolution.appdata.xml.in.h:1
+msgid ""
+"Evolution is a personal information management application that provides "
+"integrated mail, calendaring and address book functionality."
+msgstr ""
+"Еволуција је програм за управљање личним подацима који обезбеђује обједињену "
+"функционалност поште, календара и адресара."
+
+#: ../data/evolution.appdata.xml.in.h:2
+msgid ""
+"Evolution supports a wide range of industry standard data formats and "
+"network protocols for information exchange, with an emphasis on standards "
+"compliance and security. Evolution can also integrate smoothly with "
+"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
+msgstr ""
+"Еволуција подржава широк опсег записа индустријских стандардних података и "
+"мрежних протокола за размену информација, са нагласком на сагласност "
+"стандарда и безебдност. Еволуција може такође глатко да се обједини са "
+"Мајкрософтовом разменом посредством проширења „Услуге веб размене“ "
+
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1032
+#: ../modules/mailto-handler/evolution-mailto-handler.c:210
+#: ../shell/e-shell-window-private.c:242
 msgid "Evolution"
 msgstr "Еволуција"
 
 # bug(slobo): tooltip би могао да буде и „Пошаљите е-поруку пријатељима и поред
 # овако уштогљених оригинала
 # msgstr "Пакет пословних програма"
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:83
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:82
 msgid "Groupware Suite"
 msgstr "Пакет групе"
 
@@ -7080,8 +7397,9 @@ msgid "Manage your email, contacts and schedule"
 msgstr "Управљајте вашом поштом, контактима и обавезама"
 
 #: ../data/evolution.desktop.in.in.h:5
-msgid "mail;calendar;contact;addressbook;task;"
-msgstr "пошта;календар;контакт;адресар;задатак;"
+#| msgid "mail;calendar;contact;addressbook;task;"
+msgid "email;calendar;contact;addressbook;task;"
+msgstr "ел.пошта;пошта;календар;контакт;адресар;задатак;"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
@@ -8227,14 +8545,10 @@ msgstr ""
 "слике и уместо њих желе непокретне слике."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-msgid "Ellipsize mode for folder names in side bar"
-msgstr "Искључује или омогућава скраћивање назива фасцикли у бочној површи"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid "Enable or disable type ahead search feature"
 msgstr "Укључује или искључује могућност тражења куцања унапред"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -8242,11 +8556,11 @@ msgstr ""
 "Омогућава претраживање из бочне површи, што доноси интерактивност у претрази "
 "назива фасцикли."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid "Enable or disable magic space bar"
 msgstr "Укључује или искључује магичну размакницу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -8254,73 +8568,73 @@ msgstr ""
 "Укључите ово да би размакницом померали текст поруке при прегледању, као и "
 "списак порука и фасцикли."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 "Омогућити да користе слична подешавања приказа листе поруке за све фасцикле"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "Омогућити да користе слична подешавања приказа листе поруке за све фасцикле."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Mark citations in the message \"Preview\""
 msgstr "Означава цитате у прегледу поруке"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Означава цитате у прегледу поруке."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Citation highlight color"
 msgstr "Боја истицања цитата"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid "Citation highlight color."
 msgstr "Боја за истицања цитата."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Enable/disable caret mode"
 msgstr "Укључује/искључује приказ курсора"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Омогућава приказ курсора, тако да видите курсор док читате поруку."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Default charset in which to display messages"
 msgstr "Подразумевани скуп знакова за приказ порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Default charset in which to display messages."
 msgstr "Подразумевани скуп знакова за приказ порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "Самостално учитава слике за ХТМЛ поруке преко ХТТП-а"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid "Show Animations"
 msgstr "Приказивање анимација"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Show animated images as animations."
 msgstr "Приказује анимиране слике као анимације."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Show all message headers"
 msgstr "Приказивање свих заглавља порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Show all the headers when viewing a messages."
 msgstr "Приказује сва заглавља при прегледу порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "List of headers to show when viewing a message."
 msgstr "Списак заглавља за приказивање при прегледу поруке."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid ""
 "Each header is represented as a pair: the header name, and a boolean "
 "indicating whether the header is enabled. Disabled headers are not shown "
@@ -8330,41 +8644,41 @@ msgstr ""
 "која указује да ли је заглавље укључено. Искључена заглавља нису приказана "
 "уприликом прегледа пруке, али су још увек на списку у поставкама."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Show photo of the sender"
 msgstr "Приказивање слике пошиљаоца"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Приказује слику пошиљаоца у окну за читање поруке."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Mark as Seen after specified timeout"
 msgstr "Означава поруку виђеном после наведеног рока"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Mark as Seen after specified timeout."
 msgstr "Означава поруку виђеном после наведеног рока."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Timeout for marking messages as seen"
 msgstr "Време за означавање порука као виђеним"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "Време у милисекундама за које ће поруке бити означене као виђеним."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Sender email-address column in the message list"
 msgstr "Приказ колоне е-адреса пошиљаоца у списку порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "Приказује е-адресу пошиљаоца у посебној колони у списку порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view"
@@ -8372,7 +8686,7 @@ msgstr ""
 "Утврђује да ли да користи исти фонт у пољима „Шаље“ and „Наслов“ у усправном "
 "прегледу колоне „Поруке“"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -8380,19 +8694,19 @@ msgstr ""
 "Утврђује да ли да користи исти фонт у пољима „Шаље“ and „Наслов“ у усправном "
 "прегледу колоне „Поруке“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Show deleted messages in the message-list"
 msgstr "Приказивање обрисаних порука у листи порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Приказује обрисане поруке (као прецртане) у листи порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Enable Unmatched search folder"
 msgstr "Укључи непоклопљене фасцикле претраге"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
@@ -8400,11 +8714,11 @@ msgstr ""
 "Укључује непоклопљене фасцикле претраге унутар фасцикли претраге. Не ради "
 "ништа ако је су искључене фасцикле претраге."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Скрива преглед по фасциклама и уклања избор"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -8412,31 +8726,31 @@ msgstr ""
 "Овак кључ је прочитан једном и потом враћен на „false“ (нетачно). Ово уклања "
 "пошту са списка и преглед за ту фасциклу."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Height of the message-list pane"
 msgstr "Висина површи листе порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Height of the message-list pane."
 msgstr "Висина површи за листе порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Whether message headers are collapsed in the user interface"
 msgstr "Да ли су заглавља поруке скупљена у корисничком сучељу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Width of the message-list pane"
 msgstr "Ширина површи списка порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Width of the message-list pane."
 msgstr "Ширина површи списка порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Layout style"
 msgstr "Стил размештаја"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -8447,35 +8761,35 @@ msgstr ""
 "порука. 0 — (класичан преглед) смешта ову површ испода списка порука. 1 — "
 "(вертикалан преглед) смешта површ поред списка порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Variable width font"
 msgstr "Фонт променљиве величине"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "The variable width font for mail display."
 msgstr "Фонт променљиве величине за приказ поште."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Terminal font"
 msgstr "Фонт терминала"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "The terminal font for mail display."
 msgstr "Фонт терминала за приказ поште."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "Use custom fonts"
 msgstr "Коришћење сопствених фонтова"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Use custom fonts for displaying mail."
 msgstr "Користи прилагођене фонтове за приказ поште."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Сажима приказ адреса у TO/CC/BCC"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -8483,11 +8797,11 @@ msgstr ""
 "Врши сажимање приказа адреса у TO/CC/BCC на број одређен у address_count "
 "(број адреса)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Број адреса за приказ у КО/ЦЦ/БЦЦ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -8495,11 +8809,11 @@ msgstr ""
 "Ово подешава број адреса за приказ у подразумеваном прегледу списка порука, "
 "после чега је приказано „...“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Thread the message-list based on Subject"
 msgstr "Приказ поруке према наслову расправе"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -8507,11 +8821,11 @@ msgstr ""
 "Да ли покушати приказ расправе по наслову када поруке не садрже заглавља „In-"
 "Reply-To“ или „References“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Default value for thread expand state"
 msgstr "Подразумевана вредност за раширену расправу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -8519,11 +8833,11 @@ msgstr ""
 "Ово подешавање одређује да ли ће нити подразумевано бити раширене или "
 "скупљене. Еволуција захтева поновно покретање."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Да ли се поруке нижу на основу последње поруке у расправи"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -8532,11 +8846,11 @@ msgstr ""
 "Ово подешавање одређује да ли ће нити бити разврстани по последњој поруци "
 "једне нити, уместо по датуму. Еволуција захтева поновно покретање."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Ређа налоге азбучним редом у стаблу фасцикле"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to "
 "true accounts are sorted alphabetically, with an exception of On This "
@@ -8548,27 +8862,27 @@ msgstr ""
 "изузетком фасцикли „На овом рачунару“ и „Потражи“, у супротном налози бивају "
 "поређани на основу поретка који је задао корисник"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Log filter actions"
 msgstr "Дневник радњи филтера"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Log filter actions to the specified log file."
 msgstr "Бележи радње филтера у наведену датотеку дневника."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Logfile to log filter actions"
 msgstr "Дневник датотека за бележење радњи филтера"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "Logfile to log filter actions."
 msgstr "Дневник датотека за бележење радњи филтера."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Flush Outbox after filtering"
 msgstr "Празни слање након филтрирања"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
@@ -8578,44 +8892,44 @@ msgstr ""
 "ове фасцикле ће се догодити само ако се користи нека радња филтера "
 "„Проследи“ и отприлике један минут после призивања последње радње."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Default forward style"
 msgstr "Подразумевани стил прослеђивања"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "Default reply style"
 msgstr "Подразумевани стил одговора"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Prompt on empty subject"
 msgstr "Поставља упит када је наслов празан"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Поставља упит кориснику када покуша да пошаље поруку без наслова."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Prompt when emptying the trash"
 msgstr "Поставља упит приликом пражњења смећа"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "Поставља упит кориснику када покуша да испразни смеће."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Prompt when user expunges"
 msgstr "Поставља упит при пражњењу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Поставља упит кориснику када покуша да испразни фасциклу."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "Упитаће пре слања примаоцима који нису унешени као адресе поште"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -8623,19 +8937,19 @@ msgstr ""
 "Омогућава/онемогућава понављање упозорења када покушавате да пошаљете поруку "
 "примаоцима који нису унешени као адресе поште."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Prompt when user only fills Bcc"
 msgstr "Поставља упит када корисник унесе само невидљиву графитну копију (Bcc)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Поставља упит кориснику када покуша да пошаље поруку без прималаца."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Поставља упит када корисник покуша да пошаље нежељени ХТМЛ"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -8643,12 +8957,12 @@ msgstr ""
 "Поставља упит када корисник покуша да пошаље ХТМЛ поруку примаоцима који "
 "можда не желе да примају ХТМЛ пошту."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Поставља упит кориснику када покуша да отвори 10 или више порука одједном"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -8656,19 +8970,19 @@ msgstr ""
 "Уколико корисник покуша да отвори 10 или више порука одједном, питаће га да "
 "ли заиста жели то да уради."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Prompt while marking multiple messages"
 msgstr "Поставља упит при означавању више порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Укључује или искључује упозорење при означавању више порука."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Prompt when deleting messages in search folder"
 msgstr "Поставља упит код брисања порука из фасцикле претраге"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -8677,12 +8991,12 @@ msgstr ""
 "Омогућава/онемогућава понављање упозорења да је брисање поруке из фасцикле "
 "претраге трајно, а не само уклањање из резултата претраге."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr ""
 "Питаће да ли да умножи фасциклу превлачењем и убацивањем у стаблу фасцикли"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid ""
 "Possible values are: 'never' - do not allow copy with drag &amp; drop of "
 "folders in folder tree, 'always' - allow copy with drag &amp; drop of "
@@ -8694,12 +9008,12 @@ msgstr ""
 "фасцикли превлачењем и убацивањем у стабло фасцикли без питања, или „ask“ — "
 "(или свака друга вредност) питаће корисника."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr ""
 "Питаће да ли да премести фасциклу превлачењем и убацивањем у стаблу фасцикли"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid ""
 "Possible values are: 'never' - do not allow move with drag &amp; drop of "
 "folders in folder tree, 'always' - allow move with drag &amp; drop of "
@@ -8711,11 +9025,11 @@ msgstr ""
 "фасцикли превлачењем и убацивањем у стабло фасцикли без питања, или „ask“ — "
 "(или свака друга вредност) питаће корисника."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Prompt when replying privately to list messages"
 msgstr "Поставља упит када одговарате приватно на листу порука"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
@@ -8723,11 +9037,11 @@ msgstr ""
 "Омогућава/онемогућава понављање упозорења да шаљете приватан одговор на "
 "поруку која је стигла са дописне листе."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Поставља упит када дописна листа одузме приватне одговоре"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
@@ -8737,18 +9051,18 @@ msgstr ""
 "одговор на поруку која је стигла са дописне листе, али у листи заглавље "
 "„Одговор-за“ је подешено да вас преусмери да одговорите на листу."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Prompt when replying to many recipients"
 msgstr "Поставља упит када одговарате већем броју прималаца"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr ""
 "Омогућава/онемогућава понављање упозорења да шаљете одговор многим људима."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid ""
 "Policy for automatically closing the message browser window when forwarding "
 "or replying to the displayed message."
@@ -8756,42 +9070,42 @@ msgstr ""
 "Политика за самостално затварање прозора прегледника порука приликом "
 "прослеђивања или одговарања на приказану поруку."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid "Empty Trash folders on exit"
 msgstr "Празни фасцикле са смећем на излазу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Празни све фасцикле са смећем при затварању Еволуције."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Најмање дана између пражњења смећа на излазу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Најмање време између пражњења смећа на излазу, у данима."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Last time Empty Trash was run"
 msgstr "Последње време пражњења смећа"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "Када је последњи пут извршено пражњење смећа, у данима од 1. јануара, 1970 "
 "(епох)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Време у секундама за које се приказује грешка у статусној траци."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Level beyond which the message should be logged."
 msgstr "Ниво након којег се порука заводи у дневник."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -8799,11 +9113,11 @@ msgstr ""
 "Може имати три могуће вредности: 0 — за грешке, 1 — за упозорења и 2 — за "
 "поруке о дијагнози квара."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Show original \"Date\" header value."
 msgstr "Приказује оригиналну вредност заглавља датума."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -8813,11 +9127,11 @@ msgstr ""
 "се временске зоне разликују). Иначе увек приказује вредност заглавља „Датум“ "
 "према поставкама и временској зони корисника."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "List of Labels and their associated colors"
 msgstr "Списак ознака и њима додељених боја"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -8825,46 +9139,46 @@ msgstr ""
 "Списак ознака које познаје поштански део Еволуције. Списак садржи низове "
 "облика име:боја где боја користи ХТМЛ хекса кодирање."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Check incoming mail being junk"
 msgstr "Врши проверу да ли је пристигла пошта ђубре"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Run junk test on incoming mail."
 msgstr "Проверава да ли има ђубрета у долазној пошти."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Empty Junk folders on exit"
 msgstr "Празни фасцикле са ђубретом при излазу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Празни све фасцикле са ђубретом при затварању Еволуције."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Најмање дана између пражњења ђубрета на излазу"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Најмање време између пражњења ђубрета на излазу, у данима."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Last time Empty Junk was run"
 msgstr "Време последњег пражњења ђубрета"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "Када је последњи пут извршено пражњење ђубрета, у данима од 1. јануара, 1970 "
 "(епох)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "The default plugin for Junk hook"
 msgstr "Подразумевани додатак куке за ђубре"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -8874,11 +9188,11 @@ msgstr ""
 "прикључци. Уколико је поменути подразумевани прикључак искључен, преостали "
 "доступни прикључци неће бити активирани."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Утврђује да ли у адресару да прегледа адресе пошиљаоца"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -8890,7 +9204,7 @@ msgstr ""
 "самодопуњавање. Може бити споро ако су адресари (рецимо ЛДАП) означени за "
 "самодопуњавање."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -8898,7 +9212,7 @@ msgstr ""
 "Утврђује да ли само у адресару да прегледа адресе у потрази за нежељеном "
 "поштом"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -8908,13 +9222,13 @@ msgstr ""
 "да ли да се адреса тражи само у локалном адресару како би се издвојила пошта "
 "примљена од познатих пошиљалаца од оне нежељене."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Утврђује да ли да користи прилагођена заглавља приликом провере нежељене "
 "поште"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -8923,11 +9237,11 @@ msgstr ""
 "Утврђује да ли да користи прилагођена заглавља приликом провере нежељене "
 "поште. Уколико је опција укључена а заглавља наведена, провера ће бити бржа."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Custom headers to use while checking for junk."
 msgstr "Прилагођена заглавља за употребу приликом провере нежељене поште."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -8935,31 +9249,31 @@ msgstr ""
 "Прилагођена заглавља за употребу приликом провере нежељене поште. Елементи "
 "списка су низ формата „headername=value“ (име заглавља=вредност)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "UID string of the default account."
 msgstr "ЈИБ низ подразумеваног налога."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid "Save directory"
 msgstr "Директоријум чувања"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Directory for saving mail component files."
 msgstr "Директоријум за чување датотека модула за пошту."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid "Composer load/attach directory"
 msgstr "Директоријум састављача за учитавање/прилагање"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Directory for loading/attaching files to composer."
 msgstr "Директоријум за учитавање/прилагање датотека у састављач."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid "Check for new messages on start"
 msgstr "Врши проверу за новим порукама приликом покретања"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -8967,11 +9281,11 @@ msgstr ""
 "Да ли ће вршити проверу за новим порукама приликом покретања Еволуције. Ово "
 "укључује и слање порука из фасцикле Послато."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid "Check for new messages in all active accounts"
 msgstr "Врши проверу за новим порукама у свим активним налозима"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
@@ -8982,11 +9296,11 @@ msgstr ""
 "покретања Еволуције. Ова опција се користи само заједно са "
 "„send_recv_on_start“ (пошаљи_прими_при_покретању) опцијом."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid "Server synchronization interval"
 msgstr "Интервал усаглашавања са сервером"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -8994,11 +9308,11 @@ msgstr ""
 "Контролише учесталост усклађивања локалних измена са мрежним сервером поште. "
 "Интервал мора бити најмање 30 секунди."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid "(Deprecated) Default forward style"
 msgstr "(Застарело) Подразумевани стил прослеђивања"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"forward-style-name\" instead."
@@ -9006,11 +9320,11 @@ msgstr ""
 "Овај кључ је застарео у издању 3.10 и не треба више да се користи. Уместо "
 "њега користите „forward-style-name“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid "(Deprecated) Default reply style"
 msgstr "(Застарело) Подразумевани стил одговора"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"reply-style-name\" instead."
@@ -9018,11 +9332,11 @@ msgstr ""
 "Овај кључ је застарео у издању 3.10 и не треба више да се користи. Уместо "
 "њега користите „reply-style-name“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "(Застарело) Списак произвољних заглавља и да ли су укључена."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"show-headers\" instead."
@@ -9030,11 +9344,11 @@ msgstr ""
 "Овај кључ је застарео у издању 3.10 и не треба више да се користи. Уместо "
 "њега користите „show-headers“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "(Застарело) Учитава слике за ХТМЛ поруке преко ХТТП-а"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"image-loading-policy\" instead."
@@ -9042,7 +9356,7 @@ msgstr ""
 "Овај кључ је застарео у издању 3.10 и не треба више да се користи. Уместо "
 "њега користите „image-loading-policy“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
@@ -9050,7 +9364,7 @@ msgstr ""
 "(Застарело) Пита да ли да затвори прозор са поруком када корисник прослеђује "
 "или одговара на поруку приказану у прозору."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"browser-close-on-reply-policy\" instead."
@@ -9352,7 +9666,7 @@ msgstr "Полазна фасцикла избирача датотека"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Полазна фасцикла за прозорчиће избирача датотека."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:308
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:307
 msgid "Start in offline mode"
 msgstr "Започиње рад ван мреже"
 
@@ -9443,9 +9757,9 @@ msgstr "Користи само локалне провере спама."
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Користи само локалне провере спама (без DNS-а)."
 
-#: ../em-format/e-mail-formatter-attachment.c:397
-#: ../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
+#: ../em-format/e-mail-formatter-attachment.c:405
+#: ../e-util/e-attachment-bar.c:100 ../e-util/e-attachment-bar.c:105
+#: ../e-util/e-attachment-paned.c:175 ../e-util/e-attachment-paned.c:180
 #: ../mail/message-list.etspec.h:4
 msgid "Attachment"
 msgid_plural "Attachments"
@@ -9454,137 +9768,145 @@ msgstr[1] "Прилози"
 msgstr[2] "Прилози"
 msgstr[3] "Прилог"
 
-#: ../em-format/e-mail-formatter-attachment.c:398
+#: ../em-format/e-mail-formatter-attachment.c:406
 msgid "Display as attachment"
 msgstr "Прикажи као прилог"
 
-#: ../em-format/e-mail-formatter-headers.c:107
-#: ../em-format/e-mail-part-headers.c:47 ../mail/e-mail-tag-editor.c:272
-#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:64
+#: ../em-format/e-mail-formatter-audio.c:152
+msgid "Audio Player"
+msgstr "Звучни уређај"
+
+#: ../em-format/e-mail-formatter-audio.c:153
+msgid "Play the attachment in embedded audio player"
+msgstr "Пусти прилог у уграђеном програму"
+
+#: ../em-format/e-mail-formatter-headers.c:102
+#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:273
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:63
 msgid "From"
 msgstr "Шаље"
 
-#: ../em-format/e-mail-formatter-headers.c:133
+#: ../em-format/e-mail-formatter-headers.c:128
 msgid "(no subject)"
 msgstr "(без наслова)"
 
-#: ../em-format/e-mail-formatter-headers.c:333
+#: ../em-format/e-mail-formatter-headers.c:328
 #, 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:170
 msgid "Regular Image"
 msgstr "Обична слика"
 
-#: ../em-format/e-mail-formatter-image.c:153
+#: ../em-format/e-mail-formatter-image.c:171
 msgid "Display part as an image"
 msgstr "Приказује делове као слику"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:246
+#: ../em-format/e-mail-formatter-message-rfc822.c:254
 msgid "RFC822 message"
 msgstr "РФЦ822 порука"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:247
+#: ../em-format/e-mail-formatter-message-rfc822.c:255
 msgid "Format part as an RFC822 message"
 msgstr "Обликује део као РФЦ822 поруку"
 
-#: ../em-format/e-mail-formatter-print.c:54
-#: ../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:1328
-#: ../modules/cal-config-google/e-google-chooser.c:237
-#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+#: ../em-format/e-mail-formatter-print.c:53
+#: ../e-util/gal-view-instance-save-as-dialog.c:94
+#: ../mail/e-mail-label-tree-view.c:98
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1322
+#: ../modules/cal-config-google/e-google-chooser.c:236
+#: ../modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Name"
 msgstr "Назив"
 
-#: ../em-format/e-mail-formatter-print.c:54
-#: ../e-util/e-attachment-tree-view.c:574 ../mail/message-list.etspec.h:10
+#: ../em-format/e-mail-formatter-print.c:53
+#: ../e-util/e-attachment-tree-view.c:573 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Величина"
 
-#: ../em-format/e-mail-formatter-print-headers.c:144
+#: ../em-format/e-mail-formatter-print-headers.c:143
 msgid "GPG signed"
 msgstr "ГПГ потписано"
 
-#: ../em-format/e-mail-formatter-print-headers.c:150
+#: ../em-format/e-mail-formatter-print-headers.c:149
 msgid "GPG encrpyted"
 msgstr "ГПГ шифровано"
 
-#: ../em-format/e-mail-formatter-print-headers.c:156
+#: ../em-format/e-mail-formatter-print-headers.c:155
 msgid "S/MIME signed"
 msgstr "С/МИМЕ потписано"
 
-#: ../em-format/e-mail-formatter-print-headers.c:162
+#: ../em-format/e-mail-formatter-print-headers.c:161
 msgid "S/MIME encrpyted"
 msgstr "С/МИМЕ шифровано"
 
-#: ../em-format/e-mail-formatter-print-headers.c:171
+#: ../em-format/e-mail-formatter-print-headers.c:170
 #: ../mail/e-mail-config-security-page.c:645
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:195
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:129
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:194
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:128
 msgid "Security"
 msgstr "Безбедност"
 
-#: ../em-format/e-mail-formatter-quote-headers.c:168
-#: ../em-format/e-mail-part-headers.c:52 ../mail/e-mail-tag-editor.c:277
-#: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:6
-#: ../modules/mail/em-mailer-prefs.c:69 ../smime/lib/e-asn1-object.c:712
+#: ../em-format/e-mail-formatter-quote-headers.c:167
+#: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:278
+#: ../mail/em-filter-i18n.h:51 ../mail/message-list.etspec.h:6
+#: ../modules/mail/em-mailer-prefs.c:68
 msgid "Subject"
 msgstr "Наслов"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:187
-#: ../em-format/e-mail-formatter-utils.c:344
-#: ../modules/mail/em-mailer-prefs.c:1145
+#: ../em-format/e-mail-formatter-quote-headers.c:186
+#: ../em-format/e-mail-formatter-utils.c:342
+#: ../modules/mail/em-mailer-prefs.c:1144
 msgid "Mailer"
 msgstr "Пошиљалац"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:91
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:94
 #: ../em-format/e-mail-formatter-text-enriched.c:98
 msgid "Richtext"
 msgstr "Богати текст"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:92
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:95
 #: ../em-format/e-mail-formatter-text-enriched.c:99
 msgid "Display part as enriched text"
 msgstr "Приказује део као обогаћени текст"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:90
-#: ../em-format/e-mail-formatter-text-html.c:351
+#: ../em-format/e-mail-formatter-quote-text-html.c:95
+#: ../em-format/e-mail-formatter-text-html.c:359
 msgid "HTML"
 msgstr "ХТМЛ"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:91
-#: ../em-format/e-mail-formatter-text-html.c:352
+#: ../em-format/e-mail-formatter-quote-text-html.c:96
+#: ../em-format/e-mail-formatter-text-html.c:360
 msgid "Format part as HTML"
 msgstr "Обликује део као ХТМЛ"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:115
-#: ../em-format/e-mail-formatter-text-plain.c:185
+#: ../em-format/e-mail-formatter-quote-text-plain.c:121
+#: ../em-format/e-mail-formatter-text-plain.c:197
 msgid "Plain Text"
 msgstr "Обичан текст"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:116
-#: ../em-format/e-mail-formatter-text-plain.c:186
+#: ../em-format/e-mail-formatter-quote-text-plain.c:122
+#: ../em-format/e-mail-formatter-text-plain.c:198
 msgid "Format part as plain text"
 msgstr "Обликује део као обичан текст"
 
-#: ../em-format/e-mail-formatter-secure-button.c:52
+#: ../em-format/e-mail-formatter-secure-button.c:51
 msgid "Unsigned"
 msgstr "Непотписано"
 
-#: ../em-format/e-mail-formatter-secure-button.c:52
+#: ../em-format/e-mail-formatter-secure-button.c:51
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Ова порука није потписана. Није сигурно да је ова порука веродостојна."
 
-#: ../em-format/e-mail-formatter-secure-button.c:53
+#: ../em-format/e-mail-formatter-secure-button.c:52
 msgid "Valid signature"
 msgstr "Исправан потпис"
 
-#: ../em-format/e-mail-formatter-secure-button.c:53
+#: ../em-format/e-mail-formatter-secure-button.c:52
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -9592,22 +9914,22 @@ msgstr ""
 "Ова порука је потписана и исправна што значи да је пошиљалац поруке врло "
 "вероватно веродостојан."
 
-#: ../em-format/e-mail-formatter-secure-button.c:54
+#: ../em-format/e-mail-formatter-secure-button.c:53
 msgid "Invalid signature"
 msgstr "Неисправан потпис"
 
-#: ../em-format/e-mail-formatter-secure-button.c:54
+#: ../em-format/e-mail-formatter-secure-button.c:53
 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:55
+#: ../em-format/e-mail-formatter-secure-button.c:54
 msgid "Valid signature, but cannot verify sender"
 msgstr "Исправан потпис, али не могу да проверим пошиљаоца"
 
-#: ../em-format/e-mail-formatter-secure-button.c:55
+#: ../em-format/e-mail-formatter-secure-button.c:54
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -9615,21 +9937,21 @@ msgstr ""
 "Ова порука је потписана исправним потписом, али пошиљалац поруке не може "
 "бити проверен."
 
-#: ../em-format/e-mail-formatter-secure-button.c:56
+#: ../em-format/e-mail-formatter-secure-button.c:55
 msgid "Signature exists, but need public key"
 msgstr "Потпис постоји, али тражи јавни кључ"
 
-#: ../em-format/e-mail-formatter-secure-button.c:56
+#: ../em-format/e-mail-formatter-secure-button.c:55
 msgid ""
 "This message is signed with a signature, but there is no corresponding "
 "public key."
 msgstr "Ова порука је потписана, али нема одговарајућег јавног кључа."
 
-#: ../em-format/e-mail-formatter-secure-button.c:63
+#: ../em-format/e-mail-formatter-secure-button.c:62
 msgid "Unencrypted"
 msgstr "Нешифровано"
 
-#: ../em-format/e-mail-formatter-secure-button.c:63
+#: ../em-format/e-mail-formatter-secure-button.c:62
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -9637,11 +9959,11 @@ msgstr ""
 "Ова порука није шифрована. Њен садржај је могуће видети у преносу преко "
 "Интернета."
 
-#: ../em-format/e-mail-formatter-secure-button.c:64
+#: ../em-format/e-mail-formatter-secure-button.c:63
 msgid "Encrypted, weak"
 msgstr "Шифровано, слабо"
 
-#: ../em-format/e-mail-formatter-secure-button.c:64
+#: ../em-format/e-mail-formatter-secure-button.c:63
 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 "
@@ -9650,22 +9972,22 @@ msgstr ""
 "Ова порука је шифрована, али слабим алгоритмом. Тешко је, али не и немогуће "
 "да неко са стране у догледно време види садржај ове поруке."
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:64
 msgid "Encrypted"
 msgstr "Шифровано"
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:64
 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:66
+#: ../em-format/e-mail-formatter-secure-button.c:65
 msgid "Encrypted, strong"
 msgstr "Шифровано, јако"
 
-#: ../em-format/e-mail-formatter-secure-button.c:66
+#: ../em-format/e-mail-formatter-secure-button.c:65
 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 "
@@ -9675,7 +9997,7 @@ msgstr ""
 "у догледно време види садржај ове поруке."
 
 #: ../em-format/e-mail-formatter-secure-button.c:187
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "_View Certificate"
 msgstr "Прегледај _уверење"
 
@@ -9683,114 +10005,114 @@ msgstr "Прегледај _уверење"
 msgid "This certificate is not viewable"
 msgstr "Ово уверење није читљиво"
 
-#: ../em-format/e-mail-formatter-source.c:115
+#: ../em-format/e-mail-formatter-source.c:120
 msgid "Source"
 msgstr "Извор"
 
-#: ../em-format/e-mail-formatter-source.c:116
+#: ../em-format/e-mail-formatter-source.c:121
 msgid "Display source of a MIME part"
 msgstr "Приказује извое као МИМЕ део"
 
-#: ../em-format/e-mail-formatter-utils.c:204
-#: ../em-format/e-mail-formatter-utils.c:221
-#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:67
+#: ../em-format/e-mail-formatter-utils.c:202
+#: ../em-format/e-mail-formatter-utils.c:219
+#: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:66
 msgid "Cc"
 msgstr "Цц"
 
-#: ../em-format/e-mail-formatter-utils.c:205
-#: ../em-format/e-mail-formatter-utils.c:222
-#: ../em-format/e-mail-part-headers.c:51 ../modules/mail/em-mailer-prefs.c:68
+#: ../em-format/e-mail-formatter-utils.c:203
+#: ../em-format/e-mail-formatter-utils.c:220
+#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:67
 msgid "Bcc"
 msgstr "Бцц"
 
-#: ../em-format/e-mail-parser-application-mbox.c:88
+#: ../em-format/e-mail-parser-application-mbox.c:87
 #, c-format
 msgid "Error parsing MBOX part: %s"
 msgstr "Грешка обраде МБОКС дела: %s"
 
-#: ../em-format/e-mail-parser-application-smime.c:84
+#: ../em-format/e-mail-parser-application-smime.c:83
 #, c-format
 msgid "Could not parse S/MIME message: %s"
 msgstr "Не могу да обрадим С/МИМЕ поруку: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:80
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:79
 #, c-format
 msgid "Could not parse PGP message: %s"
 msgstr "Не могу да обрадим ПГП поруку: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:83
-#: ../em-format/e-mail-parser-multipart-signed.c:128
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:82
+#: ../em-format/e-mail-parser-multipart-signed.c:135
 #, c-format
 msgid "Error verifying signature: %s"
 msgstr "Грешка провере потписа: %s"
 
-#: ../em-format/e-mail-parser-message-external.c:69
+#: ../em-format/e-mail-parser-message-external.c:68
 msgid "Malformed external-body part"
 msgstr "Лоше сложен спољни део поруке"
 
-#: ../em-format/e-mail-parser-message-external.c:102
+#: ../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:113
+#: ../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:115
+#: ../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:134
+#: ../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:152
+#: ../em-format/e-mail-parser-message-external.c:151
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Показивач на непознати спољни податак (типа „%s“)"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:67
-#: ../em-format/e-mail-parser-multipart-signed.c:81
+#: ../em-format/e-mail-parser-multipart-encrypted.c:66
+#: ../em-format/e-mail-parser-multipart-signed.c:83
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Не могу да обрадим МИМЕ поруку. Приказивање извора."
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:83
+#: ../em-format/e-mail-parser-multipart-encrypted.c:82
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Неподржани тип шифре за вишеделни/шифрован (multipart/encrypted)"
 
-#: ../em-format/e-mail-parser-multipart-encrypted.c:102
+#: ../em-format/e-mail-parser-multipart-encrypted.c:101
 #, c-format
 msgid "Could not parse PGP/MIME message: %s"
 msgstr "Не могу да обрадим ПГП/МИМЕ поруку: %s"
 
-#: ../em-format/e-mail-parser-multipart-signed.c:114
+#: ../em-format/e-mail-parser-multipart-signed.c:121
 msgid "Unsupported signature format"
 msgstr "Неподржан облик потписа"
 
-#: ../em-format/e-mail-part-headers.c:48 ../modules/mail/em-mailer-prefs.c:65
+#: ../em-format/e-mail-part-headers.c:47 ../modules/mail/em-mailer-prefs.c:64
 msgid "Reply-To"
 msgstr "Одговор"
 
-#: ../em-format/e-mail-part-headers.c:53 ../e-util/e-dateedit.c:550
-#: ../e-util/e-dateedit.c:573 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:70
+#: ../em-format/e-mail-part-headers.c:52 ../e-util/e-dateedit.c:549
+#: ../e-util/e-dateedit.c:572 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:69
 msgid "Date"
 msgstr "Датум"
 
-#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/e-mail-part-headers.c:53 ../modules/mail/em-mailer-prefs.c:70
 msgid "Newsgroups"
 msgstr "Групе вести"
 
-#: ../em-format/e-mail-part-headers.c:55 ../modules/mail/em-mailer-prefs.c:72
+#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:71
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "Лице"
 
-#: ../em-format/e-mail-part-utils.c:500
+#: ../em-format/e-mail-part-utils.c:508
 #, c-format
 msgid "%s attachment"
 msgstr "%s прилог"
@@ -9848,7 +10170,7 @@ msgstr "дана"
 msgid "_When convenient"
 msgstr "Када је з_годно"
 
-#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:840
+#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:847
 msgid "Replies"
 msgstr "Одговори"
 
@@ -9939,63 +10261,70 @@ msgstr "Повратно обавештење"
 msgid "Sta_tus Tracking"
 msgstr "Праћење ста_туса"
 
-#: ../e-util/e-table-config.ui.h:1
+#: ../e-util/e-table-config.ui.h:2
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:282
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:192
+#| msgid "_Append"
+msgid "_Apply"
+msgstr "_Примени"
+
+#: ../e-util/e-table-config.ui.h:4
 msgid "_Sort..."
 msgstr "_Разврстај..."
 
-#: ../e-util/e-table-config.ui.h:2
+#: ../e-util/e-table-config.ui.h:5
 msgid "_Group By..."
 msgstr "_Групиши по..."
 
-#: ../e-util/e-table-config.ui.h:3
+#: ../e-util/e-table-config.ui.h:6
 msgid "_Fields Shown..."
 msgstr "Приказана _поља..."
 
-#: ../e-util/e-table-config.ui.h:6
+#: ../e-util/e-table-config.ui.h:9
 msgid "Clear _All"
 msgstr "Очисти _све"
 
-#: ../e-util/e-table-config.ui.h:7
+#: ../e-util/e-table-config.ui.h:10
 msgid "_Show field in View"
 msgstr "_Прикажи поље у прегледу"
 
-#: ../e-util/e-table-config.ui.h:8 ../e-util/e-table-header-item.c:1753
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1753
 msgid "Ascending"
 msgstr "Растуће"
 
-#: ../e-util/e-table-config.ui.h:9 ../e-util/e-table-header-item.c:1753
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1753
 msgid "Descending"
 msgstr "Опадајуће"
 
-#: ../e-util/e-table-config.ui.h:10
+#: ../e-util/e-table-config.ui.h:13
 msgid "Group Items By"
 msgstr "Групиши ставке по"
 
-#: ../e-util/e-table-config.ui.h:11
+#: ../e-util/e-table-config.ui.h:14
 msgid "Show _field in View"
 msgstr "Прикажи _поље у прегледу"
 
-#: ../e-util/e-table-config.ui.h:12
+#: ../e-util/e-table-config.ui.h:15
 msgid "Then By"
 msgstr "Онда по"
 
-#: ../e-util/e-table-config.ui.h:13
+#: ../e-util/e-table-config.ui.h:16
 msgid "Show field i_n View"
 msgstr "Прикажи поље _у прегледу"
 
-#: ../e-util/e-table-config.ui.h:14
+#: ../e-util/e-table-config.ui.h:17
 msgid "Show field in _View"
 msgstr "Прикажи поље у п_регледу"
 
-#: ../e-util/e-table-config.ui.h:15
+#: ../e-util/e-table-config.ui.h:18
 msgid "Sort"
 msgstr "Разврстај"
 
-#: ../e-util/e-table-config.ui.h:16
+#: ../e-util/e-table-config.ui.h:19
 msgid "Clear All"
 msgstr "Очисти све"
 
-#: ../e-util/e-table-config.ui.h:17
+#: ../e-util/e-table-config.ui.h:20
 msgid "Sort Items By"
 msgstr "Разврстај ставке по"
 
@@ -10003,7 +10332,7 @@ msgstr "Разврстај ставке по"
 msgid "Select a Time Zone"
 msgstr "Изаберите временску зону"
 
-#: ../e-util/e-timezone-dialog.ui.h:2
+#: ../e-util/e-timezone-dialog.ui.h:4
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -10012,20 +10341,20 @@ msgstr ""
 "Користите леви тастер миша да увећате мапу и изаберете временску зону.\n"
 "Користите десни тастер миша за умањивање."
 
-#: ../e-util/e-timezone-dialog.ui.h:4
+#: ../e-util/e-timezone-dialog.ui.h:6
 msgid "Time Zones"
 msgstr "Временске зоне"
 
-#: ../e-util/e-timezone-dialog.ui.h:5
+#: ../e-util/e-timezone-dialog.ui.h:7
 msgid "_Selection"
 msgstr "_Избор"
 
-#: ../e-util/e-timezone-dialog.ui.h:6
+#: ../e-util/e-timezone-dialog.ui.h:8
 msgid "Timezone drop-down combination box"
 msgstr "Прозорче за подешавање временске зоне"
 
-#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1239
-#: ../mail/em-utils.c:240
+#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1243
+#: ../mail/em-utils.c:229
 msgid "Incoming"
 msgstr "Долазно"
 
@@ -10042,7 +10371,7 @@ msgid "a time relative to the current time"
 msgstr "време у односу на тренутно време"
 
 # bug: plural-forms
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:78
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:83
 msgid "seconds"
 msgstr "секунде"
 
@@ -10071,15 +10400,15 @@ msgstr "у будућности"
 msgid "Show filters for mail:"
 msgstr "Прикажи пропуснике поште:"
 
-#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:166
+#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
 msgid "_Filter Rules"
 msgstr "Пр_авила филтера"
 
-#: ../e-util/filter.ui.h:17
+#: ../e-util/filter.ui.h:23
 msgid "Compare against"
 msgstr "Упореди са"
 
-#: ../e-util/filter.ui.h:18
+#: ../e-util/filter.ui.h:24
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -10087,7 +10416,7 @@ msgstr ""
 "Датум поруке ће бити упоређен са\n"
 "тренутним временом када се филтрирање десило."
 
-#: ../e-util/filter.ui.h:20
+#: ../e-util/filter.ui.h:26
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -10095,7 +10424,7 @@ msgstr ""
 "Датум поруке ће бити упоређен са\n"
 "00:00 наведеног датума."
 
-#: ../e-util/filter.ui.h:22
+#: ../e-util/filter.ui.h:28
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -10108,9 +10437,9 @@ 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
+#: ../e-util/e-mail-signature-script-dialog.c:416
+#: ../mail/e-mail-config-identity-page.c:310
+#: ../mail/e-mail-config-summary-page.c:340
 msgid "_Name:"
 msgstr "_Име:"
 
@@ -10118,110 +10447,110 @@ msgstr "_Име:"
 msgid "_Replace existing view"
 msgstr "_Замени постојећи преглед"
 
-#: ../e-util/e-activity-proxy.c:311
-#: ../modules/mail/e-mail-shell-view-actions.c:1734
+#: ../e-util/e-activity-proxy.c:308
+#: ../modules/mail/e-mail-shell-view-actions.c:1724
 msgid "Cancel"
 msgstr "Откажи"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:259
+#: ../e-util/e-activity.c:258
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (отказано)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:262
+#: ../e-util/e-activity.c:261
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (завршено)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:265
+#: ../e-util/e-activity.c:264
 #, 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:269
+#: ../e-util/e-activity.c:268
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (отказујем)"
 
-#: ../e-util/e-activity.c:271
+#: ../e-util/e-activity.c:270
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:276
+#: ../e-util/e-activity.c:275
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% завршено)"
 
 #. Translators: Escape is a keyboard binding.
-#: ../e-util/e-alert-bar.c:121
+#: ../e-util/e-alert-bar.c:118
 msgid "Close this message (Escape)"
 msgstr "Затворите ову поруку (Напусти)"
 
-#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:703
+#: ../e-util/e-attachment-bar.c:659 ../e-util/e-attachment-paned.c:702
 msgid "Icon View"
 msgstr "Преглед иконицама"
 
-#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:705
+#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:704
 msgid "List View"
 msgstr "Преглед списком"
 
-#: ../e-util/e-attachment-dialog.c:318
+#: ../e-util/e-attachment-dialog.c:317
 msgid "Attachment Properties"
 msgstr "Особине прилога"
 
-#: ../e-util/e-attachment-dialog.c:340 ../e-util/e-import-assistant.c:273
+#: ../e-util/e-attachment-dialog.c:339 ../e-util/e-import-assistant.c:273
 msgid "F_ilename:"
 msgstr "_Назив датотеке:"
 
-#: ../e-util/e-attachment-dialog.c:375
+#: ../e-util/e-attachment-dialog.c:374
 msgid "MIME Type:"
 msgstr "МИМЕ врста:"
 
-#: ../e-util/e-attachment-dialog.c:383 ../e-util/e-attachment-store.c:483
+#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:482
 msgid "_Suggest automatic display of attachment"
 msgstr "_Предложи аутоматски приказ прилога"
 
-#: ../e-util/e-attachment-handler-image.c:97
+#: ../e-util/e-attachment-handler-image.c:96
 msgid "Could not set as background"
 msgstr "Не могу да поставим као позадину"
 
-#: ../e-util/e-attachment-handler-image.c:147
+#: ../e-util/e-attachment-handler-image.c:146
 msgid "Set as _Background"
 msgstr "Постави као _позадину"
 
-#: ../e-util/e-attachment-icon-view.c:166
-#: ../e-util/e-attachment-tree-view.c:549
+#: ../e-util/e-attachment-icon-view.c:165
+#: ../e-util/e-attachment-tree-view.c:548
 msgid "Loading"
 msgstr "Учитавам"
 
-#: ../e-util/e-attachment-icon-view.c:178
-#: ../e-util/e-attachment-tree-view.c:561
+#: ../e-util/e-attachment-icon-view.c:177
+#: ../e-util/e-attachment-tree-view.c:560
 msgid "Saving"
 msgstr "Чувам"
 
-#: ../e-util/e-attachment-paned.c:104
+#: ../e-util/e-attachment-paned.c:103
 msgid "Hide Attachment _Bar"
 msgstr "Сакриј линију при_лога"
 
-#: ../e-util/e-attachment-paned.c:106 ../e-util/e-attachment-paned.c:719
+#: ../e-util/e-attachment-paned.c:105 ../e-util/e-attachment-paned.c:718
 msgid "Show Attachment _Bar"
 msgstr "Прикажи линију п_рилога"
 
-#: ../e-util/e-attachment-store.c:463
+#: ../e-util/e-attachment-store.c:462
 msgid "Add Attachment"
 msgstr "Додај прилог"
 
-#: ../e-util/e-attachment-store.c:466
+#: ../e-util/e-attachment-store.c:465
 msgid "A_ttach"
 msgstr "При_ложи"
 
-#: ../e-util/e-attachment-store.c:537
+#: ../e-util/e-attachment-store.c:536
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Сачувај прилог"
@@ -10230,45 +10559,68 @@ msgstr[2] "Сачувај прилоге"
 msgstr[3] "Сачувај прилог"
 
 #. Translators: Default attachment filename.
-#: ../e-util/e-attachment-store.c:568 ../e-util/e-attachment.c:2053
-#: ../e-util/e-attachment.c:2713
+#: ../e-util/e-attachment-store.c:567 ../e-util/e-attachment.c:2058
+#: ../e-util/e-attachment.c:2721
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../e-util/e-attachment-view.c:378
+#: ../e-util/e-attachment-view.c:377
 msgid "Open With Other Application..."
 msgstr "Отвори другим програмом..."
 
-#: ../e-util/e-attachment-view.c:385
+#: ../e-util/e-attachment-view.c:384
 msgid "S_ave All"
 msgstr "Сач_увај све"
 
-#: ../e-util/e-attachment-view.c:411
+#: ../e-util/e-attachment-view.c:391
+#| msgid "Sa_ve"
+msgid "Sa_ve As"
+msgstr "Сачувај _као"
+
+#: ../e-util/e-attachment-view.c:400
+#: ../plugins/save-calendar/save-calendar.c:349
+#: ../plugins/save-calendar/save-calendar.c:380
+#: ../plugins/save-calendar/save-calendar.c:411
+#| msgid "Save _As..."
+msgid "Save _As"
+msgstr "Сачувај _као"
+
+#: ../e-util/e-attachment-view.c:410
 msgid "A_dd Attachment..."
 msgstr "До_дај прилог..."
 
-#: ../e-util/e-attachment-view.c:435
+#: ../e-util/e-attachment-view.c:417
+#: ../modules/addressbook/e-book-shell-view-actions.c:1026
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
+#: ../modules/calendar/e-memo-shell-view-actions.c:628
+#: ../modules/calendar/e-task-shell-view-actions.c:752
+#: ../modules/mail/e-mail-shell-view-actions.c:1526
+#: ../modules/mail/e-mail-shell-view-actions.c:1596
+msgid "_Properties"
+msgstr "_Својства"
+
+#: ../e-util/e-attachment-view.c:434
 msgid "_Hide"
 msgstr "_Сакриј"
 
-#: ../e-util/e-attachment-view.c:442
+#: ../e-util/e-attachment-view.c:441
 msgid "Hid_e All"
 msgstr "Сак_риј све"
 
-#: ../e-util/e-attachment-view.c:449
+#: ../e-util/e-attachment-view.c:448
 msgid "_View Inline"
 msgstr "Пре_гледај унутар"
 
-#: ../e-util/e-attachment-view.c:456
+#: ../e-util/e-attachment-view.c:455
 msgid "Vie_w All Inline"
 msgstr "Пре_гледај све унутар"
 
-#: ../e-util/e-attachment-view.c:786
+#: ../e-util/e-attachment-view.c:785
 #, c-format
 msgid "Open With \"%s\""
 msgstr "Отвори програмом „%s“"
 
-#: ../e-util/e-attachment-view.c:789
+#: ../e-util/e-attachment-view.c:788
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Отвори овај прилог у „%s“"
@@ -10277,174 +10629,180 @@ msgstr "Отвори овај прилог у „%s“"
 #. * 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:1103
+#: ../e-util/e-attachment.c:1108
 msgid "Attached message"
 msgstr "Приложена порука"
 
-#: ../e-util/e-attachment.c:2134 ../e-util/e-attachment.c:3019
+#: ../e-util/e-attachment.c:2139 ../e-util/e-attachment.c:3027
 msgid "A load operation is already in progress"
 msgstr "Операција учитавања је већ у току"
 
-#: ../e-util/e-attachment.c:2142 ../e-util/e-attachment.c:3027
+#: ../e-util/e-attachment.c:2147 ../e-util/e-attachment.c:3035
 msgid "A save operation is already in progress"
 msgstr "Операција чувања је већ у току"
 
-#: ../e-util/e-attachment.c:2259
+#: ../e-util/e-attachment.c:2267
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Не могу да учитам „%s“"
 
-#: ../e-util/e-attachment.c:2262
+#: ../e-util/e-attachment.c:2270
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Не могу да учитам прилог"
 
-#: ../e-util/e-attachment.c:2566
+#: ../e-util/e-attachment.c:2574
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Не могу да отворим „%s“"
 
-#: ../e-util/e-attachment.c:2569
+#: ../e-util/e-attachment.c:2577
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Не могу да отворим прилог"
 
-#: ../e-util/e-attachment.c:3036
+#: ../e-util/e-attachment.c:3044
 msgid "Attachment contents not loaded"
 msgstr "Садржај прилога није учитан"
 
 # * found, so just bail completely.
-#: ../e-util/e-attachment.c:3112
+#: ../e-util/e-attachment.c:3124
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Не могу да сачувам „%s“"
 
-#: ../e-util/e-attachment.c:3115
+#: ../e-util/e-attachment.c:3127
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Не могу да сачувам прилог"
 
-#: ../e-util/e-book-source-config.c:98
+#: ../e-util/e-book-source-config.c:97
 msgid "Mark as default address book"
 msgstr "Означава као подразумеван адресар"
 
-#: ../e-util/e-book-source-config.c:103
+#: ../e-util/e-book-source-config.c:102
 msgid "Autocomplete with this address book"
 msgstr "Сам допуњава овим адресаром"
 
-#: ../e-util/e-book-source-config.c:277
+#: ../e-util/e-book-source-config.c:276
 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
+#: ../e-util/e-buffer-tagger.c:407
 msgid "Ctrl-click to open a link"
 msgstr "Притисните тастер Ктрл и кликните да отворите везу"
 
-#: ../e-util/e-cal-source-config.c:170
+#: ../e-util/e-cal-source-config.c:169
 msgid "Mark as default calendar"
 msgstr "Означава као основни календар"
 
-#: ../e-util/e-cal-source-config.c:173
+#: ../e-util/e-cal-source-config.c:172
 msgid "Mark as default task list"
 msgstr "Означава као основни списак задатака"
 
-#: ../e-util/e-cal-source-config.c:176
+#: ../e-util/e-cal-source-config.c:175
 msgid "Mark as default memo list"
 msgstr "Означава као основни списак белешки"
 
-#: ../e-util/e-cal-source-config.c:201
+#: ../e-util/e-cal-source-config.c:200
 msgid "Color:"
 msgstr "Боја:"
 
-#: ../e-util/e-cal-source-config.c:406
+#: ../e-util/e-cal-source-config.c:405
 msgid "Copy calendar contents locally for offline operation"
 msgstr "Умножава садржај календара локално за рад ван мреже"
 
-#: ../e-util/e-cal-source-config.c:410
+#: ../e-util/e-cal-source-config.c:409
 msgid "Copy task list contents locally for offline operation"
 msgstr "Умножава садржај списка задатака локално за рад ван мреже"
 
-#: ../e-util/e-cal-source-config.c:414
+#: ../e-util/e-cal-source-config.c:413
 msgid "Copy memo list contents locally for offline operation"
 msgstr "Умножава садржај списка белешки локално за рад ван мреже"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1327 ../e-util/e-calendar-item.c:2195
+#: ../e-util/e-calendar-item.c:1326 ../e-util/e-calendar-item.c:2194
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1329
+#: ../e-util/e-calendar-item.c:1328
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1366
+#: ../e-util/e-calendar-item.c:1365
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y."
 
-#: ../e-util/e-calendar.c:190
+#: ../e-util/e-calendar.c:189
 msgid "Previous month"
 msgstr "Претходни месец"
 
-#: ../e-util/e-calendar.c:215
+#: ../e-util/e-calendar.c:214
 msgid "Next month"
 msgstr "Следећи месец"
 
-#: ../e-util/e-calendar.c:241
+#: ../e-util/e-calendar.c:240
 msgid "Previous year"
 msgstr "Претходна година"
 
-#: ../e-util/e-calendar.c:266
+#: ../e-util/e-calendar.c:265
 msgid "Next year"
 msgstr "Следећа година"
 
-#: ../e-util/e-calendar.c:290
+#: ../e-util/e-calendar.c:289
 msgid "Month Calendar"
 msgstr "Месечни календар"
 
-#: ../e-util/e-categories-editor.c:224
+#: ../e-util/e-categories-editor.c:223
 msgid "Currently _used categories:"
 msgstr "Тренутно _коришћене категорије:"
 
-#: ../e-util/e-categories-editor.c:235
+#: ../e-util/e-categories-editor.c:234
 msgid "_Available Categories:"
 msgstr "_Доступне категорије:"
 
-#: ../e-util/e-categories-selector.c:323
+#: ../e-util/e-categories-editor.c:274 ../mail/em-folder-selector.c:269
+#: ../plugins/mail-to-task/mail-to-task.c:595
+#: ../shell/e-shell-window-actions.c:1100
+msgid "_New"
+msgstr "_Ново"
+
+#: ../e-util/e-categories-selector.c:321
 msgid "Icon"
 msgstr "Иконица"
 
-#: ../e-util/e-category-completion.c:300
+#: ../e-util/e-category-completion.c:299
 #, c-format
 msgid "Create category \"%s\""
 msgstr "Израда категорије „%s“"
 
-#: ../e-util/e-category-editor.c:137
+#: ../e-util/e-category-editor.c:136
 msgid "Category Icon"
 msgstr "Иконица категорије"
 
-#: ../e-util/e-category-editor.c:141
+#: ../e-util/e-category-editor.c:140
 msgid "_No Image"
 msgstr "_Без слике"
 
-#: ../e-util/e-category-editor.c:178
+#: ../e-util/e-category-editor.c:173
 msgid "Category _Name"
 msgstr "_Назив категорије"
 
-#: ../e-util/e-category-editor.c:190
+#: ../e-util/e-category-editor.c:185
 msgid "Category _Icon"
 msgstr "_Иконица категорије"
 
-#: ../e-util/e-category-editor.c:216
+#: ../e-util/e-category-editor.c:211
 msgid "Category Properties"
 msgstr "Особине категорије"
 
-#: ../e-util/e-category-editor.c:277
+#: ../e-util/e-category-editor.c:272
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
@@ -10452,18 +10810,18 @@ msgid ""
 msgstr ""
 "Већ постоји категорија „%s“ у подешавањима. Молим изаберите други назив"
 
-#: ../e-util/e-cell-combo.c:186
+#: ../e-util/e-cell-combo.c:185
 msgid "popup list"
 msgstr "искачућа листа"
 
-#: ../e-util/e-cell-date-edit.c:299
+#: ../e-util/e-cell-date-edit.c:298
 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:1900
-#: ../modules/itip-formatter/itip-view.c:230
+#: ../e-util/e-cell-date-edit.c:306 ../e-util/e-datetime-format.c:208
+#: ../modules/calendar/e-cal-shell-view-actions.c:1899
+#: ../modules/itip-formatter/itip-view.c:223
 msgid "Today"
 msgstr "Данас"
 
@@ -10474,149 +10832,149 @@ msgstr "Данас"
 # is not permitted.
 #. Translators: "None" as a label of a button to unset date in a
 #. * date table cell.
-#: ../e-util/e-cell-date-edit.c:317
+#: ../e-util/e-cell-date-edit.c:316
 msgctxt "table-date"
 msgid "None"
 msgstr "Ништа"
 
-#: ../e-util/e-cell-date-edit.c:325
+#: ../e-util/e-cell-date-edit.c:324 ../mail/e-mail-label-dialog.c:200
 msgid "OK"
 msgstr "У реду"
 
-#: ../e-util/e-cell-date-edit.c:873
+#: ../e-util/e-cell-date-edit.c:872
 #, c-format
 msgid "The time must be in the format: %s"
 msgstr "Време мора бити у формату: %s"
 
-#: ../e-util/e-cell-date.c:51 ../mail/message-list.c:1851
+#: ../e-util/e-cell-date.c:50 ../mail/message-list.c:1853
 msgid "?"
 msgstr "?"
 
-#: ../e-util/e-cell-percent.c:80
+#: ../e-util/e-cell-percent.c:79
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Вредност процента мора бити између 0 и 100"
 
-#: ../e-util/e-charset-combo-box.c:100
+#: ../e-util/e-charset-combo-box.c:99
 msgid "Character Encoding"
 msgstr "Кодна страна"
 
-#: ../e-util/e-charset-combo-box.c:123
+#: ../e-util/e-charset-combo-box.c:122
 msgid "Enter the character set to use"
 msgstr "Изаберите кодну страну за коришћење"
 
-#: ../e-util/e-charset-combo-box.c:342
+#: ../e-util/e-charset-combo-box.c:368
 msgid "Other..."
 msgstr "Друго..."
 
-#: ../e-util/e-charset.c:53
+#: ../e-util/e-charset.c:52
 msgid "Arabic"
 msgstr "Арапски"
 
-#: ../e-util/e-charset.c:54
+#: ../e-util/e-charset.c:53
 msgid "Baltic"
 msgstr "Балтички"
 
-#: ../e-util/e-charset.c:55
+#: ../e-util/e-charset.c:54
 msgid "Central European"
 msgstr "Централноевропски"
 
-#: ../e-util/e-charset.c:56
+#: ../e-util/e-charset.c:55
 msgid "Chinese"
 msgstr "Кинески"
 
-#: ../e-util/e-charset.c:57
+#: ../e-util/e-charset.c:56
 msgid "Cyrillic"
 msgstr "Ћирилични"
 
-#: ../e-util/e-charset.c:58
+#: ../e-util/e-charset.c:57
 msgid "Greek"
 msgstr "Грчки"
 
-#: ../e-util/e-charset.c:59
+#: ../e-util/e-charset.c:58
 msgid "Hebrew"
 msgstr "Хебрејски"
 
-#: ../e-util/e-charset.c:60
+#: ../e-util/e-charset.c:59
 msgid "Japanese"
 msgstr "Јапански"
 
-#: ../e-util/e-charset.c:61
+#: ../e-util/e-charset.c:60
 msgid "Korean"
 msgstr "Корејски"
 
-#: ../e-util/e-charset.c:62
+#: ../e-util/e-charset.c:61
 msgid "Thai"
 msgstr "Тајландски"
 
-#: ../e-util/e-charset.c:63
+#: ../e-util/e-charset.c:62
 msgid "Turkish"
 msgstr "Турски"
 
-#: ../e-util/e-charset.c:64
+#: ../e-util/e-charset.c:63
 msgid "Unicode"
 msgstr "Уникод"
 
-#: ../e-util/e-charset.c:65
+#: ../e-util/e-charset.c:64
 msgid "Western European"
 msgstr "Западноевропски"
 
-#: ../e-util/e-charset.c:66
+#: ../e-util/e-charset.c:65
 msgid "Western European, New"
 msgstr "Западноевропски, нови"
 
 #. Translators: Character set "Chinese, Traditional"
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
+#: ../e-util/e-charset.c:84 ../e-util/e-charset.c:86 ../e-util/e-charset.c:88
 msgid "Traditional"
 msgstr "Традиционални"
 
 #. Translators: Character set "Chinese, Simplified"
-#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
-#: ../e-util/e-charset.c:97
+#: ../e-util/e-charset.c:90 ../e-util/e-charset.c:92 ../e-util/e-charset.c:94
+#: ../e-util/e-charset.c:96
 msgid "Simplified"
 msgstr "Поједностављени"
 
 #. Translators: Character set "Cyrillic, Ukrainian"
-#: ../e-util/e-charset.c:101
+#: ../e-util/e-charset.c:100
 msgid "Ukrainian"
 msgstr "Украјински"
 
 #. Translators: Character set "Hebrew, Visual"
-#: ../e-util/e-charset.c:105
+#: ../e-util/e-charset.c:104
 msgid "Visual"
 msgstr "Визуелни"
 
-#: ../e-util/e-client-cache.c:1162
+#: ../e-util/e-client-cache.c:1189
 #, c-format
 msgid "Cannot create a client object from extension name '%s'"
 msgstr "Не могу да направим предмет програма из назива проширења „%s“"
 
-#: ../e-util/e-dateedit.c:524
+#: ../e-util/e-dateedit.c:523
 msgid "Date and Time"
 msgstr "Датум и време"
 
-#: ../e-util/e-dateedit.c:549
+#: ../e-util/e-dateedit.c:548
 msgid "Text entry to input date"
 msgstr "Део текста за унос датума"
 
-#: ../e-util/e-dateedit.c:572
+#: ../e-util/e-dateedit.c:571
 msgid "Click this button to show a calendar"
 msgstr "Притисните на ово дугме да прикажете календар"
 
-#: ../e-util/e-dateedit.c:626
+#: ../e-util/e-dateedit.c:625
 msgid "Drop-down combination box to select time"
 msgstr "Прозорче за избор времена"
 
 # note(slobo): можда треба рок
-#: ../e-util/e-dateedit.c:627
+#: ../e-util/e-dateedit.c:626
 #: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "Време"
 
-#: ../e-util/e-dateedit.c:701
+#: ../e-util/e-dateedit.c:700
 msgid "No_w"
 msgstr "_Сада"
 
-#: ../e-util/e-dateedit.c:708
+#: ../e-util/e-dateedit.c:707
 msgid "_Today"
 msgstr "_Данас"
 
@@ -10627,7 +10985,7 @@ msgstr "_Данас"
 # is not permitted.
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../e-util/e-dateedit.c:717
+#: ../e-util/e-dateedit.c:716
 msgid "_None"
 msgstr "_Ништа"
 
@@ -10638,32 +10996,32 @@ msgstr "_Ништа"
 # is not permitted.
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../e-util/e-dateedit.c:1813 ../e-util/e-dateedit.c:2061
+#: ../e-util/e-dateedit.c:1838 ../e-util/e-dateedit.c:2086
 msgctxt "date"
 msgid "None"
 msgstr "Ништа"
 
-#: ../e-util/e-dateedit.c:1953
+#: ../e-util/e-dateedit.c:1978
 msgid "Invalid Date Value"
 msgstr "Неисправан датум"
 
-#: ../e-util/e-dateedit.c:1998
+#: ../e-util/e-dateedit.c:2023
 msgid "Invalid Time Value"
 msgstr "Неисправно време"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:220 ../modules/itip-formatter/itip-view.c:258
+#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:251
 msgid "Tomorrow"
 msgstr "Сутра"
 
-#: ../e-util/e-datetime-format.c:222
+#: ../e-util/e-datetime-format.c:221
 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:230
+#: ../e-util/e-datetime-format.c:229
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "Следећег %a"
@@ -10671,7 +11029,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:236
+#: ../e-util/e-datetime-format.c:235
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "Следећег %a"
@@ -10679,7 +11037,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:242
+#: ../e-util/e-datetime-format.c:241
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "Следеће %a"
@@ -10687,7 +11045,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:248
+#: ../e-util/e-datetime-format.c:247
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "Следећег %a"
@@ -10695,7 +11053,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:254
+#: ../e-util/e-datetime-format.c:253
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "Следећег %a"
@@ -10703,7 +11061,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:260
+#: ../e-util/e-datetime-format.c:259
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "Следеће %a"
@@ -10711,40 +11069,40 @@ 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:266
+#: ../e-util/e-datetime-format.c:265
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Следеће %a"
 
-#: ../e-util/e-datetime-format.c:353 ../e-util/e-datetime-format.c:363
-#: ../e-util/e-datetime-format.c:372
+#: ../e-util/e-datetime-format.c:352 ../e-util/e-datetime-format.c:362
+#: ../e-util/e-datetime-format.c:371
 msgid "Use locale default"
 msgstr "Користи подразумевани локалитет"
 
-#: ../e-util/e-datetime-format.c:577
+#: ../e-util/e-datetime-format.c:576
 msgid "Format:"
 msgstr "Облик:"
 
-#: ../e-util/e-file-utils.c:121
+#: ../e-util/e-file-utils.c:120
 msgid "(Unknown Filename)"
 msgstr "(Непознато име датотеке)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:125
+#: ../e-util/e-file-utils.c:124
 #, c-format
 msgid "Writing \"%s\""
 msgstr "Уписујем „%s“"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:130
+#: ../e-util/e-file-utils.c:129
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "Уписујем „%s“ у %s"
 
 #. 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
-#: ../e-util/e-filter-datespec.c:67
+#: ../e-util/e-filter-datespec.c:66
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -10753,7 +11111,7 @@ msgstr[1] "пре %d секунде"
 msgstr[2] "пре %d секунди"
 msgstr[3] "пре %d секунде"
 
-#: ../e-util/e-filter-datespec.c:68
+#: ../e-util/e-filter-datespec.c:67
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
@@ -10762,7 +11120,7 @@ msgstr[1] "%d секунде у будућности"
 msgstr[2] "%d секунди у будућности"
 msgstr[3] "%d секунда у будућности"
 
-#: ../e-util/e-filter-datespec.c:69
+#: ../e-util/e-filter-datespec.c:68
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -10771,7 +11129,7 @@ msgstr[1] "пре %d минута"
 msgstr[2] "пре %d минута"
 msgstr[3] "пре %d минут"
 
-#: ../e-util/e-filter-datespec.c:70
+#: ../e-util/e-filter-datespec.c:69
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
@@ -10780,7 +11138,7 @@ msgstr[1] "%d минута у будућности"
 msgstr[2] "%d минута у будућности"
 msgstr[3] "%d минут у будућности"
 
-#: ../e-util/e-filter-datespec.c:71
+#: ../e-util/e-filter-datespec.c:70
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -10789,7 +11147,7 @@ msgstr[1] "пре %d сата"
 msgstr[2] "пре %d сати"
 msgstr[3] "пре %d сат"
 
-#: ../e-util/e-filter-datespec.c:72
+#: ../e-util/e-filter-datespec.c:71
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
@@ -10798,7 +11156,7 @@ msgstr[1] "%d сата у будућности"
 msgstr[2] "%d сати у будућности"
 msgstr[3] "%d сат у будућности"
 
-#: ../e-util/e-filter-datespec.c:73
+#: ../e-util/e-filter-datespec.c:72
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -10807,7 +11165,7 @@ msgstr[1] "пре %d дана"
 msgstr[2] "пре %d дана"
 msgstr[3] "пре %d дан"
 
-#: ../e-util/e-filter-datespec.c:74
+#: ../e-util/e-filter-datespec.c:73
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
@@ -10816,7 +11174,7 @@ msgstr[1] "%d дана у будућности"
 msgstr[2] "%d дана у будућности"
 msgstr[3] "%d дан у будућности"
 
-#: ../e-util/e-filter-datespec.c:75
+#: ../e-util/e-filter-datespec.c:74
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -10825,7 +11183,7 @@ msgstr[1] "пре %d недеље"
 msgstr[2] "пре %d недеља"
 msgstr[3] "пре %d недељу"
 
-#: ../e-util/e-filter-datespec.c:76
+#: ../e-util/e-filter-datespec.c:75
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
@@ -10834,7 +11192,7 @@ msgstr[1] "%d недеље у будућности"
 msgstr[2] "%d недеља у будућности"
 msgstr[3] "%d недеља у будућности"
 
-#: ../e-util/e-filter-datespec.c:77
+#: ../e-util/e-filter-datespec.c:76
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -10843,7 +11201,7 @@ msgstr[1] "пре %d месеца"
 msgstr[2] "пре %d месеци"
 msgstr[3] "пре %d месец"
 
-#: ../e-util/e-filter-datespec.c:78
+#: ../e-util/e-filter-datespec.c:77
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
@@ -10852,7 +11210,7 @@ msgstr[1] "%d месеца у будућности"
 msgstr[2] "%d месеци у будућност"
 msgstr[3] "%d месец у будућности"
 
-#: ../e-util/e-filter-datespec.c:79
+#: ../e-util/e-filter-datespec.c:78
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
@@ -10861,7 +11219,7 @@ msgstr[1] "пре %d године"
 msgstr[2] "пре %d година"
 msgstr[3] "пре %d годину"
 
-#: ../e-util/e-filter-datespec.c:80
+#: ../e-util/e-filter-datespec.c:79
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
@@ -10870,45 +11228,45 @@ msgstr[1] "%d године у будућности"
 msgstr[2] "%d година у будућности"
 msgstr[3] "%d година у будућности"
 
-#: ../e-util/e-filter-datespec.c:130
+#: ../e-util/e-filter-datespec.c:129
 msgid "<click here to select a date>"
 msgstr "<кликните овде да изаберете датум>"
 
-#: ../e-util/e-filter-datespec.c:133 ../e-util/e-filter-datespec.c:144
-#: ../e-util/e-filter-datespec.c:155
+#: ../e-util/e-filter-datespec.c:132 ../e-util/e-filter-datespec.c:143
+#: ../e-util/e-filter-datespec.c:154
 msgid "now"
 msgstr "сада"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../e-util/e-filter-datespec.c:140
+#: ../e-util/e-filter-datespec.c:139
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y."
 
-#: ../e-util/e-filter-datespec.c:289
+#: ../e-util/e-filter-datespec.c:288
 msgid "Select a time to compare against"
 msgstr "Изаберите време за поређење"
 
-#: ../e-util/e-filter-file.c:187
+#: ../e-util/e-filter-file.c:186
 msgid "Choose a File"
 msgstr "Изаберите датотеку"
 
-#: ../e-util/e-filter-rule.c:743
+#: ../e-util/e-filter-rule.c:750
 msgid "R_ule name:"
 msgstr "Назив _правила:"
 
-#: ../e-util/e-filter-rule.c:793
+#: ../e-util/e-filter-rule.c:800
 msgid "all the following conditions"
 msgstr "свим следећим условима"
 
-#: ../e-util/e-filter-rule.c:794
+#: ../e-util/e-filter-rule.c:801
 msgid "any of the following conditions"
 msgstr "било ком од следећих услова"
 
-#: ../e-util/e-filter-rule.c:800
+#: ../e-util/e-filter-rule.c:807
 msgid "_Find items which match:"
 msgstr "_Пронађи ставке које одговарају:"
 
-#: ../e-util/e-filter-rule.c:823
+#: ../e-util/e-filter-rule.c:830
 msgid "Find items that meet the following conditions"
 msgstr "Пронађите ставке које задовољавају следеће услове"
 
@@ -10921,34 +11279,35 @@ msgstr "Пронађите ставке које задовољавају сле
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../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:622
+#: ../e-util/e-filter-rule.c:845 ../e-util/e-mail-identity-combo-box.c:473
+#: ../e-util/e-mail-signature-combo-box.c:368 ../e-util/e-proxy-editor.c:549
+#: ../libemail-engine/camel-null-store.c:27
+#: ../mail/e-mail-config-summary-page.c:138
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
 msgid "None"
 msgstr "Ништа"
 
-#: ../e-util/e-filter-rule.c:839
+#: ../e-util/e-filter-rule.c:846
 msgid "All related"
 msgstr "Све повезано"
 
-#: ../e-util/e-filter-rule.c:841
+#: ../e-util/e-filter-rule.c:848
 msgid "Replies and parents"
 msgstr "Одговори и надређено"
 
-#: ../e-util/e-filter-rule.c:842
+#: ../e-util/e-filter-rule.c:849
 msgid "No reply or parent"
 msgstr "Нема одговора или родитеља"
 
-#: ../e-util/e-filter-rule.c:845
+#: ../e-util/e-filter-rule.c:852
 msgid "I_nclude threads:"
 msgstr "Укључи _нити:"
 
-#: ../e-util/e-filter-rule.c:922
+#: ../e-util/e-filter-rule.c:929
 msgid "A_dd Condition"
 msgstr "Додај _услов"
 
-#: ../e-util/e-filter-rule.c:1239 ../mail/em-utils.c:241
+#: ../e-util/e-filter-rule.c:1243 ../mail/em-utils.c:230
 msgid "Outgoing"
 msgstr "Одлазно"
 
@@ -10968,7 +11327,7 @@ msgstr "Изаберите датотеку"
 msgid "File _type:"
 msgstr "_Врста датотеке:"
 
-#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:921
+#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:917
 msgid "Choose the destination for this import"
 msgstr "Изаберите одредиште за овај увоз"
 
@@ -10985,7 +11344,7 @@ msgid "Import a _single file"
 msgstr "Увези _једну датотеку"
 
 #: ../e-util/e-import-assistant.c:403
-#: ../modules/startup-wizard/e-mail-config-import-page.c:202
+#: ../modules/startup-wizard/e-mail-config-import-page.c:201
 msgid "Please select the information that you would like to import:"
 msgstr "Изаберите податке које желите да увезете:"
 
@@ -11000,7 +11359,7 @@ msgstr ""
 "поново, кликните на дугме „Назад“."
 
 #: ../e-util/e-import-assistant.c:559
-#: ../modules/startup-wizard/e-mail-config-import-page.c:231
+#: ../modules/startup-wizard/e-mail-config-import-page.c:230
 #, c-format
 msgid "From %s:"
 msgstr "Од %s:"
@@ -11010,29 +11369,29 @@ msgstr "Од %s:"
 msgid "_Cancel Import"
 msgstr "_Откажи увожење"
 
-#: ../e-util/e-import-assistant.c:920
+#: ../e-util/e-import-assistant.c:916
 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
+#: ../e-util/e-import-assistant.c:922 ../e-util/e-import-assistant.c:935
+#: ../e-util/e-import-assistant.c:1288 ../e-util/e-import-assistant.c:1364
+#: ../e-util/e-import-assistant.c:1373
 msgid "Import Data"
 msgstr "Увези податке"
 
-#: ../e-util/e-import-assistant.c:934
+#: ../e-util/e-import-assistant.c:930
 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
+#: ../e-util/e-import-assistant.c:1278 ../e-util/e-import-assistant.c:1313
 msgid "Evolution Import Assistant"
 msgstr "Помоћник Еволуције за увоз"
 
-#: ../e-util/e-import-assistant.c:1299 ../e-util/e-import-assistant.c:1355
+#: ../e-util/e-import-assistant.c:1295 ../e-util/e-import-assistant.c:1351
 msgid "Import Location"
 msgstr "Увези локацију"
 
-#: ../e-util/e-import-assistant.c:1310
+#: ../e-util/e-import-assistant.c:1306
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -11042,43 +11401,43 @@ msgstr ""
 "Овај помоћник ће вас провести кроз поступак увоза спољних датотека у "
 "Еволуцију."
 
-#: ../e-util/e-import-assistant.c:1327
+#: ../e-util/e-import-assistant.c:1323
 msgid "Importer Type"
 msgstr "Врста увозника"
 
-#: ../e-util/e-import-assistant.c:1337
+#: ../e-util/e-import-assistant.c:1333
 msgid "Select Information to Import"
 msgstr "Изаберите информацију за увоз"
 
-#: ../e-util/e-import-assistant.c:1346
+#: ../e-util/e-import-assistant.c:1342
 msgid "Select a File"
 msgstr "Изаберите датотеку"
 
-#: ../e-util/e-import-assistant.c:1363
+#: ../e-util/e-import-assistant.c:1359
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Кликните на „Примени“ да започнете увоз датотеке у Еволуцију."
 
-#: ../e-util/e-mail-signature-combo-box.c:378
+#: ../e-util/e-mail-signature-combo-box.c:377
 msgid "Autogenerated"
 msgstr "Аутоматски састављено"
 
-#: ../e-util/e-mail-signature-editor.c:310
+#: ../e-util/e-mail-signature-editor.c:309
 msgid "Close"
 msgstr "Затвори"
 
-#: ../e-util/e-mail-signature-editor.c:315
+#: ../e-util/e-mail-signature-editor.c:314
 msgid "_Save and Close"
 msgstr "_Сачувај и затвори"
 
-#: ../e-util/e-mail-signature-editor.c:529
+#: ../e-util/e-mail-signature-editor.c:528
 msgid "Edit Signature"
 msgstr "Уреди потпис"
 
-#: ../e-util/e-mail-signature-editor.c:549
+#: ../e-util/e-mail-signature-editor.c:548
 msgid "_Signature Name:"
 msgstr "Назив _потписа:"
 
-#: ../e-util/e-mail-signature-editor.c:595
+#: ../e-util/e-mail-signature-editor.c:594
 msgid "Unnamed"
 msgstr "Без имена"
 
@@ -11086,15 +11445,15 @@ msgstr "Без имена"
 msgid "Add _Script"
 msgstr "Додај ск_рипту"
 
-#: ../e-util/e-mail-signature-manager.c:422
+#: ../e-util/e-mail-signature-manager.c:419
 msgid "Add Signature Script"
 msgstr "Додај скрипту за потпис"
 
-#: ../e-util/e-mail-signature-manager.c:492
+#: ../e-util/e-mail-signature-manager.c:489
 msgid "Edit Signature Script"
 msgstr "Уреди скрипту потписа"
 
-#: ../e-util/e-mail-signature-script-dialog.c:395
+#: ../e-util/e-mail-signature-script-dialog.c:394
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -11104,19 +11463,19 @@ msgstr ""
 "потпис. Назив који сте дали ће бити коришћен\n"
 "само за приказ."
 
-#: ../e-util/e-mail-signature-script-dialog.c:446
+#: ../e-util/e-mail-signature-script-dialog.c:445
 msgid "S_cript:"
 msgstr "С_крипта:"
 
-#: ../e-util/e-mail-signature-script-dialog.c:477
+#: ../e-util/e-mail-signature-script-dialog.c:476
 msgid "Script file must be executable."
 msgstr "Датотека скрипте мора бити извршна."
 
-#: ../e-util/e-map.c:886
+#: ../e-util/e-map.c:885
 msgid "World Map"
 msgstr "Карта света"
 
-#: ../e-util/e-map.c:889
+#: ../e-util/e-map.c:888
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -11124,86 +11483,82 @@ msgstr ""
 "Алат за избор временске зоне помоћу миша. Тастатуром се избор временске зоне "
 "врши из доњег оквира."
 
-#: ../e-util/e-misc-utils.c:242
+#: ../e-util/e-misc-utils.c:246
 msgid "Could not open the link."
 msgstr "Не могу да отворим везу."
 
-#: ../e-util/e-misc-utils.c:289
+#: ../e-util/e-misc-utils.c:293
 msgid "Could not display help for Evolution."
 msgstr "Не могу да прикажем помоћ за Еволуцију."
 
-#: ../e-util/e-name-selector-dialog.c:279
+#: ../e-util/e-name-selector-dialog.c:277
 msgid "Show Contacts"
 msgstr "Прикажи контакте"
 
-#: ../e-util/e-name-selector-dialog.c:311
+#: ../e-util/e-name-selector-dialog.c:309
 msgid "Address B_ook:"
 msgstr "_Адресар:"
 
-#: ../e-util/e-name-selector-dialog.c:318
+#: ../e-util/e-name-selector-dialog.c:316
 msgid "Cat_egory:"
 msgstr "_Категорија:"
 
-#: ../e-util/e-name-selector-dialog.c:342
+#: ../e-util/e-name-selector-dialog.c:340
 msgid "_Search:"
 msgstr "_Потражи:"
 
-#: ../e-util/e-name-selector-dialog.c:368
-#: ../e-util/e-name-selector-dialog.c:1276
-#: ../modules/addressbook/e-book-shell-view-actions.c:1113
-#: ../modules/calendar/e-cal-shell-view-actions.c:1733
-#: ../modules/calendar/e-memo-shell-view-actions.c:767
-#: ../modules/calendar/e-task-shell-view-actions.c:938
+#: ../e-util/e-name-selector-dialog.c:366
+#: ../e-util/e-name-selector-dialog.c:1274
+#: ../modules/addressbook/e-book-shell-view-actions.c:1112
+#: ../modules/calendar/e-cal-shell-view-actions.c:1732
+#: ../modules/calendar/e-memo-shell-view-actions.c:766
+#: ../modules/calendar/e-task-shell-view-actions.c:937
 msgid "Any Category"
 msgstr "Било која категорија"
 
-#: ../e-util/e-name-selector-dialog.c:370
+#: ../e-util/e-name-selector-dialog.c:368
 msgid "Co_ntacts"
 msgstr "Ко_нтакти"
 
-#: ../e-util/e-name-selector-dialog.c:447
+#: ../e-util/e-name-selector-dialog.c:445
 msgid "Search"
 msgstr "Потражи"
 
-#: ../e-util/e-name-selector-dialog.c:450
-#: ../mail/importers/pine-importer.c:426
+#: ../e-util/e-name-selector-dialog.c:448
+#: ../mail/importers/pine-importer.c:427
 msgid "Address Book"
 msgstr "Адресар"
 
-#: ../e-util/e-name-selector-dialog.c:453
-#: ../modules/addressbook/e-book-shell-backend.c:304
-#: ../modules/addressbook/e-book-shell-view.c:372
+#: ../e-util/e-name-selector-dialog.c:451
+#: ../modules/addressbook/e-book-shell-backend.c:303
+#: ../modules/addressbook/e-book-shell-view.c:371
 msgid "Contacts"
 msgstr "Контакти"
 
-#: ../e-util/e-name-selector-dialog.c:578
+#: ../e-util/e-name-selector-dialog.c:576
 msgid "Select Contacts from Address Book"
 msgstr "Изаберите контакте из адресара"
 
-#: ../e-util/e-name-selector-dialog.c:1001
-msgid "_Remove"
-msgstr "_Уклони"
-
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../e-util/e-name-selector-entry.c:3028
+#: ../e-util/e-name-selector-entry.c:3038
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "_Рашири %s унутар"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3044
+#: ../e-util/e-name-selector-entry.c:3054
 #, c-format
 msgid "Cop_y %s"
 msgstr "_Умножи %s"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3055
+#: ../e-util/e-name-selector-entry.c:3065
 #, c-format
 msgid "C_ut %s"
 msgstr "_Исеци %s"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3073
+#: ../e-util/e-name-selector-entry.c:3083
 #, c-format
 msgid "_Edit %s"
 msgstr "_Уреди %s"
@@ -11213,41 +11568,41 @@ msgstr "_Уреди %s"
 msgid "_Delete %s"
 msgstr "_Обриши %s"
 
-#: ../e-util/e-online-button.c:31
+#: ../e-util/e-online-button.c:30
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr ""
 "Еволуција је тренутно на мрежи.  Кликните на ово дугме за рад ван мреже."
 
-#: ../e-util/e-online-button.c:34
+#: ../e-util/e-online-button.c:33
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr ""
 "Еволуција тренутно није на мрежи.  Кликните на ово дугме да се повежете."
 
-#: ../e-util/e-online-button.c:37
+#: ../e-util/e-online-button.c:36
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr "Еволуција тренутно није на мрежи јер мрежа није доступна."
 
-#: ../e-util/e-passwords.c:127
+#: ../e-util/e-passwords.c:125
 msgid "Keyring key is unusable: no user or host name"
 msgstr "Кључ привеска није употребљив: нема корисника нити домаћина"
 
-#: ../e-util/e-passwords.c:447
+#: ../e-util/e-passwords.c:445
 msgid "You have the Caps Lock key on."
 msgstr "Укључили сте велика слова."
 
-#: ../e-util/e-passwords.c:578
+#: ../e-util/e-passwords.c:576
 msgid "_Remember this passphrase"
 msgstr "_Запамти ову лозинку"
 
-#: ../e-util/e-passwords.c:579
+#: ../e-util/e-passwords.c:577
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_Запамти ову лозинку до краја ове сесије"
 
-#: ../e-util/e-passwords.c:584
+#: ../e-util/e-passwords.c:582
 msgid "_Remember this password"
 msgstr "_Запамти ову лозинку"
 
-#: ../e-util/e-passwords.c:585
+#: ../e-util/e-passwords.c:583
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Запамти ову лозинку до краја ове сесије"
 
@@ -11255,139 +11610,226 @@ msgstr "_Запамти ову лозинку до краја ове сесиј�
 msgid "Evolution Preferences"
 msgstr "Подешавања Еволуције"
 
-#: ../e-util/e-print.c:161
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "Дошло је до грешке за време штампања"
 
-#: ../e-util/e-print.c:168
+#: ../e-util/e-print.c:167
 msgid "The printing system reported the following details about the error:"
 msgstr "Систем за штампање је известио следеће детаље о грешци:"
 
-#: ../e-util/e-print.c:174
+#: ../e-util/e-print.c:173
 msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "Систем за штампање није понудио никакве додатне детаље о грешци."
 
-#: ../e-util/e-rule-editor.c:185
+#: ../e-util/e-proxy-editor.c:314
+#| msgid "Method:"
+msgid "_Method:"
+msgstr "_Начин:"
+
+#: ../e-util/e-proxy-editor.c:336
+msgid "Defer to Desktop Settings"
+msgstr "Тежи подешавањима радне површи"
+
+#: ../e-util/e-proxy-editor.c:340
+msgid "_Open Desktop Settings"
+msgstr "_Отвори подешавања радне површи"
+
+#: ../e-util/e-proxy-editor.c:366
+#| msgid "January"
+msgid "Manual"
+msgstr "Ручно"
+
+#: ../e-util/e-proxy-editor.c:385
+#| msgid "H_TTP Proxy:"
+msgid "_HTTP Proxy:"
+msgstr "_ХТТП посредник:"
+
+#: ../e-util/e-proxy-editor.c:416
+#| msgid "H_TTP Proxy:"
+msgid "H_TTPS Proxy:"
+msgstr "Х_ТТПС посредник:"
+
+#: ../e-util/e-proxy-editor.c:447
+#| msgid "SOC_KS Proxy:"
+msgid "_Socks Proxy:"
+msgstr "_Сокс посредник:"
+
+#: ../e-util/e-proxy-editor.c:478
+#| msgid "Ignore"
+msgid "_Ignore Hosts:"
+msgstr "_Занемари домаћине:"
+
+#: ../e-util/e-proxy-editor.c:504
+#| msgid "Automatic Contacts"
+msgid "Automatic"
+msgstr "Самостално"
+
+#: ../e-util/e-proxy-editor.c:523
+#| msgid "Configuration"
+msgid "Configuration _URL:"
+msgstr "_Адреса подешавања:"
+
+#: ../e-util/e-proxy-editor.c:552
+msgid "Use a direct connection, no proxying required."
+msgstr "Користи непосредну везу, није потребно посредовање."
+
+#: ../e-util/e-proxy-preferences.c:177
+msgid "Switch to Basic Proxy Preferences"
+msgstr "Пребаци се на основне поставке посредника"
+
+#: ../e-util/e-proxy-preferences.c:179
+msgid "Switch to Advanced Proxy Preferences"
+msgstr "Пребаци се на напредне поставке посредника"
+
+#: ../e-util/e-proxy-preferences.c:463
+msgid "Apply custom proxy settings to these accounts:"
+msgstr "Примени произвољна подешавања посредника на ове налоге:"
+
+#: ../e-util/e-proxy-preferences.c:498
+msgid ""
+"<b>Advanced Proxy Preferences</b> lets you define alternate network proxies "
+"and apply them to specific accounts"
+msgstr ""
+"<b>Напредне поставке посредника</b> вам допуштају да одредите заменске "
+"мрежне посреднике и да их примените на посебне налоге"
+
+#: ../e-util/e-proxy-selector.c:85
+#| msgid "_Custom binary:"
+msgid "Custom Proxy"
+msgstr "Произвољни посредник"
+
+#: ../e-util/e-proxy-selector.c:487
+#| msgid "Create a new appointment"
+msgid "Create a new proxy profile"
+msgstr "Направите нови профил посредника"
+
+#: ../e-util/e-proxy-selector.c:492
+#| msgid "Delete the selected memo list"
+msgid "Delete the selected proxy profile"
+msgstr "Обришите изабрани профил посредника"
+
+#: ../e-util/e-rule-editor.c:184
 msgid "Add Rule"
 msgstr "Додај правило"
 
-#: ../e-util/e-rule-editor.c:287
+#: ../e-util/e-rule-editor.c:286
 msgid "Edit Rule"
 msgstr "Уреди правило"
 
 # bug: plural-forms if put as "%d matches"
-#: ../e-util/e-search-bar.c:81
+#: ../e-util/e-search-bar.c:82
 #, c-format
 msgid "Matches: %u"
 msgstr "Поклапања: %u"
 
-#: ../e-util/e-search-bar.c:565
+#: ../e-util/e-search-bar.c:566
 msgid "Close the find bar"
 msgstr "Затвори траку претраге"
 
-#: ../e-util/e-search-bar.c:573
+#: ../e-util/e-search-bar.c:574
 msgid "Fin_d:"
 msgstr "Про_нађи:"
 
-#: ../e-util/e-search-bar.c:585
+#: ../e-util/e-search-bar.c:586
 msgid "Clear the search"
 msgstr "Очисти претрагу"
 
-#: ../e-util/e-search-bar.c:609
+#: ../e-util/e-search-bar.c:610
 msgid "_Previous"
 msgstr "_Претходно"
 
-#: ../e-util/e-search-bar.c:615
+#: ../e-util/e-search-bar.c:613
 msgid "Find the previous occurrence of the phrase"
 msgstr "Нађи претходно појављивање израза"
 
-#: ../e-util/e-search-bar.c:624
+#: ../e-util/e-search-bar.c:622
 msgid "_Next"
 msgstr "_Следеће"
 
-#: ../e-util/e-search-bar.c:630
+#: ../e-util/e-search-bar.c:625
 msgid "Find the next occurrence of the phrase"
 msgstr "Нађи следеће појављивање израза"
 
-#: ../e-util/e-search-bar.c:639
+#: ../e-util/e-search-bar.c:634
 msgid "Mat_ch case"
 msgstr "_Упореди величину слова"
 
-#: ../e-util/e-search-bar.c:667
+#: ../e-util/e-search-bar.c:662
 msgid "Reached bottom of page, continued from top"
 msgstr "Стигао сам до дна странице, настављам са врха"
 
-#: ../e-util/e-search-bar.c:689
+#: ../e-util/e-search-bar.c:684
 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:419
-#: ../modules/mail/e-mail-shell-view.c:1088
+#: ../e-util/e-send-options.c:537 ../mail/importers/elm-importer.c:327
+#: ../mail/importers/pine-importer.c:420
+#: ../modules/mail/e-mail-shell-view.c:1097
 msgid "Mail"
 msgstr "Пошта"
 
-#: ../e-util/e-send-options.c:570
+#: ../e-util/e-send-options.c:569
 msgid "When de_leted:"
 msgstr "Када је обри_сано:"
 
-#: ../e-util/e-source-config.c:681 ../e-util/e-source-config.c:685
+#: ../e-util/e-source-config.c:680 ../e-util/e-source-config.c:684
 msgid "Type:"
 msgstr "Врста:"
 
-#: ../e-util/e-source-config.c:693 ../e-util/e-source-config.c:697
+#: ../e-util/e-source-config.c:692 ../e-util/e-source-config.c:696
 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:1302
+#: ../e-util/e-source-config.c:1301
 msgid "Refresh every"
 msgstr "Освежи на сваких"
 
-#: ../e-util/e-source-config.c:1332 ../e-util/e-source-config.c:1402
+#: ../e-util/e-source-config.c:1331 ../e-util/e-source-config.c:1401
 msgid "Use a secure connection"
 msgstr "Користи безбедну везу"
 
-#: ../e-util/e-source-config.c:1428
+#: ../e-util/e-source-config.c:1427
 msgid "Unset _trust for SSL certificate"
 msgstr "Одзначи _поверење за ССЛ уверење"
 
-#: ../e-util/e-source-config.c:1464
+#: ../e-util/e-source-config.c:1463
 msgid "User"
 msgstr "Корисник"
 
-#: ../e-util/e-source-selector-dialog.c:229
+#: ../e-util/e-source-selector-dialog.c:226
 msgid "_Destination"
 msgstr "_Одредиште"
 
-#: ../e-util/e-source-selector-dialog.c:342
+#: ../e-util/e-source-selector-dialog.c:339
 msgid "Select destination"
 msgstr "Изаберите одредиште"
 
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:384
+#: ../e-util/e-spell-entry.c:383
 msgid "(no suggestions)"
 msgstr "(нема предлога)"
 
-#: ../e-util/e-spell-entry.c:408
+#: ../e-util/e-spell-entry.c:407
 msgid "More..."
 msgstr "Даље..."
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:479
+#: ../e-util/e-spell-entry.c:478
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "Додај „%s“ у речник"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:530
+#: ../e-util/e-spell-entry.c:529
 msgid "Ignore All"
 msgstr "Занемари све"
 
-#: ../e-util/e-spell-entry.c:558
+#: ../e-util/e-spell-entry.c:557
 msgid "Spelling Suggestions"
 msgstr "Предлози правописа"
 
@@ -11500,60 +11942,60 @@ msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
 msgstr "Позадинац списка задатака који услужује „{0}“ је наишао на грешку."
 
 #: ../e-util/e-table-click-to-add.c:680
-#: ../e-util/gal-a11y-e-table-click-to-add.c:62
-#: ../e-util/gal-a11y-e-table-click-to-add.c:143
+#: ../e-util/gal-a11y-e-table-click-to-add.c:61
+#: ../e-util/gal-a11y-e-table-click-to-add.c:142
 msgid "click to add"
 msgstr "кликните да додате"
 
-#: ../e-util/e-table-column-selector.c:266
+#: ../e-util/e-table-column-selector.c:265
 msgid "Move selected column names to top"
 msgstr "Преместите изабране називе ступца на врх"
 
-#: ../e-util/e-table-column-selector.c:271
+#: ../e-util/e-table-column-selector.c:270
 msgid "Move selected column names up one row"
 msgstr "Преместите изабране називе ступца један ред на горе"
 
-#: ../e-util/e-table-column-selector.c:276
+#: ../e-util/e-table-column-selector.c:275
 msgid "Move selected column names down one row"
 msgstr "Преместите изабране називе ступца један ред на доле"
 
-#: ../e-util/e-table-column-selector.c:281
+#: ../e-util/e-table-column-selector.c:280
 msgid "Move selected column names to bottom"
 msgstr "Преместите изабране називе ступца на дно"
 
-#: ../e-util/e-table-column-selector.c:286
+#: ../e-util/e-table-column-selector.c:285
 msgid "Select all column names"
 msgstr "Изаберите све називе ступца"
 
-#: ../e-util/e-table-config.c:389 ../e-util/e-table-config.c:435
+#: ../e-util/e-table-config.c:388 ../e-util/e-table-config.c:434
 msgid "(Ascending)"
 msgstr "(Растуће)"
 
-#: ../e-util/e-table-config.c:389 ../e-util/e-table-config.c:435
+#: ../e-util/e-table-config.c:388 ../e-util/e-table-config.c:434
 msgid "(Descending)"
 msgstr "(Опадајуће)"
 
-#: ../e-util/e-table-config.c:396
+#: ../e-util/e-table-config.c:395
 msgid "Not sorted"
 msgstr "Није разврстано"
 
-#: ../e-util/e-table-config.c:441
+#: ../e-util/e-table-config.c:440
 msgid "No grouping"
 msgstr "Без груписања"
 
-#: ../e-util/e-table-config.c:546
+#: ../e-util/e-table-config.c:545
 msgid "Show Fields"
 msgstr "Прикажи поља"
 
-#: ../e-util/e-table-config.c:562
+#: ../e-util/e-table-config.c:559
 msgid "Choose the order of information to appear in the message list."
 msgstr "Изаберите редослед података за приказивање на списку порука."
 
-#: ../e-util/e-table-field-chooser-dialog.c:227
+#: ../e-util/e-table-field-chooser-dialog.c:226
 msgid "Add a Column"
 msgstr "Додај колону"
 
-#: ../e-util/e-table-field-chooser.c:167
+#: ../e-util/e-table-field-chooser.c:166
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -11561,7 +12003,7 @@ msgstr ""
 "За додавање колоне у табелу, превуците\n"
 "је на место где желите да се појави."
 
-#: ../e-util/e-table-group-container.c:369
+#: ../e-util/e-table-group-container.c:368
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -11570,7 +12012,7 @@ msgstr[1] "%s: %s (%d ставке)"
 msgstr[2] "%s: %s (%d ставки)"
 msgstr[3] "%s: %s (једна ставка)"
 
-#: ../e-util/e-table-group-container.c:383
+#: ../e-util/e-table-group-container.c:382
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
@@ -11636,129 +12078,145 @@ msgstr "_Поређај по"
 msgid "_Custom"
 msgstr "_Произвољно"
 
-#: ../e-util/e-text.c:2098
+#: ../e-util/e-text.c:2110
 msgid "Select All"
 msgstr "Изабери све"
 
-#: ../e-util/e-text.c:2111
+#: ../e-util/e-text.c:2123
 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
+#: ../e-util/e-timezone-dialog.c:206 ../e-util/e-timezone-dialog.c:428
+#: ../e-util/e-timezone-dialog.c:432 ../e-util/e-timezone-dialog.c:436
+#: ../e-util/e-timezone-dialog.c:804
 msgid "UTC"
 msgstr "КУВ"
 
-#: ../e-util/e-url-entry.c:109
+#: ../e-util/e-url-entry.c:108
 msgid "Click here to open the URL"
 msgstr "Кликните овде да отворите адресу"
 
-#: ../e-util/e-url-entry.c:111
+#: ../e-util/e-url-entry.c:110
 msgid "Enter a URL here"
 msgstr "Овде унесите адресу"
 
-#: ../e-util/e-web-view-gtkhtml.c:406 ../e-util/e-web-view.c:285
+#: ../e-util/e-web-view-gtkhtml.c:405 ../e-util/e-web-view.c:282
 msgid "_Copy Link Location"
 msgstr "_Умножи место везе"
 
-#: ../e-util/e-web-view-gtkhtml.c:408 ../e-util/e-web-view.c:287
+#: ../e-util/e-web-view-gtkhtml.c:407 ../e-util/e-web-view.c:284
 msgid "Copy the link to the clipboard"
 msgstr "Умножава везу у списак исечака"
 
-#: ../e-util/e-web-view-gtkhtml.c:416 ../e-util/e-web-view.c:295
+#: ../e-util/e-web-view-gtkhtml.c:415 ../e-util/e-web-view.c:292
 msgid "_Open Link in Browser"
 msgstr "_Отвори везу у прегледнику"
 
-#: ../e-util/e-web-view-gtkhtml.c:418 ../e-util/e-web-view.c:297
+#: ../e-util/e-web-view-gtkhtml.c:417 ../e-util/e-web-view.c:294
 msgid "Open the link in a web browser"
 msgstr "Отвори везу у веб претраживачу"
 
-#: ../e-util/e-web-view-gtkhtml.c:426 ../e-util/e-web-view.c:305
+#: ../e-util/e-web-view-gtkhtml.c:425 ../e-util/e-web-view.c:302
 msgid "_Copy Email Address"
 msgstr "_Умножи адресу ел. поште"
 
-#: ../e-util/e-web-view-gtkhtml.c:443 ../e-util/e-web-view.c:322
+#: ../e-util/e-web-view-gtkhtml.c:442 ../e-util/e-web-view.c:319
 msgid "_Copy Image"
 msgstr "_Умножи слику"
 
-#: ../e-util/e-web-view-gtkhtml.c:445 ../e-util/e-web-view.c:324
+#: ../e-util/e-web-view-gtkhtml.c:444 ../e-util/e-web-view.c:321
 msgid "Copy the image to the clipboard"
 msgstr "Умножите слику у оставу"
 
-#: ../e-util/e-web-view-gtkhtml.c:465 ../e-util/e-web-view-gtkhtml.c:1308
-#: ../e-util/e-web-view.c:351 ../e-util/e-web-view.c:1317
+#: ../e-util/e-web-view-gtkhtml.c:464 ../e-util/e-web-view-gtkhtml.c:1307
+#: ../e-util/e-web-view.c:348 ../e-util/e-web-view.c:1319
 msgid "Select all text and images"
 msgstr "Изабери сав текст и слике"
 
-#: ../e-util/e-web-view-gtkhtml.c:972 ../e-util/e-web-view-gtkhtml.c:974
-#: ../e-util/e-web-view-gtkhtml.c:976 ../e-util/e-web-view.c:992
-#: ../e-util/e-web-view.c:994 ../e-util/e-web-view.c:996
+#: ../e-util/e-web-view-gtkhtml.c:971 ../e-util/e-web-view-gtkhtml.c:973
+#: ../e-util/e-web-view-gtkhtml.c:975 ../e-util/e-web-view.c:994
+#: ../e-util/e-web-view.c:996 ../e-util/e-web-view.c:998
 #, c-format
 msgid "Click to call %s"
 msgstr "Кликните да позовете %s"
 
-#: ../e-util/e-web-view-gtkhtml.c:978 ../e-util/e-web-view.c:998
+#: ../e-util/e-web-view-gtkhtml.c:977 ../e-util/e-web-view.c:1000
 msgid "Click to hide/unhide addresses"
 msgstr "Кликните да сакријете/откријете адресе"
 
-#: ../e-util/e-web-view-gtkhtml.c:980 ../e-util/e-web-view.c:1000
+#: ../e-util/e-web-view-gtkhtml.c:979 ../e-util/e-web-view.c:1002
 #, c-format
 msgid "Click to open %s"
 msgstr "Кликните да отворите %s"
 
-#: ../e-util/e-web-view.c:329
+#: ../e-util/e-web-view.c:326
 msgid "Save _Image..."
 msgstr "Сачувај _слику..."
 
-#: ../e-util/e-web-view.c:331
+#: ../e-util/e-web-view.c:328
 msgid "Save the image to a file"
 msgstr "Сачувајте слику у датотеку"
 
-#: ../e-util/e-web-view.c:2894
+#: ../e-util/e-web-view.c:2902
 msgid "Copying image to clipboard"
 msgstr "Умножавам слику у оставу"
 
-#: ../e-util/e-web-view.c:3082
+#: ../e-util/e-web-view.c:3090
 msgid "Save Image"
 msgstr "Сачувај слику"
 
-#: ../e-util/e-web-view.c:3118
+#: ../e-util/e-web-view.c:3126
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "Чувам слику у „%s“"
 
-#: ../e-util/ea-calendar-item.c:315 ../e-util/ea-calendar-item.c:324
+#: ../e-util/e-widget-undo.c:429
+msgid "Undo 'Insert text'"
+msgstr "Поништи „Уметни текст“"
+
+#: ../e-util/e-widget-undo.c:431
+msgid "Redo 'Insert text'"
+msgstr "Поврати „Уметни текст“"
+
+#: ../e-util/e-widget-undo.c:445
+msgid "Undo 'Delete text'"
+msgstr "Поништи „Обриши текст“"
+
+#: ../e-util/e-widget-undo.c:447
+msgid "Redo 'Delete text'"
+msgstr "Поврати „Обриши текст“"
+
+#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
 msgid "%d %B %Y"
 msgstr "%d %B %Y."
 
-#: ../e-util/ea-calendar-item.c:327
+#: ../e-util/ea-calendar-item.c:326
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Календар: од %s до %s"
 
-#: ../e-util/ea-calendar-item.c:364
+#: ../e-util/ea-calendar-item.c:363
 msgid "evolution calendar item"
 msgstr "ставка календара еволуције"
 
-#: ../e-util/evolution-source-viewer.c:635
+#: ../e-util/evolution-source-viewer.c:636
 msgid "Evolution Source Viewer"
 msgstr "Приказивач извора Еволуције"
 
 #. Translators: The name that is displayed in the user interface
-#: ../e-util/evolution-source-viewer.c:665
+#: ../e-util/evolution-source-viewer.c:666
 msgid "Display Name"
 msgstr "Назив приказа"
 
-#: ../e-util/evolution-source-viewer.c:674
+#: ../e-util/evolution-source-viewer.c:675
 msgid "Flags"
 msgstr "Опције"
 
-#: ../e-util/evolution-source-viewer.c:726
-#: ../mail/e-mail-config-identity-page.c:678
+#: ../e-util/evolution-source-viewer.c:727
+#: ../mail/e-mail-config-identity-page.c:677
 msgid "Identity"
 msgstr "Идентитет"
 
@@ -11808,39 +12266,57 @@ msgstr "Назив „{0}“ је већ употребљен."
 msgid "Please choose another name."
 msgstr "Изаберите друго име."
 
+#: ../e-util/filter.error.xml.h:12
+#| msgid "Missing date."
+msgid "Missing condition."
+msgstr "Недостаје услов."
+
+#: ../e-util/filter.error.xml.h:13
+msgid "Filter should have at least one condition."
+msgstr "Пропусник треба да има барем један услов."
+
+#: ../e-util/filter.error.xml.h:14
+#| msgid "Missing date."
+msgid "Missing value."
+msgstr "Недостаје вредност."
+
+#: ../e-util/filter.error.xml.h:15
+msgid "One or more values cannot be empty."
+msgstr "Једна или више вредности не могу бити празне."
+
 #. Translators: description of a "popup" action
-#: ../e-util/gal-a11y-e-cell-popup.c:128
+#: ../e-util/gal-a11y-e-cell-popup.c:127
 msgid "popup a child"
 msgstr "искачуће изведено"
 
 #. Translators: description of a "toggle" action
-#: ../e-util/gal-a11y-e-cell-toggle.c:180
+#: ../e-util/gal-a11y-e-cell-toggle.c:179
 msgid "toggle the cell"
 msgstr "бирање ћелије"
 
 #. Translators: description of an "expand" action
-#: ../e-util/gal-a11y-e-cell-tree.c:215
+#: ../e-util/gal-a11y-e-cell-tree.c:213
 msgid "expands the row in the ETree containing this cell"
 msgstr "разгранава ред у Естабло које сдржи ову ћелију"
 
 #. Translators: description of a "collapse" action
-#: ../e-util/gal-a11y-e-cell-tree.c:223
+#: ../e-util/gal-a11y-e-cell-tree.c:221
 msgid "collapses the row in the ETree containing this cell"
 msgstr "скупља ред у Естабло које садржи ову ћелију"
 
-#: ../e-util/gal-a11y-e-cell.c:123
+#: ../e-util/gal-a11y-e-cell.c:122
 msgid "Table Cell"
 msgstr "Ћелија табеле"
 
-#: ../e-util/gal-a11y-e-table-click-to-add.c:72
+#: ../e-util/gal-a11y-e-table-click-to-add.c:71
 msgid "click"
 msgstr "клик"
 
-#: ../e-util/gal-a11y-e-table-column-header.c:163
+#: ../e-util/gal-a11y-e-table-column-header.c:162
 msgid "sort"
 msgstr "разврставање"
 
-#: ../e-util/gal-view-instance-save-as-dialog.c:296
+#: ../e-util/gal-view-instance-save-as-dialog.c:295
 msgid "Save Current View"
 msgstr "Сачувај тренутни преглед"
 
@@ -11880,31 +12356,31 @@ msgstr "Не могу да учитам потпис."
 msgid "Could not save signature."
 msgstr "Не могу да сачувам потпис."
 
-#: ../libemail-engine/camel-sasl-xoauth2.c:27
+#: ../libemail-engine/camel-sasl-xoauth2.c:26
 msgid "OAuth2"
 msgstr "ОАут2"
 
-#: ../libemail-engine/camel-sasl-xoauth2.c:28
+#: ../libemail-engine/camel-sasl-xoauth2.c:27
 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
+#: ../libemail-engine/e-mail-authenticator.c:181
 #, c-format
 msgid "Invalid authentication result code (%d)"
 msgstr "Неисправан код резултата потврђивања идентитета (%d)"
 
-#: ../libemail-engine/e-mail-folder-utils.c:114
+#: ../libemail-engine/e-mail-folder-utils.c:113
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Чувам поруку у фасциклу „%s“"
 
-#: ../libemail-engine/e-mail-folder-utils.c:572
+#: ../libemail-engine/e-mail-folder-utils.c:571
 msgid "Forwarded messages"
 msgstr "Прослеђене поруке"
 
-#: ../libemail-engine/e-mail-folder-utils.c:682
-#: ../libemail-engine/e-mail-folder-utils.c:933
+#: ../libemail-engine/e-mail-folder-utils.c:681
+#: ../libemail-engine/e-mail-folder-utils.c:932
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -11913,29 +12389,29 @@ msgstr[1] "Довлачим %d поруке"
 msgstr[2] "Довлачим %d порука"
 msgstr[3] "Довлачим једну поруку"
 
-#: ../libemail-engine/e-mail-folder-utils.c:776
+#: ../libemail-engine/e-mail-folder-utils.c:775
 msgid "Scanning messages for duplicates"
 msgstr "Тражим дупликате у порукама"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1184
+#: ../libemail-engine/e-mail-folder-utils.c:1145
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Уклањам фасциклу „%s“"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1321
+#: ../libemail-engine/e-mail-folder-utils.c:1325
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Датотека „%s“ је уклоњена."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1325
+#: ../libemail-engine/e-mail-folder-utils.c:1329
 msgid "File has been removed."
 msgstr "Датотека је уклоњена."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1384
+#: ../libemail-engine/e-mail-folder-utils.c:1388
 msgid "Removing attachments"
 msgstr "Уклањам прилоге"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1548
+#: ../libemail-engine/e-mail-folder-utils.c:1552
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
@@ -11944,23 +12420,23 @@ msgstr[1] "Чувам %d поруке"
 msgstr[2] "Чувам %d порука"
 msgstr[3] "Чувам једну поруку"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1926
+#: ../libemail-engine/e-mail-folder-utils.c:1930
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Неисправна путања фасцикле „%s“"
 
-#: ../libemail-engine/e-mail-session-utils.c:540
+#: ../libemail-engine/e-mail-session-utils.c:539
 msgid "No mail transport service available"
 msgstr "Нема доступне услуге преноса поште"
 
-#: ../libemail-engine/e-mail-session-utils.c:640
-#: ../libemail-engine/mail-ops.c:730
+#: ../libemail-engine/e-mail-session-utils.c:639
+#: ../libemail-engine/mail-ops.c:707
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Неуспела примена одлазних пропусника: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:689
-#: ../libemail-engine/mail-ops.c:774
+#: ../libemail-engine/e-mail-session-utils.c:688
+#: ../libemail-engine/mail-ops.c:750
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -11969,103 +12445,98 @@ msgstr ""
 "Нисам успео да прикачим у %s: %s\n"
 "Уместо тога прикачићу у локалну фасциклу „Послато“."
 
-#: ../libemail-engine/e-mail-session-utils.c:715
-#: ../libemail-engine/mail-ops.c:798
+#: ../libemail-engine/e-mail-session-utils.c:714
+#: ../libemail-engine/mail-ops.c:774
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Нисам успео да прикачим у локалну фасциклу „Послато“: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:916
-#: ../libemail-engine/mail-ops.c:929 ../libemail-engine/mail-ops.c:1031
+#: ../libemail-engine/e-mail-session-utils.c:915
+#: ../libemail-engine/mail-ops.c:906 ../libemail-engine/mail-ops.c:1008
 msgid "Sending message"
 msgstr "Слање поруке"
 
-#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:342
-#: ../mail/em-folder-tree-model.c:789
-#: ../modules/mail/e-mail-shell-view-private.c:1076
-#: ../modules/mail/e-mail-shell-view-private.c:1087
+#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:410
+#: ../mail/em-folder-tree-model.c:1160
+#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1071
 msgid "Inbox"
 msgstr "Сандуче"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:782
-#: ../modules/mail/e-mail-shell-view-private.c:1074
+#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:1153
+#: ../modules/mail/e-mail-shell-view-private.c:1058
 msgid "Drafts"
 msgstr "Нацрти"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:793
-#: ../modules/mail/e-mail-shell-view-private.c:1078
+#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:1164
+#: ../modules/mail/e-mail-shell-view-private.c:1062
 msgid "Outbox"
 msgstr "За слање"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:797
-#: ../modules/mail/e-mail-shell-view-private.c:1080
+#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:1168
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Sent"
 msgstr "Послато"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:785
-#: ../modules/mail/e-mail-shell-view-private.c:1082
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:1156
+#: ../modules/mail/e-mail-shell-view-private.c:1066
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1082 ../plugins/templates/templates.c:1381
-#: ../plugins/templates/templates.c:1391
+#: ../plugins/templates/templates.c:1080 ../plugins/templates/templates.c:1379
+#: ../plugins/templates/templates.c:1389
 msgid "Templates"
 msgstr "Шаблони"
 
-#: ../libemail-engine/e-mail-session.c:1347
+#: ../libemail-engine/e-mail-session.c:1245
 #, c-format
 msgid "User cancelled operation"
 msgstr "Корисник је отказао радњу"
 
-#: ../libemail-engine/e-mail-session.c:1542
+#: ../libemail-engine/e-mail-session.c:1373
 #, c-format
 msgid "%s authentication failed"
 msgstr "Није успело %s потврђивање идентитета"
 
-#: ../libemail-engine/e-mail-session.c:1592
+#: ../libemail-engine/e-mail-session.c:1423
 #, c-format
 msgid "No data source found for UID '%s'"
 msgstr "Није пронађен извор података за ЈИБ „%s“"
 
-#: ../libemail-engine/e-mail-session.c:1655
+#: ../libemail-engine/e-mail-session.c:1486
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "Није достављена одредишна адреса, прослеђивање поруке је отказано."
 
-#: ../libemail-engine/e-mail-session.c:1668
+#: ../libemail-engine/e-mail-session.c:1499
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "Није пронађен идентитет за коришћење, прослеђивање поруке је отказано."
 
-#: ../libemail-engine/e-mail-store-utils.c:190
+#: ../libemail-engine/e-mail-store-utils.c:189
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Прекидање везе са „%s“"
 
-#: ../libemail-engine/e-mail-store-utils.c:279
+#: ../libemail-engine/e-mail-store-utils.c:265
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Поновно повезивање на „%s“"
 
-#: ../libemail-engine/e-mail-store-utils.c:370
+#: ../libemail-engine/e-mail-store-utils.c:350
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Припремам налог „%s“ за рад ван мреже"
 
-#: ../libemail-engine/mail-folder-cache.c:1241
-#, c-format
-msgid "Pinging %s"
-msgstr "Испитујем доступност за %s"
-
-#: ../libemail-engine/mail-ops.c:94
+#: ../libemail-engine/mail-ops.c:90
 msgid "Filtering Selected Messages"
 msgstr "Филтрирање изабраних порука"
 
-#: ../libemail-engine/mail-ops.c:152
+#: ../libemail-engine/mail-ops.c:148
 #, c-format
 msgid ""
 "Failed to filter selected messages. One reason can be that folder location "
@@ -12078,12 +12549,12 @@ msgstr ""
 "проверите ваше пропуснике у изборнику „Уређивање—>Пропусници порука“.\n"
 "Изворна грешка беше: %s"
 
-#: ../libemail-engine/mail-ops.c:233
+#: ../libemail-engine/mail-ops.c:229
 #, c-format
 msgid "Fetching mail from '%s'"
 msgstr "Довлачим пошту са „%s“"
 
-#: ../libemail-engine/mail-ops.c:724
+#: ../libemail-engine/mail-ops.c:701
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -12096,13 +12567,13 @@ msgstr ""
 "проверите ваше пропуснике у изборнику „Уређивање—>Пропусници порука“.\n"
 "Изворна грешка беше: %s"
 
-#: ../libemail-engine/mail-ops.c:940
+#: ../libemail-engine/mail-ops.c:917
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Шаљем поруку %d од %d"
 
 # bug: plural-forms
-#: ../libemail-engine/mail-ops.c:992
+#: ../libemail-engine/mail-ops.c:969
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
@@ -12111,69 +12582,69 @@ msgstr[1] "Нисам успео да пошаљем %d од %d порука"
 msgstr[2] "Нисам успео да пошаљем %d од %d порука"
 msgstr[3] "Нисам успео да пошаљем %d од %d порукe"
 
-#: ../libemail-engine/mail-ops.c:998
+#: ../libemail-engine/mail-ops.c:975
 msgid "Canceled."
 msgstr "Отказано."
 
-#: ../libemail-engine/mail-ops.c:1000
+#: ../libemail-engine/mail-ops.c:977
 msgid "Complete."
 msgstr "Завршено."
 
-#: ../libemail-engine/mail-ops.c:1112
+#: ../libemail-engine/mail-ops.c:1089
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Премештам поруке у „%s“"
 
-#: ../libemail-engine/mail-ops.c:1113
+#: ../libemail-engine/mail-ops.c:1090
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Умножавам поруке у „%s“"
 
-#: ../libemail-engine/mail-ops.c:1232
+#: ../libemail-engine/mail-ops.c:1209
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Смештам фасциклу „%s“"
 
-#: ../libemail-engine/mail-ops.c:1360
+#: ../libemail-engine/mail-ops.c:1337
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Празним и смештам налог „%s“"
 
-#: ../libemail-engine/mail-ops.c:1361
+#: ../libemail-engine/mail-ops.c:1338
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Смештам налог „%s“"
 
-#: ../libemail-engine/mail-ops.c:1435
+#: ../libemail-engine/mail-ops.c:1413
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Избацујем смеће у „%s“"
 
-#: ../libemail-engine/mail-tools.c:71
+#: ../libemail-engine/mail-tools.c:70
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "Не могу да направим директоријум за припрему „%s“: %s"
 
-#: ../libemail-engine/mail-tools.c:111
+#: ../libemail-engine/mail-tools.c:110
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "Покушавам да преместим пошту из не-мбокс извора „%s“"
 
-#: ../libemail-engine/mail-tools.c:237
+#: ../libemail-engine/mail-tools.c:236
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Прослеђена порука — %s"
 
-#: ../libemail-engine/mail-tools.c:239
+#: ../libemail-engine/mail-tools.c:238
 msgid "Forwarded message"
 msgstr "Прослеђена порука"
 
-#: ../libemail-engine/mail-vfolder.c:153
+#: ../libemail-engine/mail-vfolder.c:151
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Подешавање фасцикле претраге: %s"
 
-#: ../libemail-engine/mail-vfolder.c:306
+#: ../libemail-engine/mail-vfolder.c:304
 #, c-format
 msgid "Updating Search Folders for '%s' - %s"
 msgstr "Ажурирање фасцикла претраге за „%s — %s“"
@@ -12183,7 +12654,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:670
+#: ../libemail-engine/mail-vfolder.c:668
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -12207,17 +12678,17 @@ msgstr[3] ""
 "„%s“."
 
 # bug: requires a comment on usage
-#: ../mail/e-mail-account-manager.c:116 ../mail/e-mail-account-manager.c:203
+#: ../mail/e-mail-account-manager.c:117 ../mail/e-mail-account-manager.c:204
 msgid "Open _Online Accounts"
 msgstr "Отвори налоге на _мрежи"
 
-#: ../mail/e-mail-account-manager.c:142 ../mail/e-mail-account-manager.c:229
+#: ../mail/e-mail-account-manager.c:143 ../mail/e-mail-account-manager.c:230
 msgid "This account was created through the Online Accounts service."
 msgstr "Овај налог је направљен путем услуге налога на мрежи."
 
 #: ../mail/e-mail-account-manager.c:690
-msgid "_Restore Default"
-msgstr "Поврати _подразумевано"
+msgid "_Reset Order"
+msgstr "_Поново постави редослед"
 
 #: ../mail/e-mail-account-manager.c:703
 msgid "You can drag and drop account names to reorder them."
@@ -12228,59 +12699,70 @@ msgid "De_fault"
 msgstr "Под_разумевано"
 
 # has "activatable" set.
-#: ../mail/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:443
-#: ../modules/plugin-manager/evolution-plugin-manager.c:359
-#: ../plugins/publish-calendar/publish-calendar.c:890
+#: ../mail/e-mail-account-tree-view.c:84
+#: ../modules/mail/em-composer-prefs.c:1191
+#: ../modules/plugin-manager/evolution-plugin-manager.c:358
+#: ../plugins/publish-calendar/publish-calendar.c:896
 msgid "Enabled"
 msgstr "Укључен"
 
-#: ../mail/e-mail-account-tree-view.c:109
+#: ../mail/e-mail-account-tree-view.c:108
 msgid "Account Name"
 msgstr "Назив налога"
 
-#: ../mail/e-mail-account-tree-view.c:136
+#: ../mail/e-mail-account-tree-view.c:135
 #: ../mail/e-mail-config-security-page.c:335
-#: ../mail/e-mail-config-security-page.c:475 ../mail/e-mail-reader.c:3532
-#: ../mail/mail-config.ui.h:49
+#: ../mail/e-mail-config-security-page.c:475 ../mail/e-mail-reader.c:3602
+#: ../mail/mail-config.ui.h:66
 msgid "Default"
 msgstr "Основно"
 
-#: ../mail/e-mail-autoconfig.c:578
+#: ../mail/e-mail-autoconfig.c:611
 msgid "No email address provided"
 msgstr "Није достављена адреса ел. поште"
 
-#: ../mail/e-mail-autoconfig.c:587
+#: ../mail/e-mail-autoconfig.c:620
 msgid "Missing domain in email address"
 msgstr "Недостаје домен у адреси ел. поште"
 
-#: ../mail/e-mail-backend.c:737
+#: ../mail/e-mail-backend.c:841
 msgid "Unknown background operation"
 msgstr "Непозната позадинска радња"
 
-#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:860
-#: ../shell/e-shell-window-actions.c:867 ../shell/e-shell-window-actions.c:874
+#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:904
+#: ../shell/e-shell-window-actions.c:911 ../shell/e-shell-window-actions.c:918
 msgid "Close this window"
 msgstr "Затворите овај прозор"
 
-#: ../mail/e-mail-browser.c:286
+#: ../mail/e-mail-browser.c:285
 msgid "(No Subject)"
 msgstr "(Без субјекта)"
 
+#. GtkAssistant's back button label.
+#: ../mail/e-mail-config-assistant.c:46
+#| msgid "Go Back"
+msgid "Go _Back"
+msgstr "Иди _назад"
+
 #. GtkAssistant sinks the floating button reference.
-#: ../mail/e-mail-config-assistant.c:102
+#: ../mail/e-mail-config-assistant.c:114
 msgid "_Skip Lookup"
 msgstr "_Прескочи претрагу"
 
-#: ../mail/e-mail-config-assistant.c:562
+#: ../mail/e-mail-config-assistant.c:654
 msgid "Evolution Account Assistant"
 msgstr "Помоћник налога Еволуције"
 
-#: ../mail/e-mail-config-auth-check.c:352
+#: ../mail/e-mail-config-assistant.c:936
+#| msgid "_Restore Defaults"
+msgid "_Revise Details"
+msgstr "_Обнови појединости"
+
+#: ../mail/e-mail-config-auth-check.c:350
 msgid "Check for Supported Types"
 msgstr "Проверите за подржаним врстама"
 
-#: ../mail/e-mail-config-confirm-page.c:157
+#: ../mail/e-mail-config-confirm-page.c:156
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12294,91 +12776,91 @@ msgstr ""
 "\n"
 "Кликните „Примени“ да сачувате поставке."
 
-#: ../mail/e-mail-config-confirm-page.c:169
+#: ../mail/e-mail-config-confirm-page.c:168
 msgid "Done"
 msgstr "Урађено"
 
-#: ../mail/e-mail-config-defaults-page.c:552
+#: ../mail/e-mail-config-defaults-page.c:549
 msgid "Special Folders"
 msgstr "Посебне фасцикле"
 
-#: ../mail/e-mail-config-defaults-page.c:561
+#: ../mail/e-mail-config-defaults-page.c:558
 msgid "Draft Messages _Folder:"
 msgstr "Фасцикла порука _нацрта:"
 
-#: ../mail/e-mail-config-defaults-page.c:571
+#: ../mail/e-mail-config-defaults-page.c:568
 msgid "Choose a folder for saving draft messages."
 msgstr "Изаберите фасциклу за чување порука нацрта."
 
-#: ../mail/e-mail-config-defaults-page.c:585
+#: ../mail/e-mail-config-defaults-page.c:582
 msgid "Sent _Messages Folder:"
 msgstr "Фасцикла послатих _порука:"
 
-#: ../mail/e-mail-config-defaults-page.c:595
+#: ../mail/e-mail-config-defaults-page.c:592
 msgid "Choose a folder for saving sent messages."
 msgstr "Изаберите фасциклу за чување послатих порука."
 
-#: ../mail/e-mail-config-defaults-page.c:614
+#: ../mail/e-mail-config-defaults-page.c:611
 msgid "S_ave replies in the folder of the message being replied to"
 msgstr "Сачувај _одговоре у фасцикли поруке на коју се одговара"
 
-#: ../mail/e-mail-config-defaults-page.c:631
+#: ../mail/e-mail-config-defaults-page.c:628
 msgid "_Restore Defaults"
 msgstr "_Поврати основно"
 
-#: ../mail/e-mail-config-defaults-page.c:645
+#: ../mail/e-mail-config-defaults-page.c:642
 msgid "Use a Real Folder for _Trash:"
 msgstr "Користи стварну фасциклу за _смеће:"
 
-#: ../mail/e-mail-config-defaults-page.c:646
+#: ../mail/e-mail-config-defaults-page.c:643
 msgid "Choose a folder for deleted messages."
 msgstr "Изаберите фасциклу за обрисане поруке."
 
-#: ../mail/e-mail-config-defaults-page.c:655
+#: ../mail/e-mail-config-defaults-page.c:652
 msgid "Use a Real Folder for _Junk:"
 msgstr "Користи стварну фасциклу за _ђубре:"
 
-#: ../mail/e-mail-config-defaults-page.c:656
+#: ../mail/e-mail-config-defaults-page.c:653
 msgid "Choose a folder for junk messages."
 msgstr "Изаберите фасциклу за непожељне поруке."
 
-#: ../mail/e-mail-config-defaults-page.c:673
+#: ../mail/e-mail-config-defaults-page.c:670
 msgid "Composing Messages"
 msgstr "Састављање порука"
 
-#: ../mail/e-mail-config-defaults-page.c:682
+#: ../mail/e-mail-config-defaults-page.c:679
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Увек пошаљи _графитну копију (cc):"
 
-#: ../mail/e-mail-config-defaults-page.c:707
+#: ../mail/e-mail-config-defaults-page.c:704
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Увек пошаљи _невидљиву графитну копију (Bcc):"
 
-#: ../mail/e-mail-config-defaults-page.c:742
+#: ../mail/e-mail-config-defaults-page.c:739
 msgid "Message Receipts"
 msgstr "Признанице поруке"
 
-#: ../mail/e-mail-config-defaults-page.c:751
+#: ../mail/e-mail-config-defaults-page.c:748
 msgid "S_end message receipts:"
 msgstr "_Пошаљи повратнице:"
 
-#: ../mail/e-mail-config-defaults-page.c:776
+#: ../mail/e-mail-config-defaults-page.c:773
 msgid "Never"
 msgstr "Никада"
 
-#: ../mail/e-mail-config-defaults-page.c:782
+#: ../mail/e-mail-config-defaults-page.c:779
 msgid "Always"
 msgstr "Увек"
 
-#: ../mail/e-mail-config-defaults-page.c:788
+#: ../mail/e-mail-config-defaults-page.c:785
 msgid "Ask for each message"
 msgstr "Питај за сваку поруку"
 
-#: ../mail/e-mail-config-defaults-page.c:859
+#: ../mail/e-mail-config-defaults-page.c:856
 msgid "Defaults"
 msgstr "Основно"
 
-#: ../mail/e-mail-config-identity-page.c:266
+#: ../mail/e-mail-config-identity-page.c:265
 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 "
@@ -12387,13 +12869,13 @@ msgstr ""
 "Унесите име и електронску адресу. „Необавезна“ поља не морају бити попуњена, "
 "осим ако не желите да ове податке укључите у поруке које шаљете."
 
-#: ../mail/e-mail-config-identity-page.c:294
-#: ../mail/e-mail-config-summary-page.c:324
+#: ../mail/e-mail-config-identity-page.c:293
+#: ../mail/e-mail-config-summary-page.c:323
 msgid "Account Information"
 msgstr "Подаци о налогу"
 
-#: ../mail/e-mail-config-identity-page.c:303
-#: ../mail/e-mail-config-summary-page.c:333
+#: ../mail/e-mail-config-identity-page.c:302
+#: ../mail/e-mail-config-summary-page.c:332
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example, \"Work\" or \"Personal\"."
@@ -12401,62 +12883,61 @@ msgstr ""
 "Упишите име по коме желите да назовете овај налог.\n"
 "На пример, „Пословни“ или „Лични“."
 
-#: ../mail/e-mail-config-identity-page.c:348
+#: ../mail/e-mail-config-identity-page.c:347
 msgid "Required Information"
 msgstr "Обавезни подаци"
 
-#: ../mail/e-mail-config-identity-page.c:357
+#: ../mail/e-mail-config-identity-page.c:356
 msgid "Full Nam_e:"
 msgstr "_Име и презиме:"
 
-#: ../mail/e-mail-config-identity-page.c:384
+#: ../mail/e-mail-config-identity-page.c:383
 msgid "Email _Address:"
 msgstr "Адреса _ел. поште:"
 
-#: ../mail/e-mail-config-identity-page.c:431
+#: ../mail/e-mail-config-identity-page.c:430
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Додатни подаци"
 
-#: ../mail/e-mail-config-identity-page.c:440
+#: ../mail/e-mail-config-identity-page.c:439
 msgid "Re_ply-To:"
 msgstr "Од_говор:"
 
-#: ../mail/e-mail-config-identity-page.c:467
+#: ../mail/e-mail-config-identity-page.c:466
 msgid "Or_ganization:"
 msgstr "Ор_ганизација:"
 
-#: ../mail/e-mail-config-identity-page.c:522
+#: ../mail/e-mail-config-identity-page.c:521
 msgid "Add Ne_w Signature..."
 msgstr "Додај но_ви потпис..."
 
-#: ../mail/e-mail-config-lookup-page.c:68
+#: ../mail/e-mail-config-lookup-page.c:67
 msgid "Looking up account details..."
 msgstr "Тражим појединости налога..."
 
-#: ../mail/e-mail-config-provider-page.c:485
+#: ../mail/e-mail-config-provider-page.c:484
 msgid "Checking for New Mail"
 msgstr "Вршим проверу за новом поштом"
 
-#: ../mail/e-mail-config-provider-page.c:501
+#: ../mail/e-mail-config-provider-page.c:500
 msgid "Check for _new messages every"
 msgstr "Провери за _нову пошту сваких"
 
-#: ../mail/e-mail-config-provider-page.c:700
+#: ../mail/e-mail-config-provider-page.c:699
 msgid "Receiving Options"
 msgstr "Опције за примање"
 
-#: ../mail/e-mail-config-receiving-page.c:50
+#: ../mail/e-mail-config-receiving-page.c:49
 msgid "Receiving Email"
 msgstr "Примање поште"
 
 #: ../mail/e-mail-config-security-page.c:260
-#: ../mail/em-folder-properties.c:266 ../mail/mail-config.ui.h:24
-#: ../modules/addressbook/autocompletion-config.c:114
+#: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:26
+#: ../modules/addressbook/autocompletion-config.c:113
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
-#: ../modules/itip-formatter/plugin/config-ui.c:91
+#: ../modules/itip-formatter/plugin/config-ui.c:90
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
-#: ../smime/gui/certificate-viewer.c:653
 msgid "General"
 msgstr "Опште"
 
@@ -12477,22 +12958,22 @@ msgid "Si_gning algorithm:"
 msgstr "Алгоритам _потписивања:"
 
 #: ../mail/e-mail-config-security-page.c:338
-#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:50
+#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:67
 msgid "SHA1"
 msgstr "СХА1"
 
 #: ../mail/e-mail-config-security-page.c:341
-#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:51
+#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:68
 msgid "SHA256"
 msgstr "СХА256"
 
 #: ../mail/e-mail-config-security-page.c:344
-#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:52
+#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:69
 msgid "SHA384"
 msgstr "СХА384"
 
 #: ../mail/e-mail-config-security-page.c:347
-#: ../mail/e-mail-config-security-page.c:487 ../mail/mail-config.ui.h:53
+#: ../mail/e-mail-config-security-page.c:487 ../mail/mail-config.ui.h:70
 msgid "SHA512"
 msgstr "СХА512"
 
@@ -12521,6 +13002,13 @@ msgstr "Уверење _потписивања:"
 msgid "Select"
 msgstr "Изабери"
 
+#: ../mail/e-mail-config-security-page.c:453
+#: ../mail/e-mail-config-security-page.c:559 ../mail/mail-dialogs.ui.h:5
+#: ../shell/e-shell-window-actions.c:1007
+#| msgid "_Clear Flag"
+msgid "_Clear"
+msgstr "_Очисти"
+
 #: ../mail/e-mail-config-security-page.c:462
 msgid "Signing _algorithm:"
 msgstr "Алгоритам п_отписа:"
@@ -12541,71 +13029,71 @@ msgstr "Увек шифруј одлазеће поруке са овог нал
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "Увек мени самом шифруј при слању шифроване поште"
 
-#: ../mail/e-mail-config-sending-page.c:50
+#: ../mail/e-mail-config-sending-page.c:49
 msgid "Sending Email"
 msgstr "Слање поште"
 
-#: ../mail/e-mail-config-service-page.c:640
+#: ../mail/e-mail-config-service-page.c:639
 msgid "Server _Type:"
 msgstr "_Врста сервера:"
 
-#: ../mail/e-mail-config-summary-page.c:142
+#: ../mail/e-mail-config-summary-page.c:141
 msgid "SSL"
 msgstr "ССЛ"
 
-#: ../mail/e-mail-config-summary-page.c:145
+#: ../mail/e-mail-config-summary-page.c:144
 msgid "TLS"
 msgstr "ТЛС"
 
-#: ../mail/e-mail-config-summary-page.c:307
+#: ../mail/e-mail-config-summary-page.c:306
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr ""
 "Ово је сажетак подешавања која ће бити коришћена за приступ вашој пошти."
 
-#: ../mail/e-mail-config-summary-page.c:372
+#: ../mail/e-mail-config-summary-page.c:371
 msgid "Personal Details"
 msgstr "Лични подаци"
 
-#: ../mail/e-mail-config-summary-page.c:381
+#: ../mail/e-mail-config-summary-page.c:380
 msgid "Full Name:"
 msgstr "Име и презиме:"
 
-#: ../mail/e-mail-config-summary-page.c:395
+#: ../mail/e-mail-config-summary-page.c:394
 msgid "Email Address:"
 msgstr "Адреса ел. поште:"
 
-#: ../mail/e-mail-config-summary-page.c:409
+#: ../mail/e-mail-config-summary-page.c:408
 msgid "Receiving"
 msgstr "Примање"
 
-#: ../mail/e-mail-config-summary-page.c:421
+#: ../mail/e-mail-config-summary-page.c:420
 msgid "Sending"
 msgstr "Слање"
 
-#: ../mail/e-mail-config-summary-page.c:433
+#: ../mail/e-mail-config-summary-page.c:432
 msgid "Server Type:"
 msgstr "Врста сервера:"
 
-#: ../mail/e-mail-config-summary-page.c:454
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
+#: ../mail/e-mail-config-summary-page.c:453
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
 msgid "Server:"
 msgstr "Сервер:"
 
-#: ../mail/e-mail-config-summary-page.c:475
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:697
+#: ../mail/e-mail-config-summary-page.c:474
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:696
 msgid "Username:"
 msgstr "Корисничко име:"
 
-#: ../mail/e-mail-config-summary-page.c:496
+#: ../mail/e-mail-config-summary-page.c:495
 msgid "Security:"
 msgstr "Безбедност:"
 
-#: ../mail/e-mail-config-summary-page.c:787
+#: ../mail/e-mail-config-summary-page.c:786
 msgid "Account Summary"
 msgstr "Сажетак налога"
 
-#: ../mail/e-mail-config-welcome-page.c:157
+#: ../mail/e-mail-config-welcome-page.c:156
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12615,55 +13103,55 @@ msgstr ""
 "\n"
 "Кликните „Настави“ да започнете."
 
-#: ../mail/e-mail-config-welcome-page.c:167
-#: ../modules/startup-wizard/e-startup-assistant.c:152
+#: ../mail/e-mail-config-welcome-page.c:166
+#: ../modules/startup-wizard/e-startup-assistant.c:151
 msgid "Welcome"
 msgstr "Добродошли"
 
-#: ../mail/e-mail-config-window.c:327
+#: ../mail/e-mail-config-window.c:326
 msgid "Account Editor"
 msgstr "Уређивач налога"
 
-#: ../mail/e-mail-display.c:96
+#: ../mail/e-mail-display.c:95
 msgid "_Add to Address Book..."
 msgstr "_Додај у адресар..."
 
-#: ../mail/e-mail-display.c:103
+#: ../mail/e-mail-display.c:102
 msgid "_To This Address"
 msgstr "_На ову адресу"
 
-#: ../mail/e-mail-display.c:110
+#: ../mail/e-mail-display.c:109
 msgid "_From This Address"
 msgstr "_Са ове адресе"
 
-#: ../mail/e-mail-display.c:117
+#: ../mail/e-mail-display.c:116
 msgid "Send _Reply To..."
 msgstr "_Пошаљи одговор..."
 
-#: ../mail/e-mail-display.c:119
+#: ../mail/e-mail-display.c:118
 msgid "Send a reply message to this address"
 msgstr "Пошаљите поруку одговора на ову адресу"
 
-#: ../mail/e-mail-display.c:126
+#: ../mail/e-mail-display.c:125
 msgid "Create Search _Folder"
 msgstr "Направи фасциклу _претраге"
 
 #. Label + combo box has a 12px left margin so it's
 #. * aligned with the junk mail options above it.
-#: ../mail/e-mail-junk-options.c:252
+#: ../mail/e-mail-junk-options.c:297
 msgid "Junk filtering software:"
 msgstr "Софтвер за филтрирање непожељне:"
 
-#: ../mail/e-mail-label-dialog.c:225
+#: ../mail/e-mail-label-dialog.c:224
 msgid "_Label name:"
 msgstr "Назив _ознаке:"
 
-#: ../mail/e-mail-label-list-store.c:57
+#: ../mail/e-mail-label-list-store.c:56
 msgid "I_mportant"
 msgstr "_Важно"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:58
+#: ../mail/e-mail-label-list-store.c:57
 msgid "_Work"
 msgstr "По_сао"
 
@@ -12671,30 +13159,30 @@ msgstr "По_сао"
 # Create the default Person task list
 # orange
 #. orange
-#: ../mail/e-mail-label-list-store.c:59
+#: ../mail/e-mail-label-list-store.c:58
 msgid "_Personal"
 msgstr "Л_ично"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:60
+#: ../mail/e-mail-label-list-store.c:59
 msgid "_To Do"
 msgstr "За уради_ти"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:61
+#: ../mail/e-mail-label-list-store.c:60
 msgid "_Later"
 msgstr "Касни_је"
 
-#: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:1030
+#: ../mail/e-mail-label-manager.c:171
+#: ../modules/mail/e-mail-shell-view-actions.c:1028
 msgid "Add Label"
 msgstr "Додајте натпис"
 
-#: ../mail/e-mail-label-manager.c:221
+#: ../mail/e-mail-label-manager.c:222
 msgid "Edit Label"
 msgstr "Уредите натпис"
 
-#: ../mail/e-mail-label-manager.c:353
+#: ../mail/e-mail-label-manager.c:354
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
@@ -12702,631 +13190,632 @@ msgstr ""
 "Напомена: подвучен знак у ознаци се користи\n"
 "као скраћеница у изборнику."
 
-#: ../mail/e-mail-label-tree-view.c:89
+#: ../mail/e-mail-label-tree-view.c:88
 msgid "Color"
 msgstr "Боја"
 
-#: ../mail/e-mail-print-config-headers.c:167
+#: ../mail/e-mail-print-config-headers.c:166
 msgid "Move selected headers to top"
 msgstr "Преместите изабрана заглавља на врх"
 
-#: ../mail/e-mail-print-config-headers.c:172
+#: ../mail/e-mail-print-config-headers.c:171
 msgid "Move selected headers up one row"
 msgstr "Преместите изабрана заглавља један ред на горе"
 
-#: ../mail/e-mail-print-config-headers.c:177
+#: ../mail/e-mail-print-config-headers.c:176
 msgid "Move selected headers down one row"
 msgstr "Преместите изабрана заглавља један ред на доле"
 
-#: ../mail/e-mail-print-config-headers.c:182
+#: ../mail/e-mail-print-config-headers.c:181
 msgid "Move selected headers to bottom"
 msgstr "Преместите изабрана заглавља на дно"
 
-#: ../mail/e-mail-print-config-headers.c:187
+#: ../mail/e-mail-print-config-headers.c:186
 msgid "Select all headers"
 msgstr "Изаберите сва заглавља"
 
-#: ../mail/e-mail-print-config-headers.c:206
+#: ../mail/e-mail-print-config-headers.c:205
 msgid "Header Name"
 msgstr "Назив заглавља"
 
-#: ../mail/e-mail-print-config-headers.c:215
+#: ../mail/e-mail-print-config-headers.c:214
 msgid "Header Value"
 msgstr "Вредност заглавља"
 
-#: ../mail/e-mail-printer.c:125 ../mail/mail-config.ui.h:101
+#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:106
 msgid "Headers"
 msgstr "Заглавља"
 
-#: ../mail/e-mail-printer.c:167
+#: ../mail/e-mail-printer.c:166
 #, c-format
 msgid "Page %d of %d"
 msgstr "Страница %d од %d"
 
-#: ../mail/e-mail-reader.c:346 ../mail/em-filter-i18n.h:12
+#: ../mail/e-mail-reader.c:348 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Умножи у фасциклу"
 
-#: ../mail/e-mail-reader.c:346 ../mail/em-folder-utils.c:518
+#: ../mail/e-mail-reader.c:348 ../mail/em-folder-utils.c:505
 msgid "C_opy"
 msgstr "_Умножи"
 
-#: ../mail/e-mail-reader.c:846 ../mail/em-filter-i18n.h:54
+#: ../mail/e-mail-reader.c:848 ../mail/em-filter-i18n.h:33
 msgid "Move to Folder"
 msgstr "Премести у фасциклу"
 
-#: ../mail/e-mail-reader.c:846 ../mail/em-folder-utils.c:518
+#: ../mail/e-mail-reader.c:848 ../mail/em-folder-utils.c:505
 msgid "_Move"
 msgstr "Пре_мести"
 
-#: ../mail/e-mail-reader.c:1172 ../mail/e-mail-reader.c:1384
-#: ../mail/e-mail-reader.c:1424
+#: ../mail/e-mail-reader.c:1174 ../mail/e-mail-reader.c:1386
+#: ../mail/e-mail-reader.c:1426
 msgid "_Do not ask me again."
 msgstr "_Не питај ме поново."
 
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1432
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Увек занемари „Одговор-за:“ за дописне листе."
 
-#: ../mail/e-mail-reader.c:1632
+#: ../mail/e-mail-reader.c:1634
 msgid "Failed to retrieve message:"
 msgstr "Нисам успео да довучем поруку:"
 
-#: ../mail/e-mail-reader.c:1672 ../mail/e-mail-reader.c:2774
+#: ../mail/e-mail-reader.c:1674 ../mail/e-mail-reader.c:2843
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Довлачим поруку „%s“"
 
-#: ../mail/e-mail-reader.c:1860
+#: ../mail/e-mail-reader.c:1862
 msgid "A_dd Sender to Address Book"
 msgstr "До_дај пошиљаоца у адресар"
 
-#: ../mail/e-mail-reader.c:1862
+#: ../mail/e-mail-reader.c:1864
 msgid "Add sender to address book"
 msgstr "Додај пошиљаоца у адресар"
 
-#: ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:1869
 msgid "Check for _Junk"
 msgstr "Провери да ли има _ђубрета"
 
-#: ../mail/e-mail-reader.c:1869
+#: ../mail/e-mail-reader.c:1871
 msgid "Filter the selected messages for junk status"
 msgstr "Филтрира да ли међу изабраним порукама има ђубрета"
 
-#: ../mail/e-mail-reader.c:1874
+#: ../mail/e-mail-reader.c:1876
 msgid "_Copy to Folder..."
 msgstr "_Умножи у фасциклу..."
 
-#: ../mail/e-mail-reader.c:1876
+#: ../mail/e-mail-reader.c:1878
 msgid "Copy selected messages to another folder"
 msgstr "Умножава изабране поруке у другу фасциклу"
 
-#: ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:1883
 msgid "_Delete Message"
 msgstr "_Обриши поруку"
 
-#: ../mail/e-mail-reader.c:1883
+#: ../mail/e-mail-reader.c:1885
 msgid "Mark the selected messages for deletion"
 msgstr "Означите изабрану(е) поруку(е) за брисање"
 
-#: ../mail/e-mail-reader.c:1888
+#: ../mail/e-mail-reader.c:1890
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Направи правило пропусника за дописну _листу..."
 
-#: ../mail/e-mail-reader.c:1890
+#: ../mail/e-mail-reader.c:1892
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Наравите правило за пропуштање порука на ову дописну листу"
 
-#: ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:1897
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Направи правило пропусника за _примаоце..."
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1899
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Направите правило за пропуштање порука овим примаоцима"
 
-#: ../mail/e-mail-reader.c:1902
+#: ../mail/e-mail-reader.c:1904
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Направи правило пропусника за _пошиљаоца..."
 
-#: ../mail/e-mail-reader.c:1904
+#: ../mail/e-mail-reader.c:1906
 msgid "Create a rule to filter messages from this sender"
 msgstr "Направите правило за пропуштање порука са овог пошиљаоца"
 
-#: ../mail/e-mail-reader.c:1909
+#: ../mail/e-mail-reader.c:1911
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Направи правило пропусника за _наслов..."
 
-#: ../mail/e-mail-reader.c:1911
+#: ../mail/e-mail-reader.c:1913
 msgid "Create a rule to filter messages with this subject"
 msgstr "Направите правило за прпуштање порука са овим насловом"
 
-#: ../mail/e-mail-reader.c:1916
+#: ../mail/e-mail-reader.c:1918
 msgid "A_pply Filters"
 msgstr "При_мени пропуснике"
 
-#: ../mail/e-mail-reader.c:1918
+#: ../mail/e-mail-reader.c:1920
 msgid "Apply filter rules to the selected messages"
 msgstr "Примените правила пропуштања на изабране поруке"
 
-#: ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:1925
 msgid "_Find in Message..."
 msgstr "П_ронађи у поруци..."
 
-#: ../mail/e-mail-reader.c:1925
+#: ../mail/e-mail-reader.c:1927
 msgid "Search for text in the body of the displayed message"
 msgstr "Потражите текст у телу приказане поруке"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:1932
 msgid "_Clear Flag"
 msgstr "Скло_ни ознаку"
 
-#: ../mail/e-mail-reader.c:1932
+#: ../mail/e-mail-reader.c:1934
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Уклоните ознаку за праћење са изабраних порука"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:1939
 msgid "_Flag Completed"
 msgstr "Означ_и као завршено"
 
-#: ../mail/e-mail-reader.c:1939
+#: ../mail/e-mail-reader.c:1941
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Поставите ознаку за праћење као завршену на изабраним порукама"
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:1946
 msgid "Follow _Up..."
 msgstr "Сле_ди..."
 
-#: ../mail/e-mail-reader.c:1946
+#: ../mail/e-mail-reader.c:1948
 msgid "Flag the selected messages for follow-up"
 msgstr "Означите изабране поруке за праћење"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:1953
 msgid "_Attached"
 msgstr "При_ложено"
 
-#: ../mail/e-mail-reader.c:1953 ../mail/e-mail-reader.c:1960
+#: ../mail/e-mail-reader.c:1955 ../mail/e-mail-reader.c:1962
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Проследите изабрану поруку некоме као прилог"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:1960
 msgid "Forward As _Attached"
 msgstr "Проследи као _прилог"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:1967
 msgid "_Inline"
 msgstr "Унут_ар"
 
-#: ../mail/e-mail-reader.c:1967 ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:1969 ../mail/e-mail-reader.c:1976
 msgid "Forward the selected message in the body of a new message"
 msgstr "Проследите изабрану поруку у телу нове поруке"
 
-#: ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:1974
 msgid "Forward As _Inline"
 msgstr "Проследи као _унутар поруке"
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:1981
 msgid "_Quoted"
 msgstr "_Цитирано"
 
-#: ../mail/e-mail-reader.c:1981 ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:1983 ../mail/e-mail-reader.c:1990
 msgid "Forward the selected message quoted like a reply"
 msgstr "Проследите изабрану поруку цитирану као одговор"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:1988
 msgid "Forward As _Quoted"
 msgstr "Проследи као _цитат"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:1995
 msgid "_Load Images"
 msgstr "_Учитај слике"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:1997
 msgid "Force images in HTML mail to be loaded"
 msgstr "Присилите учитавање слика у ХТМЛ порукама"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2002
 msgid "_Important"
 msgstr "_Важно"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2004
 msgid "Mark the selected messages as important"
 msgstr "Означите изабрану(е) поруку(е) као важно"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2009
 msgid "_Junk"
 msgstr "_Ђубре"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:2011
 msgid "Mark the selected messages as junk"
 msgstr "Означите изабрану(е) поруку(е) као нежељену пошту"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2016
 msgid "_Not Junk"
 msgstr "Ни_је ђубре"
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:2018
 msgid "Mark the selected messages as not being junk"
 msgstr "Означите изабрану(е) поруку(е) да није нежељена пошта"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2023
 msgid "_Read"
 msgstr "Про_читај"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:2025
 msgid "Mark the selected messages as having been read"
 msgstr "Означите изабрану(е) поруку(е) као прочитано"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2030
 msgid "Uni_mportant"
 msgstr "Не_важно"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:2032
 msgid "Mark the selected messages as unimportant"
 msgstr "Означите изабрану(е) поруку(е) као неважно"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2037
 msgid "_Unread"
 msgstr "_Непрочитано"
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:2039
 msgid "Mark the selected messages as not having been read"
 msgstr "Означите изабрану(е) поруку(е) као непрочитано"
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2044
 msgid "_Edit as New Message..."
 msgstr "_Уреди као нову поруку..."
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:2046
 msgid "Open the selected messages in the composer for editing"
 msgstr "Отворите изабрану поруку у састављачу ради уређивања"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2051
 msgid "Compose _New Message"
 msgstr "Састави _нову поруку"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:2053
 msgid "Open a window for composing a mail message"
 msgstr "Отворите прозор за састављање поруке"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2058
 msgid "_Open in New Window"
 msgstr "_Отвори у новом прозору"
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:2060
 msgid "Open the selected messages in a new window"
 msgstr "Отворите изабране поруке у новом прозору"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2065
 msgid "_Move to Folder..."
 msgstr "_Премести у фасциклу..."
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:2067
 msgid "Move selected messages to another folder"
 msgstr "Преместите изабрану(е) поруку(е) у другу фасциклу"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2072
 msgid "_Next Message"
 msgstr "_Следећа порука"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:2074
 msgid "Display the next message"
 msgstr "Прикажите следећу поруку"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2079
 msgid "Next _Important Message"
 msgstr "Следећа _важна порука"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:2081
 msgid "Display the next important message"
 msgstr "Прикажите следећу важну поруку"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2086
 msgid "Next _Thread"
 msgstr "_Следећа расправа"
 
-#: ../mail/e-mail-reader.c:2086
+#: ../mail/e-mail-reader.c:2088
 msgid "Display the next thread"
 msgstr "Прикажите следећу расправу"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2093
 msgid "Next _Unread Message"
 msgstr "Следећа _непрочитана порука"
 
-#: ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:2095
 msgid "Display the next unread message"
 msgstr "Прикажите следећу непрочитану поруку"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2100
 msgid "_Previous Message"
 msgstr "_Претходна порука"
 
-#: ../mail/e-mail-reader.c:2100
+#: ../mail/e-mail-reader.c:2102
 msgid "Display the previous message"
 msgstr "Прикажите претходну поруку"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2107
 msgid "Pr_evious Important Message"
 msgstr "Пр_етходна важна порука"
 
-#: ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:2109
 msgid "Display the previous important message"
 msgstr "Прикажите претходну важну поруку"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2114
 msgid "Previous T_hread"
 msgstr "_Претходна тема"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2116
 msgid "Display the previous thread"
 msgstr "Прикажите претходну тему"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2121
 msgid "P_revious Unread Message"
 msgstr "П_ретходна непрочитана порука"
 
-#: ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2123
 msgid "Display the previous unread message"
 msgstr "Прикажите претходну непрочитану поруку"
 
-#: ../mail/e-mail-reader.c:2128
+#: ../mail/e-mail-reader.c:2130
 msgid "Print this message"
 msgstr "Штампајте ову поруку"
 
-#: ../mail/e-mail-reader.c:2135
+#: ../mail/e-mail-reader.c:2137
 msgid "Preview the message to be printed"
 msgstr "Прегледајте поруку пред штампу"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2142
 msgid "Re_direct"
 msgstr "Преу_смери"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2144
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Преусмерите (без читања) изабрану поруку некоме"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2149
 msgid "Remo_ve Attachments"
 msgstr "_Уклони прилоге"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2151
 msgid "Remove attachments"
 msgstr "Уклоните прилоге"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2156
 msgid "Remove Du_plicate Messages"
 msgstr "Уклони _дуплиране поруке"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2158
 msgid "Checks selected messages for duplicates"
 msgstr "Проверите изабране поруке за дупликате"
 
-#: ../mail/e-mail-reader.c:2161 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1547
-#: ../modules/mail/e-mail-attachment-handler.c:214
+#: ../mail/e-mail-reader.c:2163 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1546
+#: ../modules/mail/e-mail-attachment-handler.c:213
 msgid "Reply to _All"
 msgstr "Одговори _свима"
 
-#: ../mail/e-mail-reader.c:2163
+#: ../mail/e-mail-reader.c:2165
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Саставите одговор свим примаоцима изабране поруке"
 
-#: ../mail/e-mail-reader.c:2168 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2170 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Одговори на _листу"
 
-#: ../mail/e-mail-reader.c:2170
+#: ../mail/e-mail-reader.c:2172
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Саставите одговор дописној листи изабране поруке"
 
-#: ../mail/e-mail-reader.c:2175
-#: ../modules/mail/e-mail-attachment-handler.c:221
+#: ../mail/e-mail-reader.c:2177
+#: ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr "_Одговори пошиљаоцу"
 
-#: ../mail/e-mail-reader.c:2177
+#: ../mail/e-mail-reader.c:2179
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Саставите одговор пошиљаоцу изабране поруке"
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2184
 msgid "_Save as mbox..."
 msgstr "_Сачувај као мбокс..."
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2186
 msgid "Save selected messages as an mbox file"
 msgstr "Сачувајте изабране поруке као „mbox“ датотеку"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2191
 msgid "_Message Source"
 msgstr "Изво_рни код поруке"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2193
 msgid "Show the raw email source of the message"
 msgstr "Прикажите изворни код електронске поруке"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2205
 msgid "_Undelete Message"
 msgstr "П_оврати поруку"
 
-#: ../mail/e-mail-reader.c:2205
+#: ../mail/e-mail-reader.c:2207
 msgid "Undelete the selected messages"
 msgstr "Повратите изабране поруке"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2212
 msgid "_Normal Size"
 msgstr "_Уобичајена величина"
 
-#: ../mail/e-mail-reader.c:2212
+#: ../mail/e-mail-reader.c:2214
 msgid "Reset the text to its original size"
 msgstr "Вратите текст на оригиналну величину"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2219
 msgid "_Zoom In"
 msgstr "У_већај"
 
-#: ../mail/e-mail-reader.c:2219
+#: ../mail/e-mail-reader.c:2221
 msgid "Increase the text size"
 msgstr "Увећајте величину текста"
 
-#: ../mail/e-mail-reader.c:2224
-msgid "Zoom _Out"
-msgstr "У_мањи"
-
-#: ../mail/e-mail-reader.c:2226
+#: ../mail/e-mail-reader.c:2228
 msgid "Decrease the text size"
 msgstr "Умањите величину текста"
 
-#: ../mail/e-mail-reader.c:2233
+#: ../mail/e-mail-reader.c:2235
 msgid "Cre_ate"
 msgstr "_Направи"
 
-#: ../mail/e-mail-reader.c:2240
+#: ../mail/e-mail-reader.c:2242
 msgid "Ch_aracter Encoding"
 msgstr "Кодна ст_рана"
 
-#: ../mail/e-mail-reader.c:2247
+#: ../mail/e-mail-reader.c:2249
 msgid "F_orward As"
 msgstr "_Проследи као"
 
-#: ../mail/e-mail-reader.c:2254
+#: ../mail/e-mail-reader.c:2256
 msgid "_Group Reply"
 msgstr "О_дговори групи"
 
-#: ../mail/e-mail-reader.c:2261
+#: ../mail/e-mail-reader.c:2263
 msgid "_Go To"
 msgstr "_Иди на"
 
-#: ../mail/e-mail-reader.c:2268
+#: ../mail/e-mail-reader.c:2270
 msgid "Mar_k As"
 msgstr "О_значи као"
 
-#: ../mail/e-mail-reader.c:2275
+#: ../mail/e-mail-reader.c:2277
 msgid "_Message"
 msgstr "_Порука"
 
-#: ../mail/e-mail-reader.c:2282
+#: ../mail/e-mail-reader.c:2284
 msgid "_Zoom"
 msgstr "Ув_ећај"
 
-#: ../mail/e-mail-reader.c:2292
+#: ../mail/e-mail-reader.c:2294
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Направи фасциклу претраге са дописне _листе..."
 
-#: ../mail/e-mail-reader.c:2294
+#: ../mail/e-mail-reader.c:2296
 msgid "Create a search folder for this mailing list"
 msgstr "Направите фасциклу претраге за ову дописну листу"
 
-#: ../mail/e-mail-reader.c:2299
+#: ../mail/e-mail-reader.c:2301
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Направи фасциклу претраге од при_малаца..."
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2303
 msgid "Create a search folder for these recipients"
 msgstr "Направите фасциклу претраге за ове примаоце"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2308
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Направи фасциклу претраге од по_шиљаоца..."
 
-#: ../mail/e-mail-reader.c:2308
+#: ../mail/e-mail-reader.c:2310
 msgid "Create a search folder for this sender"
 msgstr "Направите фасциклу претраге за овог пошиљаоца"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2315
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Направи фасциклу претраге из _наслова..."
 
-#: ../mail/e-mail-reader.c:2315
+#: ../mail/e-mail-reader.c:2317
 msgid "Create a search folder for this subject"
 msgstr "Направите фасциклу претраге за овај наслов"
 
-#: ../mail/e-mail-reader.c:2338
+#: ../mail/e-mail-reader.c:2340
 msgid "Mark for Follo_w Up..."
 msgstr "Обележи за _праћење..."
 
-#: ../mail/e-mail-reader.c:2346
+#: ../mail/e-mail-reader.c:2348
 msgid "Mark as _Important"
 msgstr "Оначи као _важно"
 
-#: ../mail/e-mail-reader.c:2350
+#: ../mail/e-mail-reader.c:2352
 msgid "Mark as _Junk"
 msgstr "Означи као _ђубре"
 
-#: ../mail/e-mail-reader.c:2354
+#: ../mail/e-mail-reader.c:2356
 msgid "Mark as _Not Junk"
 msgstr "Означи да _није ђубре"
 
-#: ../mail/e-mail-reader.c:2358
+#: ../mail/e-mail-reader.c:2360
 msgid "Mar_k as Read"
 msgstr "О_значи као прочитано"
 
-#: ../mail/e-mail-reader.c:2362
+#: ../mail/e-mail-reader.c:2364
 msgid "Mark as Uni_mportant"
 msgstr "Означи као _неважно"
 
-#: ../mail/e-mail-reader.c:2366
+#: ../mail/e-mail-reader.c:2368
 msgid "Mark as _Unread"
 msgstr "Означи као _непрочитано"
 
-#: ../mail/e-mail-reader.c:2410
+#: ../mail/e-mail-reader.c:2412
 msgid "_Caret Mode"
 msgstr "Метод у_метања"
 
-#: ../mail/e-mail-reader.c:2412
+#: ../mail/e-mail-reader.c:2414
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Прикажите трепћући курсор у телу приказаних порука"
 
-#: ../mail/e-mail-reader.c:2418
+#: ../mail/e-mail-reader.c:2420
 msgid "All Message _Headers"
 msgstr "Сва _заглавља поруке"
 
-#: ../mail/e-mail-reader.c:2420
+#: ../mail/e-mail-reader.c:2422
 msgid "Show messages with all email headers"
 msgstr "Прикажите поруку са свим заглављима ел. поште"
 
-#: ../mail/e-mail-reader.c:2780
+#: ../mail/e-mail-reader.c:2849
 msgid "Retrieving message"
 msgstr "Довлачим поруку"
 
-#: ../mail/e-mail-reader.c:3702
-#: ../modules/mail/e-mail-attachment-handler.c:207
+#: ../mail/e-mail-reader.c:3772
+#: ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "Просл_еди"
 
-#: ../mail/e-mail-reader.c:3703
+#: ../mail/e-mail-reader.c:3773
 msgid "Forward the selected message to someone"
 msgstr "Прослеђује изабрану поруку некоме"
 
-#: ../mail/e-mail-reader.c:3722
+#: ../mail/e-mail-reader.c:3792
 msgid "Group Reply"
 msgstr "Одговор групи"
 
-#: ../mail/e-mail-reader.c:3723
+#: ../mail/e-mail-reader.c:3793
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Одговорите дописној листи или свим примаоцима"
 
-#: ../mail/e-mail-reader.c:3789 ../mail/em-filter-i18n.h:15
+#: ../mail/e-mail-reader.c:3859 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "Обриши"
 
-#: ../mail/e-mail-reader.c:3801
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../mail/e-mail-reader.c:3871
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Next"
 msgstr "Следеће"
 
-#: ../mail/e-mail-reader.c:3805
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../mail/e-mail-reader.c:3875
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Previous"
 msgstr "Претходно"
 
-#: ../mail/e-mail-reader.c:3814 ../mail/mail-dialogs.ui.h:15
+#: ../mail/e-mail-reader.c:3884 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Одговори"
 
-#: ../mail/e-mail-reader-utils.c:151
+#: ../mail/e-mail-reader-utils.c:147
 msgid "Do not warn me again"
 msgstr "Не упозоравај ме поново"
 
+#: ../mail/e-mail-reader-utils.c:557 ../plugins/face/face.c:170
+#: ../smime/gui/certificate-manager.c:329
+msgid "Unknown error"
+msgstr "Непозната грешка"
+
 #: ../mail/e-mail-reader-utils.c:976
 msgid "Printing"
 msgstr "Штампам"
@@ -13379,11 +13868,11 @@ msgstr[3] "Порука"
 msgid "Parsing message"
 msgstr "Обрађујем поруку"
 
-#: ../mail/e-mail-request.c:197
+#: ../mail/e-mail-request.c:199
 msgid "The message has no text content."
 msgstr "Порука не садржи текст."
 
-#: ../mail/e-mail-tag-editor.c:238
+#: ../mail/e-mail-tag-editor.c:237
 msgid "Flag to Follow Up"
 msgstr "Означи за праћење"
 
@@ -13393,7 +13882,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:1372
+#: ../mail/em-composer-utils.c:1454
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -13401,27 +13890,27 @@ msgstr ""
 "У ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. у ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} пише:"
 
-#: ../mail/em-composer-utils.c:1378
+#: ../mail/em-composer-utils.c:1460
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Прослеђена порука --------"
 
-#: ../mail/em-composer-utils.c:1383
+#: ../mail/em-composer-utils.c:1465
 msgid "-----Original Message-----"
 msgstr "-----Оригинална порука-----"
 
-#: ../mail/em-composer-utils.c:2528
+#: ../mail/em-composer-utils.c:2615
 msgid "an unknown sender"
 msgstr "непознати пошиљалац"
 
-#: ../mail/em-composer-utils.c:2949
+#: ../mail/em-composer-utils.c:3040
 msgid "Posting destination"
 msgstr "Одредишна пошта"
 
-#: ../mail/em-composer-utils.c:2950
+#: ../mail/em-composer-utils.c:3041
 msgid "Choose folders to post the message to."
 msgstr "Изаберите фасцикле за слање поруке."
 
-#: ../mail/em-filter-editor-folder-element.c:157
+#: ../mail/em-filter-editor-folder-element.c:153
 msgid "Select Folder"
 msgstr "Изабери фасциклу"
 
@@ -13458,243 +13947,243 @@ msgstr "ЦЦ"
 msgid "Completed On"
 msgstr "Завршено за"
 
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "Датум примања"
 
-#: ../mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:13
 msgid "Date sent"
 msgstr "Датум слања"
 
-#: ../mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "Обрисано"
 
-#: ../mail/em-filter-i18n.h:18
-msgid "does not end with"
-msgstr "не завршава се са"
-
-#: ../mail/em-filter-i18n.h:19
-msgid "does not exist"
-msgstr "не постоји"
-
-#: ../mail/em-filter-i18n.h:20
-msgid "does not have words"
-msgstr "не садржи речи"
-
-#: ../mail/em-filter-i18n.h:21
-msgid "does not return"
-msgstr "не враћа"
-
-#: ../mail/em-filter-i18n.h:22
-msgid "does not sound like"
-msgstr "не звучи као"
-
-#: ../mail/em-filter-i18n.h:23
-msgid "does not start with"
-msgstr "не почиње са"
-
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:17
 msgid "Draft"
 msgstr "Нацрт"
 
-#: ../mail/em-filter-i18n.h:26
-msgid "ends with"
-msgstr "завршава се са"
-
-#: ../mail/em-filter-i18n.h:28
-msgid "exists"
-msgstr "постоји"
-
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:19
 msgid "Expression"
 msgstr "Израз"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:20
 msgid "Follow Up"
 msgstr "Следи"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:21
 msgid "Forward to"
 msgstr "Проследи"
 
-#: ../mail/em-filter-i18n.h:32
-msgid "has words"
-msgstr "садржи речи"
-
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:22
 msgid "Important"
 msgstr "Важно"
 
-#: ../mail/em-filter-i18n.h:35
-msgid "is after"
-msgstr "је после"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is before"
-msgstr "је пре"
-
-#: ../mail/em-filter-i18n.h:37
-msgid "is Flagged"
-msgstr "је означено"
-
-#: ../mail/em-filter-i18n.h:41
-msgid "is not Flagged"
-msgstr "није означено"
-
-#: ../mail/em-filter-i18n.h:42
-msgid "is not set"
-msgstr "није подешено"
-
-#: ../mail/em-filter-i18n.h:43
-msgid "is set"
-msgstr "подешено"
+#: ../mail/em-filter-i18n.h:23
+msgid "Junk Test"
+msgstr "Провера ђубрета"
 
-#: ../mail/em-filter-i18n.h:44 ../mail/mail-config.ui.h:108
+#: ../mail/em-filter-i18n.h:24 ../mail/mail-config.ui.h:113
 msgid "Junk"
 msgstr "Ђубре"
 
-#: ../mail/em-filter-i18n.h:45
-msgid "Junk Test"
-msgstr "Провера ђубрета"
-
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:25
 msgid "Label"
 msgstr "Натпис"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:26
 msgid "Mailing list"
 msgstr "Дописна листа"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:27
 msgid "Match All"
 msgstr "Одговара све"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:28
 msgid "Message Body"
 msgstr "Тело поруке"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:29
 msgid "Message Header"
 msgstr "Заглавље поруке"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:30
+msgid "Message Location"
+msgstr "Локација поруке"
+
+#: ../mail/em-filter-i18n.h:31
 msgid "Message is Junk"
 msgstr "Порука је ђубре"
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:32
 msgid "Message is not Junk"
 msgstr "Порука није ђубре"
 
-#: ../mail/em-filter-i18n.h:53
-msgid "Message Location"
-msgstr "Локација поруке"
-
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:34
 msgid "Pipe to Program"
 msgstr "Повежи на програм"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:35
 msgid "Play Sound"
 msgstr "Пусти звук"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:57 ../mail/mail-dialogs.ui.h:14
+#: ../mail/em-filter-i18n.h:36 ../mail/mail-dialogs.ui.h:15
 msgid "Read"
 msgstr "Читај"
 
-#: ../mail/em-filter-i18n.h:58 ../mail/message-list.etspec.h:16
+#: ../mail/em-filter-i18n.h:37 ../mail/message-list.etspec.h:16
 msgid "Recipients"
 msgstr "Примаоци"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:38
 msgid "Regex Match"
 msgstr "Регизр одговара"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:39
 msgid "Replied to"
 msgstr "Одговорено"
 
-#: ../mail/em-filter-i18n.h:61
-msgid "returns"
-msgstr "повратно"
-
-#: ../mail/em-filter-i18n.h:62
-msgid "returns greater than"
-msgstr "повратно веће од"
-
-#: ../mail/em-filter-i18n.h:63
-msgid "returns less than"
-msgstr "повратно мање од"
-
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:40
 msgid "Run Program"
 msgstr "Покрени програм"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/message-list.etspec.h:3
+#: ../mail/em-filter-i18n.h:41 ../mail/message-list.etspec.h:3
 msgid "Score"
 msgstr "Резултат"
 
-#: ../mail/em-filter-i18n.h:66 ../mail/message-list.etspec.h:15
-msgid "Sender"
-msgstr "Пошиљалац"
-
 # bug(slobo): вероватно извештај о достави
-#: ../mail/em-filter-i18n.h:67
+#: ../mail/em-filter-i18n.h:42
 msgid "Sender or Recipients"
 msgstr "Пошиљалац или примаоци"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:43 ../mail/message-list.etspec.h:15
+msgid "Sender"
+msgstr "Пошиљалац"
+
+#: ../mail/em-filter-i18n.h:44
 msgid "Set Label"
 msgstr "Постави ознаку"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:45
 msgid "Set Status"
 msgstr "Постави статус"
 
-#: ../mail/em-filter-i18n.h:70
+#: ../mail/em-filter-i18n.h:46
 msgid "Size (kB)"
 msgstr "Величина (kB)"
 
-#: ../mail/em-filter-i18n.h:71
-msgid "sounds like"
-msgstr "звучи као"
-
-#: ../mail/em-filter-i18n.h:72
+#: ../mail/em-filter-i18n.h:47
 msgid "Source Account"
 msgstr "Изворни налог"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:48
 msgid "Specific header"
 msgstr "Одређено заглавље"
 
-#: ../mail/em-filter-i18n.h:74
-msgid "starts with"
-msgstr "почиње са"
-
-#: ../mail/em-filter-i18n.h:76
+#: ../mail/em-filter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Прекини обраду"
 
-#: ../mail/em-filter-i18n.h:79
+#: ../mail/em-filter-i18n.h:53
 msgid "Unset Color"
 msgstr "Непостављена боја"
 
-#: ../mail/em-filter-i18n.h:80
+#: ../mail/em-filter-i18n.h:54
 msgid "Unset Status"
 msgstr "Непостављен статус"
 
+#: ../mail/em-filter-i18n.h:57
+msgid "does not end with"
+msgstr "не завршава се са"
+
+#: ../mail/em-filter-i18n.h:58
+msgid "does not exist"
+msgstr "не постоји"
+
+#: ../mail/em-filter-i18n.h:59
+msgid "does not have words"
+msgstr "не садржи речи"
+
+#: ../mail/em-filter-i18n.h:60
+msgid "does not return"
+msgstr "не враћа"
+
+#: ../mail/em-filter-i18n.h:61
+msgid "does not sound like"
+msgstr "не звучи као"
+
+#: ../mail/em-filter-i18n.h:62
+msgid "does not start with"
+msgstr "не почиње са"
+
+#: ../mail/em-filter-i18n.h:63
+msgid "ends with"
+msgstr "завршава се са"
+
+#: ../mail/em-filter-i18n.h:64
+msgid "exists"
+msgstr "постоји"
+
+#: ../mail/em-filter-i18n.h:65
+msgid "has words"
+msgstr "садржи речи"
+
+#: ../mail/em-filter-i18n.h:66
+msgid "is Flagged"
+msgstr "је означено"
+
+#: ../mail/em-filter-i18n.h:67
+msgid "is after"
+msgstr "је после"
+
+#: ../mail/em-filter-i18n.h:68
+msgid "is before"
+msgstr "је пре"
+
+#: ../mail/em-filter-i18n.h:71
+msgid "is not Flagged"
+msgstr "није означено"
+
+#: ../mail/em-filter-i18n.h:72
+msgid "is not set"
+msgstr "није подешено"
+
+#: ../mail/em-filter-i18n.h:74
+msgid "is set"
+msgstr "подешено"
+
+#: ../mail/em-filter-i18n.h:76
+msgid "returns greater than"
+msgstr "повратно веће од"
+
+#: ../mail/em-filter-i18n.h:77
+msgid "returns less than"
+msgstr "повратно мање од"
+
+#: ../mail/em-filter-i18n.h:78
+msgid "returns"
+msgstr "повратно"
+
+#: ../mail/em-filter-i18n.h:79
+msgid "sounds like"
+msgstr "звучи као"
+
+#: ../mail/em-filter-i18n.h:80
+msgid "starts with"
+msgstr "почиње са"
+
 #. and now for the action area
-#: ../mail/em-filter-rule.c:583
+#: ../mail/em-filter-rule.c:587
 msgid "Then"
 msgstr "Потом"
 
-#: ../mail/em-filter-rule.c:648
+#: ../mail/em-filter-rule.c:652
 msgid "Add Ac_tion"
 msgstr "Додај ра_дњу"
 
 # bug: no need for plural-forms
-#: ../mail/em-folder-properties.c:145
+#: ../mail/em-folder-properties.c:177
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Непрочитаних порука:"
@@ -13703,7 +14192,7 @@ msgstr[2] "Непрочитаних порука:"
 msgstr[3] "Непрочитаних порука:"
 
 # bug: no need for plural-forms here, since text is in front of number
-#: ../mail/em-folder-properties.c:156
+#: ../mail/em-folder-properties.c:188
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Укупно порука:"
@@ -13712,180 +14201,197 @@ msgstr[2] "Укупно порука:"
 msgstr[3] "Укупно порука:"
 
 # bug: no need for plural-forms here, since text is in front of number
-#: ../mail/em-folder-properties.c:177
+#: ../mail/em-folder-properties.c:209
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Искоришћеност квоте (%s):"
 
 # bug: no need for plural-forms here, since text is in front of number
-#: ../mail/em-folder-properties.c:179
+#: ../mail/em-folder-properties.c:211
 #, c-format
 msgid "Quota usage"
 msgstr "Искоришћеност квоте"
 
-#: ../mail/em-folder-properties.c:347
+#. Translators: Label of a combo with a list of configured accounts where a user can
+#. choose which account to use as the sender when composing a message in this folder
+#: ../mail/em-folder-properties.c:286
+msgid "_Send Account Override:"
+msgstr "_Препиши налог слања"
+
+#: ../mail/em-folder-properties.c:415
 msgid "Folder Properties"
 msgstr "Особине фасцикле"
 
-#: ../mail/em-folder-selection-button.c:80
+#: ../mail/em-folder-selection-button.c:76
 msgid "<click here to select a folder>"
 msgstr "<кликните овде да изаберете фасциклу>"
 
-#: ../mail/em-folder-selector.c:390
+#: ../mail/em-folder-selector.c:387
 msgid "C_reate"
 msgstr "_Направи"
 
-#: ../mail/em-folder-selector.c:396
+#: ../mail/em-folder-selector.c:393
 msgid "Folder _name:"
 msgstr "Назив _фасцикле:"
 
-#: ../mail/em-folder-tree.c:644
+#: ../mail/em-folder-tree.c:682
 msgid "Folder names cannot contain '/'"
 msgstr "Називи фасцикли не могу да садрже „/“"
 
-#: ../mail/em-folder-tree.c:781
+#: ../mail/em-folder-tree.c:819
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1609
+#: ../mail/em-folder-tree.c:1661
 msgid "Mail Folder Tree"
 msgstr "Стабло фасцикле за пошту"
 
-#: ../mail/em-folder-tree.c:2179 ../mail/em-folder-utils.c:112
+#: ../mail/em-folder-tree.c:2209 ../mail/em-folder-utils.c:100
 #, c-format
 msgid "Moving folder %s"
 msgstr "Премештам фасциклу „%s“"
 
-#: ../mail/em-folder-tree.c:2182 ../mail/em-folder-utils.c:114
+#: ../mail/em-folder-tree.c:2212 ../mail/em-folder-utils.c:102
 #, c-format
 msgid "Copying folder %s"
 msgstr "Умножавам фасциклу „%s“"
 
-#: ../mail/em-folder-tree.c:2189 ../mail/message-list.c:2280
+#: ../mail/em-folder-tree.c:2219 ../mail/message-list.c:2284
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Премештам поруке у фасциклу „%s“"
 
-#: ../mail/em-folder-tree.c:2193 ../mail/message-list.c:2282
+#: ../mail/em-folder-tree.c:2223 ../mail/message-list.c:2286
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Умножавам поруке у фасциклу „%s“"
 
-#: ../mail/em-folder-tree.c:2212
+#: ../mail/em-folder-tree.c:2242
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Не могу да убацим поруку(е) у оставу на највишем нивоу"
 
 #. UNMATCHED is always last.
-#: ../mail/em-folder-tree-model.c:176 ../mail/em-folder-tree-model.c:178
+#: ../mail/em-folder-tree-model.c:430 ../mail/em-folder-tree-model.c:432
 msgid "UNMATCHED"
 msgstr "НЕОДГОВАРА"
 
-#: ../mail/em-folder-tree-model.c:873 ../mail/em-folder-tree-model.c:1168
+#: ../mail/em-folder-tree-model.c:1244 ../mail/em-folder-tree-model.c:1621
 msgid "Loading..."
 msgstr "Учитавам..."
 
-#: ../mail/em-folder-utils.c:519
+#: ../mail/em-folder-utils.c:506
 msgid "Move Folder To"
 msgstr "Премести фасциклу у"
 
-#: ../mail/em-folder-utils.c:519
+#: ../mail/em-folder-utils.c:506
 msgid "Copy Folder To"
 msgstr "Умножи фасциклу у"
 
-#: ../mail/em-folder-utils.c:617
+#: ../mail/em-folder-utils.c:604
 msgid "Create Folder"
 msgstr "Направи фасциклу"
 
-#: ../mail/em-folder-utils.c:618
+#: ../mail/em-folder-utils.c:605
 msgid "Specify where to create the folder:"
 msgstr "Наведите где направити фасциклу:"
 
-#: ../mail/em-subscription-editor.c:867
+#: ../mail/em-subscription-editor.c:855
 msgid "_Subscribe"
 msgstr "Пријави _се"
 
-#: ../mail/em-subscription-editor.c:876
+#: ../mail/em-subscription-editor.c:864
 msgid "Su_bscribe To Shown"
 msgstr "Пријави се на _приказане"
 
-#: ../mail/em-subscription-editor.c:884
+#: ../mail/em-subscription-editor.c:872
 msgid "Subscribe To _All"
 msgstr "Пријави се _на све"
 
-#: ../mail/em-subscription-editor.c:981 ../mail/em-subscription-editor.c:1871
-#: ../modules/mail/e-mail-shell-view-actions.c:1641
+#: ../mail/em-subscription-editor.c:969 ../mail/em-subscription-editor.c:1867
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
 msgid "_Unsubscribe"
 msgstr "_Одјави се"
 
-#: ../mail/em-subscription-editor.c:990
+#: ../mail/em-subscription-editor.c:978
 msgid "Unsu_bscribe From Hidden"
 msgstr "О_дјави се са скривених"
 
-#: ../mail/em-subscription-editor.c:998
+#: ../mail/em-subscription-editor.c:986
 msgid "Unsubscribe From _All"
 msgstr "Одја_ви се са свих"
 
-#: ../mail/em-subscription-editor.c:1708
+#: ../mail/em-subscription-editor.c:1704
 msgid "Folder Subscriptions"
 msgstr "Пријаве на фасцикле"
 
-#: ../mail/em-subscription-editor.c:1747
+#: ../mail/em-subscription-editor.c:1743
 msgid "_Account:"
 msgstr "_Налог:"
 
-#: ../mail/em-subscription-editor.c:1760
+#: ../mail/em-subscription-editor.c:1756
 msgid "Clear Search"
 msgstr "Очисти претрагу"
 
-#: ../mail/em-subscription-editor.c:1777
+#: ../mail/em-subscription-editor.c:1773
 msgid "Sho_w items that contain:"
 msgstr "_Прикажи ставке које садрже:"
 
-#: ../mail/em-subscription-editor.c:1824
+#: ../mail/em-subscription-editor.c:1820
 msgid "Subscribe to the selected folder"
 msgstr "Пријавите се на изабрану фасциклу"
 
-#: ../mail/em-subscription-editor.c:1825
+#: ../mail/em-subscription-editor.c:1821
 msgid "Su_bscribe"
 msgstr "П_ријави се"
 
-#: ../mail/em-subscription-editor.c:1870
-#: ../modules/mail/e-mail-shell-view-actions.c:1643
+#: ../mail/em-subscription-editor.c:1866
+#: ../modules/mail/e-mail-shell-view-actions.c:1633
 msgid "Unsubscribe from the selected folder"
 msgstr "Одјавите се са изабране фасцикле"
 
-#: ../mail/em-subscription-editor.c:1910
+#: ../mail/em-subscription-editor.c:1906
 msgid "Collapse all folders"
 msgstr "Скупите све фасцикле"
 
-#: ../mail/em-subscription-editor.c:1911
+#: ../mail/em-subscription-editor.c:1907
 msgid "C_ollapse All"
 msgstr "_Скупи све"
 
-#: ../mail/em-subscription-editor.c:1921
+#: ../mail/em-subscription-editor.c:1917
 msgid "Expand all folders"
 msgstr "Разгранајте све фасцикле"
 
-#: ../mail/em-subscription-editor.c:1922
+#: ../mail/em-subscription-editor.c:1918
 msgid "E_xpand All"
 msgstr "_Разгранај све"
 
-#: ../mail/em-subscription-editor.c:1932
+#: ../mail/em-subscription-editor.c:1928
 msgid "Refresh the folder list"
 msgstr "Освежите списак фасцикли"
 
-#: ../mail/em-subscription-editor.c:1944
+#: ../mail/em-subscription-editor.c:1929
+#: ../modules/mail/e-mail-shell-view-actions.c:1533
+#: ../modules/mail/e-mail-shell-view-actions.c:1603
+msgid "_Refresh"
+msgstr "_Освежи"
+
+#: ../mail/em-subscription-editor.c:1940
 msgid "Stop the current operation"
 msgstr "Зауставите тренутну операцију"
 
+#: ../mail/em-subscription-editor.c:1941
+#: ../modules/addressbook/e-book-shell-view-actions.c:934
+msgid "_Stop"
+msgstr "_Заустави"
+
 #. Translators: This message is shown only for ten or more
 #. * 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:86
+#: ../mail/em-utils.c:75
 #, 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?"
@@ -13894,154 +14400,154 @@ msgstr[1] "Сигурно желите да отворите %d поруке о�
 msgstr[2] "Сигурно желите да отворите %d порука одједном?"
 msgstr[3] "Сигурно желите да отворите ову једну поруку?"
 
-#: ../mail/em-utils.c:142
-#: ../modules/mailto-handler/evolution-mailto-handler.c:150
+#: ../mail/em-utils.c:131
+#: ../modules/mailto-handler/evolution-mailto-handler.c:148
 msgid "_Do not show this message again"
 msgstr "_Не приказуј више ову поруку"
 
-#: ../mail/em-utils.c:252
+#: ../mail/em-utils.c:241
 msgid "Message Filters"
 msgstr "Пропусници порука"
 
-#: ../mail/em-utils.c:982
+#: ../mail/em-utils.c:970
 #, c-format
 msgid "Messages from %s"
 msgstr "Поруке које је послао %s"
 
-#: ../mail/em-vfolder-editor.c:105
+#: ../mail/em-vfolder-editor.c:104
 msgid "Search _Folders"
 msgstr "Фас_цикле претраге"
 
-#: ../mail/em-vfolder-editor-rule.c:397
+#: ../mail/em-vfolder-editor-rule.c:392
 msgid "Add Folder"
 msgstr "Додај фасциклу"
 
-#: ../mail/em-vfolder-editor-rule.c:523
+#: ../mail/em-vfolder-editor-rule.c:518
 msgid "Search Folder Sources"
 msgstr "Извор фасцикле претраге"
 
-#: ../mail/em-vfolder-editor-rule.c:555
+#: ../mail/em-vfolder-editor-rule.c:550
 msgid "Automatically update on any _source folder change"
 msgstr "Сам освежи при _свакој измени изворне фасцикле"
 
-#: ../mail/em-vfolder-editor-rule.c:567
+#: ../mail/em-vfolder-editor-rule.c:562
 msgid "All local folders"
 msgstr "Све локалне фасцикле"
 
-#: ../mail/em-vfolder-editor-rule.c:568
+#: ../mail/em-vfolder-editor-rule.c:563
 msgid "All active remote folders"
 msgstr "Све активне мрежне фасцикле"
 
-#: ../mail/em-vfolder-editor-rule.c:569
+#: ../mail/em-vfolder-editor-rule.c:564
 msgid "All local and active remote folders"
 msgstr "Све локалне и активне мрежне фасцикле"
 
-#: ../mail/em-vfolder-editor-rule.c:570
+#: ../mail/em-vfolder-editor-rule.c:565
 msgid "Specific folders"
 msgstr "Одређене фасцикле"
 
-#: ../mail/em-vfolder-editor-rule.c:608
+#: ../mail/em-vfolder-editor-rule.c:603
 msgid "include subfolders"
 msgstr "укључи подфасцикле"
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:173
 msgid "Importing Elm data"
 msgstr "Увожење Елм података"
 
-#: ../mail/importers/elm-importer.c:378
+#: ../mail/importers/elm-importer.c:374
 msgid "Evolution Elm importer"
 msgstr "Елм увозник Еволуције"
 
-#: ../mail/importers/elm-importer.c:379
+#: ../mail/importers/elm-importer.c:375
 msgid "Import mail from Elm."
 msgstr "Увози пошту из Елма."
 
-#: ../mail/importers/evolution-mbox-importer.c:140
-#: ../plugins/dbx-import/dbx-importer.c:250
+#: ../mail/importers/evolution-mbox-importer.c:134
+#: ../plugins/dbx-import/dbx-importer.c:246
 msgid "_Destination folder:"
 msgstr "_Одредишна фасцикла:"
 
-#: ../mail/importers/evolution-mbox-importer.c:146
-#: ../plugins/dbx-import/dbx-importer.c:256
-#: ../plugins/pst-import/pst-importer.c:545
+#: ../mail/importers/evolution-mbox-importer.c:140
+#: ../plugins/dbx-import/dbx-importer.c:252
+#: ../plugins/pst-import/pst-importer.c:541
 msgid "Select folder"
 msgstr "Изаберите фасциклу"
 
-#: ../mail/importers/evolution-mbox-importer.c:147
-#: ../plugins/dbx-import/dbx-importer.c:257
-#: ../plugins/pst-import/pst-importer.c:546
+#: ../mail/importers/evolution-mbox-importer.c:141
+#: ../plugins/dbx-import/dbx-importer.c:253
+#: ../plugins/pst-import/pst-importer.c:542
 msgid "Select folder to import into"
 msgstr "Изаберите фасциклу за увоз"
 
-#: ../mail/importers/evolution-mbox-importer.c:437
+#: ../mail/importers/evolution-mbox-importer.c:435
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Наслов"
 
-#: ../mail/importers/evolution-mbox-importer.c:442
+#: ../mail/importers/evolution-mbox-importer.c:440
 msgctxt "mboxImp"
 msgid "From"
 msgstr "Шаље"
 
-#: ../mail/importers/evolution-mbox-importer.c:486
-#: ../shell/e-shell-utils.c:172
+#: ../mail/importers/evolution-mbox-importer.c:493
+#: ../shell/e-shell-utils.c:171
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Беркли поштанско сандуче (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:487
+#: ../mail/importers/evolution-mbox-importer.c:494
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Увозник за фасцикле облика Беркли поштанског сандучета"
 
-#: ../mail/importers/mail-importer.c:63
+#: ../mail/importers/mail-importer.c:54
 msgid "Importing mailbox"
 msgstr "Увожење поштанског сандучета"
 
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:153
-#: ../plugins/dbx-import/dbx-importer.c:612
-#: ../plugins/pst-import/pst-importer.c:764
+#: ../mail/importers/mail-importer.c:144
+#: ../plugins/dbx-import/dbx-importer.c:609
+#: ../plugins/pst-import/pst-importer.c:760
 #, c-format
 msgid "Importing '%s'"
 msgstr "Увозим „%s“"
 
-#: ../mail/importers/mail-importer.c:316
+#: ../mail/importers/mail-importer.c:309
 #, c-format
 msgid "Scanning %s"
 msgstr "Претражујем „%s“"
 
 #: ../mail/importers/pine-importer.c:247
 msgid "Importing Pine data"
-msgstr "Увожење Пине податке"
+msgstr "Увожење Пине података"
 
-#: ../mail/importers/pine-importer.c:474
+#: ../mail/importers/pine-importer.c:475
 msgid "Evolution Pine importer"
-msgstr "Пине увозник Еволуције"
+msgstr "Еволуцијин Пине увозник"
 
-#: ../mail/importers/pine-importer.c:475
+#: ../mail/importers/pine-importer.c:476
 msgid "Import mail from Pine."
 msgstr "Увози пошту из програма Пине."
 
-#: ../mail/mail-autofilter.c:70
+#: ../mail/mail-autofilter.c:63
 #, c-format
 msgid "Mail to %s"
 msgstr "Пошта за %s"
 
-#: ../mail/mail-autofilter.c:226 ../mail/mail-autofilter.c:269
+#: ../mail/mail-autofilter.c:219 ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Mail from %s"
 msgstr "Пошта од %s"
 
-#: ../mail/mail-autofilter.c:252
+#: ../mail/mail-autofilter.c:245
 #, c-format
 msgid "Subject is %s"
 msgstr "Наслов је %s"
 
-#: ../mail/mail-autofilter.c:293
+#: ../mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "%s дописна листа"
 
-#: ../mail/mail-autofilter.c:403
+#: ../mail/mail-autofilter.c:396
 msgid "Add Filter Rule"
 msgstr "Додај правило филтрирања"
 
@@ -14050,7 +14556,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:512
+#: ../mail/mail-autofilter.c:505
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -14076,7 +14582,7 @@ msgstr[3] ""
 msgid "Set custom junk header"
 msgstr "Поставите произвољно заглавље нежељене"
 
-#: ../mail/mail-config.ui.h:2
+#: ../mail/mail-config.ui.h:4
 msgid ""
 "All new emails with header that matches given content will be automatically "
 "filtered as junk"
@@ -14084,138 +14590,138 @@ msgstr ""
 "Све нове ел. поруке са заглављем које се подудара са датим садржајем ће бити "
 "аутоматски филтриране као нежељене"
 
-#: ../mail/mail-config.ui.h:3
+#: ../mail/mail-config.ui.h:5
 msgid "Header name"
 msgstr "Назив заглавља"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:6
 msgid "Header content"
 msgstr "Заглавље садржи"
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:7
 msgid "Default Behavior"
 msgstr "Подразумевано понашање"
 
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:8
 msgid "For_mat messages in HTML"
 msgstr "Обликуј поруке у ХТМ_Л"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:9
 msgid "Automatically insert _emoticon images"
 msgstr "Увек уметни слике _смајлића"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:10
 msgid "Always request rea_d receipt"
 msgstr "Увек тражи _повратницу"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:11
 msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "Кодирај називе датотека на начин _Аутлука/Гпоште"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:12
 msgid "Ch_aracter encoding:"
 msgstr "Кодна ст_рана:"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:13
 msgid "Replies and Forwards"
 msgstr "Одговори и прослеђивања"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:14
 msgid "_Reply style:"
 msgstr "_Стил одговора:"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:15
 msgid "_Forward style:"
 msgstr "Стил _прослеђивања:"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:16
 msgid "Start _typing at the bottom on replying"
 msgstr "У одговору започни _куцање при дну"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:17
 msgid "_Keep signature above the original message on replying"
 msgstr "Задржи потпис _изнад оригиналне поруке при одговору"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:18
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "_Занемари „Одговор-за:“ за дописне листе"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:19
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "Одговор _групи иде само на дописну листу, ако је могуће"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:20
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr ""
 "Дигитално _потпиши поруке када је оригинална порука потписана (ПГП или С/"
 "МИМЕ)"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:21
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Приложи"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:22
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "Унутар (Аутлук стил)"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:23
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Цитирано"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:24
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Не цитирај"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:25
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "Унутар"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:27
 msgid "Sig_natures"
 msgstr "Пот_писи"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:28
 msgid "Signatures"
 msgstr "Потписи"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:29
 msgid "_Languages"
 msgstr "_Језици"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:30
 msgid "Languages Table"
 msgstr "Табела језика"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:31
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr ""
 "Списак језика овде осликава само оне језике за које имате инсталиран речник."
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:33
 msgid "Check spelling while I _type"
 msgstr "Провери правопис док _куцам"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:34
 msgid "Color for _misspelled words:"
 msgstr "Боја за _погрешно написане речи:"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:35
 #: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Pick a color"
 msgstr "Изаберите боју"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:36
 msgid "Spell Checking"
 msgstr "Провера правописа"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:37
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -14224,261 +14730,265 @@ msgstr ""
 "пре извршавања следећих означених радњи:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:39
 msgid "Sending a message with an _empty subject line"
 msgstr "Слања поруке са празном линијом _наслова"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:41
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Слања поруке која садржи одређене само _Бцц примаоце"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:43
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Слања приватног _одговора на поруку дописне листе"
 
 # bug(slobo): вероватно извештај о достави
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:45
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Слања одговора _већем броју прималаца"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:47
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "Дозвољавања _дописној листи да преусмери приватну поруку на листу"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:49
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "Слања поруке са _примаоцима који нису унешени као адресе поште"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:50
 msgid "Confirmations"
 msgstr "Потврђивања"
 
-#: ../mail/mail-config.ui.h:54 ../smime/gui/smime-ui.ui.h:1
-msgid "a"
-msgstr "a"
-
-#: ../mail/mail-config.ui.h:55 ../smime/gui/smime-ui.ui.h:2
-msgid "b"
-msgstr "б"
+#. Translators: Label of a frame with a list of folders for which to use selected account in Send account overrides
+#: ../mail/mail-config.ui.h:54
+#| msgid "Search Folders"
+msgid "Use for Folders"
+msgstr "Користи за фасцикле"
 
-#: ../mail/mail-config.ui.h:56
-msgid "Proxy Settings"
-msgstr "Подешавања посредника"
+#: ../mail/mail-config.ui.h:55
+msgid "A_dd"
+msgstr "_Додај"
 
 #: ../mail/mail-config.ui.h:57
-msgid "_Use system defaults"
-msgstr "_Користи системске поставке"
-
-#: ../mail/mail-config.ui.h:58
-msgid "_Direct connection to the Internet"
-msgstr "_Директна веза са Интернетом"
+#| msgid "_Remove"
+msgid "Re_move"
+msgstr "_Уклони"
 
+# bug(slobo): вероватно извештај о достави
+#. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account overrides
 #: ../mail/mail-config.ui.h:59
-msgid "_Manual proxy configuration:"
-msgstr "_Ручно подешавање посредника:"
+#| msgid "Sender or Recipients"
+msgid "Use for Recipients"
+msgstr "Користи за примаоце"
 
-#: ../mail/mail-config.ui.h:60
-msgid "H_TTP Proxy:"
-msgstr "ХТТП _посредник:"
-
-#: ../mail/mail-config.ui.h:61
-msgid "_Secure HTTP Proxy:"
-msgstr "_Безбедан ХТТП посредник:"
+#. Translators: Label of a frame with a list of configured accounts in Send account overrides
+#: ../mail/mail-config.ui.h:61 ../modules/mail/em-composer-prefs.c:870
+#| msgid "_Account:"
+msgid "Account"
+msgstr "Налог"
 
 #: ../mail/mail-config.ui.h:62
-msgid "SOC_KS Proxy:"
-msgstr "Посредник _СОЦКС-а:"
+msgid "Send account overrides"
+msgstr "Преписивања налога слања"
 
 #: ../mail/mail-config.ui.h:63
-msgid "No _Proxy for:"
-msgstr "Без _посредника за:"
+msgid ""
+"Assign which account should be used as a send account for respective folders "
+"or recipients, an override for usual send account detection. List of "
+"recipients can contain partial addresses or names. The name and the address "
+"parts are compared separately."
+msgstr ""
+"Доделите који налог треба бити коришћен као налог слања за одговарајуће "
+"фасцикле или примаоце, преписивање за уобичајено откривање налога слања. "
+"Списак примаоца може да садржи делимичне адресе или називе. Делови адресе и "
+"назива се упоређују засебно."
 
 #: ../mail/mail-config.ui.h:64
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:614
-msgid "Port:"
-msgstr "Порт:"
+msgid "_Folder override has precedence over Recipient override"
+msgstr "Преписивање _фасцикле има предност над преписивањем примаоца"
 
 #: ../mail/mail-config.ui.h:65
-msgid "Use Authe_ntication"
-msgstr "Користи _потврђивање идентитета"
+#| msgid "Source Account"
+msgid "Send Account"
+msgstr "Налог слања"
 
-#: ../mail/mail-config.ui.h:66
-msgid "Us_ername:"
-msgstr "Корисничко_име:"
+#: ../mail/mail-config.ui.h:71 ../smime/gui/smime-ui.ui.h:1
+msgid "a"
+msgstr "a"
 
-#: ../mail/mail-config.ui.h:67
-msgid "Pass_word:"
-msgstr "_Лозинка:"
+#: ../mail/mail-config.ui.h:72 ../smime/gui/smime-ui.ui.h:2
+msgid "b"
+msgstr "б"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:73
 msgid "Start up"
 msgstr "Покретање"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:74
 msgid "Check for new _messages on start"
 msgstr "Провери нове _поруке приликом покретања"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:75
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Провери нове _поруке у свим активним налозима"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:76
 msgid "Message Display"
 msgstr "Приказ поруке"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:77
 msgid "_Use the same fonts as other applications"
 msgstr "_Користи исте фонтове као други програми"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:78
 msgid "S_tandard Font:"
 msgstr "_Стандардни фонт:"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:79
 msgid "Select HTML fixed width font"
 msgstr "Изаберите ХТМЛ фонт сталне величине"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:80
 msgid "Select HTML variable width font"
 msgstr "Изаберите ХТМЛ фонт променљиве величине"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:81
 msgid "Fix_ed Width Font:"
 msgstr "Фонт _сталне ширине:"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:82
 msgid "_Mark messages as read after"
 msgstr "_Означи поруке као прочитане после"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:84
 msgid "Highlight _quotations with"
 msgstr "Нагласи _цитате са"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:85
 msgid "color"
 msgstr "боја"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:86
 msgid "Default character e_ncoding:"
 msgstr "Подразумеванa _кодна страна:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:87
 msgid "Apply the same _view settings to all folders"
 msgstr "Примени иста подешавања _прегледа на свим фасциклама"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:88
 msgid "F_all back to threading messages by subject"
 msgstr "Вра_ти се на низање порука по наслову"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:89
 msgid "Delete Mail"
 msgstr "Обриши пошту"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:90
 msgid "Empty _trash folders"
 msgstr "Испразни фасцикле _смећа"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:91
 msgid "Confirm _when expunging a folder"
 msgstr "_Потврди када празниш фасциклу"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:93
 msgid "_Show animated images"
 msgstr "Прикажи _анимиране слике"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:94
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Упозори при слању ХТМЛ поште контактима који их не желе"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:95
 msgid "Loading Images"
 msgstr "Учитавање слика"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:96
 msgid "_Never load images from the Internet"
 msgstr "_Никада не учитавај слике са Интернета"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:97
 msgid "_Load images only in messages from contacts"
 msgstr "_Учитај слике само у порукама од контакта"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:98
 msgid "_Always load images from the Internet"
 msgstr "_Увек учитај слике са Интернета"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:99
 msgid "HTML Messages"
 msgstr "ХТМЛ поруке"
 
-#: ../mail/mail-config.ui.h:95 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:100 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Ознаке"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:101
 msgid "Sender Photograph"
 msgstr "Фотографија пошиљаоца"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:102
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Прикажи фотографију пошиљаоца у прегледу поште"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:103
 msgid "Displayed Message Headers"
 msgstr "Приказана заглавља порука"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:104
 msgid "Mail Headers Table"
 msgstr "Табела заглавља поште"
 
-#: ../mail/mail-config.ui.h:100
-#: ../modules/addressbook/autocompletion-config.c:117
+#: ../mail/mail-config.ui.h:105
+#: ../modules/addressbook/autocompletion-config.c:116
 #: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Date/Time Format"
 msgstr "Формат датум/време"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:107
 msgid "Check incoming _messages for junk"
 msgstr "Провери има ли ђубрета у _пристиглој пошти"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:108
 msgid "_Delete junk messages"
 msgstr "_Обриши поруке ђубра"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:109
 msgid "Check cu_stom headers for junk"
 msgstr "Провери има ли ђубрета у _прилагођеним заглављима"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:110
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Не означава_ј поруке као ђубре ако је пошиљалац у мом адресару"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:111
 msgid "_Lookup in local address book only"
 msgstr "_Потражи само у локалном адресару"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:112
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "Опција се занемарује уколико је пронађено поклапање са произвољним заглављем "
 "ђубрета."
 
-#: ../mail/mail-config.ui.h:109
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:225
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:159
+#: ../mail/mail-config.ui.h:114
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:224
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:158
 msgid "No encryption"
 msgstr "Без шифровања"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:115
 msgid "TLS encryption"
 msgstr "ТЛС шифровање"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:116
 msgid "SSL encryption"
 msgstr "ССЛ шифровање"
 
@@ -14500,63 +15010,63 @@ msgstr "_Рок:"
 
 # timezone.
 #. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Co_mpleted"
 msgstr "За_вршено"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Call"
 msgstr "Позив"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Do Not Forward"
 msgstr "Не прослеђуј"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "Следи"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "За вашу информацију"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "Проследи"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "No Response Necessary"
 msgstr "Није неопходан одговор"
 
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/mail-dialogs.ui.h:17
 msgid "Reply to All"
 msgstr "Одговори свима"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Review"
 msgstr "Прегледај"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:19
 msgid "License Agreement"
 msgstr "Уговор о коришћењу"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "_Tick this to accept the license agreement"
 msgstr "Оз_начите ово да прихватите уговор о лиценци"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:22
 msgid "_Accept License"
 msgstr "_Прихвати лиценцу"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Security Information"
 msgstr "Подаци безбедности"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Digital Signature"
 msgstr "Дигитални потпис"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:25
 msgid "Encryption"
 msgstr "Шифровање"
 
@@ -14761,7 +15271,7 @@ msgstr ""
 "Сигурно желите трајно да уклоните све обрисане поруке из свих фасцикли?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1529
+#: ../modules/mail/e-mail-shell-view-actions.c:1519
 msgid "_Empty Trash"
 msgstr "_Избаци смеће"
 
@@ -14981,7 +15491,7 @@ msgid "Do _Not Disable"
 msgstr "Немој _искључити"
 
 #: ../mail/mail.error.xml.h:90
-#: ../plugins/publish-calendar/publish-calendar.c:649
+#: ../plugins/publish-calendar/publish-calendar.c:655
 msgid "_Disable"
 msgstr "_Искључи"
 
@@ -15196,14 +15706,6 @@ msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr ""
 "Да ли сте сигурни да желите да умножите фасциклу „{0}“ у фасциклу „{1}“?"
 
-#: ../mail/mail.error.xml.h:138
-msgid "_Yes"
-msgstr "_Да"
-
-#: ../mail/mail.error.xml.h:139
-msgid "_No"
-msgstr "_Не"
-
 #: ../mail/mail.error.xml.h:140
 msgid "_Always"
 msgstr "_Увек"
@@ -15339,123 +15841,127 @@ msgstr "Не могу да извршим ову радњу над „{0}“."
 msgid "You must be working online to complete this operation."
 msgstr "Морате да будете на мрежи да бисте завршили ову радњу."
 
-#: ../mail/mail-send-recv.c:202
+#: ../mail/mail.error.xml.h:173
+msgid "Message from &quot;{0}&quot; account:"
+msgstr "Порука са „{0}“ налога:"
+
+#: ../mail/mail-send-recv.c:188
 msgid "Canceling..."
 msgstr "Отказујем..."
 
-#: ../mail/mail-send-recv.c:546
+#: ../mail/mail-send-recv.c:526
 msgid "Send & Receive Mail"
 msgstr "Слање и примање поште"
 
-#: ../mail/mail-send-recv.c:562
+#: ../mail/mail-send-recv.c:542
 msgid "Cancel _All"
 msgstr "Откажи _све"
 
-#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:1047
+#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:1024
 msgid "Updating..."
 msgstr "Освежавам..."
 
-#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:736
+#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:714
 msgid "Waiting..."
 msgstr "Чекам..."
 
-#: ../mail/mail-send-recv.c:1020
+#: ../mail/mail-send-recv.c:997
 #, c-format
 msgid "Checking for new mail at '%s'"
 msgstr "Вршим проверу за новом поштом на „%s“"
 
-#: ../mail/mail-vfolder-ui.c:78
+#: ../mail/mail-vfolder-ui.c:66
 msgid "Search Folders"
 msgstr "Фасцикле претраге"
 
-#: ../mail/mail-vfolder-ui.c:158
+#: ../mail/mail-vfolder-ui.c:146
 msgid "Edit Search Folder"
 msgstr "Уреди фасциклу претраге"
 
-#: ../mail/mail-vfolder-ui.c:279
+#: ../mail/mail-vfolder-ui.c:267
 msgid "New Search Folder"
 msgstr "Нова фасцикла претраге"
 
-#: ../mail/message-list.c:298
+#: ../mail/message-list.c:287
 msgid "Unseen"
 msgstr "Невиђено"
 
-#: ../mail/message-list.c:299
+#: ../mail/message-list.c:288
 msgid "Seen"
 msgstr "Виђено"
 
-#: ../mail/message-list.c:300
+#: ../mail/message-list.c:289
 msgid "Answered"
 msgstr "Одговорено"
 
-#: ../mail/message-list.c:301
+#: ../mail/message-list.c:290
 msgid "Forwarded"
 msgstr "Прослеђено"
 
-#: ../mail/message-list.c:302
+#: ../mail/message-list.c:291
 msgid "Multiple Unseen Messages"
 msgstr "Вишеструке невиђене поруке"
 
-#: ../mail/message-list.c:303
+#: ../mail/message-list.c:292
 msgid "Multiple Messages"
 msgstr "Вишеструке поруке"
 
-#: ../mail/message-list.c:316
+#: ../mail/message-list.c:305
 msgid "Lowest"
 msgstr "Најниже"
 
-#: ../mail/message-list.c:317
+#: ../mail/message-list.c:306
 msgid "Lower"
 msgstr "Ниже"
 
-#: ../mail/message-list.c:321
+#: ../mail/message-list.c:310
 msgid "Higher"
 msgstr "Више"
 
-#: ../mail/message-list.c:322
+#: ../mail/message-list.c:311
 msgid "Highest"
 msgstr "Највише"
 
-#: ../mail/message-list.c:466 ../mail/message-list.c:5719
+#: ../mail/message-list.c:455 ../mail/message-list.c:5749
 msgid "Generating message list"
 msgstr "Прављење листе порука"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1858 ../modules/itip-formatter/itip-view.c:244
+#: ../mail/message-list.c:1860 ../modules/itip-formatter/itip-view.c:237
 msgid "Today %l:%M %p"
 msgstr "Данас у %l:%M %p"
 
-#: ../mail/message-list.c:1867
+#: ../mail/message-list.c:1869
 msgid "Yesterday %l:%M %p"
 msgstr "Јуче у %l:%M %p"
 
-#: ../mail/message-list.c:1879
+#: ../mail/message-list.c:1881
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1887
+#: ../mail/message-list.c:1889
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1889
+#: ../mail/message-list.c:1891
 msgid "%b %d %Y"
 msgstr "%d. %b %Y."
 
-#: ../mail/message-list.c:2767
+#: ../mail/message-list.c:2771
 msgid "Select all visible messages"
 msgstr "Изабери све видљиве поруке"
 
-#: ../mail/message-list.c:3395 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3399 ../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:4764
+#: ../mail/message-list.c:4706
 msgid "Follow-up"
 msgstr "Следи"
 
-#: ../mail/message-list.c:5657
+#: ../mail/message-list.c:5687
 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 "
@@ -15467,7 +15973,7 @@ msgstr ""
 "покрените нову претрагу било чишћењем исте помоћу ставке изборника „Претрага—"
 ">Очисти“ или изменивши горњи упит."
 
-#: ../mail/message-list.c:5665
+#: ../mail/message-list.c:5695
 msgid "There are no messages in this folder."
 msgstr "Нема порука у овој фасцикли."
 
@@ -15504,394 +16010,374 @@ msgid "Subject or Addresses contains"
 msgstr "Наслов или адресе садрже"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:2012
+#: ../modules/mail/e-mail-shell-view-actions.c:2002
 msgid "Recipients contain"
 msgstr "Примаоци садрже"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:2005
+#: ../modules/mail/e-mail-shell-view-actions.c:1995
 msgid "Message contains"
 msgstr "Порука садржи"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:2026
+#: ../modules/mail/e-mail-shell-view-actions.c:2016
 msgid "Subject contains"
 msgstr "Наслов садржи"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:2019
+#: ../modules/mail/e-mail-shell-view-actions.c:2009
 msgid "Sender contains"
 msgstr "Пошиљалац садржи"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1998
+#: ../modules/mail/e-mail-shell-view-actions.c:1988
 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:123
-#: ../modules/mail/em-mailer-prefs.c:1213
+#: ../modules/addressbook/autocompletion-config.c:122
+#: ../modules/mail/em-mailer-prefs.c:1212
 msgid "_Table column:"
 msgstr "Колона _табеле:"
 
-#: ../modules/addressbook/autocompletion-config.c:126
+#: ../modules/addressbook/autocompletion-config.c:125
 msgid "Address formatting"
 msgstr "Обликовање адресе"
 
-#: ../modules/addressbook/autocompletion-config.c:129
+#: ../modules/addressbook/autocompletion-config.c:128
 msgid "_Format address according to standard of its destination country"
 msgstr "_Обликуј адресу према стандарду државе њеног одредишта"
 
-#: ../modules/addressbook/autocompletion-config.c:137
+#: ../modules/addressbook/autocompletion-config.c:136
 msgid "Autocompletion"
 msgstr "Самодовршавање"
 
-#: ../modules/addressbook/autocompletion-config.c:140
+#: ../modules/addressbook/autocompletion-config.c:139
 msgid "Always _show address of the autocompleted contact"
 msgstr "Увек _приказуј адресу самодопуњеног контакта"
 
-#: ../modules/addressbook/eab-composer-util.c:148
+#: ../modules/addressbook/eab-composer-util.c:147
 msgid "Multiple vCards"
 msgstr "Вишеструке вКарте"
 
-#: ../modules/addressbook/eab-composer-util.c:156
+#: ../modules/addressbook/eab-composer-util.c:155
 #, c-format
 msgid "vCard for %s"
 msgstr "вКарта за %s"
 
-#: ../modules/addressbook/eab-composer-util.c:168
-#: ../modules/addressbook/eab-composer-util.c:195
+#: ../modules/addressbook/eab-composer-util.c:167
+#: ../modules/addressbook/eab-composer-util.c:194
 #, c-format
 msgid "Contact information"
 msgstr "Подаци за ступање у везу"
 
-#: ../modules/addressbook/eab-composer-util.c:197
+#: ../modules/addressbook/eab-composer-util.c:196
 #, c-format
 msgid "Contact information for %s"
 msgstr "Подаци о контакту за %s"
 
-#: ../modules/addressbook/e-book-shell-backend.c:259
-#: ../modules/addressbook/e-book-shell-view-actions.c:125
+#: ../modules/addressbook/e-book-shell-backend.c:258
+#: ../modules/addressbook/e-book-shell-view-actions.c:124
 msgid "New Address Book"
 msgstr "Нови адресар"
 
-#: ../modules/addressbook/e-book-shell-backend.c:268
+#: ../modules/addressbook/e-book-shell-backend.c:267
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Контакт"
 
-#: ../modules/addressbook/e-book-shell-backend.c:270
-#: ../modules/addressbook/e-book-shell-view-actions.c:979
+#: ../modules/addressbook/e-book-shell-backend.c:269
+#: ../modules/addressbook/e-book-shell-view-actions.c:978
 msgid "Create a new contact"
 msgstr "Направите нови контакт"
 
-#: ../modules/addressbook/e-book-shell-backend.c:275
+#: ../modules/addressbook/e-book-shell-backend.c:274
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Ли_ста контакта"
 
-#: ../modules/addressbook/e-book-shell-backend.c:277
-#: ../modules/addressbook/e-book-shell-view-actions.c:986
+#: ../modules/addressbook/e-book-shell-backend.c:276
+#: ../modules/addressbook/e-book-shell-view-actions.c:985
 msgid "Create a new contact list"
 msgstr "Направите нови списак контакта"
 
-#: ../modules/addressbook/e-book-shell-backend.c:285
+#: ../modules/addressbook/e-book-shell-backend.c:284
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Адресар"
 
-#: ../modules/addressbook/e-book-shell-backend.c:287
-#: ../modules/addressbook/e-book-shell-view-actions.c:902
+#: ../modules/addressbook/e-book-shell-backend.c:286
+#: ../modules/addressbook/e-book-shell-view-actions.c:901
 msgid "Create a new address book"
 msgstr "Направите нови адресар"
 
-#: ../modules/addressbook/e-book-shell-backend.c:315
+#: ../modules/addressbook/e-book-shell-backend.c:314
 msgid "Certificates"
 msgstr "Уверења"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:198
+#: ../modules/addressbook/e-book-shell-view-actions.c:197
 msgid "Address Book Properties"
 msgstr "Поставке адресара"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:476
-#: ../modules/addressbook/e-book-shell-view-actions.c:772
+#: ../modules/addressbook/e-book-shell-view-actions.c:475
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "Save as vCard"
 msgstr "Сачувајте као вКарту"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:879
+#: ../modules/addressbook/e-book-shell-view-actions.c:878
 msgid "Co_py All Contacts To..."
 msgstr "Умножи _све контакте у..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:881
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Умножите контакте изабраног адресара у други"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:886
+#: ../modules/addressbook/e-book-shell-view-actions.c:885
 msgid "D_elete Address Book"
 msgstr "О_бриши адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:888
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
 msgid "Delete the selected address book"
 msgstr "Обришите изабрани адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:893
+#: ../modules/addressbook/e-book-shell-view-actions.c:892
 msgid "Mo_ve All Contacts To..."
 msgstr "Премести _све контакте у..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:895
+#: ../modules/addressbook/e-book-shell-view-actions.c:894
 msgid "Move the contacts of the selected address book to another"
 msgstr "Преместите контакте изабраног адресара у други"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:900
+#: ../modules/addressbook/e-book-shell-view-actions.c:899
 msgid "_New Address Book"
 msgstr "_Нови адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:907
+#: ../modules/addressbook/e-book-shell-view-actions.c:906
 msgid "Address _Book Properties"
 msgstr "Подешавања адреса_ра"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:909
+#: ../modules/addressbook/e-book-shell-view-actions.c:908
 msgid "Show properties of the selected address book"
 msgstr "Прикажите својства изабраног адресара"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:914
-#: ../modules/calendar/e-cal-shell-view-actions.c:1414
-#: ../modules/calendar/e-memo-shell-view-actions.c:636
-#: ../modules/calendar/e-task-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:913
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
+#: ../modules/calendar/e-task-shell-view-actions.c:759
 msgid "Re_fresh"
 msgstr "О_свежи"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:916
+#: ../modules/addressbook/e-book-shell-view-actions.c:915
 msgid "Refresh the selected address book"
 msgstr "Освежите изабрани адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:921
+#: ../modules/addressbook/e-book-shell-view-actions.c:920
 msgid "Address Book _Map"
 msgstr "_Мапа адресара"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:923
+#: ../modules/addressbook/e-book-shell-view-actions.c:922
 msgid "Show map with all contacts from selected address book"
 msgstr "Прикажите мапу са свим контактима из изабраних адресара"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:928
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
-#: ../modules/calendar/e-task-shell-view-actions.c:767
-#: ../modules/mail/e-mail-shell-view-actions.c:1620
+#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/calendar/e-cal-shell-view-actions.c:1420
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
+#: ../modules/calendar/e-task-shell-view-actions.c:766
+#: ../modules/mail/e-mail-shell-view-actions.c:1610
 msgid "_Rename..."
 msgstr "_Преименуј..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:930
+#: ../modules/addressbook/e-book-shell-view-actions.c:929
 msgid "Rename the selected address book"
 msgstr "Преименујте изабрани адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:937
+#: ../modules/addressbook/e-book-shell-view-actions.c:936
 msgid "Stop loading"
 msgstr "Прекини учитавање"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:942
+#: ../modules/addressbook/e-book-shell-view-actions.c:941
 msgid "_Copy Contact To..."
 msgstr "_Умножи контакт у..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:944
+#: ../modules/addressbook/e-book-shell-view-actions.c:943
 msgid "Copy selected contacts to another address book"
 msgstr "Умножите изабране контакте у други адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:949
+#: ../modules/addressbook/e-book-shell-view-actions.c:948
 msgid "_Delete Contact"
 msgstr "_Уклони Контакт"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
+#: ../modules/addressbook/e-book-shell-view-actions.c:955
 msgid "_Find in Contact..."
 msgstr "_Пронађи у контакту..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:957
 msgid "Search for text in the displayed contact"
 msgstr "Претражите текст у приказаном контакту"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:963
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
 msgid "_Forward Contact..."
 msgstr "_Проследи контакт..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:965
+#: ../modules/addressbook/e-book-shell-view-actions.c:964
 msgid "Send selected contacts to another person"
 msgstr "Пошаљите изабране контакте другој особи"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:970
+#: ../modules/addressbook/e-book-shell-view-actions.c:969
 msgid "_Move Contact To..."
 msgstr "_Премести контакт у..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:972
+#: ../modules/addressbook/e-book-shell-view-actions.c:971
 msgid "Move selected contacts to another address book"
 msgstr "Преместите изабране контакте у други адресар"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:977
+#: ../modules/addressbook/e-book-shell-view-actions.c:976
 msgid "_New Contact..."
 msgstr "Нови кон_такт..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:984
+#: ../modules/addressbook/e-book-shell-view-actions.c:983
 msgid "New Contact _List..."
 msgstr "Нова _листа контакта..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:991
+#: ../modules/addressbook/e-book-shell-view-actions.c:990
 msgid "_Open Contact"
 msgstr "_Отвори контакт"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:993
+#: ../modules/addressbook/e-book-shell-view-actions.c:992
 msgid "View the current contact"
 msgstr "Прегледајте текући контакт"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:998
+#: ../modules/addressbook/e-book-shell-view-actions.c:997
 msgid "_Send Message to Contact..."
 msgstr "_Пошаљи поруку контакту..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1000
+#: ../modules/addressbook/e-book-shell-view-actions.c:999
 msgid "Send a message to the selected contacts"
 msgstr "Пошаљите поруку изабраним контактима"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1007
-#: ../modules/calendar/e-cal-shell-view-actions.c:1577
-#: ../modules/calendar/e-task-shell-view-actions.c:825
+#: ../modules/addressbook/e-book-shell-view-actions.c:1006
+#: ../modules/calendar/e-cal-shell-view-actions.c:1576
+#: ../modules/calendar/e-task-shell-view-actions.c:824
 msgid "_Actions"
 msgstr "_Радње"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1014
-#: ../modules/calendar/e-memo-shell-view-actions.c:680
-#: ../modules/calendar/e-task-shell-view-actions.c:832
-#: ../modules/mail/e-mail-shell-view-actions.c:1785
+#: ../modules/addressbook/e-book-shell-view-actions.c:1013
+#: ../modules/calendar/e-memo-shell-view-actions.c:679
+#: ../modules/calendar/e-task-shell-view-actions.c:831
+#: ../modules/mail/e-mail-shell-view-actions.c:1775
 msgid "_Preview"
 msgstr "_Преглед"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1023
-#: ../modules/calendar/e-cal-shell-view-actions.c:1594
-#: ../modules/calendar/e-memo-shell-view-actions.c:693
-#: ../modules/calendar/e-task-shell-view-actions.c:845
-msgid "_Delete"
-msgstr "_Обриши"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:1027
-#: ../modules/mail/e-mail-shell-view-actions.c:1536
-msgid "_Properties"
-msgstr "_Својства"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../modules/addressbook/e-book-shell-view-actions.c:1034
 msgid "Address Book Map"
 msgstr "Мапа адресара"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1067
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
 msgid "Contact _Preview"
 msgstr "Пре_глед контакта"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1069
+#: ../modules/addressbook/e-book-shell-view-actions.c:1068
 msgid "Show contact preview window"
 msgstr "Прикажите прозор за преглед контакта"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1075
+#: ../modules/addressbook/e-book-shell-view-actions.c:1074
 msgid "Show _Maps"
 msgstr "Прикажи _мапе"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1077
+#: ../modules/addressbook/e-book-shell-view-actions.c:1076
 msgid "Show maps in contact preview window"
 msgstr "Прикажите мапе у прозору за преглед контаката"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1096
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
-#: ../modules/calendar/e-task-shell-view-actions.c:914
-#: ../modules/mail/e-mail-shell-view-actions.c:1915
+#: ../modules/addressbook/e-book-shell-view-actions.c:1095
+#: ../modules/calendar/e-memo-shell-view-actions.c:749
+#: ../modules/calendar/e-task-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:1905
 msgid "_Classic View"
 msgstr "_Класични приказ"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1098
+#: ../modules/addressbook/e-book-shell-view-actions.c:1097
 msgid "Show contact preview below the contact list"
 msgstr "Прикажите преглед контакта испод контакт листе"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1103
-#: ../modules/calendar/e-memo-shell-view-actions.c:757
-#: ../modules/calendar/e-task-shell-view-actions.c:921
-#: ../modules/mail/e-mail-shell-view-actions.c:1922
+#: ../modules/addressbook/e-book-shell-view-actions.c:1102
+#: ../modules/calendar/e-memo-shell-view-actions.c:756
+#: ../modules/calendar/e-task-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:1912
 msgid "_Vertical View"
 msgstr "_Усправни преглед"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1105
+#: ../modules/addressbook/e-book-shell-view-actions.c:1104
 msgid "Show contact preview alongside the contact list"
 msgstr "Прикажите преглед контакта поред контакт листе"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1120
-#: ../modules/calendar/e-cal-shell-view-actions.c:1754
-#: ../modules/calendar/e-memo-shell-view-actions.c:774
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/addressbook/e-book-shell-view-actions.c:1119
+#: ../modules/calendar/e-cal-shell-view-actions.c:1753
+#: ../modules/calendar/e-memo-shell-view-actions.c:773
+#: ../modules/calendar/e-task-shell-view-actions.c:972
 msgid "Unmatched"
 msgstr "Не одговара"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1130
-#: ../modules/calendar/e-cal-shell-view-actions.c:1764
-#: ../modules/calendar/e-memo-shell-view-actions.c:784
-#: ../modules/calendar/e-task-shell-view-actions.c:983
-#: ../modules/mail/e-mail-shell-view-actions.c:1991
-#: ../shell/e-shell-content.c:658
+#: ../modules/addressbook/e-book-shell-view-actions.c:1129
+#: ../modules/calendar/e-cal-shell-view-actions.c:1763
+#: ../modules/calendar/e-memo-shell-view-actions.c:783
+#: ../modules/calendar/e-task-shell-view-actions.c:982
+#: ../modules/mail/e-mail-shell-view-actions.c:1981
+#: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Напредна претрага"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1163
+#: ../modules/addressbook/e-book-shell-view-actions.c:1162
 msgid "Print all shown contacts"
 msgstr "Штампај све приказане контакте"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1170
+#: ../modules/addressbook/e-book-shell-view-actions.c:1169
 msgid "Preview the contacts to be printed"
 msgstr "Преглед контаката пред штампу"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1177
+#: ../modules/addressbook/e-book-shell-view-actions.c:1176
 msgid "Print selected contacts"
 msgstr "Штампа изабране контакте"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1192
+#: ../modules/addressbook/e-book-shell-view-actions.c:1191
 msgid "S_ave Address Book as vCard"
 msgstr "_Сачувај адресар као вКарту"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1194
+#: ../modules/addressbook/e-book-shell-view-actions.c:1193
 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:1200
-#: ../modules/addressbook/e-book-shell-view-actions.c:1210
+#: ../modules/addressbook/e-book-shell-view-actions.c:1199
+#: ../modules/addressbook/e-book-shell-view-actions.c:1209
 msgid "_Save as vCard..."
 msgstr "_Сачувај као вКарту..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1202
+#: ../modules/addressbook/e-book-shell-view-actions.c:1201
 msgid "Save selected contacts as a vCard"
 msgstr "Сачувај изабране контакте као ВКарту"
 
-#: ../modules/addressbook/e-book-shell-view.c:312
+#: ../modules/addressbook/e-book-shell-view.c:311
 msgid "_Forward Contacts"
 msgstr "Проследи конт_акте"
 
-#: ../modules/addressbook/e-book-shell-view.c:314
+#: ../modules/addressbook/e-book-shell-view.c:313
 msgid "_Forward Contact"
 msgstr "Просле_ди контакт"
 
-#: ../modules/addressbook/e-book-shell-view.c:345
+#: ../modules/addressbook/e-book-shell-view.c:344
 msgid "_Send Message to Contacts"
 msgstr "_Пошаљи поруку контактима"
 
-#: ../modules/addressbook/e-book-shell-view.c:347
+#: ../modules/addressbook/e-book-shell-view.c:346
 msgid "_Send Message to List"
 msgstr "_Пошаљи поруку на листу"
 
-#: ../modules/addressbook/e-book-shell-view.c:349
+#: ../modules/addressbook/e-book-shell-view.c:348
 msgid "_Send Message to Contact"
 msgstr "_Пошаљи поруку контакту"
 
-#: ../modules/audio-inline/e-mail-formatter-audio.c:316
-msgid "Audio Player"
-msgstr "Звучни уређај"
-
-#: ../modules/audio-inline/e-mail-formatter-audio.c:317
-msgid "Play the attachment in embedded audio player"
-msgstr "Пусти прилог у уграђеном програму"
-
-#: ../modules/backup-restore/e-mail-config-restore-page.c:165
+#: ../modules/backup-restore/e-mail-config-restore-page.c:164
 msgid ""
 "You can restore Evolution from a backup file.\n"
 "\n"
@@ -15901,134 +16387,134 @@ msgstr ""
 "\n"
 "То ће повратити све ваше личне податке, подешавања пропусника поште, итд."
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:180
+#: ../modules/backup-restore/e-mail-config-restore-page.c:179
 msgid "_Restore from a backup file:"
 msgstr "_Врати из датотеке резерве:"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:191
+#: ../modules/backup-restore/e-mail-config-restore-page.c:190
 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:311
-#: ../modules/backup-restore/e-mail-config-restore-ready-page.c:57
+#: ../modules/backup-restore/e-mail-config-restore-page.c:310
+#: ../modules/backup-restore/e-mail-config-restore-ready-page.c:56
 msgid "Restore from Backup"
 msgstr "Врати из резерве"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:217
+#: ../modules/backup-restore/evolution-backup-restore.c:216
 msgid "Select name of the Evolution backup file"
 msgstr "Изаберите назив за датотеку резерве Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:250
+#: ../modules/backup-restore/evolution-backup-restore.c:249
 msgid "_Restart Evolution after backup"
 msgstr "_Поново покрени Еволуцију након прављења резерве"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:277
+#: ../modules/backup-restore/evolution-backup-restore.c:276
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Изаберите назив датотеке резерве Еволуције за повраћај"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:290
+#: ../modules/backup-restore/evolution-backup-restore.c:289
 msgid "_Restart Evolution after restore"
 msgstr "_Поново покрени Еволуцију након повраћаја"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:308
+#: ../modules/backup-restore/evolution-backup-restore.c:307
 msgid "_Back up Evolution Data..."
 msgstr "Направи _резерву података Еволуције..."
 
-#: ../modules/backup-restore/evolution-backup-restore.c:310
+#: ../modules/backup-restore/evolution-backup-restore.c:309
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "Направите резерву података и поставки Еволуције у архиву"
 
 # shell:noshell-reason title
-#: ../modules/backup-restore/evolution-backup-restore.c:315
+#: ../modules/backup-restore/evolution-backup-restore.c:314
 msgid "R_estore Evolution Data..."
 msgstr "_Врати податке Еволуције..."
 
-#: ../modules/backup-restore/evolution-backup-restore.c:317
+#: ../modules/backup-restore/evolution-backup-restore.c:316
 msgid "Restore Evolution data and settings from an archive file"
 msgstr "Вратите податке и поставке Еволуције из архиве"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:84
+#: ../modules/backup-restore/evolution-backup-tool.c:83
 msgid "Back up Evolution directory"
 msgstr "Директоријум за резерву Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:86
+#: ../modules/backup-restore/evolution-backup-tool.c:85
 msgid "Restore Evolution directory"
 msgstr "Директоријум за повраћај Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:88
+#: ../modules/backup-restore/evolution-backup-tool.c:87
 msgid "Check Evolution Back up"
 msgstr "Провери резерву Еволуције"
 
 # shell:noshell-reason title
-#: ../modules/backup-restore/evolution-backup-tool.c:90
+#: ../modules/backup-restore/evolution-backup-tool.c:89
 msgid "Restart Evolution"
 msgstr "Поново покреће Еволуцију"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:92
+#: ../modules/backup-restore/evolution-backup-tool.c:91
 msgid "With Graphical User Interface"
 msgstr "Са графичким окружењем"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:322
-#: ../modules/backup-restore/evolution-backup-tool.c:516
+#: ../modules/backup-restore/evolution-backup-tool.c:321
+#: ../modules/backup-restore/evolution-backup-tool.c:515
 msgid "Shutting down Evolution"
 msgstr "Гашење Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:331
+#: ../modules/backup-restore/evolution-backup-tool.c:330
 msgid "Backing Evolution accounts and settings"
 msgstr "Израдите резервну копију налога и поставке Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:348
+#: ../modules/backup-restore/evolution-backup-tool.c:347
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Израда резервне копије података Еволуције (пошта, календари, задаци, белешке)"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:364
+#: ../modules/backup-restore/evolution-backup-tool.c:363
 msgid "Back up complete"
 msgstr "Израда резервне копије је завршена"
 
 # shell:noshell-reason title
-#: ../modules/backup-restore/evolution-backup-tool.c:371
-#: ../modules/backup-restore/evolution-backup-tool.c:703
+#: ../modules/backup-restore/evolution-backup-tool.c:370
+#: ../modules/backup-restore/evolution-backup-tool.c:702
 msgid "Restarting Evolution"
 msgstr "Поновно покретање Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:522
+#: ../modules/backup-restore/evolution-backup-tool.c:521
 msgid "Back up current Evolution data"
 msgstr "Направите резерву тренутних података Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:529
+#: ../modules/backup-restore/evolution-backup-tool.c:528
 msgid "Extracting files from back up"
 msgstr "Извлачим датотеке из резервне копије"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:611
+#: ../modules/backup-restore/evolution-backup-tool.c:610
 msgid "Loading Evolution settings"
 msgstr "Учитавам подешавања Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:677
+#: ../modules/backup-restore/evolution-backup-tool.c:676
 msgid "Removing temporary back up files"
 msgstr "Уклањање привремених резервних датотека"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:688
+#: ../modules/backup-restore/evolution-backup-tool.c:687
 msgid "Reloading registry service"
 msgstr "Поново учитавам услугу завођења"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:915
+#: ../modules/backup-restore/evolution-backup-tool.c:916
 msgid "Evolution Back Up"
 msgstr "Резервни примерак Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:916
+#: ../modules/backup-restore/evolution-backup-tool.c:917
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Смештам резервни примерак у фасциклу „%s“"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:920
+#: ../modules/backup-restore/evolution-backup-tool.c:921
 msgid "Evolution Restore"
 msgstr "Повраћај Еволуције"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:921
+#: ../modules/backup-restore/evolution-backup-tool.c:922
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Враћам из фасцикле „%s“"
@@ -16109,88 +16595,92 @@ msgstr "Недовољна овлашћења"
 msgid "The selected folder is not writable."
 msgstr "У изабрану фасциклу се не може писати."
 
-#: ../modules/bogofilter/evolution-bogofilter.c:145
+#: ../modules/bogofilter/evolution-bogofilter.c:144
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr "Нисам успео да изродим Богофилтер (%s): "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:163
+#: ../modules/bogofilter/evolution-bogofilter.c:162
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr "Нисам успео да упутим садржај поруке поште Богофилтеру: "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:212
+#: ../modules/bogofilter/evolution-bogofilter.c:211
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr "Или се Богофилтер урушио или није успео да анализира поруку поште"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:308
+#: ../modules/bogofilter/evolution-bogofilter.c:307
 msgid "Bogofilter Options"
 msgstr "Опције Богофилтера"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:317
+#: ../modules/bogofilter/evolution-bogofilter.c:316
 msgid "Convert message text to _Unicode"
 msgstr "Пребаци текст поруке у _Уникод"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:474
+#: ../modules/bogofilter/evolution-bogofilter.c:473
 msgid "Bogofilter"
 msgstr "Богофилтер"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:447
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
 msgid "Standard LDAP Port"
 msgstr "Стандардни ЛДАП порт"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:453
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:625
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
 msgid "LDAP over SSL (deprecated)"
 msgstr "ЛДАП или ССЛ (превазиђено)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:459
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
 msgid "Microsoft Global Catalog"
 msgstr "Мајкрософтов општи каталог"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:465
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:464
 msgid "Microsoft Global Catalog over SSL"
 msgstr "Мајкрософтов општи каталог преко ССЛ"
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:570
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:569
 msgid "Connecting to LDAP"
 msgstr "Повезујем се на ЛДАП"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:587
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:586
 msgid "Server Information"
 msgstr "Подаци сервера"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:628
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:613
+msgid "Port:"
+msgstr "Порт:"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:627
 msgid "StartTLS (recommended)"
 msgstr "ПочетниТЛС (препоручено)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:630
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:629
 msgid "Encryption:"
 msgstr "Шифровање:"
 
-#: ../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
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:653
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:179
 msgid "Authentication"
 msgstr "Потврђивање идентитета"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
 msgid "Anonymous"
 msgstr "Анонимно"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:680
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
 msgid "Using email address"
 msgstr "Користи адресу ел. поште"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:682
 msgid "Using distinguished name (DN)"
 msgstr "Користи посебан назив (DN)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:685
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid "Method:"
 msgstr "Начин:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:690
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:689
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Using email address\" requires anonymous access to your "
@@ -16201,36 +16691,36 @@ msgstr ""
 "приступ на ваш ЛДАП сервер."
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:705
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:704
 msgid "Using LDAP"
 msgstr "Користи ЛДАП"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:722
-#: ../modules/mail/e-mail-shell-view.c:117
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:721
+#: ../modules/mail/e-mail-shell-view.c:115
 msgid "Searching"
 msgstr "Претражујем"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:744
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:743
 msgid "Search Base:"
 msgstr "Основа претраге:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:749
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:747
 msgid "Find Possible Search Bases"
 msgstr "Нађи могуће базе за претрагу"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:774
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:769
 msgid "One Level"
 msgstr "Један ниво"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:776
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:771
 msgid "Subtree"
 msgstr "Подстабло"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
 msgid "Search Scope:"
 msgstr "Обим претраге:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:783
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
 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 "
@@ -16242,165 +16732,199 @@ msgstr ""
 "за претрагу.  Обим претраге „Један ниво“ ће укључити само уносе један ниво "
 "испод ваше базе претраге."
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:792
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:787
 msgid "Search Filter:"
 msgstr "Филтер претраге:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:804
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:799
 msgid "Downloading"
 msgstr "Преузимам"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:820
 msgid "Limit:"
 msgstr "Ограничење:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
 msgid "contacts"
 msgstr "контакти"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:841
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
 msgid "Browse until limit is reached"
 msgstr "Разгледај све док се не достигне ограничење"
 
-#: ../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
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:135
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:204
+#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
 msgid "URL:"
 msgstr "Адреса:"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:146
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:145
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Избегавај ако-поклапа (потребно на Апачу < 2.2.8)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:441
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "ХТТП грешка: %s"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:475
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:469
 msgid "Could not parse response"
 msgstr "Не могу да обрадим одговор"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:484
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:478
 msgid "Empty response"
 msgstr "Празан одговор"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:492
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:486
 msgid "Unexpected reply from server"
 msgstr "Неочекиван одговор са сервера"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1124
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1118
 msgid "Could not locate user's calendars"
 msgstr "Не могу да пронађем корисников календар."
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1348
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1342
 msgid "Path"
 msgstr "Путања"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:264
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:200
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:263
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:199
 msgid "Choose a Calendar"
 msgstr "Изаберите календар"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:267
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:266
 msgid "Choose a Memo List"
 msgstr "Изаберите списак белешки"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:270
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:269
 msgid "Choose a Task List"
 msgstr "Изаберите списак садатака"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:219
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:218
 msgid "Find Calendars"
 msgstr "Пронађите календаре"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:222
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:221
 msgid "Find Memo Lists"
 msgstr "Пронађите спискове белешки"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:225
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:224
 msgid "Find Task Lists"
 msgstr "Пронађите спискове задатака"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:243
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:242
 msgid "Email:"
 msgstr "Ел. пошта:"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:248
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:247
 msgid "Server handles meeting invitations"
 msgstr "Сервер управља позивима на састанак"
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:71
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:70
 msgid "Choose which address books to use."
 msgstr "Изаберите адресаре који ћете користити."
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:201
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:200
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "Користи у календару за рођендане и годишњице"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:127
+#: ../modules/cal-config-google/e-google-chooser-button.c:126
 msgid "Default User Calendar"
 msgstr "Основни кориснички календар"
 
-#: ../modules/cal-config-google/e-google-chooser.c:515
+#: ../modules/cal-config-google/e-google-chooser.c:514
 #, c-format
 msgid "Enter Google password for user '%s'."
 msgstr "Унесите Гуглову лозинку за „%s“."
 
-#: ../modules/cal-config-google/e-google-chooser.c:532
+#: ../modules/cal-config-google/e-google-chooser.c:531
 msgid "User declined to provide a password"
 msgstr "Корисник је одбио да достави лозинку"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:160
+#: ../modules/cal-config-local/evolution-cal-config-local.c:159
 msgid "Use an existing iCalendar (ics) file"
 msgstr "Користите постојећу датотеку иКалендара (ics)"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:185
+#: ../modules/cal-config-local/evolution-cal-config-local.c:184
 msgid "iCalendar File"
 msgstr "Датотека иКалендара"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:197
+#: ../modules/cal-config-local/evolution-cal-config-local.c:196
 msgid "Choose an iCalendar file"
 msgstr "Изаберите датотеку иКалендара"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:200
+#: ../modules/cal-config-local/evolution-cal-config-local.c:199
 msgid "File:"
 msgstr "Датотека:"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:215
+#: ../modules/cal-config-local/evolution-cal-config-local.c:214
 msgid "Allow Evolution to update the file"
 msgstr "Допушта Еволуцији да освежи датотеку"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:320
+#. Translators: Please indicate whether your locale uses the
+#. * metric or imperial measurement system by changing this to
+#. * either "default:mm" or "default:inch", respectively.
+#. *
+#. * This string is just a fallback mechanism for systems on
+#. * which _NL_MEASUREMENT_MEASUREMENT is not available.
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:187
+#| msgid "Default"
+msgctxt "locale-metric"
+msgid "default:mm"
+msgstr "default:mm"
+
+#. Translators: This is the temperature in degrees
+#. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:259
+msgid "Fahrenheit (°F)"
+msgstr "Фаренхајт (°F)"
+
+#. Translators: This is the temperature in degrees
+#. * Celsius. (\302\260 is U+00B0 DEGREE SIGN)
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:264
+msgid "Centigrade (°C)"
+msgstr "Целзијус (°C)"
+
+#. Translators: This is the temperature in kelvin.
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:268
+msgid "Kelvin (K)"
+msgstr "Келвин (K)"
+
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:270
+#| msgid "Unit"
+msgid "Units:"
+msgstr "Јединице:"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:319
 #: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
 msgstr "У_вези"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:406
+#: ../modules/calendar/e-cal-attachment-handler.c:405
 msgid "Select a Calendar"
 msgstr "Изаберите календар"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:433
+#: ../modules/calendar/e-cal-attachment-handler.c:432
 msgid "Select a Task List"
 msgstr "Изаберите списак задатака"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:443
+#: ../modules/calendar/e-cal-attachment-handler.c:442
 msgid "I_mport to Calendar"
 msgstr "У_вези у календар"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:450
+#: ../modules/calendar/e-cal-attachment-handler.c:449
 msgid "I_mport to Tasks"
 msgstr "У_вези у задатке"
 
-#: ../modules/calendar/e-calendar-preferences.c:517
+#: ../modules/calendar/e-calendar-preferences.c:516
 msgid "Selected Calendars for Alarms"
 msgstr "Изабрани календари за аларме"
 
-#: ../modules/calendar/e-calendar-preferences.c:925
+#: ../modules/calendar/e-calendar-preferences.c:924
 msgid "Ti_me and date:"
 msgstr "_Време и датум:"
 
-#: ../modules/calendar/e-calendar-preferences.c:926
+#: ../modules/calendar/e-calendar-preferences.c:925
 msgid "_Date only:"
 msgstr "Само _датум:"
 
@@ -16461,7 +16985,7 @@ msgid "_24 hour"
 msgstr "_24 - часовни"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
-#: ../modules/calendar/e-cal-shell-view-actions.c:1716
+#: ../modules/calendar/e-cal-shell-view-actions.c:1715
 msgid "Work Week"
 msgstr "Радна недеља"
 
@@ -16615,72 +17139,72 @@ msgstr "%u и %d ће бити замењени корисником и доме
 msgid "Publishing Information"
 msgstr "Подаци о објављивању"
 
-#: ../modules/calendar/e-cal-shell-backend.c:313
-#: ../modules/calendar/e-cal-shell-view-actions.c:191
+#: ../modules/calendar/e-cal-shell-backend.c:312
+#: ../modules/calendar/e-cal-shell-view-actions.c:190
 msgid "New Calendar"
 msgstr "Нови календар"
 
-#: ../modules/calendar/e-cal-shell-backend.c:322
+#: ../modules/calendar/e-cal-shell-backend.c:321
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Заказивање"
 
-#: ../modules/calendar/e-cal-shell-backend.c:324
-#: ../modules/calendar/e-cal-shell-view-actions.c:1521
+#: ../modules/calendar/e-cal-shell-backend.c:323
+#: ../modules/calendar/e-cal-shell-view-actions.c:1520
 msgid "Create a new appointment"
 msgstr "Прави ново заказивање"
 
-#: ../modules/calendar/e-cal-shell-backend.c:329
+#: ../modules/calendar/e-cal-shell-backend.c:328
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Целодневно за_казивање"
 
-#: ../modules/calendar/e-cal-shell-backend.c:331
+#: ../modules/calendar/e-cal-shell-backend.c:330
 msgid "Create a new all-day appointment"
 msgstr "Прави ново целодневно заказивање"
 
-#: ../modules/calendar/e-cal-shell-backend.c:336
+#: ../modules/calendar/e-cal-shell-backend.c:335
 msgctxt "New"
 msgid "M_eeting"
 msgstr "С_астанак"
 
-#: ../modules/calendar/e-cal-shell-backend.c:338
+#: ../modules/calendar/e-cal-shell-backend.c:337
 msgid "Create a new meeting request"
 msgstr "Прави нови захтев за састанком"
 
-#: ../modules/calendar/e-cal-shell-backend.c:346
+#: ../modules/calendar/e-cal-shell-backend.c:345
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Кале_ндар"
 
-#: ../modules/calendar/e-cal-shell-backend.c:348
-#: ../modules/calendar/e-cal-shell-view-actions.c:1395
+#: ../modules/calendar/e-cal-shell-backend.c:347
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "Create a new calendar"
 msgstr "Прави нови календар"
 
-#: ../modules/calendar/e-cal-shell-backend.c:703
+#: ../modules/calendar/e-cal-shell-backend.c:702
 msgid "Calendar and Tasks"
 msgstr "Календар и задаци"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:119
+#: ../modules/calendar/e-cal-shell-sidebar.c:118
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr "Отварам календар „%s“"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:591
+#: ../modules/calendar/e-cal-shell-sidebar.c:589
 msgid "Calendar Selector"
 msgstr "Изборник календара"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:216
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
+#: ../modules/calendar/e-cal-shell-view-actions.c:215
+#: ../modules/calendar/e-cal-shell-view-actions.c:244
 msgid "Print"
 msgstr "Штампај"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:291
+#: ../modules/calendar/e-cal-shell-view-actions.c:290
 msgid "Calendar Properties"
 msgstr "Особине календара"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:322
+#: ../modules/calendar/e-cal-shell-view-actions.c:321
 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 "
@@ -16691,343 +17215,359 @@ 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:339
+#: ../modules/calendar/e-cal-shell-view-actions.c:338
 msgid "Purge events older than"
 msgstr "Избаци догађаје старије од"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:585
+#: ../modules/calendar/e-cal-shell-view-actions.c:584
 msgid "Copying Items"
 msgstr "Умножавање ставки"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:878
+#: ../modules/calendar/e-cal-shell-view-actions.c:877
 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:1211
+#: ../modules/calendar/e-cal-shell-view-actions.c:1210
 msgid "event"
 msgstr "догађај"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1213
-#: ../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:527
-#: ../modules/calendar/e-task-shell-view-actions.c:644
+#: ../modules/calendar/e-cal-shell-view-actions.c:1212
+#: ../modules/calendar/e-cal-shell-view-memopad.c:230
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:297
+#: ../modules/calendar/e-memo-shell-view-actions.c:526
+#: ../modules/calendar/e-task-shell-view-actions.c:643
 msgid "Save as iCalendar"
 msgstr "Сачувај као иКалендар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
-#: ../modules/calendar/e-memo-shell-view-actions.c:608
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
+#: ../modules/calendar/e-memo-shell-view-actions.c:607
+#: ../modules/calendar/e-task-shell-view-actions.c:731
 msgid "_Copy..."
 msgstr "_Умножи..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "D_elete Calendar"
 msgstr "Об_риши календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1360
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
 msgid "Delete the selected calendar"
 msgstr "Обришите изабрани календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1367
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
 msgid "Go Back"
 msgstr "Иди назад"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1374
+#: ../modules/calendar/e-cal-shell-view-actions.c:1373
 msgid "Go Forward"
 msgstr "Иди напред"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1381
+#: ../modules/calendar/e-cal-shell-view-actions.c:1380
 msgid "Select today"
 msgstr "Изабери данашњи дан"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1386
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
 msgid "Select _Date"
 msgstr "Изабери _датум"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1388
+#: ../modules/calendar/e-cal-shell-view-actions.c:1387
 msgid "Select a specific date"
 msgstr "Изаберите одређени датум"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "_New Calendar"
 msgstr "Нови _календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1407
-#: ../modules/calendar/e-task-shell-view-actions.c:816
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
+#: ../modules/calendar/e-task-shell-view-actions.c:815
 msgid "Purg_e"
 msgstr "Изба_ци"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
 msgid "Purge old appointments and meetings"
 msgstr "Избаците стара заказивања и састанке"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1416
+#: ../modules/calendar/e-cal-shell-view-actions.c:1415
 msgid "Refresh the selected calendar"
 msgstr "Освежите изабрани календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1422
 msgid "Rename the selected calendar"
 msgstr "Преименујте изабрани календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
-msgid "Find _next"
-msgstr "Пронађи _следеће"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1427
+#| msgid "Find _next"
+msgid "Find _Next"
+msgstr "Нађи _следеће"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1430
+#: ../modules/calendar/e-cal-shell-view-actions.c:1429
 msgid "Find next occurrence of the current search string"
 msgstr "Пронађите следеће појављивање текуће ниске претраге"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1435
-msgid "Find _previous"
-msgstr "Пронађи _претходно"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#| msgid "Find _previous"
+msgid "Find _Previous"
+msgstr "Нађи _претходно"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1437
+#: ../modules/calendar/e-cal-shell-view-actions.c:1436
 msgid "Find previous occurrence of the current search string"
 msgstr "Пронађите претходно појављивање текуће ниске претраге"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1442
-msgid "Stop _running search"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
+#| msgid "Stop _running search"
+msgid "Stop _Running Search"
 msgstr "Заустави _текућу претрагу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1444
+#: ../modules/calendar/e-cal-shell-view-actions.c:1443
 msgid "Stop currently running search"
 msgstr "Зауставите тренутно покренуту претрагу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Show _Only This Calendar"
 msgstr "Прикажи _само овај календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+#: ../modules/calendar/e-cal-shell-view-actions.c:1455
 msgid "Cop_y to Calendar..."
 msgstr "_Умножи у календар..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1463
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
 msgid "_Delegate Meeting..."
 msgstr "_Делегирај састанак..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-actions.c:1469
 msgid "_Delete Appointment"
 msgstr "_Обриши заказано"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1472
+#: ../modules/calendar/e-cal-shell-view-actions.c:1471
 msgid "Delete selected appointments"
 msgstr "Обришите изабрана заказивања"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../modules/calendar/e-cal-shell-view-actions.c:1476
 msgid "Delete This _Occurrence"
 msgstr "Обриши ову _појаву"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../modules/calendar/e-cal-shell-view-actions.c:1478
 msgid "Delete this occurrence"
 msgstr "Обришите ову појаву"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+#: ../modules/calendar/e-cal-shell-view-actions.c:1483
 msgid "Delete All Occ_urrences"
 msgstr "Обриши све по_јаве"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../modules/calendar/e-cal-shell-view-actions.c:1485
 msgid "Delete all occurrences"
 msgstr "Обришите све појаве"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1491
+#: ../modules/calendar/e-cal-shell-view-actions.c:1490
 msgid "New All Day _Event..."
 msgstr "Нови целодневни _догађај..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1493
+#: ../modules/calendar/e-cal-shell-view-actions.c:1492
 msgid "Create a new all day event"
 msgstr "Направите нови целодневни догађај"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1498
-#: ../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:601
-#: ../modules/calendar/e-task-shell-view-actions.c:725
+#: ../modules/calendar/e-cal-shell-view-actions.c:1497
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
+#: ../modules/calendar/e-memo-shell-view-actions.c:600
+#: ../modules/calendar/e-task-shell-view-actions.c:724
 msgid "_Forward as iCalendar..."
 msgstr "_Проследи као иКалендар..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1505
+#: ../modules/calendar/e-cal-shell-view-actions.c:1504
 msgid "New _Meeting..."
 msgstr "Нови _састанак..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1507
+#: ../modules/calendar/e-cal-shell-view-actions.c:1506
 msgid "Create a new meeting"
 msgstr "Направите нови састанак"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1512
+#: ../modules/calendar/e-cal-shell-view-actions.c:1511
 msgid "Mo_ve to Calendar..."
 msgstr "Прен_еси у календар..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1519
+#: ../modules/calendar/e-cal-shell-view-actions.c:1518
 msgid "New _Appointment..."
 msgstr "Ново _заказивање..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1525
 msgid "Make this Occurrence _Movable"
 msgstr "Нека ова појава буде _покретна"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1533
+#: ../modules/calendar/e-cal-shell-view-actions.c:1532
 msgid "_Open Appointment"
 msgstr "_Отвори састанак"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1535
+#: ../modules/calendar/e-cal-shell-view-actions.c:1534
 msgid "View the current appointment"
 msgstr "Прегледајте текуће заказивање"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1540
+#: ../modules/calendar/e-cal-shell-view-actions.c:1539
 msgid "_Reply"
 msgstr "_Одговори"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1554
+#: ../modules/calendar/e-cal-shell-view-actions.c:1553
 msgid "_Schedule Meeting..."
 msgstr "_Закажи састанак..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+#: ../modules/calendar/e-cal-shell-view-actions.c:1555
 msgid "Converts an appointment to a meeting"
 msgstr "Претворите заказано у састанак"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1561
+#: ../modules/calendar/e-cal-shell-view-actions.c:1560
 msgid "Conv_ert to Appointment..."
 msgstr "Пре_твори у заказано..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1563
+#: ../modules/calendar/e-cal-shell-view-actions.c:1562
 msgid "Converts a meeting to an appointment"
 msgstr "Претворите састанак у заказано"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1568
+#: ../modules/calendar/e-cal-shell-view-actions.c:1567
 msgid "Quit"
 msgstr "Изађи"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1688
+#: ../modules/calendar/e-cal-shell-view-actions.c:1687
 msgid "Day"
 msgstr "Дан"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1690
+#: ../modules/calendar/e-cal-shell-view-actions.c:1689
 msgid "Show one day"
 msgstr "Прикажи један дан"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1695
+#: ../modules/calendar/e-cal-shell-view-actions.c:1694
 msgid "List"
 msgstr "Списак"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1697
+#: ../modules/calendar/e-cal-shell-view-actions.c:1696
 msgid "Show as list"
 msgstr "Прикажи као списак"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1702
+#: ../modules/calendar/e-cal-shell-view-actions.c:1701
 msgid "Month"
 msgstr "Месец"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1704
+#: ../modules/calendar/e-cal-shell-view-actions.c:1703
 msgid "Show one month"
 msgstr "Прикажи један месец"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1709
+#: ../modules/calendar/e-cal-shell-view-actions.c:1708
 msgid "Week"
 msgstr "Недеља"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1711
+#: ../modules/calendar/e-cal-shell-view-actions.c:1710
 msgid "Show one week"
 msgstr "Прикажи једну недељу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1718
+#: ../modules/calendar/e-cal-shell-view-actions.c:1717
 msgid "Show one work week"
 msgstr "Прикажи једну радну недељу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1726
+#: ../modules/calendar/e-cal-shell-view-actions.c:1725
 msgid "Active Appointments"
 msgstr "Активна заказивања"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1740
+#: ../modules/calendar/e-cal-shell-view-actions.c:1739
 msgid "Next 7 Days' Appointments"
 msgstr "Заказано за следећу недељу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1747
+#: ../modules/calendar/e-cal-shell-view-actions.c:1746
 msgid "Occurs Less Than 5 Times"
 msgstr "Дешава се мање од 5 пута"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1778
-#: ../modules/calendar/e-memo-shell-view-actions.c:798
-#: ../modules/calendar/e-task-shell-view-actions.c:997
+#: ../modules/calendar/e-cal-shell-view-actions.c:1777
+#: ../modules/calendar/e-memo-shell-view-actions.c:797
+#: ../modules/calendar/e-task-shell-view-actions.c:996
 msgid "Description contains"
 msgstr "Опис садржи"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1785
-#: ../modules/calendar/e-memo-shell-view-actions.c:805
-#: ../modules/calendar/e-task-shell-view-actions.c:1004
+#: ../modules/calendar/e-cal-shell-view-actions.c:1784
+#: ../modules/calendar/e-memo-shell-view-actions.c:804
+#: ../modules/calendar/e-task-shell-view-actions.c:1003
 msgid "Summary contains"
 msgstr "Сажетак садржи"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1797
+#: ../modules/calendar/e-cal-shell-view-actions.c:1794
+#: ../modules/calendar/e-cal-shell-view-actions.c:1808
+#: ../modules/calendar/e-cal-shell-view-memopad.c:295
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
+#: ../modules/calendar/e-memo-shell-view-actions.c:814
+#: ../modules/calendar/e-memo-shell-view-actions.c:828
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
+#: ../modules/calendar/e-task-shell-view-actions.c:1027
+#| msgid "_Print..."
+msgid "Print..."
+msgstr "Штампај..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1796
 msgid "Print this calendar"
 msgstr "Штампа овај календар"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1804
+#: ../modules/calendar/e-cal-shell-view-actions.c:1803
 msgid "Preview the calendar to be printed"
 msgstr "Преглед календара пред штампу"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1826
-#: ../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:846
-#: ../modules/calendar/e-task-shell-view-actions.c:1045
+#: ../modules/calendar/e-cal-shell-view-actions.c:1825
+#: ../modules/calendar/e-cal-shell-view-memopad.c:305
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:392
+#: ../modules/calendar/e-memo-shell-view-actions.c:845
+#: ../modules/calendar/e-task-shell-view-actions.c:1044
 msgid "_Save as iCalendar..."
 msgstr "_Сачувај као иКалендар..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1903
+#: ../modules/calendar/e-cal-shell-view-actions.c:1902
 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:525
+#: ../modules/calendar/e-cal-shell-view-memopad.c:228
+#: ../modules/calendar/e-memo-shell-view-actions.c:524
 msgid "memo"
 msgstr "белешка"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:272
-#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../modules/calendar/e-memo-shell-view-actions.c:656
 msgid "New _Memo"
 msgstr "Нова _белешка"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../modules/calendar/e-memo-shell-backend.c:219
-#: ../modules/calendar/e-memo-shell-view-actions.c:659
+#: ../modules/calendar/e-cal-shell-view-memopad.c:273
+#: ../modules/calendar/e-memo-shell-backend.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:658
 msgid "Create a new memo"
 msgstr "Направите једну нову белешку"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:279
-#: ../modules/calendar/e-memo-shell-view-actions.c:664
+#: ../modules/calendar/e-cal-shell-view-memopad.c:278
+#: ../modules/calendar/e-memo-shell-view-actions.c:663
 msgid "_Open Memo"
 msgstr "_Отвори белешку"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:281
-#: ../modules/calendar/e-memo-shell-view-actions.c:666
+#: ../modules/calendar/e-cal-shell-view-memopad.c:280
+#: ../modules/calendar/e-memo-shell-view-actions.c:665
 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:671
-#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/calendar/e-cal-shell-view-memopad.c:285
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:372
+#: ../modules/calendar/e-memo-shell-view-actions.c:670
+#: ../modules/calendar/e-task-shell-view-actions.c:808
 msgid "Open _Web Page"
 msgstr "Отвори _Веб страницу"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:298
-#: ../modules/calendar/e-memo-shell-view-actions.c:831
+#: ../modules/calendar/e-cal-shell-view-memopad.c:297
+#: ../modules/calendar/e-memo-shell-view-actions.c:830
 msgid "Print the selected memo"
 msgstr "Штампајте изабрану белешку"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1566
+#: ../modules/calendar/e-cal-shell-view-private.c:1561
 msgid "Searching next matching event"
 msgstr "Тражим следећи одговарајући догађај"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1567
+#: ../modules/calendar/e-cal-shell-view-private.c:1562
 msgid "Searching previous matching event"
 msgstr "Тражим претходни одговарајући догађај"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1588
+#: ../modules/calendar/e-cal-shell-view-private.c:1583
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
@@ -17036,7 +17576,7 @@ msgstr[1] "Не могу да пронађем одговарајући дога
 msgstr[2] "Не могу да пронађем одговарајући догађај у следећих %d година"
 msgstr[3] "Не могу да пронађем одговарајући догађај у следећој %d години"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1592
+#: ../modules/calendar/e-cal-shell-view-private.c:1587
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
@@ -17045,7 +17585,7 @@ msgstr[1] "Не могу да пронађем одговарајући дога
 msgstr[2] "Не могу да пронађем одговарајући догађај у претходних %d години"
 msgstr[3] "Не могу да пронађем одговарајући догађај у претходној %d години"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1617
+#: ../modules/calendar/e-cal-shell-view-private.c:1612
 msgid "Cannot search with no active calendar"
 msgstr "Не могу да тражим ако нема активног календара"
 
@@ -17053,177 +17593,177 @@ msgstr "Не могу да тражим ако нема активног кал�
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:296
-#: ../modules/calendar/e-task-shell-view-actions.c:642
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:295
+#: ../modules/calendar/e-task-shell-view-actions.c:641
 msgid "task"
 msgstr "задатак"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
-#: ../modules/calendar/e-task-shell-view-actions.c:704
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
+#: ../modules/calendar/e-task-shell-view-actions.c:703
 msgid "_Assign Task"
 msgstr "_Додели задатак"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:781
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
+#: ../modules/calendar/e-task-shell-view-actions.c:780
 msgid "_Mark as Complete"
 msgstr "_Означи као завршено"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:347
-#: ../modules/calendar/e-task-shell-view-actions.c:783
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
+#: ../modules/calendar/e-task-shell-view-actions.c:782
 msgid "Mark selected tasks as complete"
 msgstr "Обележите изабране задатке као завршене"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
 msgid "_Mark as Incomplete"
 msgstr "_Означи као незавршено"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:354
-#: ../modules/calendar/e-task-shell-view-actions.c:790
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
+#: ../modules/calendar/e-task-shell-view-actions.c:789
 msgid "Mark selected tasks as incomplete"
 msgstr "Обележите изабране задатке као незавршене"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:359
-#: ../modules/calendar/e-task-shell-view-actions.c:795
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
+#: ../modules/calendar/e-task-shell-view-actions.c:794
 msgid "New _Task"
 msgstr "Нови зад_атак"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-task-shell-backend.c:216
-#: ../modules/calendar/e-task-shell-view-actions.c:797
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:360
+#: ../modules/calendar/e-task-shell-backend.c:215
+#: ../modules/calendar/e-task-shell-view-actions.c:796
 msgid "Create a new task"
 msgstr "Направите нови задатак"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:366
-#: ../modules/calendar/e-task-shell-view-actions.c:802
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
+#: ../modules/calendar/e-task-shell-view-actions.c:801
 msgid "_Open Task"
 msgstr "_Отвори задатак"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:368
-#: ../modules/calendar/e-task-shell-view-actions.c:804
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:367
+#: ../modules/calendar/e-task-shell-view-actions.c:803
 msgid "View the selected task"
 msgstr "Прегледајте изабрани задатак"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:385
-#: ../modules/calendar/e-task-shell-view-actions.c:1030
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:384
+#: ../modules/calendar/e-task-shell-view-actions.c:1029
 msgid "Print the selected task"
 msgstr "Штампа изабрани задатак"
 
-#: ../modules/calendar/e-memo-shell-backend.c:208
-#: ../modules/calendar/e-memo-shell-view-actions.c:196
+#: ../modules/calendar/e-memo-shell-backend.c:207
+#: ../modules/calendar/e-memo-shell-view-actions.c:195
 msgid "New Memo List"
 msgstr "Нови списак белешке"
 
-#: ../modules/calendar/e-memo-shell-backend.c:217
+#: ../modules/calendar/e-memo-shell-backend.c:216
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Белешк_а"
 
-#: ../modules/calendar/e-memo-shell-backend.c:224
+#: ../modules/calendar/e-memo-shell-backend.c:223
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Дељена белешка"
 
-#: ../modules/calendar/e-memo-shell-backend.c:226
+#: ../modules/calendar/e-memo-shell-backend.c:225
 msgid "Create a new shared memo"
 msgstr "Направите нову дељену белешку"
 
-#: ../modules/calendar/e-memo-shell-backend.c:234
+#: ../modules/calendar/e-memo-shell-backend.c:233
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Спи_сак белешки"
 
-#: ../modules/calendar/e-memo-shell-backend.c:236
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-memo-shell-backend.c:235
+#: ../modules/calendar/e-memo-shell-view-actions.c:623
 msgid "Create a new memo list"
 msgstr "Саставите нови списак белешки"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:117
+#: ../modules/calendar/e-memo-shell-sidebar.c:116
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr "Отварам списак белешки „%s“"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:547
+#: ../modules/calendar/e-memo-shell-sidebar.c:545
 msgid "Memo List Selector"
 msgstr "Изборник спискова белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:212
-#: ../modules/calendar/e-memo-shell-view-actions.c:227
+#: ../modules/calendar/e-memo-shell-view-actions.c:211
+#: ../modules/calendar/e-memo-shell-view-actions.c:226
 msgid "Print Memos"
 msgstr "Штампај белешке"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:268
+#: ../modules/calendar/e-memo-shell-view-actions.c:267
 msgid "Memo List Properties"
 msgstr "Особине списка задатака"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:587
+#: ../modules/calendar/e-memo-shell-view-actions.c:586
 msgid "_Delete Memo"
 msgstr "_Обриши белешку"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:594
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
 msgid "_Find in Memo..."
 msgstr "П_ронађи у белешци..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:596
+#: ../modules/calendar/e-memo-shell-view-actions.c:595
 msgid "Search for text in the displayed memo"
 msgstr "Претражите текст у приказаној белешци"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:615
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
 msgid "D_elete Memo List"
 msgstr "Об_риши списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:616
 msgid "Delete the selected memo list"
 msgstr "Обришите изабрани списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
 msgid "_New Memo List"
 msgstr "_Нови списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#: ../modules/calendar/e-memo-shell-view-actions.c:637
 msgid "Refresh the selected memo list"
 msgstr "Освежите изабрани списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:645
+#: ../modules/calendar/e-memo-shell-view-actions.c:644
 msgid "Rename the selected memo list"
 msgstr "Преименујте изабрани списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:650
+#: ../modules/calendar/e-memo-shell-view-actions.c:649
 msgid "Show _Only This Memo List"
 msgstr "Прикажи _само овај списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:729
+#: ../modules/calendar/e-memo-shell-view-actions.c:728
 msgid "Memo _Preview"
 msgstr "_Преглед белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:731
+#: ../modules/calendar/e-memo-shell-view-actions.c:730
 msgid "Show memo preview pane"
 msgstr "Прикажите преглед белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:752
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
 msgid "Show memo preview below the memo list"
 msgstr "Прикажите преглед белешки испод списка белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:759
+#: ../modules/calendar/e-memo-shell-view-actions.c:758
 msgid "Show memo preview alongside the memo list"
 msgstr "Прикажите преглед белешки поред списка белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:817
+#: ../modules/calendar/e-memo-shell-view-actions.c:816
 msgid "Print the list of memos"
 msgstr "Штампајте списак белешки"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:824
+#: ../modules/calendar/e-memo-shell-view-actions.c:823
 msgid "Preview the list of memos to be printed"
 msgstr "Прегледајте списак белешки за штампу"
 
-#: ../modules/calendar/e-memo-shell-view.c:239
+#: ../modules/calendar/e-memo-shell-view.c:238
 msgid "Delete Memos"
 msgstr "Обриши белешке"
 
-#: ../modules/calendar/e-memo-shell-view.c:241
+#: ../modules/calendar/e-memo-shell-view.c:240
 msgid "Delete Memo"
 msgstr "Обриши белешку"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:538
+#: ../modules/calendar/e-memo-shell-view-private.c:537
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -17232,60 +17772,60 @@ msgstr[1] "%d белешке"
 msgstr[2] "%d белешки"
 msgstr[3] "%d белешка"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:542
-#: ../modules/calendar/e-task-shell-view-private.c:746
+#: ../modules/calendar/e-memo-shell-view-private.c:541
+#: ../modules/calendar/e-task-shell-view-private.c:747
 #, c-format
 msgid "%d selected"
 msgstr "изабраних — %d"
 
-#: ../modules/calendar/e-task-shell-backend.c:205
-#: ../modules/calendar/e-task-shell-view-actions.c:219
+#: ../modules/calendar/e-task-shell-backend.c:204
+#: ../modules/calendar/e-task-shell-view-actions.c:218
 msgid "New Task List"
 msgstr "Нови списак задатака"
 
-#: ../modules/calendar/e-task-shell-backend.c:214
+#: ../modules/calendar/e-task-shell-backend.c:213
 msgctxt "New"
 msgid "_Task"
 msgstr "_Задатак"
 
-#: ../modules/calendar/e-task-shell-backend.c:221
+#: ../modules/calendar/e-task-shell-backend.c:220
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Додељен_и задатак"
 
-#: ../modules/calendar/e-task-shell-backend.c:223
+#: ../modules/calendar/e-task-shell-backend.c:222
 msgid "Create a new assigned task"
 msgstr "Направите нови додељени задатак"
 
-#: ../modules/calendar/e-task-shell-backend.c:231
+#: ../modules/calendar/e-task-shell-backend.c:230
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Списак за_датака"
 
-#: ../modules/calendar/e-task-shell-backend.c:233
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-backend.c:232
+#: ../modules/calendar/e-task-shell-view-actions.c:747
 msgid "Create a new task list"
 msgstr "Направите нови списак задатака"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:117
+#: ../modules/calendar/e-task-shell-sidebar.c:116
 #, c-format
 msgid "Opening task list '%s'"
 msgstr "Отварам списак задатака „%s“"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:547
+#: ../modules/calendar/e-task-shell-sidebar.c:545
 msgid "Task List Selector"
 msgstr "Изборник списка задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:235
-#: ../modules/calendar/e-task-shell-view-actions.c:250
+#: ../modules/calendar/e-task-shell-view-actions.c:234
+#: ../modules/calendar/e-task-shell-view-actions.c:249
 msgid "Print Tasks"
 msgstr "Штампај задатке"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:291
+#: ../modules/calendar/e-task-shell-view-actions.c:290
 msgid "Task List Properties"
 msgstr "Особине списка задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:586
+#: ../modules/calendar/e-task-shell-view-actions.c:585
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -17297,115 +17837,111 @@ msgstr ""
 "\n"
 "Да обришем ове задатке?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:593
+#: ../modules/calendar/e-task-shell-view-actions.c:592
 msgid "Do not ask me again"
 msgstr "Не питај ме поново"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:711
+#: ../modules/calendar/e-task-shell-view-actions.c:710
 msgid "_Delete Task"
 msgstr "_Обриши задатак"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:718
+#: ../modules/calendar/e-task-shell-view-actions.c:717
 msgid "_Find in Task..."
 msgstr "_Пронађи у задатку..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:720
+#: ../modules/calendar/e-task-shell-view-actions.c:719
 msgid "Search for text in the displayed task"
 msgstr "Претражи текст у приказаном задатку"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:732
-msgid "Copy..."
-msgstr "Умножи..."
-
-#: ../modules/calendar/e-task-shell-view-actions.c:739
+#: ../modules/calendar/e-task-shell-view-actions.c:738
 msgid "D_elete Task List"
 msgstr "О_бриши списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 msgid "Delete the selected task list"
 msgstr "Обришите изабрани списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:746
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "_New Task List"
 msgstr "Но_ви списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "Refresh the selected task list"
 msgstr "Освежите изабрани списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "Rename the selected task list"
 msgstr "Преименујте изабрани списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:773
 msgid "Show _Only This Task List"
 msgstr "Прикажи _само овај списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:787
 msgid "Mar_k as Incomplete"
 msgstr "О_значи као незавршено"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:818
+#: ../modules/calendar/e-task-shell-view-actions.c:817
 msgid "Delete completed tasks"
 msgstr "Обришите завршене задатке"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:893
+#: ../modules/calendar/e-task-shell-view-actions.c:892
 msgid "Task _Preview"
 msgstr "Преглед за_датака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:895
+#: ../modules/calendar/e-task-shell-view-actions.c:894
 msgid "Show task preview pane"
 msgstr "Прикажите преглед задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:916
+#: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Show task preview below the task list"
 msgstr "Прикажите преглед испод списка задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:923
+#: ../modules/calendar/e-task-shell-view-actions.c:922
 msgid "Show task preview alongside the task list"
 msgstr "Прикажите преглед поред списка задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:931
+#: ../modules/calendar/e-task-shell-view-actions.c:930
 msgid "Active Tasks"
 msgstr "Активни задаци"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:945
+#: ../modules/calendar/e-task-shell-view-actions.c:944
 msgid "Completed Tasks"
 msgstr "Завршени задаци"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:952
+#: ../modules/calendar/e-task-shell-view-actions.c:951
 msgid "Next 7 Days' Tasks"
 msgstr "Задаци за следећу недељу"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:959
+#: ../modules/calendar/e-task-shell-view-actions.c:958
 msgid "Overdue Tasks"
 msgstr "Прекорачени задаци"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:966
+#: ../modules/calendar/e-task-shell-view-actions.c:965
 msgid "Tasks with Attachments"
 msgstr "Задаци са прилозима"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1016
+#: ../modules/calendar/e-task-shell-view-actions.c:1015
 msgid "Print the list of tasks"
 msgstr "Штампајте списак задатака"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1023
+#: ../modules/calendar/e-task-shell-view-actions.c:1022
 msgid "Preview the list of tasks to be printed"
 msgstr "Прегледајте списак задатака пред штампу"
 
-#: ../modules/calendar/e-task-shell-view.c:374
+#: ../modules/calendar/e-task-shell-view.c:373
 msgid "Delete Tasks"
 msgstr "Обриши задатке"
 
-#: ../modules/calendar/e-task-shell-view.c:376
+#: ../modules/calendar/e-task-shell-view.c:375
 msgid "Delete Task"
 msgstr "Обриши задатак"
 
-#: ../modules/calendar/e-task-shell-view-private.c:631
+#: ../modules/calendar/e-task-shell-view-private.c:632
 msgid "Expunging"
 msgstr "Избацивање"
 
-#: ../modules/calendar/e-task-shell-view-private.c:742
+#: ../modules/calendar/e-task-shell-view-private.c:743
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -17424,49 +17960,49 @@ msgstr "Приказује делове као позивницу"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:235
+#: ../modules/itip-formatter/itip-view.c:228
 msgid "Today %H:%M"
 msgstr "Данас у %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:239
+#: ../modules/itip-formatter/itip-view.c:232
 msgid "Today %H:%M:%S"
 msgstr "Данас у %H:%M:%S"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:248
+#: ../modules/itip-formatter/itip-view.c:241
 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:263
+#: ../modules/itip-formatter/itip-view.c:256
 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:267
+#: ../modules/itip-formatter/itip-view.c:260
 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:272
+#: ../modules/itip-formatter/itip-view.c:265
 msgid "Tomorrow %l:%M %p"
 msgstr "Сутра у %l:%M %p"
 
 #. strftime format of a time,
 #. * in 12-hour format.
-#: ../modules/itip-formatter/itip-view.c:276
+#: ../modules/itip-formatter/itip-view.c:269
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Сутра у %l:%M %S %p"
 
 #. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:295
+#: ../modules/itip-formatter/itip-view.c:288
 #, c-format
 msgid "%A"
 msgstr "%A"
@@ -17476,69 +18012,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:300
+#: ../modules/itip-formatter/itip-view.c:293
 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:304
+#: ../modules/itip-formatter/itip-view.c:297
 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:309
+#: ../modules/itip-formatter/itip-view.c:302
 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:313
+#: ../modules/itip-formatter/itip-view.c:306
 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:322
+#: ../modules/itip-formatter/itip-view.c:315
 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:328
+#: ../modules/itip-formatter/itip-view.c:321
 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:332
+#: ../modules/itip-formatter/itip-view.c:325
 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:337
+#: ../modules/itip-formatter/itip-view.c:330
 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:341
+#: ../modules/itip-formatter/itip-view.c:334
 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:347
+#: ../modules/itip-formatter/itip-view.c:340
 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:352
+#: ../modules/itip-formatter/itip-view.c:345
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y. %H:%M"
 
@@ -17548,167 +18084,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:356
+#: ../modules/itip-formatter/itip-view.c:349
 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:361
+#: ../modules/itip-formatter/itip-view.c:354
 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:365
+#: ../modules/itip-formatter/itip-view.c:358
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y. %l:%M:%S %p"
 
-#: ../modules/itip-formatter/itip-view.c:403
-#: ../modules/itip-formatter/itip-view.c:404
-#: ../modules/itip-formatter/itip-view.c:493
-#: ../modules/itip-formatter/itip-view.c:494
-#: ../modules/itip-formatter/itip-view.c:583
+#: ../modules/itip-formatter/itip-view.c:396
+#: ../modules/itip-formatter/itip-view.c:397
+#: ../modules/itip-formatter/itip-view.c:486
+#: ../modules/itip-formatter/itip-view.c:487
+#: ../modules/itip-formatter/itip-view.c:576
 msgid "An unknown person"
 msgstr "Непозната особа"
 
-#: ../modules/itip-formatter/itip-view.c:408
-#: ../modules/itip-formatter/itip-view.c:498
-#: ../modules/itip-formatter/itip-view.c:587
+#: ../modules/itip-formatter/itip-view.c:401
+#: ../modules/itip-formatter/itip-view.c:491
+#: ../modules/itip-formatter/itip-view.c:580
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Одговорите у име %s"
 
-#: ../modules/itip-formatter/itip-view.c:410
-#: ../modules/itip-formatter/itip-view.c:500
-#: ../modules/itip-formatter/itip-view.c:589
+#: ../modules/itip-formatter/itip-view.c:403
+#: ../modules/itip-formatter/itip-view.c:493
+#: ../modules/itip-formatter/itip-view.c:582
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Примљено у име %s"
 
-#: ../modules/itip-formatter/itip-view.c:415
+#: ../modules/itip-formatter/itip-view.c:408
 #, c-format
 msgid "%s through %s has published the following meeting information:"
 msgstr "%s преко %s објављује следећи податак о састанку:"
 
-#: ../modules/itip-formatter/itip-view.c:417
+#: ../modules/itip-formatter/itip-view.c:410
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%s објављује следећи податак о састанку:"
 
-#: ../modules/itip-formatter/itip-view.c:422
+#: ../modules/itip-formatter/itip-view.c:415
 #, c-format
 msgid "%s has delegated the following meeting to you:"
 msgstr "%s вам делегира следећи састанак:"
 
-#: ../modules/itip-formatter/itip-view.c:425
+#: ../modules/itip-formatter/itip-view.c:418
 #, c-format
 msgid "%s through %s requests your presence at the following meeting:"
 msgstr "%s преко %s захтева ваше присуство на следећем састанку:"
 
-#: ../modules/itip-formatter/itip-view.c:427
+#: ../modules/itip-formatter/itip-view.c:420
 #, c-format
 msgid "%s requests your presence at the following meeting:"
 msgstr "%s захтева ваше присуство на следећем састанку:"
 
-#: ../modules/itip-formatter/itip-view.c:433
+#: ../modules/itip-formatter/itip-view.c:426
 #, c-format
 msgid "%s through %s wishes to add to an existing meeting:"
 msgstr "%s преко %s жели да дода постојећем састанку:"
 
-#: ../modules/itip-formatter/itip-view.c:435
+#: ../modules/itip-formatter/itip-view.c:428
 #, c-format
 msgid "%s wishes to add to an existing meeting:"
 msgstr "%s жели да дода постојећем састанку:"
 
-#: ../modules/itip-formatter/itip-view.c:439
+#: ../modules/itip-formatter/itip-view.c:432
 #, 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:441
+#: ../modules/itip-formatter/itip-view.c:434
 #, c-format
 msgid "%s wishes to receive the latest information for the following meeting:"
 msgstr "%s жели да прими најновији податак за следећи састанак:"
 
-#: ../modules/itip-formatter/itip-view.c:445
+#: ../modules/itip-formatter/itip-view.c:438
 #, c-format
 msgid "%s through %s has sent back the following meeting response:"
 msgstr "%s преко %s шаље следећи одговор за састанак:"
 
-#: ../modules/itip-formatter/itip-view.c:447
+#: ../modules/itip-formatter/itip-view.c:440
 #, c-format
 msgid "%s has sent back the following meeting response:"
 msgstr "%s шаље следећи одговор за састанак:"
 
-#: ../modules/itip-formatter/itip-view.c:451
+#: ../modules/itip-formatter/itip-view.c:444
 #, c-format
 msgid "%s through %s has canceled the following meeting:"
 msgstr "%s преко %s отказује следећи састанак:"
 
-#: ../modules/itip-formatter/itip-view.c:453
+#: ../modules/itip-formatter/itip-view.c:446
 #, c-format
 msgid "%s has canceled the following meeting:"
 msgstr "%s отказује следећи састанак:"
 
-#: ../modules/itip-formatter/itip-view.c:457
+#: ../modules/itip-formatter/itip-view.c:450
 #, c-format
 msgid "%s through %s has proposed the following meeting changes."
 msgstr "%s преко %s предлаже следеће промене састанка."
 
-#: ../modules/itip-formatter/itip-view.c:459
+#: ../modules/itip-formatter/itip-view.c:452
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s предлаже следеће измене састанка:"
 
-#: ../modules/itip-formatter/itip-view.c:463
+#: ../modules/itip-formatter/itip-view.c:456
 #, c-format
 msgid "%s through %s has declined the following meeting changes:"
 msgstr "%s преко %s одбија следеће промене састанка:"
 
-#: ../modules/itip-formatter/itip-view.c:465
+#: ../modules/itip-formatter/itip-view.c:458
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s одбија следеће измене састанка:"
 
-#: ../modules/itip-formatter/itip-view.c:505
+#: ../modules/itip-formatter/itip-view.c:498
 #, c-format
 msgid "%s through %s has published the following task:"
 msgstr "%s преко %s објављује следећи задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:507
+#: ../modules/itip-formatter/itip-view.c:500
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s објави следеће задужење:"
 
-#: ../modules/itip-formatter/itip-view.c:512
+#: ../modules/itip-formatter/itip-view.c:505
 #, c-format
 msgid "%s requests the assignment of %s to the following task:"
 msgstr "%s захтева да %s преузме следећи задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:515
+#: ../modules/itip-formatter/itip-view.c:508
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s преко %s вам додељује задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:517
+#: ../modules/itip-formatter/itip-view.c:510
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s вам додељује задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:523
+#: ../modules/itip-formatter/itip-view.c:516
 #, c-format
 msgid "%s through %s wishes to add to an existing task:"
 msgstr "%s преко %s жели да дода постојећем задатку:"
 
-#: ../modules/itip-formatter/itip-view.c:525
+#: ../modules/itip-formatter/itip-view.c:518
 #, c-format
 msgid "%s wishes to add to an existing task:"
 msgstr "%s жели да дода постојећем задатку:"
 
-#: ../modules/itip-formatter/itip-view.c:529
+#: ../modules/itip-formatter/itip-view.c:522
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -17716,334 +18252,334 @@ msgid ""
 msgstr ""
 "%s преко %s жели да добије најновије информације за следећи додељени задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:531
+#: ../modules/itip-formatter/itip-view.c:524
 #, c-format
 msgid ""
 "%s wishes to receive the latest information for the following assigned task:"
 msgstr "%s жели да добије најновије информације за следећи додељени задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:535
+#: ../modules/itip-formatter/itip-view.c:528
 #, c-format
 msgid "%s through %s has sent back the following assigned task response:"
 msgstr "%s преко %s враћа следећи одговор на додељени задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:537
+#: ../modules/itip-formatter/itip-view.c:530
 #, c-format
 msgid "%s has sent back the following assigned task response:"
 msgstr "%s шаље назад следећи одговор на додељени задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:541
+#: ../modules/itip-formatter/itip-view.c:534
 #, c-format
 msgid "%s through %s has canceled the following assigned task:"
 msgstr "%s преко %s отказује следећи додељени задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:543
+#: ../modules/itip-formatter/itip-view.c:536
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "%s отказује следећи додељени задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:547
+#: ../modules/itip-formatter/itip-view.c:540
 #, c-format
 msgid "%s through %s has proposed the following task assignment changes:"
 msgstr "%s преко %s предлаже следеће промене у додели задатка:"
 
-#: ../modules/itip-formatter/itip-view.c:549
+#: ../modules/itip-formatter/itip-view.c:542
 #, c-format
 msgid "%s has proposed the following task assignment changes:"
 msgstr "%s предлаже следеће промене у додели задатка:"
 
-#: ../modules/itip-formatter/itip-view.c:553
+#: ../modules/itip-formatter/itip-view.c:546
 #, c-format
 msgid "%s through %s has declined the following assigned task:"
 msgstr "%s преко %s одбија следећи додељени задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:555
+#: ../modules/itip-formatter/itip-view.c:548
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s одбија следећи додељени задатак:"
 
-#: ../modules/itip-formatter/itip-view.c:594
+#: ../modules/itip-formatter/itip-view.c:587
 #, c-format
 msgid "%s through %s has published the following memo:"
 msgstr "%s преко %s објављује следећу белешку:"
 
-#: ../modules/itip-formatter/itip-view.c:596
+#: ../modules/itip-formatter/itip-view.c:589
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s објављује следећу белешку:"
 
-#: ../modules/itip-formatter/itip-view.c:601
+#: ../modules/itip-formatter/itip-view.c:594
 #, c-format
 msgid "%s through %s wishes to add to an existing memo:"
 msgstr "%s преко %s жели да дода постојећој белешци:"
 
-#: ../modules/itip-formatter/itip-view.c:603
+#: ../modules/itip-formatter/itip-view.c:596
 #, c-format
 msgid "%s wishes to add to an existing memo:"
 msgstr "%s жели да дода постојећој белешци:"
 
-#: ../modules/itip-formatter/itip-view.c:607
+#: ../modules/itip-formatter/itip-view.c:600
 #, c-format
 msgid "%s through %s has canceled the following shared memo:"
 msgstr "%s преко %s отказује следећу дељену белешку:"
 
-#: ../modules/itip-formatter/itip-view.c:609
+#: ../modules/itip-formatter/itip-view.c:602
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "%s отказује следеће дељену белешку:"
 
-#: ../modules/itip-formatter/itip-view.c:682
+#: ../modules/itip-formatter/itip-view.c:675
 msgid "All day:"
 msgstr "Целодневно:"
 
-#: ../modules/itip-formatter/itip-view.c:688
+#: ../modules/itip-formatter/itip-view.c:681
 msgid "Start day:"
 msgstr "Почетак дана:"
 
-#: ../modules/itip-formatter/itip-view.c:688
-#: ../modules/itip-formatter/itip-view.c:1502
+#: ../modules/itip-formatter/itip-view.c:681
+#: ../modules/itip-formatter/itip-view.c:1504
 msgid "Start time:"
 msgstr "Време почетка:"
 
-#: ../modules/itip-formatter/itip-view.c:697
+#: ../modules/itip-formatter/itip-view.c:690
 msgid "End day:"
 msgstr "Крај дана:"
 
-#: ../modules/itip-formatter/itip-view.c:697
-#: ../modules/itip-formatter/itip-view.c:1503
+#: ../modules/itip-formatter/itip-view.c:690
+#: ../modules/itip-formatter/itip-view.c:1505
 msgid "End time:"
 msgstr "Време завршетка:"
 
-#: ../modules/itip-formatter/itip-view.c:1028
+#: ../modules/itip-formatter/itip-view.c:1030
 msgid "Ope_n Calendar"
 msgstr "О_твори календар"
 
-#: ../modules/itip-formatter/itip-view.c:1031
+#: ../modules/itip-formatter/itip-view.c:1033
 msgid "_Decline all"
 msgstr "Од_биј све"
 
-#: ../modules/itip-formatter/itip-view.c:1034
+#: ../modules/itip-formatter/itip-view.c:1036
 msgid "_Decline"
 msgstr "_Одбиј"
 
-#: ../modules/itip-formatter/itip-view.c:1037
+#: ../modules/itip-formatter/itip-view.c:1039
 msgid "_Tentative all"
 msgstr "Све са ре_зервом"
 
-#: ../modules/itip-formatter/itip-view.c:1040
+#: ../modules/itip-formatter/itip-view.c:1042
 msgid "_Tentative"
 msgstr "Са _резервом"
 
-#: ../modules/itip-formatter/itip-view.c:1043
+#: ../modules/itip-formatter/itip-view.c:1045
 msgid "Acce_pt all"
 msgstr "П_рихвати све"
 
-#: ../modules/itip-formatter/itip-view.c:1046
+#: ../modules/itip-formatter/itip-view.c:1048
 msgid "Acce_pt"
 msgstr "Прих_ваћено"
 
-#: ../modules/itip-formatter/itip-view.c:1049
+#: ../modules/itip-formatter/itip-view.c:1051
 msgid "Send _Information"
 msgstr "Пошаљи _податке"
 
-#: ../modules/itip-formatter/itip-view.c:1052
+#: ../modules/itip-formatter/itip-view.c:1054
 msgid "_Update Attendee Status"
 msgstr "Ажурирај стање учесни_ка"
 
-#: ../modules/itip-formatter/itip-view.c:1055
+#: ../modules/itip-formatter/itip-view.c:1057
 msgid "_Update"
 msgstr "_Освежи"
 
-#: ../modules/itip-formatter/itip-view.c:1505
-#: ../modules/itip-formatter/itip-view.c:1553
-#: ../modules/itip-formatter/itip-view.c:1624
+#: ../modules/itip-formatter/itip-view.c:1507
+#: ../modules/itip-formatter/itip-view.c:1555
+#: ../modules/itip-formatter/itip-view.c:1626
 msgid "Comment:"
 msgstr "Напомена:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1541
+#: ../modules/itip-formatter/itip-view.c:1543
 msgid "Send reply to sender"
 msgstr "Одговори пошиљаоцу"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1556
+#: ../modules/itip-formatter/itip-view.c:1558
 msgid "Send _updates to attendees"
 msgstr "Пошаљи _ажуриране податке учесницима"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1559
+#: ../modules/itip-formatter/itip-view.c:1561
 msgid "_Apply to all instances"
 msgstr "При_мени на све нивое"
 
-#: ../modules/itip-formatter/itip-view.c:1560
+#: ../modules/itip-formatter/itip-view.c:1562
 msgid "Show time as _free"
 msgstr "Прикажи време као _слободно"
 
-#: ../modules/itip-formatter/itip-view.c:1561
+#: ../modules/itip-formatter/itip-view.c:1563
 msgid "_Preserve my reminder"
 msgstr "_Очувај мој подсетник"
 
-#: ../modules/itip-formatter/itip-view.c:1562
+#: ../modules/itip-formatter/itip-view.c:1564
 msgid "_Inherit reminder"
 msgstr "_Наследи подсетник"
 
-#: ../modules/itip-formatter/itip-view.c:1892
+#: ../modules/itip-formatter/itip-view.c:1894
 msgid "_Tasks:"
 msgstr "_Задаци:"
 
-#: ../modules/itip-formatter/itip-view.c:1895
+#: ../modules/itip-formatter/itip-view.c:1897
 msgid "_Memos:"
 msgstr "_Белешке:"
 
-#: ../modules/itip-formatter/itip-view.c:3123
+#: ../modules/itip-formatter/itip-view.c:3125
 msgid "Sa_ve"
 msgstr "Са_чувај"
 
-#: ../modules/itip-formatter/itip-view.c:3583
-#: ../modules/itip-formatter/itip-view.c:5028
+#: ../modules/itip-formatter/itip-view.c:3585
+#: ../modules/itip-formatter/itip-view.c:5032
 msgid "Attendee status updated"
 msgstr "Статус учесника је ажуриран"
 
-#: ../modules/itip-formatter/itip-view.c:3762
+#: ../modules/itip-formatter/itip-view.c:3764
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Једно заказивање у календару „%s“ је у исто време кад и овај састанак"
 
-#: ../modules/itip-formatter/itip-view.c:3791
+#: ../modules/itip-formatter/itip-view.c:3793
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Пронашао сам заказивање у календару „%s“"
 
-#: ../modules/itip-formatter/itip-view.c:3904
+#: ../modules/itip-formatter/itip-view.c:3906
 msgid "Unable to find any calendars"
 msgstr "Не могу да пронађем ниједан календар"
 
-#: ../modules/itip-formatter/itip-view.c:3912
+#: ../modules/itip-formatter/itip-view.c:3914
 msgid "Unable to find this meeting in any calendar"
 msgstr "Не могу да пронађем овај састанак ни у једном календару"
 
-#: ../modules/itip-formatter/itip-view.c:3917
+#: ../modules/itip-formatter/itip-view.c:3919
 msgid "Unable to find this task in any task list"
 msgstr "Не могу да пронађем овај задатак ни у једном списку задатака"
 
-#: ../modules/itip-formatter/itip-view.c:3922
+#: ../modules/itip-formatter/itip-view.c:3924
 msgid "Unable to find this memo in any memo list"
 msgstr "Ниједан списак белешки не садржи ову белешку"
 
-#: ../modules/itip-formatter/itip-view.c:4266
+#: ../modules/itip-formatter/itip-view.c:4268
 msgid "Opening the calendar. Please wait..."
 msgstr "Отварам календар. Молим сачекајте..."
 
-#: ../modules/itip-formatter/itip-view.c:4271
+#: ../modules/itip-formatter/itip-view.c:4273
 msgid "Searching for an existing version of this appointment"
 msgstr "Претрага за једном постојећом верзијом овог заказивања је у току"
 
-#: ../modules/itip-formatter/itip-view.c:4664
+#: ../modules/itip-formatter/itip-view.c:4668
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Не могу да пошаљем ставке календару „%s“.  %s"
 
-#: ../modules/itip-formatter/itip-view.c:4679
+#: ../modules/itip-formatter/itip-view.c:4683
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Послато календару „%s“ као прихваћено"
 
-#: ../modules/itip-formatter/itip-view.c:4684
+#: ../modules/itip-formatter/itip-view.c:4688
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Послато календару „%s“ као покушај"
 
-#: ../modules/itip-formatter/itip-view.c:4690
+#: ../modules/itip-formatter/itip-view.c:4694
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Послато календару „%s“ као одбијено"
 
-#: ../modules/itip-formatter/itip-view.c:4696
+#: ../modules/itip-formatter/itip-view.c:4700
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Послато календару „%s“ као отказано"
 
-#: ../modules/itip-formatter/itip-view.c:4717
-#: ../modules/itip-formatter/itip-view.c:5174
-#: ../modules/itip-formatter/itip-view.c:5280
+#: ../modules/itip-formatter/itip-view.c:4721
+#: ../modules/itip-formatter/itip-view.c:5178
+#: ../modules/itip-formatter/itip-view.c:5284
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Чувам измене у календар. Молим сачекајте..."
 
-#: ../modules/itip-formatter/itip-view.c:4758
+#: ../modules/itip-formatter/itip-view.c:4762
 msgid "Unable to parse item"
 msgstr "Не могу да обрадим ставку"
 
-#: ../modules/itip-formatter/itip-view.c:4951
+#: ../modules/itip-formatter/itip-view.c:4955
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Организатор је уклонио делегата „%s“ "
 
-#: ../modules/itip-formatter/itip-view.c:4968
+#: ../modules/itip-formatter/itip-view.c:4972
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Делегату је послато обавештење о отказивању"
 
-#: ../modules/itip-formatter/itip-view.c:4972
+#: ../modules/itip-formatter/itip-view.c:4976
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Не могу делегату да пошаљем обавештење о отказивању"
 
-#: ../modules/itip-formatter/itip-view.c:5020
+#: ../modules/itip-formatter/itip-view.c:5024
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Не могу да ажурирам учесника. %s"
 
-#: ../modules/itip-formatter/itip-view.c:5063
+#: ../modules/itip-formatter/itip-view.c:5067
 msgid "The meeting is invalid and cannot be updated"
 msgstr "Састанак није исправан и не може бити ажуриран"
 
-#: ../modules/itip-formatter/itip-view.c:5139
+#: ../modules/itip-formatter/itip-view.c:5143
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Статус учесника није ажуриран због неисправног стања"
 
-#: ../modules/itip-formatter/itip-view.c:5211
-#: ../modules/itip-formatter/itip-view.c:5250
+#: ../modules/itip-formatter/itip-view.c:5215
+#: ../modules/itip-formatter/itip-view.c:5254
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Статус учесника није освежен јер ставка више не постоји"
 
-#: ../modules/itip-formatter/itip-view.c:5313
+#: ../modules/itip-formatter/itip-view.c:5317
 msgid "Meeting information sent"
 msgstr "Податак о састанку је послат"
 
-#: ../modules/itip-formatter/itip-view.c:5318
+#: ../modules/itip-formatter/itip-view.c:5322
 msgid "Task information sent"
 msgstr "Податак о задатку је послат"
 
-#: ../modules/itip-formatter/itip-view.c:5323
+#: ../modules/itip-formatter/itip-view.c:5327
 msgid "Memo information sent"
 msgstr "Податак о белешци је послат"
 
-#: ../modules/itip-formatter/itip-view.c:5334
+#: ../modules/itip-formatter/itip-view.c:5338
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Не могу да пошаљем податак о састанку, састанак не постоји"
 
-#: ../modules/itip-formatter/itip-view.c:5339
+#: ../modules/itip-formatter/itip-view.c:5343
 msgid "Unable to send task information, the task does not exist"
 msgstr "Не могу да пошаљем податак о задатку, задужење не постоји"
 
-#: ../modules/itip-formatter/itip-view.c:5344
+#: ../modules/itip-formatter/itip-view.c:5348
 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:5409
+#: ../modules/itip-formatter/itip-view.c:5413
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5414
+#: ../modules/itip-formatter/itip-view.c:5418
 msgid "Save Calendar"
 msgstr "Сачувај календар"
 
-#: ../modules/itip-formatter/itip-view.c:5463
-#: ../modules/itip-formatter/itip-view.c:5476
+#: ../modules/itip-formatter/itip-view.c:5467
+#: ../modules/itip-formatter/itip-view.c:5480
 msgid "The calendar attached is not valid"
 msgstr "Приложен календар није исправан"
 
-#: ../modules/itip-formatter/itip-view.c:5464
-#: ../modules/itip-formatter/itip-view.c:5477
+#: ../modules/itip-formatter/itip-view.c:5468
+#: ../modules/itip-formatter/itip-view.c:5481
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18051,15 +18587,15 @@ msgstr ""
 "Порука пријављује да садржи календар, али тај календар није исправан "
 "иКалендар."
 
-#: ../modules/itip-formatter/itip-view.c:5519
-#: ../modules/itip-formatter/itip-view.c:5549
-#: ../modules/itip-formatter/itip-view.c:5650
+#: ../modules/itip-formatter/itip-view.c:5523
+#: ../modules/itip-formatter/itip-view.c:5553
+#: ../modules/itip-formatter/itip-view.c:5654
 msgid "The item in the calendar is not valid"
 msgstr "Ставка у календару није исправна"
 
-#: ../modules/itip-formatter/itip-view.c:5520
-#: ../modules/itip-formatter/itip-view.c:5550
-#: ../modules/itip-formatter/itip-view.c:5651
+#: ../modules/itip-formatter/itip-view.c:5524
+#: ../modules/itip-formatter/itip-view.c:5554
+#: ../modules/itip-formatter/itip-view.c:5655
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18067,11 +18603,11 @@ msgstr ""
 "Порука садржи календар, али он не садржи догађаје, задатке или податке "
 "слободно/заузето."
 
-#: ../modules/itip-formatter/itip-view.c:5565
+#: ../modules/itip-formatter/itip-view.c:5569
 msgid "The calendar attached contains multiple items"
 msgstr "Календар у прилогу садржи више ставки"
 
-#: ../modules/itip-formatter/itip-view.c:5566
+#: ../modules/itip-formatter/itip-view.c:5570
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18083,24 +18619,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:6067
+#: ../modules/itip-formatter/itip-view.c:6072
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ништа"
 
-#: ../modules/itip-formatter/itip-view.c:6083
+#: ../modules/itip-formatter/itip-view.c:6088
 msgid "Tentatively Accepted"
 msgstr "Прихваћено с резервом"
 
-#: ../modules/itip-formatter/itip-view.c:6243
+#: ../modules/itip-formatter/itip-view.c:6248
 msgid "This meeting recurs"
 msgstr "Овај састанак се понавља"
 
-#: ../modules/itip-formatter/itip-view.c:6246
+#: ../modules/itip-formatter/itip-view.c:6251
 msgid "This task recurs"
 msgstr "Овај задатак се понавља"
 
-#: ../modules/itip-formatter/itip-view.c:6249
+#: ../modules/itip-formatter/itip-view.c:6254
 msgid "This memo recurs"
 msgstr "Ова белешка се понавља"
 
@@ -18117,21 +18653,21 @@ msgstr "Овај састанак је делегиран"
 msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr "„{0}“ делегира састанак. Желите ли да додате делегата „{1}“?"
 
-#: ../modules/itip-formatter/plugin/config-ui.c:82
+#: ../modules/itip-formatter/plugin/config-ui.c:81
 msgid "Meeting Invitations"
 msgstr "Позивнице за састанак"
 
-#: ../modules/itip-formatter/plugin/config-ui.c:108
+#: ../modules/itip-formatter/plugin/config-ui.c:107
 msgid "_Delete message after acting"
 msgstr "_Обриши поруку након радње"
 
-#: ../modules/itip-formatter/plugin/config-ui.c:122
-#: ../modules/itip-formatter/plugin/config-ui.c:153
+#: ../modules/itip-formatter/plugin/config-ui.c:121
+#: ../modules/itip-formatter/plugin/config-ui.c:152
 msgid "Conflict Search"
 msgstr "Претрага преклапања"
 
 #. Source selector
-#: ../modules/itip-formatter/plugin/config-ui.c:137
+#: ../modules/itip-formatter/plugin/config-ui.c:136
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Бира календаре за претрагу преклапања у састанцима"
 
@@ -18143,114 +18679,114 @@ msgstr "Итип форматирање"
 msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "Приказује МИМЕ делове „text/calendar“ у порукама."
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:252
+#: ../modules/mail-config/e-mail-config-google-summary.c:251
 msgid "Google Features"
 msgstr "Гугл могућности"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:261
+#: ../modules/mail-config/e-mail-config-google-summary.c:260
 msgid "Add Google Ca_lendar to this account"
 msgstr "Додај ка_лендар Гугла овом налогу"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:269
+#: ../modules/mail-config/e-mail-config-google-summary.c:268
 msgid "Add Google Con_tacts to this account"
 msgstr "Додај ко_нтакте Гугла овом налогу"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:277
+#: ../modules/mail-config/e-mail-config-google-summary.c:276
 msgid "You may need to enable IMAP access"
 msgstr "Можда ћете морати да омогућите ИМАП приступ"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:246
-#: ../modules/mail-config/e-mail-config-local-accounts.c:292
+#: ../modules/mail-config/e-mail-config-local-accounts.c:245
+#: ../modules/mail-config/e-mail-config-local-accounts.c:291
 msgid "Mail _Directory:"
 msgstr "Директоријум _поште:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:247
+#: ../modules/mail-config/e-mail-config-local-accounts.c:246
 msgid "Choose a MH mail directory"
 msgstr "Изаберите МХ директоријум поште"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:269
+#: ../modules/mail-config/e-mail-config-local-accounts.c:268
 msgid "Local Delivery _File:"
 msgstr "Месна датотека _доставе:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:270
+#: ../modules/mail-config/e-mail-config-local-accounts.c:269
 msgid "Choose a local delivery file"
 msgstr "Изаберите месну датотеку доставе"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:293
+#: ../modules/mail-config/e-mail-config-local-accounts.c:292
 msgid "Choose a Maildir mail directory"
 msgstr "Изаберите Мејлдир директоријум поште"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:315
+#: ../modules/mail-config/e-mail-config-local-accounts.c:314
 msgid "Spool _File:"
 msgstr "Датотека _припреме:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:316
+#: ../modules/mail-config/e-mail-config-local-accounts.c:315
 msgid "Choose a mbox spool file"
 msgstr "Изаберите датотеку мбокс припреме"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:338
+#: ../modules/mail-config/e-mail-config-local-accounts.c:337
 msgid "Spool _Directory:"
 msgstr "Директоријум _припреме:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:339
+#: ../modules/mail-config/e-mail-config-local-accounts.c:338
 msgid "Choose a mbox spool directory"
 msgstr "Изаберите директоријум мбокс припреме"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:137
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:80
-#: ../modules/plugin-manager/evolution-plugin-manager.c:159
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:136
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:53
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:79
+#: ../modules/plugin-manager/evolution-plugin-manager.c:158
 msgid "Configuration"
 msgstr "Подешавање"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:155
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:98
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:154
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:97
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "_Сервер:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:169
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:111
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:168
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
 msgid "_Port:"
 msgstr "_Порт:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:227
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:180
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:226
 msgid "User_name:"
 msgstr "Корисничко_име:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:214
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:148
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:213
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:147
 msgid "Encryption _method:"
 msgstr "Начин _шифровања:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:229
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:163
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:228
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:162
 msgid "STARTTLS after connecting"
 msgstr "СТАРТТЛС након повезивања"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:233
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:167
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:232
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:166
 msgid "SSL on a dedicated port"
 msgstr "ССЛ на одеђеном порту"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:70
+#: ../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:74
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:73
 msgid "_Custom binary:"
 msgstr "_Произвољни извршни:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:91
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:90
 msgid "U_se custom arguments"
 msgstr "Користи _произвољне аргументе"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:95
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:94
 msgid "Cus_tom arguments:"
 msgstr "Произвољни _аргументи:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:113
+#: ../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"
@@ -18260,27 +18796,27 @@ msgstr ""
 "   %F — означава адресу пошиљаоца\n"
 "   %R — означава адресе прималаца"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:128
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:127
 msgid "Send mail also when in offline _mode"
 msgstr "Пошаљи пошту такође у режиму _ван мреже"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:122
 msgid "Ser_ver requires authentication"
 msgstr "Сер_вер тражи потврђивање идентитета"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:209
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:208
 msgid "T_ype:"
 msgstr "_Врста:"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:247
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:246
 msgid "Yahoo! Features"
 msgstr "Јаху! могућности"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:256
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:255
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Додај Јаху! _календар и задатке овом налогу"
 
-#: ../modules/mail/e-mail-attachment-handler.c:425
+#: ../modules/mail/e-mail-attachment-handler.c:424
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
@@ -18289,46 +18825,46 @@ msgstr[1] "%d приложене поруке"
 msgstr[2] "%d приложених порука"
 msgstr[3] "Једна приложена порука"
 
-#: ../modules/mail/e-mail-shell-backend.c:321
+#: ../modules/mail/e-mail-shell-backend.c:314
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Порука"
 
-#: ../modules/mail/e-mail-shell-backend.c:323
+#: ../modules/mail/e-mail-shell-backend.c:316
 msgid "Compose a new mail message"
 msgstr "Саставите нову поруку"
 
-#: ../modules/mail/e-mail-shell-backend.c:331
+#: ../modules/mail/e-mail-shell-backend.c:324
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "Поштански _налог"
 
-#: ../modules/mail/e-mail-shell-backend.c:333
+#: ../modules/mail/e-mail-shell-backend.c:326
 msgid "Create a new mail account"
 msgstr "Направите нови налог за пошту"
 
-#: ../modules/mail/e-mail-shell-backend.c:338
+#: ../modules/mail/e-mail-shell-backend.c:331
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Фасцикла за пошту"
 
-#: ../modules/mail/e-mail-shell-backend.c:340
+#: ../modules/mail/e-mail-shell-backend.c:333
 msgid "Create a new mail folder"
 msgstr "Направите нову фасциклу за пошту"
 
-#: ../modules/mail/e-mail-shell-backend.c:636
+#: ../modules/mail/e-mail-shell-backend.c:644
 msgid "Mail Accounts"
 msgstr "Поштански налози"
 
-#: ../modules/mail/e-mail-shell-backend.c:645
+#: ../modules/mail/e-mail-shell-backend.c:653
 msgid "Mail Preferences"
 msgstr "Поставке поште"
 
-#: ../modules/mail/e-mail-shell-backend.c:654
+#: ../modules/mail/e-mail-shell-backend.c:662
 msgid "Composer Preferences"
 msgstr "Поставке састављача"
 
-#: ../modules/mail/e-mail-shell-backend.c:663
+#: ../modules/mail/e-mail-shell-backend.c:672
 msgid "Network Preferences"
 msgstr "Поставке мреже"
 
@@ -18339,135 +18875,131 @@ msgstr "Поставке мреже"
 # is not permitted.
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:954
+#: ../modules/mail/e-mail-shell-backend.c:964
 msgctxt "label"
 msgid "None"
 msgstr "Ништа"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:672
+#: ../modules/mail/e-mail-shell-view-actions.c:670
 msgid "Marking messages as read..."
 msgstr "Означавам поруке прочитаним..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1522
+#: ../modules/mail/e-mail-shell-view-actions.c:1512
 msgid "_Disable Account"
 msgstr "_Онемогући налог"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1524
+#: ../modules/mail/e-mail-shell-view-actions.c:1514
 msgid "Disable this account"
 msgstr "Искључите овај налог"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1531
+#: ../modules/mail/e-mail-shell-view-actions.c:1521
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Трајно уклоните све обрисане поруке из свих фасцикли"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1538
+#: ../modules/mail/e-mail-shell-view-actions.c:1528
 msgid "Edit properties of this account"
 msgstr "Измените особине овог налога"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1543
-msgid "_Refresh"
-msgstr "_Освежи"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1545
+#: ../modules/mail/e-mail-shell-view-actions.c:1535
 msgid "Refresh list of folders of this account"
 msgstr "Освежите списак фасцикли за овај налог"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1550
+#: ../modules/mail/e-mail-shell-view-actions.c:1540
 msgid "_Download Messages for Offline Usage"
 msgstr "_Преузми поруке за рад ван мреже"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1552
+#: ../modules/mail/e-mail-shell-view-actions.c:1542
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr ""
 "Преузмите поруке за налоге и фасцикле које су означене за рад ван мреже"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1557
+#: ../modules/mail/e-mail-shell-view-actions.c:1547
 msgid "Fl_ush Outbox"
 msgstr "Ис_празни „За слање“"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1564
+#: ../modules/mail/e-mail-shell-view-actions.c:1554
 msgid "_Copy Folder To..."
 msgstr "_Умножи фасциклу у..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1566
+#: ../modules/mail/e-mail-shell-view-actions.c:1556
 msgid "Copy the selected folder into another folder"
 msgstr "Умножите изабрану фасциклу у другу фасциклу"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1573
+#: ../modules/mail/e-mail-shell-view-actions.c:1563
 msgid "Permanently remove this folder"
 msgstr "Трајно уклоните ову фасциклу"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1578
+#: ../modules/mail/e-mail-shell-view-actions.c:1568
 msgid "E_xpunge"
 msgstr "Изба_ци"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1580
+#: ../modules/mail/e-mail-shell-view-actions.c:1570
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Трајно уклоните све обрисане поруке из ове фасцикле"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1585
-#: ../modules/mail/e-mail-shell-view-actions.c:1685
+#: ../modules/mail/e-mail-shell-view-actions.c:1575
+#: ../modules/mail/e-mail-shell-view-actions.c:1675
 msgid "Mar_k All Messages as Read"
 msgstr "Означи све по_руке као прочитане"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1587
-#: ../modules/mail/e-mail-shell-view-actions.c:1687
+#: ../modules/mail/e-mail-shell-view-actions.c:1577
+#: ../modules/mail/e-mail-shell-view-actions.c:1677
 msgid "Mark all messages in the folder as read"
 msgstr "Означите све поруке у фасцикли као прочитане"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1592
+#: ../modules/mail/e-mail-shell-view-actions.c:1582
 msgid "_Move Folder To..."
 msgstr "_Премести фасциклу у..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1594
+#: ../modules/mail/e-mail-shell-view-actions.c:1584
 msgid "Move the selected folder into another folder"
 msgstr "Преместите изабрану фасциклу у другу фасциклу"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1599
+#: ../modules/mail/e-mail-shell-view-actions.c:1589
 msgid "_New..."
 msgstr "_Ново..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1601
+#: ../modules/mail/e-mail-shell-view-actions.c:1591
 msgid "Create a new folder for storing mail"
 msgstr "Направите нову фасциклу за смештај поште"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1608
+#: ../modules/mail/e-mail-shell-view-actions.c:1598
 msgid "Change the properties of this folder"
 msgstr "Измените особине ове фасцикле"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1615
+#: ../modules/mail/e-mail-shell-view-actions.c:1605
 msgid "Refresh the folder"
 msgstr "Освежите фасциклу"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1622
+#: ../modules/mail/e-mail-shell-view-actions.c:1612
 msgid "Change the name of this folder"
 msgstr "Промените назив ове фасцикле"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1627
+#: ../modules/mail/e-mail-shell-view-actions.c:1617
 msgid "Select Message _Thread"
 msgstr "Изабери _расправу"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1629
+#: ../modules/mail/e-mail-shell-view-actions.c:1619
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Означите све поруке исте расправе као изабрану поруку"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1634
+#: ../modules/mail/e-mail-shell-view-actions.c:1624
 msgid "Select Message S_ubthread"
 msgstr "Изабери п_одниз поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1636
+#: ../modules/mail/e-mail-shell-view-actions.c:1626
 msgid "Select all replies to the currently selected message"
 msgstr "Изаберите све одговоре на тренутно изабрану поруку"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1648
+#: ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "Empty _Trash"
 msgstr "Избаци _смеће"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1650
+#: ../modules/mail/e-mail-shell-view-actions.c:1640
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Трајно уклоните све обрисане поруке са свих налога"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1655
+#: ../modules/mail/e-mail-shell-view-actions.c:1645
 msgid "_New Label"
 msgstr "_Нова ознака"
 
@@ -18476,201 +19008,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:1664
+#: ../modules/mail/e-mail-shell-view-actions.c:1654
 msgid "N_one"
 msgstr "Н_ишта"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1678
+#: ../modules/mail/e-mail-shell-view-actions.c:1668
 msgid "_Manage Subscriptions"
 msgstr "_Управљај пријавама"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1680
-#: ../modules/mail/e-mail-shell-view-actions.c:1764
+#: ../modules/mail/e-mail-shell-view-actions.c:1670
+#: ../modules/mail/e-mail-shell-view-actions.c:1754
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Пријавите се или се одјавите са фасцикли на мрежним серверима"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1692
-#: ../modules/mail/e-mail-shell-view-actions.c:1713
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
 msgid "Send / _Receive"
 msgstr "Слање / п_римање"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1694
+#: ../modules/mail/e-mail-shell-view-actions.c:1684
 msgid "Send queued items and retrieve new items"
 msgstr "Пошаљите припремљене и довуците нове ставке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1699
+#: ../modules/mail/e-mail-shell-view-actions.c:1689
 msgid "R_eceive All"
 msgstr "П_рими све"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1701
+#: ../modules/mail/e-mail-shell-view-actions.c:1691
 msgid "Receive new items from all accounts"
 msgstr "Примите нове ставке са свих налога"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1706
+#: ../modules/mail/e-mail-shell-view-actions.c:1696
 msgid "_Send All"
 msgstr "П_ошаљи све"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1708
+#: ../modules/mail/e-mail-shell-view-actions.c:1698
 msgid "Send queued items in all accounts"
 msgstr "Пошаљите ставке на чекању у свим налозима"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1736
+#: ../modules/mail/e-mail-shell-view-actions.c:1726
 msgid "Cancel the current mail operation"
 msgstr "Откажите тренутну операцију са поштом"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1741
+#: ../modules/mail/e-mail-shell-view-actions.c:1731
 msgid "Collapse All _Threads"
 msgstr "Скупи све _расправе"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1743
+#: ../modules/mail/e-mail-shell-view-actions.c:1733
 msgid "Collapse all message threads"
 msgstr "Скупите целокупно гранање расправа"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1748
+#: ../modules/mail/e-mail-shell-view-actions.c:1738
 msgid "E_xpand All Threads"
 msgstr "Разгранај све ра_справе"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1750
+#: ../modules/mail/e-mail-shell-view-actions.c:1740
 msgid "Expand all message threads"
 msgstr "Разгранајте све поруке у расправама"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1755
+#: ../modules/mail/e-mail-shell-view-actions.c:1745
 msgid "_Message Filters"
 msgstr "_Пропусници порука"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1757
+#: ../modules/mail/e-mail-shell-view-actions.c:1747
 msgid "Create or edit rules for filtering new mail"
 msgstr "Направите или уредите правила за издвајање нове поште"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1762
+#: ../modules/mail/e-mail-shell-view-actions.c:1752
 msgid "_Subscriptions..."
 msgstr "_Пријаве..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1771
+#: ../modules/mail/e-mail-shell-view-actions.c:1761
 msgid "F_older"
 msgstr "_Фасцикла"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1778
+#: ../modules/mail/e-mail-shell-view-actions.c:1768
 msgid "_Label"
 msgstr "_Натпис"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1795
+#: ../modules/mail/e-mail-shell-view-actions.c:1785
 msgid "C_reate Search Folder From Search..."
 msgstr "Направи _фасциклу претраге из претраге..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1802
+#: ../modules/mail/e-mail-shell-view-actions.c:1792
 msgid "Search F_olders"
 msgstr "Фас_цикле претраге"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1804
+#: ../modules/mail/e-mail-shell-view-actions.c:1794
 msgid "Create or edit search folder definitions"
 msgstr "Направите или уредите дефиниције фасцикле претраге"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1843
+#: ../modules/mail/e-mail-shell-view-actions.c:1833
 msgid "_New Folder..."
 msgstr "_Нова фасцикла..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1871
+#: ../modules/mail/e-mail-shell-view-actions.c:1861
 msgid "Show Message _Preview"
 msgstr "Прика_жи преглед поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1873
+#: ../modules/mail/e-mail-shell-view-actions.c:1863
 msgid "Show message preview pane"
 msgstr "Прикажите преглед поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1879
+#: ../modules/mail/e-mail-shell-view-actions.c:1869
 msgid "Show _Deleted Messages"
 msgstr "Прикажи о_брисане поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1881
+#: ../modules/mail/e-mail-shell-view-actions.c:1871
 msgid "Show deleted messages with a line through them"
 msgstr "Прикажите обрисане поруке (као прецртане)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1887
+#: ../modules/mail/e-mail-shell-view-actions.c:1877
 msgid "_Group By Threads"
 msgstr "Групиши по _расправама"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1889
+#: ../modules/mail/e-mail-shell-view-actions.c:1879
 msgid "Threaded message list"
 msgstr "Списак порука по темама"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1895
+#: ../modules/mail/e-mail-shell-view-actions.c:1885
 msgid "_Unmatched Folder Enabled"
 msgstr "Укључена _непоклопљена фасцикла"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1897
+#: ../modules/mail/e-mail-shell-view-actions.c:1887
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Окида приликом укључивања непоклопљене фасцикле претраге"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1917
+#: ../modules/mail/e-mail-shell-view-actions.c:1907
 msgid "Show message preview below the message list"
 msgstr "Прикажите преглед поруке испод листе порука"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1924
+#: ../modules/mail/e-mail-shell-view-actions.c:1914
 msgid "Show message preview alongside the message list"
 msgstr "Прикажите преглед поруке поред списка порука"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1932
+#: ../modules/mail/e-mail-shell-view-actions.c:1922
 msgid "All Messages"
 msgstr "Све поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1939
+#: ../modules/mail/e-mail-shell-view-actions.c:1929
 msgid "Important Messages"
 msgstr "Важне поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1946
+#: ../modules/mail/e-mail-shell-view-actions.c:1936
 msgid "Last 5 Days' Messages"
 msgstr "Поруке у задњих 5 дана"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1953
+#: ../modules/mail/e-mail-shell-view-actions.c:1943
 msgid "Messages Not Junk"
 msgstr "Поруке нису ђубре"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1960
+#: ../modules/mail/e-mail-shell-view-actions.c:1950
 msgid "Messages with Attachments"
 msgstr "Поруке са прилозима"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1967
+#: ../modules/mail/e-mail-shell-view-actions.c:1957
 msgid "No Label"
 msgstr "Без ознаке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1974
+#: ../modules/mail/e-mail-shell-view-actions.c:1964
 msgid "Read Messages"
 msgstr "Прочитане поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1981
+#: ../modules/mail/e-mail-shell-view-actions.c:1971
 msgid "Unread Messages"
 msgstr "Непрочитане поруке"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2033
+#: ../modules/mail/e-mail-shell-view-actions.c:2023
 msgid "Subject or Addresses contain"
 msgstr "Наслов или адресе садрже"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:2043
+#: ../modules/mail/e-mail-shell-view-actions.c:2033
 msgid "All Accounts"
 msgstr "свим налозима"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:2050
+#: ../modules/mail/e-mail-shell-view-actions.c:2040
 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:2057
+#: ../modules/mail/e-mail-shell-view-actions.c:2047
 msgid "Current Folder"
 msgstr "текућој фасцикли"
 
-#: ../modules/mail/e-mail-shell-view.c:638
+#: ../modules/mail/e-mail-shell-view.c:636
 msgid "All Account Search"
 msgstr "Претрага свих налога"
 
-#: ../modules/mail/e-mail-shell-view.c:746
+#: ../modules/mail/e-mail-shell-view.c:744
 msgid "Account Search"
 msgstr "Претрага налога"
 
-#: ../modules/mail/e-mail-shell-view-private.c:988
+#: ../modules/mail/e-mail-shell-view-private.c:972
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -18679,8 +19211,8 @@ msgstr[1] "%d изабране, "
 msgstr[2] "%d изабраних, "
 msgstr[3] "%d изабрана, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:997
-#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:981
+#: ../modules/mail/e-mail-shell-view-private.c:998
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -18689,8 +19221,8 @@ msgstr[1] "%d обрисане"
 msgstr[2] "%d обрисаних"
 msgstr[3] "%d обрисана"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1023
-#: ../modules/mail/e-mail-shell-view-private.c:1029
+#: ../modules/mail/e-mail-shell-view-private.c:1007
+#: ../modules/mail/e-mail-shell-view-private.c:1013
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -18699,7 +19231,7 @@ msgstr[1] "%d непожељне"
 msgstr[2] "%d непожељних"
 msgstr[3] "%d непожељна"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1036
+#: ../modules/mail/e-mail-shell-view-private.c:1020
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -18708,7 +19240,7 @@ 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:1026
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -18717,7 +19249,7 @@ msgstr[1] "%d непослате"
 msgstr[2] "%d непослатих"
 msgstr[3] "%d непослата"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1048
+#: ../modules/mail/e-mail-shell-view-private.c:1032
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -18726,7 +19258,7 @@ msgstr[1] "%d послате"
 msgstr[2] "%d послатих"
 msgstr[3] "%d послата"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1044
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -18735,7 +19267,7 @@ msgstr[1] "%d непрочитане, "
 msgstr[2] "%d непрочитаних, "
 msgstr[3] "%d непрочитана, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1063
+#: ../modules/mail/e-mail-shell-view-private.c:1047
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -18744,84 +19276,99 @@ msgstr[1] "%d укупно"
 msgstr[2] "%d укупно"
 msgstr[3] "%d укупно"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1084
+#: ../modules/mail/e-mail-shell-view-private.c:1068
 msgid "Trash"
 msgstr "Смеће"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1522
+#: ../modules/mail/e-mail-shell-view-private.c:1505
 msgid "Send / Receive"
 msgstr "Пошаљи / Прими"
 
-#: ../modules/mail/em-composer-prefs.c:447
+#: ../modules/mail/em-composer-prefs.c:443
+#| msgid "Select Folder"
+msgid "Select Folder to Add"
+msgstr "Изаберите фасциклу за додавање"
+
+#: ../modules/mail/em-composer-prefs.c:888
+#| msgid "F_older"
+msgid "Folder"
+msgstr "Фасцикла"
+
+#: ../modules/mail/em-composer-prefs.c:924
+#| msgid "Recipients"
+msgid "Recipient"
+msgstr "Прималац"
+
+#: ../modules/mail/em-composer-prefs.c:1195
 msgid "Language(s)"
 msgstr "Језик(ци)"
 
 # bug: requires a comment on usage
 # слично као за месеце и недеље
-#: ../modules/mail/em-mailer-prefs.c:81
+#: ../modules/mail/em-mailer-prefs.c:80
 msgid "On exit, every time"
 msgstr "При изласку, сваки пут"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:82
+#: ../modules/mail/em-mailer-prefs.c:81
 msgid "On exit, once per day"
 msgstr "При изласку, једном дневно"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:83
+#: ../modules/mail/em-mailer-prefs.c:82
 msgid "On exit, once per week"
 msgstr "При изласку, једном недељено"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:84
+#: ../modules/mail/em-mailer-prefs.c:83
 msgid "On exit, once per month"
 msgstr "При изласку, једном месечно"
 
-#: ../modules/mail/em-mailer-prefs.c:85
+#: ../modules/mail/em-mailer-prefs.c:84
 msgid "Immediately, on folder leave"
 msgstr "Одмах, при напуштању фасцикле"
 
-#: ../modules/mail/em-mailer-prefs.c:356
+#: ../modules/mail/em-mailer-prefs.c:355
 msgid "Header"
 msgstr "Заглавље"
 
-#: ../modules/mail/em-mailer-prefs.c:360
+#: ../modules/mail/em-mailer-prefs.c:359
 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:1215
+#: ../modules/mail/em-mailer-prefs.c:1214
 msgid "_Date header:"
 msgstr "Заглавље _датума:"
 
-#: ../modules/mail/em-mailer-prefs.c:1216
+#: ../modules/mail/em-mailer-prefs.c:1215
 msgid "Show _original header value"
 msgstr "Прикажи _оригиналну вредност заглавља"
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:142
+#: ../modules/mailto-handler/evolution-mailto-handler.c:140
 msgid "Do you want to make Evolution your default email client?"
 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:311
+#: ../modules/mdn/evolution-mdn.c:307
 #, 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:378
+#: ../modules/mdn/evolution-mdn.c:374
 #, c-format
 msgid "Delivery Notification for \"%s\""
 msgstr "Обавештење о пријему за „%s“"
 
-#: ../modules/mdn/evolution-mdn.c:543
+#: ../modules/mdn/evolution-mdn.c:539
 #, 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:544
 msgid "_Notify Sender"
 msgstr "Обавести _пошиљаоца"
 
@@ -18853,68 +19400,68 @@ msgstr ""
 "Еволуција ће се вратити у режим на мрежи када мрежна веза буде била "
 "успостављена."
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
+#: ../modules/plugin-manager/evolution-plugin-manager.c:67
 msgid "Author(s)"
 msgstr "Аутор(и)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:254
+#: ../modules/plugin-manager/evolution-plugin-manager.c:253
 msgid "Plugin Manager"
 msgstr "Управник прикључака"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:269
+#: ../modules/plugin-manager/evolution-plugin-manager.c:268
 msgid "Note: Some changes will not take effect until restart"
 msgstr "Напомена: неке измене неће бити укључене пре поновног покретања"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:298
+#: ../modules/plugin-manager/evolution-plugin-manager.c:297
 msgid "Overview"
 msgstr "Преглед"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:367
-#: ../modules/plugin-manager/evolution-plugin-manager.c:450
+#: ../modules/plugin-manager/evolution-plugin-manager.c:366
+#: ../modules/plugin-manager/evolution-plugin-manager.c:449
 msgid "Plugin"
 msgstr "Прикључак"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:488
+#: ../modules/plugin-manager/evolution-plugin-manager.c:487
 msgid "_Plugins"
 msgstr "_Прикључци"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:489
+#: ../modules/plugin-manager/evolution-plugin-manager.c:488
 msgid "Enable and disable plugins"
 msgstr "Укључује и искључује додатке"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:140
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:139
 msgid "Display plain text version"
 msgstr "Прикажи издање обичног текста"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:142
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:141
 msgid "Display plain text version of multipart/alternative message"
 msgstr "Приказује издање обичног текста поруке из више делова или неке друге"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:148
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:147
 msgid "Display HTML version"
 msgstr "Прикажи ХТМЛ издање"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:150
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:149
 msgid "Display HTML version of multipart/alternative message"
 msgstr "Приказује издање ХТМЛ-а поруке из више делова или неке друге"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
-#: ../modules/prefer-plain/plugin/config-ui.c:44
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:77
+#: ../modules/prefer-plain/plugin/config-ui.c:43
 msgid "Show HTML if present"
 msgstr "Прикажи ХТМЛ ако постоји"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
-#: ../modules/prefer-plain/plugin/config-ui.c:45
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../modules/prefer-plain/plugin/config-ui.c:44
 msgid "Let Evolution choose the best part to show."
 msgstr "Пушта да Еволуција изабере најбољи део за приказ."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
-#: ../modules/prefer-plain/plugin/config-ui.c:48
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:81
+#: ../modules/prefer-plain/plugin/config-ui.c:47
 msgid "Show plain text if present"
 msgstr "Прикажи обичан текст ако постоји"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
-#: ../modules/prefer-plain/plugin/config-ui.c:49
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../modules/prefer-plain/plugin/config-ui.c:48
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -18922,13 +19469,13 @@ msgstr ""
 "Приказује део са обичним текстом, ако постоји, иначе пушта да Еволуција "
 "изабере најбољи део за приказ."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
-#: ../modules/prefer-plain/plugin/config-ui.c:53
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:86
+#: ../modules/prefer-plain/plugin/config-ui.c:52
 msgid "Only ever show plain text"
 msgstr "Искључиво приказуј обичан текст"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
-#: ../modules/prefer-plain/plugin/config-ui.c:54
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../modules/prefer-plain/plugin/config-ui.c:53
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -18936,11 +19483,11 @@ msgstr ""
 "Увек приказује део са обичним текстом, прилажући остале делове у поруку, по "
 "избору."
 
-#: ../modules/prefer-plain/plugin/config-ui.c:105
+#: ../modules/prefer-plain/plugin/config-ui.c:104
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Прикажи по_тиснуте ХТМЛ делове као прилоге"
 
-#: ../modules/prefer-plain/plugin/config-ui.c:127
+#: ../modules/prefer-plain/plugin/config-ui.c:126
 msgid "HTML _Mode"
 msgstr "ХТМЛ _режим"
 
@@ -18957,61 +19504,61 @@ msgstr "Модел текста"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "Прегледа поруке као обичан текст, чак и ако садрже ХТМЛ."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:151
+#: ../modules/spamassassin/evolution-spamassassin.c:150
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr "Нисам успео да изродим Убицу спама (%s): "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:174
+#: ../modules/spamassassin/evolution-spamassassin.c:173
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr "Нисам успео да пошаљем садржај поруке поште до Убице спама: "
 
 # bug: plural-forms
-#: ../modules/spamassassin/evolution-spamassassin.c:193
+#: ../modules/spamassassin/evolution-spamassassin.c:192
 #, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr "Нисам успео да запишем „%s“ у Убици спама: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:221
+#: ../modules/spamassassin/evolution-spamassassin.c:220
 msgid "Failed to read output from SpamAssassin: "
 msgstr "Нисам успео да прочитам излаз из Убице спама: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:276
+#: ../modules/spamassassin/evolution-spamassassin.c:275
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr "Или се Убица спама урушио или није успео да анализира поруку поште"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:356
+#: ../modules/spamassassin/evolution-spamassassin.c:355
 msgid "SpamAssassin Options"
 msgstr "Опције Убице спама"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:371
+#: ../modules/spamassassin/evolution-spamassassin.c:370
 msgid "I_nclude remote tests"
 msgstr "У_кључи мрежне провере"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:385
+#: ../modules/spamassassin/evolution-spamassassin.c:384
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "Ово ће Убицу спама учинити поузданијим , али споријим."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:559
+#: ../modules/spamassassin/evolution-spamassassin.c:558
 msgid "SpamAssassin"
 msgstr "Убица спама"
 
 #. 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:262
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:342
+#: ../modules/startup-wizard/e-mail-config-import-page.c:261
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:340
 msgid "Importing Files"
 msgstr "Увозим датотеке"
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:261
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:259
 msgid "Import cancelled."
 msgstr "Увожење је отказано."
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:278
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:276
 msgid "Import complete."
 msgstr "Увожење је завршено."
 
-#: ../modules/startup-wizard/e-startup-assistant.c:156
+#: ../modules/startup-wizard/e-startup-assistant.c:155
 msgid ""
 "Welcome to Evolution.\n"
 "\n"
@@ -19023,263 +19570,263 @@ msgstr ""
 "Неколико наредних екрана ће омогућити Еволуцији да се повеже на ваше налоге "
 "ел. поште и да увезе датотеке из других програма."
 
-#: ../modules/startup-wizard/evolution-startup-wizard.c:229
+#: ../modules/startup-wizard/evolution-startup-wizard.c:228
 msgid "Loading accounts..."
 msgstr "Учитавам налоге..."
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:95
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:94
 msgid "_Format as..."
 msgstr "Обликуј _као..."
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:103
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:102
 msgid "_Other languages"
 msgstr "_Други језици"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:337
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:481
 msgid "Text Highlight"
 msgstr "Истицање текста"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:338
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:482
 msgid "Syntax highlighting of mail parts"
 msgstr "Истицање садржаја делова поште"
 
-#: ../modules/text-highlight/languages.c:32
+#: ../modules/text-highlight/languages.c:31
 msgid "_Plain text"
 msgstr "_Обичан текст"
 
 #  Translators: Menu item Verb/Connect/Couple/Assemble
-#: ../modules/text-highlight/languages.c:38
+#: ../modules/text-highlight/languages.c:37
 msgid "_Assembler"
 msgstr "_Спајач"
 
-#: ../modules/text-highlight/languages.c:43
+#: ../modules/text-highlight/languages.c:42
 msgid "_Bash"
 msgstr "_Баш"
 
-#: ../modules/text-highlight/languages.c:54
+#: ../modules/text-highlight/languages.c:53
 msgid "_C/C++"
 msgstr "_Ц/Ц++"
 
-#: ../modules/text-highlight/languages.c:63
+#: ../modules/text-highlight/languages.c:62
 msgid "_C#"
 msgstr "_Ц#"
 
-#: ../modules/text-highlight/languages.c:68
+#: ../modules/text-highlight/languages.c:67
 msgid "_Cascade Style Sheet"
 msgstr "_Каскадни стил листа"
 
-#: ../modules/text-highlight/languages.c:73
+#: ../modules/text-highlight/languages.c:72
 msgid "_HTML"
 msgstr "_ХТМЛ"
 
-#: ../modules/text-highlight/languages.c:81
+#: ../modules/text-highlight/languages.c:80
 msgid "_Java"
 msgstr "_Јава"
 
-#: ../modules/text-highlight/languages.c:87
+#: ../modules/text-highlight/languages.c:86
 msgid "_JavaScript"
 msgstr "_Јава скрипт"
 
-#: ../modules/text-highlight/languages.c:93
+#: ../modules/text-highlight/languages.c:92
 msgid "_Patch/diff"
 msgstr "_Закрпе/разлике"
 
-#: ../modules/text-highlight/languages.c:99
+#: ../modules/text-highlight/languages.c:98
 msgid "_Perl"
 msgstr "_Перл"
 
-#: ../modules/text-highlight/languages.c:110
+#: ../modules/text-highlight/languages.c:109
 msgid "_PHP"
 msgstr "_ПХП"
 
-#: ../modules/text-highlight/languages.c:123
+#: ../modules/text-highlight/languages.c:122
 msgid "_Python"
 msgstr "_Питон"
 
-#: ../modules/text-highlight/languages.c:128
+#: ../modules/text-highlight/languages.c:127
 msgid "_Ruby"
 msgstr "_Руби"
 
-#: ../modules/text-highlight/languages.c:135
+#: ../modules/text-highlight/languages.c:134
 msgid "_Tcl/Tk"
 msgstr "_Тцл/Тк"
 
-#: ../modules/text-highlight/languages.c:141
+#: ../modules/text-highlight/languages.c:140
 msgid "_TeX/LaTeX"
 msgstr "_ТеКс/ЛаТеКс"
 
-#: ../modules/text-highlight/languages.c:147
+#: ../modules/text-highlight/languages.c:146
 msgid "_Vala"
 msgstr "_Вала"
 
-#: ../modules/text-highlight/languages.c:152
+#: ../modules/text-highlight/languages.c:151
 msgid "_Visual Basic"
 msgstr "_Визуел бејзик"
 
-#: ../modules/text-highlight/languages.c:159
+#: ../modules/text-highlight/languages.c:158
 msgid "_XML"
 msgstr "_ИксМЛ"
 
-#: ../modules/text-highlight/languages.c:177
+#: ../modules/text-highlight/languages.c:176
 msgid "_ActionScript"
 msgstr "_Скрипта радње"
 
-#: ../modules/text-highlight/languages.c:182
+#: ../modules/text-highlight/languages.c:181
 msgid "_ADA95"
 msgstr "_АДА95"
 
-#: ../modules/text-highlight/languages.c:189
+#: ../modules/text-highlight/languages.c:188
 msgid "_ALGOL 68"
 msgstr "_АЛГОЛ 68"
 
-#: ../modules/text-highlight/languages.c:194
+#: ../modules/text-highlight/languages.c:193
 msgid "(_G)AWK"
 msgstr "(_Г)АВК"
 
-#: ../modules/text-highlight/languages.c:199
+#: ../modules/text-highlight/languages.c:198
 msgid "_COBOL"
 msgstr "_КОБОЛ"
 
-#: ../modules/text-highlight/languages.c:204
+#: ../modules/text-highlight/languages.c:203
 msgid "_DOS Batch"
 msgstr "_ДОС група"
 
-#: ../modules/text-highlight/languages.c:209
+#: ../modules/text-highlight/languages.c:208
 msgid "_D"
 msgstr "_Д"
 
-#: ../modules/text-highlight/languages.c:214
+#: ../modules/text-highlight/languages.c:213
 msgid "_Erlang"
 msgstr "_Ерланг"
 
-#: ../modules/text-highlight/languages.c:219
+#: ../modules/text-highlight/languages.c:218
 msgid "_FORTRAN 77"
 msgstr "_ФОРТРАН 77"
 
-#: ../modules/text-highlight/languages.c:225
+#: ../modules/text-highlight/languages.c:224
 msgid "_FORTRAN 90"
 msgstr "_ФОРТРАН 90"
 
-#: ../modules/text-highlight/languages.c:230
+#: ../modules/text-highlight/languages.c:229
 msgid "_F#"
 msgstr "_Ф#"
 
-#: ../modules/text-highlight/languages.c:235
+#: ../modules/text-highlight/languages.c:234
 msgid "_Go"
 msgstr "_Гоу"
 
-#: ../modules/text-highlight/languages.c:240
+#: ../modules/text-highlight/languages.c:239
 msgid "_Haskell"
 msgstr "_Хаскел"
 
-#: ../modules/text-highlight/languages.c:245
+#: ../modules/text-highlight/languages.c:244
 msgid "_JSP"
 msgstr "_ЈСП"
 
-#: ../modules/text-highlight/languages.c:250
+#: ../modules/text-highlight/languages.c:249
 msgid "_Lisp"
 msgstr "_Лисп"
 
-#: ../modules/text-highlight/languages.c:258
+#: ../modules/text-highlight/languages.c:257
 msgid "_Lotus"
 msgstr "_Лотус"
 
-#: ../modules/text-highlight/languages.c:263
+#: ../modules/text-highlight/languages.c:262
 msgid "_Lua"
 msgstr "_Луа"
 
-#: ../modules/text-highlight/languages.c:268
+#: ../modules/text-highlight/languages.c:267
 msgid "_Maple"
 msgstr "_Мејпл"
 
-#: ../modules/text-highlight/languages.c:273
+#: ../modules/text-highlight/languages.c:272
 msgid "_Matlab"
 msgstr "_Матлаб"
 
-#: ../modules/text-highlight/languages.c:278
+#: ../modules/text-highlight/languages.c:277
 msgid "_Maya"
 msgstr "_Маја"
 
-#: ../modules/text-highlight/languages.c:283
+#: ../modules/text-highlight/languages.c:282
 msgid "_Oberon"
 msgstr "_Оберон"
 
-#: ../modules/text-highlight/languages.c:288
+#: ../modules/text-highlight/languages.c:287
 msgid "_Objective C"
 msgstr "_Објектни Ц"
 
-#: ../modules/text-highlight/languages.c:294
+#: ../modules/text-highlight/languages.c:293
 msgid "_OCaml"
 msgstr "_ОКемл"
 
-#: ../modules/text-highlight/languages.c:299
+#: ../modules/text-highlight/languages.c:298
 msgid "_Octave"
 msgstr "_Октава"
 
 # Mozda ipak "Portret"?
-#: ../modules/text-highlight/languages.c:304
+#: ../modules/text-highlight/languages.c:303
 msgid "_Object Script"
 msgstr "_Објектни скрипт"
 
-#: ../modules/text-highlight/languages.c:309
+#: ../modules/text-highlight/languages.c:308
 msgid "_Pascal"
 msgstr "_Паскал"
 
-#: ../modules/text-highlight/languages.c:314
+#: ../modules/text-highlight/languages.c:313
 msgid "_POV-Ray"
 msgstr "_ПОВ-реј"
 
-#: ../modules/text-highlight/languages.c:319
+#: ../modules/text-highlight/languages.c:318
 msgid "_Prolog"
 msgstr "_Пролог"
 
-#: ../modules/text-highlight/languages.c:324
+#: ../modules/text-highlight/languages.c:323
 msgid "_PostScript"
 msgstr "_Постскрипт"
 
-#: ../modules/text-highlight/languages.c:329
+#: ../modules/text-highlight/languages.c:328
 msgid "_R"
 msgstr "_Р"
 
-#: ../modules/text-highlight/languages.c:334
+#: ../modules/text-highlight/languages.c:333
 msgid "_RPM Spec"
 msgstr "_РПМ навод"
 
-#: ../modules/text-highlight/languages.c:339
+#: ../modules/text-highlight/languages.c:338
 msgid "_Scala"
 msgstr "_Размера"
 
-#: ../modules/text-highlight/languages.c:344
+#: ../modules/text-highlight/languages.c:343
 msgid "_Smalltalk"
 msgstr "_Смолток"
 
-#: ../modules/text-highlight/languages.c:350
+#: ../modules/text-highlight/languages.c:349
 msgid "_TCSH"
 msgstr "_ТЦСХ"
 
-#: ../modules/text-highlight/languages.c:355
+#: ../modules/text-highlight/languages.c:354
 msgid "_VHDL"
 msgstr "_ВХДЛ"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:129
-#: ../modules/vcard-inline/e-mail-part-vcard.c:152
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:131
+#: ../modules/vcard-inline/e-mail-part-vcard.c:151
 msgid "Show F_ull vCard"
 msgstr "Прикажи _пуну вКарту"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:132
-#: ../modules/vcard-inline/e-mail-part-vcard.c:170
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:134
+#: ../modules/vcard-inline/e-mail-part-vcard.c:169
 msgid "Show Com_pact vCard"
 msgstr "Прикажи _сажету вКарту"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:157
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:162
 msgid "Save _To Addressbook"
 msgstr "Сачувај _у адресар"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:178
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
 msgid "There is one other contact."
 msgstr "Постоји још један контакт."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:189
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
@@ -19288,24 +19835,24 @@ msgstr[1] "Постоје још %d контакта."
 msgstr[2] "Постоји још %d контакта."
 msgstr[3] "Постоји још %d контакт."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:209
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:215
 msgid "Addressbook Contact"
 msgstr "Контакт адресара"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:210
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:216
 msgid "Display the part as an addressbook contact"
 msgstr "Прикажите делове као контакт адресара"
 
-#: ../modules/web-inspector/evolution-web-inspector.c:96
+#: ../modules/web-inspector/evolution-web-inspector.c:95
 msgid "Evolution Web Inspector"
 msgstr "Надзорник веба Еволуције"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:122
 msgid "_Do not show this message again."
 msgstr "_Не приказуј поново ову поруку."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:583
-#: ../plugins/templates/templates.c:480
+#: ../plugins/attachment-reminder/attachment-reminder.c:584
+#: ../plugins/templates/templates.c:478
 msgid "Keywords"
 msgstr "Кључне речи"
 
@@ -19337,35 +19884,35 @@ msgstr "Подсетник прилога"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "Подсећа када заборавите да додате прилог у поруку."
 
-#: ../plugins/bbdb/bbdb.c:635 ../plugins/bbdb/bbdb.c:644
+#: ../plugins/bbdb/bbdb.c:636 ../plugins/bbdb/bbdb.c:645
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Аутоматски контакти"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:659
+#: ../plugins/bbdb/bbdb.c:660
 msgid "Create _address book entries when sending mails"
 msgstr "Направи уносе у _адресар при слању поште"
 
-#: ../plugins/bbdb/bbdb.c:666
+#: ../plugins/bbdb/bbdb.c:667
 msgid "Select Address book for Automatic Contacts"
 msgstr "Изабери адресар за Аутоматске контакте"
 
-#: ../plugins/bbdb/bbdb.c:683
+#: ../plugins/bbdb/bbdb.c:684
 msgid "Instant Messaging Contacts"
 msgstr "Контакти тренутних порука"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:698
+#: ../plugins/bbdb/bbdb.c:699
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "_Усклађује слике и податке контакта са листом другара из Пиџина"
 
-#: ../plugins/bbdb/bbdb.c:705
+#: ../plugins/bbdb/bbdb.c:706
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Бира адресар за листу пријатеља Пиџина"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:718
+#: ../plugins/bbdb/bbdb.c:719
 msgid "Synchronize with _buddy list now"
 msgstr "Усклади са _листом другара сада"
 
@@ -19387,7 +19934,7 @@ msgstr ""
 "поруке.  Такође попуњава податке за контакт брзим гласником из списка "
 "другара."
 
-#: ../plugins/dbx-import/dbx-importer.c:282
+#: ../plugins/dbx-import/dbx-importer.c:278
 msgid "Importing Outlook Express data"
 msgstr "Увозим податке Аутлук Експреса"
 
@@ -19403,7 +19950,7 @@ msgstr "Личне фасцикле Аутлук Експреса 5/6 (.pst)"
 msgid "Import Outlook Express messages from DBX file"
 msgstr "Увози поруке Аутлук Експреса из ДБХ датотеке"
 
-#: ../plugins/email-custom-header/email-custom-header.c:291
+#: ../plugins/email-custom-header/email-custom-header.c:293
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Сигурност:"
@@ -19411,32 +19958,32 @@ msgstr "Сигурност:"
 # Create the default Person calendar
 # Create the default Person task list
 # orange
-#: ../plugins/email-custom-header/email-custom-header.c:295
+#: ../plugins/email-custom-header/email-custom-header.c:297
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "Лично"
 
-#: ../plugins/email-custom-header/email-custom-header.c:296
+#: ../plugins/email-custom-header/email-custom-header.c:298
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "Неразврстано"
 
-#: ../plugins/email-custom-header/email-custom-header.c:297
+#: ../plugins/email-custom-header/email-custom-header.c:299
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "Заштићено"
 
-#: ../plugins/email-custom-header/email-custom-header.c:298
+#: ../plugins/email-custom-header/email-custom-header.c:300
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "Поверљиво"
 
-#: ../plugins/email-custom-header/email-custom-header.c:299
+#: ../plugins/email-custom-header/email-custom-header.c:301
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Тајно"
 
-#: ../plugins/email-custom-header/email-custom-header.c:300
+#: ../plugins/email-custom-header/email-custom-header.c:302
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Строго поверљиво"
@@ -19446,17 +19993,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:360
+#: ../plugins/email-custom-header/email-custom-header.c:362
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "Ништа"
 
-#: ../plugins/email-custom-header/email-custom-header.c:536
+#: ../plugins/email-custom-header/email-custom-header.c:538
 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:806
+#: ../plugins/email-custom-header/email-custom-header.c:808
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -19464,12 +20011,12 @@ msgstr ""
 "Формат за навођење кључа прилагођеног заглавља је:\n"
 "Вредности назив кључа прилагођеног заглавља су раздвојени са „;“."
 
-#: ../plugins/email-custom-header/email-custom-header.c:859
+#: ../plugins/email-custom-header/email-custom-header.c:861
 msgid "Key"
 msgstr "Кључ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:876
-#: ../plugins/templates/templates.c:489
+#: ../plugins/email-custom-header/email-custom-header.c:878
+#: ../plugins/templates/templates.c:487
 msgid "Values"
 msgstr "Вредности"
 
@@ -19486,11 +20033,11 @@ msgstr "Додајте прилагођена заглавља одлазним
 msgid "Email Custom Header"
 msgstr "Прилагођено заглавље ел. поште"
 
-#: ../plugins/external-editor/external-editor.c:112
+#: ../plugins/external-editor/external-editor.c:113
 msgid "Command to be executed to launch the editor: "
 msgstr "Наредба за извршавање ради покретања уређивача: "
 
-#: ../plugins/external-editor/external-editor.c:113
+#: ../plugins/external-editor/external-editor.c:114
 msgid ""
 "For XEmacs use \"xemacs\"\n"
 "For Vim use \"gvim -f\""
@@ -19498,12 +20045,12 @@ msgstr ""
 "За иКсЕмакс користите „xemacs“\n"
 "За Вим користите „gvim -f“"
 
-#: ../plugins/external-editor/external-editor.c:123
+#: ../plugins/external-editor/external-editor.c:124
 msgid "_Automatically launch when a new mail is edited"
 msgstr "_Сам покрени када је нова порука измењена"
 
-#: ../plugins/external-editor/external-editor.c:413
-#: ../plugins/external-editor/external-editor.c:415
+#: ../plugins/external-editor/external-editor.c:417
+#: ../plugins/external-editor/external-editor.c:419
 msgid "Compose in External Editor"
 msgstr "Саставља у спољном уређивачу"
 
@@ -19551,27 +20098,23 @@ msgstr ""
 "Покренут је спољни уређивач. Прозор састављача поруке није могуће затворити "
 "док је активан уређивач."
 
-#: ../plugins/face/face.c:171 ../smime/gui/certificate-manager.c:322
-msgid "Unknown error"
-msgstr "Непозната грешка"
-
-#: ../plugins/face/face.c:289
+#: ../plugins/face/face.c:288
 msgid "Select a Face Picture"
 msgstr "Изаберите слику лица"
 
-#: ../plugins/face/face.c:299
+#: ../plugins/face/face.c:298
 msgid "Image files"
 msgstr "Датотеке слика"
 
-#: ../plugins/face/face.c:358
+#: ../plugins/face/face.c:357
 msgid "_Insert Face picture by default"
 msgstr "_Унапред уметни слику контакта"
 
-#: ../plugins/face/face.c:371
+#: ../plugins/face/face.c:370
 msgid "Load new _Face picture"
 msgstr "Учитај нову _слику контакта"
 
-#: ../plugins/face/face.c:432
+#: ../plugins/face/face.c:431
 msgid "Include _Face"
 msgstr "Укључи _слику"
 
@@ -19612,55 +20155,55 @@ msgstr "Унутрашња слика"
 msgid "View image attachments directly in mail messages."
 msgstr "Прегледајте прилоге са сликама директно у порукама."
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:368
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:364
 msgid "Get List _Archive"
 msgstr "Прибави _архиву листе"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:370
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
 msgid "Get an archive of the list this message belongs to"
 msgstr "Прибавља архиву листе којој ова порука припада"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:375
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:371
 msgid "Get List _Usage Information"
 msgstr "Прибави податке о _коришћењу листе"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:377
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
 msgid "Get information about the usage of the list this message belongs to"
 msgstr "Прибавља податке о коришћењу листе којој ова порука припада"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:382
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:378
 msgid "Contact List _Owner"
 msgstr "_Власник контакт листе"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:384
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
 msgid "Contact the owner of the mailing list this message belongs to"
 msgstr "Јавите се власнику дописне листе којој ова порука припада"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:389
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:385
 msgid "_Post Message to List"
 msgstr "_Пошаљи поруку на листу"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:391
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
 msgid "Post a message to the mailing list this message belongs to"
 msgstr "Саставите поруку за дописну листу којој ова порука припада"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:396
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:392
 msgid "_Subscribe to List"
 msgstr "При_јави се на листу"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:398
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
 msgid "Subscribe to the mailing list this message belongs to"
 msgstr "Пријавите се на дописну листу којој ова порука припада"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:403
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:399
 msgid "_Unsubscribe from List"
 msgstr "О_дјави се са листе"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:405
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:401
 msgid "Unsubscribe from the mailing list this message belongs to"
 msgstr "Одјавите се са дописне листе којој ова порука припада"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:412
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:408
 msgid "Mailing _List"
 msgstr "Дописна _листа"
 
@@ -19749,8 +20292,8 @@ msgstr ""
 "\n"
 "Заглавље: {0}"
 
-#: ../plugins/mail-notification/mail-notification.c:384
-#: ../plugins/mail-notification/mail-notification.c:420
+#: ../plugins/mail-notification/mail-notification.c:382
+#: ../plugins/mail-notification/mail-notification.c:418
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -19761,55 +20304,55 @@ msgstr[3] "Примили сте нову поруку."
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user@example.com"
-#: ../plugins/mail-notification/mail-notification.c:395
+#: ../plugins/mail-notification/mail-notification.c:393
 #, c-format
 msgid "From: %s"
 msgstr "Шаље: %s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:409
+#: ../plugins/mail-notification/mail-notification.c:407
 #, c-format
 msgid "Subject: %s"
 msgstr "Наслов: %s"
 
 # shell:noshell-reason title
-#: ../plugins/mail-notification/mail-notification.c:426
+#: ../plugins/mail-notification/mail-notification.c:424
 msgid "New email in Evolution"
 msgstr "Нова пошта у Еволуцији"
 
 #. Translators: The '%s' is a mail
 #. * folder name.  (e.g. "Show Inbox")
-#: ../plugins/mail-notification/mail-notification.c:461
+#: ../plugins/mail-notification/mail-notification.c:459
 #, c-format
 msgid "Show %s"
 msgstr "Прикажи %s"
 
-#: ../plugins/mail-notification/mail-notification.c:663
+#: ../plugins/mail-notification/mail-notification.c:661
 msgid "_Play sound when a new message arrives"
 msgstr "Звучно _обавести када стигне нова порука"
 
-#: ../plugins/mail-notification/mail-notification.c:695
+#: ../plugins/mail-notification/mail-notification.c:693
 msgid "_Beep"
 msgstr "_Запишти"
 
-#: ../plugins/mail-notification/mail-notification.c:708
+#: ../plugins/mail-notification/mail-notification.c:706
 msgid "Use sound _theme"
 msgstr "Користи звук _теме"
 
-#: ../plugins/mail-notification/mail-notification.c:727
+#: ../plugins/mail-notification/mail-notification.c:725
 msgid "Play _file:"
 msgstr "Пусти звучну _датотеку:"
 
-#: ../plugins/mail-notification/mail-notification.c:736
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Select sound file"
 msgstr "Изаберите звучну датотеку"
 
-#: ../plugins/mail-notification/mail-notification.c:792
+#: ../plugins/mail-notification/mail-notification.c:790
 msgid "Notify new messages for _Inbox only"
 msgstr "Обавести о новим порукама само за _Сандуче"
 
-#: ../plugins/mail-notification/mail-notification.c:802
+#: ../plugins/mail-notification/mail-notification.c:800
 msgid "Show _notification when a new message arrives"
 msgstr "Прикажи _обавештење када пристигне нова порука"
 
@@ -19822,12 +20365,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:232
+#: ../plugins/mail-to-task/mail-to-task.c:229
 #, c-format
 msgid "Created from a mail by %s"
 msgstr "Сачињено из поруке коју шаље %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:616
+#: ../plugins/mail-to-task/mail-to-task.c:613
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -19836,7 +20379,7 @@ msgstr ""
 "Изабрани календар већ садржи догађај „%s“. Желите ли да уредите стари "
 "догађај?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:619
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -19844,7 +20387,7 @@ msgid ""
 msgstr ""
 "Изабрани списак већ садржи задатак „%s“. Желите ли да уредите стари задатак?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:622
+#: ../plugins/mail-to-task/mail-to-task.c:619
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -19852,7 +20395,7 @@ msgid ""
 msgstr ""
 "Изабрани списак већ садржи белешку „%s“. Желите ли да уредите стару белешку?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:642
+#: ../plugins/mail-to-task/mail-to-task.c:639
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -19873,7 +20416,7 @@ msgstr[3] ""
 "Изабрали сте %d пошта да преведете у догађаје. Да ли заиста желите све да их "
 "додате?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:649
+#: ../plugins/mail-to-task/mail-to-task.c:646
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -19894,7 +20437,7 @@ msgstr[3] ""
 "Изабрали сте %d пошта да преведете у задатке. Да ли заиста желите све да их "
 "додате?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:656
+#: ../plugins/mail-to-task/mail-to-task.c:653
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -19915,29 +20458,29 @@ msgstr[3] ""
 "Изабрали сте %d пошта да преведете у белешке. Да ли заиста желите све да их "
 "додате?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:677
+#: ../plugins/mail-to-task/mail-to-task.c:674
 msgid "Do you wish to continue converting remaining mails?"
 msgstr "Да ли желите да наставите са превођењем преосталих пошта?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:753
+#: ../plugins/mail-to-task/mail-to-task.c:750
 msgid "[No Summary]"
 msgstr "[Без сажетка]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:766
+#: ../plugins/mail-to-task/mail-to-task.c:763
 msgid "Invalid object returned from a server"
 msgstr "Неисправан објекат враћен са сервера"
 
-#: ../plugins/mail-to-task/mail-to-task.c:821
+#: ../plugins/mail-to-task/mail-to-task.c:818
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Дошло је до грешке у обради: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:855
+#: ../plugins/mail-to-task/mail-to-task.c:852
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Не могу да отворим календар. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:862
+#: ../plugins/mail-to-task/mail-to-task.c:856
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -19945,7 +20488,7 @@ msgstr ""
 "Изабрани календар је само за читање, стога не можете направити догађај. "
 "Изаберите други календар."
 
-#: ../plugins/mail-to-task/mail-to-task.c:865
+#: ../plugins/mail-to-task/mail-to-task.c:859
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
@@ -19953,7 +20496,7 @@ msgstr ""
 "Изабрани списак задатака је само за читање, стога не можете направити "
 "задатак. Изаберите други списак задатака."
 
-#: ../plugins/mail-to-task/mail-to-task.c:868
+#: ../plugins/mail-to-task/mail-to-task.c:862
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
@@ -19961,39 +20504,35 @@ msgstr ""
 "Изабрани списак белешки је само за читање, стога не можете направити "
 "белешку. Изаберите други списак белешки."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1203
-msgid "No writable calendar is available."
-msgstr "Нема доступног календара за уписивање."
-
-#: ../plugins/mail-to-task/mail-to-task.c:1280
+#: ../plugins/mail-to-task/mail-to-task.c:1261
 msgid "Create an _Appointment"
 msgstr "Направи _заказивање"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1282
+#: ../plugins/mail-to-task/mail-to-task.c:1263
 msgid "Create a new event from the selected message"
 msgstr "Прави нови догађај од изабране поруке"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1287
+#: ../plugins/mail-to-task/mail-to-task.c:1268
 msgid "Create a Mem_o"
 msgstr "Направи белешк_у"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1289
+#: ../plugins/mail-to-task/mail-to-task.c:1270
 msgid "Create a new memo from the selected message"
 msgstr "Прави нову белешку од изабране поруке"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1294
+#: ../plugins/mail-to-task/mail-to-task.c:1275
 msgid "Create a _Task"
 msgstr "Направи _задатак"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1296
+#: ../plugins/mail-to-task/mail-to-task.c:1277
 msgid "Create a new task from the selected message"
 msgstr "Прави нови задатак од изабране поруке"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1304
+#: ../plugins/mail-to-task/mail-to-task.c:1285
 msgid "Create a _Meeting"
 msgstr "Направи _састанак"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1306
+#: ../plugins/mail-to-task/mail-to-task.c:1287
 msgid "Create a new meeting from the selected message"
 msgstr "Прави нови састанак од изабране поруке"
 
@@ -20013,37 +20552,37 @@ msgstr "Личне фасцикле Аутлука (.pst)"
 msgid "Import Outlook messages from PST file"
 msgstr "Увози Аутлук поруке из ПСТ датотеке"
 
-#: ../plugins/pst-import/pst-importer.c:530
+#: ../plugins/pst-import/pst-importer.c:526
 msgid "_Mail"
 msgstr "_Пошта"
 
-#: ../plugins/pst-import/pst-importer.c:559
+#: ../plugins/pst-import/pst-importer.c:555
 msgid "Destination folder:"
 msgstr "Одредишна фасцикла:"
 
-#: ../plugins/pst-import/pst-importer.c:569
+#: ../plugins/pst-import/pst-importer.c:565
 msgid "_Address Book"
 msgstr "_Адресар"
 
-#: ../plugins/pst-import/pst-importer.c:574
+#: ../plugins/pst-import/pst-importer.c:570
 msgid "A_ppointments"
 msgstr "За_казано"
 
-#: ../plugins/pst-import/pst-importer.c:579 ../views/tasks/galview.xml.h:1
+#: ../plugins/pst-import/pst-importer.c:575 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
 msgstr "_Задаци"
 
-#: ../plugins/pst-import/pst-importer.c:584
+#: ../plugins/pst-import/pst-importer.c:580
 msgid "_Journal entries"
 msgstr "Уноси _дневника"
 
-#: ../plugins/pst-import/pst-importer.c:701
+#: ../plugins/pst-import/pst-importer.c:697
 msgid "Importing Outlook data"
 msgstr "Увозим Аутлук податке"
 
 #: ../plugins/publish-calendar/org-gnome-publish-calendar.eplug.xml.h:1
-#: ../plugins/publish-calendar/publish-calendar.c:141
-#: ../plugins/publish-calendar/publish-calendar.c:148
+#: ../plugins/publish-calendar/publish-calendar.c:140
+#: ../plugins/publish-calendar/publish-calendar.c:147
 msgid "Calendar Publishing"
 msgstr "Објављивање календара"
 
@@ -20076,23 +20615,23 @@ msgstr "Објављивање на %s је успешно завршено"
 msgid "Mount of %s failed:"
 msgstr "Нисам успео да монтирам %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:649
-#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+#: ../plugins/publish-calendar/publish-calendar.c:655
+#: ../plugins/publish-calendar/publish-calendar.ui.h:35
 msgid "E_nable"
 msgstr "О_могући"
 
-#: ../plugins/publish-calendar/publish-calendar.c:799
+#: ../plugins/publish-calendar/publish-calendar.c:805
 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:1138
+#: ../plugins/publish-calendar/publish-calendar.c:1142
 msgid "Could not create publish thread."
 msgstr "Не могу да објавим расправу."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1148
+#: ../plugins/publish-calendar/publish-calendar.c:1152
 msgid "_Publish Calendar Information"
 msgstr "Објави распоред из _календара"
 
@@ -20184,100 +20723,100 @@ msgstr "_Запамти лозинку"
 msgid "Publishing Location"
 msgstr "Место објављивања"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:100
-#: ../plugins/publish-calendar/publish-format-ical.c:103
+#: ../plugins/publish-calendar/publish-format-fb.c:99
+#: ../plugins/publish-calendar/publish-format-ical.c:102
 #, c-format
 msgid "Invalid source UID '%s'"
 msgstr "Неисправан ЈИБ извора „%s“"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:540
+#: ../plugins/publish-calendar/url-editor-dialog.c:544
 msgid "New Location"
 msgstr "Ново место"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:542
+#: ../plugins/publish-calendar/url-editor-dialog.c:546
 msgid "Edit Location"
 msgstr "Измените место"
 
 #. Translators: the %F %T is the third argument for a
 #. * strftime function.  It lets you define the formatting
 #. * of the date in the csv-file.
-#: ../plugins/save-calendar/csv-format.c:161
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "UID"
 msgstr "ЈИБ"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Description List"
 msgstr "Списак описа"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Categories List"
 msgstr "Списак категорија"
 
-#: ../plugins/save-calendar/csv-format.c:379
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Comment List"
 msgstr "Списак коментара"
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "Contact List"
 msgstr "Списак контаката"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "Start"
 msgstr "Почетак"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "End"
 msgstr "Крај"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "Due"
 msgstr "Рок"
 
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "percent Done"
 msgstr "постотак завршеног"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "URL"
 msgstr "Адреса"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:388
 msgid "Attendees List"
 msgstr "Списак учесника"
 
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "Modified"
 msgstr "Измењено"
 
-#: ../plugins/save-calendar/csv-format.c:564
+#: ../plugins/save-calendar/csv-format.c:563
 msgid "A_dvanced options for the CSV format"
 msgstr "На_предне опције за ЦВС формат"
 
-#: ../plugins/save-calendar/csv-format.c:572
+#: ../plugins/save-calendar/csv-format.c:571
 msgid "Prepend a _header"
 msgstr "Прво укључи _заглавље"
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:580
 msgid "_Value delimiter:"
 msgstr "Граничник _вредности:"
 
-#: ../plugins/save-calendar/csv-format.c:592
+#: ../plugins/save-calendar/csv-format.c:591
 msgid "_Record delimiter:"
 msgstr "Граничник _записа:"
 
-#: ../plugins/save-calendar/csv-format.c:603
+#: ../plugins/save-calendar/csv-format.c:602
 msgid "_Encapsulate values with:"
 msgstr "_Обавиј вредности са:"
 
-#: ../plugins/save-calendar/csv-format.c:629
+#: ../plugins/save-calendar/csv-format.c:628
 msgid "Comma separated values (.csv)"
 msgstr "Вредности раздвојене зарезом (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:184 ../shell/e-shell-utils.c:178
+#: ../plugins/save-calendar/ical-format.c:183 ../shell/e-shell-utils.c:177
 msgid "iCalendar (.ics)"
 msgstr "иКалендар (.ics)"
 
@@ -20302,23 +20841,28 @@ msgstr "%FT%T"
 msgid "RDF (.rdf)"
 msgstr "РДФ (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:121
+#: ../plugins/save-calendar/save-calendar.c:120
 msgid "_Format:"
 msgstr "_Формат:"
 
-#: ../plugins/save-calendar/save-calendar.c:187
+#: ../plugins/save-calendar/save-calendar.c:186
 msgid "Select destination file"
 msgstr "Изаберите одредишну датотеку"
 
-#: ../plugins/save-calendar/save-calendar.c:343
+#: ../plugins/save-calendar/save-calendar.c:190
+#| msgid "_Save"
+msgid "_Save As"
+msgstr "_Сачувај као"
+
+#: ../plugins/save-calendar/save-calendar.c:347
 msgid "Save the selected calendar to disk"
 msgstr "Сачувај изабрани календар на диск"
 
-#: ../plugins/save-calendar/save-calendar.c:374
+#: ../plugins/save-calendar/save-calendar.c:378
 msgid "Save the selected memo list to disk"
 msgstr "Сачувај изабрану белешку на диск"
 
-#: ../plugins/save-calendar/save-calendar.c:405
+#: ../plugins/save-calendar/save-calendar.c:409
 msgid "Save the selected task list to disk"
 msgstr "Сачувај изабрани списак задатака на диск"
 
@@ -20332,39 +20876,39 @@ msgstr ""
 "$ORIG[тема], $ORIG[шаље], $ORIG[прима] or $ORIG[порука], које ће бити "
 "замењене вредностима из ел. поште на коју одговарате."
 
-#: ../plugins/templates/templates.c:1148
+#: ../plugins/templates/templates.c:1146
 msgid "No Title"
 msgstr "Без звања"
 
-#: ../plugins/templates/templates.c:1257
+#: ../plugins/templates/templates.c:1255
 msgid "Save as _Template"
 msgstr "Сачувај као _шаблон"
 
-#: ../plugins/templates/templates.c:1259
+#: ../plugins/templates/templates.c:1257
 msgid "Save as Template"
 msgstr "Чува као шаблон"
 
-#: ../shell/e-shell.c:279
+#: ../shell/e-shell.c:302
 msgid "Preparing to go offline..."
 msgstr "Припремам се за рад ван мреже..."
 
-#: ../shell/e-shell.c:332
+#: ../shell/e-shell.c:355
 msgid "Preparing to go online..."
 msgstr "Припремам се за рад на мрежи..."
 
-#: ../shell/e-shell.c:413
+#: ../shell/e-shell.c:436
 msgid "Preparing to quit"
 msgstr "Припремам се да изађем"
 
-#: ../shell/e-shell.c:419
+#: ../shell/e-shell.c:442
 msgid "Preparing to quit..."
 msgstr "Припремам се да изађем..."
 
-#: ../shell/e-shell-content.c:721 ../shell/e-shell-content.c:722
+#: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
 msgid "Searches"
 msgstr "Претраге"
 
-#: ../shell/e-shell-content.c:765
+#: ../shell/e-shell-content.c:764
 msgid "Save Search"
 msgstr "Сачувај претрагу"
 
@@ -20372,38 +20916,38 @@ 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:938
+#: ../shell/e-shell-searchbar.c:937
 msgid "Sho_w:"
 msgstr "Прика_жи:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:963
+#: ../shell/e-shell-searchbar.c:962
 msgid "Sear_ch:"
 msgstr "П_ретражи:"
 
 #. Translators: This is part of the quick search interface.
 #. * example: Search: [_______________] in [ Current Folder ]
-#: ../shell/e-shell-searchbar.c:1031
+#: ../shell/e-shell-searchbar.c:1030
 msgid "i_n"
 msgstr " _у "
 
-#: ../shell/e-shell-utils.c:175
+#: ../shell/e-shell-utils.c:174
 msgid "vCard (.vcf)"
 msgstr "вКарта (.vcf)"
 
-#: ../shell/e-shell-utils.c:199
+#: ../shell/e-shell-utils.c:198
 msgid "All Files (*)"
 msgstr "Све датотеке (*)"
 
-#: ../shell/e-shell-view.c:292
+#: ../shell/e-shell-view.c:291
 msgid "Saving user interface state"
 msgstr "Чувам стање корисничког сучеља"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:74
+#: ../shell/e-shell-window-actions.c:73
 msgid "translator-credits"
 msgstr ""
 "Игор Несторовић <igor@prevod.org>\n"
@@ -20412,282 +20956,290 @@ msgstr ""
 "\n"
 "http://prevod.org — превод на српски језик."
 
-#: ../shell/e-shell-window-actions.c:85
+#: ../shell/e-shell-window-actions.c:84
 msgid "Evolution Website"
 msgstr "Веб страница Еволуције"
 
-#: ../shell/e-shell-window-actions.c:341
+#: ../shell/e-shell-window-actions.c:340
 msgid "Categories Editor"
 msgstr "Уређивач категорија"
 
-#: ../shell/e-shell-window-actions.c:672
+#: ../shell/e-shell-window-actions.c:716
 msgid "Bug Buddy is not installed."
 msgstr "Бубаждајин помоћник није инсталиран."
 
-#: ../shell/e-shell-window-actions.c:673
+#: ../shell/e-shell-window-actions.c:717
 msgid "Bug Buddy could not be run."
 msgstr "Бубаждајин помоћник не може бити покренут."
 
-#: ../shell/e-shell-window-actions.c:853
+#: ../shell/e-shell-window-actions.c:895
+msgid "_About"
+msgstr "_О програму"
+
+#: ../shell/e-shell-window-actions.c:897
 msgid "Show information about Evolution"
 msgstr "Приказује податке о Еволуцији"
 
-#: ../shell/e-shell-window-actions.c:858 ../shell/e-shell-window-actions.c:872
+#: ../shell/e-shell-window-actions.c:902 ../shell/e-shell-window-actions.c:916
 msgid "_Close Window"
 msgstr "_Затвори прозор"
 
-#: ../shell/e-shell-window-actions.c:879
+#: ../shell/e-shell-window-actions.c:923
 msgid "_Contents"
 msgstr "_Садржај"
 
-#: ../shell/e-shell-window-actions.c:881
+#: ../shell/e-shell-window-actions.c:925
 msgid "Open the Evolution User Guide"
 msgstr "Отворите корисничко упутство Еволуције"
 
-#: ../shell/e-shell-window-actions.c:907
+#: ../shell/e-shell-window-actions.c:951
 msgid "I_mport..."
 msgstr "_Увези..."
 
-#: ../shell/e-shell-window-actions.c:909
+#: ../shell/e-shell-window-actions.c:953
 msgid "Import data from other programs"
 msgstr "Увезите податке из других програма"
 
-#: ../shell/e-shell-window-actions.c:914
+#: ../shell/e-shell-window-actions.c:958
 msgid "New _Window"
 msgstr "Нови _прозор"
 
-#: ../shell/e-shell-window-actions.c:916
+#: ../shell/e-shell-window-actions.c:960
 msgid "Create a new window displaying this view"
 msgstr "Отворите нов прозор за приказ овог прегледа"
 
-#: ../shell/e-shell-window-actions.c:928
+#: ../shell/e-shell-window-actions.c:972
 msgid "Available Cate_gories"
 msgstr "Доступне _категорије"
 
-#: ../shell/e-shell-window-actions.c:930
+#: ../shell/e-shell-window-actions.c:974
 msgid "Manage available categories"
 msgstr "Управљајте доступним категоријама"
 
-#: ../shell/e-shell-window-actions.c:942
+#: ../shell/e-shell-window-actions.c:986
 msgid "_Quick Reference"
 msgstr "_Кратак подсетник"
 
-#: ../shell/e-shell-window-actions.c:944
+#: ../shell/e-shell-window-actions.c:988
 msgid "Show Evolution's shortcut keys"
 msgstr "Прикажите пречице тастатуре Еволуције"
 
-#: ../shell/e-shell-window-actions.c:951
+#: ../shell/e-shell-window-actions.c:993
+#| msgid "Quit"
+msgid "_Quit"
+msgstr "_Изађи"
+
+#: ../shell/e-shell-window-actions.c:995
 msgid "Exit the program"
 msgstr "Изађите из програма"
 
-#: ../shell/e-shell-window-actions.c:956
+#: ../shell/e-shell-window-actions.c:1000
 msgid "_Advanced Search..."
 msgstr "_Напредна претрага..."
 
-#: ../shell/e-shell-window-actions.c:958
+#: ../shell/e-shell-window-actions.c:1002
 msgid "Construct a more advanced search"
 msgstr "Образујте напреднију претрагу"
 
-#: ../shell/e-shell-window-actions.c:965
+#: ../shell/e-shell-window-actions.c:1009
 msgid "Clear the current search parameters"
 msgstr "Очистите параметре тренутне претраге"
 
-#: ../shell/e-shell-window-actions.c:970
+#: ../shell/e-shell-window-actions.c:1014
 msgid "_Edit Saved Searches..."
 msgstr "_Уреди сачуване претраге..."
 
-#: ../shell/e-shell-window-actions.c:972
+#: ../shell/e-shell-window-actions.c:1016
 msgid "Manage your saved searches"
 msgstr "Управљајте вашим сачуваним претрагама"
 
-#: ../shell/e-shell-window-actions.c:979
+#: ../shell/e-shell-window-actions.c:1023
 msgid "Click here to change the search type"
 msgstr "Кликните овде да промените врсту претраге"
 
-#: ../shell/e-shell-window-actions.c:984
+#: ../shell/e-shell-window-actions.c:1028
 msgid "_Find Now"
 msgstr "Про_нађи сада"
 
-#. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:986
+#: ../shell/e-shell-window-actions.c:1030
 msgid "Execute the current search parameters"
 msgstr "Извршите параметре тренутне претраге"
 
-#: ../shell/e-shell-window-actions.c:991
+#: ../shell/e-shell-window-actions.c:1035
 msgid "_Save Search..."
 msgstr "_Сачувај претрагу..."
 
-#: ../shell/e-shell-window-actions.c:993
+#: ../shell/e-shell-window-actions.c:1037
 msgid "Save the current search parameters"
 msgstr "Сачувајте параметре тренутне претраге"
 
-#: ../shell/e-shell-window-actions.c:1005
+#: ../shell/e-shell-window-actions.c:1049
 msgid "Submit _Bug Report..."
 msgstr "Пошаљи извештај о _грешци..."
 
-#: ../shell/e-shell-window-actions.c:1007
+#: ../shell/e-shell-window-actions.c:1051
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Пошаљите извештај о грешци Бубаждајиним помоћником"
 
-#: ../shell/e-shell-window-actions.c:1012
+#: ../shell/e-shell-window-actions.c:1056
 msgid "_Work Offline"
 msgstr "Рад _ван мреже"
 
-#: ../shell/e-shell-window-actions.c:1014
+#: ../shell/e-shell-window-actions.c:1058
 msgid "Put Evolution into offline mode"
 msgstr "Поставите Еволуцију у рад ван мреже"
 
-#: ../shell/e-shell-window-actions.c:1019
+#: ../shell/e-shell-window-actions.c:1063
 msgid "_Work Online"
 msgstr "_Рад на мрежи"
 
-#: ../shell/e-shell-window-actions.c:1021
+#: ../shell/e-shell-window-actions.c:1065
 msgid "Put Evolution into online mode"
 msgstr "Поставите Еволуцију у рад на мрежи"
 
-#: ../shell/e-shell-window-actions.c:1049
+#: ../shell/e-shell-window-actions.c:1093
 msgid "Lay_out"
 msgstr "_Распоред"
 
-#: ../shell/e-shell-window-actions.c:1056
-msgid "_New"
-msgstr "_Ново"
-
-#: ../shell/e-shell-window-actions.c:1063
+#: ../shell/e-shell-window-actions.c:1107
 msgid "_Search"
 msgstr "Пре_тражи"
 
-#: ../shell/e-shell-window-actions.c:1070
+#: ../shell/e-shell-window-actions.c:1114
 msgid "_Switcher Appearance"
 msgstr "_Изглед пребацивача"
 
-#: ../shell/e-shell-window-actions.c:1084
+#: ../shell/e-shell-window-actions.c:1128
 msgid "_Window"
 msgstr "Про_зор"
 
-#: ../shell/e-shell-window-actions.c:1113
+#: ../shell/e-shell-window-actions.c:1157
 msgid "Show Side _Bar"
 msgstr "Прикажи _бочну површ"
 
-#: ../shell/e-shell-window-actions.c:1115
+#: ../shell/e-shell-window-actions.c:1159
 msgid "Show the side bar"
 msgstr "Прикажите бочну површ"
 
-#: ../shell/e-shell-window-actions.c:1121
+#: ../shell/e-shell-window-actions.c:1165
 msgid "Show _Buttons"
 msgstr "Прикажи _дугмад"
 
-#: ../shell/e-shell-window-actions.c:1123
+#: ../shell/e-shell-window-actions.c:1167
 msgid "Show the switcher buttons"
 msgstr "Прикажите дугмад пребацивача"
 
-#: ../shell/e-shell-window-actions.c:1129
+#: ../shell/e-shell-window-actions.c:1173
 msgid "Show _Status Bar"
 msgstr "Прикажи траку _стања"
 
-#: ../shell/e-shell-window-actions.c:1131
+#: ../shell/e-shell-window-actions.c:1175
 msgid "Show the status bar"
 msgstr "Прикажите траку стања"
 
-#: ../shell/e-shell-window-actions.c:1137
+#: ../shell/e-shell-window-actions.c:1181
 msgid "Show _Tool Bar"
 msgstr "Прикажи траку _алата"
 
-#: ../shell/e-shell-window-actions.c:1139
+#: ../shell/e-shell-window-actions.c:1183
 msgid "Show the tool bar"
 msgstr "Прикажите траку алата"
 
-#: ../shell/e-shell-window-actions.c:1161
+#: ../shell/e-shell-window-actions.c:1205
 msgid "_Icons Only"
 msgstr "Само _иконице"
 
-#: ../shell/e-shell-window-actions.c:1163
+#: ../shell/e-shell-window-actions.c:1207
 msgid "Display window buttons with icons only"
 msgstr "Прикажите дугмад прозора само са иконицама"
 
-#: ../shell/e-shell-window-actions.c:1168
+#: ../shell/e-shell-window-actions.c:1212
 msgid "_Text Only"
 msgstr "Само _текст"
 
-#: ../shell/e-shell-window-actions.c:1170
+#: ../shell/e-shell-window-actions.c:1214
 msgid "Display window buttons with text only"
 msgstr "Прикажите дугмад прозора само са текстом"
 
-#: ../shell/e-shell-window-actions.c:1175
+#: ../shell/e-shell-window-actions.c:1219
 msgid "Icons _and Text"
 msgstr "Иконице _и текст"
 
-#: ../shell/e-shell-window-actions.c:1177
+#: ../shell/e-shell-window-actions.c:1221
 msgid "Display window buttons with icons and text"
 msgstr "Прикажите дугмад прозора са иконицама и текстом"
 
-#: ../shell/e-shell-window-actions.c:1182
+#: ../shell/e-shell-window-actions.c:1226
 msgid "Tool_bar Style"
 msgstr "Стил тра_ке алата"
 
-#: ../shell/e-shell-window-actions.c:1184
+#: ../shell/e-shell-window-actions.c:1228
 msgid "Display window buttons using the desktop toolbar setting"
 msgstr "Прикажите дугмад прозора користећи подешавања траке алата радне површи"
 
-#: ../shell/e-shell-window-actions.c:1192
+#: ../shell/e-shell-window-actions.c:1236
 msgid "Delete Current View"
 msgstr "Обриши тренутни преглед"
 
-#: ../shell/e-shell-window-actions.c:1199
+#: ../shell/e-shell-window-actions.c:1243
 msgid "Save Custom View..."
 msgstr "Сачувај прилагођен преглед..."
 
-#: ../shell/e-shell-window-actions.c:1201
+#: ../shell/e-shell-window-actions.c:1245
 msgid "Save current custom view"
 msgstr "Сачувајте тренутни кориснички преглед"
 
-#: ../shell/e-shell-window-actions.c:1208
+#: ../shell/e-shell-window-actions.c:1252
 msgid "C_urrent View"
 msgstr "Т_ренутни преглед"
 
-#: ../shell/e-shell-window-actions.c:1218
+#: ../shell/e-shell-window-actions.c:1262
 msgid "Custom View"
 msgstr "Прилагођен преглед"
 
-#: ../shell/e-shell-window-actions.c:1220
+#: ../shell/e-shell-window-actions.c:1264
 msgid "Current view is a customized view"
 msgstr "Тренутан преглед је подесио корисник"
 
-#: ../shell/e-shell-window-actions.c:1230
+#: ../shell/e-shell-window-actions.c:1272
+msgid "Page Set_up..."
+msgstr "Подешавање _странице..."
+
+#: ../shell/e-shell-window-actions.c:1274
 msgid "Change the page settings for your current printer"
 msgstr "Измените поставке странице за тренутни штампач"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1635
 #, c-format
 msgid "Switch to %s"
 msgstr "Пређи на %s"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1758
 #, c-format
 msgid "Select view: %s"
 msgstr "Изабери преглед: %s"
 
-#: ../shell/e-shell-window-actions.c:1731
+#: ../shell/e-shell-window-actions.c:1775
 #, c-format
 msgid "Delete view: %s"
 msgstr "Обриши преглед: %s"
 
-#: ../shell/e-shell-window-actions.c:1825
+#: ../shell/e-shell-window-actions.c:1869
 msgid "Execute these search parameters"
 msgstr "Извршите ове параметре претраге"
 
-#: ../shell/e-shell-window.c:504
+#: ../shell/e-shell-window.c:503
 msgid "New"
 msgstr "Ново"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:580
+#: ../shell/e-shell-window-private.c:579
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s — Еволуција"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:183
+#: ../shell/main.c:182
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20722,7 +21274,7 @@ msgstr ""
 "Надамо се да ћете уживати у плодовима нашег напорног рада, и \n"
 "жељно ишчекујемо ваш допринос!\n"
 
-#: ../shell/main.c:207
+#: ../shell/main.c:206
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20730,13 +21282,13 @@ msgstr ""
 "Хвала\n"
 "Тим Еволуције\n"
 
-#: ../shell/main.c:213
+#: ../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:302
+#: ../shell/main.c:301
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -20744,40 +21296,40 @@ msgstr ""
 "Покреће Еволуцију приказујући одређене компоненте. Доступне опције су: "
 "„mail“, „calendar“, „contacts“, „tasks“ и „memos“"
 
-#: ../shell/main.c:306
+#: ../shell/main.c:305
 msgid "Apply the given geometry to the main window"
 msgstr "Примени дату геометрију на главни прозор"
 
-#: ../shell/main.c:310
+#: ../shell/main.c:309
 msgid "Start in online mode"
 msgstr "Почни рад на мрежи"
 
-#: ../shell/main.c:312
+#: ../shell/main.c:311
 msgid "Ignore network availability"
 msgstr "Занемари доступност мреже"
 
-#: ../shell/main.c:315
+#: ../shell/main.c:314
 msgid "Forcibly shut down Evolution"
 msgstr "Силом угаси Еволуцију"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:317
 msgid "Disable loading of any plugins."
 msgstr "Искључи учитавање свих додатака."
 
-#: ../shell/main.c:320
+#: ../shell/main.c:319
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Искључи окно за преглед поште, контакта и задатака."
 
-#: ../shell/main.c:324
+#: ../shell/main.c:323
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Увози адресе датотека датих као остатак аргумената."
 
 # shell:noshell-reason title
-#: ../shell/main.c:326
+#: ../shell/main.c:325
 msgid "Request a running Evolution process to quit"
 msgstr "Захтева крај покренутог процеса Еволуције"
 
-#: ../shell/main.c:403
+#: ../shell/main.c:402
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
@@ -20786,11 +21338,11 @@ msgstr ""
 "Не могу да покренем Еволуцију.  Други примерак Еволуције можда не одговара. "
 "Грешка система: %s"
 
-#: ../shell/main.c:499 ../shell/main.c:504
+#: ../shell/main.c:496 ../shell/main.c:501
 msgid "- The Evolution PIM and Email Client"
 msgstr "— Еволуција руководилац личним податацима и клијент ел. поште"
 
-#: ../shell/main.c:571
+#: ../shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20799,7 +21351,7 @@ msgstr ""
 "%s: „--online“ и „--offline“ се не могу користити заједно.\n"
 "  Покрените „%s --help“ за више података.\n"
 
-#: ../shell/main.c:577
+#: ../shell/main.c:574
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -20847,7 +21399,7 @@ msgstr ""
 "решење можете прво да покушате да надоградите на Еволуцију 2, а затим на "
 "Еволуцију 3."
 
-#: ../smime/gui/ca-trust-dialog.c:109
+#: ../smime/gui/ca-trust-dialog.c:108
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20858,175 +21410,105 @@ msgstr ""
 "\n"
 "Уредите поставке поверења:"
 
-#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
-#: ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:80 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:119
 msgid "Certificate Name"
 msgstr "Назив уверења"
 
-#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
+#: ../smime/gui/certificate-manager.c:81
+#: ../smime/gui/certificate-manager.c:101
 msgid "Issued To Organization"
 msgstr "Издато је организацији"
 
-#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
 msgid "Issued To Organizational Unit"
 msgstr "Издато је организационој јединици"
 
-#: ../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
+#: ../smime/gui/certificate-manager.c:83
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:121
 msgid "Serial Number"
 msgstr "Серијски број"
 
-#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
-#: ../smime/gui/certificate-manager.c:115
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:122
 msgid "Purposes"
 msgstr "Намене"
 
-#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
-#: ../smime/gui/certificate-manager.c:116
-#: ../smime/gui/certificate-viewer.c:640
+#: ../smime/gui/certificate-manager.c:85
+#: ../smime/gui/certificate-manager.c:105
+#: ../smime/gui/certificate-manager.c:123
 msgid "Issued By"
 msgstr "Издавач"
 
-#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
-#: ../smime/gui/certificate-manager.c:117
+#: ../smime/gui/certificate-manager.c:86
+#: ../smime/gui/certificate-manager.c:106
+#: ../smime/gui/certificate-manager.c:124
 msgid "Issued By Organization"
 msgstr "Издала је организација"
 
-#: ../smime/gui/certificate-manager.c:80
-#: ../smime/gui/certificate-manager.c:100
-#: ../smime/gui/certificate-manager.c:118
+#: ../smime/gui/certificate-manager.c:87
+#: ../smime/gui/certificate-manager.c:107
+#: ../smime/gui/certificate-manager.c:125
 msgid "Issued By Organizational Unit"
 msgstr "Издала је организациона јединица"
 
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:101
-#: ../smime/gui/certificate-manager.c:119
+#: ../smime/gui/certificate-manager.c:88
+#: ../smime/gui/certificate-manager.c:108
+#: ../smime/gui/certificate-manager.c:126
 msgid "Issued"
 msgstr "Издато"
 
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:102
-#: ../smime/gui/certificate-manager.c:120
+#: ../smime/gui/certificate-manager.c:89
+#: ../smime/gui/certificate-manager.c:109
+#: ../smime/gui/certificate-manager.c:127
 msgid "Expires"
 msgstr "Истиче"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121
-#: ../smime/gui/certificate-viewer.c:650
+#: ../smime/gui/certificate-manager.c:90
+#: ../smime/gui/certificate-manager.c:110
+#: ../smime/gui/certificate-manager.c:128
 msgid "SHA1 Fingerprint"
 msgstr "СХА1 отисак"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122
-#: ../smime/gui/certificate-viewer.c:651
+#: ../smime/gui/certificate-manager.c:91
+#: ../smime/gui/certificate-manager.c:111
+#: ../smime/gui/certificate-manager.c:129
 msgid "MD5 Fingerprint"
 msgstr "МД5 Отисак"
 
-#: ../smime/gui/certificate-manager.c:93
-#: ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:120
 msgid "Email Address"
 msgstr "Адреса ел. поште"
 
-#: ../smime/gui/certificate-manager.c:614
+#: ../smime/gui/certificate-manager.c:621
 msgid "Select a certificate to import..."
 msgstr "Изаберите уверење за увоз..."
 
-#: ../smime/gui/certificate-manager.c:628
+#: ../smime/gui/certificate-manager.c:635
 msgid "All files"
 msgstr "Све датотеке"
 
-#: ../smime/gui/certificate-manager.c:664
+#: ../smime/gui/certificate-manager.c:671
 msgid "Failed to import certificate"
 msgstr "Нисам успео да увезем уверење"
 
-#: ../smime/gui/certificate-manager.c:1046
+#: ../smime/gui/certificate-manager.c:1053
 msgid "All PKCS12 files"
 msgstr "Све ПКЦС12 датотеке"
 
-#: ../smime/gui/certificate-manager.c:1063
+#: ../smime/gui/certificate-manager.c:1070
 msgid "All email certificate files"
 msgstr "Све датотеке уверења поште"
 
-#: ../smime/gui/certificate-manager.c:1080
+#: ../smime/gui/certificate-manager.c:1087
 msgid "All CA certificate files"
 msgstr "Све датотеке ЦА уверења"
 
-#: ../smime/gui/certificate-viewer.c:292
-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/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
+#: ../smime/gui/cert-trust-dialog.c:152
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -21035,7 +21517,7 @@ msgstr ""
 "Пошто верујете издаваоцу овог уверења, онда верујете и у аутентичност овог "
 "уверења осим ако овде не назначите другачије"
 
-#: ../smime/gui/cert-trust-dialog.c:158
+#: ../smime/gui/cert-trust-dialog.c:157
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -21044,27 +21526,27 @@ msgstr ""
 "Пошто не верујете издаваоцу овог уверења, онда не верујете ни у аутентичност "
 "овог уверења осим ако овде не назначите другачије"
 
-#: ../smime/gui/component.c:56
+#: ../smime/gui/component.c:55
 #, c-format
 msgid "Enter the password for '%s', token '%s'"
 msgstr "Унесите лозинку за „%s“, прстен „%s“"
 
-#: ../smime/gui/component.c:58
+#: ../smime/gui/component.c:57
 #, c-format
 msgid "Enter the password for '%s'"
 msgstr "Унесите лозинку за „%s“"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:86
+#: ../smime/gui/component.c:85
 msgid "Enter new password for certificate database"
 msgstr "Унесите нову лозинку за базу уверења"
 
-#: ../smime/gui/component.c:89
+#: ../smime/gui/component.c:88
 msgid "Enter new password"
 msgstr "Унесите нову лозинку"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -21073,7 +21555,7 @@ msgstr ""
 "Коме је издато:\n"
 "  Наслов: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:123
+#: ../smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -21082,7 +21564,7 @@ msgstr ""
 "Издао је:\n"
 "  Наслов: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:176
+#: ../smime/gui/e-cert-selector.c:175
 msgid "Select certificate"
 msgstr "Изаберите уверење"
 
@@ -21103,44 +21585,44 @@ msgstr "Направи _резерву"
 msgid "Backup _All"
 msgstr "Направи резерву _свега"
 
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Your Certificates"
 msgstr "Ваша уверења"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "You have certificates on file that identify these people:"
 msgstr "Поседујете уверења која одређују ове особе:"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Contact Certificates"
 msgstr "Уверења контакта"
 
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:15
 msgid ""
 "You have certificates on file that identify these certificate authorities:"
 msgstr "Поседујете уверења која одређују ове издаваоце уверења:"
 
-#: ../smime/gui/smime-ui.ui.h:14
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Authorities"
 msgstr "Издаваоци"
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Certificate Authority Trust"
 msgstr "Поверење издаваоцу уверења"
 
-#: ../smime/gui/smime-ui.ui.h:16
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Trust this CA to identify _websites."
 msgstr "Веруј овом издаваоцу уверења за препознавање _веб страница."
 
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Trust this CA to identify _email users."
 msgstr "Веруј овом издаваоцу уверења за препознавање _ел. адреса."
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Trust this CA to identify _software developers."
 msgstr "Веруј овом издаваоцу уверења за препознавање _програмера."
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:21
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -21148,214 +21630,44 @@ msgstr ""
 "Пре веровања овом издаваоцу уверења, прво прегледајте његово уверење, "
 "политику и процедуре (ако су доступни)."
 
-#: ../smime/gui/smime-ui.ui.h:21 ../smime/lib/e-asn1-object.c:658
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Certificate"
 msgstr "Уверење"
 
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "Certificate details"
 msgstr "Детаљи уверења"
 
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Email Certificate Trust Settings"
 msgstr "Подешавања поверења у уверења ел. поште"
 
-#: ../smime/gui/smime-ui.ui.h:24
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Trust the authenticity of this certificate"
 msgstr "Веруј у веродостојност овог уверења"
 
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Не веруј у веродостојност овог уверења"
 
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:30
 msgid "_Edit CA Trust"
 msgstr "_Уреди ЦА поверење"
 
-#: ../smime/lib/e-asn1-object.c:95
-msgid "Version"
-msgstr "Издање"
-
-#: ../smime/lib/e-asn1-object.c:110
-msgid "Version 1"
-msgstr "Издање 1"
-
-#: ../smime/lib/e-asn1-object.c:113
-msgid "Version 2"
-msgstr "Издање 2"
-
-#: ../smime/lib/e-asn1-object.c:116
-msgid "Version 3"
-msgstr "Издање 3"
-
-#: ../smime/lib/e-asn1-object.c:192
-msgid "PKCS #1 MD2 With RSA Encryption"
-msgstr "ПКЦС #1 МД2 са РСА шифровањем"
-
-#: ../smime/lib/e-asn1-object.c:195
-msgid "PKCS #1 MD5 With RSA Encryption"
-msgstr "ПКЦС #1 МД5 са РСА шифровањем"
-
-#: ../smime/lib/e-asn1-object.c:198
-msgid "PKCS #1 SHA-1 With RSA Encryption"
-msgstr "ПКЦС #1 СХА-1 са РСА шифровањем"
-
-#: ../smime/lib/e-asn1-object.c:201
-msgid "PKCS #1 SHA-256 With RSA Encryption"
-msgstr "ПКЦС #1 СХА-256 са РСА шифровањем"
-
-#: ../smime/lib/e-asn1-object.c:204
-msgid "PKCS #1 SHA-384 With RSA Encryption"
-msgstr "ПКЦС #1 СХА-384 са РСА шифровањем"
-
-#: ../smime/lib/e-asn1-object.c:207
-msgid "PKCS #1 SHA-512 With RSA Encryption"
-msgstr "ПКЦС #1 СХА-512 са РСА шифровањем"
-
-#: ../smime/lib/e-asn1-object.c:234
-msgid "PKCS #1 RSA Encryption"
-msgstr "ПКЦС #1 РСА шифровање"
-
-#: ../smime/lib/e-asn1-object.c:237
-msgid "Certificate Key Usage"
-msgstr "Употреба кључа уверења"
-
-#: ../smime/lib/e-asn1-object.c:240
-msgid "Netscape Certificate Type"
-msgstr "Врста Нетскејп уверења"
-
-#: ../smime/lib/e-asn1-object.c:243
-msgid "Certificate Authority Key Identifier"
-msgstr "Одређивач кључа издаваоца уверења"
-
-#: ../smime/lib/e-asn1-object.c:255
-#, c-format
-msgid "Object Identifier (%s)"
-msgstr "Одређивач предмета (%s)"
-
-#: ../smime/lib/e-asn1-object.c:306
-msgid "Algorithm Identifier"
-msgstr "Одређивач алгоритма"
-
-#: ../smime/lib/e-asn1-object.c:314
-msgid "Algorithm Parameters"
-msgstr "Параметри алгоритма"
-
-#: ../smime/lib/e-asn1-object.c:336
-msgid "Subject Public Key Info"
-msgstr "Подаци о јавном кључу субјекта"
-
-#: ../smime/lib/e-asn1-object.c:341
-msgid "Subject Public Key Algorithm"
-msgstr "Алгоритам јавног кључа субјекта"
-
-#: ../smime/lib/e-asn1-object.c:356
-msgid "Subject's Public Key"
-msgstr "Јавни кључ субјекта"
-
-#: ../smime/lib/e-asn1-object.c:378 ../smime/lib/e-asn1-object.c:428
-msgid "Error: Unable to process extension"
-msgstr "Грешка: не могу да обрадим проширење"
-
-#: ../smime/lib/e-asn1-object.c:399 ../smime/lib/e-asn1-object.c:411
-msgid "Object Signer"
-msgstr "Потписник предмета"
-
-#: ../smime/lib/e-asn1-object.c:403
-msgid "SSL Certificate Authority"
-msgstr "Издавач ССЛ уверења"
-
-#: ../smime/lib/e-asn1-object.c:407
-msgid "Email Certificate Authority"
-msgstr "Издавач уверења ел. поште"
-
-#: ../smime/lib/e-asn1-object.c:436
-msgid "Signing"
-msgstr "Потписивање"
-
-#: ../smime/lib/e-asn1-object.c:440
-msgid "Non-repudiation"
-msgstr "Без одрицања"
-
-#: ../smime/lib/e-asn1-object.c:444
-msgid "Key Encipherment"
-msgstr "Замућивање кључа"
-
-#: ../smime/lib/e-asn1-object.c:448
-msgid "Data Encipherment"
-msgstr "Замућивање података"
-
-#: ../smime/lib/e-asn1-object.c:452
-msgid "Key Agreement"
-msgstr "Сагласност кључа"
-
-#: ../smime/lib/e-asn1-object.c:456
-msgid "Certificate Signer"
-msgstr "Потписник уверења"
-
-#: ../smime/lib/e-asn1-object.c:460
-msgid "CRL Signer"
-msgstr "ЦРЛ потписник"
-
-#: ../smime/lib/e-asn1-object.c:509
-msgid "Critical"
-msgstr "Критично"
-
-#: ../smime/lib/e-asn1-object.c:511 ../smime/lib/e-asn1-object.c:514
-msgid "Not Critical"
-msgstr "Није критично"
-
-#: ../smime/lib/e-asn1-object.c:535
-msgid "Extensions"
-msgstr "Проширења"
-
-#. Translators: This string is used in Certificate
-#. * details for fields like Issuer or Subject, which
-#. * shows the field name on the left and its respective
-#. * value on the right, both as stored in the
-#. * certificate itself.  You probably do not need to
-#. * change this string, unless changing the order of
-#. * name and value.  As a result example:
-#. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-asn1-object.c:615
-#, c-format
-msgid "%s = %s"
-msgstr "%s = %s"
-
-#: ../smime/lib/e-asn1-object.c:672 ../smime/lib/e-asn1-object.c:807
-msgid "Certificate Signature Algorithm"
-msgstr "Алгоритам потписа уверења"
-
-#: ../smime/lib/e-asn1-object.c:681
-msgid "Issuer"
-msgstr "Издавач"
-
-#: ../smime/lib/e-asn1-object.c:735
-msgid "Issuer Unique ID"
-msgstr "Јединствени ИБ издавача"
-
-#: ../smime/lib/e-asn1-object.c:754
-msgid "Subject Unique ID"
-msgstr "Јединствени ИБ субјекта"
-
-#: ../smime/lib/e-asn1-object.c:813
-msgid "Certificate Signature Value"
-msgstr "Вредност потписа уверења"
-
-#: ../smime/lib/e-cert.c:201 ../smime/lib/e-cert.c:213
+#: ../smime/lib/e-cert.c:236 ../smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d. %m. %Y."
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:392
+#: ../smime/lib/e-cert.c:404
 msgid "Sign"
 msgstr "Потпиши"
 
-#: ../smime/lib/e-cert.c:393
+#: ../smime/lib/e-cert.c:405
 msgid "Encrypt"
 msgstr "Шифруј"
 
-#: ../smime/lib/e-cert-db.c:864
+#: ../smime/lib/e-cert-db.c:718
 msgid "Certificate already exists"
 msgstr "Уверење већ постоји"
 
@@ -21442,3 +21754,222 @@ msgstr "Са _роком"
 #: ../views/tasks/galview.xml.h:3
 msgid "With _Status"
 msgstr "Са _стањем"
+
+#~ msgid "Original Contact:"
+#~ msgstr "Оригиналан контакт:"
+
+#~ msgid "Ellipsize mode for folder names in side bar"
+#~ msgstr "Искључује или омогућава скраћивање назива фасцикли у бочној површи"
+
+#~ msgid "Pinging %s"
+#~ msgstr "Испитујем доступност за %s"
+
+#~ msgid "_Restore Default"
+#~ msgstr "Поврати _подразумевано"
+
+#~ msgid "Proxy Settings"
+#~ msgstr "Подешавања посредника"
+
+#~ msgid "_Use system defaults"
+#~ msgstr "_Користи системске поставке"
+
+#~ msgid "_Direct connection to the Internet"
+#~ msgstr "_Директна веза са Интернетом"
+
+#~ msgid "_Manual proxy configuration:"
+#~ msgstr "_Ручно подешавање посредника:"
+
+#~ msgid "_Secure HTTP Proxy:"
+#~ msgstr "_Безбедан ХТТП посредник:"
+
+#~ msgid "No _Proxy for:"
+#~ msgstr "Без _посредника за:"
+
+#~ msgid "Use Authe_ntication"
+#~ msgstr "Користи _потврђивање идентитета"
+
+#~ msgid "Us_ername:"
+#~ msgstr "Корисничко_име:"
+
+#~ msgid "Pass_word:"
+#~ msgstr "_Лозинка:"
+
+#~ msgid "Copy..."
+#~ msgstr "Умножи..."
+
+#~ msgid "No writable calendar is available."
+#~ msgstr "Нема доступног календара за уписивање."
+
+#~ msgid "Not part of certificate"
+#~ msgstr "Није део уверења"
+
+#~ msgid "This certificate has been verified for the following uses:"
+#~ msgstr "Ово уверење је проверено за следеће потребе:"
+
+#~ msgid "SSL Client Certificate"
+#~ msgstr "Уверење ССЛ клијента"
+
+#~ msgid "SSL Server Certificate"
+#~ msgstr "Уверење ССЛ сервера"
+
+#~ msgid "Email Signer Certificate"
+#~ msgstr "Уверење потписника ел. поруке"
+
+#~ msgid "Email Recipient Certificate"
+#~ msgstr "Уверење примаоца ел. поруке"
+
+#~ msgid "Issued To"
+#~ msgstr "Коме је издато"
+
+#~ msgid "Common Name (CN)"
+#~ msgstr "Заједничко име (CN)"
+
+#~ msgid "Organization (O)"
+#~ msgstr "Организација (O)"
+
+#~ msgid "Organizational Unit (OU)"
+#~ msgstr "Организациона јединица (OU)"
+
+#~ msgid "Validity"
+#~ msgstr "Исправност"
+
+#~ msgid "Issued On"
+#~ msgstr "Издато је"
+
+#~ msgid "Expires On"
+#~ msgstr "Истиче"
+
+#~ msgid "Fingerprints"
+#~ msgstr "Отисци"
+
+#~ msgid "Certificate Hierarchy"
+#~ msgstr "Хијерархија уверења"
+
+#~ msgid "Certificate Fields"
+#~ msgstr "Поља уверења"
+
+#~ msgid "Field Value"
+#~ msgstr "Вредност поља"
+
+#~ msgid "Details"
+#~ msgstr "Појединости"
+
+#~ msgid "Version"
+#~ msgstr "Издање"
+
+#~ msgid "Version 1"
+#~ msgstr "Издање 1"
+
+#~ msgid "Version 2"
+#~ msgstr "Издање 2"
+
+#~ msgid "Version 3"
+#~ msgstr "Издање 3"
+
+#~ msgid "PKCS #1 MD2 With RSA Encryption"
+#~ msgstr "ПКЦС #1 МД2 са РСА шифровањем"
+
+#~ msgid "PKCS #1 MD5 With RSA Encryption"
+#~ msgstr "ПКЦС #1 МД5 са РСА шифровањем"
+
+#~ msgid "PKCS #1 SHA-1 With RSA Encryption"
+#~ msgstr "ПКЦС #1 СХА-1 са РСА шифровањем"
+
+#~ msgid "PKCS #1 SHA-256 With RSA Encryption"
+#~ msgstr "ПКЦС #1 СХА-256 са РСА шифровањем"
+
+#~ msgid "PKCS #1 SHA-384 With RSA Encryption"
+#~ msgstr "ПКЦС #1 СХА-384 са РСА шифровањем"
+
+#~ msgid "PKCS #1 SHA-512 With RSA Encryption"
+#~ msgstr "ПКЦС #1 СХА-512 са РСА шифровањем"
+
+#~ msgid "PKCS #1 RSA Encryption"
+#~ msgstr "ПКЦС #1 РСА шифровање"
+
+#~ msgid "Certificate Key Usage"
+#~ msgstr "Употреба кључа уверења"
+
+#~ msgid "Netscape Certificate Type"
+#~ msgstr "Врста Нетскејп уверења"
+
+#~ msgid "Certificate Authority Key Identifier"
+#~ msgstr "Одређивач кључа издаваоца уверења"
+
+#~ msgid "Object Identifier (%s)"
+#~ msgstr "Одређивач предмета (%s)"
+
+#~ msgid "Algorithm Identifier"
+#~ msgstr "Одређивач алгоритма"
+
+#~ msgid "Algorithm Parameters"
+#~ msgstr "Параметри алгоритма"
+
+#~ msgid "Subject Public Key Info"
+#~ msgstr "Подаци о јавном кључу субјекта"
+
+#~ msgid "Subject Public Key Algorithm"
+#~ msgstr "Алгоритам јавног кључа субјекта"
+
+#~ msgid "Subject's Public Key"
+#~ msgstr "Јавни кључ субјекта"
+
+#~ msgid "Error: Unable to process extension"
+#~ msgstr "Грешка: не могу да обрадим проширење"
+
+#~ msgid "Object Signer"
+#~ msgstr "Потписник предмета"
+
+#~ msgid "SSL Certificate Authority"
+#~ msgstr "Издавач ССЛ уверења"
+
+#~ msgid "Email Certificate Authority"
+#~ msgstr "Издавач уверења ел. поште"
+
+#~ msgid "Signing"
+#~ msgstr "Потписивање"
+
+#~ msgid "Non-repudiation"
+#~ msgstr "Без одрицања"
+
+#~ msgid "Key Encipherment"
+#~ msgstr "Замућивање кључа"
+
+#~ msgid "Data Encipherment"
+#~ msgstr "Замућивање података"
+
+#~ msgid "Key Agreement"
+#~ msgstr "Сагласност кључа"
+
+#~ msgid "Certificate Signer"
+#~ msgstr "Потписник уверења"
+
+#~ msgid "CRL Signer"
+#~ msgstr "ЦРЛ потписник"
+
+#~ msgid "Critical"
+#~ msgstr "Критично"
+
+#~ msgid "Not Critical"
+#~ msgstr "Није критично"
+
+#~ msgid "Extensions"
+#~ msgstr "Проширења"
+
+#~ msgid "%s = %s"
+#~ msgstr "%s = %s"
+
+#~ msgid "Certificate Signature Algorithm"
+#~ msgstr "Алгоритам потписа уверења"
+
+#~ msgid "Issuer"
+#~ msgstr "Издавач"
+
+#~ msgid "Issuer Unique ID"
+#~ msgstr "Јединствени ИБ издавача"
+
+#~ msgid "Subject Unique ID"
+#~ msgstr "Јединствени ИБ субјекта"
+
+#~ msgid "Certificate Signature Value"
+#~ msgstr "Вредност потписа уверења"
diff --git a/po/sr@latin.po b/po/sr@latin.po
index 8a325e786b..775c6e3316 100644
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
@@ -4,17 +4,17 @@
 # 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, 2013.
-#: ../shell/main.c:557
+# Miroslav Nikolić <miroslavnikolic@rocketmail.com>, 2011—2014.
+#: ../shell/main.c:554
 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: 2013-11-17 00:25+0000\n"
-"PO-Revision-Date: 2013-11-30 10:04+0200\n"
+"POT-Creation-Date: 2014-03-16 05:28+0000\n"
+"PO-Revision-Date: 2014-03-16 11:14+0200\n"
 "Last-Translator: Miroslav Nikolić <miroslavnikolic@rocketmail.com>\n"
-"Language-Team: Serbian <(nothing)>\n"
+"Language-Team: Serbian <gnom@prevod.org>\n"
 "Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -116,8 +116,9 @@ msgid "Category editor not available."
 msgstr "Uređivač kategorija nije dostupan."
 
 #: ../addressbook/addressbook.error.xml.h:18
-msgid "Unable to open address book"
-msgstr "Ne mogu da otvorim adresar"
+#| msgid "Unable to open address book"
+msgid "Unable to open address book '{0}'"
+msgstr "Ne mogu da otvorim adresar „{0}“"
 
 #: ../addressbook/addressbook.error.xml.h:19
 msgid "Unable to perform search."
@@ -189,7 +190,21 @@ msgstr ""
 "istom adresom?"
 
 #: ../addressbook/addressbook.error.xml.h:33
-#: ../e-util/e-name-selector-dialog.c:997 ../mail/em-vfolder-editor-rule.c:397
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
+#: ../addressbook/gui/widgets/eab-contact-merging.c:626
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:4
+#: ../calendar/gui/dialogs/event-page.ui.h:22
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:19
+#: ../calendar/gui/dialogs/task-page.ui.h:30 ../e-util/filter.ui.h:16
+#: ../e-util/e-mail-signature-manager.c:327
+#: ../e-util/e-name-selector-dialog.c:995 ../mail/e-mail-account-manager.c:719
+#: ../mail/e-mail-label-manager.c:373 ../mail/em-vfolder-editor-rule.c:392
+#: ../mail/em-vfolder-editor-rule.c:622 ../mail/mail-config.ui.h:51
+#: ../modules/mail/em-composer-prefs.c:443
+#: ../plugins/attachment-reminder/attachment-reminder.c:557
+#: ../plugins/email-custom-header/email-custom-header.c:838
+#: ../plugins/publish-calendar/publish-calendar.ui.h:32
+#: ../plugins/templates/templates.c:453
 msgid "_Add"
 msgstr "_Dodaj"
 
@@ -226,7 +241,7 @@ msgstr ""
 "želite da ga dodate?"
 
 #: ../addressbook/addressbook.error.xml.h:40
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1251
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1250
 msgid "Failed to delete contact"
 msgstr "Nisam uspeo da obrišem kontakt"
 
@@ -247,10 +262,23 @@ msgstr ""
 "Adresar „{0}“ je samo za čitanje i nije podložan izmenama. Izaberite drugi "
 "adresar sa bočne trake u pregledu Kontakti."
 
+#: ../addressbook/addressbook.error.xml.h:45
+msgid "Cannot save a contact, address book is still opening"
+msgstr "Ne mogu da sačuvam kontakt, adresar se još uvek otvara"
+
+#. For Translators: {0} is the name of the address book source
+#: ../addressbook/addressbook.error.xml.h:47
+msgid ""
+"Cannot save a contact to the address book '{0}', because it is still "
+"opening. Either wait till it's opened, or select a different address book."
+msgstr ""
+"Ne mogu da sačuvam kontakt u adresar „{0}“, jer se još uvek otvara. Ili "
+"sačekajte dok se ne otvori, ili izaberite neki drugi adresar."
+
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:650
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:672
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2958
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:734
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:756
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3037
 msgid "Contact Editor"
 msgstr "Uređivač za kontakte"
 
@@ -287,11 +315,10 @@ msgid "_Wants to receive HTML mail"
 msgstr "_Želi da prima HTML poštu"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/merging/eab-contact-merging.c:409
+#: ../addressbook/gui/widgets/eab-contact-merging.c:408
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:590
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:942
-#: ../smime/lib/e-asn1-object.c:395
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:980
 msgid "Email"
 msgstr "El. pošta"
 
@@ -304,7 +331,7 @@ msgid "Instant Messaging"
 msgstr "Trenutne poruke"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
-#: ../addressbook/importers/evolution-vcard-importer.c:1003
+#: ../addressbook/importers/evolution-vcard-importer.c:971
 msgid "Contact"
 msgstr "Kontakt"
 
@@ -314,8 +341,8 @@ msgstr "_Lična strana:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 #: ../calendar/gui/dialogs/event-page.c:709
-#: ../calendar/gui/dialogs/event-page.ui.h:22
-#: ../modules/itip-formatter/itip-view.c:1889
+#: ../calendar/gui/dialogs/event-page.ui.h:25
+#: ../modules/itip-formatter/itip-view.c:1891
 msgid "_Calendar:"
 msgstr "_Kalendar:"
 
@@ -332,7 +359,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:97
+#: ../modules/cal-config-google/evolution-cal-config-google.c:96
 msgid "Calendar:"
 msgstr "Kalendar:"
 
@@ -379,21 +406,21 @@ msgid "_Department:"
 msgstr "_Odeljenje:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:30
+msgid "_Office:"
+msgstr "_Kancelarija:"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
 msgid "_Manager:"
 msgstr "_Rukovodilac:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:31
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
 msgid "_Assistant:"
 msgstr "_Pomoćnik:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:32
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
 msgid "Job"
 msgstr "Posao"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:33
-msgid "_Office:"
-msgstr "_Kancelarija:"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:34
 msgid "_Spouse:"
 msgstr "S_upružnik:"
@@ -407,8 +434,8 @@ msgid "_Anniversary:"
 msgstr "_Godišnjica:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:685
-#: ../calendar/gui/e-calendar-view.c:2278
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:692
+#: ../calendar/gui/e-calendar-view.c:2288
 msgid "Anniversary"
 msgstr "Godišnjica"
 
@@ -418,8 +445,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:684
-#: ../calendar/gui/e-calendar-view.c:2277 ../shell/main.c:128
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:691
+#: ../calendar/gui/e-calendar-view.c:2287 ../shell/main.c:127
 msgid "Birthday"
 msgstr "Rođendan"
 
@@ -456,27 +483,28 @@ msgid "_Address:"
 msgstr "_Adresa:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/e-contact-map.c:372
-#: ../addressbook/gui/widgets/eab-contact-display.c:357
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
+#: ../addressbook/gui/widgets/e-contact-map.c:371
+#: ../addressbook/gui/widgets/eab-contact-display.c:356
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:80
 msgid "Home"
 msgstr "Kuća"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:190
-#: ../addressbook/gui/widgets/e-contact-map.c:385
-#: ../addressbook/gui/widgets/eab-contact-display.c:354
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:80
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:666
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
+#: ../addressbook/gui/widgets/e-contact-map.c:384
+#: ../addressbook/gui/widgets/eab-contact-display.c:353
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:79
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:673
 msgid "Work"
 msgstr "Posao"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:82
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:368
-#: ../calendar/gui/e-cal-model.c:3963
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:367
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:726
+#: ../calendar/gui/e-cal-model.c:3957
 msgid "Other"
 msgstr "Drugo"
 
@@ -488,79 +516,170 @@ msgstr "Adresa stanovanja"
 msgid "Notes"
 msgstr "Napomene"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:170
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:593
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:52
+#: ../calendar/gui/dialogs/comp-editor.c:1250
+#: ../calendar/gui/dialogs/comp-editor.c:1336 ../e-util/e-send-options.ui.h:41
+#: ../e-util/e-preferences-window.c:379
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
+#: ../shell/e-shell-window-actions.c:1086
+msgid "_Help"
+msgstr "Po_moć"
+
+#. This is only shown if the EActivity has a GCancellable.
+#. no flags
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3575
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:223
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
+#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:17
+#: ../addressbook/gui/widgets/eab-contact-merging.c:362
+#: ../addressbook/gui/widgets/eab-contact-merging.c:621
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
+#: ../addressbook/gui/widgets/eab-gui-util.c:318
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
+#: ../calendar/gui/dialogs/goto-dialog.ui.h:15
+#: ../calendar/gui/dialogs/recurrence-page.c:2322
+#: ../composer/e-composer-actions.c:204 ../e-util/e-send-options.ui.h:42
+#: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
+#: ../e-util/e-activity-bar.c:299 ../e-util/e-attachment-dialog.c:311
+#: ../e-util/e-attachment-store.c:464 ../e-util/e-attachment-store.c:545
+#: ../e-util/e-attachment-view.c:370 ../e-util/e-categories-dialog.c:82
+#: ../e-util/e-category-editor.c:138 ../e-util/e-category-editor.c:208
+#: ../e-util/e-charset-combo-box.c:101 ../e-util/e-filter-datespec.c:291
+#: ../e-util/e-mail-signature-script-dialog.c:366 ../e-util/e-passwords.c:468
+#: ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180
+#: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:776
+#: ../e-util/e-source-config-dialog.c:375
+#: ../e-util/e-source-selector-dialog.c:348 ../e-util/e-table-config.c:548
+#: ../e-util/e-web-view.c:3092 ../e-util/evolution-source-viewer.c:832
+#: ../e-util/gal-view-instance-save-as-dialog.c:269
+#: ../mail/e-mail-config-window.c:331 ../mail/e-mail-label-dialog.c:196
+#: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:278
+#: ../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:635
+#: ../mail/mail-send-recv.c:717 ../mail/mail-vfolder-ui.c:148
+#: ../mail/mail-vfolder-ui.c:270
+#: ../modules/backup-restore/evolution-backup-tool.c:949
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:278
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:188
+#: ../modules/calendar/e-cal-attachment-handler.c:317
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
+#: ../plugins/face/face.c:291 ../plugins/mail-to-task/mail-to-task.c:593
+#: ../plugins/publish-calendar/publish-calendar.c:806
+#: ../plugins/publish-calendar/url-editor-dialog.c:421
+#: ../plugins/save-calendar/save-calendar.c:189 ../shell/e-shell-content.c:659
+#: ../shell/e-shell-content.c:766 ../shell/e-shell-utils.c:70
+#: ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:623
+#: ../smime/gui/e-cert-selector.c:232 ../smime/gui/smime-ui.ui.h:23
+#| msgid "Cancel"
+msgid "_Cancel"
+msgstr "_Otkaži"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
+#: ../addressbook/gui/widgets/eab-contact-merging.c:624
+#: ../calendar/calendar.error.xml.h:47
+#: ../calendar/gui/dialogs/comp-editor.c:1278
+#: ../composer/e-composer-actions.c:205 ../composer/e-composer-actions.c:296
+#: ../e-util/e-attachment-store.c:546
+#: ../e-util/e-mail-signature-script-dialog.c:370 ../e-util/e-web-view.c:3093
+#: ../e-util/gal-view-instance-save-as-dialog.c:270
+#: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:135
+msgid "_Save"
+msgstr "_Sačuvaj"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:599
 msgid "AIM"
 msgstr "AIM"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:171
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:602
 msgid "Jabber"
 msgstr "Džaber"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:604
 msgid "Yahoo"
 msgstr "Jahu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:599
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:605
 msgid "Gadu-Gadu"
 msgstr "Gadu-Gadu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:174
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:597
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:603
 msgid "MSN"
 msgstr "MSN"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:175
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:595
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:601
 msgid "ICQ"
 msgstr "ICKu"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:594
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
 msgid "GroupWise"
 msgstr "GroupVajz"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:606
 msgid "Skype"
 msgstr "Skajp"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:601
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:607
 msgid "Twitter"
 msgstr "Tviter"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:230
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
+#: ../calendar/gui/dialogs/comp-editor.c:1301 ../e-util/e-focus-tracker.c:121
+msgid "Undo"
+msgstr "Opozovi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:278
+#: ../calendar/gui/dialogs/comp-editor.c:1308 ../e-util/e-focus-tracker.c:137
+msgid "Redo"
+msgstr "Vrati"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
 #: ../addressbook/gui/widgets/eab-gui-util.c:503
 msgid "Error adding contact"
 msgstr "Greška pri dodavanju kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:250
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:330
 msgid "Error modifying contact"
 msgstr "Greška pri izmeni kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:270
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:350
 msgid "Error removing contact"
 msgstr "Greška pri uklanjanju kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:666
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:2952
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:750
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3031
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Uređivač za kontakte — %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3485
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3572
 msgid "Please select an image for this contact"
 msgstr "Izaberite sliku za ovaj kontakt"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3486
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3576
+#: ../e-util/e-category-editor.c:146 ../plugins/face/face.c:292
+#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:624
+#| msgid "Open"
+msgid "_Open"
+msgstr "_Otvori"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3577
 msgid "_No image"
 msgstr "_Bez slike"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3827
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3926
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -568,48 +687,77 @@ msgstr ""
 "Podaci o kontaktu nisu ispravni:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3833
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3932
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "„%s“ ima neispravan format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3841
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3940
 #, 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:3849
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3948
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s„%s“ ima neispravan format"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3862
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3876
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3961
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3975
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s„%s“ je prazan"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3891
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3990
 msgid "Invalid contact."
 msgstr "Neispravan kontakt."
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:452
+#: ../addressbook/gui/contact-editor/e-contact-editor-fullname.c:224
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:456
+#: ../addressbook/gui/contact-editor/fullname.ui.h:13
+#: ../addressbook/gui/widgets/eab-gui-util.c:319
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
+#: ../calendar/gui/dialogs/recurrence-page.c:2323
+#: ../e-util/e-send-options.ui.h:43 ../e-util/e-table-config.ui.h:3
+#: ../e-util/e-timezone-dialog.ui.h:3 ../e-util/e-attachment-dialog.c:313
+#: ../e-util/e-categories-dialog.c:83 ../e-util/e-category-editor.c:209
+#: ../e-util/e-charset-combo-box.c:102 ../e-util/e-filter-datespec.c:292
+#: ../e-util/e-passwords.c:469 ../e-util/e-rule-context.c:816
+#: ../e-util/e-rule-editor.c:181 ../e-util/e-rule-editor.c:283
+#: ../e-util/e-rule-editor.c:777 ../e-util/e-source-config-dialog.c:376
+#: ../e-util/e-source-selector-dialog.c:349 ../e-util/e-table-config.c:549
+#: ../mail/e-mail-config-window.c:332 ../mail/e-mail-tag-editor.c:243
+#: ../mail/em-folder-selector.c:279 ../mail/mail-config.ui.h:3
+#: ../mail/mail-dialogs.ui.h:26 ../mail/mail-vfolder-ui.c:149
+#: ../mail/mail-vfolder-ui.c:271
+#: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
+#: ../plugins/publish-calendar/url-editor-dialog.c:422
+#: ../shell/e-shell-content.c:661 ../shell/e-shell-content.c:767
+#: ../shell/main.c:167 ../smime/gui/e-cert-selector.c:233
+#: ../smime/gui/smime-ui.ui.h:24
+#| msgid "OK"
+msgid "_OK"
+msgstr "U _redu"
+
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:451
 msgid "Contact Quick-Add"
 msgstr "Brzo dodavanje kontakta"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:455
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:454
 msgid "_Edit Full"
 msgstr "_Uredi potpuno"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:508
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:507
 msgid "_Full name"
 msgstr "_Ime i prezime"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:521
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:520
 msgid "E_mail"
 msgstr "E-_pošta"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:534
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:533
 msgid "_Select Address Book"
 msgstr "_Izaberi adresar"
 
@@ -662,29 +810,29 @@ msgstr "Poš."
 msgid "Full Name"
 msgstr "Ime i prezime"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:13
+#: ../addressbook/gui/contact-editor/fullname.ui.h:15
 msgid "_First:"
 msgstr "_Ime:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:14
+#: ../addressbook/gui/contact-editor/fullname.ui.h:16
 msgctxt "FullName"
 msgid "_Title:"
 msgstr "_Zvanje:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:15
+#: ../addressbook/gui/contact-editor/fullname.ui.h:17
 msgid "_Middle:"
 msgstr "_Srednje:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:16
+#: ../addressbook/gui/contact-editor/fullname.ui.h:18
 msgid "_Last:"
 msgstr "_Prezime:"
 
-#: ../addressbook/gui/contact-editor/fullname.ui.h:17
+#: ../addressbook/gui/contact-editor/fullname.ui.h:19
 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:818
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:817
 msgid "Contact List Editor"
 msgstr "Uređivač kontakt liste"
 
@@ -708,115 +856,159 @@ msgstr "_Sakrij adrese kada šalješ poštu na ovna spisku"
 msgid "Add an email to the List"
 msgstr "Dodajte el. poštu na spisak"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
 msgid "Remove an email address from the List"
 msgstr "Uklonite adresu el. pošte sa spiska"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:9
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:5
+#: ../calendar/gui/dialogs/event-page.ui.h:23
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:21
+#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/filter.ui.h:18
+#: ../e-util/e-attachment-view.c:424 ../e-util/e-filter-rule.c:224
+#: ../e-util/e-mail-signature-manager.c:367
+#: ../e-util/e-name-selector-dialog.c:999 ../mail/e-mail-label-manager.c:391
+#: ../mail/em-filter-rule.c:440 ../mail/em-vfolder-editor-rule.c:627
+#: ../mail/mail-config.ui.h:52
+#: ../plugins/attachment-reminder/attachment-reminder.c:567
+#: ../plugins/email-custom-header/email-custom-header.c:848
+#: ../plugins/publish-calendar/publish-calendar.c:807
+#: ../plugins/publish-calendar/publish-calendar.ui.h:34
+#: ../plugins/templates/templates.c:463
+msgid "_Remove"
+msgstr "_Ukloni"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:11
 msgid "Insert email addresses from Address Book"
 msgstr "Umetnite adrese el. pošte iz adresara"
 
-#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:10
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:12
 msgid "_Select..."
 msgstr "_Izaberi..."
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:941
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:13
+#: ../e-util/filter.ui.h:19
+msgid "_Top"
+msgstr "_Vrh"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:14
+#: ../e-util/filter.ui.h:20
+#| msgid "_Update"
+msgid "_Up"
+msgstr "_Gore"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:15
+#: ../e-util/filter.ui.h:21
+msgid "_Down"
+msgstr "Do_le"
+
+#: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:16
+#: ../e-util/filter.ui.h:22
+msgid "_Bottom"
+msgstr "D_no"
+
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:942
 msgid "Contact List Members"
 msgstr "Članovi kontakt liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1475
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1486
 msgid "_Members"
 msgstr "_Članovi"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1597
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1626
 msgid "Error adding list"
 msgstr "Greška pri dodavanju liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1617
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1646
 msgid "Error modifying list"
 msgstr "Greška pri izmeni liste"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1637
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1666
 msgid "Error removing list"
 msgstr "Greška pri uklanjanju liste"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:1
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:1
+#: ../addressbook/gui/widgets/eab-contact-merging.c:243
+#: ../calendar/gui/tasktypes.xml.h:14
+msgid "Cancelled"
+msgstr "Otkazano"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:345
+msgid "Merge Contact"
+msgstr "Pripoji kontakt"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:363
+#: ../addressbook/gui/widgets/eab-contact-merging.c:627
+msgid "_Merge"
+msgstr "_Stopi"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:616
 msgid "Duplicate Contact Detected"
 msgstr "Otkriven dupli kontakt"
 
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:2
+#: ../addressbook/gui/widgets/eab-contact-merging.c:674
+#| msgid ""
+#| "The name or email of this contact already exists in this folder. Would "
+#| "you like to save the changes anyway?"
 msgid ""
-"The name or email of this contact already exists in this folder. Would you "
-"like to save the changes anyway?"
+"The name or email address of this contact already exists\n"
+"in this folder. Would you like to save the changes anyway?"
 msgstr ""
-"Naziv ili el. pošta ovog kontakta već postoji u ovoj fascikli. Da li želite "
-"ipak da ga dodate?"
+"Naziv ili adresa el. pošte ovog kontakta već postoji u\n"
+"ovoj fascikli. Da li ipak želite da sačuvate izmene?"
 
-#. Translators: Heading of the contact which has same name or email address in this folder already.
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:4
-msgid "Conflicting Contact:"
-msgstr "Sporan kontakt:"
-
-#: ../addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui.h:5
-msgid "Changed Contact:"
-msgstr "Izmenjen kontakt:"
-
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:2
-#: ../addressbook/gui/merging/eab-contact-merging.c:364
-msgid "_Merge"
-msgstr "_Stopi"
-
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:3
+#: ../addressbook/gui/widgets/eab-contact-merging.c:677
+#| msgid ""
+#| "The name or email address of this contact already exists\n"
+#| "in this folder.  Would you like to add it anyway?"
 msgid ""
 "The name or email address of this contact already exists\n"
-"in this folder.  Would you like to add it anyway?"
+"in this folder. Would you like to add it anyway?"
 msgstr ""
-"Naziv ili elektronska adresa ovog kontakta već postoji\n"
-"u ovoj fascikli. Da li želite ipak da  ga dodate?"
+"Naziv ili adresa el. pošte ovog kontakta već postoji\n"
+"u ovoj fascikli. Da li ipak želite da ga dodate?"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:5
-msgid "Original Contact:"
-msgstr "Originalan kontakt:"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:692
+msgid "Changed Contact:"
+msgstr "Izmenjen kontakt:"
 
-#: ../addressbook/gui/merging/eab-contact-duplicate-detected.ui.h:6
+#: ../addressbook/gui/widgets/eab-contact-merging.c:694
 msgid "New Contact:"
 msgstr "Novi kontakt:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:244
-#: ../calendar/gui/tasktypes.xml.h:14
-msgid "Cancelled"
-msgstr "Otkazano"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:733
+msgid "Conflicting Contact:"
+msgstr "Sporan kontakt:"
 
-#: ../addressbook/gui/merging/eab-contact-merging.c:346
-msgid "Merge Contact"
-msgstr "Pripoji kontakt"
+#: ../addressbook/gui/widgets/eab-contact-merging.c:735
+#| msgid "Contact: "
+msgid "Old Contact:"
+msgstr "Stari kontakt: "
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1151
+#: ../modules/addressbook/e-book-shell-view-actions.c:1150
 msgid "Name contains"
 msgstr "Naziv sadrži"
 
 #: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1144
+#: ../modules/addressbook/e-book-shell-view-actions.c:1143
 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:1137
-#: ../modules/calendar/e-cal-shell-view-actions.c:1771
-#: ../modules/calendar/e-memo-shell-view-actions.c:791
-#: ../modules/calendar/e-task-shell-view-actions.c:990
+#: ../modules/addressbook/e-book-shell-view-actions.c:1136
+#: ../modules/calendar/e-cal-shell-view-actions.c:1770
+#: ../modules/calendar/e-memo-shell-view-actions.c:790
+#: ../modules/calendar/e-task-shell-view-actions.c:989
 msgid "Any field contains"
 msgstr "Polje koje sadrži"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:163
+#: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
 msgstr "Nema kontakta"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:167
+#: ../addressbook/gui/widgets/e-addressbook-model.c:166
 #, c-format
 msgid "%d contact"
 msgid_plural "%d contacts"
@@ -825,67 +1017,81 @@ msgstr[1] "%d kontakta"
 msgstr[2] "%d kontakata"
 msgstr[3] "jedan kontakt"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:373
+#: ../addressbook/gui/widgets/e-addressbook-model.c:372
 msgid "Error getting book view"
 msgstr "Greška pri učitavanju pregleda knjige"
 
-#: ../addressbook/gui/widgets/e-addressbook-model.c:820
+#: ../addressbook/gui/widgets/e-addressbook-model.c:819
 msgid "Search Interrupted"
 msgstr "Pretraga je prekinuta"
 
-#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:204
+#: ../addressbook/gui/widgets/e-addressbook-table-adapter.c:203
 msgid "Error modifying card"
 msgstr "Greška pri izmeni karte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:649
+#: ../addressbook/gui/widgets/e-addressbook-view.c:648
 msgid "Cut selected contacts to the clipboard"
 msgstr "Seče označene kontakte u spisak isečaka"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:655
+#: ../addressbook/gui/widgets/e-addressbook-view.c:654
 msgid "Copy selected contacts to the clipboard"
 msgstr "Umnožava označene kontakte u spisak isečaka"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:661
+#: ../addressbook/gui/widgets/e-addressbook-view.c:660
 msgid "Paste contacts from the clipboard"
 msgstr "Ubacuje kontakte iz spiska isečaka"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:667
-#: ../modules/addressbook/e-book-shell-view-actions.c:951
+#: ../addressbook/gui/widgets/e-addressbook-view.c:666
+#: ../modules/addressbook/e-book-shell-view-actions.c:950
 msgid "Delete selected contacts"
 msgstr "Briše izabrane kontakte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:673
+#: ../addressbook/gui/widgets/e-addressbook-view.c:672
 msgid "Select all visible contacts"
 msgstr "Označava sve vidljive kontakte"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1299
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1298
 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:1303
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1302
 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:1307
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1306
 #, c-format
 msgid "Are you sure you want to delete this contact list (%s)?"
 msgstr "Sigurno želite da obrišete ovaj spisak kontakta (%s)?"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1313
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1312
 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:1317
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1316
 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:1321
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1320
 #, c-format
 msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Sigurno želite da obrišete ovaj kontakt (%s)?"
 
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1331
+#: ../calendar/gui/dialogs/comp-editor.c:1243
+#: ../e-util/e-categories-editor.c:282 ../e-util/e-focus-tracker.c:740
+#: ../e-util/evolution-source-viewer.c:803
+#: ../mail/e-mail-account-manager.c:737
+#: ../modules/addressbook/e-book-shell-view-actions.c:1022
+#: ../modules/calendar/e-cal-shell-view-actions.c:1593
+#: ../modules/calendar/e-memo-shell-view-actions.c:692
+#: ../modules/calendar/e-task-shell-view-actions.c:844
+#: ../modules/mail/e-mail-shell-view-actions.c:1561
+#: ../shell/e-shell-window-actions.c:944 ../smime/gui/smime-ui.ui.h:10
+msgid "_Delete"
+msgstr "_Obriši"
+
 #. Translators: This is shown for > 5 contacts.
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1477
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1476
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -906,11 +1112,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:1485
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1484
 msgid "_Don't Display"
 msgstr "_Ne prikazuj"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.c:1486
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1485
 msgid "Display _All Contacts"
 msgstr "Prikaži _sve kontakte"
 
@@ -927,7 +1133,7 @@ msgid "Family Name"
 msgstr "Prezime"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:592
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
 msgid "Nickname"
 msgstr "Nadimak"
 
@@ -984,7 +1190,7 @@ msgid "ISDN Phone"
 msgstr "ISDN telefon"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:682
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:689
 msgid "Mobile Phone"
 msgstr "Mobilni telefon"
 
@@ -1023,7 +1229,7 @@ msgid "TTYTDD"
 msgstr "TTUTDD"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:645
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
 msgid "Company"
 msgstr "Preduzeće"
 
@@ -1032,6 +1238,7 @@ msgid "Unit"
 msgstr "Jedinica"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
 msgid "Office"
 msgstr "Kancelarija"
 
@@ -1046,12 +1253,12 @@ msgid "Role"
 msgstr "Uloga"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:649
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
 msgid "Manager"
 msgstr "Rukovodilac"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:650
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:657
 msgid "Assistant"
 msgstr "Pomoćnik"
 
@@ -1067,25 +1274,44 @@ 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 ../e-util/e-categories-dialog.c:89
+#: ../calendar/gui/e-memo-table.etspec.h:4 ../e-util/e-categories-dialog.c:87
 msgid "Categories"
 msgstr "Kategorije"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:693
 msgid "Spouse"
 msgstr "Supružnik"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:718
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:748
 msgid "Note"
 msgstr "Napomena"
 
-#: ../addressbook/gui/widgets/e-contact-map-window.c:374
+#: ../addressbook/gui/widgets/e-contact-map-window.c:375
 msgid "Contacts Map"
 msgstr "Karta kontakata"
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:191
+#. Zoom-in button
+#: ../addressbook/gui/widgets/e-contact-map-window.c:410
+#| msgid "_Zoom In"
+msgid "Zoom _In"
+msgstr "U_većaj"
+
+#. Zoom-out button
+#: ../addressbook/gui/widgets/e-contact-map-window.c:418
+#: ../mail/e-mail-reader.c:2226
+msgid "Zoom _Out"
+msgstr "U_manji"
+
+#. Search button
+#: ../addressbook/gui/widgets/e-contact-map-window.c:448
+#: ../shell/e-shell-window-actions.c:1021
+#| msgid "_Find Now"
+msgid "_Find"
+msgstr "_Nađi"
+
+#: ../addressbook/gui/widgets/e-minicard-view.c:190
 msgid ""
 "\n"
 "\n"
@@ -1095,7 +1321,7 @@ msgstr ""
 "\n"
 "Tražim kontakte..."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:194
+#: ../addressbook/gui/widgets/e-minicard-view.c:193
 msgid ""
 "\n"
 "\n"
@@ -1109,7 +1335,7 @@ msgstr ""
 "\n"
 "ili kliknite dvaput ovde da napravite novi kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:197
+#: ../addressbook/gui/widgets/e-minicard-view.c:196
 msgid ""
 "\n"
 "\n"
@@ -1123,7 +1349,7 @@ msgstr ""
 "\n"
 "Kliknite dvaput da napravite nov kontakt."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:201
+#: ../addressbook/gui/widgets/e-minicard-view.c:200
 msgid ""
 "\n"
 "\n"
@@ -1133,7 +1359,7 @@ msgstr ""
 "\n"
 "Pretraga za kontaktima."
 
-#: ../addressbook/gui/widgets/e-minicard-view.c:203
+#: ../addressbook/gui/widgets/e-minicard-view.c:202
 msgid ""
 "\n"
 "\n"
@@ -1143,16 +1369,16 @@ msgstr ""
 "\n"
 "Nema stavki za prikazivanje."
 
-#: ../addressbook/gui/widgets/e-minicard.c:93
+#: ../addressbook/gui/widgets/e-minicard.c:92
 msgid "Work Email"
 msgstr "Poslovna el. pošta"
 
-#: ../addressbook/gui/widgets/e-minicard.c:94
+#: ../addressbook/gui/widgets/e-minicard.c:93
 msgid "Home Email"
 msgstr "Kućna el. pošta"
 
-#: ../addressbook/gui/widgets/e-minicard.c:95
-#: ../addressbook/gui/widgets/e-minicard.c:828
+#: ../addressbook/gui/widgets/e-minicard.c:94
+#: ../addressbook/gui/widgets/e-minicard.c:827
 msgid "Other Email"
 msgstr "Druga el. pošta"
 
@@ -1164,21 +1390,21 @@ msgstr "Druga el. pošta"
 # 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
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:94
+#: ../addressbook/gui/widgets/ea-addressbook-view.c:103
+#: ../addressbook/gui/widgets/ea-minicard-view.c:193
 msgid "evolution address book"
 msgstr "Adresar Evolucije"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+#: ../addressbook/gui/widgets/ea-minicard-view.c:35
 msgid "New Contact"
 msgstr "Novi kontakt"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:37
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
 msgid "New Contact List"
 msgstr "Nova kontakt lista"
 
-#: ../addressbook/gui/widgets/ea-minicard-view.c:177
+#: ../addressbook/gui/widgets/ea-minicard-view.c:176
 #, c-format
 msgid "current address book folder %s has %d card"
 msgid_plural "current address book folder %s has %d cards"
@@ -1187,133 +1413,134 @@ 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
+#: ../addressbook/gui/widgets/ea-minicard.c:33
 msgid "Open"
 msgstr "Otvori"
 
-#: ../addressbook/gui/widgets/ea-minicard.c:160
+#: ../addressbook/gui/widgets/ea-minicard.c:159
 msgid "Contact List: "
 msgstr "Spisak kontakta: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:161
+#: ../addressbook/gui/widgets/ea-minicard.c:160
 msgid "Contact: "
 msgstr "Kontakt: "
 
-#: ../addressbook/gui/widgets/ea-minicard.c:188
+#: ../addressbook/gui/widgets/ea-minicard.c:187
 msgid "evolution minicard"
 msgstr "minikarta evolucije"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:150
+#: ../addressbook/gui/widgets/eab-contact-display.c:149
 msgid "Copy _Email Address"
 msgstr "Umnoži elektronsku _adresu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:152
-#: ../e-util/e-web-view-gtkhtml.c:428 ../e-util/e-web-view.c:307
+#: ../addressbook/gui/widgets/eab-contact-display.c:151
+#: ../e-util/e-web-view-gtkhtml.c:427 ../e-util/e-web-view.c:304
 msgid "Copy the email address to the clipboard"
 msgstr "Umnožava adrese u spisak isečaka"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:157
-#: ../e-util/e-web-view-gtkhtml.c:433 ../e-util/e-web-view.c:312
+#: ../addressbook/gui/widgets/eab-contact-display.c:156
+#: ../e-util/e-web-view-gtkhtml.c:432 ../e-util/e-web-view.c:309
 msgid "_Send New Message To..."
 msgstr "_Pošalji poruku za..."
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:159
-#: ../e-util/e-web-view-gtkhtml.c:435 ../e-util/e-web-view.c:314
+#: ../addressbook/gui/widgets/eab-contact-display.c:158
+#: ../e-util/e-web-view-gtkhtml.c:434 ../e-util/e-web-view.c:311
 msgid "Send a mail message to this address"
 msgstr "Šalje poruku na ovu adresu"
 
-#: ../addressbook/gui/widgets/eab-contact-display.c:291
-#: ../e-util/e-web-view-gtkhtml.c:970 ../e-util/e-web-view.c:990
+#: ../addressbook/gui/widgets/eab-contact-display.c:290
+#: ../e-util/e-web-view-gtkhtml.c:969 ../e-util/e-web-view.c:992
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite da pošaljete %s"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:137
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:136
 msgid "Open map"
 msgstr "Otvorite mapu"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:529
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:535
 msgid "List Members:"
 msgstr "Članovi liste:"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:646
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
 msgid "Department"
 msgstr "Odeljenje"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:647
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
 msgid "Profession"
 msgstr "Zanimanje"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:648
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
 msgid "Position"
 msgstr "Položaj"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:658
 msgid "Video Chat"
 msgstr "Video razgovor"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
-#: ../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:591
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:659
+#: ../e-util/e-send-options.c:545
+#: ../modules/calendar/e-cal-shell-view-actions.c:215
+#: ../modules/calendar/e-cal-shell-view-actions.c:244
+#: ../modules/calendar/e-cal-shell-view.c:590
 #: ../plugins/publish-calendar/publish-calendar.ui.h:21
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
-#: ../calendar/gui/dialogs/event-editor.c:116
-#: ../calendar/gui/dialogs/event-editor.c:343
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:660
+#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:342
 #: ../plugins/publish-calendar/publish-calendar.ui.h:2
 msgid "Free/Busy"
 msgstr "Slobodno/zauzeto"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:661
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:688
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:662
 msgid "Fax"
 msgstr "Faks"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:683
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:663
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:690
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:716
 msgid "Address"
 msgstr "Adresa"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:679
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
 msgid "Home Page"
 msgstr "Matična stranica"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:680
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:687
 msgid "Web Log"
 msgstr "Veb log"
 
 # Create the default Person calendar
 # Create the default Person task list
 # orange
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:696
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
 msgid "Personal"
 msgstr "Lično"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:906
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:944
 msgid "List Members"
 msgstr "Članovi liste"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:927
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:965
 msgid "Job Title"
 msgstr "Zvanje na poslu"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:968
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1006
 msgid "Home page"
 msgstr "Matična stranica"
 
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:978
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1016
 msgid "Blog"
 msgstr "Blog"
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:123
+#: ../addressbook/gui/widgets/eab-gui-util.c:121
 msgid ""
 "This address book cannot be opened. This either means this book is not "
 "marked for offline usage or not yet downloaded for offline usage. Please "
@@ -1323,7 +1550,7 @@ msgstr ""
 "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:142
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
 #, c-format
 msgid ""
 "This address book cannot be opened.  Please check that the path %s exists "
@@ -1332,7 +1559,7 @@ 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:155
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
 msgid ""
 "This version of Evolution does not have LDAP support compiled in to it.  To "
 "use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
@@ -1341,7 +1568,7 @@ msgstr ""
 "koristite LDAP u Evoluciji, morate da instalirate paket Evolucije sa "
 "podrškom za LDAP."
 
-#: ../addressbook/gui/widgets/eab-gui-util.c:164
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
 msgid ""
 "This address book cannot be opened.  This either means that an incorrect URI "
 "was entered, or the server is unreachable."
@@ -1349,7 +1576,7 @@ 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:174
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
 msgid "Detailed error message:"
 msgstr "Detalji greške:"
 
@@ -1425,108 +1652,108 @@ msgstr "Premesti kontakte u"
 msgid "Copy contacts to"
 msgstr "Umnoži kontakte u"
 
-#: ../addressbook/importers/evolution-csv-importer.c:747
-#: ../addressbook/importers/evolution-ldif-importer.c:549
-#: ../addressbook/importers/evolution-vcard-importer.c:281
-#: ../calendar/importers/icalendar-importer.c:440
-#: ../calendar/importers/icalendar-importer.c:935
-#: ../calendar/importers/icalendar-importer.c:974 ../shell/shell.error.xml.h:1
+#: ../addressbook/importers/evolution-csv-importer.c:746
+#: ../addressbook/importers/evolution-ldif-importer.c:548
+#: ../addressbook/importers/evolution-vcard-importer.c:249
+#: ../calendar/importers/icalendar-importer.c:439
+#: ../calendar/importers/icalendar-importer.c:934
+#: ../calendar/importers/icalendar-importer.c:973 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Uvozim..."
 
-#: ../addressbook/importers/evolution-csv-importer.c:1082
+#: ../addressbook/importers/evolution-csv-importer.c:1081
 msgid "Outlook Contacts CSV or Tab (.csv, .tab)"
 msgstr "Autluk kontakti CSV ili Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1083
+#: ../addressbook/importers/evolution-csv-importer.c:1082
 msgid "Outlook Contacts CSV and Tab Importer"
 msgstr "Autlukov uvoznik CSV i Tab kontakata"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1091
+#: ../addressbook/importers/evolution-csv-importer.c:1090
 msgid "Mozilla Contacts CSV or Tab (.csv, .tab)"
 msgstr "Mozila kontakti CSV ili Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1092
+#: ../addressbook/importers/evolution-csv-importer.c:1091
 msgid "Mozilla Contacts CSV and Tab Importer"
 msgstr "Mozilin uvoznik CSV i Tab kontakata"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1100
+#: ../addressbook/importers/evolution-csv-importer.c:1099
 msgid "Evolution Contacts CSV or Tab (.csv, .tab)"
 msgstr "Evolucija kontakti CSV ili Tab (.csv, .tab)"
 
-#: ../addressbook/importers/evolution-csv-importer.c:1101
+#: ../addressbook/importers/evolution-csv-importer.c:1100
 msgid "Evolution Contacts CSV and Tab Importer"
 msgstr "Evolucijin uvoznik CSV i Tab kontakata"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:807
+#: ../addressbook/importers/evolution-ldif-importer.c:806
 msgid "LDAP Data Interchange Format (.ldif)"
 msgstr "LDAP oblik razmene podataka (.ldif)"
 
-#: ../addressbook/importers/evolution-ldif-importer.c:808
+#: ../addressbook/importers/evolution-ldif-importer.c:807
 msgid "Evolution LDIF importer"
 msgstr "Evolucijin LDIF uvoznik"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:666
+#: ../addressbook/importers/evolution-vcard-importer.c:634
 msgid "vCard (.vcf, .gcrd)"
 msgstr "vKarta (.vcf, .gcrd)"
 
-#: ../addressbook/importers/evolution-vcard-importer.c:667
+#: ../addressbook/importers/evolution-vcard-importer.c:635
 msgid "Evolution vCard Importer"
 msgstr "Evolucijin vKart uvoznik"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:764
+#: ../addressbook/printing/e-contact-print.c:763
 #, c-format
 msgid "Page %d"
 msgstr "%d. stranica"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:58
 msgid "Specify the output file instead of standard output"
 msgstr "Navedite izlaznu datoteku umesto standardnog izlaza"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:60
+#: ../addressbook/tools/evolution-addressbook-export.c:59
 msgid "OUTPUTFILE"
 msgstr "IZLAZNA-DATOTEKA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:63
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid "List local address book folders"
 msgstr "Navodi fascikle lokalnog adresara"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:66
+#: ../addressbook/tools/evolution-addressbook-export.c:65
 msgid "Show cards as vcard or csv file"
 msgstr "Prikazuje karte kao vkartu ili csv datoteku"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:67
+#: ../addressbook/tools/evolution-addressbook-export.c:66
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:136
+#: ../addressbook/tools/evolution-addressbook-export.c:133
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Greška u argumentima naredbe, koristite opciju „--help“ da vidite kako se "
 "koristi."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:150
+#: ../addressbook/tools/evolution-addressbook-export.c:147
 msgid "Only support csv or vcard format."
 msgstr "Podržava samo csv ili vkard oblik."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:181
+#: ../addressbook/tools/evolution-addressbook-export.c:178
 msgid "Unhandled error"
 msgstr "Nepoznata greška"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:625
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:46
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:624
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
 msgid "Can not open file"
 msgstr "Ne mogu da otvorim datoteku"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:76
+#: ../addressbook/tools/evolution-addressbook-export-list-folders.c:75
 #, c-format
 msgid "Failed to open client '%s': %s"
 msgstr "Nisam uspeo da otvorim „%s“: %s"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:106
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
 msgstr[0] "minut"
@@ -1534,7 +1761,7 @@ msgstr[1] "minuta"
 msgstr[2] "minuta"
 msgstr[3] "minut"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:119
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:118
 msgid "hour"
 msgid_plural "hours"
 msgstr[0] "sat"
@@ -1545,8 +1772,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:132
-#: ../calendar/gui/dialogs/recurrence-page.c:1248
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:131
+#: ../calendar/gui/dialogs/recurrence-page.c:1249
 msgid "day"
 msgid_plural "days"
 msgstr[0] "dan"
@@ -1554,7 +1781,7 @@ msgstr[1] "dana"
 msgstr[2] "dana"
 msgstr[3] "dan"
 
-#: ../calendar/alarm-notify/alarm-notify-dialog.c:329
+#: ../calendar/alarm-notify/alarm-notify-dialog.c:343
 msgid "Start time"
 msgstr "Vreme početka"
 
@@ -1570,74 +1797,98 @@ msgstr "Zanemari _sve"
 msgid "_Snooze"
 msgstr "_Dremanje"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:4 ../e-util/e-alert-dialog.c:166
+#: ../calendar/alarm-notify/alarm-notify.ui.h:4
+#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:6
+#: ../calendar/gui/dialogs/comp-editor.c:1322
+#: ../calendar/gui/dialogs/event-page.ui.h:24
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
+#: ../calendar/gui/dialogs/task-page.ui.h:32 ../e-util/filter.ui.h:17
+#: ../e-util/e-categories-editor.c:278
+#: ../e-util/e-mail-signature-manager.c:357
+#: ../mail/e-mail-account-manager.c:728 ../mail/e-mail-browser.c:170
+#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:56
+#: ../plugins/attachment-reminder/attachment-reminder.c:562
+#: ../plugins/email-custom-header/email-custom-header.c:843
+#: ../plugins/mail-to-task/mail-to-task.c:594
+#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1072
+#: ../smime/gui/smime-ui.ui.h:13
+msgid "_Edit"
+msgstr "_Uređivanje"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#| msgid "Print"
+msgid "_Print"
+msgstr "_Štampaj"
+
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:165
 msgid "_Dismiss"
 msgstr "_Zanemari"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:5
+#: ../calendar/alarm-notify/alarm-notify.ui.h:7
 #: ../calendar/alarm-notify/alarm-queue.c:1835
 #: ../calendar/alarm-notify/alarm-queue.c:1845
-#: ../modules/cal-config-weather/evolution-cal-config-weather.c:190
-#: ../modules/itip-formatter/itip-view.c:1501
-#: ../modules/itip-formatter/itip-view.c:1612
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:249
+#: ../modules/itip-formatter/itip-view.c:1503
+#: ../modules/itip-formatter/itip-view.c:1614
 msgid "Location:"
 msgstr "Mesto:"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6
+#: ../calendar/alarm-notify/alarm-notify.ui.h:8
 msgid "location of appointment"
 msgstr "mesto sastanka"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:7
+#: ../calendar/alarm-notify/alarm-notify.ui.h:9
 msgid "Snooze _time:"
 msgstr "Vreme _dremanja:"
 
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../calendar/alarm-notify/alarm-notify.ui.h:8
+#: ../calendar/alarm-notify/alarm-notify.ui.h:10
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../e-util/filter.ui.h:8
-#: ../e-util/e-interval-chooser.c:143
-#: ../modules/calendar/e-cal-shell-view-actions.c:352
+#: ../e-util/e-interval-chooser.c:142
+#: ../modules/calendar/e-cal-shell-view-actions.c:351
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "days"
 msgstr "dana"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:9
+#: ../calendar/alarm-notify/alarm-notify.ui.h:11
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
 #: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/filter.ui.h:7
-#: ../e-util/e-interval-chooser.c:141
+#: ../e-util/e-interval-chooser.c:140
 msgid "hours"
 msgstr "sati"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:10
+#: ../calendar/alarm-notify/alarm-notify.ui.h:12
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
 #: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/filter.ui.h:6
-#: ../e-util/e-interval-chooser.c:139
-#: ../mail/e-mail-config-provider-page.c:527
+#: ../e-util/e-interval-chooser.c:138
+#: ../mail/e-mail-config-provider-page.c:526
 msgid "minutes"
 msgstr "minuta"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1679
+#: ../calendar/alarm-notify/alarm-queue.c:1678
 #: ../calendar/alarm-notify/alarm-queue.c:1815
 msgid "No summary available."
 msgstr "Nema dostupnog sažetka."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1688
-#: ../calendar/alarm-notify/alarm-queue.c:1690
+#: ../calendar/alarm-notify/alarm-queue.c:1687
+#: ../calendar/alarm-notify/alarm-queue.c:1689
 msgid "No description available."
 msgstr "Nema dostupnog opisa."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1698
+#: ../calendar/alarm-notify/alarm-queue.c:1697
 msgid "No location information available."
 msgstr "Nema dostupnog podatka o lokaciji."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1703
+#: ../calendar/alarm-notify/alarm-queue.c:1702
 #: ../calendar/alarm-notify/alarm-queue.c:1806
-#: ../calendar/alarm-notify/alarm-queue.c:2145
+#: ../calendar/alarm-notify/alarm-queue.c:2147
 msgid "Evolution Reminders"
 msgstr "Podsetnici Evolucije"
 
 # bug(slobo): plural-forms. Report this one to bugzilla.gnome.org
-#: ../calendar/alarm-notify/alarm-queue.c:1747
+#: ../calendar/alarm-notify/alarm-queue.c:1746
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
@@ -1650,6 +1901,17 @@ msgstr[3] "Imate jedan potsetnik"
 msgid "Warning"
 msgstr "Upozorenje"
 
+#: ../calendar/alarm-notify/alarm-queue.c:1966 ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail.error.xml.h:139
+#: ../modules/mailto-handler/evolution-mailto-handler.c:114
+msgid "_No"
+msgstr "_Ne"
+
+#: ../calendar/alarm-notify/alarm-queue.c:1967 ../mail/mail.error.xml.h:138
+#: ../modules/mailto-handler/evolution-mailto-handler.c:115
+msgid "_Yes"
+msgstr "_Da"
+
 #: ../calendar/alarm-notify/alarm-queue.c:1971
 #, c-format
 msgid ""
@@ -1671,13 +1933,13 @@ msgstr ""
 msgid "Do not ask me about this program again."
 msgstr "Ne pitaj me ponovo za ovaj program."
 
-#: ../calendar/alarm-notify/util.c:44
+#: ../calendar/alarm-notify/util.c:43
 msgid "invalid time"
 msgstr "neispravno vreme"
 
 #. Translator: Entire string is like "Pop up an alert %d hours before start of appointment"
-#: ../calendar/alarm-notify/util.c:70 ../calendar/gui/e-alarm-list.c:370
-#: ../calendar/gui/misc.c:96
+#: ../calendar/alarm-notify/util.c:69 ../calendar/gui/e-alarm-list.c:369
+#: ../calendar/gui/misc.c:103
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -1687,8 +1949,8 @@ msgstr[2] "%d sati"
 msgstr[3] "Jedan sat"
 
 #. Translator: Entire string is like "Pop up an alert %d minutes before start of appointment"
-#: ../calendar/alarm-notify/util.c:76 ../calendar/gui/e-alarm-list.c:376
-#: ../calendar/gui/misc.c:102
+#: ../calendar/alarm-notify/util.c:75 ../calendar/gui/e-alarm-list.c:375
+#: ../calendar/gui/misc.c:109
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -1700,8 +1962,8 @@ msgstr[3] "Jedan minut"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
 #. Translator: Entire string is like "Pop up an alert %d seconds before start of appointment"
 #. TRANSLATORS: here, "second" is the time division (like "minute"), not the ordinal number (like "third")
-#: ../calendar/alarm-notify/util.c:80 ../calendar/gui/e-alarm-list.c:382
-#: ../calendar/gui/misc.c:106
+#: ../calendar/alarm-notify/util.c:79 ../calendar/gui/e-alarm-list.c:381
+#: ../calendar/gui/misc.c:113
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -1732,7 +1994,7 @@ msgid "_Send Notice"
 msgstr "Pošalji po_dsetnik"
 
 #: ../calendar/calendar.error.xml.h:5
-#: ../calendar/gui/dialogs/delete-comp.c:193
+#: ../calendar/gui/dialogs/delete-comp.c:192
 #, c-format
 msgid "Are you sure you want to delete this meeting?"
 msgstr "Sigurno želite da obrišete ovaj sastanak?"
@@ -1752,7 +2014,7 @@ msgstr ""
 "znati da je zadatak obrisan."
 
 #: ../calendar/calendar.error.xml.h:9
-#: ../calendar/gui/dialogs/delete-comp.c:196
+#: ../calendar/gui/dialogs/delete-comp.c:195
 #, c-format
 msgid "Are you sure you want to delete this task?"
 msgstr "Sigurno želite da obrišete ovaj zadatak?"
@@ -1777,7 +2039,7 @@ msgstr ""
 "znati da je beleška obrisana."
 
 #: ../calendar/calendar.error.xml.h:13
-#: ../calendar/gui/dialogs/delete-comp.c:199
+#: ../calendar/gui/dialogs/delete-comp.c:198
 #, c-format
 msgid "Are you sure you want to delete this memo?"
 msgstr "Sigurno želite da obrišete ovu belešku?"
@@ -1946,10 +2208,6 @@ 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:297
-msgid "_Save"
-msgstr "_Sačuvaj"
-
 #: ../calendar/calendar.error.xml.h:48
 msgid "Download in progress. Do you want to save the appointment?"
 msgstr "Preuzimanje je u toku. Želite li da sačuvate zakazivanje?"
@@ -2182,24 +2440,24 @@ msgstr "Premeštam belešku u spisak beleški „{0}“"
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
 #: ../calendar/gui/e-memo-table.etspec.h:2 ../calendar/gui/memotypes.xml.h:1
-#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:376
+#: ../calendar/gui/tasktypes.xml.h:1 ../plugins/save-calendar/csv-format.c:375
 msgid "Summary"
 msgstr "Sažetak"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:11
+#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:55
 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:17
+#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:56
 msgid "does not contain"
 msgstr "ne sadrži"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../e-util/e-table-config.ui.h:4 ../e-util/e-attachment-tree-view.c:528
-#: ../modules/plugin-manager/evolution-plugin-manager.c:69
+#: ../e-util/e-table-config.ui.h:7 ../e-util/e-attachment-tree-view.c:527
+#: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Description"
 msgstr "Opis"
 
@@ -2213,34 +2471,34 @@ 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:34
+#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:75
 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:40
+#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:73
 msgid "is not"
 msgstr "nije"
 
 #. To Translators: This is task classification
 #: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2
-#: ../calendar/gui/e-cal-list-view.c:250 ../calendar/gui/e-cal-model.c:454
-#: ../calendar/gui/e-cal-model.c:461 ../calendar/gui/e-task-table.c:547
+#: ../calendar/gui/e-cal-list-view.c:249 ../calendar/gui/e-cal-model.c:453
+#: ../calendar/gui/e-cal-model.c:460 ../calendar/gui/e-task-table.c:546
 #: ../calendar/gui/memotypes.xml.h:10
 msgid "Public"
 msgstr "Javno"
 
 #. To Translators: This is task classification
 #: ../calendar/gui/caltypes.xml.h:10 ../calendar/gui/dialogs/task-page.ui.h:4
-#: ../calendar/gui/e-cal-list-view.c:251 ../calendar/gui/e-cal-model.c:463
-#: ../calendar/gui/e-task-table.c:548 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/e-cal-list-view.c:250 ../calendar/gui/e-cal-model.c:462
+#: ../calendar/gui/e-task-table.c:547 ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "Lično"
 
 #. To Translators: This is task classification
 #: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
-#: ../calendar/gui/e-cal-list-view.c:252 ../calendar/gui/e-cal-model.c:465
-#: ../calendar/gui/e-task-table.c:549 ../calendar/gui/memotypes.xml.h:12
+#: ../calendar/gui/e-cal-list-view.c:251 ../calendar/gui/e-cal-model.c:464
+#: ../calendar/gui/e-task-table.c:548 ../calendar/gui/memotypes.xml.h:12
 #: ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Poverljivo"
@@ -2258,37 +2516,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:897
+#: ../plugins/publish-calendar/publish-calendar.c:903
 #: ../plugins/publish-calendar/publish-calendar.ui.h:22
-#: ../plugins/save-calendar/csv-format.c:390
+#: ../plugins/save-calendar/csv-format.c:389
 msgid "Location"
 msgstr "Mesto"
 
 #: ../calendar/gui/caltypes.xml.h:15 ../calendar/gui/memotypes.xml.h:13
-#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:328
+#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:326
 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:54
-#: ../em-format/e-mail-formatter-print-headers.c:204
+#: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
+#: ../em-format/e-mail-formatter-print-headers.c:203
 #: ../mail/em-filter-i18n.h:6
 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:27
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:18
 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:24
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:16
 msgid "Do Not Exist"
 msgstr "Ne postoji"
 
 #: ../calendar/gui/caltypes.xml.h:19
-#: ../calendar/gui/dialogs/event-editor.c:310
-#: ../calendar/gui/dialogs/event-editor.c:331
+#: ../calendar/gui/dialogs/event-editor.c:309
+#: ../calendar/gui/dialogs/event-editor.c:330
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:15
 msgid "Recurrence"
 msgstr "Ponavljanje"
@@ -2319,43 +2577,43 @@ msgstr "Sažetak sadrži"
 msgid "Description Contains"
 msgstr "Opisi"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:669
+#: ../calendar/gui/dialogs/alarm-dialog.c:668
 msgid "Edit Reminder"
 msgstr "Uredi podsetnik"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:897
-#: ../calendar/gui/e-alarm-list.c:412
+#: ../calendar/gui/dialogs/alarm-dialog.c:896
+#: ../calendar/gui/e-alarm-list.c:411
 msgid "Pop up an alert"
 msgstr "Iskačuće upozorenje"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:898
-#: ../calendar/gui/e-alarm-list.c:408
+#: ../calendar/gui/dialogs/alarm-dialog.c:897
+#: ../calendar/gui/e-alarm-list.c:407
 msgid "Play a sound"
 msgstr "Pušta zvuk"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:899
-#: ../calendar/gui/e-alarm-list.c:420
+#: ../calendar/gui/dialogs/alarm-dialog.c:898
+#: ../calendar/gui/e-alarm-list.c:419
 msgid "Run a program"
 msgstr "Pokreće program"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:900
-#: ../calendar/gui/e-alarm-list.c:416
+#: ../calendar/gui/dialogs/alarm-dialog.c:899
+#: ../calendar/gui/e-alarm-list.c:415
 msgid "Send an email"
 msgstr "Šalje elektronsku poruku"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:909
+#: ../calendar/gui/dialogs/alarm-dialog.c:908
 msgid "before"
 msgstr "pre"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:910
+#: ../calendar/gui/dialogs/alarm-dialog.c:909
 msgid "after"
 msgstr "posle"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:919
+#: ../calendar/gui/dialogs/alarm-dialog.c:918
 msgid "start of appointment"
 msgstr "zakazani početak"
 
-#: ../calendar/gui/dialogs/alarm-dialog.c:920
+#: ../calendar/gui/dialogs/alarm-dialog.c:919
 msgid "end of appointment"
 msgstr "kraj sastanka"
 
@@ -2376,453 +2634,499 @@ msgstr "dan(i)"
 msgid "Add Reminder"
 msgstr "Dodaj podsetnik"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:8
-#: ../calendar/gui/dialogs/event-editor.c:353
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
+#: ../calendar/gui/dialogs/event-editor.c:352
 msgid "Reminder"
 msgstr "Podsetnik"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:9
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:11
 msgid "Repeat"
 msgstr "Ponovi"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:10
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
 msgid "_Repeat the reminder"
 msgstr "Po_novi podsetnik"
 
 #. This is part of the sentence: 'Repeat the reminder %d extra times every %d minutes'. Where %d are numbers.
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:12
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
 msgid "extra times every"
 msgstr "prikaži još na svakih"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:13 ../mail/mail-config.ui.h:30
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:32
 msgid "Options"
 msgstr "Mogućnosti"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:14
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
 msgid "Custom _message"
 msgstr "Proizvoljna _poruka"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
 msgid "Mes_sage:"
 msgstr "Po_ruka:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
 msgid "Custom reminder sound"
 msgstr "Proizvoljan zvuk podsetnika"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:17
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
 msgid "_Sound:"
 msgstr "_Zvuk:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:18
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
 msgid "Select A File"
 msgstr "Izaberite datoteku"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:19
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
 msgid "_Program:"
 msgstr "_Program:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:20
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:22
 msgid "_Arguments:"
 msgstr "_Argumenti:"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:21
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:23
 msgid "Send To:"
 msgstr "Pošalji:"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.c:240
+#: ../calendar/gui/dialogs/alarm-list-dialog.c:239
 msgid "Action/Trigger"
 msgstr "Radnja/pokretač"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
-#: ../calendar/gui/dialogs/event-page.ui.h:25
+#: ../calendar/gui/dialogs/event-page.ui.h:28
 #: ../modules/calendar/e-calendar-preferences.ui.h:62
 msgid "Reminders"
 msgstr "Podsetnici"
 
-#: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:2
-msgid "A_dd"
-msgstr "_Dodaj"
-
-#: ../calendar/gui/dialogs/changed-comp.c:60
+#: ../calendar/gui/dialogs/changed-comp.c:59
 msgid "This event has been deleted."
 msgstr "Ovaj događaj je obrisan."
 
-#: ../calendar/gui/dialogs/changed-comp.c:64
+#: ../calendar/gui/dialogs/changed-comp.c:63
 msgid "This task has been deleted."
 msgstr "Ovaj zadatak je obrisan."
 
-#: ../calendar/gui/dialogs/changed-comp.c:68
+#: ../calendar/gui/dialogs/changed-comp.c:67
 msgid "This memo has been deleted."
 msgstr "Ova beleška je obrisana."
 
-#: ../calendar/gui/dialogs/changed-comp.c:78
+#: ../calendar/gui/dialogs/changed-comp.c:77
 #, 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:80
+#: ../calendar/gui/dialogs/changed-comp.c:79
 #, 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:85
+#: ../calendar/gui/dialogs/changed-comp.c:84
 msgid "This event has been changed."
 msgstr "Ovaj događaj je izmenjen."
 
-#: ../calendar/gui/dialogs/changed-comp.c:89
+#: ../calendar/gui/dialogs/changed-comp.c:88
 msgid "This task has been changed."
 msgstr "Ovaj zadatak je izmenjen."
 
-#: ../calendar/gui/dialogs/changed-comp.c:93
+#: ../calendar/gui/dialogs/changed-comp.c:92
 msgid "This memo has been changed."
 msgstr "Ova beleška je izmenjena."
 
-#: ../calendar/gui/dialogs/changed-comp.c:103
+#: ../calendar/gui/dialogs/changed-comp.c:102
 #, 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:105
+#: ../calendar/gui/dialogs/changed-comp.c:104
 #, 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:266
+#: ../calendar/gui/dialogs/comp-editor.c:271
 msgid "Could not save attachments"
 msgstr "Ne mogu da sačuvam priloge"
 
-#: ../calendar/gui/dialogs/comp-editor.c:620
+#: ../calendar/gui/dialogs/comp-editor.c:626
 msgid "Could not update object"
 msgstr "Ne mogu da osvežim objekat"
 
-#: ../calendar/gui/dialogs/comp-editor.c:754
+#: ../calendar/gui/dialogs/comp-editor.c:760
 msgid "Edit Appointment"
 msgstr "Uredi zakazivanje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:761
+#: ../calendar/gui/dialogs/comp-editor.c:767
 #, c-format
 msgid "Meeting - %s"
 msgstr "Sastanak — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:763
+#: ../calendar/gui/dialogs/comp-editor.c:769
 #, c-format
 msgid "Appointment - %s"
 msgstr "Zakazivanje — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:769
+#: ../calendar/gui/dialogs/comp-editor.c:775
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Dodeljen zadatak — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:771
+#: ../calendar/gui/dialogs/comp-editor.c:777
 #, c-format
 msgid "Task - %s"
 msgstr "Zadatak — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:776
+#: ../calendar/gui/dialogs/comp-editor.c:782
 #, c-format
 msgid "Memo - %s"
 msgstr "Beleška — %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:792
+#: ../calendar/gui/dialogs/comp-editor.c:798
 msgid "No Summary"
 msgstr "Bez sažetka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:913
+#: ../calendar/gui/dialogs/comp-editor.c:919
 msgid "Keep original item?"
 msgstr "Zadržati originalnu stavku?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1080
-#: ../calendar/gui/dialogs/comp-editor.c:1108
+#: ../calendar/gui/dialogs/comp-editor.c:1082
+#: ../calendar/gui/dialogs/comp-editor.c:1110
 msgid "Unable to synchronize with the server"
 msgstr "Ne mogu da se usaglasim sa serverom"
 
 #: ../calendar/gui/dialogs/comp-editor.c:1222
+#: ../calendar/gui/dialogs/event-editor.c:116
+#: ../calendar/gui/dialogs/event-editor.c:310
+#: ../calendar/gui/dialogs/event-page.ui.h:29
+#: ../composer/e-composer-actions.c:275
+#: ../e-util/e-mail-signature-editor.c:307
+#: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:388
+#: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:126
+#: ../mail/em-folder-properties.c:418 ../mail/em-subscription-editor.c:1714
+#: ../modules/plugin-manager/evolution-plugin-manager.c:256
+#: ../shell/e-shell-window-actions.c:343 ../shell/e-shell-window-actions.c:909
+#: ../smime/gui/certificate-manager.c:1182
+msgid "_Close"
+msgstr "_Zatvori"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1224
 msgid "Close the current window"
 msgstr "Zatvorite trenutni prozor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1229 ../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:1296 ../e-util/e-web-view.c:341
-#: ../e-util/e-web-view.c:1305 ../mail/e-mail-browser.c:136
-#: ../shell/e-shell-window-actions.c:888
+#. copy menu item
+#: ../calendar/gui/dialogs/comp-editor.c:1229 ../e-util/e-focus-tracker.c:730
+#: ../e-util/e-text.c:2085 ../e-util/e-web-view-gtkhtml.c:452
+#: ../e-util/e-web-view.c:336 ../mail/e-mail-browser.c:133
+#: ../shell/e-shell-window-actions.c:930
+#| msgid "_Copy..."
+msgid "_Copy"
+msgstr "_Umnoži"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1231 ../e-util/e-focus-tracker.c:174
+#: ../e-util/e-focus-tracker.c:230 ../e-util/e-focus-tracker.c:731
+#: ../e-util/e-web-view-gtkhtml.c:454 ../e-util/e-web-view-gtkhtml.c:1295
+#: ../e-util/e-web-view.c:338 ../e-util/e-web-view.c:1307
+#: ../mail/e-mail-browser.c:135 ../shell/e-shell-window-actions.c:932
 msgid "Copy the selection"
 msgstr "Umnožite izabrano"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1236 ../e-util/e-focus-tracker.c:114
-#: ../e-util/e-focus-tracker.c:553 ../e-util/e-web-view-gtkhtml.c:1290
-#: ../e-util/e-web-view.c:1299 ../mail/e-mail-browser.c:143
-#: ../shell/e-shell-window-actions.c:895
+#. cut menu item
+#: ../calendar/gui/dialogs/comp-editor.c:1236 ../e-util/e-focus-tracker.c:725
+#: ../e-util/e-text.c:2071 ../mail/e-mail-browser.c:140
+#: ../shell/e-shell-window-actions.c:937
+msgid "Cu_t"
+msgstr "_Iseci"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1238 ../e-util/e-focus-tracker.c:167
+#: ../e-util/e-focus-tracker.c:223 ../e-util/e-focus-tracker.c:726
+#: ../e-util/e-web-view-gtkhtml.c:1289 ../e-util/e-web-view.c:1301
+#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:939
 msgid "Cut the selection"
 msgstr "Isecite izabrano"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1243 ../e-util/e-focus-tracker.c:135
-#: ../e-util/e-focus-tracker.c:568 ../shell/e-shell-window-actions.c:902
+#: ../calendar/gui/dialogs/comp-editor.c:1245 ../e-util/e-focus-tracker.c:188
+#: ../e-util/e-focus-tracker.c:244 ../e-util/e-focus-tracker.c:741
+#: ../shell/e-shell-window-actions.c:946
 msgid "Delete the selection"
 msgstr "Obrišite izbor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1250
+#: ../calendar/gui/dialogs/comp-editor.c:1252
 msgid "View help"
 msgstr "Pogledaj pomoć"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1257 ../e-util/e-focus-tracker.c:128
-#: ../e-util/e-focus-tracker.c:563 ../e-util/e-web-view-gtkhtml.c:1302
-#: ../e-util/e-web-view.c:1311 ../mail/e-mail-browser.c:150
-#: ../shell/e-shell-window-actions.c:923
+#. paste menu item
+#: ../calendar/gui/dialogs/comp-editor.c:1257 ../e-util/e-focus-tracker.c:735
+#: ../e-util/e-text.c:2097 ../mail/e-mail-browser.c:147
+#: ../shell/e-shell-window-actions.c:965
+#| msgid "_Pascal"
+msgid "_Paste"
+msgstr "_Ubaci"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1259 ../e-util/e-focus-tracker.c:181
+#: ../e-util/e-focus-tracker.c:237 ../e-util/e-focus-tracker.c:736
+#: ../e-util/e-web-view-gtkhtml.c:1301 ../e-util/e-web-view.c:1313
+#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:967
 msgid "Paste the clipboard"
 msgstr "Ubacite iz spiska isečaka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1278
+#: ../calendar/gui/dialogs/comp-editor.c:1264
+#: ../composer/e-composer-actions.c:329 ../mail/e-mail-reader.c:2128
+#: ../modules/addressbook/e-book-shell-view-actions.c:1160
+#: ../modules/addressbook/e-book-shell-view-actions.c:1174
+msgid "_Print..."
+msgstr "_Štampaj..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1271 ../mail/e-mail-reader.c:2135
+#: ../modules/addressbook/e-book-shell-view-actions.c:1167
+#: ../modules/calendar/e-cal-shell-view-actions.c:1801
+#: ../modules/calendar/e-memo-shell-view-actions.c:821
+#: ../modules/calendar/e-task-shell-view-actions.c:1020
+#| msgid "Preview"
+msgid "Pre_view..."
+msgstr "_Pregled..."
+
+#: ../calendar/gui/dialogs/comp-editor.c:1280
 msgid "Save current changes"
 msgstr "Sačuvajte tekuće izmene"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1283
-#: ../e-util/e-mail-signature-editor.c:317
+#: ../calendar/gui/dialogs/comp-editor.c:1285
+#: ../e-util/e-mail-signature-editor.c:316
 msgid "Save and Close"
 msgstr "Sačuvaj i zatvori"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1285
+#: ../calendar/gui/dialogs/comp-editor.c:1287
 msgid "Save current changes and close editor"
 msgstr "Sačuvajte tekuće izmene i zatvorite uređivač"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1292 ../e-util/e-focus-tracker.c:142
-#: ../e-util/e-focus-tracker.c:573 ../mail/e-mail-browser.c:157
-#: ../shell/e-shell-window-actions.c:1000
+#: ../calendar/gui/dialogs/comp-editor.c:1292 ../e-util/e-focus-tracker.c:745
+#: ../e-util/e-web-view-gtkhtml.c:462 ../e-util/e-web-view.c:346
+#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1042
+#| msgid "Select All"
+msgid "Select _All"
+msgstr "Izaberi _sve"
+
+#: ../calendar/gui/dialogs/comp-editor.c:1294 ../e-util/e-focus-tracker.c:195
+#: ../e-util/e-focus-tracker.c:251 ../e-util/e-focus-tracker.c:746
+#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:1044
 msgid "Select all text"
 msgstr "Izaberite sav tekst"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1299
+#: ../calendar/gui/dialogs/comp-editor.c:1315
 msgid "_Classification"
 msgstr "_Razvrstavanje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1306
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:19 ../e-util/filter.ui.h:16
-#: ../mail/e-mail-browser.c:171
-#: ../plugins/publish-calendar/publish-calendar.ui.h:32
-#: ../shell/e-shell-window-actions.c:1028
-msgid "_Edit"
-msgstr "_Uređivanje"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1313
-#: ../e-util/e-mail-signature-editor.c:322 ../mail/e-mail-browser.c:164
-#: ../shell/e-shell-window-actions.c:1035
+#: ../calendar/gui/dialogs/comp-editor.c:1329
+#: ../e-util/e-mail-signature-editor.c:321 ../mail/e-mail-browser.c:163
+#: ../shell/e-shell-window-actions.c:1079
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1320
-#: ../shell/e-shell-window-actions.c:1042
-msgid "_Help"
-msgstr "Po_moć"
-
-#: ../calendar/gui/dialogs/comp-editor.c:1327
+#: ../calendar/gui/dialogs/comp-editor.c:1343
 msgid "_Insert"
 msgstr "_Umetni"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1334
-#: ../composer/e-composer-actions.c:320
+#: ../calendar/gui/dialogs/comp-editor.c:1350
+#: ../composer/e-composer-actions.c:319
 msgid "_Options"
 msgstr "_Mogućnosti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1341 ../mail/e-mail-browser.c:178
-#: ../shell/e-shell-window-actions.c:1077 ../smime/gui/smime-ui.ui.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1357 ../mail/e-mail-browser.c:177
+#: ../shell/e-shell-window-actions.c:1121 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "P_regled"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1351
-#: ../composer/e-composer-actions.c:269
+#: ../calendar/gui/dialogs/comp-editor.c:1367
+#: ../composer/e-composer-actions.c:268
 msgid "_Attachment..."
 msgstr "_Prilog..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1353
-#: ../composer/e-composer-actions.c:271 ../e-util/e-attachment-view.c:413
+#: ../calendar/gui/dialogs/comp-editor.c:1369
+#: ../composer/e-composer-actions.c:270 ../e-util/e-attachment-view.c:412
 msgid "Attach a file"
 msgstr "Priložite datoteku"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1361
+#: ../calendar/gui/dialogs/comp-editor.c:1377
 msgid "_Categories"
 msgstr "_Kategorije"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1363
+#: ../calendar/gui/dialogs/comp-editor.c:1379
 msgid "Toggles whether to display categories"
 msgstr "Prebacuje prikazivanje kategorija"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1369
+#: ../calendar/gui/dialogs/comp-editor.c:1385
 msgid "Time _Zone"
 msgstr "Vremenska _zona"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1371
+#: ../calendar/gui/dialogs/comp-editor.c:1387
 msgid "Toggles whether the time zone is displayed"
 msgstr "Prebacuje prikazivanje vremenske zone"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1380
+#: ../calendar/gui/dialogs/comp-editor.c:1396
 msgid "Pu_blic"
 msgstr "_Javno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1382
+#: ../calendar/gui/dialogs/comp-editor.c:1398
 msgid "Classify as public"
 msgstr "Označite kao javno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1403
 msgid "_Private"
 msgstr "L_ično"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1389
+#: ../calendar/gui/dialogs/comp-editor.c:1405
 msgid "Classify as private"
 msgstr "Označite kao lično"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1394
+#: ../calendar/gui/dialogs/comp-editor.c:1410
 msgid "_Confidential"
 msgstr "Pove_rljivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1412
 msgid "Classify as confidential"
 msgstr "Označite kao poverljivo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1404
+#: ../calendar/gui/dialogs/comp-editor.c:1420
 msgid "R_ole Field"
 msgstr "Polje _uloge"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1406
+#: ../calendar/gui/dialogs/comp-editor.c:1422
 msgid "Toggles whether the Role field is displayed"
 msgstr "Prebacuje prikazivanje polja Uloga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1412
+#: ../calendar/gui/dialogs/comp-editor.c:1428
 msgid "_RSVP"
 msgstr "_Molim odgovorite"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1414
+#: ../calendar/gui/dialogs/comp-editor.c:1430
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Prebacuje prikazivanje polja Molim odgovorite"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1436
 msgid "_Status Field"
 msgstr "Polje _stanja"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1438
 msgid "Toggles whether the Status field is displayed"
 msgstr "Prebacuje prikazivanje polja Stanja"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1428
+#: ../calendar/gui/dialogs/comp-editor.c:1444
 msgid "_Type Field"
 msgstr "Polje _tipa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1446
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Prebacuje prikazivanje polja Tipa"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2211
-#: ../composer/e-composer-actions.c:488
+#: ../calendar/gui/dialogs/comp-editor.c:2233
+#: ../composer/e-composer-actions.c:487
 msgid "Attach"
 msgstr "Priloži"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2541
-#: ../calendar/gui/dialogs/comp-editor.c:2751
-#: ../calendar/gui/dialogs/comp-editor.c:3764
+#: ../calendar/gui/dialogs/comp-editor.c:2563
+#: ../calendar/gui/dialogs/comp-editor.c:2773
+#: ../calendar/gui/dialogs/comp-editor.c:3786
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Promene načinjene na ovoj stavki mogu biti zanemarene ako bude ažurirano"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3726
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
+#: ../calendar/gui/dialogs/comp-editor.c:3748
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:120
 msgid "attachment"
 msgstr "prilog"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3796
+#: ../calendar/gui/dialogs/comp-editor.c:3818
 msgid "Unable to use current version!"
 msgstr "Ne mogu da koristim trenutno izdanje!"
 
-#: ../calendar/gui/dialogs/comp-editor-page.c:441
+#: ../calendar/gui/dialogs/comp-editor-page.c:440
 #, c-format
 msgid "Validation error: %s"
 msgstr "Greška provere: %s"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:121
+#: ../calendar/gui/dialogs/copy-source-dialog.c:120
 msgid "Could not open destination"
 msgstr "Ne mogu da otvorim odredište"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:131
+#: ../calendar/gui/dialogs/copy-source-dialog.c:130
 msgid "Destination is read only"
 msgstr "Odredište je samo za čitanje"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:173
+#: ../calendar/gui/dialogs/copy-source-dialog.c:172
 msgid "Cannot create object"
 msgstr "Ne mogu da napravim objekat"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:204
+#: ../calendar/gui/dialogs/copy-source-dialog.c:203
 msgid "Could not open source"
 msgstr "Ne mogu da otvorim izvor"
 
-#: ../calendar/gui/dialogs/delete-comp.c:216
+#: ../calendar/gui/dialogs/delete-comp.c:215
 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:219
+#: ../calendar/gui/dialogs/delete-comp.c:218
 msgid "_Retract comment"
 msgstr "_Uvuci komentar"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:55
+#: ../calendar/gui/dialogs/delete-error.c:54
 #, c-format
 msgid "The event could not be deleted due to a dbus error: %s"
 msgstr "Događaj ne može biti obrisan zbog dbas greške: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:59
+#: ../calendar/gui/dialogs/delete-error.c:58
 #, c-format
 msgid "The task could not be deleted due to a dbus error: %s"
 msgstr "Zadatak ne može biti obrisan zbog dbas greške: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:63
+#: ../calendar/gui/dialogs/delete-error.c:62
 #, c-format
 msgid "The memo could not be deleted due to a dbus error: %s"
 msgstr "Beleška ne može biti obrisana zbog dbas greške: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:67
+#: ../calendar/gui/dialogs/delete-error.c:66
 #, c-format
 msgid "The item could not be deleted due to a dbus error: %s"
 msgstr "Stavka ne može biti obrisana zbog dbas greške: %s"
 
-#: ../calendar/gui/dialogs/delete-error.c:74
+#: ../calendar/gui/dialogs/delete-error.c:73
 msgid "The event could not be deleted because permission was denied"
 msgstr "Događaj ne može biti obrisan jer je odbijena dozvola"
 
-#: ../calendar/gui/dialogs/delete-error.c:77
+#: ../calendar/gui/dialogs/delete-error.c:76
 msgid "The task could not be deleted because permission was denied"
 msgstr "Zadatak ne može biti obrisan jer je odbijena dozvola"
 
-#: ../calendar/gui/dialogs/delete-error.c:80
+#: ../calendar/gui/dialogs/delete-error.c:79
 msgid "The memo could not be deleted because permission was denied"
 msgstr "Beleška ne može biti obrisana jer je odbijena dozvola"
 
-#: ../calendar/gui/dialogs/delete-error.c:83
+#: ../calendar/gui/dialogs/delete-error.c:82
 msgid "The item could not be deleted because permission was denied"
 msgstr "Stavka ne može biti obrisana jer je odbijena dozvola"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:91
+#: ../calendar/gui/dialogs/delete-error.c:90
 #, c-format
 msgid "The event could not be deleted due to an error: %s"
 msgstr "Događaj ne može biti obrisan zbog greške: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:95
+#: ../calendar/gui/dialogs/delete-error.c:94
 #, c-format
 msgid "The task could not be deleted due to an error: %s"
 msgstr "Zadatak ne može biti obrisan zbog greške: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:99
+#: ../calendar/gui/dialogs/delete-error.c:98
 #, c-format
 msgid "The memo could not be deleted due to an error: %s"
 msgstr "Beleška ne može biti obrisana zbog greške: %s"
 
 #. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:103
+#: ../calendar/gui/dialogs/delete-error.c:102
 #, c-format
 msgid "The item could not be deleted due to an error: %s"
 msgstr "Stavka ne može biti obrisana zbog greške: %s"
@@ -2831,74 +3135,74 @@ msgstr "Stavka ne može biti obrisana zbog greške: %s"
 msgid "Enter Delegate"
 msgstr "Unesi delegata"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:2
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:4
 msgid "Delegate To:"
 msgstr "Delegiraj na:"
 
-#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:3
+#: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:5
 msgid "Contacts..."
 msgstr "Kontakti..."
 
-#: ../calendar/gui/dialogs/event-editor.c:205
+#: ../calendar/gui/dialogs/event-editor.c:204
 msgid "_Reminders"
 msgstr "_Podsetnici"
 
-#: ../calendar/gui/dialogs/event-editor.c:207
+#: ../calendar/gui/dialogs/event-editor.c:206
 msgid "Set or unset reminders for this event"
 msgstr "Postavlja ili isključuje podsetnike za ovaj događaj"
 
-#: ../calendar/gui/dialogs/event-editor.c:215
+#: ../calendar/gui/dialogs/event-editor.c:214
 msgid "Show Time as _Busy"
 msgstr "Prikaži vreme kao _zauzeto"
 
-#: ../calendar/gui/dialogs/event-editor.c:217
+#: ../calendar/gui/dialogs/event-editor.c:216
 msgid "Toggles whether to show time as busy"
 msgstr "Prebacuje prikazivanje vremena kao zauzeto"
 
-#: ../calendar/gui/dialogs/event-editor.c:226
+#: ../calendar/gui/dialogs/event-editor.c:225
 msgid "_Recurrence"
 msgstr "_Ponavljanje"
 
-#: ../calendar/gui/dialogs/event-editor.c:228
+#: ../calendar/gui/dialogs/event-editor.c:227
 msgid "Make this a recurring event"
 msgstr "Neka se ovaj događaj ponavlja"
 
-#: ../calendar/gui/dialogs/event-editor.c:233 ../e-util/e-send-options.ui.h:14
+#: ../calendar/gui/dialogs/event-editor.c:232 ../e-util/e-send-options.ui.h:14
 msgid "Send Options"
 msgstr "Opcije slanja"
 
-#: ../calendar/gui/dialogs/event-editor.c:235
-#: ../calendar/gui/dialogs/task-editor.c:96
+#: ../calendar/gui/dialogs/event-editor.c:234
+#: ../calendar/gui/dialogs/task-editor.c:95
 msgid "Insert advanced send options"
 msgstr "Umetnite napredne opcije slanja"
 
-#: ../calendar/gui/dialogs/event-editor.c:243
+#: ../calendar/gui/dialogs/event-editor.c:242
 msgid "All _Day Event"
 msgstr "Celodnevni događa_j"
 
-#: ../calendar/gui/dialogs/event-editor.c:245
+#: ../calendar/gui/dialogs/event-editor.c:244
 msgid "Toggles whether to have All Day Event"
 msgstr "Bira da li dozvoljava celodnevne događaje"
 
-#: ../calendar/gui/dialogs/event-editor.c:254
+#: ../calendar/gui/dialogs/event-editor.c:253
 msgid "_Free/Busy"
 msgstr "S_lobodno/zauzeto"
 
-#: ../calendar/gui/dialogs/event-editor.c:256
+#: ../calendar/gui/dialogs/event-editor.c:255
 msgid "Query free / busy information for the attendees"
 msgstr "Zatraži podatak za slobodno/zauzeto vreme za ove učesnike"
 
-#: ../calendar/gui/dialogs/event-editor.c:307 ../calendar/gui/print.c:3505
+#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3496
 msgid "Appointment"
 msgstr "Zakazivanje"
 
-#: ../calendar/gui/dialogs/event-editor.c:377
-#: ../calendar/gui/dialogs/event-page.ui.h:24
-#: ../calendar/gui/e-meeting-list-view.c:165
+#: ../calendar/gui/dialogs/event-editor.c:376
+#: ../calendar/gui/dialogs/event-page.ui.h:27
+#: ../calendar/gui/e-meeting-list-view.c:164
 msgid "Attendees"
 msgstr "Učesnici"
 
-#: ../calendar/gui/dialogs/event-editor.c:574
+#: ../calendar/gui/dialogs/event-editor.c:573
 msgid "Print this event"
 msgstr "Štampajte ovu poruku"
 
@@ -2916,7 +3220,7 @@ msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Događaj nije moguće potpuno urediti, pošto niste organizator"
 
 #: ../calendar/gui/dialogs/event-page.c:650
-#: ../calendar/gui/dialogs/event-page.c:3168
+#: ../calendar/gui/dialogs/event-page.c:3171
 msgid "This event has reminders"
 msgstr "Ovaj događaj ima podsetnike"
 
@@ -2925,52 +3229,52 @@ msgstr "Ovaj događaj ima podsetnike"
 msgid "Or_ganizer:"
 msgstr "Or_ganizator:"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
+#: ../calendar/gui/dialogs/event-page.c:1302
 msgid "Event with no start date"
 msgstr "Događaj bez datuma početka"
 
-#: ../calendar/gui/dialogs/event-page.c:1306
+#: ../calendar/gui/dialogs/event-page.c:1305
 msgid "Event with no end date"
 msgstr "Događaj bez datuma završetka"
 
-#: ../calendar/gui/dialogs/event-page.c:1479
-#: ../calendar/gui/dialogs/memo-page.c:726
-#: ../calendar/gui/dialogs/task-page.c:1026
+#: ../calendar/gui/dialogs/event-page.c:1483
+#: ../calendar/gui/dialogs/memo-page.c:732
+#: ../calendar/gui/dialogs/task-page.c:1030
 msgid "Start date is wrong"
 msgstr "Datum početka je pogrešan"
 
-#: ../calendar/gui/dialogs/event-page.c:1490
+#: ../calendar/gui/dialogs/event-page.c:1494
 msgid "End date is wrong"
 msgstr "Datum završetka je pogrešan"
 
-#: ../calendar/gui/dialogs/event-page.c:1514
+#: ../calendar/gui/dialogs/event-page.c:1518
 msgid "Start time is wrong"
 msgstr "Vreme početka je pogrešno"
 
-#: ../calendar/gui/dialogs/event-page.c:1522
+#: ../calendar/gui/dialogs/event-page.c:1526
 msgid "End time is wrong"
 msgstr "Vreme završetka je pogrešno"
 
-#: ../calendar/gui/dialogs/event-page.c:1686
-#: ../calendar/gui/dialogs/memo-page.c:765
-#: ../calendar/gui/dialogs/task-page.c:1080
+#: ../calendar/gui/dialogs/event-page.c:1690
+#: ../calendar/gui/dialogs/memo-page.c:771
+#: ../calendar/gui/dialogs/task-page.c:1084
 msgid "An organizer is required."
 msgstr "Potreban je organizator."
 
-#: ../calendar/gui/dialogs/event-page.c:1721
-#: ../calendar/gui/dialogs/task-page.c:1115
+#: ../calendar/gui/dialogs/event-page.c:1725
+#: ../calendar/gui/dialogs/task-page.c:1119
 msgid "At least one attendee is required."
 msgstr "Najmanje jedan učesnik je potreban."
 
-#: ../calendar/gui/dialogs/event-page.c:1927
+#: ../calendar/gui/dialogs/event-page.c:1931
 msgid "_Delegatees"
 msgstr "Delegat_i"
 
-#: ../calendar/gui/dialogs/event-page.c:1929
+#: ../calendar/gui/dialogs/event-page.c:1933
 msgid "Atte_ndees"
 msgstr "Uč_esnici"
 
-#: ../calendar/gui/dialogs/event-page.c:3448
+#: ../calendar/gui/dialogs/event-page.c:3451
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -2979,7 +3283,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:3454
+#: ../calendar/gui/dialogs/event-page.c:3457
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -2988,7 +3292,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:3460
+#: ../calendar/gui/dialogs/event-page.c:3463
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -2997,7 +3301,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:3481
+#: ../calendar/gui/dialogs/event-page.c:3484
 msgid "Customize"
 msgstr "Prilagodi"
 
@@ -3007,7 +3311,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:3488
+#: ../calendar/gui/dialogs/event-page.c:3491
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Ništa"
@@ -3049,7 +3353,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:29
-#: ../e-util/e-attachment-dialog.c:357
+#: ../e-util/e-attachment-dialog.c:356
 msgid "_Description:"
 msgstr "_Opis:"
 
@@ -3071,17 +3375,17 @@ msgstr "_Sažetak:"
 msgid "Event Description"
 msgstr "Opis događaja"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:23
-#: ../calendar/gui/dialogs/task-page.ui.h:30
+#: ../calendar/gui/dialogs/event-page.ui.h:26
+#: ../calendar/gui/dialogs/task-page.ui.h:33
 #: ../calendar/gui/e-meeting-time-sel.c:547
 msgid "Atte_ndees..."
 msgstr "Uč_esnici..."
 
-#: ../calendar/gui/dialogs/event-page.ui.h:26
+#: ../calendar/gui/dialogs/event-page.ui.h:30
 msgid "_Reminder"
 msgstr "_Podsetnik"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:27
+#: ../calendar/gui/dialogs/event-page.ui.h:31
 msgid "Custom Reminder:"
 msgstr "Proizvoljan podsetnik:"
 
@@ -3138,41 +3442,41 @@ msgid "Select Date"
 msgstr "Izaberite datum"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1379
+#: ../modules/calendar/e-cal-shell-view-actions.c:1378
 msgid "Select _Today"
 msgstr "Izaberi _današnji dan"
 
-#: ../calendar/gui/dialogs/memo-editor.c:106 ../calendar/gui/print.c:3509
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3500
 msgid "Memo"
 msgstr "Beleška"
 
-#: ../calendar/gui/dialogs/memo-editor.c:156
+#: ../calendar/gui/dialogs/memo-editor.c:155
 msgid "Print this memo"
 msgstr "Štampajte ovu belešku"
 
-#: ../calendar/gui/dialogs/memo-page.c:421
+#: ../calendar/gui/dialogs/memo-page.c:424
 msgid "Memo's start date is in the past"
 msgstr "Početak beleške je u prošlosti"
 
-#: ../calendar/gui/dialogs/memo-page.c:457
+#: ../calendar/gui/dialogs/memo-page.c:460
 msgid "Memo cannot be edited, because the selected memo list is read only"
 msgstr "Belešku nije moguće uređivati, pošto je izabran spisak samo za čitanje"
 
-#: ../calendar/gui/dialogs/memo-page.c:461
+#: ../calendar/gui/dialogs/memo-page.c:464
 msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Belešku nije moguće potpuno urediti, pošto niste organizator"
 
-#: ../calendar/gui/dialogs/memo-page.c:1160
-#: ../em-format/e-mail-formatter-utils.c:203
-#: ../em-format/e-mail-formatter-utils.c:220
-#: ../em-format/e-mail-part-headers.c:49 ../mail/em-filter-i18n.h:78
-#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:66
+#: ../calendar/gui/dialogs/memo-page.c:1166
+#: ../em-format/e-mail-formatter-utils.c:201
+#: ../em-format/e-mail-formatter-utils.c:218
+#: ../em-format/e-mail-part-headers.c:48 ../mail/em-filter-i18n.h:52
+#: ../mail/message-list.etspec.h:9 ../modules/mail/em-mailer-prefs.c:65
 msgid "To"
 msgstr "Prima"
 
 #: ../calendar/gui/dialogs/memo-page.ui.h:3
 #: ../calendar/gui/dialogs/task-page.c:426
-#: ../calendar/gui/dialogs/task-page.ui.h:31
+#: ../calendar/gui/dialogs/task-page.ui.h:34
 msgid "_List:"
 msgstr "_Spisak:"
 
@@ -3196,57 +3500,57 @@ msgstr "Datum p_očetka:"
 msgid "Su_mmary:"
 msgstr "Saže_tak:"
 
-#: ../calendar/gui/dialogs/recur-comp.c:53
+#: ../calendar/gui/dialogs/recur-comp.c:52
 #, c-format
 msgid "You are modifying a recurring event. What would you like to modify?"
 msgstr "Menjate povratni događaj. Šta želite da izmenite?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:55
+#: ../calendar/gui/dialogs/recur-comp.c:54
 #, c-format
 msgid "You are delegating a recurring event. What would you like to delegate?"
 msgstr "Delegirate povratni događaj. Šta želite da delegirate?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:59
+#: ../calendar/gui/dialogs/recur-comp.c:58
 #, c-format
 msgid "You are modifying a recurring task. What would you like to modify?"
 msgstr "Menjate povratni zadatak. Šta želite da izmenite?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:63
+#: ../calendar/gui/dialogs/recur-comp.c:62
 #, c-format
 msgid "You are modifying a recurring memo. What would you like to modify?"
 msgstr "Menjate povratnu belešku. Šta želite da izmenite?"
 
-#: ../calendar/gui/dialogs/recur-comp.c:89
+#: ../calendar/gui/dialogs/recur-comp.c:88
 msgid "This Instance Only"
 msgstr "Samo ovaj unos"
 
-#: ../calendar/gui/dialogs/recur-comp.c:93
+#: ../calendar/gui/dialogs/recur-comp.c:92
 msgid "This and Prior Instances"
 msgstr "Ovaj i prethodne unose"
 
-#: ../calendar/gui/dialogs/recur-comp.c:99
+#: ../calendar/gui/dialogs/recur-comp.c:98
 msgid "This and Future Instances"
 msgstr "Ovaj i buduće unose"
 
-#: ../calendar/gui/dialogs/recur-comp.c:104
+#: ../calendar/gui/dialogs/recur-comp.c:103
 msgid "All Instances"
 msgstr "Sve unose"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:575
+#: ../calendar/gui/dialogs/recurrence-page.c:574
 msgid "This appointment contains recurrences that Evolution cannot edit."
 msgstr "Ovo zakazivanje sadrži ponavljanja koja Evolucija ne može da uredi."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1000
+#: ../calendar/gui/dialogs/recurrence-page.c:1001
 msgid "Recurrence date is invalid"
 msgstr "Datum ponavljanja nije ispravan"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1044
+#: ../calendar/gui/dialogs/recurrence-page.c:1045
 msgid "End time of the recurrence was before event's start"
 msgstr "Vreme završetka ponavljanja je pre početka događaja"
 
 #. 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:1073
+#: ../calendar/gui/dialogs/recurrence-page.c:1074
 msgid "on"
 msgstr "u"
 
@@ -3254,7 +3558,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:1154
+#: ../calendar/gui/dialogs/recurrence-page.c:1155
 msgid "first"
 msgstr "prvom"
 
@@ -3263,7 +3567,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:1160
+#: ../calendar/gui/dialogs/recurrence-page.c:1161
 msgid "second"
 msgstr "drugom"
 
@@ -3271,7 +3575,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:1165
+#: ../calendar/gui/dialogs/recurrence-page.c:1166
 msgid "third"
 msgstr "trećem"
 
@@ -3279,7 +3583,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:1170
+#: ../calendar/gui/dialogs/recurrence-page.c:1171
 msgid "fourth"
 msgstr "četvrtom"
 
@@ -3287,7 +3591,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:1175
+#: ../calendar/gui/dialogs/recurrence-page.c:1176
 msgid "fifth"
 msgstr "petom"
 
@@ -3295,13 +3599,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:1180
+#: ../calendar/gui/dialogs/recurrence-page.c:1181
 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:1204
+#: ../calendar/gui/dialogs/recurrence-page.c:1205
 msgid "Other Date"
 msgstr "Drugi datum"
 
@@ -3309,7 +3613,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:1210
+#: ../calendar/gui/dialogs/recurrence-page.c:1211
 msgid "1st to 10th"
 msgstr "od prvog do desetog"
 
@@ -3317,7 +3621,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:1216
+#: ../calendar/gui/dialogs/recurrence-page.c:1217
 msgid "11th to 20th"
 msgstr "od jedanaestog do dvadesetog"
 
@@ -3325,41 +3629,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:1222
+#: ../calendar/gui/dialogs/recurrence-page.c:1223
 msgid "21st to 31st"
 msgstr "od dvadeset prvog do trideset prvog"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1249
+#: ../calendar/gui/dialogs/recurrence-page.c:1250
 #: ../modules/calendar/e-calendar-preferences.ui.h:25
 msgid "Monday"
 msgstr "Ponedeljak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1250
+#: ../calendar/gui/dialogs/recurrence-page.c:1251
 #: ../modules/calendar/e-calendar-preferences.ui.h:28
 msgid "Tuesday"
 msgstr "Utorak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1251
+#: ../calendar/gui/dialogs/recurrence-page.c:1252
 #: ../modules/calendar/e-calendar-preferences.ui.h:31
 msgid "Wednesday"
 msgstr "Sreda"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1252
+#: ../calendar/gui/dialogs/recurrence-page.c:1253
 #: ../modules/calendar/e-calendar-preferences.ui.h:34
 msgid "Thursday"
 msgstr "Četvrtak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1253
+#: ../calendar/gui/dialogs/recurrence-page.c:1254
 #: ../modules/calendar/e-calendar-preferences.ui.h:37
 msgid "Friday"
 msgstr "Petak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1254
+#: ../calendar/gui/dialogs/recurrence-page.c:1255
 #: ../modules/calendar/e-calendar-preferences.ui.h:40
 msgid "Saturday"
 msgstr "Subota"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1255
+#: ../calendar/gui/dialogs/recurrence-page.c:1256
 #: ../modules/calendar/e-calendar-preferences.ui.h:43
 msgid "Sunday"
 msgstr "Nedelja"
@@ -3367,31 +3671,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:1386
+#: ../calendar/gui/dialogs/recurrence-page.c:1387
 msgid "on the"
 msgstr "na"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:1571
+#: ../calendar/gui/dialogs/recurrence-page.c:1572
 msgid "occurrences"
 msgstr "pojave"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2341
+#: ../calendar/gui/dialogs/recurrence-page.c:2342
 msgid "Add exception"
 msgstr "Dodaj izuzetak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2383
+#: ../calendar/gui/dialogs/recurrence-page.c:2384
 msgid "Could not get a selection to modify."
 msgstr "Ne mogu da nađem izbor radi menjanja."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2389
+#: ../calendar/gui/dialogs/recurrence-page.c:2390
 msgid "Modify exception"
 msgstr "Izmenite izuzetak"
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2435
+#: ../calendar/gui/dialogs/recurrence-page.c:2436
 msgid "Could not get a selection to delete."
 msgstr "Ne mogu da nađem izbor radi brisanja."
 
-#: ../calendar/gui/dialogs/recurrence-page.c:2576
+#: ../calendar/gui/dialogs/recurrence-page.c:2577
 msgid "Date/Time"
 msgstr "Datum/vreme"
 
@@ -3449,30 +3753,30 @@ msgstr "Svakih"
 msgid "Exceptions"
 msgstr "Izuzeci"
 
-#: ../calendar/gui/dialogs/recurrence-page.ui.h:20
+#: ../calendar/gui/dialogs/recurrence-page.ui.h:22
 msgid "Preview"
 msgstr "Pregled"
 
-#: ../calendar/gui/dialogs/send-comp.c:173
-#: ../calendar/gui/dialogs/send-comp.c:255
+#: ../calendar/gui/dialogs/send-comp.c:172
+#: ../calendar/gui/dialogs/send-comp.c:254
 msgid "Send my reminders with this event"
 msgstr "Pošalji moje podsetnike sa ovim događajem"
 
-#: ../calendar/gui/dialogs/send-comp.c:175
-#: ../calendar/gui/dialogs/send-comp.c:257
+#: ../calendar/gui/dialogs/send-comp.c:174
+#: ../calendar/gui/dialogs/send-comp.c:256
 msgid "Notify new attendees _only"
 msgstr "Obavesti _samo nove učesnike"
 
-#: ../calendar/gui/dialogs/task-editor.c:94
+#: ../calendar/gui/dialogs/task-editor.c:93
 msgid "_Send Options"
 msgstr "Mogućnosti _slanja"
 
-#: ../calendar/gui/dialogs/task-editor.c:149 ../calendar/gui/print.c:3507
-#: ../e-util/e-send-options.c:553
+#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3498
+#: ../e-util/e-send-options.c:552
 msgid "Task"
 msgstr "Zadatak"
 
-#: ../calendar/gui/dialogs/task-editor.c:286
+#: ../calendar/gui/dialogs/task-editor.c:285
 msgid "Print this task"
 msgstr "Odštampajte ovaj zadatak"
 
@@ -3500,89 +3804,89 @@ msgstr ""
 "Zadatak nije moguće uređivati, zato što izabrani spisak zadataka ne podržava "
 "dodeljene zadatke"
 
-#: ../calendar/gui/dialogs/task-page.c:1007
+#: ../calendar/gui/dialogs/task-page.c:1011
 msgid "Due date is wrong"
 msgstr "Krajnji rok je pogrešan"
 
-#: ../calendar/gui/dialogs/task-page.c:1175
-#: ../calendar/gui/dialogs/task-page.c:1200
+#: ../calendar/gui/dialogs/task-page.c:1179
+#: ../calendar/gui/dialogs/task-page.c:1204
 msgid "Completed date is wrong"
 msgstr "Datum završetka je pogrešan"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:337
-#: ../calendar/gui/e-task-table.c:573 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:320
+#: ../calendar/gui/e-cal-component-preview.c:336
+#: ../calendar/gui/e-task-table.c:572 ../calendar/gui/tasktypes.xml.h:19
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:309
 msgid "High"
 msgstr "Visok"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:339
-#: ../calendar/gui/e-cal-model.c:1666 ../calendar/gui/e-task-table.c:574
+#: ../calendar/gui/e-cal-component-preview.c:338
+#: ../calendar/gui/e-cal-model.c:1665 ../calendar/gui/e-task-table.c:573
 #: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:319
+#: ../mail/message-list.c:308
 msgid "Normal"
 msgstr "Običan"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:341
-#: ../calendar/gui/e-task-table.c:575 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:318
+#: ../calendar/gui/e-cal-component-preview.c:340
+#: ../calendar/gui/e-task-table.c:574 ../calendar/gui/tasktypes.xml.h:21
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:307
 msgid "Low"
 msgstr "Nizak"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:14
-#: ../calendar/gui/e-task-table.c:576 ../calendar/gui/tasktypes.xml.h:22
+#: ../calendar/gui/e-task-table.c:575 ../calendar/gui/tasktypes.xml.h:22
 #: ../e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "Neodređen"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:322
-#: ../calendar/gui/e-cal-model-tasks.c:311
-#: ../calendar/gui/e-cal-model-tasks.c:553 ../calendar/gui/e-task-table.c:214
-#: ../calendar/gui/e-task-table.c:229 ../calendar/gui/e-task-table.c:656
-#: ../calendar/gui/print.c:3591 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-model-tasks.c:310
+#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:655
+#: ../calendar/gui/print.c:3582 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "Nije započet"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:18
-#: ../calendar/gui/e-cal-component-preview.c:312
-#: ../calendar/gui/e-cal-model-tasks.c:313
-#: ../calendar/gui/e-cal-model-tasks.c:555
-#: ../calendar/gui/e-cal-model-tasks.c:633 ../calendar/gui/e-task-table.c:216
-#: ../calendar/gui/e-task-table.c:231 ../calendar/gui/e-task-table.c:657
-#: ../calendar/gui/print.c:3594
+#: ../calendar/gui/e-cal-component-preview.c:311
+#: ../calendar/gui/e-cal-model-tasks.c:312
+#: ../calendar/gui/e-cal-model-tasks.c:554
+#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:215
+#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:656
+#: ../calendar/gui/print.c:3585
 msgid "In Progress"
 msgstr "U toku"
 
 # timezone.
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:20
-#: ../calendar/gui/e-cal-component-preview.c:315
-#: ../calendar/gui/e-cal-model-tasks.c:315
-#: ../calendar/gui/e-cal-model-tasks.c:557
-#: ../calendar/gui/e-meeting-store.c:205 ../calendar/gui/e-meeting-store.c:228
-#: ../calendar/gui/e-task-table.c:218 ../calendar/gui/e-task-table.c:233
-#: ../calendar/gui/e-task-table.c:658 ../calendar/gui/print.c:3597
+#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-cal-model-tasks.c:314
+#: ../calendar/gui/e-cal-model-tasks.c:556
+#: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
+#: ../calendar/gui/e-task-table.c:217 ../calendar/gui/e-task-table.c:232
+#: ../calendar/gui/e-task-table.c:657 ../calendar/gui/print.c:3588
 #: ../calendar/gui/tasktypes.xml.h:13
-#: ../plugins/save-calendar/csv-format.c:380
+#: ../plugins/save-calendar/csv-format.c:379
 msgid "Completed"
 msgstr "Završeno"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:22
-#: ../calendar/gui/e-cal-component-preview.c:318
-#: ../calendar/gui/e-cal-model-tasks.c:317
-#: ../calendar/gui/e-cal-model-tasks.c:559 ../calendar/gui/e-task-table.c:220
-#: ../calendar/gui/e-task-table.c:235 ../calendar/gui/e-task-table.c:659
-#: ../calendar/gui/print.c:3600 ../mail/mail-send-recv.c:878
+#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-cal-model-tasks.c:316
+#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:219
+#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:658
+#: ../calendar/gui/print.c:3591 ../mail/mail-send-recv.c:855
 msgid "Canceled"
 msgstr "Otkazano"
 
@@ -3594,80 +3898,80 @@ msgstr "Krajnji _rok:"
 msgid "Time zone:"
 msgstr "Vremenska zona:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:32
+#: ../calendar/gui/dialogs/task-page.ui.h:35
 msgid "_Status:"
 msgstr "_Stanje:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:33
+#: ../calendar/gui/dialogs/task-page.ui.h:36
 msgid "Date _completed:"
 msgstr "_Datum završetka:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:34
+#: ../calendar/gui/dialogs/task-page.ui.h:37
 msgid "_Percent complete:"
 msgstr "P_rocenat završenog:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:35
+#: ../calendar/gui/dialogs/task-page.ui.h:38
 msgid "Priorit_y:"
 msgstr "_Važnost:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:36
+#: ../calendar/gui/dialogs/task-page.ui.h:39
 msgid "C_lassification:"
 msgstr "_Razvrstavanje:"
 
-#: ../calendar/gui/dialogs/task-page.ui.h:37
+#: ../calendar/gui/dialogs/task-page.ui.h:40
 msgid "_Web Page:"
 msgstr "_Veb stranica:"
 
-#: ../calendar/gui/ea-cal-view.c:324
+#: ../calendar/gui/ea-cal-view.c:281
 msgid "New Appointment"
 msgstr "Novo zakazivanje"
 
-#: ../calendar/gui/ea-cal-view.c:325
+#: ../calendar/gui/ea-cal-view.c:282
 msgid "New All Day Event"
 msgstr "Novi celodnevni događaj"
 
-#: ../calendar/gui/ea-cal-view.c:326
+#: ../calendar/gui/ea-cal-view.c:283
 msgid "New Meeting"
 msgstr "Novi sastanak"
 
-#: ../calendar/gui/ea-cal-view.c:327
+#: ../calendar/gui/ea-cal-view.c:284
 msgid "Go to Today"
 msgstr "Idi na današnji dan"
 
-#: ../calendar/gui/ea-cal-view.c:328
+#: ../calendar/gui/ea-cal-view.c:285
 msgid "Go to Date"
 msgstr "Idi na datum"
 
-#: ../calendar/gui/ea-cal-view-event.c:298
+#: ../calendar/gui/ea-cal-view-event.c:297
 msgid "It has reminders."
 msgstr "Ima podsetnike."
 
-#: ../calendar/gui/ea-cal-view-event.c:301
+#: ../calendar/gui/ea-cal-view-event.c:300
 msgid "It has recurrences."
 msgstr "Ima ponavljanja."
 
-#: ../calendar/gui/ea-cal-view-event.c:304
+#: ../calendar/gui/ea-cal-view-event.c:303
 msgid "It is a meeting."
 msgstr "To je sastanak."
 
-#: ../calendar/gui/ea-cal-view-event.c:311
+#: ../calendar/gui/ea-cal-view-event.c:310
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Kalendarski događaj: sažetak je %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:314
+#: ../calendar/gui/ea-cal-view-event.c:313
 msgid "Calendar Event: It has no summary."
 msgstr "Kalendarski događaj: nema sažetka."
 
-#: ../calendar/gui/ea-cal-view-event.c:337
+#: ../calendar/gui/ea-cal-view-event.c:336
 msgid "calendar view event"
 msgstr "događaj pregleda kalendara"
 
-#: ../calendar/gui/ea-cal-view-event.c:569
+#: ../calendar/gui/ea-cal-view-event.c:568
 msgid "Grab Focus"
 msgstr "Fokusiraj"
 
-#: ../calendar/gui/ea-day-view.c:154 ../calendar/gui/ea-week-view.c:154
+#: ../calendar/gui/ea-day-view.c:111 ../calendar/gui/ea-week-view.c:110
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -3678,41 +3982,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:161 ../calendar/gui/ea-week-view.c:157
+#: ../calendar/gui/ea-day-view.c:118 ../calendar/gui/ea-week-view.c:113
 msgid "It has no events."
 msgstr "Nema događaja."
 
-#: ../calendar/gui/ea-day-view.c:169
+#: ../calendar/gui/ea-day-view.c:126
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Pregled radne nedelje: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:176
+#: ../calendar/gui/ea-day-view.c:133
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Dnevni pregled: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:210
+#: ../calendar/gui/ea-day-view.c:167
 msgid "calendar view for a work week"
 msgstr "pregled kalendara za radnu nedelju"
 
-#: ../calendar/gui/ea-day-view.c:212
+#: ../calendar/gui/ea-day-view.c:169
 msgid "calendar view for one or more days"
 msgstr "pregled kalendara za jedan ili više dana"
 
-#: ../calendar/gui/ea-day-view-main-item.c:327
-#: ../calendar/gui/ea-week-view-main-item.c:354
+#: ../calendar/gui/ea-day-view-main-item.c:266
+#: ../calendar/gui/ea-week-view-main-item.c:293
 msgid "a table to view and select the current time range"
 msgstr "tabela za prikaz i izbor tekućeg vremenskog raspona"
 
-#: ../calendar/gui/ea-gnome-calendar.c:48
-#: ../calendar/gui/ea-gnome-calendar.c:56
-#: ../calendar/importers/icalendar-importer.c:1114
+#: ../calendar/gui/ea-gnome-calendar.c:47
+#: ../calendar/gui/ea-gnome-calendar.c:55
+#: ../calendar/importers/icalendar-importer.c:1107
 msgid "Gnome Calendar"
 msgstr "Gnomov kalendar"
 
-#: ../calendar/gui/ea-gnome-calendar.c:204
-#: ../modules/calendar/e-cal-shell-view-private.c:1191
+#: ../calendar/gui/ea-gnome-calendar.c:206
+#: ../modules/calendar/e-cal-shell-view-private.c:1190
 msgid "%A %d %b %Y"
 msgstr "%A, %d. %b %Y."
 
@@ -3727,30 +4031,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:208 ../calendar/gui/e-day-view.c:2793
-#: ../calendar/gui/e-day-view-top-item.c:859
-#: ../calendar/gui/e-week-view-main-item.c:219
-#: ../modules/calendar/e-cal-shell-view-private.c:1195
+#: ../calendar/gui/ea-gnome-calendar.c:210 ../calendar/gui/e-day-view.c:2796
+#: ../calendar/gui/e-day-view-top-item.c:858
+#: ../calendar/gui/e-week-view-main-item.c:218
+#: ../modules/calendar/e-cal-shell-view-private.c:1194
 msgid "%a %d %b"
 msgstr "%a %d %b"
 
-#: ../calendar/gui/ea-gnome-calendar.c:211
-#: ../calendar/gui/ea-gnome-calendar.c:217
-#: ../calendar/gui/ea-gnome-calendar.c:220
-#: ../modules/calendar/e-cal-shell-view-private.c:1198
-#: ../modules/calendar/e-cal-shell-view-private.c:1204
-#: ../modules/calendar/e-cal-shell-view-private.c:1207
+#: ../calendar/gui/ea-gnome-calendar.c:213
+#: ../calendar/gui/ea-gnome-calendar.c:219
+#: ../calendar/gui/ea-gnome-calendar.c:222
+#: ../modules/calendar/e-cal-shell-view-private.c:1197
+#: ../modules/calendar/e-cal-shell-view-private.c:1203
+#: ../modules/calendar/e-cal-shell-view-private.c:1206
 msgid "%a %d %b %Y"
 msgstr "%a %d %b %Y."
 
-#: ../calendar/gui/ea-gnome-calendar.c: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:1224
-#: ../modules/calendar/e-cal-shell-view-private.c:1235
-#: ../modules/calendar/e-cal-shell-view-private.c:1242
-#: ../modules/calendar/e-cal-shell-view-private.c:1245
+#: ../calendar/gui/ea-gnome-calendar.c:241
+#: ../calendar/gui/ea-gnome-calendar.c:249
+#: ../calendar/gui/ea-gnome-calendar.c:256
+#: ../calendar/gui/ea-gnome-calendar.c:259
+#: ../modules/calendar/e-cal-shell-view-private.c:1223
+#: ../modules/calendar/e-cal-shell-view-private.c:1234
+#: ../modules/calendar/e-cal-shell-view-private.c:1241
+#: ../modules/calendar/e-cal-shell-view-private.c:1244
 msgid "%d %b %Y"
 msgstr "%d. %b %Y."
 
@@ -3763,23 +4067,23 @@ 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:244 ../calendar/gui/e-day-view.c:2809
-#: ../calendar/gui/e-day-view-top-item.c:863
-#: ../calendar/gui/e-week-view-main-item.c:233
-#: ../modules/calendar/e-cal-shell-view-private.c:1231
+#: ../calendar/gui/ea-gnome-calendar.c:246 ../calendar/gui/e-day-view.c:2812
+#: ../calendar/gui/e-day-view-top-item.c:862
+#: ../calendar/gui/e-week-view-main-item.c:232
+#: ../modules/calendar/e-cal-shell-view-private.c:1230
 msgid "%d %b"
 msgstr "%d. %b"
 
-#: ../calendar/gui/ea-jump-button.c:151
+#: ../calendar/gui/ea-jump-button.c:150
 msgid "Jump button"
 msgstr "Dugme za preskakanje"
 
-#: ../calendar/gui/ea-jump-button.c:160
+#: ../calendar/gui/ea-jump-button.c:159
 msgid "Click here, you can find more events."
 msgstr "Kliknite ovde, možete naći još događaja."
 
 #. Translator: Entire string is like "Pop up an alert %d days before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:358
+#: ../calendar/gui/e-alarm-list.c:357 ../calendar/gui/misc.c:97
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -3789,7 +4093,7 @@ msgstr[2] "%d dana"
 msgstr[3] "%d dan"
 
 #. Translator: Entire string is like "Pop up an alert %d weeks before start of appointment"
-#: ../calendar/gui/e-alarm-list.c:364
+#: ../calendar/gui/e-alarm-list.c:363
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -3798,131 +4102,129 @@ msgstr[1] "%d nedelje"
 msgstr[2] "%d nedelja"
 msgstr[3] "%d nedelja"
 
-#: ../calendar/gui/e-alarm-list.c:426
+#: ../calendar/gui/e-alarm-list.c:425
 msgid "Unknown action to be performed"
 msgstr "Izvršiće se nepoznata radnja"
 
-#: ../calendar/gui/e-alarm-list.c:441
+#: ../calendar/gui/e-alarm-list.c:440
 #, c-format
 msgid "%s %s before the start of the appointment"
 msgstr "%s %s pre početka sastanka"
 
-#: ../calendar/gui/e-alarm-list.c:447
+#: ../calendar/gui/e-alarm-list.c:446
 #, c-format
 msgid "%s %s after the start of the appointment"
 msgstr "%s %s nakon početka sastanka"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:454
+#: ../calendar/gui/e-alarm-list.c:453
 #, c-format
 msgid "%s at the start of the appointment"
 msgstr "%s na početku sastanka"
 
-#: ../calendar/gui/e-alarm-list.c:466
+#: ../calendar/gui/e-alarm-list.c:465
 #, c-format
 msgid "%s %s before the end of the appointment"
 msgstr "%s %s pre kraja sastanka"
 
-#: ../calendar/gui/e-alarm-list.c:472
+#: ../calendar/gui/e-alarm-list.c:471
 #, c-format
 msgid "%s %s after the end of the appointment"
 msgstr "%s %s nakon završetka sastanka"
 
 #. Translator: The %s refers to the base, which would be actions like
 #. * "Play a sound"
-#: ../calendar/gui/e-alarm-list.c:479
+#: ../calendar/gui/e-alarm-list.c:478
 #, 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:503
+#: ../calendar/gui/e-alarm-list.c:502
 #, 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:511
+#: ../calendar/gui/e-alarm-list.c:510
 #, c-format
 msgid "%s for an unknown trigger type"
 msgstr "%s za nepoznat tip pokretača"
 
-#: ../calendar/gui/ea-week-view.c:163
+#: ../calendar/gui/ea-week-view.c:119
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Mesečni pregled: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:168
+#: ../calendar/gui/ea-week-view.c:124
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Nedeljni pregled: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:202
+#: ../calendar/gui/ea-week-view.c:158
 msgid "calendar view for a month"
 msgstr "pregled kalendara za mesec"
 
-#: ../calendar/gui/ea-week-view.c:204
+#: ../calendar/gui/ea-week-view.c:160
 msgid "calendar view for one or more weeks"
 msgstr "pregled kalendara za jednu ili više nedelja"
 
-#: ../calendar/gui/e-cal-component-preview.c:223 ../e-util/e-filter-rule.c:750
-#: ../mail/e-mail-config-page.c:126
+#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:757
+#: ../mail/e-mail-config-page.c:125
 msgid "Untitled"
 msgstr "Neimenovano"
 
-#: ../calendar/gui/e-cal-component-preview.c:231
+#: ../calendar/gui/e-cal-component-preview.c:230
 msgid "Categories:"
 msgstr "Kategorije:"
 
-#: ../calendar/gui/e-cal-component-preview.c:263
+#: ../calendar/gui/e-cal-component-preview.c:262
 msgid "Summary:"
 msgstr "Sažetak:"
 
-#: ../calendar/gui/e-cal-component-preview.c:272
+#: ../calendar/gui/e-cal-component-preview.c:271
 msgid "Start Date:"
 msgstr "Datum početka:"
 
-#: ../calendar/gui/e-cal-component-preview.c:284
+#: ../calendar/gui/e-cal-component-preview.c:283
 msgid "End Date:"
 msgstr "Datum završetka:"
 
-#: ../calendar/gui/e-cal-component-preview.c:296
+#: ../calendar/gui/e-cal-component-preview.c:295
 msgid "Due Date:"
 msgstr "Krajnji rok:"
 
-#: ../calendar/gui/e-cal-component-preview.c:308
-#: ../modules/itip-formatter/itip-view.c:1504
-#: ../modules/itip-formatter/itip-view.c:1621
+#: ../calendar/gui/e-cal-component-preview.c:307
+#: ../modules/itip-formatter/itip-view.c:1506
+#: ../modules/itip-formatter/itip-view.c:1623
 msgid "Status:"
 msgstr "Stanje:"
 
-#: ../calendar/gui/e-cal-component-preview.c:335
+#: ../calendar/gui/e-cal-component-preview.c:334
 msgid "Priority:"
 msgstr "Važnost:"
 
-#: ../calendar/gui/e-cal-component-preview.c:360
-#: ../mail/e-mail-config-service-page.c:672
+#: ../calendar/gui/e-cal-component-preview.c:359
+#: ../mail/e-mail-config-service-page.c:671
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../calendar/gui/e-cal-component-preview.c:391
+#: ../calendar/gui/e-cal-component-preview.c:390
 msgid "Web Page:"
 msgstr "Veb stranica:"
 
-#: ../calendar/gui/e-calendar-selector.c:358
-#: ../modules/calendar/e-cal-shell-view-private.c:1097
+#: ../calendar/gui/e-calendar-selector.c:356
+#: ../modules/calendar/e-cal-shell-view-private.c:1096
 #, c-format
-#| msgid "Copying an event into the calendar '{0}'"
 msgid "Copying an event into the calendar %s"
 msgstr "Umnožavam događaj u kalendar „%s“"
 
-#: ../calendar/gui/e-calendar-selector.c:359
-#: ../modules/calendar/e-cal-shell-view-private.c:1096
+#: ../calendar/gui/e-calendar-selector.c:357
+#: ../modules/calendar/e-cal-shell-view-private.c:1095
 #, c-format
-#| msgid "Moving an event into the calendar '{0}'"
 msgid "Moving an event into the calendar %s"
 msgstr "Premeštam događaj u kalendar „%s“"
 
@@ -3938,8 +4240,8 @@ msgstr "Datum početka"
 #: ../calendar/gui/e-meeting-list-view.c:652
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
-#: ../e-util/e-attachment-tree-view.c:586
-#: ../mail/e-mail-account-tree-view.c:159
+#: ../e-util/e-attachment-tree-view.c:585
+#: ../mail/e-mail-account-tree-view.c:158
 msgid "Type"
 msgstr "Vrsta"
 
@@ -3947,7 +4249,7 @@ msgstr "Vrsta"
 msgid "Completion date"
 msgstr "Datum završetka"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:880
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:857
 msgid "Complete"
 msgstr "Završeno"
 
@@ -3962,17 +4264,17 @@ msgstr "% je završeno"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:10
 #: ../calendar/gui/tasktypes.xml.h:18
-#: ../plugins/save-calendar/csv-format.c:387
+#: ../plugins/save-calendar/csv-format.c:386
 msgid "Priority"
 msgstr "Važnost"
 
 #. To Translators: 'Status' here means the state of the attendees, the resulting string will be in a form:
 #. * Status: Accepted: X   Declined: Y   ...
 #: ../calendar/gui/e-calendar-table.etspec.h:11
-#: ../calendar/gui/e-cal-model.c:4017
+#: ../calendar/gui/e-cal-model.c:4011
 #: ../calendar/gui/e-meeting-list-view.c:695
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:9
-#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:75
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/em-filter-i18n.h:49
 #: ../mail/message-list.etspec.h:1
 msgid "Status"
 msgstr "Stanje"
@@ -3980,7 +4282,7 @@ msgstr "Stanje"
 #: ../calendar/gui/e-calendar-table.etspec.h:13
 #: ../calendar/gui/e-cal-list-view.etspec.h:7
 #: ../calendar/gui/e-memo-table.etspec.h:6
-#: ../plugins/save-calendar/csv-format.c:381
+#: ../plugins/save-calendar/csv-format.c:380
 msgid "Created"
 msgstr "Napravljeno"
 
@@ -3990,37 +4292,37 @@ msgstr "Napravljeno"
 msgid "Last modified"
 msgstr "Poslednje izmene"
 
-#: ../calendar/gui/e-calendar-view.c:446
+#: ../calendar/gui/e-calendar-view.c:448
 msgid "Cut selected events to the clipboard"
 msgstr "Seče izabrane događaje u spisak isečaka"
 
-#: ../calendar/gui/e-calendar-view.c:452
+#: ../calendar/gui/e-calendar-view.c:454
 msgid "Copy selected events to the clipboard"
 msgstr "Umnožava izabrane događaje u spisak isečaka"
 
-#: ../calendar/gui/e-calendar-view.c:458
+#: ../calendar/gui/e-calendar-view.c:460
 msgid "Paste events from the clipboard"
 msgstr "Ubacuje događaje iz spiska isečaka"
 
-#: ../calendar/gui/e-calendar-view.c:464
+#: ../calendar/gui/e-calendar-view.c:466
 msgid "Delete selected events"
 msgstr "Briše izabrane događaje"
 
-#: ../calendar/gui/e-calendar-view.c:484 ../calendar/gui/e-memo-table.c:183
-#: ../calendar/gui/e-task-table.c:270
+#: ../calendar/gui/e-calendar-view.c:486 ../calendar/gui/e-memo-table.c:182
+#: ../calendar/gui/e-task-table.c:269
 msgid "Deleting selected objects"
 msgstr "Brišem izabrane objekte"
 
-#: ../calendar/gui/e-calendar-view.c:646 ../calendar/gui/e-memo-table.c:878
-#: ../calendar/gui/e-task-table.c:1176
+#: ../calendar/gui/e-calendar-view.c:648 ../calendar/gui/e-memo-table.c:877
+#: ../calendar/gui/e-task-table.c:1175
 msgid "Updating objects"
 msgstr "Ažuriram objekat"
 
 #. 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:2084 ../calendar/gui/e-memo-table.c:553
-#: ../calendar/gui/e-task-table.c:840
+#: ../calendar/gui/e-calendar-view.c:2094 ../calendar/gui/e-memo-table.c:552
+#: ../calendar/gui/e-task-table.c:839
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizator: %s <%s>"
@@ -4028,21 +4330,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:2088 ../calendar/gui/e-memo-table.c:558
-#: ../calendar/gui/e-task-table.c:844
+#: ../calendar/gui/e-calendar-view.c:2098 ../calendar/gui/e-memo-table.c:557
+#: ../calendar/gui/e-task-table.c:843
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2104
-#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3545
+#: ../calendar/gui/e-calendar-view.c:2114
+#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3536
 #, c-format
 msgid "Location: %s"
 msgstr "Mesto: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2135
+#: ../calendar/gui/e-calendar-view.c:2145
 #, c-format
 msgid "Time: %s %s"
 msgstr "Vreme: %s %s"
@@ -4056,81 +4358,81 @@ msgstr "Datum početka"
 msgid "End Date"
 msgstr "Datum završetka"
 
-#: ../calendar/gui/e-cal-model.c:467 ../calendar/gui/e-meeting-list-view.c:185
-#: ../calendar/gui/e-meeting-list-view.c:199
-#: ../calendar/gui/e-meeting-store.c:135 ../calendar/gui/e-meeting-store.c:170
-#: ../calendar/gui/e-meeting-store.c:233 ../calendar/gui/print.c:1251
-#: ../calendar/gui/print.c:1268 ../e-util/e-charset.c:52
-#: ../modules/itip-formatter/itip-view.c:3508
-#: ../modules/itip-formatter/itip-view.c:6092
-#: ../modules/plugin-manager/evolution-plugin-manager.c:100
+#: ../calendar/gui/e-cal-model.c:466 ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-meeting-list-view.c:198
+#: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:169
+#: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1250
+#: ../calendar/gui/print.c:1267 ../e-util/e-charset.c:51
+#: ../modules/itip-formatter/itip-view.c:3510
+#: ../modules/itip-formatter/itip-view.c:6097
+#: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "Nepoznato"
 
-#: ../calendar/gui/e-cal-model.c:1668
+#: ../calendar/gui/e-cal-model.c:1667
 msgid "Recurring"
 msgstr "Periodičnost"
 
-#: ../calendar/gui/e-cal-model.c:1670
+#: ../calendar/gui/e-cal-model.c:1669
 msgid "Assigned"
 msgstr "Dodeljeno"
 
-#: ../calendar/gui/e-cal-model.c:1672 ../calendar/gui/e-cal-model-tasks.c:1163
-#: ../calendar/gui/e-meeting-list-view.c:209
-#: ../calendar/gui/e-meeting-store.c:177 ../calendar/gui/e-meeting-store.c:187
-#: ../calendar/gui/e-meeting-store.c:1024
+#: ../calendar/gui/e-cal-model.c:1671 ../calendar/gui/e-cal-model-tasks.c:1165
+#: ../calendar/gui/e-meeting-list-view.c:208
+#: ../calendar/gui/e-meeting-store.c:176 ../calendar/gui/e-meeting-store.c:186
+#: ../calendar/gui/e-meeting-store.c:1023
 msgid "Yes"
 msgstr "Da"
 
-#: ../calendar/gui/e-cal-model.c:1672 ../calendar/gui/e-cal-model-tasks.c:1163
-#: ../calendar/gui/e-meeting-list-view.c:210
-#: ../calendar/gui/e-meeting-store.c:189
+#: ../calendar/gui/e-cal-model.c:1671 ../calendar/gui/e-cal-model-tasks.c:1165
+#: ../calendar/gui/e-meeting-list-view.c:209
+#: ../calendar/gui/e-meeting-store.c:188
 msgid "No"
 msgstr "Ne"
 
-#: ../calendar/gui/e-cal-model.c:3958
-#: ../calendar/gui/e-meeting-list-view.c:221
-#: ../calendar/gui/e-meeting-store.c:197 ../calendar/gui/e-meeting-store.c:220
-#: ../modules/itip-formatter/itip-view.c:6080
+#: ../calendar/gui/e-cal-model.c:3952
+#: ../calendar/gui/e-meeting-list-view.c:220
+#: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
+#: ../modules/itip-formatter/itip-view.c:6085
 msgid "Accepted"
 msgstr "Prihvaćeno"
 
-#: ../calendar/gui/e-cal-model.c:3959
-#: ../calendar/gui/e-meeting-list-view.c:222
-#: ../calendar/gui/e-meeting-store.c:199 ../calendar/gui/e-meeting-store.c:222
-#: ../modules/itip-formatter/itip-view.c:6086
+#: ../calendar/gui/e-cal-model.c:3953
+#: ../calendar/gui/e-meeting-list-view.c:221
+#: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
+#: ../modules/itip-formatter/itip-view.c:6091
 msgid "Declined"
 msgstr "Odbijeno"
 
-#: ../calendar/gui/e-cal-model.c:3960
-#: ../calendar/gui/e-meeting-list-view.c:223
-#: ../calendar/gui/e-meeting-store.c:201 ../calendar/gui/e-meeting-store.c:224
-#: ../calendar/gui/e-meeting-time-sel.c:526
+#: ../calendar/gui/e-cal-model.c:3954
+#: ../calendar/gui/e-meeting-list-view.c:222
+#: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
+#: ../calendar/gui/e-meeting-time-sel.c:527
 msgid "Tentative"
 msgstr "Sa rezervom"
 
-#: ../calendar/gui/e-cal-model.c:3961
-#: ../calendar/gui/e-meeting-list-view.c:224
-#: ../calendar/gui/e-meeting-store.c:203 ../calendar/gui/e-meeting-store.c:226
-#: ../modules/itip-formatter/itip-view.c:6089
+#: ../calendar/gui/e-cal-model.c:3955
+#: ../calendar/gui/e-meeting-list-view.c:223
+#: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
+#: ../modules/itip-formatter/itip-view.c:6094
 msgid "Delegated"
 msgstr "Delegirano"
 
-#: ../calendar/gui/e-cal-model.c:3962
+#: ../calendar/gui/e-cal-model.c:3956
 msgid "Needs action"
 msgstr "Zahteva radnju"
 
-#: ../calendar/gui/e-cal-model-calendar.c:125
-#: ../calendar/gui/e-task-table.c:631
+#: ../calendar/gui/e-cal-model-calendar.c:124
+#: ../calendar/gui/e-task-table.c:630
 msgid "Free"
 msgstr "Slobodno"
 
-#: ../calendar/gui/e-cal-model-calendar.c:128
-#: ../calendar/gui/e-meeting-time-sel.c:527 ../calendar/gui/e-task-table.c:632
+#: ../calendar/gui/e-cal-model-calendar.c:127
+#: ../calendar/gui/e-meeting-time-sel.c:528 ../calendar/gui/e-task-table.c:631
 msgid "Busy"
 msgstr "Zauzeto"
 
-#: ../calendar/gui/e-cal-model-tasks.c:499
+#: ../calendar/gui/e-cal-model-tasks.c:498
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -4146,7 +4448,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:551
+#: ../calendar/gui/e-cal-model-tasks.c:550
 msgctxt "cal-task-status"
 msgid "None"
 msgstr "Ništa"
@@ -4156,7 +4458,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:159
+#: ../calendar/gui/e-cell-date-edit-text.c:158
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d. %m. %Y. %H:%M:%S"
 
@@ -4165,11 +4467,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:162
+#: ../calendar/gui/e-cell-date-edit-text.c:161
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d. %m. %Y. %I:%M:%S %p"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:170
+#: ../calendar/gui/e-cell-date-edit-text.c:169
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4179,16 +4481,16 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1983 ../calendar/gui/e-week-view.c:1554
-#: ../calendar/gui/print.c:1074 ../calendar/gui/print.c:1093
-#: ../calendar/gui/print.c:2637 ../calendar/gui/print.c:2657
+#: ../calendar/gui/e-day-view.c:1986 ../calendar/gui/e-week-view.c:1540
+#: ../calendar/gui/print.c:1073 ../calendar/gui/print.c:1092
+#: ../calendar/gui/print.c:2633 ../calendar/gui/print.c:2653
 msgid "am"
 msgstr "prp"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1986 ../calendar/gui/e-week-view.c:1557
-#: ../calendar/gui/print.c:1079 ../calendar/gui/print.c:1095
-#: ../calendar/gui/print.c:2642 ../calendar/gui/print.c:2659
+#: ../calendar/gui/e-day-view.c:1989 ../calendar/gui/e-week-view.c:1543
+#: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
+#: ../calendar/gui/print.c:2638 ../calendar/gui/print.c:2655
 msgid "pm"
 msgstr "pop"
 
@@ -4203,13 +4505,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:2776 ../calendar/gui/e-day-view-top-item.c:855
-#: ../calendar/gui/e-week-view-main-item.c:210 ../calendar/gui/print.c:2093
+#: ../calendar/gui/e-day-view.c:2779 ../calendar/gui/e-day-view-top-item.c:854
+#: ../calendar/gui/e-week-view-main-item.c:209 ../calendar/gui/print.c:2089
 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:3433
+#: ../calendar/gui/e-day-view.c:3443
 #, c-format
 msgid "Week %d"
 msgstr "%d. nedelja"
@@ -4220,12 +4522,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:801
+#: ../calendar/gui/e-day-view-time-item.c:800
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i minutni razmaci"
 
-#: ../calendar/gui/e-day-view-time-item.c:826
+#: ../calendar/gui/e-day-view-time-item.c:825
 msgid "Show the second time zone"
 msgstr "Prikaži drugu vremensku zonu"
 
@@ -4235,87 +4537,87 @@ 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:843
-#: ../modules/calendar/e-calendar-preferences.c:306
-#: ../modules/calendar/e-calendar-preferences.c:358
+#: ../calendar/gui/e-day-view-time-item.c:842
+#: ../modules/calendar/e-calendar-preferences.c:305
+#: ../modules/calendar/e-calendar-preferences.c:357
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
 msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Ništa"
 
-#: ../calendar/gui/e-day-view-time-item.c:877
-#: ../calendar/gui/e-timezone-entry.c:324
-#: ../modules/calendar/e-calendar-preferences.c:389
+#: ../calendar/gui/e-day-view-time-item.c:876
+#: ../calendar/gui/e-timezone-entry.c:323
+#: ../modules/calendar/e-calendar-preferences.c:388
 msgid "Select..."
 msgstr "Izaberi..."
 
-#: ../calendar/gui/e-meeting-list-view.c:64
+#: ../calendar/gui/e-meeting-list-view.c:63
 msgid "Chair Persons"
 msgstr "Predsedavajući"
 
-#: ../calendar/gui/e-meeting-list-view.c:65
+#: ../calendar/gui/e-meeting-list-view.c:64
 msgid "Required Participants"
 msgstr "Obavezni učesnici"
 
-#: ../calendar/gui/e-meeting-list-view.c:66
+#: ../calendar/gui/e-meeting-list-view.c:65
 msgid "Optional Participants"
 msgstr "Mogući učesnici"
 
-#: ../calendar/gui/e-meeting-list-view.c:67
+#: ../calendar/gui/e-meeting-list-view.c:66
 msgid "Resources"
 msgstr "Izvori"
 
-#: ../calendar/gui/e-meeting-list-view.c:181
-#: ../calendar/gui/e-meeting-store.c:110 ../calendar/gui/e-meeting-store.c:127
-#: ../calendar/gui/e-meeting-store.c:1018 ../calendar/gui/print.c:1247
+#: ../calendar/gui/e-meeting-list-view.c:180
+#: ../calendar/gui/e-meeting-store.c:109 ../calendar/gui/e-meeting-store.c:126
+#: ../calendar/gui/e-meeting-store.c:1017 ../calendar/gui/print.c:1246
 msgid "Individual"
 msgstr "Pojedinac"
 
-#: ../calendar/gui/e-meeting-list-view.c:182
-#: ../calendar/gui/e-meeting-store.c:112 ../calendar/gui/e-meeting-store.c:129
-#: ../calendar/gui/print.c:1248 ../e-util/e-table-config.ui.h:5
+#: ../calendar/gui/e-meeting-list-view.c:181
+#: ../calendar/gui/e-meeting-store.c:111 ../calendar/gui/e-meeting-store.c:128
+#: ../calendar/gui/print.c:1247 ../e-util/e-table-config.ui.h:8
 msgid "Group"
 msgstr "Grupa"
 
-#: ../calendar/gui/e-meeting-list-view.c:183
-#: ../calendar/gui/e-meeting-store.c:114 ../calendar/gui/e-meeting-store.c:131
-#: ../calendar/gui/print.c:1249
+#: ../calendar/gui/e-meeting-list-view.c:182
+#: ../calendar/gui/e-meeting-store.c:113 ../calendar/gui/e-meeting-store.c:130
+#: ../calendar/gui/print.c:1248
 msgid "Resource"
 msgstr "Izvor"
 
-#: ../calendar/gui/e-meeting-list-view.c:184
-#: ../calendar/gui/e-meeting-store.c:116 ../calendar/gui/e-meeting-store.c:133
-#: ../calendar/gui/print.c:1250
+#: ../calendar/gui/e-meeting-list-view.c:183
+#: ../calendar/gui/e-meeting-store.c:115 ../calendar/gui/e-meeting-store.c:132
+#: ../calendar/gui/print.c:1249
 msgid "Room"
 msgstr "Soba"
 
-#: ../calendar/gui/e-meeting-list-view.c:195
-#: ../calendar/gui/e-meeting-store.c:145 ../calendar/gui/e-meeting-store.c:162
-#: ../calendar/gui/print.c:1264
+#: ../calendar/gui/e-meeting-list-view.c:194
+#: ../calendar/gui/e-meeting-store.c:144 ../calendar/gui/e-meeting-store.c:161
+#: ../calendar/gui/print.c:1263
 msgid "Chair"
 msgstr "Stolica"
 
-#: ../calendar/gui/e-meeting-list-view.c:196
-#: ../calendar/gui/e-meeting-store.c:147 ../calendar/gui/e-meeting-store.c:164
-#: ../calendar/gui/e-meeting-store.c:1021 ../calendar/gui/print.c:1265
+#: ../calendar/gui/e-meeting-list-view.c:195
+#: ../calendar/gui/e-meeting-store.c:146 ../calendar/gui/e-meeting-store.c:163
+#: ../calendar/gui/e-meeting-store.c:1020 ../calendar/gui/print.c:1264
 msgid "Required Participant"
 msgstr "Obavezan učesnik"
 
-#: ../calendar/gui/e-meeting-list-view.c:197
-#: ../calendar/gui/e-meeting-store.c:149 ../calendar/gui/e-meeting-store.c:166
-#: ../calendar/gui/print.c:1266
+#: ../calendar/gui/e-meeting-list-view.c:196
+#: ../calendar/gui/e-meeting-store.c:148 ../calendar/gui/e-meeting-store.c:165
+#: ../calendar/gui/print.c:1265
 msgid "Optional Participant"
 msgstr "Mogući učesnik"
 
-#: ../calendar/gui/e-meeting-list-view.c:198
-#: ../calendar/gui/e-meeting-store.c:151 ../calendar/gui/e-meeting-store.c:168
-#: ../calendar/gui/print.c:1267
+#: ../calendar/gui/e-meeting-list-view.c:197
+#: ../calendar/gui/e-meeting-store.c:150 ../calendar/gui/e-meeting-store.c:167
+#: ../calendar/gui/print.c:1266
 msgid "Non-Participant"
 msgstr "Ne-učesnik"
 
-#: ../calendar/gui/e-meeting-list-view.c:220
-#: ../calendar/gui/e-meeting-store.c:195 ../calendar/gui/e-meeting-store.c:218
-#: ../calendar/gui/e-meeting-store.c:1031
+#: ../calendar/gui/e-meeting-list-view.c:219
+#: ../calendar/gui/e-meeting-store.c:194 ../calendar/gui/e-meeting-store.c:217
+#: ../calendar/gui/e-meeting-store.c:1030
 msgid "Needs Action"
 msgstr "Potrebna radnja"
 
@@ -4328,85 +4630,85 @@ msgstr "Učesnik                          "
 msgid "RSVP"
 msgstr "MVOM"
 
-#: ../calendar/gui/e-meeting-store.c:207 ../calendar/gui/e-meeting-store.c:230
+#: ../calendar/gui/e-meeting-store.c:206 ../calendar/gui/e-meeting-store.c:229
 msgid "In Process"
 msgstr "U toku"
 
-#: ../calendar/gui/e-meeting-store.c:1910
+#: ../calendar/gui/e-meeting-store.c:1909
 #, 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:1920
+#: ../calendar/gui/e-meeting-store.c:1919
 #, c-format
 msgid "Failure reason: %s"
 msgstr "Razlog neuspeha: %s"
 
-#: ../calendar/gui/e-meeting-store.c:1925
+#: ../calendar/gui/e-meeting-store.c:1924
 #: ../plugins/publish-calendar/publish-calendar.c:351
-#: ../smime/gui/component.c:64
+#: ../smime/gui/component.c:63
 msgid "Enter password"
 msgstr "Upišite lozinku"
 
-#: ../calendar/gui/e-meeting-time-sel.c:528
+#: ../calendar/gui/e-meeting-time-sel.c:529
 msgid "Out of Office"
 msgstr "Van kancelarije"
 
-#: ../calendar/gui/e-meeting-time-sel.c:530
+#: ../calendar/gui/e-meeting-time-sel.c:531
 msgid "No Information"
 msgstr "Nema podatka"
 
-#: ../calendar/gui/e-meeting-time-sel.c:570
+#: ../calendar/gui/e-meeting-time-sel.c:566
 msgid "O_ptions"
 msgstr "_Mogućnosti"
 
-#: ../calendar/gui/e-meeting-time-sel.c:590
+#: ../calendar/gui/e-meeting-time-sel.c:586
 msgid "Show _only working hours"
 msgstr "Prikaži _samo radne sate"
 
-#: ../calendar/gui/e-meeting-time-sel.c:603
+#: ../calendar/gui/e-meeting-time-sel.c:599
 msgid "Show _zoomed out"
 msgstr "Prikaži _umanjeno"
 
-#: ../calendar/gui/e-meeting-time-sel.c:621
+#: ../calendar/gui/e-meeting-time-sel.c:617
 msgid "_Update free/busy"
 msgstr "_Ažuriraj slobodno/zauzeto"
 
-#: ../calendar/gui/e-meeting-time-sel.c:638
+#: ../calendar/gui/e-meeting-time-sel.c:634
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:658
+#: ../calendar/gui/e-meeting-time-sel.c:654
 msgid "_Autopick"
 msgstr "_Samoizbor"
 
-#: ../calendar/gui/e-meeting-time-sel.c:675
+#: ../calendar/gui/e-meeting-time-sel.c:671
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:696
+#: ../calendar/gui/e-meeting-time-sel.c:692
 msgid "_All people and resources"
 msgstr "_Sve ljude i izvore"
 
-#: ../calendar/gui/e-meeting-time-sel.c:707
+#: ../calendar/gui/e-meeting-time-sel.c:703
 msgid "All _people and one resource"
 msgstr "Sve _ljude i jedan izvor"
 
-#: ../calendar/gui/e-meeting-time-sel.c:718
+#: ../calendar/gui/e-meeting-time-sel.c:714
 msgid "_Required people"
 msgstr "_Obavezne ljude"
 
-#: ../calendar/gui/e-meeting-time-sel.c:728
+#: ../calendar/gui/e-meeting-time-sel.c:724
 msgid "Required people and _one resource"
 msgstr "Obavezne ljude i _jedan izvor"
 
-#: ../calendar/gui/e-meeting-time-sel.c:767
+#: ../calendar/gui/e-meeting-time-sel.c:763
 msgid "_Start time:"
 msgstr "_Vreme početka:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:796
+#: ../calendar/gui/e-meeting-time-sel.c:792
 msgid "_End time:"
 msgstr "Vreme _završetka:"
 
@@ -4419,7 +4721,7 @@ msgstr ""
 "Sažetak: %s\n"
 "Mesto: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3534
+#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3525
 #, c-format
 msgid "Summary: %s"
 msgstr "Sažetak: %s"
@@ -4448,46 +4750,46 @@ msgstr "Zajedničko ime"
 msgid "Language"
 msgstr "Jezik"
 
-#: ../calendar/gui/e-memo-table.c:434
-#: ../modules/calendar/e-cal-shell-content.c:482
-#: ../modules/calendar/e-memo-shell-view-actions.c:212
-#: ../modules/calendar/e-memo-shell-view-actions.c:227
-#: ../modules/calendar/e-memo-shell-view.c:307
+#: ../calendar/gui/e-memo-table.c:433
+#: ../modules/calendar/e-cal-shell-content.c:481
+#: ../modules/calendar/e-memo-shell-view-actions.c:211
+#: ../modules/calendar/e-memo-shell-view-actions.c:226
+#: ../modules/calendar/e-memo-shell-view.c:306
 msgid "Memos"
 msgstr "Beleške"
 
-#: ../calendar/gui/e-memo-table.c:515 ../calendar/gui/e-task-table.c:803
+#: ../calendar/gui/e-memo-table.c:514 ../calendar/gui/e-task-table.c:802
 msgid "* No Summary *"
 msgstr "* Bez sažetka *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:602 ../calendar/gui/e-task-table.c:887
+#: ../calendar/gui/e-memo-table.c:601 ../calendar/gui/e-task-table.c:886
 msgid "Start: "
 msgstr "Početak: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:621 ../calendar/gui/e-task-table.c:905
+#: ../calendar/gui/e-memo-table.c:620 ../calendar/gui/e-task-table.c:904
 msgid "Due: "
 msgstr "Rok: "
 
-#: ../calendar/gui/e-memo-table.c:742
+#: ../calendar/gui/e-memo-table.c:741
 msgid "Cut selected memos to the clipboard"
 msgstr "Seče izabrane beleške u spisak isečaka"
 
-#: ../calendar/gui/e-memo-table.c:748
+#: ../calendar/gui/e-memo-table.c:747
 msgid "Copy selected memos to the clipboard"
 msgstr "Umnožava izabrane beleške u spisak isečaka"
 
-#: ../calendar/gui/e-memo-table.c:754
+#: ../calendar/gui/e-memo-table.c:753
 msgid "Paste memos from the clipboard"
 msgstr "Ubacuje beleške iz spiska isečaka"
 
-#: ../calendar/gui/e-memo-table.c:760
-#: ../modules/calendar/e-memo-shell-view-actions.c:589
+#: ../calendar/gui/e-memo-table.c:759
+#: ../modules/calendar/e-memo-shell-view-actions.c:588
 msgid "Delete selected memos"
 msgstr "Briše izabrane beleške"
 
-#: ../calendar/gui/e-memo-table.c:766
+#: ../calendar/gui/e-memo-table.c:765
 msgid "Select all visible memos"
 msgstr "Bira sve vidljive beleške"
 
@@ -4503,44 +4805,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:604
+#: ../calendar/gui/e-task-table.c:603
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:721 ../calendar/gui/print.c:2418
-#: ../calendar/importers/icalendar-importer.c:79
-#: ../calendar/importers/icalendar-importer.c:1078
+#: ../calendar/gui/e-task-table.c:720 ../calendar/gui/print.c:2414
+#: ../calendar/importers/icalendar-importer.c:78
+#: ../calendar/importers/icalendar-importer.c:1071
 #: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:439
-#: ../modules/calendar/e-task-shell-view-actions.c:235
-#: ../modules/calendar/e-task-shell-view-actions.c:250
-#: ../modules/calendar/e-task-shell-view.c:462
+#: ../modules/calendar/e-cal-shell-content.c:438
+#: ../modules/calendar/e-task-shell-view-actions.c:234
+#: ../modules/calendar/e-task-shell-view-actions.c:249
+#: ../modules/calendar/e-task-shell-view.c:461
 msgid "Tasks"
 msgstr "Zadaci"
 
-#: ../calendar/gui/e-task-table.c:1040
+#: ../calendar/gui/e-task-table.c:1039
 msgid "Cut selected tasks to the clipboard"
 msgstr "Seče izabrane zadatke u spisak isečaka"
 
-#: ../calendar/gui/e-task-table.c:1046
+#: ../calendar/gui/e-task-table.c:1045
 msgid "Copy selected tasks to the clipboard"
 msgstr "Umnožava izabrane zadatke u spisak isečaka"
 
-#: ../calendar/gui/e-task-table.c:1052
+#: ../calendar/gui/e-task-table.c:1051
 msgid "Paste tasks from the clipboard"
 msgstr "Ubacuje zadatke iz spiska isečaka"
 
-#: ../calendar/gui/e-task-table.c:1058
-#: ../modules/calendar/e-task-shell-view-actions.c:713
+#: ../calendar/gui/e-task-table.c:1057
+#: ../modules/calendar/e-task-shell-view-actions.c:712
 msgid "Delete selected tasks"
 msgstr "Briše izabrane zadatke"
 
-#: ../calendar/gui/e-task-table.c:1064
+#: ../calendar/gui/e-task-table.c:1063
 msgid "Select all visible tasks"
 msgstr "Bira sve vidljive zadatke"
 
-#: ../calendar/gui/e-timezone-entry.c:335
+#: ../calendar/gui/e-timezone-entry.c:334
 msgid "Select Timezone"
 msgstr "Izaberi vremensku zonu"
 
@@ -4549,40 +4851,40 @@ 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:227 ../calendar/gui/print.c:2072
+#: ../calendar/gui/e-week-view-main-item.c:226 ../calendar/gui/print.c:2068
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2369
+#: ../calendar/gui/gnome-cal.c:2371
 msgid "Purging"
 msgstr "Brisanje"
 
-#: ../calendar/gui/itip-utils.c:646 ../calendar/gui/itip-utils.c:704
-#: ../calendar/gui/itip-utils.c:838
+#: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
+#: ../calendar/gui/itip-utils.c:841
 msgid "An organizer must be set."
 msgstr "Organizator mora biti određen."
 
-#: ../calendar/gui/itip-utils.c:695
+#: ../calendar/gui/itip-utils.c:698
 msgid "At least one attendee is necessary"
 msgstr "Najmanje jedan učesnik je neophodan"
 
-#: ../calendar/gui/itip-utils.c:926 ../calendar/gui/itip-utils.c:1087
+#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
 msgid "Event information"
 msgstr "Podaci o događaju"
 
-#: ../calendar/gui/itip-utils.c:929 ../calendar/gui/itip-utils.c:1090
+#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
 msgid "Task information"
 msgstr "Podaci o zadatku"
 
-#: ../calendar/gui/itip-utils.c:932 ../calendar/gui/itip-utils.c:1093
+#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1096
 msgid "Memo information"
 msgstr "Podaci o belešci"
 
-#: ../calendar/gui/itip-utils.c:935 ../calendar/gui/itip-utils.c:1111
+#: ../calendar/gui/itip-utils.c:938 ../calendar/gui/itip-utils.c:1114
 msgid "Free/Busy information"
 msgstr "Podaci slobodno/zauzeto"
 
-#: ../calendar/gui/itip-utils.c:938
+#: ../calendar/gui/itip-utils.c:941
 msgid "Calendar information"
 msgstr "Podaci o kalendaru"
 
@@ -4590,7 +4892,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:975
+#: ../calendar/gui/itip-utils.c:978
 msgctxt "Meeting"
 msgid "Accepted"
 msgstr "Prihvaćeno"
@@ -4599,7 +4901,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:982
+#: ../calendar/gui/itip-utils.c:985
 msgctxt "Meeting"
 msgid "Tentatively Accepted"
 msgstr "Prihvaćeno s rezervom"
@@ -4611,7 +4913,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:989 ../calendar/gui/itip-utils.c:1037
+#: ../calendar/gui/itip-utils.c:992 ../calendar/gui/itip-utils.c:1040
 msgctxt "Meeting"
 msgid "Declined"
 msgstr "Odbijeno"
@@ -4620,7 +4922,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:996
+#: ../calendar/gui/itip-utils.c:999
 msgctxt "Meeting"
 msgid "Delegated"
 msgstr "Delegirano"
@@ -4628,7 +4930,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:1009
+#: ../calendar/gui/itip-utils.c:1012
 msgctxt "Meeting"
 msgid "Updated"
 msgstr "Osveženo"
@@ -4636,7 +4938,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:1016
+#: ../calendar/gui/itip-utils.c:1019
 msgctxt "Meeting"
 msgid "Cancel"
 msgstr "Otkaži"
@@ -4644,7 +4946,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:1023
+#: ../calendar/gui/itip-utils.c:1026
 msgctxt "Meeting"
 msgid "Refresh"
 msgstr "Osveži"
@@ -4652,154 +4954,154 @@ 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:1030
+#: ../calendar/gui/itip-utils.c:1033
 msgctxt "Meeting"
 msgid "Counter-proposal"
 msgstr "Protiv-predlog"
 
-#: ../calendar/gui/itip-utils.c:1108
+#: ../calendar/gui/itip-utils.c:1111
 #, c-format
 msgid "Free/Busy information (%s to %s)"
 msgstr "Podaci slobodno/zauzeto (%s do %s)"
 
-#: ../calendar/gui/itip-utils.c:1116
+#: ../calendar/gui/itip-utils.c:1119
 msgid "iCalendar information"
 msgstr "Podaci iKalendara"
 
-#: ../calendar/gui/itip-utils.c:1144
+#: ../calendar/gui/itip-utils.c:1147
 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:1152
+#: ../calendar/gui/itip-utils.c:1155
 #, c-format
 msgid "Unable to book a resource, error: %s"
 msgstr "Ne mogu da sačuvam unos, greška: %s"
 
-#: ../calendar/gui/itip-utils.c:1324
+#: ../calendar/gui/itip-utils.c:1327
 msgid "You must be an attendee of the event."
 msgstr "Morate biti učesnik događaja."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:660
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:660
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:660
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:660
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:660
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:661
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:661
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:661
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:661
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:661
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:662
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:662
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:662
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:662
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:662
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:663
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:664
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:665
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:667
+#: ../calendar/gui/print.c:666
 msgid "31st"
 msgstr "31."
 
@@ -4807,102 +5109,102 @@ msgstr "31."
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_BAD_WEEKDAY
 #. G_DATE_MONDAY
-#: ../calendar/gui/print.c:727
+#: ../calendar/gui/print.c:726
 msgid "Mo"
 msgstr "Po"
 
 #. G_DATE_TUESDAY
-#: ../calendar/gui/print.c:728
+#: ../calendar/gui/print.c:727
 msgid "Tu"
 msgstr "Ut"
 
 #. G_DATE_WEDNESDAY
-#: ../calendar/gui/print.c:729
+#: ../calendar/gui/print.c:728
 msgid "We"
 msgstr "Sr"
 
 #. G_DATE_THURSDAY
-#: ../calendar/gui/print.c:730
+#: ../calendar/gui/print.c:729
 msgid "Th"
 msgstr "Če"
 
 #. G_DATE_FRIDAY
-#: ../calendar/gui/print.c:731
+#: ../calendar/gui/print.c:730
 msgid "Fr"
 msgstr "Pe"
 
 #. G_DATE_SATURDAY
-#: ../calendar/gui/print.c:732
+#: ../calendar/gui/print.c:731
 msgid "Sa"
 msgstr "Su"
 
 #. G_DATE_SUNDAY
-#: ../calendar/gui/print.c:733
+#: ../calendar/gui/print.c:732
 msgid "Su"
 msgstr "Ne"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3328
+#: ../calendar/gui/print.c:3319
 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:3338
+#: ../calendar/gui/print.c:3329
 msgid " (Completed "
 msgstr " (Završeno je "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3344
+#: ../calendar/gui/print.c:3335
 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:3354
+#: ../calendar/gui/print.c:3345
 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:3361
+#: ../calendar/gui/print.c:3352
 msgid "Due "
 msgstr "Rok "
 
-#: ../calendar/gui/print.c:3564
+#: ../calendar/gui/print.c:3555
 msgid "Attendees: "
 msgstr "Prisutni: "
 
-#: ../calendar/gui/print.c:3608
+#: ../calendar/gui/print.c:3599
 #, c-format
 msgid "Status: %s"
 msgstr "Stanje: %s"
 
-#: ../calendar/gui/print.c:3624
+#: ../calendar/gui/print.c:3615
 #, c-format
 msgid "Priority: %s"
 msgstr "Važnost: %s"
 
-#: ../calendar/gui/print.c:3642
+#: ../calendar/gui/print.c:3633
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Postotak završenog: %i"
 
-#: ../calendar/gui/print.c:3656
+#: ../calendar/gui/print.c:3647
 #, c-format
 msgid "URL: %s"
 msgstr "Adresa: %s"
 
-#: ../calendar/gui/print.c:3670
+#: ../calendar/gui/print.c:3661
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
-#: ../calendar/gui/print.c:3681
+#: ../calendar/gui/print.c:3672
 msgid "Contacts: "
 msgstr "Kontakti: "
 
@@ -4915,190 +5217,190 @@ msgstr "U toku"
 msgid "% Completed"
 msgstr "% je završeno"
 
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:38
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:69
 msgid "is greater than"
 msgstr "je veće od"
 
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:39
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:70
 msgid "is less than"
 msgstr "je manje od"
 
-#: ../calendar/importers/icalendar-importer.c:78
+#: ../calendar/importers/icalendar-importer.c:77
 msgid "Appointments and Meetings"
 msgstr "Zakazivanje i sastanci"
 
-#: ../calendar/importers/icalendar-importer.c:462
-#: ../calendar/importers/icalendar-importer.c:901
+#: ../calendar/importers/icalendar-importer.c:461
+#: ../calendar/importers/icalendar-importer.c:900
 msgid "Opening calendar"
 msgstr "Otvaranje kalendara"
 
-#: ../calendar/importers/icalendar-importer.c:610
+#: ../calendar/importers/icalendar-importer.c:609
 msgid "iCalendar files (.ics)"
 msgstr "Datoteke iKalendara (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:611
+#: ../calendar/importers/icalendar-importer.c:610
 msgid "Evolution iCalendar importer"
 msgstr "Uvoznik iKalendara Evolucije"
 
-#: ../calendar/importers/icalendar-importer.c:703
+#: ../calendar/importers/icalendar-importer.c:702
 msgid "Reminder!"
 msgstr "Podsetnik!"
 
-#: ../calendar/importers/icalendar-importer.c:787
+#: ../calendar/importers/icalendar-importer.c:786
 msgid "vCalendar files (.vcs)"
 msgstr "Datoteke vKalendara (.vcs)"
 
-#: ../calendar/importers/icalendar-importer.c:788
+#: ../calendar/importers/icalendar-importer.c:787
 msgid "Evolution vCalendar importer"
 msgstr "Uvoznik vKalendara Evolucije"
 
-#: ../calendar/importers/icalendar-importer.c:1071
+#: ../calendar/importers/icalendar-importer.c:1064
 msgid "Calendar Events"
 msgstr "Događaji kalendara"
 
-#: ../calendar/importers/icalendar-importer.c:1115
+#: ../calendar/importers/icalendar-importer.c:1108
 msgid "Evolution Calendar intelligent importer"
 msgstr "Inteligentni uvoznik kalendara Evolucije"
 
-#: ../calendar/importers/icalendar-importer.c:1186
-#: ../calendar/importers/icalendar-importer.c:1500
+#: ../calendar/importers/icalendar-importer.c:1179
+#: ../calendar/importers/icalendar-importer.c:1493
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Sastanak"
 
-#: ../calendar/importers/icalendar-importer.c:1186
-#: ../calendar/importers/icalendar-importer.c:1500
+#: ../calendar/importers/icalendar-importer.c:1179
+#: ../calendar/importers/icalendar-importer.c:1493
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Događaj"
 
-#: ../calendar/importers/icalendar-importer.c:1189
-#: ../calendar/importers/icalendar-importer.c:1501
+#: ../calendar/importers/icalendar-importer.c:1182
+#: ../calendar/importers/icalendar-importer.c:1494
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Zadatak"
 
-#: ../calendar/importers/icalendar-importer.c:1192
-#: ../calendar/importers/icalendar-importer.c:1502
+#: ../calendar/importers/icalendar-importer.c:1185
+#: ../calendar/importers/icalendar-importer.c:1495
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Beleška"
 
-#: ../calendar/importers/icalendar-importer.c:1201
+#: ../calendar/importers/icalendar-importer.c:1194
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "ima ponavljanja"
 
-#: ../calendar/importers/icalendar-importer.c:1206
+#: ../calendar/importers/icalendar-importer.c:1199
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "je primerak"
 
-#: ../calendar/importers/icalendar-importer.c:1211
+#: ../calendar/importers/icalendar-importer.c:1204
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "ima podsetnike"
 
-#: ../calendar/importers/icalendar-importer.c:1216
+#: ../calendar/importers/icalendar-importer.c:1209
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "ima priloge"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1229
+#: ../calendar/importers/icalendar-importer.c:1222
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Javno"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1232
+#: ../calendar/importers/icalendar-importer.c:1225
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Lično"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1235
+#: ../calendar/importers/icalendar-importer.c:1228
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Poverljivo"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1239
+#: ../calendar/importers/icalendar-importer.c:1232
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Razvrstavanje"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1244
-#: ../calendar/importers/icalendar-importer.c:1544
+#: ../calendar/importers/icalendar-importer.c:1237
+#: ../calendar/importers/icalendar-importer.c:1537
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Sažetak"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1250
+#: ../calendar/importers/icalendar-importer.c:1243
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Mesto"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1258
-#: ../calendar/importers/icalendar-importer.c:1539
+#: ../calendar/importers/icalendar-importer.c:1251
+#: ../calendar/importers/icalendar-importer.c:1532
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Početak"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1269
+#: ../calendar/importers/icalendar-importer.c:1262
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Rok"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1281
+#: ../calendar/importers/icalendar-importer.c:1274
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Kraj"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1291
+#: ../calendar/importers/icalendar-importer.c:1284
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Kategorije"
 
 # timezone.
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1315
+#: ../calendar/importers/icalendar-importer.c:1308
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Završeno"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1323
+#: ../calendar/importers/icalendar-importer.c:1316
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "Adresa"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1334
-#: ../calendar/importers/icalendar-importer.c:1337
+#: ../calendar/importers/icalendar-importer.c:1327
+#: ../calendar/importers/icalendar-importer.c:1330
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organizator"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1357
-#: ../calendar/importers/icalendar-importer.c:1360
+#: ../calendar/importers/icalendar-importer.c:1350
+#: ../calendar/importers/icalendar-importer.c:1353
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Učesnici"
 
-#: ../calendar/importers/icalendar-importer.c:1374
+#: ../calendar/importers/icalendar-importer.c:1367
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Opis"
 
-#: ../calendar/importers/icalendar-importer.c:1534
+#: ../calendar/importers/icalendar-importer.c:1527
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Vrsta"
@@ -5107,18 +5409,17 @@ msgstr "Vrsta"
 # * Don't include in any C files.
 #.
 #. *
-#. * This program is free software; you can redistribute it and/or
-#. * modify it under the terms of the GNU Lesser General Public
-#. * License as published by the Free Software Foundation; either
-#. * version 2 of the License, or (at your option) version 3.
+#. * This program is free software; you can redistribute it and/or modify it
+#. * under the terms of the GNU Lesser General Public License as published by
+#. * the Free Software Foundation.
 #. *
-#. * This program is distributed in the hope that it will be useful,
-#. * but WITHOUT ANY WARRANTY; without even the implied warranty of
-#. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#. * Lesser General Public License for more details.
+#. * This program is distributed in the hope that it will be useful, but
+#. * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+#. * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#. * for more details.
 #. *
-#. * You should have received a copy of the GNU Lesser General Public
-#. * License along with the program; if not, see <http://www.gnu.org/licenses/>
+#. * You should have received a copy of the GNU Lesser General Public License
+#. * along with this program; if not, see <http://www.gnu.org/licenses/>.
 #. *
 #. *
 #. * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
@@ -5129,1688 +5430,1684 @@ msgstr "Vrsta"
 #. * We only place them here so gettext picks them up for translation.
 #. * Don't include in any C files.
 #.
-#: ../calendar/zones.h:26
+#: ../calendar/zones.h:25
 msgid "Africa/Abidjan"
 msgstr "Afrika/Abidžan"
 
-#: ../calendar/zones.h:27
+#: ../calendar/zones.h:26
 msgid "Africa/Accra"
 msgstr "Afrika/Akra"
 
-#: ../calendar/zones.h:28
+#: ../calendar/zones.h:27
 msgid "Africa/Addis_Ababa"
 msgstr "Afrika/Adis_Abeba"
 
-#: ../calendar/zones.h:29
+#: ../calendar/zones.h:28
 msgid "Africa/Algiers"
 msgstr "Afrika/Alžir"
 
-#: ../calendar/zones.h:30
+#: ../calendar/zones.h:29
 msgid "Africa/Asmera"
 msgstr "Afrika/Asmera"
 
-#: ../calendar/zones.h:31
+#: ../calendar/zones.h:30
 msgid "Africa/Bamako"
 msgstr "Afrika/Bamako"
 
-#: ../calendar/zones.h:32
+#: ../calendar/zones.h:31
 msgid "Africa/Bangui"
 msgstr "Afrika/Bangui"
 
-#: ../calendar/zones.h:33
+#: ../calendar/zones.h:32
 msgid "Africa/Banjul"
 msgstr "Afrika/Banžul"
 
-#: ../calendar/zones.h:34
+#: ../calendar/zones.h:33
 msgid "Africa/Bissau"
 msgstr "Afrika/Bisao"
 
-#: ../calendar/zones.h:35
+#: ../calendar/zones.h:34
 msgid "Africa/Blantyre"
 msgstr "Afrika/Blantir"
 
-#: ../calendar/zones.h:36
+#: ../calendar/zones.h:35
 msgid "Africa/Brazzaville"
 msgstr "Afrika/Brazavil"
 
-#: ../calendar/zones.h:37
+#: ../calendar/zones.h:36
 msgid "Africa/Bujumbura"
 msgstr "Afrika/Budžumbura"
 
-#: ../calendar/zones.h:38
+#: ../calendar/zones.h:37
 msgid "Africa/Cairo"
 msgstr "Afrika/Kairo"
 
-#: ../calendar/zones.h:39
+#: ../calendar/zones.h:38
 msgid "Africa/Casablanca"
 msgstr "Afrika/Kazablanka"
 
-#: ../calendar/zones.h:40
+#: ../calendar/zones.h:39
 msgid "Africa/Ceuta"
 msgstr "Afrika/Keuta"
 
-#: ../calendar/zones.h:41
+#: ../calendar/zones.h:40
 msgid "Africa/Conakry"
 msgstr "Afrika/Konakri"
 
-#: ../calendar/zones.h:42
+#: ../calendar/zones.h:41
 msgid "Africa/Dakar"
 msgstr "Afrika/Dakar"
 
-#: ../calendar/zones.h:43
+#: ../calendar/zones.h:42
 msgid "Africa/Dar_es_Salaam"
 msgstr "Afrika/Dar_es_Salam"
 
-#: ../calendar/zones.h:44
+#: ../calendar/zones.h:43
 msgid "Africa/Djibouti"
 msgstr "Afrika/Džibuti"
 
-#: ../calendar/zones.h:45
+#: ../calendar/zones.h:44
 msgid "Africa/Douala"
 msgstr "Afrika/Duala"
 
-#: ../calendar/zones.h:46
+#: ../calendar/zones.h:45
 msgid "Africa/El_Aaiun"
 msgstr "Afrika/El_Ajun"
 
-#: ../calendar/zones.h:47
+#: ../calendar/zones.h:46
 msgid "Africa/Freetown"
 msgstr "Afrika/Fritaun"
 
-#: ../calendar/zones.h:48
+#: ../calendar/zones.h:47
 msgid "Africa/Gaborone"
 msgstr "Afrika/Gaboron"
 
-#: ../calendar/zones.h:49
+#: ../calendar/zones.h:48
 msgid "Africa/Harare"
 msgstr "Afrika/Harare"
 
-#: ../calendar/zones.h:50
+#: ../calendar/zones.h:49
 msgid "Africa/Johannesburg"
 msgstr "Afrika/Johanesburg"
 
-#: ../calendar/zones.h:51
+#: ../calendar/zones.h:50
 msgid "Africa/Kampala"
 msgstr "Afrika/Kampala"
 
-#: ../calendar/zones.h:52
+#: ../calendar/zones.h:51
 msgid "Africa/Khartoum"
 msgstr "Afrika/Kartum"
 
-#: ../calendar/zones.h:53
+#: ../calendar/zones.h:52
 msgid "Africa/Kigali"
 msgstr "Afrika/Kigali"
 
-#: ../calendar/zones.h:54
+#: ../calendar/zones.h:53
 msgid "Africa/Kinshasa"
 msgstr "Afrika/Kinšasa"
 
-#: ../calendar/zones.h:55
+#: ../calendar/zones.h:54
 msgid "Africa/Lagos"
 msgstr "Afrika/Lagos"
 
-#: ../calendar/zones.h:56
+#: ../calendar/zones.h:55
 msgid "Africa/Libreville"
 msgstr "Afrika/Librevil"
 
-#: ../calendar/zones.h:57
+#: ../calendar/zones.h:56
 msgid "Africa/Lome"
 msgstr "Afrika/Lome"
 
-#: ../calendar/zones.h:58
+#: ../calendar/zones.h:57
 msgid "Africa/Luanda"
 msgstr "Afrika/Luanda"
 
-#: ../calendar/zones.h:59
+#: ../calendar/zones.h:58
 msgid "Africa/Lubumbashi"
 msgstr "Afrika/Lubumbaši"
 
-#: ../calendar/zones.h:60
+#: ../calendar/zones.h:59
 msgid "Africa/Lusaka"
 msgstr "Afrika/Lusaka"
 
-#: ../calendar/zones.h:61
+#: ../calendar/zones.h:60
 msgid "Africa/Malabo"
 msgstr "Afrika/Malabo"
 
-#: ../calendar/zones.h:62
+#: ../calendar/zones.h:61
 msgid "Africa/Maputo"
 msgstr "Afrika/Maputo"
 
-#: ../calendar/zones.h:63
+#: ../calendar/zones.h:62
 msgid "Africa/Maseru"
 msgstr "Afrika/Maseru"
 
-#: ../calendar/zones.h:64
+#: ../calendar/zones.h:63
 msgid "Africa/Mbabane"
 msgstr "Afrika/Mbabane"
 
-#: ../calendar/zones.h:65
+#: ../calendar/zones.h:64
 msgid "Africa/Mogadishu"
 msgstr "Afrika/Mogadišo"
 
-#: ../calendar/zones.h:66
+#: ../calendar/zones.h:65
 msgid "Africa/Monrovia"
 msgstr "Afrika/Monrovija"
 
-#: ../calendar/zones.h:67
+#: ../calendar/zones.h:66
 msgid "Africa/Nairobi"
 msgstr "Afrika/Najrobi"
 
-#: ../calendar/zones.h:68
+#: ../calendar/zones.h:67
 msgid "Africa/Ndjamena"
 msgstr "Afrika/Ndžamena"
 
-#: ../calendar/zones.h:69
+#: ../calendar/zones.h:68
 msgid "Africa/Niamey"
 msgstr "Afrika/Niamej"
 
-#: ../calendar/zones.h:70
+#: ../calendar/zones.h:69
 msgid "Africa/Nouakchott"
 msgstr "Afrika/Nuakšot"
 
-#: ../calendar/zones.h:71
+#: ../calendar/zones.h:70
 msgid "Africa/Ouagadougou"
 msgstr "Afrika/Uagadugu"
 
-#: ../calendar/zones.h:72
+#: ../calendar/zones.h:71
 msgid "Africa/Porto-Novo"
 msgstr "Afrika/Porto-Novo"
 
-#: ../calendar/zones.h:73
+#: ../calendar/zones.h:72
 msgid "Africa/Sao_Tome"
 msgstr "Afrika/Sao_Tome"
 
-#: ../calendar/zones.h:74
+#: ../calendar/zones.h:73
 msgid "Africa/Timbuktu"
 msgstr "Afrika/Timbuktu"
 
-#: ../calendar/zones.h:75
+#: ../calendar/zones.h:74
 msgid "Africa/Tripoli"
 msgstr "Afrika/Tripoli"
 
-#: ../calendar/zones.h:76
+#: ../calendar/zones.h:75
 msgid "Africa/Tunis"
 msgstr "Afrika/Tunis"
 
-#: ../calendar/zones.h:77
+#: ../calendar/zones.h:76
 msgid "Africa/Windhoek"
 msgstr "Afrika/Vindoek"
 
-#: ../calendar/zones.h:78
+#: ../calendar/zones.h:77
 msgid "America/Adak"
 msgstr "Amerika/Adak"
 
-#: ../calendar/zones.h:79
+#: ../calendar/zones.h:78
 msgid "America/Anchorage"
 msgstr "Amerika/Ankorejdž"
 
-#: ../calendar/zones.h:80
+#: ../calendar/zones.h:79
 msgid "America/Anguilla"
 msgstr "Amerika/Angila"
 
-#: ../calendar/zones.h:81
+#: ../calendar/zones.h:80
 msgid "America/Antigua"
 msgstr "Amerika/Antigva"
 
-#: ../calendar/zones.h:82
+#: ../calendar/zones.h:81
 msgid "America/Araguaina"
 msgstr "Amerika/Aragvajna"
 
-#: ../calendar/zones.h:83
+#: ../calendar/zones.h:82
 msgid "America/Aruba"
 msgstr "Amerika/Aruba"
 
-#: ../calendar/zones.h:84
+#: ../calendar/zones.h:83
 msgid "America/Asuncion"
 msgstr "Amerika/Asunsion"
 
-#: ../calendar/zones.h:85
+#: ../calendar/zones.h:84
 msgid "America/Barbados"
 msgstr "Amerika/Barbados"
 
-#: ../calendar/zones.h:86
+#: ../calendar/zones.h:85
 msgid "America/Belem"
 msgstr "Amerika/Belem"
 
-#: ../calendar/zones.h:87
+#: ../calendar/zones.h:86
 msgid "America/Belize"
 msgstr "Amerika/Beliz"
 
-#: ../calendar/zones.h:88
+#: ../calendar/zones.h:87
 msgid "America/Boa_Vista"
 msgstr "Amerika/Boa_Vista"
 
-#: ../calendar/zones.h:89
+#: ../calendar/zones.h:88
 msgid "America/Bogota"
 msgstr "Amerika/Bogota"
 
-#: ../calendar/zones.h:90
+#: ../calendar/zones.h:89
 msgid "America/Boise"
 msgstr "Amerika/Buaz"
 
-#: ../calendar/zones.h:91
+#: ../calendar/zones.h:90
 msgid "America/Buenos_Aires"
 msgstr "Amerika/Buenos_Aires"
 
-#: ../calendar/zones.h:92
+#: ../calendar/zones.h:91
 msgid "America/Cambridge_Bay"
 msgstr "Amerika/Kejmbridž_zaliv"
 
-#: ../calendar/zones.h:93
+#: ../calendar/zones.h:92
 msgid "America/Cancun"
 msgstr "Amerika/Kankun"
 
-#: ../calendar/zones.h:94
+#: ../calendar/zones.h:93
 msgid "America/Caracas"
 msgstr "Amerika/Karakas"
 
-#: ../calendar/zones.h:95
+#: ../calendar/zones.h:94
 msgid "America/Catamarca"
 msgstr "Amerika/Katamarka"
 
-#: ../calendar/zones.h:96
+#: ../calendar/zones.h:95
 msgid "America/Cayenne"
 msgstr "Amerika/Kajen"
 
-#: ../calendar/zones.h:97
+#: ../calendar/zones.h:96
 msgid "America/Cayman"
 msgstr "Amerika/Kajman"
 
-#: ../calendar/zones.h:98
+#: ../calendar/zones.h:97
 msgid "America/Chicago"
 msgstr "Amerika/Čikago"
 
-#: ../calendar/zones.h:99
+#: ../calendar/zones.h:98
 msgid "America/Chihuahua"
 msgstr "Amerika/Čiuaua"
 
-#: ../calendar/zones.h:100
+#: ../calendar/zones.h:99
 msgid "America/Cordoba"
 msgstr "Amerika/Kordoba"
 
-#: ../calendar/zones.h:101
+#: ../calendar/zones.h:100
 msgid "America/Costa_Rica"
 msgstr "Amerika/Kostarika"
 
-#: ../calendar/zones.h:102
+#: ../calendar/zones.h:101
 msgid "America/Cuiaba"
 msgstr "Amerika/Kujaba"
 
-#: ../calendar/zones.h:103
+#: ../calendar/zones.h:102
 msgid "America/Curacao"
 msgstr "Amerika/Kurakao"
 
-#: ../calendar/zones.h:104
+#: ../calendar/zones.h:103
 msgid "America/Danmarkshavn"
 msgstr "Amerika/Denmarkšon"
 
-#: ../calendar/zones.h:105
+#: ../calendar/zones.h:104
 msgid "America/Dawson"
 msgstr "Amerika/Doson"
 
-#: ../calendar/zones.h:106
+#: ../calendar/zones.h:105
 msgid "America/Dawson_Creek"
 msgstr "Amerika/Doson_Krik"
 
-#: ../calendar/zones.h:107
+#: ../calendar/zones.h:106
 msgid "America/Denver"
 msgstr "Amerika/Denver"
 
-#: ../calendar/zones.h:108
+#: ../calendar/zones.h:107
 msgid "America/Detroit"
 msgstr "Amerika/Detroit"
 
-#: ../calendar/zones.h:109
+#: ../calendar/zones.h:108
 msgid "America/Dominica"
 msgstr "Amerika/Dominika"
 
-#: ../calendar/zones.h:110
+#: ../calendar/zones.h:109
 msgid "America/Edmonton"
 msgstr "Amerika/Edmonton"
 
-#: ../calendar/zones.h:111
+#: ../calendar/zones.h:110
 msgid "America/Eirunepe"
 msgstr "Amerika/Ejrunepe"
 
-#: ../calendar/zones.h:112
+#: ../calendar/zones.h:111
 msgid "America/El_Salvador"
 msgstr "Amerika/El_Salvador"
 
-#: ../calendar/zones.h:113
+#: ../calendar/zones.h:112
 msgid "America/Fortaleza"
 msgstr "Amerika/Fortaleza"
 
-#: ../calendar/zones.h:114
+#: ../calendar/zones.h:113
 msgid "America/Glace_Bay"
 msgstr "Amerika/Glas_Bej"
 
-#: ../calendar/zones.h:115
+#: ../calendar/zones.h:114
 msgid "America/Godthab"
 msgstr "Amerika/Gotab"
 
-#: ../calendar/zones.h:116
+#: ../calendar/zones.h:115
 msgid "America/Goose_Bay"
 msgstr "Amerika/Gus_Bej"
 
-#: ../calendar/zones.h:117
+#: ../calendar/zones.h:116
 msgid "America/Grand_Turk"
 msgstr "Amerika/Veliki_Turk"
 
-#: ../calendar/zones.h:118
+#: ../calendar/zones.h:117
 msgid "America/Grenada"
 msgstr "Amerika/Grenada"
 
-#: ../calendar/zones.h:119
+#: ../calendar/zones.h:118
 msgid "America/Guadeloupe"
 msgstr "Amerika/Gvadalupa"
 
-#: ../calendar/zones.h:120
+#: ../calendar/zones.h:119
 msgid "America/Guatemala"
 msgstr "Amerika/Gvatemala"
 
-#: ../calendar/zones.h:121
+#: ../calendar/zones.h:120
 msgid "America/Guayaquil"
 msgstr "Amerika/Gvajakil"
 
-#: ../calendar/zones.h:122
+#: ../calendar/zones.h:121
 msgid "America/Guyana"
 msgstr "Amerika/Gvajana"
 
-#: ../calendar/zones.h:123
+#: ../calendar/zones.h:122
 msgid "America/Halifax"
 msgstr "Amerika/Halifaks"
 
-#: ../calendar/zones.h:124
+#: ../calendar/zones.h:123
 msgid "America/Havana"
 msgstr "Amerika/Havana"
 
-#: ../calendar/zones.h:125
+#: ../calendar/zones.h:124
 msgid "America/Hermosillo"
 msgstr "Amerika/Ermosiljo"
 
-#: ../calendar/zones.h:126
+#: ../calendar/zones.h:125
 msgid "America/Indiana/Indianapolis"
 msgstr "Amerika/Indijana/Indijanapolis"
 
-#: ../calendar/zones.h:127
+#: ../calendar/zones.h:126
 msgid "America/Indiana/Knox"
 msgstr "Amerika/Indijana/Noks"
 
-#: ../calendar/zones.h:128
+#: ../calendar/zones.h:127
 msgid "America/Indiana/Marengo"
 msgstr "Amerika/Indijana/Marengo"
 
-#: ../calendar/zones.h:129
+#: ../calendar/zones.h:128
 msgid "America/Indiana/Vevay"
 msgstr "Amerika/Indijana/Vivej"
 
-#: ../calendar/zones.h:130
+#: ../calendar/zones.h:129
 msgid "America/Indianapolis"
 msgstr "Amerika/Indijanapolis"
 
-#: ../calendar/zones.h:131
+#: ../calendar/zones.h:130
 msgid "America/Inuvik"
 msgstr "Amerika/Inuvik"
 
-#: ../calendar/zones.h:132
+#: ../calendar/zones.h:131
 msgid "America/Iqaluit"
 msgstr "Amerika/Ikaluit"
 
-#: ../calendar/zones.h:133
+#: ../calendar/zones.h:132
 msgid "America/Jamaica"
 msgstr "Amerika/Jamajka"
 
-#: ../calendar/zones.h:134
+#: ../calendar/zones.h:133
 msgid "America/Jujuy"
 msgstr "Amerika/Huhui"
 
-#: ../calendar/zones.h:135
+#: ../calendar/zones.h:134
 msgid "America/Juneau"
 msgstr "Amerika/Džuno"
 
-#: ../calendar/zones.h:136
+#: ../calendar/zones.h:135
 msgid "America/Kentucky/Louisville"
 msgstr "Amerika/Kentaki/Liusvil"
 
-#: ../calendar/zones.h:137
+#: ../calendar/zones.h:136
 msgid "America/Kentucky/Monticello"
 msgstr "Amerika/Kentaki/Montićelo"
 
-#: ../calendar/zones.h:138
+#: ../calendar/zones.h:137
 msgid "America/La_Paz"
 msgstr "Amerika/La_Paz"
 
-#: ../calendar/zones.h:139
+#: ../calendar/zones.h:138
 msgid "America/Lima"
 msgstr "Amerika/Lima"
 
-#: ../calendar/zones.h:140
+#: ../calendar/zones.h:139
 msgid "America/Los_Angeles"
 msgstr "Amerika/Los_Anđeles"
 
-#: ../calendar/zones.h:141
+#: ../calendar/zones.h:140
 msgid "America/Louisville"
 msgstr "Amerika/Luisvil"
 
-#: ../calendar/zones.h:142
+#: ../calendar/zones.h:141
 msgid "America/Maceio"
 msgstr "Amerika/Maćejo"
 
-#: ../calendar/zones.h:143
+#: ../calendar/zones.h:142
 msgid "America/Managua"
 msgstr "Amerika/Managva"
 
-#: ../calendar/zones.h:144
+#: ../calendar/zones.h:143
 msgid "America/Manaus"
 msgstr "Amerika/Manaus"
 
-#: ../calendar/zones.h:145
+#: ../calendar/zones.h:144
 msgid "America/Martinique"
 msgstr "Amerika/Martinik"
 
-#: ../calendar/zones.h:146
+#: ../calendar/zones.h:145
 msgid "America/Mazatlan"
 msgstr "Amerika/Macatlan"
 
-#: ../calendar/zones.h:147
+#: ../calendar/zones.h:146
 msgid "America/Mendoza"
 msgstr "Amerika/Mendoza"
 
-#: ../calendar/zones.h:148
+#: ../calendar/zones.h:147
 msgid "America/Menominee"
 msgstr "Amerika/Menomini"
 
-#: ../calendar/zones.h:149
+#: ../calendar/zones.h:148
 msgid "America/Merida"
 msgstr "Amerika/Merida"
 
-#: ../calendar/zones.h:150
+#: ../calendar/zones.h:149
 msgid "America/Mexico_City"
 msgstr "Amerika/Meksiko_Siti"
 
-#: ../calendar/zones.h:151
+#: ../calendar/zones.h:150
 msgid "America/Miquelon"
 msgstr "Amerika/Mikelon"
 
-#: ../calendar/zones.h:152
+#: ../calendar/zones.h:151
 msgid "America/Monterrey"
 msgstr "Amerika/Monterej"
 
-#: ../calendar/zones.h:153
+#: ../calendar/zones.h:152
 msgid "America/Montevideo"
 msgstr "Amerika/Montevideo"
 
-#: ../calendar/zones.h:154
+#: ../calendar/zones.h:153
 msgid "America/Montreal"
 msgstr "Amerika/Montreal"
 
-#: ../calendar/zones.h:155
+#: ../calendar/zones.h:154
 msgid "America/Montserrat"
 msgstr "Amerika/Monserat"
 
-#: ../calendar/zones.h:156
+#: ../calendar/zones.h:155
 msgid "America/Nassau"
 msgstr "Amerika/Nasau"
 
-#: ../calendar/zones.h:157
+#: ../calendar/zones.h:156
 msgid "America/New_York"
 msgstr "Amerika/Njujork"
 
-#: ../calendar/zones.h:158
+#: ../calendar/zones.h:157
 msgid "America/Nipigon"
 msgstr "Amerika/Nipigon"
 
-#: ../calendar/zones.h:159
+#: ../calendar/zones.h:158
 msgid "America/Nome"
 msgstr "Amerika/Nom"
 
-#: ../calendar/zones.h:160
+#: ../calendar/zones.h:159
 msgid "America/Noronha"
 msgstr "Amerina/Norona"
 
-#: ../calendar/zones.h:161
+#: ../calendar/zones.h:160
 msgid "America/North_Dakota/Center"
 msgstr "Amerika/Severna_Dakota/Centar"
 
-#: ../calendar/zones.h:162
+#: ../calendar/zones.h:161
 msgid "America/Panama"
 msgstr "Amerika/Panama"
 
-#: ../calendar/zones.h:163
+#: ../calendar/zones.h:162
 msgid "America/Pangnirtung"
 msgstr "Amerika/Pangnirtung"
 
-#: ../calendar/zones.h:164
+#: ../calendar/zones.h:163
 msgid "America/Paramaribo"
 msgstr "Amerika/Paramaribo"
 
-#: ../calendar/zones.h:165
+#: ../calendar/zones.h:164
 msgid "America/Phoenix"
 msgstr "Amerika/Feniks"
 
-#: ../calendar/zones.h:166
+#: ../calendar/zones.h:165
 msgid "America/Port-au-Prince"
 msgstr "Amerika/Portoprens"
 
-#: ../calendar/zones.h:167
+#: ../calendar/zones.h:166
 msgid "America/Port_of_Spain"
 msgstr "Amerika/Port_Of_Spejn"
 
-#: ../calendar/zones.h:168
+#: ../calendar/zones.h:167
 msgid "America/Porto_Velho"
 msgstr "Amerika/Portovelo"
 
-#: ../calendar/zones.h:169
+#: ../calendar/zones.h:168
 msgid "America/Puerto_Rico"
 msgstr "Amerika/Portoriko"
 
-#: ../calendar/zones.h:170
+#: ../calendar/zones.h:169
 msgid "America/Rainy_River"
 msgstr "Amerika/Rejni_River"
 
-#: ../calendar/zones.h:171
+#: ../calendar/zones.h:170
 msgid "America/Rankin_Inlet"
 msgstr "Amerika/Renkin_Inlet"
 
-#: ../calendar/zones.h:172
+#: ../calendar/zones.h:171
 msgid "America/Recife"
 msgstr "Amerika/Resifi"
 
-#: ../calendar/zones.h:173
+#: ../calendar/zones.h:172
 msgid "America/Regina"
 msgstr "Amerika/Regina"
 
-#: ../calendar/zones.h:174
+#: ../calendar/zones.h:173
 msgid "America/Rio_Branco"
 msgstr "Amerika/Rio_Branko"
 
-#: ../calendar/zones.h:175
+#: ../calendar/zones.h:174
 msgid "America/Rosario"
 msgstr "Amerika/Rozario"
 
-#: ../calendar/zones.h:176
+#: ../calendar/zones.h:175
 msgid "America/Santiago"
 msgstr "Amerika/Santjago"
 
-#: ../calendar/zones.h:177
+#: ../calendar/zones.h:176
 msgid "America/Santo_Domingo"
 msgstr "Amerika/Santo_Domingo"
 
-#: ../calendar/zones.h:178
+#: ../calendar/zones.h:177
 msgid "America/Sao_Paulo"
 msgstr "Amerika/Sao_Paolo"
 
-#: ../calendar/zones.h:179
+#: ../calendar/zones.h:178
 msgid "America/Scoresbysund"
 msgstr "Amerika/Skorsbajsand"
 
-#: ../calendar/zones.h:180
+#: ../calendar/zones.h:179
 msgid "America/Shiprock"
 msgstr "Amerika/Šiprok"
 
-#: ../calendar/zones.h:181
+#: ../calendar/zones.h:180
 msgid "America/St_Johns"
 msgstr "Amerika/Sv_Džons"
 
-#: ../calendar/zones.h:182
+#: ../calendar/zones.h:181
 msgid "America/St_Kitts"
 msgstr "Amerika/Sv_Kits"
 
-#: ../calendar/zones.h:183
+#: ../calendar/zones.h:182
 msgid "America/St_Lucia"
 msgstr "Amerika/Sv_Lucija"
 
-#: ../calendar/zones.h:184
+#: ../calendar/zones.h:183
 msgid "America/St_Thomas"
 msgstr "Amerika/Sv_Tomas"
 
-#: ../calendar/zones.h:185
+#: ../calendar/zones.h:184
 msgid "America/St_Vincent"
 msgstr "Amerika/Sv_Vinsent"
 
-#: ../calendar/zones.h:186
+#: ../calendar/zones.h:185
 msgid "America/Swift_Current"
 msgstr "Amerika/Svift_Karent"
 
-#: ../calendar/zones.h:187
+#: ../calendar/zones.h:186
 msgid "America/Tegucigalpa"
 msgstr "Amerika/Tegusigalpa"
 
-#: ../calendar/zones.h:188
+#: ../calendar/zones.h:187
 msgid "America/Thule"
 msgstr "Amerika/Tula"
 
-#: ../calendar/zones.h:189
+#: ../calendar/zones.h:188
 msgid "America/Thunder_Bay"
 msgstr "Amerika/Tander_Bej"
 
-#: ../calendar/zones.h:190
+#: ../calendar/zones.h:189
 msgid "America/Tijuana"
 msgstr "Amerika/Tihuana"
 
-#: ../calendar/zones.h:191
+#: ../calendar/zones.h:190
 msgid "America/Tortola"
 msgstr "Amerika/Tortola"
 
-#: ../calendar/zones.h:192
+#: ../calendar/zones.h:191
 msgid "America/Vancouver"
 msgstr "Amerika/Vankuver"
 
-#: ../calendar/zones.h:193
+#: ../calendar/zones.h:192
 msgid "America/Whitehorse"
 msgstr "Amerika/Vajthors"
 
-#: ../calendar/zones.h:194
+#: ../calendar/zones.h:193
 msgid "America/Winnipeg"
 msgstr "Amerika/Vinipeg"
 
-#: ../calendar/zones.h:195
+#: ../calendar/zones.h:194
 msgid "America/Yakutat"
 msgstr "Amerika/Jakutat"
 
-#: ../calendar/zones.h:196
+#: ../calendar/zones.h:195
 msgid "America/Yellowknife"
 msgstr "Amerika/Jelounajf"
 
-#: ../calendar/zones.h:197
+#: ../calendar/zones.h:196
 msgid "Antarctica/Casey"
 msgstr "Antarktik/Kejsi"
 
-#: ../calendar/zones.h:198
+#: ../calendar/zones.h:197
 msgid "Antarctica/Davis"
 msgstr "Antarktik/Dejvis"
 
-#: ../calendar/zones.h:199
+#: ../calendar/zones.h:198
 msgid "Antarctica/DumontDUrville"
 msgstr "Antarktik/Dimondirvij"
 
-#: ../calendar/zones.h:200
+#: ../calendar/zones.h:199
 msgid "Antarctica/Mawson"
 msgstr "Antarktik/Moson"
 
-#: ../calendar/zones.h:201
+#: ../calendar/zones.h:200
 msgid "Antarctica/McMurdo"
 msgstr "Antarktik/Mekmardo"
 
-#: ../calendar/zones.h:202
+#: ../calendar/zones.h:201
 msgid "Antarctica/Palmer"
 msgstr "Antarktik/Palmer"
 
-#: ../calendar/zones.h:203
+#: ../calendar/zones.h:202
 msgid "Antarctica/South_Pole"
 msgstr "Antarktik/Južni_pol"
 
-#: ../calendar/zones.h:204
+#: ../calendar/zones.h:203
 msgid "Antarctica/Syowa"
 msgstr "Antarktik/Sijova"
 
-#: ../calendar/zones.h:205
+#: ../calendar/zones.h:204
 msgid "Antarctica/Vostok"
 msgstr "Antarktik/Vostok"
 
-#: ../calendar/zones.h:206
+#: ../calendar/zones.h:205
 msgid "Arctic/Longyearbyen"
 msgstr "Arktik/Longjerbjen"
 
-#: ../calendar/zones.h:207
+#: ../calendar/zones.h:206
 msgid "Asia/Aden"
 msgstr "Azija/Aden"
 
-#: ../calendar/zones.h:208
+#: ../calendar/zones.h:207
 msgid "Asia/Almaty"
 msgstr "Azija/Almati"
 
-#: ../calendar/zones.h:209
+#: ../calendar/zones.h:208
 msgid "Asia/Amman"
 msgstr "Azija/Aman"
 
-#: ../calendar/zones.h:210
+#: ../calendar/zones.h:209
 msgid "Asia/Anadyr"
 msgstr "Azija/Anadir"
 
-#: ../calendar/zones.h:211
+#: ../calendar/zones.h:210
 msgid "Asia/Aqtau"
 msgstr "Azija/Akto"
 
-#: ../calendar/zones.h:212
+#: ../calendar/zones.h:211
 msgid "Asia/Aqtobe"
 msgstr "Azija/Aktobe"
 
-#: ../calendar/zones.h:213
+#: ../calendar/zones.h:212
 msgid "Asia/Ashgabat"
 msgstr "Azija/Ašgabat"
 
-#: ../calendar/zones.h:214
+#: ../calendar/zones.h:213
 msgid "Asia/Baghdad"
 msgstr "Azija/Bagdad"
 
-#: ../calendar/zones.h:215
+#: ../calendar/zones.h:214
 msgid "Asia/Bahrain"
 msgstr "Azija/Bahrein"
 
-#: ../calendar/zones.h:216
+#: ../calendar/zones.h:215
 msgid "Asia/Baku"
 msgstr "Azija/Baku"
 
-#: ../calendar/zones.h:217
+#: ../calendar/zones.h:216
 msgid "Asia/Bangkok"
 msgstr "Azija/Bangkok"
 
-#: ../calendar/zones.h:218
+#: ../calendar/zones.h:217
 msgid "Asia/Beirut"
 msgstr "Azija/Bejrut"
 
-#: ../calendar/zones.h:219
+#: ../calendar/zones.h:218
 msgid "Asia/Bishkek"
 msgstr "Azija/Biškek"
 
-#: ../calendar/zones.h:220
+#: ../calendar/zones.h:219
 msgid "Asia/Brunei"
 msgstr "Azija/Brunej"
 
-#: ../calendar/zones.h:221
+#: ../calendar/zones.h:220
 msgid "Asia/Calcutta"
 msgstr "Azija/Kalkuta"
 
-#: ../calendar/zones.h:222
+#: ../calendar/zones.h:221
 msgid "Asia/Choibalsan"
 msgstr "Azija/Kobajsan"
 
-#: ../calendar/zones.h:223
+#: ../calendar/zones.h:222
 msgid "Asia/Chongqing"
 msgstr "Azija/Čongking"
 
-#: ../calendar/zones.h:224
+#: ../calendar/zones.h:223
 msgid "Asia/Colombo"
 msgstr "Azija/Kolombo"
 
-#: ../calendar/zones.h:225
+#: ../calendar/zones.h:224
 msgid "Asia/Damascus"
 msgstr "Azija/Damask"
 
-#: ../calendar/zones.h:226
+#: ../calendar/zones.h:225
 msgid "Asia/Dhaka"
 msgstr "Azija/Daka"
 
-#: ../calendar/zones.h:227
+#: ../calendar/zones.h:226
 msgid "Asia/Dili"
 msgstr "Azija/Dili"
 
-#: ../calendar/zones.h:228
+#: ../calendar/zones.h:227
 msgid "Asia/Dubai"
 msgstr "Azija/Dubai"
 
-#: ../calendar/zones.h:229
+#: ../calendar/zones.h:228
 msgid "Asia/Dushanbe"
 msgstr "Azija/Dušanbe"
 
-#: ../calendar/zones.h:230
+#: ../calendar/zones.h:229
 msgid "Asia/Gaza"
 msgstr "Azija/Gaza"
 
-#: ../calendar/zones.h:231
+#: ../calendar/zones.h:230
 msgid "Asia/Harbin"
 msgstr "Azija/Harbin"
 
-#: ../calendar/zones.h:232
+#: ../calendar/zones.h:231
 msgid "Asia/Hong_Kong"
 msgstr "Azija/Hongkong"
 
-#: ../calendar/zones.h:233
+#: ../calendar/zones.h:232
 msgid "Asia/Hovd"
 msgstr "Azija/Houd"
 
-#: ../calendar/zones.h:234
+#: ../calendar/zones.h:233
 msgid "Asia/Irkutsk"
 msgstr "Azija/Irkutsk"
 
-#: ../calendar/zones.h:235
+#: ../calendar/zones.h:234
 msgid "Asia/Istanbul"
 msgstr "Azija/Istanbul"
 
-#: ../calendar/zones.h:236
+#: ../calendar/zones.h:235
 msgid "Asia/Jakarta"
 msgstr "Azija/Džakarta"
 
-#: ../calendar/zones.h:237
+#: ../calendar/zones.h:236
 msgid "Asia/Jayapura"
 msgstr "Azija/Džajapura"
 
-#: ../calendar/zones.h:238
+#: ../calendar/zones.h:237
 msgid "Asia/Jerusalem"
 msgstr "Azija/Jerusalim"
 
-#: ../calendar/zones.h:239
+#: ../calendar/zones.h:238
 msgid "Asia/Kabul"
 msgstr "Azija/Kabul"
 
-#: ../calendar/zones.h:240
+#: ../calendar/zones.h:239
 msgid "Asia/Kamchatka"
 msgstr "Azija/Kamčatka"
 
-#: ../calendar/zones.h:241
+#: ../calendar/zones.h:240
 msgid "Asia/Karachi"
 msgstr "Azija/Karači"
 
-#: ../calendar/zones.h:242
+#: ../calendar/zones.h:241
 msgid "Asia/Kashgar"
 msgstr "Azija/Kašgar"
 
-#: ../calendar/zones.h:243
+#: ../calendar/zones.h:242
 msgid "Asia/Katmandu"
 msgstr "Azija/Katmandu"
 
-#: ../calendar/zones.h:244
+#: ../calendar/zones.h:243
 msgid "Asia/Krasnoyarsk"
 msgstr "Azija/Krasnojarsk"
 
-#: ../calendar/zones.h:245
+#: ../calendar/zones.h:244
 msgid "Asia/Kuala_Lumpur"
 msgstr "Azija/Kuala_Lumpur"
 
-#: ../calendar/zones.h:246
+#: ../calendar/zones.h:245
 msgid "Asia/Kuching"
 msgstr "Azija/Kučing"
 
-#: ../calendar/zones.h:247
+#: ../calendar/zones.h:246
 msgid "Asia/Kuwait"
 msgstr "Azija/Kuvajt"
 
-#: ../calendar/zones.h:248
+#: ../calendar/zones.h:247
 msgid "Asia/Macao"
 msgstr "Azija/Makao"
 
-#: ../calendar/zones.h:249
+#: ../calendar/zones.h:248
 msgid "Asia/Macau"
 msgstr "Azija/Makau"
 
-#: ../calendar/zones.h:250
+#: ../calendar/zones.h:249
 msgid "Asia/Magadan"
 msgstr "Azija/Magadan"
 
-#: ../calendar/zones.h:251
+#: ../calendar/zones.h:250
 msgid "Asia/Makassar"
 msgstr "Azija/Makasar"
 
-#: ../calendar/zones.h:252
+#: ../calendar/zones.h:251
 msgid "Asia/Manila"
 msgstr "Azija/Manila"
 
-#: ../calendar/zones.h:253
+#: ../calendar/zones.h:252
 msgid "Asia/Muscat"
 msgstr "Azija/Muskat"
 
-#: ../calendar/zones.h:254
+#: ../calendar/zones.h:253
 msgid "Asia/Nicosia"
 msgstr "Azija/Nikozija"
 
-#: ../calendar/zones.h:255
+#: ../calendar/zones.h:254
 msgid "Asia/Novosibirsk"
 msgstr "Azija/Novosibirsk"
 
-#: ../calendar/zones.h:256
+#: ../calendar/zones.h:255
 msgid "Asia/Omsk"
 msgstr "Azija/Omsk"
 
-#: ../calendar/zones.h:257
+#: ../calendar/zones.h:256
 msgid "Asia/Oral"
 msgstr "Azija/Oral"
 
-#: ../calendar/zones.h:258
+#: ../calendar/zones.h:257
 msgid "Asia/Phnom_Penh"
 msgstr "Azija/Pnom_Pen"
 
-#: ../calendar/zones.h:259
+#: ../calendar/zones.h:258
 msgid "Asia/Pontianak"
 msgstr "Azija/Pontianak"
 
-#: ../calendar/zones.h:260
+#: ../calendar/zones.h:259
 msgid "Asia/Pyongyang"
 msgstr "Azija/Pjongjang"
 
-#: ../calendar/zones.h:261
+#: ../calendar/zones.h:260
 msgid "Asia/Qatar"
 msgstr "Azija/Katar"
 
-#: ../calendar/zones.h:262
+#: ../calendar/zones.h:261
 msgid "Asia/Qyzylorda"
 msgstr "Azija/Kzil-Orda"
 
-#: ../calendar/zones.h:263
+#: ../calendar/zones.h:262
 msgid "Asia/Rangoon"
 msgstr "Azija/Rangun"
 
-#: ../calendar/zones.h:264
+#: ../calendar/zones.h:263
 msgid "Asia/Riyadh"
 msgstr "Azija/Rijad"
 
-#: ../calendar/zones.h:265
+#: ../calendar/zones.h:264
 msgid "Asia/Saigon"
 msgstr "Azija/Sajgon"
 
-#: ../calendar/zones.h:266
+#: ../calendar/zones.h:265
 msgid "Asia/Sakhalin"
 msgstr "Azija/Sahalin"
 
-#: ../calendar/zones.h:267
+#: ../calendar/zones.h:266
 msgid "Asia/Samarkand"
 msgstr "Azija/Samarkand"
 
-#: ../calendar/zones.h:268
+#: ../calendar/zones.h:267
 msgid "Asia/Seoul"
 msgstr "Azija/Seul"
 
-#: ../calendar/zones.h:269
+#: ../calendar/zones.h:268
 msgid "Asia/Shanghai"
 msgstr "Azija/Šangaj"
 
-#: ../calendar/zones.h:270
+#: ../calendar/zones.h:269
 msgid "Asia/Singapore"
 msgstr "Azija/Singapur"
 
-#: ../calendar/zones.h:271
+#: ../calendar/zones.h:270
 msgid "Asia/Taipei"
 msgstr "Azija/Tajpej"
 
-#: ../calendar/zones.h:272
+#: ../calendar/zones.h:271
 msgid "Asia/Tashkent"
 msgstr "Azija/Taškent"
 
-#: ../calendar/zones.h:273
+#: ../calendar/zones.h:272
 msgid "Asia/Tbilisi"
 msgstr "Azija/Tbilisi"
 
-#: ../calendar/zones.h:274
+#: ../calendar/zones.h:273
 msgid "Asia/Tehran"
 msgstr "Azija/Teheran"
 
-#: ../calendar/zones.h:275
+#: ../calendar/zones.h:274
 msgid "Asia/Thimphu"
 msgstr "Azija/Timfu"
 
-#: ../calendar/zones.h:276
+#: ../calendar/zones.h:275
 msgid "Asia/Tokyo"
 msgstr "Azija/Tokio"
 
-#: ../calendar/zones.h:277
+#: ../calendar/zones.h:276
 msgid "Asia/Ujung_Pandang"
 msgstr "Azija/Ujung_Pandang"
 
-#: ../calendar/zones.h:278
+#: ../calendar/zones.h:277
 msgid "Asia/Ulaanbaatar"
 msgstr "Azija/Ulan_Bator"
 
-#: ../calendar/zones.h:279
+#: ../calendar/zones.h:278
 msgid "Asia/Urumqi"
 msgstr "Azija/Urumki"
 
-#: ../calendar/zones.h:280
+#: ../calendar/zones.h:279
 msgid "Asia/Vientiane"
 msgstr "Azija/Vijentan"
 
-#: ../calendar/zones.h:281
+#: ../calendar/zones.h:280
 msgid "Asia/Vladivostok"
 msgstr "Azija/Vladivostok"
 
-#: ../calendar/zones.h:282
+#: ../calendar/zones.h:281
 msgid "Asia/Yakutsk"
 msgstr "Azija/Jakutsk"
 
-#: ../calendar/zones.h:283
+#: ../calendar/zones.h:282
 msgid "Asia/Yekaterinburg"
 msgstr "Azija/Jekaterinburg"
 
-#: ../calendar/zones.h:284
+#: ../calendar/zones.h:283
 msgid "Asia/Yerevan"
 msgstr "Azija/Jerevan"
 
-#: ../calendar/zones.h:285
+#: ../calendar/zones.h:284
 msgid "Atlantic/Azores"
 msgstr "Atlantik/Azori"
 
-#: ../calendar/zones.h:286
+#: ../calendar/zones.h:285
 msgid "Atlantic/Bermuda"
 msgstr "Atlantik/Bermuda"
 
-#: ../calendar/zones.h:287
+#: ../calendar/zones.h:286
 msgid "Atlantic/Canary"
 msgstr "Atlantik/Kanari"
 
-#: ../calendar/zones.h:288
+#: ../calendar/zones.h:287
 msgid "Atlantic/Cape_Verde"
 msgstr "Atlantik/Zelenortska_Ostrva"
 
-#: ../calendar/zones.h:289
+#: ../calendar/zones.h:288
 msgid "Atlantic/Faeroe"
 msgstr "Atlantik/Farska_ostrva"
 
-#: ../calendar/zones.h:290
+#: ../calendar/zones.h:289
 msgid "Atlantic/Jan_Mayen"
 msgstr "Atlantik/Jan_Majen"
 
-#: ../calendar/zones.h:291
+#: ../calendar/zones.h:290
 msgid "Atlantic/Madeira"
 msgstr "Atlantik/Madejra"
 
-#: ../calendar/zones.h:292
+#: ../calendar/zones.h:291
 msgid "Atlantic/Reykjavik"
 msgstr "Atlantik/Rejkjavik"
 
-#: ../calendar/zones.h:293
+#: ../calendar/zones.h:292
 msgid "Atlantic/South_Georgia"
 msgstr "Atlantik/Južna_Džordžija"
 
-#: ../calendar/zones.h:294
+#: ../calendar/zones.h:293
 msgid "Atlantic/St_Helena"
 msgstr "Atlantik/Sv_Jelena"
 
-#: ../calendar/zones.h:295
+#: ../calendar/zones.h:294
 msgid "Atlantic/Stanley"
 msgstr "Atlantik/Stenli"
 
-#: ../calendar/zones.h:296
+#: ../calendar/zones.h:295
 msgid "Australia/Adelaide"
 msgstr "Australija/Adelejd"
 
-#: ../calendar/zones.h:297
+#: ../calendar/zones.h:296
 msgid "Australia/Brisbane"
 msgstr "Australija/Brizbejn"
 
-#: ../calendar/zones.h:298
+#: ../calendar/zones.h:297
 msgid "Australia/Broken_Hill"
 msgstr "Australija/Brouken_Hil"
 
-#: ../calendar/zones.h:299
+#: ../calendar/zones.h:298
 msgid "Australia/Darwin"
 msgstr "Australija/Darvin"
 
-#: ../calendar/zones.h:300
+#: ../calendar/zones.h:299
 msgid "Australia/Hobart"
 msgstr "Australija/Hobart"
 
-#: ../calendar/zones.h:301
+#: ../calendar/zones.h:300
 msgid "Australia/Lindeman"
 msgstr "Australija/Lindman"
 
-#: ../calendar/zones.h:302
+#: ../calendar/zones.h:301
 msgid "Australia/Lord_Howe"
 msgstr "Australija/Lord_Ov"
 
-#: ../calendar/zones.h:303
+#: ../calendar/zones.h:302
 msgid "Australia/Melbourne"
 msgstr "Australija/Melburn"
 
-#: ../calendar/zones.h:304
+#: ../calendar/zones.h:303
 msgid "Australia/Perth"
 msgstr "Australija/Pert"
 
-#: ../calendar/zones.h:305
+#: ../calendar/zones.h:304
 msgid "Australia/Sydney"
 msgstr "Australija/Sidnej"
 
-#: ../calendar/zones.h:306
+#: ../calendar/zones.h:305
 msgid "Europe/Amsterdam"
 msgstr "Evropa/Amsterdam"
 
-#: ../calendar/zones.h:307
+#: ../calendar/zones.h:306
 msgid "Europe/Andorra"
 msgstr "Evropa/Andora"
 
-#: ../calendar/zones.h:308
+#: ../calendar/zones.h:307
 msgid "Europe/Athens"
 msgstr "Evropa/Atina"
 
-#: ../calendar/zones.h:309
+#: ../calendar/zones.h:308
 msgid "Europe/Belfast"
 msgstr "Evropa/Belfast"
 
-#: ../calendar/zones.h:310
+#: ../calendar/zones.h:309
 msgid "Europe/Belgrade"
 msgstr "Evropa/Beograd"
 
-#: ../calendar/zones.h:311
+#: ../calendar/zones.h:310
 msgid "Europe/Berlin"
 msgstr "Evropa/Berlin"
 
-#: ../calendar/zones.h:312
+#: ../calendar/zones.h:311
 msgid "Europe/Bratislava"
 msgstr "Evropa/Bratislava"
 
-#: ../calendar/zones.h:313
+#: ../calendar/zones.h:312
 msgid "Europe/Brussels"
 msgstr "Evropa/Brisel"
 
-#: ../calendar/zones.h:314
+#: ../calendar/zones.h:313
 msgid "Europe/Bucharest"
 msgstr "Evropa/Bukurešt"
 
-#: ../calendar/zones.h:315
+#: ../calendar/zones.h:314
 msgid "Europe/Budapest"
 msgstr "Evropa/Budimpešta"
 
-#: ../calendar/zones.h:316
+#: ../calendar/zones.h:315
 msgid "Europe/Chisinau"
 msgstr "Evropa/Čisinau"
 
-#: ../calendar/zones.h:317
+#: ../calendar/zones.h:316
 msgid "Europe/Copenhagen"
 msgstr "Evropa/Kopenhagen"
 
-#: ../calendar/zones.h:318
+#: ../calendar/zones.h:317
 msgid "Europe/Dublin"
 msgstr "Evropa/Dablin"
 
-#: ../calendar/zones.h:319
+#: ../calendar/zones.h:318
 msgid "Europe/Gibraltar"
 msgstr "Evropa/Gibraltar"
 
-#: ../calendar/zones.h:320
+#: ../calendar/zones.h:319
 msgid "Europe/Helsinki"
 msgstr "Evropa/Helsinki"
 
-#: ../calendar/zones.h:321
+#: ../calendar/zones.h:320
 msgid "Europe/Istanbul"
 msgstr "Evropa/Istambul"
 
-#: ../calendar/zones.h:322
+#: ../calendar/zones.h:321
 msgid "Europe/Kaliningrad"
 msgstr "Evropa/Kalinjingrad"
 
-#: ../calendar/zones.h:323
+#: ../calendar/zones.h:322
 msgid "Europe/Kiev"
 msgstr "Evropa/Kijev"
 
-#: ../calendar/zones.h:324
+#: ../calendar/zones.h:323
 msgid "Europe/Lisbon"
 msgstr "Evropa/Lisabon"
 
-#: ../calendar/zones.h:325
+#: ../calendar/zones.h:324
 msgid "Europe/Ljubljana"
 msgstr "Evropa/Ljubljana"
 
-#: ../calendar/zones.h:326
+#: ../calendar/zones.h:325
 msgid "Europe/London"
 msgstr "Evropa/London"
 
-#: ../calendar/zones.h:327
+#: ../calendar/zones.h:326
 msgid "Europe/Luxembourg"
 msgstr "Evropa/Luksemburg"
 
-#: ../calendar/zones.h:328
+#: ../calendar/zones.h:327
 msgid "Europe/Madrid"
 msgstr "Evropa/Madrid"
 
-#: ../calendar/zones.h:329
+#: ../calendar/zones.h:328
 msgid "Europe/Malta"
 msgstr "Evropa/Malta"
 
-#: ../calendar/zones.h:330
+#: ../calendar/zones.h:329
 msgid "Europe/Minsk"
 msgstr "Evropa/Minsk"
 
-#: ../calendar/zones.h:331
+#: ../calendar/zones.h:330
 msgid "Europe/Monaco"
 msgstr "Evropa/Monako"
 
-#: ../calendar/zones.h:332
+#: ../calendar/zones.h:331
 msgid "Europe/Moscow"
 msgstr "Evropa/Moskva"
 
-#: ../calendar/zones.h:333
+#: ../calendar/zones.h:332
 msgid "Europe/Nicosia"
 msgstr "Evropa/Nikozija"
 
-#: ../calendar/zones.h:334
+#: ../calendar/zones.h:333
 msgid "Europe/Oslo"
 msgstr "Evropa/Oslo"
 
-#: ../calendar/zones.h:335
+#: ../calendar/zones.h:334
 msgid "Europe/Paris"
 msgstr "Evropa/Pariz"
 
-#: ../calendar/zones.h:336
+#: ../calendar/zones.h:335
 msgid "Europe/Prague"
 msgstr "Evropa/Prag"
 
-#: ../calendar/zones.h:337
+#: ../calendar/zones.h:336
 msgid "Europe/Riga"
 msgstr "Evropa/Riga"
 
-#: ../calendar/zones.h:338
+#: ../calendar/zones.h:337
 msgid "Europe/Rome"
 msgstr "Evropa/Rim"
 
-#: ../calendar/zones.h:339
+#: ../calendar/zones.h:338
 msgid "Europe/Samara"
 msgstr "Evropa/Samara"
 
-#: ../calendar/zones.h:340
+#: ../calendar/zones.h:339
 msgid "Europe/San_Marino"
 msgstr "Evropa/San_Marino"
 
-#: ../calendar/zones.h:341
+#: ../calendar/zones.h:340
 msgid "Europe/Sarajevo"
 msgstr "Evropa/Sarajevo"
 
-#: ../calendar/zones.h:342
+#: ../calendar/zones.h:341
 msgid "Europe/Simferopol"
 msgstr "Evropa/Sevastopolj"
 
-#: ../calendar/zones.h:343
+#: ../calendar/zones.h:342
 msgid "Europe/Skopje"
 msgstr "Evropa/Skoplje"
 
-#: ../calendar/zones.h:344
+#: ../calendar/zones.h:343
 msgid "Europe/Sofia"
 msgstr "Evropa/Sofija"
 
-#: ../calendar/zones.h:345
+#: ../calendar/zones.h:344
 msgid "Europe/Stockholm"
 msgstr "Evropa/Stokholm"
 
-#: ../calendar/zones.h:346
+#: ../calendar/zones.h:345
 msgid "Europe/Tallinn"
 msgstr "Evropa/Talin"
 
-#: ../calendar/zones.h:347
+#: ../calendar/zones.h:346
 msgid "Europe/Tirane"
 msgstr "Evropa/Tirana"
 
-#: ../calendar/zones.h:348
+#: ../calendar/zones.h:347
 msgid "Europe/Uzhgorod"
 msgstr "Evropa/Užgorod"
 
-#: ../calendar/zones.h:349
+#: ../calendar/zones.h:348
 msgid "Europe/Vaduz"
 msgstr "Evropa/Vaduz"
 
-#: ../calendar/zones.h:350
+#: ../calendar/zones.h:349
 msgid "Europe/Vatican"
 msgstr "Evropa/Vatikan"
 
-#: ../calendar/zones.h:351
+#: ../calendar/zones.h:350
 msgid "Europe/Vienna"
 msgstr "Evropa/Beč"
 
-#: ../calendar/zones.h:352
+#: ../calendar/zones.h:351
 msgid "Europe/Vilnius"
 msgstr "Evropa/Vilnus"
 
-#: ../calendar/zones.h:353
+#: ../calendar/zones.h:352
 msgid "Europe/Warsaw"
 msgstr "Evropa/Varšava"
 
-#: ../calendar/zones.h:354
+#: ../calendar/zones.h:353
 msgid "Europe/Zagreb"
 msgstr "Evropa/Zagreb"
 
-#: ../calendar/zones.h:355
+#: ../calendar/zones.h:354
 msgid "Europe/Zaporozhye"
 msgstr "Evropa/Zaporožje"
 
-#: ../calendar/zones.h:356
+#: ../calendar/zones.h:355
 msgid "Europe/Zurich"
 msgstr "Evropa/Cirih"
 
-#: ../calendar/zones.h:357
+#: ../calendar/zones.h:356
 msgid "Indian/Antananarivo"
 msgstr "Indijski/Antananarivo"
 
-#: ../calendar/zones.h:358
+#: ../calendar/zones.h:357
 msgid "Indian/Chagos"
 msgstr "Indijski_okean/Čagos"
 
-#: ../calendar/zones.h:359
+#: ../calendar/zones.h:358
 msgid "Indian/Christmas"
 msgstr "Indijski_okean/Božićna_ostrva"
 
-#: ../calendar/zones.h:360
+#: ../calendar/zones.h:359
 msgid "Indian/Cocos"
 msgstr "Indijski_okean/Kokos"
 
-#: ../calendar/zones.h:361
+#: ../calendar/zones.h:360
 msgid "Indian/Comoro"
 msgstr "Indijski_okean/Komoro"
 
-#: ../calendar/zones.h:362
+#: ../calendar/zones.h:361
 msgid "Indian/Kerguelen"
 msgstr "Indijski/Kerguelen"
 
-#: ../calendar/zones.h:363
+#: ../calendar/zones.h:362
 msgid "Indian/Mahe"
 msgstr "Indijski_okean/Mahe"
 
-#: ../calendar/zones.h:364
+#: ../calendar/zones.h:363
 msgid "Indian/Maldives"
 msgstr "Indijski_okean/Maldivi"
 
-#: ../calendar/zones.h:365
+#: ../calendar/zones.h:364
 msgid "Indian/Mauritius"
 msgstr "Indijski_okean/Mauricijus"
 
-#: ../calendar/zones.h:366
+#: ../calendar/zones.h:365
 msgid "Indian/Mayotte"
 msgstr "Indijski_okean/Majot"
 
-#: ../calendar/zones.h:367
+#: ../calendar/zones.h:366
 msgid "Indian/Reunion"
 msgstr "Indijski_okean/Reunion"
 
-#: ../calendar/zones.h:368
+#: ../calendar/zones.h:367
 msgid "Pacific/Apia"
 msgstr "Pacifik/Apia"
 
-#: ../calendar/zones.h:369
+#: ../calendar/zones.h:368
 msgid "Pacific/Auckland"
 msgstr "Pacifik/Oklend"
 
-#: ../calendar/zones.h:370
+#: ../calendar/zones.h:369
 msgid "Pacific/Chatham"
 msgstr "Pacifik/Čatam"
 
-#: ../calendar/zones.h:371
+#: ../calendar/zones.h:370
 msgid "Pacific/Easter"
 msgstr "Pacifik/Uskršnja_ostrva"
 
-#: ../calendar/zones.h:372
+#: ../calendar/zones.h:371
 msgid "Pacific/Efate"
 msgstr "Pacifik/Efat"
 
-#: ../calendar/zones.h:373
+#: ../calendar/zones.h:372
 msgid "Pacific/Enderbury"
 msgstr "Pacifik/Enderburi"
 
-#: ../calendar/zones.h:374
+#: ../calendar/zones.h:373
 msgid "Pacific/Fakaofo"
 msgstr "Pacifik/Fakaofo"
 
-#: ../calendar/zones.h:375
+#: ../calendar/zones.h:374
 msgid "Pacific/Fiji"
 msgstr "Pacifik/Fidži"
 
-#: ../calendar/zones.h:376
+#: ../calendar/zones.h:375
 msgid "Pacific/Funafuti"
 msgstr "Pacifik/Funafuti"
 
-#: ../calendar/zones.h:377
+#: ../calendar/zones.h:376
 msgid "Pacific/Galapagos"
 msgstr "Pacifik/Galapagos"
 
-#: ../calendar/zones.h:378
+#: ../calendar/zones.h:377
 msgid "Pacific/Gambier"
 msgstr "Pacifik/Gambjer"
 
-#: ../calendar/zones.h:379
+#: ../calendar/zones.h:378
 msgid "Pacific/Guadalcanal"
 msgstr "Pacifik/Gvadalkanal"
 
-#: ../calendar/zones.h:380
+#: ../calendar/zones.h:379
 msgid "Pacific/Guam"
 msgstr "Pacifik/Guam"
 
-#: ../calendar/zones.h:381
+#: ../calendar/zones.h:380
 msgid "Pacific/Honolulu"
 msgstr "Pacifik/Honolulu"
 
-#: ../calendar/zones.h:382
+#: ../calendar/zones.h:381
 msgid "Pacific/Johnston"
 msgstr "Pacifik/Džonston"
 
-#: ../calendar/zones.h:383
+#: ../calendar/zones.h:382
 msgid "Pacific/Kiritimati"
 msgstr "Pacifik/Kiritimati"
 
-#: ../calendar/zones.h:384
+#: ../calendar/zones.h:383
 msgid "Pacific/Kosrae"
 msgstr "Pacifik/Kosre"
 
-#: ../calendar/zones.h:385
+#: ../calendar/zones.h:384
 msgid "Pacific/Kwajalein"
 msgstr "Pacifik/Kvajalajn"
 
-#: ../calendar/zones.h:386
+#: ../calendar/zones.h:385
 msgid "Pacific/Majuro"
 msgstr "Pacifik/Madžuro"
 
-#: ../calendar/zones.h:387
+#: ../calendar/zones.h:386
 msgid "Pacific/Marquesas"
 msgstr "Pacifik/Markesas"
 
-#: ../calendar/zones.h:388
+#: ../calendar/zones.h:387
 msgid "Pacific/Midway"
 msgstr "Pacifik/Midvej"
 
-#: ../calendar/zones.h:389
+#: ../calendar/zones.h:388
 msgid "Pacific/Nauru"
 msgstr "Pacifik/Nauru"
 
-#: ../calendar/zones.h:390
+#: ../calendar/zones.h:389
 msgid "Pacific/Niue"
 msgstr "Pacifik/Njue"
 
-#: ../calendar/zones.h:391
+#: ../calendar/zones.h:390
 msgid "Pacific/Norfolk"
 msgstr "Pacifik/Norfolk"
 
-#: ../calendar/zones.h:392
+#: ../calendar/zones.h:391
 msgid "Pacific/Noumea"
 msgstr "Pacifik/Numea"
 
-#: ../calendar/zones.h:393
+#: ../calendar/zones.h:392
 msgid "Pacific/Pago_Pago"
 msgstr "Pacifik/Pago_Pago"
 
-#: ../calendar/zones.h:394
+#: ../calendar/zones.h:393
 msgid "Pacific/Palau"
 msgstr "Pacifik/Palau"
 
-#: ../calendar/zones.h:395
+#: ../calendar/zones.h:394
 msgid "Pacific/Pitcairn"
 msgstr "Pacifik/Pitkern"
 
-#: ../calendar/zones.h:396
+#: ../calendar/zones.h:395
 msgid "Pacific/Ponape"
 msgstr "Pacifik/Ponape"
 
-#: ../calendar/zones.h:397
+#: ../calendar/zones.h:396
 msgid "Pacific/Port_Moresby"
 msgstr "Pacifik/Port_Moresbi"
 
-#: ../calendar/zones.h:398
+#: ../calendar/zones.h:397
 msgid "Pacific/Rarotonga"
 msgstr "Pacifik/Rarotonga"
 
-#: ../calendar/zones.h:399
+#: ../calendar/zones.h:398
 msgid "Pacific/Saipan"
 msgstr "Pacifik/Sajpan"
 
-#: ../calendar/zones.h:400
+#: ../calendar/zones.h:399
 msgid "Pacific/Tahiti"
 msgstr "Pacifik/Tahiti"
 
-#: ../calendar/zones.h:401
+#: ../calendar/zones.h:400
 msgid "Pacific/Tarawa"
 msgstr "Pacifik/Tarava"
 
-#: ../calendar/zones.h:402
+#: ../calendar/zones.h:401
 msgid "Pacific/Tongatapu"
 msgstr "Pacifik/Tongatapu"
 
-#: ../calendar/zones.h:403
+#: ../calendar/zones.h:402
 msgid "Pacific/Truk"
 msgstr "Pacifik/Truk"
 
-#: ../calendar/zones.h:404
+#: ../calendar/zones.h:403
 msgid "Pacific/Wake"
 msgstr "Pacifik/Vejk"
 
-#: ../calendar/zones.h:405
+#: ../calendar/zones.h:404
 msgid "Pacific/Wallis"
 msgstr "Pacifik/Volis"
 
-#: ../calendar/zones.h:406
+#: ../calendar/zones.h:405
 msgid "Pacific/Yap"
 msgstr "Pacifik/Jap"
 
-#: ../composer/e-composer-actions.c:203
+#: ../composer/e-composer-actions.c:202
 msgid "Save as..."
 msgstr "Sačuvaj kao..."
 
-#: ../composer/e-composer-actions.c:276
-#: ../e-util/e-mail-signature-editor.c:308
-msgid "_Close"
-msgstr "_Zatvori"
-
-#: ../composer/e-composer-actions.c:278
+#: ../composer/e-composer-actions.c:277
 msgid "Close the current file"
 msgstr "Zatvorite trenutnu datoteku"
 
-#: ../composer/e-composer-actions.c:283
+#: ../composer/e-composer-actions.c:282
 msgid "New _Message"
 msgstr "Nova _poruka"
 
-#: ../composer/e-composer-actions.c:285
+#: ../composer/e-composer-actions.c:284
 msgid "Open New Message window"
 msgstr "Otvara prozor za novu poruku"
 
-#: ../composer/e-composer-actions.c:292 ../shell/e-shell-window-actions.c:937
+#: ../composer/e-composer-actions.c:289 ../shell/e-shell-window-actions.c:979
+#| msgid "Mail Preferences"
+msgid "_Preferences"
+msgstr "_Postavke"
+
+#: ../composer/e-composer-actions.c:291 ../shell/e-shell-window-actions.c:981
 msgid "Configure Evolution"
 msgstr "Podesi Evoluciju"
 
-#: ../composer/e-composer-actions.c:299
+#: ../composer/e-composer-actions.c:298
 msgid "Save the current file"
 msgstr "Sačuvajte trenutnu datoteku"
 
-#: ../composer/e-composer-actions.c:304
+#: ../composer/e-composer-actions.c:303
 msgid "Save _As..."
 msgstr "Sačuvaj _kao..."
 
-#: ../composer/e-composer-actions.c:306
+#: ../composer/e-composer-actions.c:305
 msgid "Save the current file with a different name"
 msgstr "Sačuvajte trenutnu datoteku pod drugim imenom"
 
-#: ../composer/e-composer-actions.c:313
+#: ../composer/e-composer-actions.c:312
 msgid "Character _Encoding"
 msgstr "Ko_dna strana"
 
-#: ../composer/e-composer-actions.c:330
-msgid "_Print..."
-msgstr "_Štampaj..."
-
-#: ../composer/e-composer-actions.c:337
+#: ../composer/e-composer-actions.c:336
 msgid "Print Pre_view"
 msgstr "Pregled pred _štampu"
 
-#: ../composer/e-composer-actions.c:344
+#: ../composer/e-composer-actions.c:343
 msgid "Save as _Draft"
 msgstr "Sačuvaj kao _nacrt"
 
-#: ../composer/e-composer-actions.c:346
+#: ../composer/e-composer-actions.c:345
 msgid "Save as draft"
 msgstr "Sačuvajte kao nacrt"
 
-#: ../composer/e-composer-actions.c:351
+#: ../composer/e-composer-actions.c:350
 msgid "S_end"
 msgstr "Poš_alji"
 
-#: ../composer/e-composer-actions.c:353
+#: ../composer/e-composer-actions.c:352
 msgid "Send this message"
 msgstr "Pošaljite ovu poruku"
 
-#: ../composer/e-composer-actions.c:361
+#: ../composer/e-composer-actions.c:360
 msgid "PGP _Encrypt"
 msgstr "PGP _šifruj"
 
-#: ../composer/e-composer-actions.c:363
+#: ../composer/e-composer-actions.c:362
 msgid "Encrypt this message with PGP"
 msgstr "Šifrujte ovu poruku pomoću PGP-a"
 
-#: ../composer/e-composer-actions.c:369
+#: ../composer/e-composer-actions.c:368
 msgid "PGP _Sign"
 msgstr "PGP _potpiši"
 
-#: ../composer/e-composer-actions.c:371
+#: ../composer/e-composer-actions.c:370
 msgid "Sign this message with your PGP key"
 msgstr "Potpišite ovu poruku pomoću PGP ključa"
 
-#: ../composer/e-composer-actions.c:377
+#: ../composer/e-composer-actions.c:376
 msgid "_Picture Gallery"
 msgstr "Galerija _slika"
 
-#: ../composer/e-composer-actions.c:379
+#: ../composer/e-composer-actions.c:378
 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:385
+#: ../composer/e-composer-actions.c:384
 msgid "_Prioritize Message"
 msgstr "V_ažnost poruke"
 
-#: ../composer/e-composer-actions.c:387
+#: ../composer/e-composer-actions.c:386
 msgid "Set the message priority to high"
 msgstr "Postavlja važnost poruke na visoko"
 
-#: ../composer/e-composer-actions.c:393
+#: ../composer/e-composer-actions.c:392
 msgid "Re_quest Read Receipt"
 msgstr "T_raži povratnicu"
 
-#: ../composer/e-composer-actions.c:395
+#: ../composer/e-composer-actions.c:394
 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:401
+#: ../composer/e-composer-actions.c:400
 msgid "S/MIME En_crypt"
 msgstr "S/MIME _šifruj"
 
-#: ../composer/e-composer-actions.c:403
+#: ../composer/e-composer-actions.c:402
 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:409
+#: ../composer/e-composer-actions.c:408
 msgid "S/MIME Sig_n"
 msgstr "S/MIME _potpiši"
 
-#: ../composer/e-composer-actions.c:411
+#: ../composer/e-composer-actions.c:410
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Potpisuje ovu poruku S/MIME uverenjem"
 
-#: ../composer/e-composer-actions.c:417
+#: ../composer/e-composer-actions.c:416
 msgid "_Bcc Field"
 msgstr "_Bcc polje"
 
-#: ../composer/e-composer-actions.c:419
+#: ../composer/e-composer-actions.c:418
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Bira da li je polje Bcc prikazano"
 
-#: ../composer/e-composer-actions.c:425
+#: ../composer/e-composer-actions.c:424
 msgid "_Cc Field"
 msgstr "_Cc polje"
 
-#: ../composer/e-composer-actions.c:427
+#: ../composer/e-composer-actions.c:426
 msgid "Toggles whether the CC field is displayed"
 msgstr "Bira da li je polje CC prikazano"
 
-#: ../composer/e-composer-actions.c:433
+#: ../composer/e-composer-actions.c:432
 msgid "_Reply-To Field"
 msgstr "Polje Odgo_vor-za"
 
-#: ../composer/e-composer-actions.c:435
+#: ../composer/e-composer-actions.c:434
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Bira da li je polje Odgovor-za prikazano"
 
-#: ../composer/e-composer-actions.c:494
+#: ../composer/e-composer-actions.c:493
 msgid "Save Draft"
 msgstr "Sačuvaj nacrt"
 
-#: ../composer/e-composer-header-table.c:39
+#: ../composer/e-composer-header-table.c:38
 msgid "Enter the recipients of the message"
 msgstr "Unesite primaoce poruke"
 
-#: ../composer/e-composer-header-table.c:41
+#: ../composer/e-composer-header-table.c:40
 msgid "Enter the addresses that will receive a carbon copy of the message"
 msgstr "Unesite adrese koje će primiti grafitnu kopiju (cc) poruke"
 
-#: ../composer/e-composer-header-table.c:44
+#: ../composer/e-composer-header-table.c:43
 msgid ""
 "Enter the addresses that will receive a carbon copy of the message without "
 "appearing in the recipient list of the message"
@@ -6818,7 +7115,7 @@ msgstr ""
 "Unesite adrese koje će primiti grafitnu kopiju poruke bez pojavljivanja u "
 "listi primalaca poruke"
 
-#: ../composer/e-composer-header-table.c:772
+#: ../composer/e-composer-header-table.c:771
 msgid "Fr_om:"
 msgstr "Š_alje:"
 
@@ -6826,44 +7123,44 @@ msgstr "Š_alje:"
 # * Create this before we call create_from_optionmenu,
 # * because that causes from_changed to be called, which
 # * expects the reply_to fields to be initialized.
-#: ../composer/e-composer-header-table.c:779
+#: ../composer/e-composer-header-table.c:778
 msgid "_Reply-To:"
 msgstr "_Odgovor-za:"
 
-#: ../composer/e-composer-header-table.c:784
+#: ../composer/e-composer-header-table.c:783
 msgid "_To:"
 msgstr "_Prima:"
 
-#: ../composer/e-composer-header-table.c:790
+#: ../composer/e-composer-header-table.c:789
 msgid "_Cc:"
 msgstr "_Cc:"
 
-#: ../composer/e-composer-header-table.c:796
+#: ../composer/e-composer-header-table.c:795
 msgid "_Bcc:"
 msgstr "_Bcc:"
 
-#: ../composer/e-composer-header-table.c:801
+#: ../composer/e-composer-header-table.c:800
 msgid "_Post To:"
 msgstr "Objavi _na:"
 
-#: ../composer/e-composer-header-table.c:805
+#: ../composer/e-composer-header-table.c:804
 msgid "S_ubject:"
 msgstr "Na_slov:"
 
-#: ../composer/e-composer-header-table.c:813
-#: ../mail/e-mail-config-identity-page.c:489
+#: ../composer/e-composer-header-table.c:812
+#: ../mail/e-mail-config-identity-page.c:488
 msgid "Si_gnature:"
 msgstr "Potp_is:"
 
-#: ../composer/e-composer-name-header.c:235
+#: ../composer/e-composer-name-header.c:234
 msgid "Click here for the address book"
 msgstr "Kliknite ovde za adresar."
 
-#: ../composer/e-composer-post-header.c:184
+#: ../composer/e-composer-post-header.c:183
 msgid "Click here to select folders to post to"
 msgstr "Kliknite ovde da izaberete fascikle za slanje"
 
-#: ../composer/e-msg-composer.c:878
+#: ../composer/e-msg-composer.c:879
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -6871,7 +7168,7 @@ msgstr ""
 "Nije moguće potpisivanje odlazeće poruke: nije postavljeno uverenje za "
 "potpisivanje za ovaj nalog"
 
-#: ../composer/e-msg-composer.c:887
+#: ../composer/e-msg-composer.c:888
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -6880,15 +7177,15 @@ msgstr ""
 "Nije moguće šifrovanje odlazeće poruke: nije postavljeno uverenje za šifrovanje "
 "za ovaj nalog"
 
-#: ../composer/e-msg-composer.c:1566 ../composer/e-msg-composer.c:1967
+#: ../composer/e-msg-composer.c:1569 ../composer/e-msg-composer.c:1981
 msgid "Compose Message"
 msgstr "Sastavi poruku"
 
-#: ../composer/e-msg-composer.c:4235
+#: ../composer/e-msg-composer.c:4243
 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:4908
+#: ../composer/e-msg-composer.c:4943
 msgid "Untitled Message"
 msgstr "Neimenovana poruka"
 
@@ -7058,16 +7355,36 @@ 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:1033
-#: ../modules/mailto-handler/evolution-mailto-handler.c:212
-#: ../shell/e-shell-window-private.c:243
+#: ../data/evolution.appdata.xml.in.h:1
+msgid ""
+"Evolution is a personal information management application that provides "
+"integrated mail, calendaring and address book functionality."
+msgstr ""
+"Evolucija je program za upravljanje ličnim podacima koji obezbeđuje objedinjenu "
+"funkcionalnost pošte, kalendara i adresara."
+
+#: ../data/evolution.appdata.xml.in.h:2
+msgid ""
+"Evolution supports a wide range of industry standard data formats and "
+"network protocols for information exchange, with an emphasis on standards "
+"compliance and security. Evolution can also integrate smoothly with "
+"Microsoft Exchange by way of the \"Exchange Web Services\" (EWS) extension."
+msgstr ""
+"Evolucija podržava širok opseg zapisa industrijskih standardnih podataka i "
+"mrežnih protokola za razmenu informacija, sa naglaskom na saglasnost "
+"standarda i bezebdnost. Evolucija može takođe glatko da se objedini sa "
+"Majkrosoftovom razmenom posredstvom proširenja „Usluge veb razmene“ "
+
+#: ../data/evolution.desktop.in.in.h:1 ../mail/e-mail-browser.c:1032
+#: ../modules/mailto-handler/evolution-mailto-handler.c:210
+#: ../shell/e-shell-window-private.c:242
 msgid "Evolution"
 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:83
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:82
 msgid "Groupware Suite"
 msgstr "Paket grupe"
 
@@ -7080,8 +7397,9 @@ 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;"
+#| msgid "mail;calendar;contact;addressbook;task;"
+msgid "email;calendar;contact;addressbook;task;"
+msgstr "el.pošta;pošta;kalendar;kontakt;adresar;zadatak;"
 
 #: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:1
 msgid "Enable address formatting"
@@ -8227,14 +8545,10 @@ msgstr ""
 "slike i umesto njih žele nepokretne slike."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
-msgid "Ellipsize mode for folder names in side bar"
-msgstr "Isključuje ili omogućava skraćivanje naziva fascikli u bočnoj površi"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid "Enable or disable type ahead search feature"
 msgstr "Uključuje ili isključuje mogućnost traženja kucanja unapred"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
@@ -8242,11 +8556,11 @@ msgstr ""
 "Omogućava pretraživanje iz bočne površi, što donosi interaktivnost u pretrazi "
 "naziva fascikli."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
 msgid "Enable or disable magic space bar"
 msgstr "Uključuje ili isključuje magičnu razmaknicu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -8254,73 +8568,73 @@ msgstr ""
 "Uključite ovo da bi razmaknicom pomerali tekst poruke pri pregledanju, kao i "
 "spisak poruka i fascikli."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 "Omogućiti da koriste slična podešavanja prikaza liste poruke za sve fascikle"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "Omogućiti da koriste slična podešavanja prikaza liste poruke za sve fascikle."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Mark citations in the message \"Preview\""
 msgstr "Označava citate u pregledu poruke"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Označava citate u pregledu poruke."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Citation highlight color"
 msgstr "Boja isticanja citata"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid "Citation highlight color."
 msgstr "Boja za isticanja citata."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Enable/disable caret mode"
 msgstr "Uključuje/isključuje prikaz kursora"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Omogućava prikaz kursora, tako da vidite kursor dok čitate poruku."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Default charset in which to display messages"
 msgstr "Podrazumevani skup znakova za prikaz poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Default charset in which to display messages."
 msgstr "Podrazumevani skup znakova za prikaz poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "Samostalno učitava slike za HTML poruke preko HTTP-a"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid "Show Animations"
 msgstr "Prikazivanje animacija"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Show animated images as animations."
 msgstr "Prikazuje animirane slike kao animacije."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Show all message headers"
 msgstr "Prikazivanje svih zaglavlja poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Show all the headers when viewing a messages."
 msgstr "Prikazuje sva zaglavlja pri pregledu poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "List of headers to show when viewing a message."
 msgstr "Spisak zaglavlja za prikazivanje pri pregledu poruke."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid ""
 "Each header is represented as a pair: the header name, and a boolean "
 "indicating whether the header is enabled. Disabled headers are not shown "
@@ -8330,41 +8644,41 @@ msgstr ""
 "koja ukazuje da li je zaglavlje uključeno. Isključena zaglavlja nisu prikazana "
 "uprilikom pregleda pruke, ali su još uvek na spisku u postavkama."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Show photo of the sender"
 msgstr "Prikazivanje slike pošiljaoca"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Prikazuje sliku pošiljaoca u oknu za čitanje poruke."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Mark as Seen after specified timeout"
 msgstr "Označava poruku viđenom posle navedenog roka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Mark as Seen after specified timeout."
 msgstr "Označava poruku viđenom posle navedenog roka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Timeout for marking messages as seen"
 msgstr "Vreme za označavanje poruka kao viđenim"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "Vreme u milisekundama za koje će poruke biti označene kao viđenim."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "Sender email-address column in the message list"
 msgstr "Prikaz kolone e-adresa pošiljaoca u spisku poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr "Prikazuje e-adresu pošiljaoca u posebnoj koloni u spisku poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view"
@@ -8372,7 +8686,7 @@ msgstr ""
 "Utvrđuje da li da koristi isti font u poljima „Šalje“ and „Naslov“ u uspravnom "
 "pregledu kolone „Poruke“"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -8380,19 +8694,19 @@ msgstr ""
 "Utvrđuje da li da koristi isti font u poljima „Šalje“ and „Naslov“ u uspravnom "
 "pregledu kolone „Poruke“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
 msgid "Show deleted messages in the message-list"
 msgstr "Prikazivanje obrisanih poruka u listi poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Prikazuje obrisane poruke (kao precrtane) u listi poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Enable Unmatched search folder"
 msgstr "Uključi nepoklopljene fascikle pretrage"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
@@ -8400,11 +8714,11 @@ msgstr ""
 "Uključuje nepoklopljene fascikle pretrage unutar fascikli pretrage. Ne radi "
 "ništa ako je su isključene fascikle pretrage."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Skriva pregled po fasciklama i uklanja izbor"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid ""
 "This key is read only once and reset to \"false\" after read. This unselects "
 "the mail in the list and removes the preview for that folder."
@@ -8412,31 +8726,31 @@ msgstr ""
 "Ovak ključ je pročitan jednom i potom vraćen na „false“ (netačno). Ovo uklanja "
 "poštu sa spiska i pregled za tu fasciklu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Height of the message-list pane"
 msgstr "Visina površi liste poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid "Height of the message-list pane."
 msgstr "Visina površi za liste poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid "Whether message headers are collapsed in the user interface"
 msgstr "Da li su zaglavlja poruke skupljena u korisničkom sučelju"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid "Width of the message-list pane"
 msgstr "Širina površi spiska poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Width of the message-list pane."
 msgstr "Širina površi spiska poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Layout style"
 msgstr "Stil razmeštaja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid ""
 "The layout style determines where to place the preview pane in relation to "
 "the message list. \"0\" (Classic View) places the preview pane below the "
@@ -8447,35 +8761,35 @@ msgstr ""
 "poruka. 0 — (klasičan pregled) smešta ovu površ ispoda spiska poruka. 1 — "
 "(vertikalan pregled) smešta površ pored spiska poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid "Variable width font"
 msgstr "Font promenljive veličine"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "The variable width font for mail display."
 msgstr "Font promenljive veličine za prikaz pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 msgid "Terminal font"
 msgstr "Font terminala"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "The terminal font for mail display."
 msgstr "Font terminala za prikaz pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "Use custom fonts"
 msgstr "Korišćenje sopstvenih fontova"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Use custom fonts for displaying mail."
 msgstr "Koristi prilagođene fontove za prikaz pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Sažima prikaz adresa u TO/CC/BCC"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -8483,11 +8797,11 @@ msgstr ""
 "Vrši sažimanje prikaza adresa u TO/CC/BCC na broj određen u address_count "
 "(broj adresa)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Broj adresa za prikaz u KO/CC/BCC"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -8495,11 +8809,11 @@ msgstr ""
 "Ovo podešava broj adresa za prikaz u podrazumevanom pregledu spiska poruka, "
 "posle čega je prikazano „...“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Thread the message-list based on Subject"
 msgstr "Prikaz poruke prema naslovu rasprave"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -8507,11 +8821,11 @@ msgstr ""
 "Da li pokušati prikaz rasprave po naslovu kada poruke ne sadrže zaglavlja „In-"
 "Reply-To“ ili „References“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Default value for thread expand state"
 msgstr "Podrazumevana vrednost za raširenu raspravu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -8519,11 +8833,11 @@ msgstr ""
 "Ovo podešavanje određuje da li će niti podrazumevano biti raširene ili "
 "skupljene. Evolucija zahteva ponovno pokretanje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Da li se poruke nižu na osnovu poslednje poruke u raspravi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid ""
 "This setting specifies whether the threads should be sorted based on latest "
 "message in each thread, rather than by message's date. Evolution requires a "
@@ -8532,11 +8846,11 @@ msgstr ""
 "Ovo podešavanje određuje da li će niti biti razvrstani po poslednjoj poruci "
 "jedne niti, umesto po datumu. Evolucija zahteva ponovno pokretanje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Ređa naloge azbučnim redom u stablu fascikle"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid ""
 "Tells how to sort accounts in a folder tree used in a Mail view. When set to "
 "true accounts are sorted alphabetically, with an exception of On This "
@@ -8548,27 +8862,27 @@ msgstr ""
 "izuzetkom fascikli „Na ovom računaru“ i „Potraži“, u suprotnom nalozi bivaju "
 "poređani na osnovu poretka koji je zadao korisnik"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Log filter actions"
 msgstr "Dnevnik radnji filtera"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid "Log filter actions to the specified log file."
 msgstr "Beleži radnje filtera u navedenu datoteku dnevnika."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Logfile to log filter actions"
 msgstr "Dnevnik datoteka za beleženje radnji filtera"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid "Logfile to log filter actions."
 msgstr "Dnevnik datoteka za beleženje radnji filtera."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Flush Outbox after filtering"
 msgstr "Prazni slanje nakon filtriranja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid ""
 "Whether to flush Outbox after filtering is done. Outbox flush will happen "
 "only when there was used any 'Forward to' filter action and approximately "
@@ -8578,44 +8892,44 @@ msgstr ""
 "ove fascikle će se dogoditi samo ako se koristi neka radnja filtera "
 "„Prosledi“ i otprilike jedan minut posle prizivanja poslednje radnje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Default forward style"
 msgstr "Podrazumevani stil prosleđivanja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 msgid "Default reply style"
 msgstr "Podrazumevani stil odgovora"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Prompt on empty subject"
 msgstr "Postavlja upit kada je naslov prazan"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Postavlja upit korisniku kada pokuša da pošalje poruku bez naslova."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Prompt when emptying the trash"
 msgstr "Postavlja upit prilikom pražnjenja smeća"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "Postavlja upit korisniku kada pokuša da isprazni smeće."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Prompt when user expunges"
 msgstr "Postavlja upit pri pražnjenju"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Postavlja upit korisniku kada pokuša da isprazni fasciklu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr "Upitaće pre slanja primaocima koji nisu unešeni kao adrese pošte"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -8623,19 +8937,19 @@ msgstr ""
 "Omogućava/onemogućava ponavljanje upozorenja kada pokušavate da pošaljete poruku "
 "primaocima koji nisu unešeni kao adrese pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Prompt when user only fills Bcc"
 msgstr "Postavlja upit kada korisnik unese samo nevidljivu grafitnu kopiju (Bcc)"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Postavlja upit korisniku kada pokuša da pošalje poruku bez primalaca."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Postavlja upit kada korisnik pokuša da pošalje neželjeni HTML"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -8643,12 +8957,12 @@ msgstr ""
 "Postavlja upit kada korisnik pokuša da pošalje HTML poruku primaocima koji "
 "možda ne žele da primaju HTML poštu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr ""
 "Postavlja upit korisniku kada pokuša da otvori 10 ili više poruka odjednom"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -8656,19 +8970,19 @@ msgstr ""
 "Ukoliko korisnik pokuša da otvori 10 ili više poruka odjednom, pitaće ga da "
 "li zaista želi to da uradi."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Prompt while marking multiple messages"
 msgstr "Postavlja upit pri označavanju više poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Uključuje ili isključuje upozorenje pri označavanju više poruka."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Prompt when deleting messages in search folder"
 msgstr "Postavlja upit kod brisanja poruka iz fascikle pretrage"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid ""
 "It disables/enables the repeated prompts to warn that deleting messages from "
 "a search folder permanently deletes the message, not simply removing it from "
@@ -8677,12 +8991,12 @@ msgstr ""
 "Omogućava/onemogućava ponavljanje upozorenja da je brisanje poruke iz fascikle "
 "pretrage trajno, a ne samo uklanjanje iz rezultata pretrage."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr ""
 "Pitaće da li da umnoži fasciklu prevlačenjem i ubacivanjem u stablu fascikli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid ""
 "Possible values are: 'never' - do not allow copy with drag &amp; drop of "
 "folders in folder tree, 'always' - allow copy with drag &amp; drop of "
@@ -8694,12 +9008,12 @@ msgstr ""
 "fascikli prevlačenjem i ubacivanjem u stablo fascikli bez pitanja, ili „ask“ — "
 "(ili svaka druga vrednost) pitaće korisnika."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr ""
 "Pitaće da li da premesti fasciklu prevlačenjem i ubacivanjem u stablu fascikli"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid ""
 "Possible values are: 'never' - do not allow move with drag &amp; drop of "
 "folders in folder tree, 'always' - allow move with drag &amp; drop of "
@@ -8711,11 +9025,11 @@ msgstr ""
 "fascikli prevlačenjem i ubacivanjem u stablo fascikli bez pitanja, ili „ask“ — "
 "(ili svaka druga vrednost) pitaće korisnika."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Prompt when replying privately to list messages"
 msgstr "Postavlja upit kada odgovarate privatno na listu poruka"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "private reply to a message which arrived via a mailing list."
@@ -8723,11 +9037,11 @@ msgstr ""
 "Omogućava/onemogućava ponavljanje upozorenja da šaljete privatan odgovor na "
 "poruku koja je stigla sa dopisne liste."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Postavlja upit kada dopisna lista oduzme privatne odgovore"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying sending "
 "a private reply to a message which arrived via a mailing list, but the list "
@@ -8737,18 +9051,18 @@ msgstr ""
 "odgovor na poruku koja je stigla sa dopisne liste, ali u listi zaglavlje "
 "„Odgovor-za“ je podešeno da vas preusmeri da odgovorite na listu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Prompt when replying to many recipients"
 msgstr "Postavlja upit kada odgovarate većem broju primalaca"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
 msgstr ""
 "Omogućava/onemogućava ponavljanje upozorenja da šaljete odgovor mnogim ljudima."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid ""
 "Policy for automatically closing the message browser window when forwarding "
 "or replying to the displayed message."
@@ -8756,42 +9070,42 @@ msgstr ""
 "Politika za samostalno zatvaranje prozora preglednika poruka prilikom "
 "prosleđivanja ili odgovaranja na prikazanu poruku."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 msgid "Empty Trash folders on exit"
 msgstr "Prazni fascikle sa smećem na izlazu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Prazni sve fascikle sa smećem pri zatvaranju Evolucije."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Najmanje dana između pražnjenja smeća na izlazu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Najmanje vreme između pražnjenja smeća na izlazu, u danima."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 msgid "Last time Empty Trash was run"
 msgstr "Poslednje vreme pražnjenja smeća"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "Kada je poslednji put izvršeno pražnjenje smeća, u danima od 1. januara, 1970 "
 "(epoh)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Vreme u sekundama za koje se prikazuje greška u statusnoj traci."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Level beyond which the message should be logged."
 msgstr "Nivo nakon kojeg se poruka zavodi u dnevnik."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -8799,11 +9113,11 @@ msgstr ""
 "Može imati tri moguće vrednosti: 0 — za greške, 1 — za upozorenja i 2 — za "
 "poruke o dijagnozi kvara."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Show original \"Date\" header value."
 msgstr "Prikazuje originalnu vrednost zaglavlja datuma."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid ""
 "Show the original \"Date\" header (with a local time only if the time zone "
 "differs). Otherwise always show \"Date\" header value in a user preferred "
@@ -8813,11 +9127,11 @@ msgstr ""
 "se vremenske zone razlikuju). Inače uvek prikazuje vrednost zaglavlja „Datum“ "
 "prema postavkama i vremenskoj zoni korisnika."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid "List of Labels and their associated colors"
 msgstr "Spisak oznaka i njima dodeljenih boja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:color where color uses the HTML hex encoding."
@@ -8825,46 +9139,46 @@ msgstr ""
 "Spisak oznaka koje poznaje poštanski deo Evolucije. Spisak sadrži nizove "
 "oblika ime:boja gde boja koristi HTML heksa kodiranje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Check incoming mail being junk"
 msgstr "Vrši proveru da li je pristigla pošta đubre"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Run junk test on incoming mail."
 msgstr "Proverava da li ima đubreta u dolaznoj pošti."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Empty Junk folders on exit"
 msgstr "Prazni fascikle sa đubretom pri izlazu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Prazni sve fascikle sa đubretom pri zatvaranju Evolucije."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Najmanje dana između pražnjenja đubreta na izlazu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Najmanje vreme između pražnjenja đubreta na izlazu, u danima."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Last time Empty Junk was run"
 msgstr "Vreme poslednjeg pražnjenja đubreta"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "Kada je poslednji put izvršeno pražnjenje đubreta, u danima od 1. januara, 1970 "
 "(epoh)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "The default plugin for Junk hook"
 msgstr "Podrazumevani dodatak kuke za đubre"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 msgid ""
 "This is the default junk plugin, even though there are multiple plugins "
 "enabled. If the default listed plugin is disabled, then it won't fall back "
@@ -8874,11 +9188,11 @@ msgstr ""
 "priključci. Ukoliko je pomenuti podrazumevani priključak isključen, preostali "
 "dostupni priključci neće biti aktivirani."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Utvrđuje da li u adresaru da pregleda adrese pošiljaoca"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 msgid ""
 "Determines whether to lookup the sender email in address book. If found, it "
 "shouldn't be a spam. It looks up in the books marked for autocompletion. It "
@@ -8890,7 +9204,7 @@ msgstr ""
 "samodopunjavanje. Može biti sporo ako su adresari (recimo LDAP) označeni za "
 "samodopunjavanje."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -8898,7 +9212,7 @@ msgstr ""
 "Utvrđuje da li samo u adresaru da pregleda adrese u potrazi za neželjenom "
 "poštom"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid ""
 "This option is related to the key lookup_addressbook and is used to "
 "determine whether to look up addresses in local address book only to exclude "
@@ -8908,13 +9222,13 @@ msgstr ""
 "da li da se adresa traži samo u lokalnom adresaru kako bi se izdvojila pošta "
 "primljena od poznatih pošiljalaca od one neželjene."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Determines whether to use custom headers to check for junk"
 msgstr ""
 "Utvrđuje da li da koristi prilagođena zaglavlja prilikom provere neželjene "
 "pošte"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid ""
 "Determines whether to use custom headers to check for junk. If this option "
 "is enabled and the headers are mentioned, it will be improve the junk "
@@ -8923,11 +9237,11 @@ msgstr ""
 "Utvrđuje da li da koristi prilagođena zaglavlja prilikom provere neželjene "
 "pošte. Ukoliko je opcija uključena a zaglavlja navedena, provera će biti brža."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Custom headers to use while checking for junk."
 msgstr "Prilagođena zaglavlja za upotrebu prilikom provere neželjene pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -8935,31 +9249,31 @@ msgstr ""
 "Prilagođena zaglavlja za upotrebu prilikom provere neželjene pošte. Elementi "
 "spiska su niz formata „headername=value“ (ime zaglavlja=vrednost)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "UID string of the default account."
 msgstr "JIB niz podrazumevanog naloga."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid "Save directory"
 msgstr "Direktorijum čuvanja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "Directory for saving mail component files."
 msgstr "Direktorijum za čuvanje datoteka modula za poštu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 msgid "Composer load/attach directory"
 msgstr "Direktorijum sastavljača za učitavanje/prilaganje"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Directory for loading/attaching files to composer."
 msgstr "Direktorijum za učitavanje/prilaganje datoteka u sastavljač."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 msgid "Check for new messages on start"
 msgstr "Vrši proveru za novim porukama prilikom pokretanja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -8967,11 +9281,11 @@ msgstr ""
 "Da li će vršiti proveru za novim porukama prilikom pokretanja Evolucije. Ovo "
 "uključuje i slanje poruka iz fascikle Poslato."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 msgid "Check for new messages in all active accounts"
 msgstr "Vrši proveru za novim porukama u svim aktivnim nalozima"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid ""
 "Whether to check for new messages in all active accounts regardless of the "
 "account \"Check for new messages every X minutes\" option when Evolution is "
@@ -8982,11 +9296,11 @@ msgstr ""
 "pokretanja Evolucije. Ova opcija se koristi samo zajedno sa "
 "„send_recv_on_start“ (pošalji_primi_pri_pokretanju) opcijom."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 msgid "Server synchronization interval"
 msgstr "Interval usaglašavanja sa serverom"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -8994,11 +9308,11 @@ msgstr ""
 "Kontroliše učestalost usklađivanja lokalnih izmena sa mrežnim serverom pošte. "
 "Interval mora biti najmanje 30 sekundi."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid "(Deprecated) Default forward style"
 msgstr "(Zastarelo) Podrazumevani stil prosleđivanja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"forward-style-name\" instead."
@@ -9006,11 +9320,11 @@ msgstr ""
 "Ovaj ključ je zastareo u izdanju 3.10 i ne treba više da se koristi. Umesto "
 "njega koristite „forward-style-name“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid "(Deprecated) Default reply style"
 msgstr "(Zastarelo) Podrazumevani stil odgovora"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"reply-style-name\" instead."
@@ -9018,11 +9332,11 @@ msgstr ""
 "Ovaj ključ je zastareo u izdanju 3.10 i ne treba više da se koristi. Umesto "
 "njega koristite „reply-style-name“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "(Zastarelo) Spisak proizvoljnih zaglavlja i da li su uključena."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"show-headers\" instead."
@@ -9030,11 +9344,11 @@ msgstr ""
 "Ovaj ključ je zastareo u izdanju 3.10 i ne treba više da se koristi. Umesto "
 "njega koristite „show-headers“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "(Zastarelo) Učitava slike za HTML poruke preko HTTP-a"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"image-loading-policy\" instead."
@@ -9042,7 +9356,7 @@ msgstr ""
 "Ovaj ključ je zastareo u izdanju 3.10 i ne treba više da se koristi. Umesto "
 "njega koristite „image-loading-policy“."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
@@ -9050,7 +9364,7 @@ msgstr ""
 "(Zastarelo) Pita da li da zatvori prozor sa porukom kada korisnik prosleđuje "
 "ili odgovara na poruku prikazanu u prozoru."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"browser-close-on-reply-policy\" instead."
@@ -9352,7 +9666,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:308
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:307
 msgid "Start in offline mode"
 msgstr "Započinje rad van mreže"
 
@@ -9443,9 +9757,9 @@ msgstr "Koristi samo lokalne provere spama."
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Koristi samo lokalne provere spama (bez DNS-a)."
 
-#: ../em-format/e-mail-formatter-attachment.c:397
-#: ../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
+#: ../em-format/e-mail-formatter-attachment.c:405
+#: ../e-util/e-attachment-bar.c:100 ../e-util/e-attachment-bar.c:105
+#: ../e-util/e-attachment-paned.c:175 ../e-util/e-attachment-paned.c:180
 #: ../mail/message-list.etspec.h:4
 msgid "Attachment"
 msgid_plural "Attachments"
@@ -9454,137 +9768,145 @@ msgstr[1] "Prilozi"
 msgstr[2] "Prilozi"
 msgstr[3] "Prilog"
 
-#: ../em-format/e-mail-formatter-attachment.c:398
+#: ../em-format/e-mail-formatter-attachment.c:406
 msgid "Display as attachment"
 msgstr "Prikaži kao prilog"
 
-#: ../em-format/e-mail-formatter-headers.c:107
-#: ../em-format/e-mail-part-headers.c:47 ../mail/e-mail-tag-editor.c:272
-#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:64
+#: ../em-format/e-mail-formatter-audio.c:152
+msgid "Audio Player"
+msgstr "Zvučni uređaj"
+
+#: ../em-format/e-mail-formatter-audio.c:153
+msgid "Play the attachment in embedded audio player"
+msgstr "Pusti prilog u ugrađenom programu"
+
+#: ../em-format/e-mail-formatter-headers.c:102
+#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:273
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:63
 msgid "From"
 msgstr "Šalje"
 
-#: ../em-format/e-mail-formatter-headers.c:133
+#: ../em-format/e-mail-formatter-headers.c:128
 msgid "(no subject)"
 msgstr "(bez naslova)"
 
-#: ../em-format/e-mail-formatter-headers.c:333
+#: ../em-format/e-mail-formatter-headers.c:328
 #, 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:170
 msgid "Regular Image"
 msgstr "Obična slika"
 
-#: ../em-format/e-mail-formatter-image.c:153
+#: ../em-format/e-mail-formatter-image.c:171
 msgid "Display part as an image"
 msgstr "Prikazuje delove kao sliku"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:246
+#: ../em-format/e-mail-formatter-message-rfc822.c:254
 msgid "RFC822 message"
 msgstr "RFC822 poruka"
 
-#: ../em-format/e-mail-formatter-message-rfc822.c:247
+#: ../em-format/e-mail-formatter-message-rfc822.c:255
 msgid "Format part as an RFC822 message"
 msgstr "Oblikuje deo kao RFC822 poruku"
 
-#: ../em-format/e-mail-formatter-print.c:54
-#: ../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:1328
-#: ../modules/cal-config-google/e-google-chooser.c:237
-#: ../modules/plugin-manager/evolution-plugin-manager.c:67
+#: ../em-format/e-mail-formatter-print.c:53
+#: ../e-util/gal-view-instance-save-as-dialog.c:94
+#: ../mail/e-mail-label-tree-view.c:98
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1322
+#: ../modules/cal-config-google/e-google-chooser.c:236
+#: ../modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Name"
 msgstr "Naziv"
 
-#: ../em-format/e-mail-formatter-print.c:54
-#: ../e-util/e-attachment-tree-view.c:574 ../mail/message-list.etspec.h:10
+#: ../em-format/e-mail-formatter-print.c:53
+#: ../e-util/e-attachment-tree-view.c:573 ../mail/message-list.etspec.h:10
 msgid "Size"
 msgstr "Veličina"
 
-#: ../em-format/e-mail-formatter-print-headers.c:144
+#: ../em-format/e-mail-formatter-print-headers.c:143
 msgid "GPG signed"
 msgstr "GPG potpisano"
 
-#: ../em-format/e-mail-formatter-print-headers.c:150
+#: ../em-format/e-mail-formatter-print-headers.c:149
 msgid "GPG encrpyted"
 msgstr "GPG šifrovano"
 
-#: ../em-format/e-mail-formatter-print-headers.c:156
+#: ../em-format/e-mail-formatter-print-headers.c:155
 msgid "S/MIME signed"
 msgstr "S/MIME potpisano"
 
-#: ../em-format/e-mail-formatter-print-headers.c:162
+#: ../em-format/e-mail-formatter-print-headers.c:161
 msgid "S/MIME encrpyted"
 msgstr "S/MIME šifrovano"
 
-#: ../em-format/e-mail-formatter-print-headers.c:171
+#: ../em-format/e-mail-formatter-print-headers.c:170
 #: ../mail/e-mail-config-security-page.c:645
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:195
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:129
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:194
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:128
 msgid "Security"
 msgstr "Bezbednost"
 
-#: ../em-format/e-mail-formatter-quote-headers.c:168
-#: ../em-format/e-mail-part-headers.c:52 ../mail/e-mail-tag-editor.c:277
-#: ../mail/em-filter-i18n.h:77 ../mail/message-list.etspec.h:6
-#: ../modules/mail/em-mailer-prefs.c:69 ../smime/lib/e-asn1-object.c:712
+#: ../em-format/e-mail-formatter-quote-headers.c:167
+#: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:278
+#: ../mail/em-filter-i18n.h:51 ../mail/message-list.etspec.h:6
+#: ../modules/mail/em-mailer-prefs.c:68
 msgid "Subject"
 msgstr "Naslov"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:187
-#: ../em-format/e-mail-formatter-utils.c:344
-#: ../modules/mail/em-mailer-prefs.c:1145
+#: ../em-format/e-mail-formatter-quote-headers.c:186
+#: ../em-format/e-mail-formatter-utils.c:342
+#: ../modules/mail/em-mailer-prefs.c:1144
 msgid "Mailer"
 msgstr "Pošiljalac"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:91
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:94
 #: ../em-format/e-mail-formatter-text-enriched.c:98
 msgid "Richtext"
 msgstr "Bogati tekst"
 
-#: ../em-format/e-mail-formatter-quote-text-enriched.c:92
+#: ../em-format/e-mail-formatter-quote-text-enriched.c:95
 #: ../em-format/e-mail-formatter-text-enriched.c:99
 msgid "Display part as enriched text"
 msgstr "Prikazuje deo kao obogaćeni tekst"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:90
-#: ../em-format/e-mail-formatter-text-html.c:351
+#: ../em-format/e-mail-formatter-quote-text-html.c:95
+#: ../em-format/e-mail-formatter-text-html.c:359
 msgid "HTML"
 msgstr "HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-html.c:91
-#: ../em-format/e-mail-formatter-text-html.c:352
+#: ../em-format/e-mail-formatter-quote-text-html.c:96
+#: ../em-format/e-mail-formatter-text-html.c:360
 msgid "Format part as HTML"
 msgstr "Oblikuje deo kao HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:115
-#: ../em-format/e-mail-formatter-text-plain.c:185
+#: ../em-format/e-mail-formatter-quote-text-plain.c:121
+#: ../em-format/e-mail-formatter-text-plain.c:197
 msgid "Plain Text"
 msgstr "Običan tekst"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:116
-#: ../em-format/e-mail-formatter-text-plain.c:186
+#: ../em-format/e-mail-formatter-quote-text-plain.c:122
+#: ../em-format/e-mail-formatter-text-plain.c:198
 msgid "Format part as plain text"
 msgstr "Oblikuje deo kao običan tekst"
 
-#: ../em-format/e-mail-formatter-secure-button.c:52
+#: ../em-format/e-mail-formatter-secure-button.c:51
 msgid "Unsigned"
 msgstr "Nepotpisano"
 
-#: ../em-format/e-mail-formatter-secure-button.c:52
+#: ../em-format/e-mail-formatter-secure-button.c:51
 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:53
+#: ../em-format/e-mail-formatter-secure-button.c:52
 msgid "Valid signature"
 msgstr "Ispravan potpis"
 
-#: ../em-format/e-mail-formatter-secure-button.c:53
+#: ../em-format/e-mail-formatter-secure-button.c:52
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
@@ -9592,22 +9914,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:54
+#: ../em-format/e-mail-formatter-secure-button.c:53
 msgid "Invalid signature"
 msgstr "Neispravan potpis"
 
-#: ../em-format/e-mail-formatter-secure-button.c:54
+#: ../em-format/e-mail-formatter-secure-button.c:53
 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:55
+#: ../em-format/e-mail-formatter-secure-button.c:54
 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:55
+#: ../em-format/e-mail-formatter-secure-button.c:54
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
@@ -9615,21 +9937,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:56
+#: ../em-format/e-mail-formatter-secure-button.c:55
 msgid "Signature exists, but need public key"
 msgstr "Potpis postoji, ali traži javni ključ"
 
-#: ../em-format/e-mail-formatter-secure-button.c:56
+#: ../em-format/e-mail-formatter-secure-button.c:55
 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:63
+#: ../em-format/e-mail-formatter-secure-button.c:62
 msgid "Unencrypted"
 msgstr "Nešifrovano"
 
-#: ../em-format/e-mail-formatter-secure-button.c:63
+#: ../em-format/e-mail-formatter-secure-button.c:62
 msgid ""
 "This message is not encrypted. Its content may be viewed in transit across "
 "the Internet."
@@ -9637,11 +9959,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:64
+#: ../em-format/e-mail-formatter-secure-button.c:63
 msgid "Encrypted, weak"
 msgstr "Šifrovano, slabo"
 
-#: ../em-format/e-mail-formatter-secure-button.c:64
+#: ../em-format/e-mail-formatter-secure-button.c:63
 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 "
@@ -9650,22 +9972,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:65
+#: ../em-format/e-mail-formatter-secure-button.c:64
 msgid "Encrypted"
 msgstr "Šifrovano"
 
-#: ../em-format/e-mail-formatter-secure-button.c:65
+#: ../em-format/e-mail-formatter-secure-button.c:64
 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:66
+#: ../em-format/e-mail-formatter-secure-button.c:65
 msgid "Encrypted, strong"
 msgstr "Šifrovano, jako"
 
-#: ../em-format/e-mail-formatter-secure-button.c:66
+#: ../em-format/e-mail-formatter-secure-button.c:65
 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 "
@@ -9675,7 +9997,7 @@ msgstr ""
 "u dogledno vreme vidi sadržaj ove poruke."
 
 #: ../em-format/e-mail-formatter-secure-button.c:187
-#: ../smime/gui/smime-ui.ui.h:20
+#: ../smime/gui/smime-ui.ui.h:22
 msgid "_View Certificate"
 msgstr "Pregledaj _uverenje"
 
@@ -9683,114 +10005,114 @@ msgstr "Pregledaj _uverenje"
 msgid "This certificate is not viewable"
 msgstr "Ovo uverenje nije čitljivo"
 
-#: ../em-format/e-mail-formatter-source.c:115
+#: ../em-format/e-mail-formatter-source.c:120
 msgid "Source"
 msgstr "Izvor"
 
-#: ../em-format/e-mail-formatter-source.c:116
+#: ../em-format/e-mail-formatter-source.c:121
 msgid "Display source of a MIME part"
 msgstr "Prikazuje izvoe kao MIME deo"
 
-#: ../em-format/e-mail-formatter-utils.c:204
-#: ../em-format/e-mail-formatter-utils.c:221
-#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:67
+#: ../em-format/e-mail-formatter-utils.c:202
+#: ../em-format/e-mail-formatter-utils.c:219
+#: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:66
 msgid "Cc"
 msgstr "Cc"
 
-#: ../em-format/e-mail-formatter-utils.c:205
-#: ../em-format/e-mail-formatter-utils.c:222
-#: ../em-format/e-mail-part-headers.c:51 ../modules/mail/em-mailer-prefs.c:68
+#: ../em-format/e-mail-formatter-utils.c:203
+#: ../em-format/e-mail-formatter-utils.c:220
+#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:67
 msgid "Bcc"
 msgstr "Bcc"
 
-#: ../em-format/e-mail-parser-application-mbox.c:88
+#: ../em-format/e-mail-parser-application-mbox.c:87
 #, c-format
 msgid "Error parsing MBOX part: %s"
 msgstr "Greška obrade MBOKS dela: %s"
 
-#: ../em-format/e-mail-parser-application-smime.c:84
+#: ../em-format/e-mail-parser-application-smime.c:83
 #, 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:80
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:79
 #, 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:83
-#: ../em-format/e-mail-parser-multipart-signed.c:128
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:82
+#: ../em-format/e-mail-parser-multipart-signed.c:135
 #, c-format
 msgid "Error verifying signature: %s"
 msgstr "Greška provere potpisa: %s"
 
-#: ../em-format/e-mail-parser-message-external.c:69
+#: ../em-format/e-mail-parser-message-external.c:68
 msgid "Malformed external-body part"
 msgstr "Loše složen spoljni deo poruke"
 
-#: ../em-format/e-mail-parser-message-external.c:102
+#: ../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:113
+#: ../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:115
+#: ../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:134
+#: ../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:152
+#: ../em-format/e-mail-parser-message-external.c:151
 #, 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:67
-#: ../em-format/e-mail-parser-multipart-signed.c:81
+#: ../em-format/e-mail-parser-multipart-encrypted.c:66
+#: ../em-format/e-mail-parser-multipart-signed.c:83
 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:83
+#: ../em-format/e-mail-parser-multipart-encrypted.c:82
 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:102
+#: ../em-format/e-mail-parser-multipart-encrypted.c:101
 #, 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:114
+#: ../em-format/e-mail-parser-multipart-signed.c:121
 msgid "Unsupported signature format"
 msgstr "Nepodržan oblik potpisa"
 
-#: ../em-format/e-mail-part-headers.c:48 ../modules/mail/em-mailer-prefs.c:65
+#: ../em-format/e-mail-part-headers.c:47 ../modules/mail/em-mailer-prefs.c:64
 msgid "Reply-To"
 msgstr "Odgovor"
 
-#: ../em-format/e-mail-part-headers.c:53 ../e-util/e-dateedit.c:550
-#: ../e-util/e-dateedit.c:573 ../mail/message-list.etspec.h:7
-#: ../modules/mail/em-mailer-prefs.c:70
+#: ../em-format/e-mail-part-headers.c:52 ../e-util/e-dateedit.c:549
+#: ../e-util/e-dateedit.c:572 ../mail/message-list.etspec.h:7
+#: ../modules/mail/em-mailer-prefs.c:69
 msgid "Date"
 msgstr "Datum"
 
-#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/e-mail-part-headers.c:53 ../modules/mail/em-mailer-prefs.c:70
 msgid "Newsgroups"
 msgstr "Grupe vesti"
 
-#: ../em-format/e-mail-part-headers.c:55 ../modules/mail/em-mailer-prefs.c:72
+#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:71
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "Lice"
 
-#: ../em-format/e-mail-part-utils.c:500
+#: ../em-format/e-mail-part-utils.c:508
 #, c-format
 msgid "%s attachment"
 msgstr "%s prilog"
@@ -9848,7 +10170,7 @@ msgstr "dana"
 msgid "_When convenient"
 msgstr "Kada je z_godno"
 
-#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:840
+#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:847
 msgid "Replies"
 msgstr "Odgovori"
 
@@ -9939,63 +10261,70 @@ msgstr "Povratno obaveštenje"
 msgid "Sta_tus Tracking"
 msgstr "Praćenje sta_tusa"
 
-#: ../e-util/e-table-config.ui.h:1
+#: ../e-util/e-table-config.ui.h:2
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:282
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:192
+#| msgid "_Append"
+msgid "_Apply"
+msgstr "_Primeni"
+
+#: ../e-util/e-table-config.ui.h:4
 msgid "_Sort..."
 msgstr "_Razvrstaj..."
 
-#: ../e-util/e-table-config.ui.h:2
+#: ../e-util/e-table-config.ui.h:5
 msgid "_Group By..."
 msgstr "_Grupiši po..."
 
-#: ../e-util/e-table-config.ui.h:3
+#: ../e-util/e-table-config.ui.h:6
 msgid "_Fields Shown..."
 msgstr "Prikazana _polja..."
 
-#: ../e-util/e-table-config.ui.h:6
+#: ../e-util/e-table-config.ui.h:9
 msgid "Clear _All"
 msgstr "Očisti _sve"
 
-#: ../e-util/e-table-config.ui.h:7
+#: ../e-util/e-table-config.ui.h:10
 msgid "_Show field in View"
 msgstr "_Prikaži polje u pregledu"
 
-#: ../e-util/e-table-config.ui.h:8 ../e-util/e-table-header-item.c:1753
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1753
 msgid "Ascending"
 msgstr "Rastuće"
 
-#: ../e-util/e-table-config.ui.h:9 ../e-util/e-table-header-item.c:1753
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1753
 msgid "Descending"
 msgstr "Opadajuće"
 
-#: ../e-util/e-table-config.ui.h:10
+#: ../e-util/e-table-config.ui.h:13
 msgid "Group Items By"
 msgstr "Grupiši stavke po"
 
-#: ../e-util/e-table-config.ui.h:11
+#: ../e-util/e-table-config.ui.h:14
 msgid "Show _field in View"
 msgstr "Prikaži _polje u pregledu"
 
-#: ../e-util/e-table-config.ui.h:12
+#: ../e-util/e-table-config.ui.h:15
 msgid "Then By"
 msgstr "Onda po"
 
-#: ../e-util/e-table-config.ui.h:13
+#: ../e-util/e-table-config.ui.h:16
 msgid "Show field i_n View"
 msgstr "Prikaži polje _u pregledu"
 
-#: ../e-util/e-table-config.ui.h:14
+#: ../e-util/e-table-config.ui.h:17
 msgid "Show field in _View"
 msgstr "Prikaži polje u p_regledu"
 
-#: ../e-util/e-table-config.ui.h:15
+#: ../e-util/e-table-config.ui.h:18
 msgid "Sort"
 msgstr "Razvrstaj"
 
-#: ../e-util/e-table-config.ui.h:16
+#: ../e-util/e-table-config.ui.h:19
 msgid "Clear All"
 msgstr "Očisti sve"
 
-#: ../e-util/e-table-config.ui.h:17
+#: ../e-util/e-table-config.ui.h:20
 msgid "Sort Items By"
 msgstr "Razvrstaj stavke po"
 
@@ -10003,7 +10332,7 @@ msgstr "Razvrstaj stavke po"
 msgid "Select a Time Zone"
 msgstr "Izaberite vremensku zonu"
 
-#: ../e-util/e-timezone-dialog.ui.h:2
+#: ../e-util/e-timezone-dialog.ui.h:4
 msgid ""
 "Use the left mouse button to zoom in on an area of the map and select a time "
 "zone.\n"
@@ -10012,20 +10341,20 @@ 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
+#: ../e-util/e-timezone-dialog.ui.h:6
 msgid "Time Zones"
 msgstr "Vremenske zone"
 
-#: ../e-util/e-timezone-dialog.ui.h:5
+#: ../e-util/e-timezone-dialog.ui.h:7
 msgid "_Selection"
 msgstr "_Izbor"
 
-#: ../e-util/e-timezone-dialog.ui.h:6
+#: ../e-util/e-timezone-dialog.ui.h:8
 msgid "Timezone drop-down combination box"
 msgstr "Prozorče za podešavanje vremenske zone"
 
-#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1239
-#: ../mail/em-utils.c:240
+#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1243
+#: ../mail/em-utils.c:229
 msgid "Incoming"
 msgstr "Dolazno"
 
@@ -10042,7 +10371,7 @@ 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
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:83
 msgid "seconds"
 msgstr "sekunde"
 
@@ -10071,15 +10400,15 @@ msgstr "u budućnosti"
 msgid "Show filters for mail:"
 msgstr "Prikaži propusnike pošte:"
 
-#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:166
+#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
 msgid "_Filter Rules"
 msgstr "Pr_avila filtera"
 
-#: ../e-util/filter.ui.h:17
+#: ../e-util/filter.ui.h:23
 msgid "Compare against"
 msgstr "Uporedi sa"
 
-#: ../e-util/filter.ui.h:18
+#: ../e-util/filter.ui.h:24
 msgid ""
 "The message's date will be compared against\n"
 "the current time when filtering occurs."
@@ -10087,7 +10416,7 @@ msgstr ""
 "Datum poruke će biti upoređen sa\n"
 "trenutnim vremenom kada se filtriranje desilo."
 
-#: ../e-util/filter.ui.h:20
+#: ../e-util/filter.ui.h:26
 msgid ""
 "The message's date will be compared against\n"
 "12:00am of the date specified."
@@ -10095,7 +10424,7 @@ msgstr ""
 "Datum poruke će biti upoređen sa\n"
 "00:00 navedenog datuma."
 
-#: ../e-util/filter.ui.h:22
+#: ../e-util/filter.ui.h:28
 msgid ""
 "The message's date will be compared against\n"
 "a time relative to when filtering occurs."
@@ -10108,9 +10437,9 @@ 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
+#: ../e-util/e-mail-signature-script-dialog.c:416
+#: ../mail/e-mail-config-identity-page.c:310
+#: ../mail/e-mail-config-summary-page.c:340
 msgid "_Name:"
 msgstr "_Ime:"
 
@@ -10118,110 +10447,110 @@ msgstr "_Ime:"
 msgid "_Replace existing view"
 msgstr "_Zameni postojeći pregled"
 
-#: ../e-util/e-activity-proxy.c:311
-#: ../modules/mail/e-mail-shell-view-actions.c:1734
+#: ../e-util/e-activity-proxy.c:308
+#: ../modules/mail/e-mail-shell-view-actions.c:1724
 msgid "Cancel"
 msgstr "Otkaži"
 
 #. Translators: This is a cancelled activity.
-#: ../e-util/e-activity.c:259
+#: ../e-util/e-activity.c:258
 #, c-format
 msgid "%s (cancelled)"
 msgstr "%s (otkazano)"
 
 #. Translators: This is a completed activity.
-#: ../e-util/e-activity.c:262
+#: ../e-util/e-activity.c:261
 #, c-format
 msgid "%s (completed)"
 msgstr "%s (završeno)"
 
 #. Translators: This is an activity waiting to run.
-#: ../e-util/e-activity.c:265
+#: ../e-util/e-activity.c:264
 #, 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:269
+#: ../e-util/e-activity.c:268
 #, c-format
 msgid "%s (cancelling)"
 msgstr "%s (otkazujem)"
 
-#: ../e-util/e-activity.c:271
+#: ../e-util/e-activity.c:270
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: ../e-util/e-activity.c:276
+#: ../e-util/e-activity.c:275
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% završeno)"
 
 #. Translators: Escape is a keyboard binding.
-#: ../e-util/e-alert-bar.c:121
+#: ../e-util/e-alert-bar.c:118
 msgid "Close this message (Escape)"
 msgstr "Zatvorite ovu poruku (Napusti)"
 
-#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:703
+#: ../e-util/e-attachment-bar.c:659 ../e-util/e-attachment-paned.c:702
 msgid "Icon View"
 msgstr "Pregled ikonicama"
 
-#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:705
+#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:704
 msgid "List View"
 msgstr "Pregled spiskom"
 
-#: ../e-util/e-attachment-dialog.c:318
+#: ../e-util/e-attachment-dialog.c:317
 msgid "Attachment Properties"
 msgstr "Osobine priloga"
 
-#: ../e-util/e-attachment-dialog.c:340 ../e-util/e-import-assistant.c:273
+#: ../e-util/e-attachment-dialog.c:339 ../e-util/e-import-assistant.c:273
 msgid "F_ilename:"
 msgstr "_Naziv datoteke:"
 
-#: ../e-util/e-attachment-dialog.c:375
+#: ../e-util/e-attachment-dialog.c:374
 msgid "MIME Type:"
 msgstr "MIME vrsta:"
 
-#: ../e-util/e-attachment-dialog.c:383 ../e-util/e-attachment-store.c:483
+#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:482
 msgid "_Suggest automatic display of attachment"
 msgstr "_Predloži automatski prikaz priloga"
 
-#: ../e-util/e-attachment-handler-image.c:97
+#: ../e-util/e-attachment-handler-image.c:96
 msgid "Could not set as background"
 msgstr "Ne mogu da postavim kao pozadinu"
 
-#: ../e-util/e-attachment-handler-image.c:147
+#: ../e-util/e-attachment-handler-image.c:146
 msgid "Set as _Background"
 msgstr "Postavi kao _pozadinu"
 
-#: ../e-util/e-attachment-icon-view.c:166
-#: ../e-util/e-attachment-tree-view.c:549
+#: ../e-util/e-attachment-icon-view.c:165
+#: ../e-util/e-attachment-tree-view.c:548
 msgid "Loading"
 msgstr "Učitavam"
 
-#: ../e-util/e-attachment-icon-view.c:178
-#: ../e-util/e-attachment-tree-view.c:561
+#: ../e-util/e-attachment-icon-view.c:177
+#: ../e-util/e-attachment-tree-view.c:560
 msgid "Saving"
 msgstr "Čuvam"
 
-#: ../e-util/e-attachment-paned.c:104
+#: ../e-util/e-attachment-paned.c:103
 msgid "Hide Attachment _Bar"
 msgstr "Sakrij liniju pri_loga"
 
-#: ../e-util/e-attachment-paned.c:106 ../e-util/e-attachment-paned.c:719
+#: ../e-util/e-attachment-paned.c:105 ../e-util/e-attachment-paned.c:718
 msgid "Show Attachment _Bar"
 msgstr "Prikaži liniju p_riloga"
 
-#: ../e-util/e-attachment-store.c:463
+#: ../e-util/e-attachment-store.c:462
 msgid "Add Attachment"
 msgstr "Dodaj prilog"
 
-#: ../e-util/e-attachment-store.c:466
+#: ../e-util/e-attachment-store.c:465
 msgid "A_ttach"
 msgstr "Pri_loži"
 
-#: ../e-util/e-attachment-store.c:537
+#: ../e-util/e-attachment-store.c:536
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Sačuvaj prilog"
@@ -10230,45 +10559,68 @@ msgstr[2] "Sačuvaj priloge"
 msgstr[3] "Sačuvaj prilog"
 
 #. Translators: Default attachment filename.
-#: ../e-util/e-attachment-store.c:568 ../e-util/e-attachment.c:2053
-#: ../e-util/e-attachment.c:2713
+#: ../e-util/e-attachment-store.c:567 ../e-util/e-attachment.c:2058
+#: ../e-util/e-attachment.c:2721
 msgid "attachment.dat"
 msgstr "attachment.dat"
 
-#: ../e-util/e-attachment-view.c:378
+#: ../e-util/e-attachment-view.c:377
 msgid "Open With Other Application..."
 msgstr "Otvori drugim programom..."
 
-#: ../e-util/e-attachment-view.c:385
+#: ../e-util/e-attachment-view.c:384
 msgid "S_ave All"
 msgstr "Sač_uvaj sve"
 
-#: ../e-util/e-attachment-view.c:411
+#: ../e-util/e-attachment-view.c:391
+#| msgid "Sa_ve"
+msgid "Sa_ve As"
+msgstr "Sačuvaj _kao"
+
+#: ../e-util/e-attachment-view.c:400
+#: ../plugins/save-calendar/save-calendar.c:349
+#: ../plugins/save-calendar/save-calendar.c:380
+#: ../plugins/save-calendar/save-calendar.c:411
+#| msgid "Save _As..."
+msgid "Save _As"
+msgstr "Sačuvaj _kao"
+
+#: ../e-util/e-attachment-view.c:410
 msgid "A_dd Attachment..."
 msgstr "Do_daj prilog..."
 
-#: ../e-util/e-attachment-view.c:435
+#: ../e-util/e-attachment-view.c:417
+#: ../modules/addressbook/e-book-shell-view-actions.c:1026
+#: ../modules/calendar/e-cal-shell-view-actions.c:1399
+#: ../modules/calendar/e-memo-shell-view-actions.c:628
+#: ../modules/calendar/e-task-shell-view-actions.c:752
+#: ../modules/mail/e-mail-shell-view-actions.c:1526
+#: ../modules/mail/e-mail-shell-view-actions.c:1596
+msgid "_Properties"
+msgstr "_Svojstva"
+
+#: ../e-util/e-attachment-view.c:434
 msgid "_Hide"
 msgstr "_Sakrij"
 
-#: ../e-util/e-attachment-view.c:442
+#: ../e-util/e-attachment-view.c:441
 msgid "Hid_e All"
 msgstr "Sak_rij sve"
 
-#: ../e-util/e-attachment-view.c:449
+#: ../e-util/e-attachment-view.c:448
 msgid "_View Inline"
 msgstr "Pre_gledaj unutar"
 
-#: ../e-util/e-attachment-view.c:456
+#: ../e-util/e-attachment-view.c:455
 msgid "Vie_w All Inline"
 msgstr "Pre_gledaj sve unutar"
 
-#: ../e-util/e-attachment-view.c:786
+#: ../e-util/e-attachment-view.c:785
 #, c-format
 msgid "Open With \"%s\""
 msgstr "Otvori programom „%s“"
 
-#: ../e-util/e-attachment-view.c:789
+#: ../e-util/e-attachment-view.c:788
 #, c-format
 msgid "Open this attachment in %s"
 msgstr "Otvori ovaj prilog u „%s“"
@@ -10277,174 +10629,180 @@ msgstr "Otvori ovaj prilog u „%s“"
 #. * 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:1103
+#: ../e-util/e-attachment.c:1108
 msgid "Attached message"
 msgstr "Priložena poruka"
 
-#: ../e-util/e-attachment.c:2134 ../e-util/e-attachment.c:3019
+#: ../e-util/e-attachment.c:2139 ../e-util/e-attachment.c:3027
 msgid "A load operation is already in progress"
 msgstr "Operacija učitavanja je već u toku"
 
-#: ../e-util/e-attachment.c:2142 ../e-util/e-attachment.c:3027
+#: ../e-util/e-attachment.c:2147 ../e-util/e-attachment.c:3035
 msgid "A save operation is already in progress"
 msgstr "Operacija čuvanja je već u toku"
 
-#: ../e-util/e-attachment.c:2259
+#: ../e-util/e-attachment.c:2267
 #, c-format
 msgid "Could not load '%s'"
 msgstr "Ne mogu da učitam „%s“"
 
-#: ../e-util/e-attachment.c:2262
+#: ../e-util/e-attachment.c:2270
 #, c-format
 msgid "Could not load the attachment"
 msgstr "Ne mogu da učitam prilog"
 
-#: ../e-util/e-attachment.c:2566
+#: ../e-util/e-attachment.c:2574
 #, c-format
 msgid "Could not open '%s'"
 msgstr "Ne mogu da otvorim „%s“"
 
-#: ../e-util/e-attachment.c:2569
+#: ../e-util/e-attachment.c:2577
 #, c-format
 msgid "Could not open the attachment"
 msgstr "Ne mogu da otvorim prilog"
 
-#: ../e-util/e-attachment.c:3036
+#: ../e-util/e-attachment.c:3044
 msgid "Attachment contents not loaded"
 msgstr "Sadržaj priloga nije učitan"
 
 # * found, so just bail completely.
-#: ../e-util/e-attachment.c:3112
+#: ../e-util/e-attachment.c:3124
 #, c-format
 msgid "Could not save '%s'"
 msgstr "Ne mogu da sačuvam „%s“"
 
-#: ../e-util/e-attachment.c:3115
+#: ../e-util/e-attachment.c:3127
 #, c-format
 msgid "Could not save the attachment"
 msgstr "Ne mogu da sačuvam prilog"
 
-#: ../e-util/e-book-source-config.c:98
+#: ../e-util/e-book-source-config.c:97
 msgid "Mark as default address book"
 msgstr "Označava kao podrazumevan adresar"
 
-#: ../e-util/e-book-source-config.c:103
+#: ../e-util/e-book-source-config.c:102
 msgid "Autocomplete with this address book"
 msgstr "Sam dopunjava ovim adresarom"
 
-#: ../e-util/e-book-source-config.c:277
+#: ../e-util/e-book-source-config.c:276
 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
+#: ../e-util/e-buffer-tagger.c:407
 msgid "Ctrl-click to open a link"
 msgstr "Pritisnite taster Ktrl i kliknite da otvorite vezu"
 
-#: ../e-util/e-cal-source-config.c:170
+#: ../e-util/e-cal-source-config.c:169
 msgid "Mark as default calendar"
 msgstr "Označava kao osnovni kalendar"
 
-#: ../e-util/e-cal-source-config.c:173
+#: ../e-util/e-cal-source-config.c:172
 msgid "Mark as default task list"
 msgstr "Označava kao osnovni spisak zadataka"
 
-#: ../e-util/e-cal-source-config.c:176
+#: ../e-util/e-cal-source-config.c:175
 msgid "Mark as default memo list"
 msgstr "Označava kao osnovni spisak beleški"
 
-#: ../e-util/e-cal-source-config.c:201
+#: ../e-util/e-cal-source-config.c:200
 msgid "Color:"
 msgstr "Boja:"
 
-#: ../e-util/e-cal-source-config.c:406
+#: ../e-util/e-cal-source-config.c:405
 msgid "Copy calendar contents locally for offline operation"
 msgstr "Umnožava sadržaj kalendara lokalno za rad van mreže"
 
-#: ../e-util/e-cal-source-config.c:410
+#: ../e-util/e-cal-source-config.c:409
 msgid "Copy task list contents locally for offline operation"
 msgstr "Umnožava sadržaj spiska zadataka lokalno za rad van mreže"
 
-#: ../e-util/e-cal-source-config.c:414
+#: ../e-util/e-cal-source-config.c:413
 msgid "Copy memo list contents locally for offline operation"
 msgstr "Umnožava sadržaj spiska beleški lokalno za rad van mreže"
 
 #. This is a strftime() format. %B = Month name.
-#: ../e-util/e-calendar-item.c:1327 ../e-util/e-calendar-item.c:2195
+#: ../e-util/e-calendar-item.c:1326 ../e-util/e-calendar-item.c:2194
 msgctxt "CalItem"
 msgid "%B"
 msgstr "%B"
 
 #. This is a strftime() format. %Y = Year.
-#: ../e-util/e-calendar-item.c:1329
+#: ../e-util/e-calendar-item.c:1328
 msgctxt "CalItem"
 msgid "%Y"
 msgstr "%Y"
 
 #. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1366
+#: ../e-util/e-calendar-item.c:1365
 msgctxt "CalItem"
 msgid "%B %Y"
 msgstr "%B %Y."
 
-#: ../e-util/e-calendar.c:190
+#: ../e-util/e-calendar.c:189
 msgid "Previous month"
 msgstr "Prethodni mesec"
 
-#: ../e-util/e-calendar.c:215
+#: ../e-util/e-calendar.c:214
 msgid "Next month"
 msgstr "Sledeći mesec"
 
-#: ../e-util/e-calendar.c:241
+#: ../e-util/e-calendar.c:240
 msgid "Previous year"
 msgstr "Prethodna godina"
 
-#: ../e-util/e-calendar.c:266
+#: ../e-util/e-calendar.c:265
 msgid "Next year"
 msgstr "Sledeća godina"
 
-#: ../e-util/e-calendar.c:290
+#: ../e-util/e-calendar.c:289
 msgid "Month Calendar"
 msgstr "Mesečni kalendar"
 
-#: ../e-util/e-categories-editor.c:224
+#: ../e-util/e-categories-editor.c:223
 msgid "Currently _used categories:"
 msgstr "Trenutno _korišćene kategorije:"
 
-#: ../e-util/e-categories-editor.c:235
+#: ../e-util/e-categories-editor.c:234
 msgid "_Available Categories:"
 msgstr "_Dostupne kategorije:"
 
-#: ../e-util/e-categories-selector.c:323
+#: ../e-util/e-categories-editor.c:274 ../mail/em-folder-selector.c:269
+#: ../plugins/mail-to-task/mail-to-task.c:595
+#: ../shell/e-shell-window-actions.c:1100
+msgid "_New"
+msgstr "_Novo"
+
+#: ../e-util/e-categories-selector.c:321
 msgid "Icon"
 msgstr "Ikonica"
 
-#: ../e-util/e-category-completion.c:300
+#: ../e-util/e-category-completion.c:299
 #, c-format
 msgid "Create category \"%s\""
 msgstr "Izrada kategorije „%s“"
 
-#: ../e-util/e-category-editor.c:137
+#: ../e-util/e-category-editor.c:136
 msgid "Category Icon"
 msgstr "Ikonica kategorije"
 
-#: ../e-util/e-category-editor.c:141
+#: ../e-util/e-category-editor.c:140
 msgid "_No Image"
 msgstr "_Bez slike"
 
-#: ../e-util/e-category-editor.c:178
+#: ../e-util/e-category-editor.c:173
 msgid "Category _Name"
 msgstr "_Naziv kategorije"
 
-#: ../e-util/e-category-editor.c:190
+#: ../e-util/e-category-editor.c:185
 msgid "Category _Icon"
 msgstr "_Ikonica kategorije"
 
-#: ../e-util/e-category-editor.c:216
+#: ../e-util/e-category-editor.c:211
 msgid "Category Properties"
 msgstr "Osobine kategorije"
 
-#: ../e-util/e-category-editor.c:277
+#: ../e-util/e-category-editor.c:272
 #, c-format
 msgid ""
 "There is already a category '%s' in the configuration. Please use another "
@@ -10452,18 +10810,18 @@ msgid ""
 msgstr ""
 "Već postoji kategorija „%s“ u podešavanjima. Molim izaberite drugi naziv"
 
-#: ../e-util/e-cell-combo.c:186
+#: ../e-util/e-cell-combo.c:185
 msgid "popup list"
 msgstr "iskačuća lista"
 
-#: ../e-util/e-cell-date-edit.c:299
+#: ../e-util/e-cell-date-edit.c:298
 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:1900
-#: ../modules/itip-formatter/itip-view.c:230
+#: ../e-util/e-cell-date-edit.c:306 ../e-util/e-datetime-format.c:208
+#: ../modules/calendar/e-cal-shell-view-actions.c:1899
+#: ../modules/itip-formatter/itip-view.c:223
 msgid "Today"
 msgstr "Danas"
 
@@ -10474,149 +10832,149 @@ msgstr "Danas"
 # is not permitted.
 #. Translators: "None" as a label of a button to unset date in a
 #. * date table cell.
-#: ../e-util/e-cell-date-edit.c:317
+#: ../e-util/e-cell-date-edit.c:316
 msgctxt "table-date"
 msgid "None"
 msgstr "Ništa"
 
-#: ../e-util/e-cell-date-edit.c:325
+#: ../e-util/e-cell-date-edit.c:324 ../mail/e-mail-label-dialog.c:200
 msgid "OK"
 msgstr "U redu"
 
-#: ../e-util/e-cell-date-edit.c:873
+#: ../e-util/e-cell-date-edit.c:872
 #, 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:1851
+#: ../e-util/e-cell-date.c:50 ../mail/message-list.c:1853
 msgid "?"
 msgstr "?"
 
-#: ../e-util/e-cell-percent.c:80
+#: ../e-util/e-cell-percent.c:79
 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
+#: ../e-util/e-charset-combo-box.c:99
 msgid "Character Encoding"
 msgstr "Kodna strana"
 
-#: ../e-util/e-charset-combo-box.c:123
+#: ../e-util/e-charset-combo-box.c:122
 msgid "Enter the character set to use"
 msgstr "Izaberite kodnu stranu za korišćenje"
 
-#: ../e-util/e-charset-combo-box.c:342
+#: ../e-util/e-charset-combo-box.c:368
 msgid "Other..."
 msgstr "Drugo..."
 
-#: ../e-util/e-charset.c:53
+#: ../e-util/e-charset.c:52
 msgid "Arabic"
 msgstr "Arapski"
 
-#: ../e-util/e-charset.c:54
+#: ../e-util/e-charset.c:53
 msgid "Baltic"
 msgstr "Baltički"
 
-#: ../e-util/e-charset.c:55
+#: ../e-util/e-charset.c:54
 msgid "Central European"
 msgstr "Centralnoevropski"
 
-#: ../e-util/e-charset.c:56
+#: ../e-util/e-charset.c:55
 msgid "Chinese"
 msgstr "Kineski"
 
-#: ../e-util/e-charset.c:57
+#: ../e-util/e-charset.c:56
 msgid "Cyrillic"
 msgstr "Ćirilični"
 
-#: ../e-util/e-charset.c:58
+#: ../e-util/e-charset.c:57
 msgid "Greek"
 msgstr "Grčki"
 
-#: ../e-util/e-charset.c:59
+#: ../e-util/e-charset.c:58
 msgid "Hebrew"
 msgstr "Hebrejski"
 
-#: ../e-util/e-charset.c:60
+#: ../e-util/e-charset.c:59
 msgid "Japanese"
 msgstr "Japanski"
 
-#: ../e-util/e-charset.c:61
+#: ../e-util/e-charset.c:60
 msgid "Korean"
 msgstr "Korejski"
 
-#: ../e-util/e-charset.c:62
+#: ../e-util/e-charset.c:61
 msgid "Thai"
 msgstr "Tajlandski"
 
-#: ../e-util/e-charset.c:63
+#: ../e-util/e-charset.c:62
 msgid "Turkish"
 msgstr "Turski"
 
-#: ../e-util/e-charset.c:64
+#: ../e-util/e-charset.c:63
 msgid "Unicode"
 msgstr "Unikod"
 
-#: ../e-util/e-charset.c:65
+#: ../e-util/e-charset.c:64
 msgid "Western European"
 msgstr "Zapadnoevropski"
 
-#: ../e-util/e-charset.c:66
+#: ../e-util/e-charset.c:65
 msgid "Western European, New"
 msgstr "Zapadnoevropski, novi"
 
 #. Translators: Character set "Chinese, Traditional"
-#: ../e-util/e-charset.c:85 ../e-util/e-charset.c:87 ../e-util/e-charset.c:89
+#: ../e-util/e-charset.c:84 ../e-util/e-charset.c:86 ../e-util/e-charset.c:88
 msgid "Traditional"
 msgstr "Tradicionalni"
 
 #. Translators: Character set "Chinese, Simplified"
-#: ../e-util/e-charset.c:91 ../e-util/e-charset.c:93 ../e-util/e-charset.c:95
-#: ../e-util/e-charset.c:97
+#: ../e-util/e-charset.c:90 ../e-util/e-charset.c:92 ../e-util/e-charset.c:94
+#: ../e-util/e-charset.c:96
 msgid "Simplified"
 msgstr "Pojednostavljeni"
 
 #. Translators: Character set "Cyrillic, Ukrainian"
-#: ../e-util/e-charset.c:101
+#: ../e-util/e-charset.c:100
 msgid "Ukrainian"
 msgstr "Ukrajinski"
 
 #. Translators: Character set "Hebrew, Visual"
-#: ../e-util/e-charset.c:105
+#: ../e-util/e-charset.c:104
 msgid "Visual"
 msgstr "Vizuelni"
 
-#: ../e-util/e-client-cache.c:1162
+#: ../e-util/e-client-cache.c:1189
 #, c-format
 msgid "Cannot create a client object from extension name '%s'"
 msgstr "Ne mogu da napravim predmet programa iz naziva proširenja „%s“"
 
-#: ../e-util/e-dateedit.c:524
+#: ../e-util/e-dateedit.c:523
 msgid "Date and Time"
 msgstr "Datum i vreme"
 
-#: ../e-util/e-dateedit.c:549
+#: ../e-util/e-dateedit.c:548
 msgid "Text entry to input date"
 msgstr "Deo teksta za unos datuma"
 
-#: ../e-util/e-dateedit.c:572
+#: ../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:626
+#: ../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:627
+#: ../e-util/e-dateedit.c:626
 #: ../modules/calendar/e-calendar-preferences.ui.h:9
 msgid "Time"
 msgstr "Vreme"
 
-#: ../e-util/e-dateedit.c:701
+#: ../e-util/e-dateedit.c:700
 msgid "No_w"
 msgstr "_Sada"
 
-#: ../e-util/e-dateedit.c:708
+#: ../e-util/e-dateedit.c:707
 msgid "_Today"
 msgstr "_Danas"
 
@@ -10627,7 +10985,7 @@ msgstr "_Danas"
 # is not permitted.
 #. Note that we don't show this here, since by default a 'None' date
 #. * is not permitted.
-#: ../e-util/e-dateedit.c:717
+#: ../e-util/e-dateedit.c:716
 msgid "_None"
 msgstr "_Ništa"
 
@@ -10638,32 +10996,32 @@ msgstr "_Ništa"
 # is not permitted.
 #. Translators: "None" for date field of a date edit, shown when
 #. * there is no date set.
-#: ../e-util/e-dateedit.c:1813 ../e-util/e-dateedit.c:2061
+#: ../e-util/e-dateedit.c:1838 ../e-util/e-dateedit.c:2086
 msgctxt "date"
 msgid "None"
 msgstr "Ništa"
 
-#: ../e-util/e-dateedit.c:1953
+#: ../e-util/e-dateedit.c:1978
 msgid "Invalid Date Value"
 msgstr "Neispravan datum"
 
-#: ../e-util/e-dateedit.c:1998
+#: ../e-util/e-dateedit.c:2023
 msgid "Invalid Time Value"
 msgstr "Neispravno vreme"
 
 #. strftime format of a weekday and a date.
-#: ../e-util/e-datetime-format.c:220 ../modules/itip-formatter/itip-view.c:258
+#: ../e-util/e-datetime-format.c:219 ../modules/itip-formatter/itip-view.c:251
 msgid "Tomorrow"
 msgstr "Sutra"
 
-#: ../e-util/e-datetime-format.c:222
+#: ../e-util/e-datetime-format.c:221
 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:230
+#: ../e-util/e-datetime-format.c:229
 msgctxt "DateFmt"
 msgid "Next Mon"
 msgstr "Sledećeg %a"
@@ -10671,7 +11029,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:236
+#: ../e-util/e-datetime-format.c:235
 msgctxt "DateFmt"
 msgid "Next Tue"
 msgstr "Sledećeg %a"
@@ -10679,7 +11037,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:242
+#: ../e-util/e-datetime-format.c:241
 msgctxt "DateFmt"
 msgid "Next Wed"
 msgstr "Sledeće %a"
@@ -10687,7 +11045,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:248
+#: ../e-util/e-datetime-format.c:247
 msgctxt "DateFmt"
 msgid "Next Thu"
 msgstr "Sledećeg %a"
@@ -10695,7 +11053,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:254
+#: ../e-util/e-datetime-format.c:253
 msgctxt "DateFmt"
 msgid "Next Fri"
 msgstr "Sledećeg %a"
@@ -10703,7 +11061,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:260
+#: ../e-util/e-datetime-format.c:259
 msgctxt "DateFmt"
 msgid "Next Sat"
 msgstr "Sledeće %a"
@@ -10711,40 +11069,40 @@ 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:266
+#: ../e-util/e-datetime-format.c:265
 msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Sledeće %a"
 
-#: ../e-util/e-datetime-format.c:353 ../e-util/e-datetime-format.c:363
-#: ../e-util/e-datetime-format.c:372
+#: ../e-util/e-datetime-format.c:352 ../e-util/e-datetime-format.c:362
+#: ../e-util/e-datetime-format.c:371
 msgid "Use locale default"
 msgstr "Koristi podrazumevani lokalitet"
 
-#: ../e-util/e-datetime-format.c:577
+#: ../e-util/e-datetime-format.c:576
 msgid "Format:"
 msgstr "Oblik:"
 
-#: ../e-util/e-file-utils.c:121
+#: ../e-util/e-file-utils.c:120
 msgid "(Unknown Filename)"
 msgstr "(Nepoznato ime datoteke)"
 
 #. Translators: The string value is the basename of a file.
-#: ../e-util/e-file-utils.c:125
+#: ../e-util/e-file-utils.c:124
 #, c-format
 msgid "Writing \"%s\""
 msgstr "Upisujem „%s“"
 
 #. Translators: The first string value is the basename of a
 #. * remote file, the second string value is the hostname.
-#: ../e-util/e-file-utils.c:130
+#: ../e-util/e-file-utils.c:129
 #, c-format
 msgid "Writing \"%s\" to %s"
 msgstr "Upisujem „%s“ u %s"
 
 #. 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
-#: ../e-util/e-filter-datespec.c:67
+#: ../e-util/e-filter-datespec.c:66
 #, c-format
 msgid "1 second ago"
 msgid_plural "%d seconds ago"
@@ -10753,7 +11111,7 @@ msgstr[1] "pre %d sekunde"
 msgstr[2] "pre %d sekundi"
 msgstr[3] "pre %d sekunde"
 
-#: ../e-util/e-filter-datespec.c:68
+#: ../e-util/e-filter-datespec.c:67
 #, c-format
 msgid "1 second in the future"
 msgid_plural "%d seconds in the future"
@@ -10762,7 +11120,7 @@ msgstr[1] "%d sekunde u budućnosti"
 msgstr[2] "%d sekundi u budućnosti"
 msgstr[3] "%d sekunda u budućnosti"
 
-#: ../e-util/e-filter-datespec.c:69
+#: ../e-util/e-filter-datespec.c:68
 #, c-format
 msgid "1 minute ago"
 msgid_plural "%d minutes ago"
@@ -10771,7 +11129,7 @@ msgstr[1] "pre %d minuta"
 msgstr[2] "pre %d minuta"
 msgstr[3] "pre %d minut"
 
-#: ../e-util/e-filter-datespec.c:70
+#: ../e-util/e-filter-datespec.c:69
 #, c-format
 msgid "1 minute in the future"
 msgid_plural "%d minutes in the future"
@@ -10780,7 +11138,7 @@ msgstr[1] "%d minuta u budućnosti"
 msgstr[2] "%d minuta u budućnosti"
 msgstr[3] "%d minut u budućnosti"
 
-#: ../e-util/e-filter-datespec.c:71
+#: ../e-util/e-filter-datespec.c:70
 #, c-format
 msgid "1 hour ago"
 msgid_plural "%d hours ago"
@@ -10789,7 +11147,7 @@ msgstr[1] "pre %d sata"
 msgstr[2] "pre %d sati"
 msgstr[3] "pre %d sat"
 
-#: ../e-util/e-filter-datespec.c:72
+#: ../e-util/e-filter-datespec.c:71
 #, c-format
 msgid "1 hour in the future"
 msgid_plural "%d hours in the future"
@@ -10798,7 +11156,7 @@ msgstr[1] "%d sata u budućnosti"
 msgstr[2] "%d sati u budućnosti"
 msgstr[3] "%d sat u budućnosti"
 
-#: ../e-util/e-filter-datespec.c:73
+#: ../e-util/e-filter-datespec.c:72
 #, c-format
 msgid "1 day ago"
 msgid_plural "%d days ago"
@@ -10807,7 +11165,7 @@ msgstr[1] "pre %d dana"
 msgstr[2] "pre %d dana"
 msgstr[3] "pre %d dan"
 
-#: ../e-util/e-filter-datespec.c:74
+#: ../e-util/e-filter-datespec.c:73
 #, c-format
 msgid "1 day in the future"
 msgid_plural "%d days in the future"
@@ -10816,7 +11174,7 @@ msgstr[1] "%d dana u budućnosti"
 msgstr[2] "%d dana u budućnosti"
 msgstr[3] "%d dan u budućnosti"
 
-#: ../e-util/e-filter-datespec.c:75
+#: ../e-util/e-filter-datespec.c:74
 #, c-format
 msgid "1 week ago"
 msgid_plural "%d weeks ago"
@@ -10825,7 +11183,7 @@ msgstr[1] "pre %d nedelje"
 msgstr[2] "pre %d nedelja"
 msgstr[3] "pre %d nedelju"
 
-#: ../e-util/e-filter-datespec.c:76
+#: ../e-util/e-filter-datespec.c:75
 #, c-format
 msgid "1 week in the future"
 msgid_plural "%d weeks in the future"
@@ -10834,7 +11192,7 @@ msgstr[1] "%d nedelje u budućnosti"
 msgstr[2] "%d nedelja u budućnosti"
 msgstr[3] "%d nedelja u budućnosti"
 
-#: ../e-util/e-filter-datespec.c:77
+#: ../e-util/e-filter-datespec.c:76
 #, c-format
 msgid "1 month ago"
 msgid_plural "%d months ago"
@@ -10843,7 +11201,7 @@ msgstr[1] "pre %d meseca"
 msgstr[2] "pre %d meseci"
 msgstr[3] "pre %d mesec"
 
-#: ../e-util/e-filter-datespec.c:78
+#: ../e-util/e-filter-datespec.c:77
 #, c-format
 msgid "1 month in the future"
 msgid_plural "%d months in the future"
@@ -10852,7 +11210,7 @@ msgstr[1] "%d meseca u budućnosti"
 msgstr[2] "%d meseci u budućnost"
 msgstr[3] "%d mesec u budućnosti"
 
-#: ../e-util/e-filter-datespec.c:79
+#: ../e-util/e-filter-datespec.c:78
 #, c-format
 msgid "1 year ago"
 msgid_plural "%d years ago"
@@ -10861,7 +11219,7 @@ msgstr[1] "pre %d godine"
 msgstr[2] "pre %d godina"
 msgstr[3] "pre %d godinu"
 
-#: ../e-util/e-filter-datespec.c:80
+#: ../e-util/e-filter-datespec.c:79
 #, c-format
 msgid "1 year in the future"
 msgid_plural "%d years in the future"
@@ -10870,45 +11228,45 @@ msgstr[1] "%d godine u budućnosti"
 msgstr[2] "%d godina u budućnosti"
 msgstr[3] "%d godina u budućnosti"
 
-#: ../e-util/e-filter-datespec.c:130
+#: ../e-util/e-filter-datespec.c:129
 msgid "<click here to select a date>"
 msgstr "<kliknite ovde da izaberete datum>"
 
-#: ../e-util/e-filter-datespec.c:133 ../e-util/e-filter-datespec.c:144
-#: ../e-util/e-filter-datespec.c:155
+#: ../e-util/e-filter-datespec.c:132 ../e-util/e-filter-datespec.c:143
+#: ../e-util/e-filter-datespec.c:154
 msgid "now"
 msgstr "sada"
 
 #. strftime for date filter display, only needs to show a day date (i.e. no time)
-#: ../e-util/e-filter-datespec.c:140
+#: ../e-util/e-filter-datespec.c:139
 msgid "%d-%b-%Y"
 msgstr "%d.%b.%Y."
 
-#: ../e-util/e-filter-datespec.c:289
+#: ../e-util/e-filter-datespec.c:288
 msgid "Select a time to compare against"
 msgstr "Izaberite vreme za poređenje"
 
-#: ../e-util/e-filter-file.c:187
+#: ../e-util/e-filter-file.c:186
 msgid "Choose a File"
 msgstr "Izaberite datoteku"
 
-#: ../e-util/e-filter-rule.c:743
+#: ../e-util/e-filter-rule.c:750
 msgid "R_ule name:"
 msgstr "Naziv _pravila:"
 
-#: ../e-util/e-filter-rule.c:793
+#: ../e-util/e-filter-rule.c:800
 msgid "all the following conditions"
 msgstr "svim sledećim uslovima"
 
-#: ../e-util/e-filter-rule.c:794
+#: ../e-util/e-filter-rule.c:801
 msgid "any of the following conditions"
 msgstr "bilo kom od sledećih uslova"
 
-#: ../e-util/e-filter-rule.c:800
+#: ../e-util/e-filter-rule.c:807
 msgid "_Find items which match:"
 msgstr "_Pronađi stavke koje odgovaraju:"
 
-#: ../e-util/e-filter-rule.c:823
+#: ../e-util/e-filter-rule.c:830
 msgid "Find items that meet the following conditions"
 msgstr "Pronađite stavke koje zadovoljavaju sledeće uslove"
 
@@ -10921,34 +11279,35 @@ msgstr "Pronađite stavke koje zadovoljavaju sledeće uslove"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../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:622
+#: ../e-util/e-filter-rule.c:845 ../e-util/e-mail-identity-combo-box.c:473
+#: ../e-util/e-mail-signature-combo-box.c:368 ../e-util/e-proxy-editor.c:549
+#: ../libemail-engine/camel-null-store.c:27
+#: ../mail/e-mail-config-summary-page.c:138
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
 msgid "None"
 msgstr "Ništa"
 
-#: ../e-util/e-filter-rule.c:839
+#: ../e-util/e-filter-rule.c:846
 msgid "All related"
 msgstr "Sve povezano"
 
-#: ../e-util/e-filter-rule.c:841
+#: ../e-util/e-filter-rule.c:848
 msgid "Replies and parents"
 msgstr "Odgovori i nadređeno"
 
-#: ../e-util/e-filter-rule.c:842
+#: ../e-util/e-filter-rule.c:849
 msgid "No reply or parent"
 msgstr "Nema odgovora ili roditelja"
 
-#: ../e-util/e-filter-rule.c:845
+#: ../e-util/e-filter-rule.c:852
 msgid "I_nclude threads:"
 msgstr "Uključi _niti:"
 
-#: ../e-util/e-filter-rule.c:922
+#: ../e-util/e-filter-rule.c:929
 msgid "A_dd Condition"
 msgstr "Dodaj _uslov"
 
-#: ../e-util/e-filter-rule.c:1239 ../mail/em-utils.c:241
+#: ../e-util/e-filter-rule.c:1243 ../mail/em-utils.c:230
 msgid "Outgoing"
 msgstr "Odlazno"
 
@@ -10968,7 +11327,7 @@ msgstr "Izaberite datoteku"
 msgid "File _type:"
 msgstr "_Vrsta datoteke:"
 
-#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:921
+#: ../e-util/e-import-assistant.c:340 ../e-util/e-import-assistant.c:917
 msgid "Choose the destination for this import"
 msgstr "Izaberite odredište za ovaj uvoz"
 
@@ -10985,7 +11344,7 @@ 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
+#: ../modules/startup-wizard/e-mail-config-import-page.c:201
 msgid "Please select the information that you would like to import:"
 msgstr "Izaberite podatke koje želite da uvezete:"
 
@@ -11000,7 +11359,7 @@ msgstr ""
 "ponovo, kliknite na dugme „Nazad“."
 
 #: ../e-util/e-import-assistant.c:559
-#: ../modules/startup-wizard/e-mail-config-import-page.c:231
+#: ../modules/startup-wizard/e-mail-config-import-page.c:230
 #, c-format
 msgid "From %s:"
 msgstr "Od %s:"
@@ -11010,29 +11369,29 @@ msgstr "Od %s:"
 msgid "_Cancel Import"
 msgstr "_Otkaži uvoženje"
 
-#: ../e-util/e-import-assistant.c:920
+#: ../e-util/e-import-assistant.c:916
 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
+#: ../e-util/e-import-assistant.c:922 ../e-util/e-import-assistant.c:935
+#: ../e-util/e-import-assistant.c:1288 ../e-util/e-import-assistant.c:1364
+#: ../e-util/e-import-assistant.c:1373
 msgid "Import Data"
 msgstr "Uvezi podatke"
 
-#: ../e-util/e-import-assistant.c:934
+#: ../e-util/e-import-assistant.c:930
 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
+#: ../e-util/e-import-assistant.c:1278 ../e-util/e-import-assistant.c:1313
 msgid "Evolution Import Assistant"
 msgstr "Pomoćnik Evolucije za uvoz"
 
-#: ../e-util/e-import-assistant.c:1299 ../e-util/e-import-assistant.c:1355
+#: ../e-util/e-import-assistant.c:1295 ../e-util/e-import-assistant.c:1351
 msgid "Import Location"
 msgstr "Uvezi lokaciju"
 
-#: ../e-util/e-import-assistant.c:1310
+#: ../e-util/e-import-assistant.c:1306
 msgid ""
 "Welcome to the Evolution Import Assistant.\n"
 "With this assistant you will be guided through the process of importing "
@@ -11042,43 +11401,43 @@ msgstr ""
 "Ovaj pomoćnik će vas provesti kroz postupak uvoza spoljnih datoteka u "
 "Evoluciju."
 
-#: ../e-util/e-import-assistant.c:1327
+#: ../e-util/e-import-assistant.c:1323
 msgid "Importer Type"
 msgstr "Vrsta uvoznika"
 
-#: ../e-util/e-import-assistant.c:1337
+#: ../e-util/e-import-assistant.c:1333
 msgid "Select Information to Import"
 msgstr "Izaberite informaciju za uvoz"
 
-#: ../e-util/e-import-assistant.c:1346
+#: ../e-util/e-import-assistant.c:1342
 msgid "Select a File"
 msgstr "Izaberite datoteku"
 
-#: ../e-util/e-import-assistant.c:1363
+#: ../e-util/e-import-assistant.c:1359
 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
+#: ../e-util/e-mail-signature-combo-box.c:377
 msgid "Autogenerated"
 msgstr "Automatski sastavljeno"
 
-#: ../e-util/e-mail-signature-editor.c:310
+#: ../e-util/e-mail-signature-editor.c:309
 msgid "Close"
 msgstr "Zatvori"
 
-#: ../e-util/e-mail-signature-editor.c:315
+#: ../e-util/e-mail-signature-editor.c:314
 msgid "_Save and Close"
 msgstr "_Sačuvaj i zatvori"
 
-#: ../e-util/e-mail-signature-editor.c:529
+#: ../e-util/e-mail-signature-editor.c:528
 msgid "Edit Signature"
 msgstr "Uredi potpis"
 
-#: ../e-util/e-mail-signature-editor.c:549
+#: ../e-util/e-mail-signature-editor.c:548
 msgid "_Signature Name:"
 msgstr "Naziv _potpisa:"
 
-#: ../e-util/e-mail-signature-editor.c:595
+#: ../e-util/e-mail-signature-editor.c:594
 msgid "Unnamed"
 msgstr "Bez imena"
 
@@ -11086,15 +11445,15 @@ msgstr "Bez imena"
 msgid "Add _Script"
 msgstr "Dodaj sk_riptu"
 
-#: ../e-util/e-mail-signature-manager.c:422
+#: ../e-util/e-mail-signature-manager.c:419
 msgid "Add Signature Script"
 msgstr "Dodaj skriptu za potpis"
 
-#: ../e-util/e-mail-signature-manager.c:492
+#: ../e-util/e-mail-signature-manager.c:489
 msgid "Edit Signature Script"
 msgstr "Uredi skriptu potpisa"
 
-#: ../e-util/e-mail-signature-script-dialog.c:395
+#: ../e-util/e-mail-signature-script-dialog.c:394
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -11104,19 +11463,19 @@ msgstr ""
 "potpis. Naziv koji ste dali će biti korišćen\n"
 "samo za prikaz."
 
-#: ../e-util/e-mail-signature-script-dialog.c:446
+#: ../e-util/e-mail-signature-script-dialog.c:445
 msgid "S_cript:"
 msgstr "S_kripta:"
 
-#: ../e-util/e-mail-signature-script-dialog.c:477
+#: ../e-util/e-mail-signature-script-dialog.c:476
 msgid "Script file must be executable."
 msgstr "Datoteka skripte mora biti izvršna."
 
-#: ../e-util/e-map.c:886
+#: ../e-util/e-map.c:885
 msgid "World Map"
 msgstr "Karta sveta"
 
-#: ../e-util/e-map.c:889
+#: ../e-util/e-map.c:888
 msgid ""
 "Mouse-based interactive map widget for selecting timezone. Keyboard users "
 "should instead select the timezone from the drop-down combination box below."
@@ -11124,86 +11483,82 @@ 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:242
+#: ../e-util/e-misc-utils.c:246
 msgid "Could not open the link."
 msgstr "Ne mogu da otvorim vezu."
 
-#: ../e-util/e-misc-utils.c:289
+#: ../e-util/e-misc-utils.c:293
 msgid "Could not display help for Evolution."
 msgstr "Ne mogu da prikažem pomoć za Evoluciju."
 
-#: ../e-util/e-name-selector-dialog.c:279
+#: ../e-util/e-name-selector-dialog.c:277
 msgid "Show Contacts"
 msgstr "Prikaži kontakte"
 
-#: ../e-util/e-name-selector-dialog.c:311
+#: ../e-util/e-name-selector-dialog.c:309
 msgid "Address B_ook:"
 msgstr "_Adresar:"
 
-#: ../e-util/e-name-selector-dialog.c:318
+#: ../e-util/e-name-selector-dialog.c:316
 msgid "Cat_egory:"
 msgstr "_Kategorija:"
 
-#: ../e-util/e-name-selector-dialog.c:342
+#: ../e-util/e-name-selector-dialog.c:340
 msgid "_Search:"
 msgstr "_Potraži:"
 
-#: ../e-util/e-name-selector-dialog.c:368
-#: ../e-util/e-name-selector-dialog.c:1276
-#: ../modules/addressbook/e-book-shell-view-actions.c:1113
-#: ../modules/calendar/e-cal-shell-view-actions.c:1733
-#: ../modules/calendar/e-memo-shell-view-actions.c:767
-#: ../modules/calendar/e-task-shell-view-actions.c:938
+#: ../e-util/e-name-selector-dialog.c:366
+#: ../e-util/e-name-selector-dialog.c:1274
+#: ../modules/addressbook/e-book-shell-view-actions.c:1112
+#: ../modules/calendar/e-cal-shell-view-actions.c:1732
+#: ../modules/calendar/e-memo-shell-view-actions.c:766
+#: ../modules/calendar/e-task-shell-view-actions.c:937
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
 
-#: ../e-util/e-name-selector-dialog.c:370
+#: ../e-util/e-name-selector-dialog.c:368
 msgid "Co_ntacts"
 msgstr "Ko_ntakti"
 
-#: ../e-util/e-name-selector-dialog.c:447
+#: ../e-util/e-name-selector-dialog.c:445
 msgid "Search"
 msgstr "Potraži"
 
-#: ../e-util/e-name-selector-dialog.c:450
-#: ../mail/importers/pine-importer.c:426
+#: ../e-util/e-name-selector-dialog.c:448
+#: ../mail/importers/pine-importer.c:427
 msgid "Address Book"
 msgstr "Adresar"
 
-#: ../e-util/e-name-selector-dialog.c:453
-#: ../modules/addressbook/e-book-shell-backend.c:304
-#: ../modules/addressbook/e-book-shell-view.c:372
+#: ../e-util/e-name-selector-dialog.c:451
+#: ../modules/addressbook/e-book-shell-backend.c:303
+#: ../modules/addressbook/e-book-shell-view.c:371
 msgid "Contacts"
 msgstr "Kontakti"
 
-#: ../e-util/e-name-selector-dialog.c:578
+#: ../e-util/e-name-selector-dialog.c:576
 msgid "Select Contacts from Address Book"
 msgstr "Izaberite kontakte iz adresara"
 
-#: ../e-util/e-name-selector-dialog.c:1001
-msgid "_Remove"
-msgstr "_Ukloni"
-
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../e-util/e-name-selector-entry.c:3028
+#: ../e-util/e-name-selector-entry.c:3038
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "_Raširi %s unutar"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3044
+#: ../e-util/e-name-selector-entry.c:3054
 #, c-format
 msgid "Cop_y %s"
 msgstr "_Umnoži %s"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3055
+#: ../e-util/e-name-selector-entry.c:3065
 #, c-format
 msgid "C_ut %s"
 msgstr "_Iseci %s"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3073
+#: ../e-util/e-name-selector-entry.c:3083
 #, c-format
 msgid "_Edit %s"
 msgstr "_Uredi %s"
@@ -11213,41 +11568,41 @@ msgstr "_Uredi %s"
 msgid "_Delete %s"
 msgstr "_Obriši %s"
 
-#: ../e-util/e-online-button.c:31
+#: ../e-util/e-online-button.c:30
 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
+#: ../e-util/e-online-button.c:33
 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
+#: ../e-util/e-online-button.c:36
 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
+#: ../e-util/e-passwords.c:125
 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
+#: ../e-util/e-passwords.c:445
 msgid "You have the Caps Lock key on."
 msgstr "Uključili ste velika slova."
 
-#: ../e-util/e-passwords.c:578
+#: ../e-util/e-passwords.c:576
 msgid "_Remember this passphrase"
 msgstr "_Zapamti ovu lozinku"
 
-#: ../e-util/e-passwords.c:579
+#: ../e-util/e-passwords.c:577
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_Zapamti ovu lozinku do kraja ove sesije"
 
-#: ../e-util/e-passwords.c:584
+#: ../e-util/e-passwords.c:582
 msgid "_Remember this password"
 msgstr "_Zapamti ovu lozinku"
 
-#: ../e-util/e-passwords.c:585
+#: ../e-util/e-passwords.c:583
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamti ovu lozinku do kraja ove sesije"
 
@@ -11255,139 +11610,226 @@ msgstr "_Zapamti ovu lozinku do kraja ove sesije"
 msgid "Evolution Preferences"
 msgstr "Podešavanja Evolucije"
 
-#: ../e-util/e-print.c:161
+#: ../e-util/e-print.c:160
 msgid "An error occurred while printing"
 msgstr "Došlo je do greške za vreme štampanja"
 
-#: ../e-util/e-print.c:168
+#: ../e-util/e-print.c:167
 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
+#: ../e-util/e-print.c:173
 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:185
+#: ../e-util/e-proxy-editor.c:314
+#| msgid "Method:"
+msgid "_Method:"
+msgstr "_Način:"
+
+#: ../e-util/e-proxy-editor.c:336
+msgid "Defer to Desktop Settings"
+msgstr "Teži podešavanjima radne površi"
+
+#: ../e-util/e-proxy-editor.c:340
+msgid "_Open Desktop Settings"
+msgstr "_Otvori podešavanja radne površi"
+
+#: ../e-util/e-proxy-editor.c:366
+#| msgid "January"
+msgid "Manual"
+msgstr "Ručno"
+
+#: ../e-util/e-proxy-editor.c:385
+#| msgid "H_TTP Proxy:"
+msgid "_HTTP Proxy:"
+msgstr "_HTTP posrednik:"
+
+#: ../e-util/e-proxy-editor.c:416
+#| msgid "H_TTP Proxy:"
+msgid "H_TTPS Proxy:"
+msgstr "H_TTPS posrednik:"
+
+#: ../e-util/e-proxy-editor.c:447
+#| msgid "SOC_KS Proxy:"
+msgid "_Socks Proxy:"
+msgstr "_Soks posrednik:"
+
+#: ../e-util/e-proxy-editor.c:478
+#| msgid "Ignore"
+msgid "_Ignore Hosts:"
+msgstr "_Zanemari domaćine:"
+
+#: ../e-util/e-proxy-editor.c:504
+#| msgid "Automatic Contacts"
+msgid "Automatic"
+msgstr "Samostalno"
+
+#: ../e-util/e-proxy-editor.c:523
+#| msgid "Configuration"
+msgid "Configuration _URL:"
+msgstr "_Adresa podešavanja:"
+
+#: ../e-util/e-proxy-editor.c:552
+msgid "Use a direct connection, no proxying required."
+msgstr "Koristi neposrednu vezu, nije potrebno posredovanje."
+
+#: ../e-util/e-proxy-preferences.c:177
+msgid "Switch to Basic Proxy Preferences"
+msgstr "Prebaci se na osnovne postavke posrednika"
+
+#: ../e-util/e-proxy-preferences.c:179
+msgid "Switch to Advanced Proxy Preferences"
+msgstr "Prebaci se na napredne postavke posrednika"
+
+#: ../e-util/e-proxy-preferences.c:463
+msgid "Apply custom proxy settings to these accounts:"
+msgstr "Primeni proizvoljna podešavanja posrednika na ove naloge:"
+
+#: ../e-util/e-proxy-preferences.c:498
+msgid ""
+"<b>Advanced Proxy Preferences</b> lets you define alternate network proxies "
+"and apply them to specific accounts"
+msgstr ""
+"<b>Napredne postavke posrednika</b> vam dopuštaju da odredite zamenske "
+"mrežne posrednike i da ih primenite na posebne naloge"
+
+#: ../e-util/e-proxy-selector.c:85
+#| msgid "_Custom binary:"
+msgid "Custom Proxy"
+msgstr "Proizvoljni posrednik"
+
+#: ../e-util/e-proxy-selector.c:487
+#| msgid "Create a new appointment"
+msgid "Create a new proxy profile"
+msgstr "Napravite novi profil posrednika"
+
+#: ../e-util/e-proxy-selector.c:492
+#| msgid "Delete the selected memo list"
+msgid "Delete the selected proxy profile"
+msgstr "Obrišite izabrani profil posrednika"
+
+#: ../e-util/e-rule-editor.c:184
 msgid "Add Rule"
 msgstr "Dodaj pravilo"
 
-#: ../e-util/e-rule-editor.c:287
+#: ../e-util/e-rule-editor.c:286
 msgid "Edit Rule"
 msgstr "Uredi pravilo"
 
 # bug: plural-forms if put as "%d matches"
-#: ../e-util/e-search-bar.c:81
+#: ../e-util/e-search-bar.c:82
 #, c-format
 msgid "Matches: %u"
 msgstr "Poklapanja: %u"
 
-#: ../e-util/e-search-bar.c:565
+#: ../e-util/e-search-bar.c:566
 msgid "Close the find bar"
 msgstr "Zatvori traku pretrage"
 
-#: ../e-util/e-search-bar.c:573
+#: ../e-util/e-search-bar.c:574
 msgid "Fin_d:"
 msgstr "Pro_nađi:"
 
-#: ../e-util/e-search-bar.c:585
+#: ../e-util/e-search-bar.c:586
 msgid "Clear the search"
 msgstr "Očisti pretragu"
 
-#: ../e-util/e-search-bar.c:609
+#: ../e-util/e-search-bar.c:610
 msgid "_Previous"
 msgstr "_Prethodno"
 
-#: ../e-util/e-search-bar.c:615
+#: ../e-util/e-search-bar.c:613
 msgid "Find the previous occurrence of the phrase"
 msgstr "Nađi prethodno pojavljivanje izraza"
 
-#: ../e-util/e-search-bar.c:624
+#: ../e-util/e-search-bar.c:622
 msgid "_Next"
 msgstr "_Sledeće"
 
-#: ../e-util/e-search-bar.c:630
+#: ../e-util/e-search-bar.c:625
 msgid "Find the next occurrence of the phrase"
 msgstr "Nađi sledeće pojavljivanje izraza"
 
-#: ../e-util/e-search-bar.c:639
+#: ../e-util/e-search-bar.c:634
 msgid "Mat_ch case"
 msgstr "_Uporedi veličinu slova"
 
-#: ../e-util/e-search-bar.c:667
+#: ../e-util/e-search-bar.c:662
 msgid "Reached bottom of page, continued from top"
 msgstr "Stigao sam do dna stranice, nastavljam sa vrha"
 
-#: ../e-util/e-search-bar.c:689
+#: ../e-util/e-search-bar.c:684
 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:419
-#: ../modules/mail/e-mail-shell-view.c:1088
+#: ../e-util/e-send-options.c:537 ../mail/importers/elm-importer.c:327
+#: ../mail/importers/pine-importer.c:420
+#: ../modules/mail/e-mail-shell-view.c:1097
 msgid "Mail"
 msgstr "Pošta"
 
-#: ../e-util/e-send-options.c:570
+#: ../e-util/e-send-options.c:569
 msgid "When de_leted:"
 msgstr "Kada je obri_sano:"
 
-#: ../e-util/e-source-config.c:681 ../e-util/e-source-config.c:685
+#: ../e-util/e-source-config.c:680 ../e-util/e-source-config.c:684
 msgid "Type:"
 msgstr "Vrsta:"
 
-#: ../e-util/e-source-config.c:693 ../e-util/e-source-config.c:697
+#: ../e-util/e-source-config.c:692 ../e-util/e-source-config.c:696
 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:1302
+#: ../e-util/e-source-config.c:1301
 msgid "Refresh every"
 msgstr "Osveži na svakih"
 
-#: ../e-util/e-source-config.c:1332 ../e-util/e-source-config.c:1402
+#: ../e-util/e-source-config.c:1331 ../e-util/e-source-config.c:1401
 msgid "Use a secure connection"
 msgstr "Koristi bezbednu vezu"
 
-#: ../e-util/e-source-config.c:1428
+#: ../e-util/e-source-config.c:1427
 msgid "Unset _trust for SSL certificate"
 msgstr "Odznači _poverenje za SSL uverenje"
 
-#: ../e-util/e-source-config.c:1464
+#: ../e-util/e-source-config.c:1463
 msgid "User"
 msgstr "Korisnik"
 
-#: ../e-util/e-source-selector-dialog.c:229
+#: ../e-util/e-source-selector-dialog.c:226
 msgid "_Destination"
 msgstr "_Odredište"
 
-#: ../e-util/e-source-selector-dialog.c:342
+#: ../e-util/e-source-selector-dialog.c:339
 msgid "Select destination"
 msgstr "Izaberite odredište"
 
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:384
+#: ../e-util/e-spell-entry.c:383
 msgid "(no suggestions)"
 msgstr "(nema predloga)"
 
-#: ../e-util/e-spell-entry.c:408
+#: ../e-util/e-spell-entry.c:407
 msgid "More..."
 msgstr "Dalje..."
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:479
+#: ../e-util/e-spell-entry.c:478
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "Dodaj „%s“ u rečnik"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:530
+#: ../e-util/e-spell-entry.c:529
 msgid "Ignore All"
 msgstr "Zanemari sve"
 
-#: ../e-util/e-spell-entry.c:558
+#: ../e-util/e-spell-entry.c:557
 msgid "Spelling Suggestions"
 msgstr "Predlozi pravopisa"
 
@@ -11500,60 +11942,60 @@ msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
 msgstr "Pozadinac spiska zadataka koji uslužuje „{0}“ je naišao na grešku."
 
 #: ../e-util/e-table-click-to-add.c:680
-#: ../e-util/gal-a11y-e-table-click-to-add.c:62
-#: ../e-util/gal-a11y-e-table-click-to-add.c:143
+#: ../e-util/gal-a11y-e-table-click-to-add.c:61
+#: ../e-util/gal-a11y-e-table-click-to-add.c:142
 msgid "click to add"
 msgstr "kliknite da dodate"
 
-#: ../e-util/e-table-column-selector.c:266
+#: ../e-util/e-table-column-selector.c:265
 msgid "Move selected column names to top"
 msgstr "Premestite izabrane nazive stupca na vrh"
 
-#: ../e-util/e-table-column-selector.c:271
+#: ../e-util/e-table-column-selector.c:270
 msgid "Move selected column names up one row"
 msgstr "Premestite izabrane nazive stupca jedan red na gore"
 
-#: ../e-util/e-table-column-selector.c:276
+#: ../e-util/e-table-column-selector.c:275
 msgid "Move selected column names down one row"
 msgstr "Premestite izabrane nazive stupca jedan red na dole"
 
-#: ../e-util/e-table-column-selector.c:281
+#: ../e-util/e-table-column-selector.c:280
 msgid "Move selected column names to bottom"
 msgstr "Premestite izabrane nazive stupca na dno"
 
-#: ../e-util/e-table-column-selector.c:286
+#: ../e-util/e-table-column-selector.c:285
 msgid "Select all column names"
 msgstr "Izaberite sve nazive stupca"
 
-#: ../e-util/e-table-config.c:389 ../e-util/e-table-config.c:435
+#: ../e-util/e-table-config.c:388 ../e-util/e-table-config.c:434
 msgid "(Ascending)"
 msgstr "(Rastuće)"
 
-#: ../e-util/e-table-config.c:389 ../e-util/e-table-config.c:435
+#: ../e-util/e-table-config.c:388 ../e-util/e-table-config.c:434
 msgid "(Descending)"
 msgstr "(Opadajuće)"
 
-#: ../e-util/e-table-config.c:396
+#: ../e-util/e-table-config.c:395
 msgid "Not sorted"
 msgstr "Nije razvrstano"
 
-#: ../e-util/e-table-config.c:441
+#: ../e-util/e-table-config.c:440
 msgid "No grouping"
 msgstr "Bez grupisanja"
 
-#: ../e-util/e-table-config.c:546
+#: ../e-util/e-table-config.c:545
 msgid "Show Fields"
 msgstr "Prikaži polja"
 
-#: ../e-util/e-table-config.c:562
+#: ../e-util/e-table-config.c:559
 msgid "Choose the order of information to appear in the message list."
 msgstr "Izaberite redosled podataka za prikazivanje na spisku poruka."
 
-#: ../e-util/e-table-field-chooser-dialog.c:227
+#: ../e-util/e-table-field-chooser-dialog.c:226
 msgid "Add a Column"
 msgstr "Dodaj kolonu"
 
-#: ../e-util/e-table-field-chooser.c:167
+#: ../e-util/e-table-field-chooser.c:166
 msgid ""
 "To add a column to your table, drag it into\n"
 "the location in which you want it to appear."
@@ -11561,7 +12003,7 @@ msgstr ""
 "Za dodavanje kolone u tabelu, prevucite\n"
 "je na mesto gde želite da se pojavi."
 
-#: ../e-util/e-table-group-container.c:369
+#: ../e-util/e-table-group-container.c:368
 #, c-format
 msgid "%s: %s (%d item)"
 msgid_plural "%s: %s (%d items)"
@@ -11570,7 +12012,7 @@ 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:383
+#: ../e-util/e-table-group-container.c:382
 #, c-format
 msgid "%s (%d item)"
 msgid_plural "%s (%d items)"
@@ -11636,129 +12078,145 @@ msgstr "_Poređaj po"
 msgid "_Custom"
 msgstr "_Proizvoljno"
 
-#: ../e-util/e-text.c:2098
+#: ../e-util/e-text.c:2110
 msgid "Select All"
 msgstr "Izaberi sve"
 
-#: ../e-util/e-text.c:2111
+#: ../e-util/e-text.c:2123
 msgid "Input Methods"
 msgstr "Načini unosa"
 
 # Univerzalno vreme, ili UT
 # Valjda UV?
 #. Put the "UTC" entry at the top of the combo's list.
-#: ../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
+#: ../e-util/e-timezone-dialog.c:206 ../e-util/e-timezone-dialog.c:428
+#: ../e-util/e-timezone-dialog.c:432 ../e-util/e-timezone-dialog.c:436
+#: ../e-util/e-timezone-dialog.c:804
 msgid "UTC"
 msgstr "KUV"
 
-#: ../e-util/e-url-entry.c:109
+#: ../e-util/e-url-entry.c:108
 msgid "Click here to open the URL"
 msgstr "Kliknite ovde da otvorite adresu"
 
-#: ../e-util/e-url-entry.c:111
+#: ../e-util/e-url-entry.c:110
 msgid "Enter a URL here"
 msgstr "Ovde unesite adresu"
 
-#: ../e-util/e-web-view-gtkhtml.c:406 ../e-util/e-web-view.c:285
+#: ../e-util/e-web-view-gtkhtml.c:405 ../e-util/e-web-view.c:282
 msgid "_Copy Link Location"
 msgstr "_Umnoži mesto veze"
 
-#: ../e-util/e-web-view-gtkhtml.c:408 ../e-util/e-web-view.c:287
+#: ../e-util/e-web-view-gtkhtml.c:407 ../e-util/e-web-view.c:284
 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:295
+#: ../e-util/e-web-view-gtkhtml.c:415 ../e-util/e-web-view.c:292
 msgid "_Open Link in Browser"
 msgstr "_Otvori vezu u pregledniku"
 
-#: ../e-util/e-web-view-gtkhtml.c:418 ../e-util/e-web-view.c:297
+#: ../e-util/e-web-view-gtkhtml.c:417 ../e-util/e-web-view.c:294
 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:305
+#: ../e-util/e-web-view-gtkhtml.c:425 ../e-util/e-web-view.c:302
 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:322
+#: ../e-util/e-web-view-gtkhtml.c:442 ../e-util/e-web-view.c:319
 msgid "_Copy Image"
 msgstr "_Umnoži sliku"
 
-#: ../e-util/e-web-view-gtkhtml.c:445 ../e-util/e-web-view.c:324
+#: ../e-util/e-web-view-gtkhtml.c:444 ../e-util/e-web-view.c:321
 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:1308
-#: ../e-util/e-web-view.c:351 ../e-util/e-web-view.c:1317
+#: ../e-util/e-web-view-gtkhtml.c:464 ../e-util/e-web-view-gtkhtml.c:1307
+#: ../e-util/e-web-view.c:348 ../e-util/e-web-view.c:1319
 msgid "Select all text and images"
 msgstr "Izaberi sav tekst i slike"
 
-#: ../e-util/e-web-view-gtkhtml.c:972 ../e-util/e-web-view-gtkhtml.c:974
-#: ../e-util/e-web-view-gtkhtml.c:976 ../e-util/e-web-view.c:992
-#: ../e-util/e-web-view.c:994 ../e-util/e-web-view.c:996
+#: ../e-util/e-web-view-gtkhtml.c:971 ../e-util/e-web-view-gtkhtml.c:973
+#: ../e-util/e-web-view-gtkhtml.c:975 ../e-util/e-web-view.c:994
+#: ../e-util/e-web-view.c:996 ../e-util/e-web-view.c:998
 #, c-format
 msgid "Click to call %s"
 msgstr "Kliknite da pozovete %s"
 
-#: ../e-util/e-web-view-gtkhtml.c:978 ../e-util/e-web-view.c:998
+#: ../e-util/e-web-view-gtkhtml.c:977 ../e-util/e-web-view.c:1000
 msgid "Click to hide/unhide addresses"
 msgstr "Kliknite da sakrijete/otkrijete adrese"
 
-#: ../e-util/e-web-view-gtkhtml.c:980 ../e-util/e-web-view.c:1000
+#: ../e-util/e-web-view-gtkhtml.c:979 ../e-util/e-web-view.c:1002
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknite da otvorite %s"
 
-#: ../e-util/e-web-view.c:329
+#: ../e-util/e-web-view.c:326
 msgid "Save _Image..."
 msgstr "Sačuvaj _sliku..."
 
-#: ../e-util/e-web-view.c:331
+#: ../e-util/e-web-view.c:328
 msgid "Save the image to a file"
 msgstr "Sačuvajte sliku u datoteku"
 
-#: ../e-util/e-web-view.c:2894
+#: ../e-util/e-web-view.c:2902
 msgid "Copying image to clipboard"
 msgstr "Umnožavam sliku u ostavu"
 
-#: ../e-util/e-web-view.c:3082
+#: ../e-util/e-web-view.c:3090
 msgid "Save Image"
 msgstr "Sačuvaj sliku"
 
-#: ../e-util/e-web-view.c:3118
+#: ../e-util/e-web-view.c:3126
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "Čuvam sliku u „%s“"
 
-#: ../e-util/ea-calendar-item.c:315 ../e-util/ea-calendar-item.c:324
+#: ../e-util/e-widget-undo.c:429
+msgid "Undo 'Insert text'"
+msgstr "Poništi „Umetni tekst“"
+
+#: ../e-util/e-widget-undo.c:431
+msgid "Redo 'Insert text'"
+msgstr "Povrati „Umetni tekst“"
+
+#: ../e-util/e-widget-undo.c:445
+msgid "Undo 'Delete text'"
+msgstr "Poništi „Obriši tekst“"
+
+#: ../e-util/e-widget-undo.c:447
+msgid "Redo 'Delete text'"
+msgstr "Povrati „Obriši tekst“"
+
+#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
 msgid "%d %B %Y"
 msgstr "%d %B %Y."
 
-#: ../e-util/ea-calendar-item.c:327
+#: ../e-util/ea-calendar-item.c:326
 #, c-format
 msgid "Calendar: from %s to %s"
 msgstr "Kalendar: od %s do %s"
 
-#: ../e-util/ea-calendar-item.c:364
+#: ../e-util/ea-calendar-item.c:363
 msgid "evolution calendar item"
 msgstr "stavka kalendara evolucije"
 
-#: ../e-util/evolution-source-viewer.c:635
+#: ../e-util/evolution-source-viewer.c:636
 msgid "Evolution Source Viewer"
 msgstr "Prikazivač izvora Evolucije"
 
 #. Translators: The name that is displayed in the user interface
-#: ../e-util/evolution-source-viewer.c:665
+#: ../e-util/evolution-source-viewer.c:666
 msgid "Display Name"
 msgstr "Naziv prikaza"
 
-#: ../e-util/evolution-source-viewer.c:674
+#: ../e-util/evolution-source-viewer.c:675
 msgid "Flags"
 msgstr "Opcije"
 
-#: ../e-util/evolution-source-viewer.c:726
-#: ../mail/e-mail-config-identity-page.c:678
+#: ../e-util/evolution-source-viewer.c:727
+#: ../mail/e-mail-config-identity-page.c:677
 msgid "Identity"
 msgstr "Identitet"
 
@@ -11808,39 +12266,57 @@ msgstr "Naziv „{0}“ je već upotrebljen."
 msgid "Please choose another name."
 msgstr "Izaberite drugo ime."
 
+#: ../e-util/filter.error.xml.h:12
+#| msgid "Missing date."
+msgid "Missing condition."
+msgstr "Nedostaje uslov."
+
+#: ../e-util/filter.error.xml.h:13
+msgid "Filter should have at least one condition."
+msgstr "Propusnik treba da ima barem jedan uslov."
+
+#: ../e-util/filter.error.xml.h:14
+#| msgid "Missing date."
+msgid "Missing value."
+msgstr "Nedostaje vrednost."
+
+#: ../e-util/filter.error.xml.h:15
+msgid "One or more values cannot be empty."
+msgstr "Jedna ili više vrednosti ne mogu biti prazne."
+
 #. Translators: description of a "popup" action
-#: ../e-util/gal-a11y-e-cell-popup.c:128
+#: ../e-util/gal-a11y-e-cell-popup.c:127
 msgid "popup a child"
 msgstr "iskačuće izvedeno"
 
 #. Translators: description of a "toggle" action
-#: ../e-util/gal-a11y-e-cell-toggle.c:180
+#: ../e-util/gal-a11y-e-cell-toggle.c:179
 msgid "toggle the cell"
 msgstr "biranje ćelije"
 
 #. Translators: description of an "expand" action
-#: ../e-util/gal-a11y-e-cell-tree.c:215
+#: ../e-util/gal-a11y-e-cell-tree.c:213
 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
-#: ../e-util/gal-a11y-e-cell-tree.c:223
+#: ../e-util/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"
 
-#: ../e-util/gal-a11y-e-cell.c:123
+#: ../e-util/gal-a11y-e-cell.c:122
 msgid "Table Cell"
 msgstr "Ćelija tabele"
 
-#: ../e-util/gal-a11y-e-table-click-to-add.c:72
+#: ../e-util/gal-a11y-e-table-click-to-add.c:71
 msgid "click"
 msgstr "klik"
 
-#: ../e-util/gal-a11y-e-table-column-header.c:163
+#: ../e-util/gal-a11y-e-table-column-header.c:162
 msgid "sort"
 msgstr "razvrstavanje"
 
-#: ../e-util/gal-view-instance-save-as-dialog.c:296
+#: ../e-util/gal-view-instance-save-as-dialog.c:295
 msgid "Save Current View"
 msgstr "Sačuvaj trenutni pregled"
 
@@ -11880,31 +12356,31 @@ msgstr "Ne mogu da učitam potpis."
 msgid "Could not save signature."
 msgstr "Ne mogu da sačuvam potpis."
 
-#: ../libemail-engine/camel-sasl-xoauth2.c:27
+#: ../libemail-engine/camel-sasl-xoauth2.c:26
 msgid "OAuth2"
 msgstr "OAut2"
 
-#: ../libemail-engine/camel-sasl-xoauth2.c:28
+#: ../libemail-engine/camel-sasl-xoauth2.c:27
 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
+#: ../libemail-engine/e-mail-authenticator.c:181
 #, c-format
 msgid "Invalid authentication result code (%d)"
 msgstr "Neispravan kod rezultata potvrđivanja identiteta (%d)"
 
-#: ../libemail-engine/e-mail-folder-utils.c:114
+#: ../libemail-engine/e-mail-folder-utils.c:113
 #, c-format
 msgid "Saving message to folder '%s'"
 msgstr "Čuvam poruku u fasciklu „%s“"
 
-#: ../libemail-engine/e-mail-folder-utils.c:572
+#: ../libemail-engine/e-mail-folder-utils.c:571
 msgid "Forwarded messages"
 msgstr "Prosleđene poruke"
 
-#: ../libemail-engine/e-mail-folder-utils.c:682
-#: ../libemail-engine/e-mail-folder-utils.c:933
+#: ../libemail-engine/e-mail-folder-utils.c:681
+#: ../libemail-engine/e-mail-folder-utils.c:932
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -11913,29 +12389,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:776
+#: ../libemail-engine/e-mail-folder-utils.c:775
 msgid "Scanning messages for duplicates"
 msgstr "Tražim duplikate u porukama"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1184
+#: ../libemail-engine/e-mail-folder-utils.c:1145
 #, c-format
 msgid "Removing folder '%s'"
 msgstr "Uklanjam fasciklu „%s“"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1321
+#: ../libemail-engine/e-mail-folder-utils.c:1325
 #, c-format
 msgid "File \"%s\" has been removed."
 msgstr "Datoteka „%s“ je uklonjena."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1325
+#: ../libemail-engine/e-mail-folder-utils.c:1329
 msgid "File has been removed."
 msgstr "Datoteka je uklonjena."
 
-#: ../libemail-engine/e-mail-folder-utils.c:1384
+#: ../libemail-engine/e-mail-folder-utils.c:1388
 msgid "Removing attachments"
 msgstr "Uklanjam priloge"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1548
+#: ../libemail-engine/e-mail-folder-utils.c:1552
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messages"
@@ -11944,23 +12420,23 @@ msgstr[1] "Čuvam %d poruke"
 msgstr[2] "Čuvam %d poruka"
 msgstr[3] "Čuvam jednu poruku"
 
-#: ../libemail-engine/e-mail-folder-utils.c:1926
+#: ../libemail-engine/e-mail-folder-utils.c:1930
 #, c-format
 msgid "Invalid folder URI '%s'"
 msgstr "Neispravna putanja fascikle „%s“"
 
-#: ../libemail-engine/e-mail-session-utils.c:540
+#: ../libemail-engine/e-mail-session-utils.c:539
 msgid "No mail transport service available"
 msgstr "Nema dostupne usluge prenosa pošte"
 
-#: ../libemail-engine/e-mail-session-utils.c:640
-#: ../libemail-engine/mail-ops.c:730
+#: ../libemail-engine/e-mail-session-utils.c:639
+#: ../libemail-engine/mail-ops.c:707
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Neuspela primena odlaznih propusnika: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:689
-#: ../libemail-engine/mail-ops.c:774
+#: ../libemail-engine/e-mail-session-utils.c:688
+#: ../libemail-engine/mail-ops.c:750
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -11969,103 +12445,98 @@ 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:715
-#: ../libemail-engine/mail-ops.c:798
+#: ../libemail-engine/e-mail-session-utils.c:714
+#: ../libemail-engine/mail-ops.c:774
 #, c-format
 msgid "Failed to append to local 'Sent' folder: %s"
 msgstr "Nisam uspeo da prikačim u lokalnu fasciklu „Poslato“: %s"
 
-#: ../libemail-engine/e-mail-session-utils.c:916
-#: ../libemail-engine/mail-ops.c:929 ../libemail-engine/mail-ops.c:1031
+#: ../libemail-engine/e-mail-session-utils.c:915
+#: ../libemail-engine/mail-ops.c:906 ../libemail-engine/mail-ops.c:1008
 msgid "Sending message"
 msgstr "Slanje poruke"
 
-#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:342
-#: ../mail/em-folder-tree-model.c:789
-#: ../modules/mail/e-mail-shell-view-private.c:1076
-#: ../modules/mail/e-mail-shell-view-private.c:1087
+#: ../libemail-engine/e-mail-session.c:120 ../mail/em-folder-properties.c:410
+#: ../mail/em-folder-tree-model.c:1160
+#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1071
 msgid "Inbox"
 msgstr "Sanduče"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:782
-#: ../modules/mail/e-mail-shell-view-private.c:1074
+#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:1153
+#: ../modules/mail/e-mail-shell-view-private.c:1058
 msgid "Drafts"
 msgstr "Nacrti"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:793
-#: ../modules/mail/e-mail-shell-view-private.c:1078
+#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:1164
+#: ../modules/mail/e-mail-shell-view-private.c:1062
 msgid "Outbox"
 msgstr "Za slanje"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:797
-#: ../modules/mail/e-mail-shell-view-private.c:1080
+#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:1168
+#: ../modules/mail/e-mail-shell-view-private.c:1064
 msgid "Sent"
 msgstr "Poslato"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:785
-#: ../modules/mail/e-mail-shell-view-private.c:1082
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:1156
+#: ../modules/mail/e-mail-shell-view-private.c:1066
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1082 ../plugins/templates/templates.c:1381
-#: ../plugins/templates/templates.c:1391
+#: ../plugins/templates/templates.c:1080 ../plugins/templates/templates.c:1379
+#: ../plugins/templates/templates.c:1389
 msgid "Templates"
 msgstr "Šabloni"
 
-#: ../libemail-engine/e-mail-session.c:1347
+#: ../libemail-engine/e-mail-session.c:1245
 #, c-format
 msgid "User cancelled operation"
 msgstr "Korisnik je otkazao radnju"
 
-#: ../libemail-engine/e-mail-session.c:1542
+#: ../libemail-engine/e-mail-session.c:1373
 #, c-format
 msgid "%s authentication failed"
 msgstr "Nije uspelo %s potvrđivanje identiteta"
 
-#: ../libemail-engine/e-mail-session.c:1592
+#: ../libemail-engine/e-mail-session.c:1423
 #, c-format
 msgid "No data source found for UID '%s'"
 msgstr "Nije pronađen izvor podataka za JIB „%s“"
 
-#: ../libemail-engine/e-mail-session.c:1655
+#: ../libemail-engine/e-mail-session.c:1486
 #, 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:1668
+#: ../libemail-engine/e-mail-session.c:1499
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr "Nije pronađen identitet za korišćenje, prosleđivanje poruke je otkazano."
 
-#: ../libemail-engine/e-mail-store-utils.c:190
+#: ../libemail-engine/e-mail-store-utils.c:189
 #, c-format
 msgid "Disconnecting from '%s'"
 msgstr "Prekidanje veze sa „%s“"
 
-#: ../libemail-engine/e-mail-store-utils.c:279
+#: ../libemail-engine/e-mail-store-utils.c:265
 #, c-format
 msgid "Reconnecting to '%s'"
 msgstr "Ponovno povezivanje na „%s“"
 
-#: ../libemail-engine/e-mail-store-utils.c:370
+#: ../libemail-engine/e-mail-store-utils.c:350
 #, c-format
 msgid "Preparing account '%s' for offline"
 msgstr "Pripremam nalog „%s“ za rad van mreže"
 
-#: ../libemail-engine/mail-folder-cache.c:1241
-#, c-format
-msgid "Pinging %s"
-msgstr "Ispitujem dostupnost za %s"
-
-#: ../libemail-engine/mail-ops.c:94
+#: ../libemail-engine/mail-ops.c:90
 msgid "Filtering Selected Messages"
 msgstr "Filtriranje izabranih poruka"
 
-#: ../libemail-engine/mail-ops.c:152
+#: ../libemail-engine/mail-ops.c:148
 #, c-format
 msgid ""
 "Failed to filter selected messages. One reason can be that folder location "
@@ -12078,12 +12549,12 @@ msgstr ""
 "proverite vaše propusnike u izborniku „Uređivanje—>Propusnici poruka“.\n"
 "Izvorna greška beše: %s"
 
-#: ../libemail-engine/mail-ops.c:233
+#: ../libemail-engine/mail-ops.c:229
 #, c-format
 msgid "Fetching mail from '%s'"
 msgstr "Dovlačim poštu sa „%s“"
 
-#: ../libemail-engine/mail-ops.c:724
+#: ../libemail-engine/mail-ops.c:701
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -12096,13 +12567,13 @@ msgstr ""
 "proverite vaše propusnike u izborniku „Uređivanje—>Propusnici poruka“.\n"
 "Izvorna greška beše: %s"
 
-#: ../libemail-engine/mail-ops.c:940
+#: ../libemail-engine/mail-ops.c:917
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Šaljem poruku %d od %d"
 
 # bug: plural-forms
-#: ../libemail-engine/mail-ops.c:992
+#: ../libemail-engine/mail-ops.c:969
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
@@ -12111,69 +12582,69 @@ 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:998
+#: ../libemail-engine/mail-ops.c:975
 msgid "Canceled."
 msgstr "Otkazano."
 
-#: ../libemail-engine/mail-ops.c:1000
+#: ../libemail-engine/mail-ops.c:977
 msgid "Complete."
 msgstr "Završeno."
 
-#: ../libemail-engine/mail-ops.c:1112
+#: ../libemail-engine/mail-ops.c:1089
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Premeštam poruke u „%s“"
 
-#: ../libemail-engine/mail-ops.c:1113
+#: ../libemail-engine/mail-ops.c:1090
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Umnožavam poruke u „%s“"
 
-#: ../libemail-engine/mail-ops.c:1232
+#: ../libemail-engine/mail-ops.c:1209
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Smeštam fasciklu „%s“"
 
-#: ../libemail-engine/mail-ops.c:1360
+#: ../libemail-engine/mail-ops.c:1337
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Praznim i smeštam nalog „%s“"
 
-#: ../libemail-engine/mail-ops.c:1361
+#: ../libemail-engine/mail-ops.c:1338
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Smeštam nalog „%s“"
 
-#: ../libemail-engine/mail-ops.c:1435
+#: ../libemail-engine/mail-ops.c:1413
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Izbacujem smeće u „%s“"
 
-#: ../libemail-engine/mail-tools.c:71
+#: ../libemail-engine/mail-tools.c:70
 #, c-format
 msgid "Could not create spool directory '%s': %s"
 msgstr "Ne mogu da napravim direktorijum za pripremu „%s“: %s"
 
-#: ../libemail-engine/mail-tools.c:111
+#: ../libemail-engine/mail-tools.c:110
 #, c-format
 msgid "Trying to movemail a non-mbox source '%s'"
 msgstr "Pokušavam da premestim poštu iz ne-mboks izvora „%s“"
 
-#: ../libemail-engine/mail-tools.c:237
+#: ../libemail-engine/mail-tools.c:236
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Prosleđena poruka — %s"
 
-#: ../libemail-engine/mail-tools.c:239
+#: ../libemail-engine/mail-tools.c:238
 msgid "Forwarded message"
 msgstr "Prosleđena poruka"
 
-#: ../libemail-engine/mail-vfolder.c:153
+#: ../libemail-engine/mail-vfolder.c:151
 #, c-format
 msgid "Setting up Search Folder: %s"
 msgstr "Podešavanje fascikle pretrage: %s"
 
-#: ../libemail-engine/mail-vfolder.c:306
+#: ../libemail-engine/mail-vfolder.c:304
 #, c-format
 msgid "Updating Search Folders for '%s' - %s"
 msgstr "Ažuriranje fascikla pretrage za „%s — %s“"
@@ -12183,7 +12654,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:670
+#: ../libemail-engine/mail-vfolder.c:668
 #, c-format
 msgid ""
 "The Search Folder \"%s\" has been modified to account for the deleted "
@@ -12207,17 +12678,17 @@ msgstr[3] ""
 "„%s“."
 
 # bug: requires a comment on usage
-#: ../mail/e-mail-account-manager.c:116 ../mail/e-mail-account-manager.c:203
+#: ../mail/e-mail-account-manager.c:117 ../mail/e-mail-account-manager.c:204
 msgid "Open _Online Accounts"
 msgstr "Otvori naloge na _mreži"
 
-#: ../mail/e-mail-account-manager.c:142 ../mail/e-mail-account-manager.c:229
+#: ../mail/e-mail-account-manager.c:143 ../mail/e-mail-account-manager.c:230
 msgid "This account was created through the Online Accounts service."
 msgstr "Ovaj nalog je napravljen putem usluge naloga na mreži."
 
 #: ../mail/e-mail-account-manager.c:690
-msgid "_Restore Default"
-msgstr "Povrati _podrazumevano"
+msgid "_Reset Order"
+msgstr "_Ponovo postavi redosled"
 
 #: ../mail/e-mail-account-manager.c:703
 msgid "You can drag and drop account names to reorder them."
@@ -12228,59 +12699,70 @@ msgid "De_fault"
 msgstr "Pod_razumevano"
 
 # has "activatable" set.
-#: ../mail/e-mail-account-tree-view.c:85
-#: ../modules/mail/em-composer-prefs.c:443
-#: ../modules/plugin-manager/evolution-plugin-manager.c:359
-#: ../plugins/publish-calendar/publish-calendar.c:890
+#: ../mail/e-mail-account-tree-view.c:84
+#: ../modules/mail/em-composer-prefs.c:1191
+#: ../modules/plugin-manager/evolution-plugin-manager.c:358
+#: ../plugins/publish-calendar/publish-calendar.c:896
 msgid "Enabled"
 msgstr "Uključen"
 
-#: ../mail/e-mail-account-tree-view.c:109
+#: ../mail/e-mail-account-tree-view.c:108
 msgid "Account Name"
 msgstr "Naziv naloga"
 
-#: ../mail/e-mail-account-tree-view.c:136
+#: ../mail/e-mail-account-tree-view.c:135
 #: ../mail/e-mail-config-security-page.c:335
-#: ../mail/e-mail-config-security-page.c:475 ../mail/e-mail-reader.c:3532
-#: ../mail/mail-config.ui.h:49
+#: ../mail/e-mail-config-security-page.c:475 ../mail/e-mail-reader.c:3602
+#: ../mail/mail-config.ui.h:66
 msgid "Default"
 msgstr "Osnovno"
 
-#: ../mail/e-mail-autoconfig.c:578
+#: ../mail/e-mail-autoconfig.c:611
 msgid "No email address provided"
 msgstr "Nije dostavljena adresa el. pošte"
 
-#: ../mail/e-mail-autoconfig.c:587
+#: ../mail/e-mail-autoconfig.c:620
 msgid "Missing domain in email address"
 msgstr "Nedostaje domen u adresi el. pošte"
 
-#: ../mail/e-mail-backend.c:737
+#: ../mail/e-mail-backend.c:841
 msgid "Unknown background operation"
 msgstr "Nepoznata pozadinska radnja"
 
-#: ../mail/e-mail-browser.c:129 ../shell/e-shell-window-actions.c:860
-#: ../shell/e-shell-window-actions.c:867 ../shell/e-shell-window-actions.c:874
+#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:904
+#: ../shell/e-shell-window-actions.c:911 ../shell/e-shell-window-actions.c:918
 msgid "Close this window"
 msgstr "Zatvorite ovaj prozor"
 
-#: ../mail/e-mail-browser.c:286
+#: ../mail/e-mail-browser.c:285
 msgid "(No Subject)"
 msgstr "(Bez subjekta)"
 
+#. GtkAssistant's back button label.
+#: ../mail/e-mail-config-assistant.c:46
+#| msgid "Go Back"
+msgid "Go _Back"
+msgstr "Idi _nazad"
+
 #. GtkAssistant sinks the floating button reference.
-#: ../mail/e-mail-config-assistant.c:102
+#: ../mail/e-mail-config-assistant.c:114
 msgid "_Skip Lookup"
 msgstr "_Preskoči pretragu"
 
-#: ../mail/e-mail-config-assistant.c:562
+#: ../mail/e-mail-config-assistant.c:654
 msgid "Evolution Account Assistant"
 msgstr "Pomoćnik naloga Evolucije"
 
-#: ../mail/e-mail-config-auth-check.c:352
+#: ../mail/e-mail-config-assistant.c:936
+#| msgid "_Restore Defaults"
+msgid "_Revise Details"
+msgstr "_Obnovi pojedinosti"
+
+#: ../mail/e-mail-config-auth-check.c:350
 msgid "Check for Supported Types"
 msgstr "Proverite za podržanim vrstama"
 
-#: ../mail/e-mail-config-confirm-page.c:157
+#: ../mail/e-mail-config-confirm-page.c:156
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12294,91 +12776,91 @@ msgstr ""
 "\n"
 "Kliknite „Primeni“ da sačuvate postavke."
 
-#: ../mail/e-mail-config-confirm-page.c:169
+#: ../mail/e-mail-config-confirm-page.c:168
 msgid "Done"
 msgstr "Urađeno"
 
-#: ../mail/e-mail-config-defaults-page.c:552
+#: ../mail/e-mail-config-defaults-page.c:549
 msgid "Special Folders"
 msgstr "Posebne fascikle"
 
-#: ../mail/e-mail-config-defaults-page.c:561
+#: ../mail/e-mail-config-defaults-page.c:558
 msgid "Draft Messages _Folder:"
 msgstr "Fascikla poruka _nacrta:"
 
-#: ../mail/e-mail-config-defaults-page.c:571
+#: ../mail/e-mail-config-defaults-page.c:568
 msgid "Choose a folder for saving draft messages."
 msgstr "Izaberite fasciklu za čuvanje poruka nacrta."
 
-#: ../mail/e-mail-config-defaults-page.c:585
+#: ../mail/e-mail-config-defaults-page.c:582
 msgid "Sent _Messages Folder:"
 msgstr "Fascikla poslatih _poruka:"
 
-#: ../mail/e-mail-config-defaults-page.c:595
+#: ../mail/e-mail-config-defaults-page.c:592
 msgid "Choose a folder for saving sent messages."
 msgstr "Izaberite fasciklu za čuvanje poslatih poruka."
 
-#: ../mail/e-mail-config-defaults-page.c:614
+#: ../mail/e-mail-config-defaults-page.c:611
 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
+#: ../mail/e-mail-config-defaults-page.c:628
 msgid "_Restore Defaults"
 msgstr "_Povrati osnovno"
 
-#: ../mail/e-mail-config-defaults-page.c:645
+#: ../mail/e-mail-config-defaults-page.c:642
 msgid "Use a Real Folder for _Trash:"
 msgstr "Koristi stvarnu fasciklu za _smeće:"
 
-#: ../mail/e-mail-config-defaults-page.c:646
+#: ../mail/e-mail-config-defaults-page.c:643
 msgid "Choose a folder for deleted messages."
 msgstr "Izaberite fasciklu za obrisane poruke."
 
-#: ../mail/e-mail-config-defaults-page.c:655
+#: ../mail/e-mail-config-defaults-page.c:652
 msgid "Use a Real Folder for _Junk:"
 msgstr "Koristi stvarnu fasciklu za _đubre:"
 
-#: ../mail/e-mail-config-defaults-page.c:656
+#: ../mail/e-mail-config-defaults-page.c:653
 msgid "Choose a folder for junk messages."
 msgstr "Izaberite fasciklu za nepoželjne poruke."
 
-#: ../mail/e-mail-config-defaults-page.c:673
+#: ../mail/e-mail-config-defaults-page.c:670
 msgid "Composing Messages"
 msgstr "Sastavljanje poruka"
 
-#: ../mail/e-mail-config-defaults-page.c:682
+#: ../mail/e-mail-config-defaults-page.c:679
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Uvek pošalji _grafitnu kopiju (cc):"
 
-#: ../mail/e-mail-config-defaults-page.c:707
+#: ../mail/e-mail-config-defaults-page.c:704
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Uvek pošalji _nevidljivu grafitnu kopiju (Bcc):"
 
-#: ../mail/e-mail-config-defaults-page.c:742
+#: ../mail/e-mail-config-defaults-page.c:739
 msgid "Message Receipts"
 msgstr "Priznanice poruke"
 
-#: ../mail/e-mail-config-defaults-page.c:751
+#: ../mail/e-mail-config-defaults-page.c:748
 msgid "S_end message receipts:"
 msgstr "_Pošalji povratnice:"
 
-#: ../mail/e-mail-config-defaults-page.c:776
+#: ../mail/e-mail-config-defaults-page.c:773
 msgid "Never"
 msgstr "Nikada"
 
-#: ../mail/e-mail-config-defaults-page.c:782
+#: ../mail/e-mail-config-defaults-page.c:779
 msgid "Always"
 msgstr "Uvek"
 
-#: ../mail/e-mail-config-defaults-page.c:788
+#: ../mail/e-mail-config-defaults-page.c:785
 msgid "Ask for each message"
 msgstr "Pitaj za svaku poruku"
 
-#: ../mail/e-mail-config-defaults-page.c:859
+#: ../mail/e-mail-config-defaults-page.c:856
 msgid "Defaults"
 msgstr "Osnovno"
 
-#: ../mail/e-mail-config-identity-page.c:266
+#: ../mail/e-mail-config-identity-page.c:265
 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 "
@@ -12387,13 +12869,13 @@ msgstr ""
 "Unesite ime i elektronsku adresu. „Neobavezna“ polja ne moraju biti popunjena, "
 "osim ako ne želite da ove podatke uključite u poruke koje šaljete."
 
-#: ../mail/e-mail-config-identity-page.c:294
-#: ../mail/e-mail-config-summary-page.c:324
+#: ../mail/e-mail-config-identity-page.c:293
+#: ../mail/e-mail-config-summary-page.c:323
 msgid "Account Information"
 msgstr "Podaci o nalogu"
 
-#: ../mail/e-mail-config-identity-page.c:303
-#: ../mail/e-mail-config-summary-page.c:333
+#: ../mail/e-mail-config-identity-page.c:302
+#: ../mail/e-mail-config-summary-page.c:332
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example, \"Work\" or \"Personal\"."
@@ -12401,62 +12883,61 @@ 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:348
+#: ../mail/e-mail-config-identity-page.c:347
 msgid "Required Information"
 msgstr "Obavezni podaci"
 
-#: ../mail/e-mail-config-identity-page.c:357
+#: ../mail/e-mail-config-identity-page.c:356
 msgid "Full Nam_e:"
 msgstr "_Ime i prezime:"
 
-#: ../mail/e-mail-config-identity-page.c:384
+#: ../mail/e-mail-config-identity-page.c:383
 msgid "Email _Address:"
 msgstr "Adresa _el. pošte:"
 
-#: ../mail/e-mail-config-identity-page.c:431
+#: ../mail/e-mail-config-identity-page.c:430
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Dodatni podaci"
 
-#: ../mail/e-mail-config-identity-page.c:440
+#: ../mail/e-mail-config-identity-page.c:439
 msgid "Re_ply-To:"
 msgstr "Od_govor:"
 
-#: ../mail/e-mail-config-identity-page.c:467
+#: ../mail/e-mail-config-identity-page.c:466
 msgid "Or_ganization:"
 msgstr "Or_ganizacija:"
 
-#: ../mail/e-mail-config-identity-page.c:522
+#: ../mail/e-mail-config-identity-page.c:521
 msgid "Add Ne_w Signature..."
 msgstr "Dodaj no_vi potpis..."
 
-#: ../mail/e-mail-config-lookup-page.c:68
+#: ../mail/e-mail-config-lookup-page.c:67
 msgid "Looking up account details..."
 msgstr "Tražim pojedinosti naloga..."
 
-#: ../mail/e-mail-config-provider-page.c:485
+#: ../mail/e-mail-config-provider-page.c:484
 msgid "Checking for New Mail"
 msgstr "Vršim proveru za novom poštom"
 
-#: ../mail/e-mail-config-provider-page.c:501
+#: ../mail/e-mail-config-provider-page.c:500
 msgid "Check for _new messages every"
 msgstr "Proveri za _novu poštu svakih"
 
-#: ../mail/e-mail-config-provider-page.c:700
+#: ../mail/e-mail-config-provider-page.c:699
 msgid "Receiving Options"
 msgstr "Opcije za primanje"
 
-#: ../mail/e-mail-config-receiving-page.c:50
+#: ../mail/e-mail-config-receiving-page.c:49
 msgid "Receiving Email"
 msgstr "Primanje pošte"
 
 #: ../mail/e-mail-config-security-page.c:260
-#: ../mail/em-folder-properties.c:266 ../mail/mail-config.ui.h:24
-#: ../modules/addressbook/autocompletion-config.c:114
+#: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:26
+#: ../modules/addressbook/autocompletion-config.c:113
 #: ../modules/calendar/e-calendar-preferences.ui.h:47
-#: ../modules/itip-formatter/plugin/config-ui.c:91
+#: ../modules/itip-formatter/plugin/config-ui.c:90
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
-#: ../smime/gui/certificate-viewer.c:653
 msgid "General"
 msgstr "Opšte"
 
@@ -12477,22 +12958,22 @@ msgid "Si_gning algorithm:"
 msgstr "Algoritam _potpisivanja:"
 
 #: ../mail/e-mail-config-security-page.c:338
-#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:50
+#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:67
 msgid "SHA1"
 msgstr "SHA1"
 
 #: ../mail/e-mail-config-security-page.c:341
-#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:51
+#: ../mail/e-mail-config-security-page.c:481 ../mail/mail-config.ui.h:68
 msgid "SHA256"
 msgstr "SHA256"
 
 #: ../mail/e-mail-config-security-page.c:344
-#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:52
+#: ../mail/e-mail-config-security-page.c:484 ../mail/mail-config.ui.h:69
 msgid "SHA384"
 msgstr "SHA384"
 
 #: ../mail/e-mail-config-security-page.c:347
-#: ../mail/e-mail-config-security-page.c:487 ../mail/mail-config.ui.h:53
+#: ../mail/e-mail-config-security-page.c:487 ../mail/mail-config.ui.h:70
 msgid "SHA512"
 msgstr "SHA512"
 
@@ -12521,6 +13002,13 @@ msgstr "Uverenje _potpisivanja:"
 msgid "Select"
 msgstr "Izaberi"
 
+#: ../mail/e-mail-config-security-page.c:453
+#: ../mail/e-mail-config-security-page.c:559 ../mail/mail-dialogs.ui.h:5
+#: ../shell/e-shell-window-actions.c:1007
+#| msgid "_Clear Flag"
+msgid "_Clear"
+msgstr "_Očisti"
+
 #: ../mail/e-mail-config-security-page.c:462
 msgid "Signing _algorithm:"
 msgstr "Algoritam p_otpisa:"
@@ -12541,71 +13029,71 @@ msgstr "Uvek šifruj odlazeće poruke sa ovog naloga"
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "Uvek meni samom šifruj pri slanju šifrovane pošte"
 
-#: ../mail/e-mail-config-sending-page.c:50
+#: ../mail/e-mail-config-sending-page.c:49
 msgid "Sending Email"
 msgstr "Slanje pošte"
 
-#: ../mail/e-mail-config-service-page.c:640
+#: ../mail/e-mail-config-service-page.c:639
 msgid "Server _Type:"
 msgstr "_Vrsta servera:"
 
-#: ../mail/e-mail-config-summary-page.c:142
+#: ../mail/e-mail-config-summary-page.c:141
 msgid "SSL"
 msgstr "SSL"
 
-#: ../mail/e-mail-config-summary-page.c:145
+#: ../mail/e-mail-config-summary-page.c:144
 msgid "TLS"
 msgstr "TLS"
 
-#: ../mail/e-mail-config-summary-page.c:307
+#: ../mail/e-mail-config-summary-page.c:306
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr ""
 "Ovo je sažetak podešavanja koja će biti korišćena za pristup vašoj pošti."
 
-#: ../mail/e-mail-config-summary-page.c:372
+#: ../mail/e-mail-config-summary-page.c:371
 msgid "Personal Details"
 msgstr "Lični podaci"
 
-#: ../mail/e-mail-config-summary-page.c:381
+#: ../mail/e-mail-config-summary-page.c:380
 msgid "Full Name:"
 msgstr "Ime i prezime:"
 
-#: ../mail/e-mail-config-summary-page.c:395
+#: ../mail/e-mail-config-summary-page.c:394
 msgid "Email Address:"
 msgstr "Adresa el. pošte:"
 
-#: ../mail/e-mail-config-summary-page.c:409
+#: ../mail/e-mail-config-summary-page.c:408
 msgid "Receiving"
 msgstr "Primanje"
 
-#: ../mail/e-mail-config-summary-page.c:421
+#: ../mail/e-mail-config-summary-page.c:420
 msgid "Sending"
 msgstr "Slanje"
 
-#: ../mail/e-mail-config-summary-page.c:433
+#: ../mail/e-mail-config-summary-page.c:432
 msgid "Server Type:"
 msgstr "Vrsta servera:"
 
-#: ../mail/e-mail-config-summary-page.c:454
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
+#: ../mail/e-mail-config-summary-page.c:453
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
 msgid "Server:"
 msgstr "Server:"
 
-#: ../mail/e-mail-config-summary-page.c:475
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:697
+#: ../mail/e-mail-config-summary-page.c:474
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:696
 msgid "Username:"
 msgstr "Korisničko ime:"
 
-#: ../mail/e-mail-config-summary-page.c:496
+#: ../mail/e-mail-config-summary-page.c:495
 msgid "Security:"
 msgstr "Bezbednost:"
 
-#: ../mail/e-mail-config-summary-page.c:787
+#: ../mail/e-mail-config-summary-page.c:786
 msgid "Account Summary"
 msgstr "Sažetak naloga"
 
-#: ../mail/e-mail-config-welcome-page.c:157
+#: ../mail/e-mail-config-welcome-page.c:156
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
@@ -12615,55 +13103,55 @@ msgstr ""
 "\n"
 "Kliknite „Nastavi“ da započnete."
 
-#: ../mail/e-mail-config-welcome-page.c:167
-#: ../modules/startup-wizard/e-startup-assistant.c:152
+#: ../mail/e-mail-config-welcome-page.c:166
+#: ../modules/startup-wizard/e-startup-assistant.c:151
 msgid "Welcome"
 msgstr "Dobrodošli"
 
-#: ../mail/e-mail-config-window.c:327
+#: ../mail/e-mail-config-window.c:326
 msgid "Account Editor"
 msgstr "Uređivač naloga"
 
-#: ../mail/e-mail-display.c:96
+#: ../mail/e-mail-display.c:95
 msgid "_Add to Address Book..."
 msgstr "_Dodaj u adresar..."
 
-#: ../mail/e-mail-display.c:103
+#: ../mail/e-mail-display.c:102
 msgid "_To This Address"
 msgstr "_Na ovu adresu"
 
-#: ../mail/e-mail-display.c:110
+#: ../mail/e-mail-display.c:109
 msgid "_From This Address"
 msgstr "_Sa ove adrese"
 
-#: ../mail/e-mail-display.c:117
+#: ../mail/e-mail-display.c:116
 msgid "Send _Reply To..."
 msgstr "_Pošalji odgovor..."
 
-#: ../mail/e-mail-display.c:119
+#: ../mail/e-mail-display.c:118
 msgid "Send a reply message to this address"
 msgstr "Pošaljite poruku odgovora na ovu adresu"
 
-#: ../mail/e-mail-display.c:126
+#: ../mail/e-mail-display.c:125
 msgid "Create Search _Folder"
 msgstr "Napravi fasciklu _pretrage"
 
 #. Label + combo box has a 12px left margin so it's
 #. * aligned with the junk mail options above it.
-#: ../mail/e-mail-junk-options.c:252
+#: ../mail/e-mail-junk-options.c:297
 msgid "Junk filtering software:"
 msgstr "Softver za filtriranje nepoželjne:"
 
-#: ../mail/e-mail-label-dialog.c:225
+#: ../mail/e-mail-label-dialog.c:224
 msgid "_Label name:"
 msgstr "Naziv _oznake:"
 
-#: ../mail/e-mail-label-list-store.c:57
+#: ../mail/e-mail-label-list-store.c:56
 msgid "I_mportant"
 msgstr "_Važno"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:58
+#: ../mail/e-mail-label-list-store.c:57
 msgid "_Work"
 msgstr "Po_sao"
 
@@ -12671,30 +13159,30 @@ msgstr "Po_sao"
 # Create the default Person task list
 # orange
 #. orange
-#: ../mail/e-mail-label-list-store.c:59
+#: ../mail/e-mail-label-list-store.c:58
 msgid "_Personal"
 msgstr "L_ično"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:60
+#: ../mail/e-mail-label-list-store.c:59
 msgid "_To Do"
 msgstr "Za uradi_ti"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:61
+#: ../mail/e-mail-label-list-store.c:60
 msgid "_Later"
 msgstr "Kasni_je"
 
-#: ../mail/e-mail-label-manager.c:170
-#: ../modules/mail/e-mail-shell-view-actions.c:1030
+#: ../mail/e-mail-label-manager.c:171
+#: ../modules/mail/e-mail-shell-view-actions.c:1028
 msgid "Add Label"
 msgstr "Dodajte natpis"
 
-#: ../mail/e-mail-label-manager.c:221
+#: ../mail/e-mail-label-manager.c:222
 msgid "Edit Label"
 msgstr "Uredite natpis"
 
-#: ../mail/e-mail-label-manager.c:353
+#: ../mail/e-mail-label-manager.c:354
 msgid ""
 "Note: Underscore in the label name is used\n"
 "as mnemonic identifier in menu."
@@ -12702,631 +13190,632 @@ msgstr ""
 "Napomena: podvučen znak u oznaci se koristi\n"
 "kao skraćenica u izborniku."
 
-#: ../mail/e-mail-label-tree-view.c:89
+#: ../mail/e-mail-label-tree-view.c:88
 msgid "Color"
 msgstr "Boja"
 
-#: ../mail/e-mail-print-config-headers.c:167
+#: ../mail/e-mail-print-config-headers.c:166
 msgid "Move selected headers to top"
 msgstr "Premestite izabrana zaglavlja na vrh"
 
-#: ../mail/e-mail-print-config-headers.c:172
+#: ../mail/e-mail-print-config-headers.c:171
 msgid "Move selected headers up one row"
 msgstr "Premestite izabrana zaglavlja jedan red na gore"
 
-#: ../mail/e-mail-print-config-headers.c:177
+#: ../mail/e-mail-print-config-headers.c:176
 msgid "Move selected headers down one row"
 msgstr "Premestite izabrana zaglavlja jedan red na dole"
 
-#: ../mail/e-mail-print-config-headers.c:182
+#: ../mail/e-mail-print-config-headers.c:181
 msgid "Move selected headers to bottom"
 msgstr "Premestite izabrana zaglavlja na dno"
 
-#: ../mail/e-mail-print-config-headers.c:187
+#: ../mail/e-mail-print-config-headers.c:186
 msgid "Select all headers"
 msgstr "Izaberite sva zaglavlja"
 
-#: ../mail/e-mail-print-config-headers.c:206
+#: ../mail/e-mail-print-config-headers.c:205
 msgid "Header Name"
 msgstr "Naziv zaglavlja"
 
-#: ../mail/e-mail-print-config-headers.c:215
+#: ../mail/e-mail-print-config-headers.c:214
 msgid "Header Value"
 msgstr "Vrednost zaglavlja"
 
-#: ../mail/e-mail-printer.c:125 ../mail/mail-config.ui.h:101
+#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:106
 msgid "Headers"
 msgstr "Zaglavlja"
 
-#: ../mail/e-mail-printer.c:167
+#: ../mail/e-mail-printer.c:166
 #, c-format
 msgid "Page %d of %d"
 msgstr "Stranica %d od %d"
 
-#: ../mail/e-mail-reader.c:346 ../mail/em-filter-i18n.h:12
+#: ../mail/e-mail-reader.c:348 ../mail/em-filter-i18n.h:11
 msgid "Copy to Folder"
 msgstr "Umnoži u fasciklu"
 
-#: ../mail/e-mail-reader.c:346 ../mail/em-folder-utils.c:518
+#: ../mail/e-mail-reader.c:348 ../mail/em-folder-utils.c:505
 msgid "C_opy"
 msgstr "_Umnoži"
 
-#: ../mail/e-mail-reader.c:846 ../mail/em-filter-i18n.h:54
+#: ../mail/e-mail-reader.c:848 ../mail/em-filter-i18n.h:33
 msgid "Move to Folder"
 msgstr "Premesti u fasciklu"
 
-#: ../mail/e-mail-reader.c:846 ../mail/em-folder-utils.c:518
+#: ../mail/e-mail-reader.c:848 ../mail/em-folder-utils.c:505
 msgid "_Move"
 msgstr "Pre_mesti"
 
-#: ../mail/e-mail-reader.c:1172 ../mail/e-mail-reader.c:1384
-#: ../mail/e-mail-reader.c:1424
+#: ../mail/e-mail-reader.c:1174 ../mail/e-mail-reader.c:1386
+#: ../mail/e-mail-reader.c:1426
 msgid "_Do not ask me again."
 msgstr "_Ne pitaj me ponovo."
 
-#: ../mail/e-mail-reader.c:1430
+#: ../mail/e-mail-reader.c:1432
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Uvek zanemari „Odgovor-za:“ za dopisne liste."
 
-#: ../mail/e-mail-reader.c:1632
+#: ../mail/e-mail-reader.c:1634
 msgid "Failed to retrieve message:"
 msgstr "Nisam uspeo da dovučem poruku:"
 
-#: ../mail/e-mail-reader.c:1672 ../mail/e-mail-reader.c:2774
+#: ../mail/e-mail-reader.c:1674 ../mail/e-mail-reader.c:2843
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Dovlačim poruku „%s“"
 
-#: ../mail/e-mail-reader.c:1860
+#: ../mail/e-mail-reader.c:1862
 msgid "A_dd Sender to Address Book"
 msgstr "Do_daj pošiljaoca u adresar"
 
-#: ../mail/e-mail-reader.c:1862
+#: ../mail/e-mail-reader.c:1864
 msgid "Add sender to address book"
 msgstr "Dodaj pošiljaoca u adresar"
 
-#: ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:1869
 msgid "Check for _Junk"
 msgstr "Proveri da li ima _đubreta"
 
-#: ../mail/e-mail-reader.c:1869
+#: ../mail/e-mail-reader.c:1871
 msgid "Filter the selected messages for junk status"
 msgstr "Filtrira da li među izabranim porukama ima đubreta"
 
-#: ../mail/e-mail-reader.c:1874
+#: ../mail/e-mail-reader.c:1876
 msgid "_Copy to Folder..."
 msgstr "_Umnoži u fasciklu..."
 
-#: ../mail/e-mail-reader.c:1876
+#: ../mail/e-mail-reader.c:1878
 msgid "Copy selected messages to another folder"
 msgstr "Umnožava izabrane poruke u drugu fasciklu"
 
-#: ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:1883
 msgid "_Delete Message"
 msgstr "_Obriši poruku"
 
-#: ../mail/e-mail-reader.c:1883
+#: ../mail/e-mail-reader.c:1885
 msgid "Mark the selected messages for deletion"
 msgstr "Označite izabranu(e) poruku(e) za brisanje"
 
-#: ../mail/e-mail-reader.c:1888
+#: ../mail/e-mail-reader.c:1890
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Napravi pravilo propusnika za dopisnu _listu..."
 
-#: ../mail/e-mail-reader.c:1890
+#: ../mail/e-mail-reader.c:1892
 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:1895
+#: ../mail/e-mail-reader.c:1897
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Napravi pravilo propusnika za _primaoce..."
 
-#: ../mail/e-mail-reader.c:1897
+#: ../mail/e-mail-reader.c:1899
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Napravite pravilo za propuštanje poruka ovim primaocima"
 
-#: ../mail/e-mail-reader.c:1902
+#: ../mail/e-mail-reader.c:1904
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Napravi pravilo propusnika za _pošiljaoca..."
 
-#: ../mail/e-mail-reader.c:1904
+#: ../mail/e-mail-reader.c:1906
 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:1909
+#: ../mail/e-mail-reader.c:1911
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Napravi pravilo propusnika za _naslov..."
 
-#: ../mail/e-mail-reader.c:1911
+#: ../mail/e-mail-reader.c:1913
 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:1916
+#: ../mail/e-mail-reader.c:1918
 msgid "A_pply Filters"
 msgstr "Pri_meni propusnike"
 
-#: ../mail/e-mail-reader.c:1918
+#: ../mail/e-mail-reader.c:1920
 msgid "Apply filter rules to the selected messages"
 msgstr "Primenite pravila propuštanja na izabrane poruke"
 
-#: ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:1925
 msgid "_Find in Message..."
 msgstr "P_ronađi u poruci..."
 
-#: ../mail/e-mail-reader.c:1925
+#: ../mail/e-mail-reader.c:1927
 msgid "Search for text in the body of the displayed message"
 msgstr "Potražite tekst u telu prikazane poruke"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:1932
 msgid "_Clear Flag"
 msgstr "Sklo_ni oznaku"
 
-#: ../mail/e-mail-reader.c:1932
+#: ../mail/e-mail-reader.c:1934
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Uklonite oznaku za praćenje sa izabranih poruka"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:1939
 msgid "_Flag Completed"
 msgstr "Označ_i kao završeno"
 
-#: ../mail/e-mail-reader.c:1939
+#: ../mail/e-mail-reader.c:1941
 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:1944
+#: ../mail/e-mail-reader.c:1946
 msgid "Follow _Up..."
 msgstr "Sle_di..."
 
-#: ../mail/e-mail-reader.c:1946
+#: ../mail/e-mail-reader.c:1948
 msgid "Flag the selected messages for follow-up"
 msgstr "Označite izabrane poruke za praćenje"
 
-#: ../mail/e-mail-reader.c:1951
+#: ../mail/e-mail-reader.c:1953
 msgid "_Attached"
 msgstr "Pri_loženo"
 
-#: ../mail/e-mail-reader.c:1953 ../mail/e-mail-reader.c:1960
+#: ../mail/e-mail-reader.c:1955 ../mail/e-mail-reader.c:1962
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Prosledite izabranu poruku nekome kao prilog"
 
-#: ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:1960
 msgid "Forward As _Attached"
 msgstr "Prosledi kao _prilog"
 
-#: ../mail/e-mail-reader.c:1965
+#: ../mail/e-mail-reader.c:1967
 msgid "_Inline"
 msgstr "Unut_ar"
 
-#: ../mail/e-mail-reader.c:1967 ../mail/e-mail-reader.c:1974
+#: ../mail/e-mail-reader.c:1969 ../mail/e-mail-reader.c:1976
 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:1972
+#: ../mail/e-mail-reader.c:1974
 msgid "Forward As _Inline"
 msgstr "Prosledi kao _unutar poruke"
 
-#: ../mail/e-mail-reader.c:1979
+#: ../mail/e-mail-reader.c:1981
 msgid "_Quoted"
 msgstr "_Citirano"
 
-#: ../mail/e-mail-reader.c:1981 ../mail/e-mail-reader.c:1988
+#: ../mail/e-mail-reader.c:1983 ../mail/e-mail-reader.c:1990
 msgid "Forward the selected message quoted like a reply"
 msgstr "Prosledite izabranu poruku citiranu kao odgovor"
 
-#: ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:1988
 msgid "Forward As _Quoted"
 msgstr "Prosledi kao _citat"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:1995
 msgid "_Load Images"
 msgstr "_Učitaj slike"
 
-#: ../mail/e-mail-reader.c:1995
+#: ../mail/e-mail-reader.c:1997
 msgid "Force images in HTML mail to be loaded"
 msgstr "Prisilite učitavanje slika u HTML porukama"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2002
 msgid "_Important"
 msgstr "_Važno"
 
-#: ../mail/e-mail-reader.c:2002
+#: ../mail/e-mail-reader.c:2004
 msgid "Mark the selected messages as important"
 msgstr "Označite izabranu(e) poruku(e) kao važno"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2009
 msgid "_Junk"
 msgstr "_Đubre"
 
-#: ../mail/e-mail-reader.c:2009
+#: ../mail/e-mail-reader.c:2011
 msgid "Mark the selected messages as junk"
 msgstr "Označite izabranu(e) poruku(e) kao neželjenu poštu"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2016
 msgid "_Not Junk"
 msgstr "Ni_je đubre"
 
-#: ../mail/e-mail-reader.c:2016
+#: ../mail/e-mail-reader.c:2018
 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:2021
+#: ../mail/e-mail-reader.c:2023
 msgid "_Read"
 msgstr "Pro_čitaj"
 
-#: ../mail/e-mail-reader.c:2023
+#: ../mail/e-mail-reader.c:2025
 msgid "Mark the selected messages as having been read"
 msgstr "Označite izabranu(e) poruku(e) kao pročitano"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2030
 msgid "Uni_mportant"
 msgstr "Ne_važno"
 
-#: ../mail/e-mail-reader.c:2030
+#: ../mail/e-mail-reader.c:2032
 msgid "Mark the selected messages as unimportant"
 msgstr "Označite izabranu(e) poruku(e) kao nevažno"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2037
 msgid "_Unread"
 msgstr "_Nepročitano"
 
-#: ../mail/e-mail-reader.c:2037
+#: ../mail/e-mail-reader.c:2039
 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:2042
+#: ../mail/e-mail-reader.c:2044
 msgid "_Edit as New Message..."
 msgstr "_Uredi kao novu poruku..."
 
-#: ../mail/e-mail-reader.c:2044
+#: ../mail/e-mail-reader.c:2046
 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:2049
+#: ../mail/e-mail-reader.c:2051
 msgid "Compose _New Message"
 msgstr "Sastavi _novu poruku"
 
-#: ../mail/e-mail-reader.c:2051
+#: ../mail/e-mail-reader.c:2053
 msgid "Open a window for composing a mail message"
 msgstr "Otvorite prozor za sastavljanje poruke"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2058
 msgid "_Open in New Window"
 msgstr "_Otvori u novom prozoru"
 
-#: ../mail/e-mail-reader.c:2058
+#: ../mail/e-mail-reader.c:2060
 msgid "Open the selected messages in a new window"
 msgstr "Otvorite izabrane poruke u novom prozoru"
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2065
 msgid "_Move to Folder..."
 msgstr "_Premesti u fasciklu..."
 
-#: ../mail/e-mail-reader.c:2065
+#: ../mail/e-mail-reader.c:2067
 msgid "Move selected messages to another folder"
 msgstr "Premestite izabranu(e) poruku(e) u drugu fasciklu"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2072
 msgid "_Next Message"
 msgstr "_Sledeća poruka"
 
-#: ../mail/e-mail-reader.c:2072
+#: ../mail/e-mail-reader.c:2074
 msgid "Display the next message"
 msgstr "Prikažite sledeću poruku"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2079
 msgid "Next _Important Message"
 msgstr "Sledeća _važna poruka"
 
-#: ../mail/e-mail-reader.c:2079
+#: ../mail/e-mail-reader.c:2081
 msgid "Display the next important message"
 msgstr "Prikažite sledeću važnu poruku"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2086
 msgid "Next _Thread"
 msgstr "_Sledeća rasprava"
 
-#: ../mail/e-mail-reader.c:2086
+#: ../mail/e-mail-reader.c:2088
 msgid "Display the next thread"
 msgstr "Prikažite sledeću raspravu"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2093
 msgid "Next _Unread Message"
 msgstr "Sledeća _nepročitana poruka"
 
-#: ../mail/e-mail-reader.c:2093
+#: ../mail/e-mail-reader.c:2095
 msgid "Display the next unread message"
 msgstr "Prikažite sledeću nepročitanu poruku"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2100
 msgid "_Previous Message"
 msgstr "_Prethodna poruka"
 
-#: ../mail/e-mail-reader.c:2100
+#: ../mail/e-mail-reader.c:2102
 msgid "Display the previous message"
 msgstr "Prikažite prethodnu poruku"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2107
 msgid "Pr_evious Important Message"
 msgstr "Pr_ethodna važna poruka"
 
-#: ../mail/e-mail-reader.c:2107
+#: ../mail/e-mail-reader.c:2109
 msgid "Display the previous important message"
 msgstr "Prikažite prethodnu važnu poruku"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2114
 msgid "Previous T_hread"
 msgstr "_Prethodna tema"
 
-#: ../mail/e-mail-reader.c:2114
+#: ../mail/e-mail-reader.c:2116
 msgid "Display the previous thread"
 msgstr "Prikažite prethodnu temu"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2121
 msgid "P_revious Unread Message"
 msgstr "P_rethodna nepročitana poruka"
 
-#: ../mail/e-mail-reader.c:2121
+#: ../mail/e-mail-reader.c:2123
 msgid "Display the previous unread message"
 msgstr "Prikažite prethodnu nepročitanu poruku"
 
-#: ../mail/e-mail-reader.c:2128
+#: ../mail/e-mail-reader.c:2130
 msgid "Print this message"
 msgstr "Štampajte ovu poruku"
 
-#: ../mail/e-mail-reader.c:2135
+#: ../mail/e-mail-reader.c:2137
 msgid "Preview the message to be printed"
 msgstr "Pregledajte poruku pred štampu"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2142
 msgid "Re_direct"
 msgstr "Preu_smeri"
 
-#: ../mail/e-mail-reader.c:2142
+#: ../mail/e-mail-reader.c:2144
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Preusmerite (bez čitanja) izabranu poruku nekome"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2149
 msgid "Remo_ve Attachments"
 msgstr "_Ukloni priloge"
 
-#: ../mail/e-mail-reader.c:2149
+#: ../mail/e-mail-reader.c:2151
 msgid "Remove attachments"
 msgstr "Uklonite priloge"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2156
 msgid "Remove Du_plicate Messages"
 msgstr "Ukloni _duplirane poruke"
 
-#: ../mail/e-mail-reader.c:2156
+#: ../mail/e-mail-reader.c:2158
 msgid "Checks selected messages for duplicates"
 msgstr "Proverite izabrane poruke za duplikate"
 
-#: ../mail/e-mail-reader.c:2161 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1547
-#: ../modules/mail/e-mail-attachment-handler.c:214
+#: ../mail/e-mail-reader.c:2163 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1546
+#: ../modules/mail/e-mail-attachment-handler.c:213
 msgid "Reply to _All"
 msgstr "Odgovori _svima"
 
-#: ../mail/e-mail-reader.c:2163
+#: ../mail/e-mail-reader.c:2165
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Sastavite odgovor svim primaocima izabrane poruke"
 
-#: ../mail/e-mail-reader.c:2168 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2170 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Odgovori na _listu"
 
-#: ../mail/e-mail-reader.c:2170
+#: ../mail/e-mail-reader.c:2172
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Sastavite odgovor dopisnoj listi izabrane poruke"
 
-#: ../mail/e-mail-reader.c:2175
-#: ../modules/mail/e-mail-attachment-handler.c:221
+#: ../mail/e-mail-reader.c:2177
+#: ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljaocu"
 
-#: ../mail/e-mail-reader.c:2177
+#: ../mail/e-mail-reader.c:2179
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Sastavite odgovor pošiljaocu izabrane poruke"
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2184
 msgid "_Save as mbox..."
 msgstr "_Sačuvaj kao mboks..."
 
-#: ../mail/e-mail-reader.c:2184
+#: ../mail/e-mail-reader.c:2186
 msgid "Save selected messages as an mbox file"
 msgstr "Sačuvajte izabrane poruke kao „mbox“ datoteku"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2191
 msgid "_Message Source"
 msgstr "Izvo_rni kod poruke"
 
-#: ../mail/e-mail-reader.c:2191
+#: ../mail/e-mail-reader.c:2193
 msgid "Show the raw email source of the message"
 msgstr "Prikažite izvorni kod elektronske poruke"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2205
 msgid "_Undelete Message"
 msgstr "P_ovrati poruku"
 
-#: ../mail/e-mail-reader.c:2205
+#: ../mail/e-mail-reader.c:2207
 msgid "Undelete the selected messages"
 msgstr "Povratite izabrane poruke"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2212
 msgid "_Normal Size"
 msgstr "_Uobičajena veličina"
 
-#: ../mail/e-mail-reader.c:2212
+#: ../mail/e-mail-reader.c:2214
 msgid "Reset the text to its original size"
 msgstr "Vratite tekst na originalnu veličinu"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2219
 msgid "_Zoom In"
 msgstr "U_većaj"
 
-#: ../mail/e-mail-reader.c:2219
+#: ../mail/e-mail-reader.c:2221
 msgid "Increase the text size"
 msgstr "Uvećajte veličinu teksta"
 
-#: ../mail/e-mail-reader.c:2224
-msgid "Zoom _Out"
-msgstr "U_manji"
-
-#: ../mail/e-mail-reader.c:2226
+#: ../mail/e-mail-reader.c:2228
 msgid "Decrease the text size"
 msgstr "Umanjite veličinu teksta"
 
-#: ../mail/e-mail-reader.c:2233
+#: ../mail/e-mail-reader.c:2235
 msgid "Cre_ate"
 msgstr "_Napravi"
 
-#: ../mail/e-mail-reader.c:2240
+#: ../mail/e-mail-reader.c:2242
 msgid "Ch_aracter Encoding"
 msgstr "Kodna st_rana"
 
-#: ../mail/e-mail-reader.c:2247
+#: ../mail/e-mail-reader.c:2249
 msgid "F_orward As"
 msgstr "_Prosledi kao"
 
-#: ../mail/e-mail-reader.c:2254
+#: ../mail/e-mail-reader.c:2256
 msgid "_Group Reply"
 msgstr "O_dgovori grupi"
 
-#: ../mail/e-mail-reader.c:2261
+#: ../mail/e-mail-reader.c:2263
 msgid "_Go To"
 msgstr "_Idi na"
 
-#: ../mail/e-mail-reader.c:2268
+#: ../mail/e-mail-reader.c:2270
 msgid "Mar_k As"
 msgstr "O_znači kao"
 
-#: ../mail/e-mail-reader.c:2275
+#: ../mail/e-mail-reader.c:2277
 msgid "_Message"
 msgstr "_Poruka"
 
-#: ../mail/e-mail-reader.c:2282
+#: ../mail/e-mail-reader.c:2284
 msgid "_Zoom"
 msgstr "Uv_ećaj"
 
-#: ../mail/e-mail-reader.c:2292
+#: ../mail/e-mail-reader.c:2294
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Napravi fasciklu pretrage sa dopisne _liste..."
 
-#: ../mail/e-mail-reader.c:2294
+#: ../mail/e-mail-reader.c:2296
 msgid "Create a search folder for this mailing list"
 msgstr "Napravite fasciklu pretrage za ovu dopisnu listu"
 
-#: ../mail/e-mail-reader.c:2299
+#: ../mail/e-mail-reader.c:2301
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Napravi fasciklu pretrage od pri_malaca..."
 
-#: ../mail/e-mail-reader.c:2301
+#: ../mail/e-mail-reader.c:2303
 msgid "Create a search folder for these recipients"
 msgstr "Napravite fasciklu pretrage za ove primaoce"
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2308
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Napravi fasciklu pretrage od po_šiljaoca..."
 
-#: ../mail/e-mail-reader.c:2308
+#: ../mail/e-mail-reader.c:2310
 msgid "Create a search folder for this sender"
 msgstr "Napravite fasciklu pretrage za ovog pošiljaoca"
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2315
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Napravi fasciklu pretrage iz _naslova..."
 
-#: ../mail/e-mail-reader.c:2315
+#: ../mail/e-mail-reader.c:2317
 msgid "Create a search folder for this subject"
 msgstr "Napravite fasciklu pretrage za ovaj naslov"
 
-#: ../mail/e-mail-reader.c:2338
+#: ../mail/e-mail-reader.c:2340
 msgid "Mark for Follo_w Up..."
 msgstr "Obeleži za _praćenje..."
 
-#: ../mail/e-mail-reader.c:2346
+#: ../mail/e-mail-reader.c:2348
 msgid "Mark as _Important"
 msgstr "Onači kao _važno"
 
-#: ../mail/e-mail-reader.c:2350
+#: ../mail/e-mail-reader.c:2352
 msgid "Mark as _Junk"
 msgstr "Označi kao _đubre"
 
-#: ../mail/e-mail-reader.c:2354
+#: ../mail/e-mail-reader.c:2356
 msgid "Mark as _Not Junk"
 msgstr "Označi da _nije đubre"
 
-#: ../mail/e-mail-reader.c:2358
+#: ../mail/e-mail-reader.c:2360
 msgid "Mar_k as Read"
 msgstr "O_znači kao pročitano"
 
-#: ../mail/e-mail-reader.c:2362
+#: ../mail/e-mail-reader.c:2364
 msgid "Mark as Uni_mportant"
 msgstr "Označi kao _nevažno"
 
-#: ../mail/e-mail-reader.c:2366
+#: ../mail/e-mail-reader.c:2368
 msgid "Mark as _Unread"
 msgstr "Označi kao _nepročitano"
 
-#: ../mail/e-mail-reader.c:2410
+#: ../mail/e-mail-reader.c:2412
 msgid "_Caret Mode"
 msgstr "Metod u_metanja"
 
-#: ../mail/e-mail-reader.c:2412
+#: ../mail/e-mail-reader.c:2414
 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:2418
+#: ../mail/e-mail-reader.c:2420
 msgid "All Message _Headers"
 msgstr "Sva _zaglavlja poruke"
 
-#: ../mail/e-mail-reader.c:2420
+#: ../mail/e-mail-reader.c:2422
 msgid "Show messages with all email headers"
 msgstr "Prikažite poruku sa svim zaglavljima el. pošte"
 
-#: ../mail/e-mail-reader.c:2780
+#: ../mail/e-mail-reader.c:2849
 msgid "Retrieving message"
 msgstr "Dovlačim poruku"
 
-#: ../mail/e-mail-reader.c:3702
-#: ../modules/mail/e-mail-attachment-handler.c:207
+#: ../mail/e-mail-reader.c:3772
+#: ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "Prosl_edi"
 
-#: ../mail/e-mail-reader.c:3703
+#: ../mail/e-mail-reader.c:3773
 msgid "Forward the selected message to someone"
 msgstr "Prosleđuje izabranu poruku nekome"
 
-#: ../mail/e-mail-reader.c:3722
+#: ../mail/e-mail-reader.c:3792
 msgid "Group Reply"
 msgstr "Odgovor grupi"
 
-#: ../mail/e-mail-reader.c:3723
+#: ../mail/e-mail-reader.c:3793
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Odgovorite dopisnoj listi ili svim primaocima"
 
-#: ../mail/e-mail-reader.c:3789 ../mail/em-filter-i18n.h:15
+#: ../mail/e-mail-reader.c:3859 ../mail/em-filter-i18n.h:14
 msgid "Delete"
 msgstr "Obriši"
 
-#: ../mail/e-mail-reader.c:3801
-#: ../modules/calendar/e-cal-shell-view-actions.c:1372
+#: ../mail/e-mail-reader.c:3871
+#: ../modules/calendar/e-cal-shell-view-actions.c:1371
 msgid "Next"
 msgstr "Sledeće"
 
-#: ../mail/e-mail-reader.c:3805
-#: ../modules/calendar/e-cal-shell-view-actions.c:1365
+#: ../mail/e-mail-reader.c:3875
+#: ../modules/calendar/e-cal-shell-view-actions.c:1364
 msgid "Previous"
 msgstr "Prethodno"
 
-#: ../mail/e-mail-reader.c:3814 ../mail/mail-dialogs.ui.h:15
+#: ../mail/e-mail-reader.c:3884 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Odgovori"
 
-#: ../mail/e-mail-reader-utils.c:151
+#: ../mail/e-mail-reader-utils.c:147
 msgid "Do not warn me again"
 msgstr "Ne upozoravaj me ponovo"
 
+#: ../mail/e-mail-reader-utils.c:557 ../plugins/face/face.c:170
+#: ../smime/gui/certificate-manager.c:329
+msgid "Unknown error"
+msgstr "Nepoznata greška"
+
 #: ../mail/e-mail-reader-utils.c:976
 msgid "Printing"
 msgstr "Štampam"
@@ -13379,11 +13868,11 @@ msgstr[3] "Poruka"
 msgid "Parsing message"
 msgstr "Obrađujem poruku"
 
-#: ../mail/e-mail-request.c:197
+#: ../mail/e-mail-request.c:199
 msgid "The message has no text content."
 msgstr "Poruka ne sadrži tekst."
 
-#: ../mail/e-mail-tag-editor.c:238
+#: ../mail/e-mail-tag-editor.c:237
 msgid "Flag to Follow Up"
 msgstr "Označi za praćenje"
 
@@ -13393,7 +13882,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:1372
+#: ../mail/em-composer-utils.c:1454
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -13401,27 +13890,27 @@ msgstr ""
 "U ${AbbrevWeekdayName}, ${Day}. ${Month} ${Year}. u ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} piše:"
 
-#: ../mail/em-composer-utils.c:1378
+#: ../mail/em-composer-utils.c:1460
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Prosleđena poruka --------"
 
-#: ../mail/em-composer-utils.c:1383
+#: ../mail/em-composer-utils.c:1465
 msgid "-----Original Message-----"
 msgstr "-----Originalna poruka-----"
 
-#: ../mail/em-composer-utils.c:2528
+#: ../mail/em-composer-utils.c:2615
 msgid "an unknown sender"
 msgstr "nepoznati pošiljalac"
 
-#: ../mail/em-composer-utils.c:2949
+#: ../mail/em-composer-utils.c:3040
 msgid "Posting destination"
 msgstr "Odredišna pošta"
 
-#: ../mail/em-composer-utils.c:2950
+#: ../mail/em-composer-utils.c:3041
 msgid "Choose folders to post the message to."
 msgstr "Izaberite fascikle za slanje poruke."
 
-#: ../mail/em-filter-editor-folder-element.c:157
+#: ../mail/em-filter-editor-folder-element.c:153
 msgid "Select Folder"
 msgstr "Izaberi fasciklu"
 
@@ -13458,243 +13947,243 @@ msgstr "CC"
 msgid "Completed On"
 msgstr "Završeno za"
 
-#: ../mail/em-filter-i18n.h:13
+#: ../mail/em-filter-i18n.h:12
 msgid "Date received"
 msgstr "Datum primanja"
 
-#: ../mail/em-filter-i18n.h:14
+#: ../mail/em-filter-i18n.h:13
 msgid "Date sent"
 msgstr "Datum slanja"
 
-#: ../mail/em-filter-i18n.h:16
+#: ../mail/em-filter-i18n.h:15
 msgid "Deleted"
 msgstr "Obrisano"
 
-#: ../mail/em-filter-i18n.h:18
-msgid "does not end with"
-msgstr "ne završava se sa"
-
-#: ../mail/em-filter-i18n.h:19
-msgid "does not exist"
-msgstr "ne postoji"
-
-#: ../mail/em-filter-i18n.h:20
-msgid "does not have words"
-msgstr "ne sadrži reči"
-
-#: ../mail/em-filter-i18n.h:21
-msgid "does not return"
-msgstr "ne vraća"
-
-#: ../mail/em-filter-i18n.h:22
-msgid "does not sound like"
-msgstr "ne zvuči kao"
-
-#: ../mail/em-filter-i18n.h:23
-msgid "does not start with"
-msgstr "ne počinje sa"
-
-#: ../mail/em-filter-i18n.h:25
+#: ../mail/em-filter-i18n.h:17
 msgid "Draft"
 msgstr "Nacrt"
 
-#: ../mail/em-filter-i18n.h:26
-msgid "ends with"
-msgstr "završava se sa"
-
-#: ../mail/em-filter-i18n.h:28
-msgid "exists"
-msgstr "postoji"
-
-#: ../mail/em-filter-i18n.h:29
+#: ../mail/em-filter-i18n.h:19
 msgid "Expression"
 msgstr "Izraz"
 
-#: ../mail/em-filter-i18n.h:30
+#: ../mail/em-filter-i18n.h:20
 msgid "Follow Up"
 msgstr "Sledi"
 
-#: ../mail/em-filter-i18n.h:31
+#: ../mail/em-filter-i18n.h:21
 msgid "Forward to"
 msgstr "Prosledi"
 
-#: ../mail/em-filter-i18n.h:32
-msgid "has words"
-msgstr "sadrži reči"
-
-#: ../mail/em-filter-i18n.h:33
+#: ../mail/em-filter-i18n.h:22
 msgid "Important"
 msgstr "Važno"
 
-#: ../mail/em-filter-i18n.h:35
-msgid "is after"
-msgstr "je posle"
-
-#: ../mail/em-filter-i18n.h:36
-msgid "is before"
-msgstr "je pre"
-
-#: ../mail/em-filter-i18n.h:37
-msgid "is Flagged"
-msgstr "je označeno"
-
-#: ../mail/em-filter-i18n.h:41
-msgid "is not Flagged"
-msgstr "nije označeno"
-
-#: ../mail/em-filter-i18n.h:42
-msgid "is not set"
-msgstr "nije podešeno"
-
-#: ../mail/em-filter-i18n.h:43
-msgid "is set"
-msgstr "podešeno"
+#: ../mail/em-filter-i18n.h:23
+msgid "Junk Test"
+msgstr "Provera đubreta"
 
-#: ../mail/em-filter-i18n.h:44 ../mail/mail-config.ui.h:108
+#: ../mail/em-filter-i18n.h:24 ../mail/mail-config.ui.h:113
 msgid "Junk"
 msgstr "Đubre"
 
-#: ../mail/em-filter-i18n.h:45
-msgid "Junk Test"
-msgstr "Provera đubreta"
-
-#: ../mail/em-filter-i18n.h:46
+#: ../mail/em-filter-i18n.h:25
 msgid "Label"
 msgstr "Natpis"
 
-#: ../mail/em-filter-i18n.h:47
+#: ../mail/em-filter-i18n.h:26
 msgid "Mailing list"
 msgstr "Dopisna lista"
 
-#: ../mail/em-filter-i18n.h:48
+#: ../mail/em-filter-i18n.h:27
 msgid "Match All"
 msgstr "Odgovara sve"
 
-#: ../mail/em-filter-i18n.h:49
+#: ../mail/em-filter-i18n.h:28
 msgid "Message Body"
 msgstr "Telo poruke"
 
-#: ../mail/em-filter-i18n.h:50
+#: ../mail/em-filter-i18n.h:29
 msgid "Message Header"
 msgstr "Zaglavlje poruke"
 
-#: ../mail/em-filter-i18n.h:51
+#: ../mail/em-filter-i18n.h:30
+msgid "Message Location"
+msgstr "Lokacija poruke"
+
+#: ../mail/em-filter-i18n.h:31
 msgid "Message is Junk"
 msgstr "Poruka je đubre"
 
-#: ../mail/em-filter-i18n.h:52
+#: ../mail/em-filter-i18n.h:32
 msgid "Message is not Junk"
 msgstr "Poruka nije đubre"
 
-#: ../mail/em-filter-i18n.h:53
-msgid "Message Location"
-msgstr "Lokacija poruke"
-
-#: ../mail/em-filter-i18n.h:55
+#: ../mail/em-filter-i18n.h:34
 msgid "Pipe to Program"
 msgstr "Poveži na program"
 
-#: ../mail/em-filter-i18n.h:56
+#: ../mail/em-filter-i18n.h:35
 msgid "Play Sound"
 msgstr "Pusti zvuk"
 
 #. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:57 ../mail/mail-dialogs.ui.h:14
+#: ../mail/em-filter-i18n.h:36 ../mail/mail-dialogs.ui.h:15
 msgid "Read"
 msgstr "Čitaj"
 
-#: ../mail/em-filter-i18n.h:58 ../mail/message-list.etspec.h:16
+#: ../mail/em-filter-i18n.h:37 ../mail/message-list.etspec.h:16
 msgid "Recipients"
 msgstr "Primaoci"
 
-#: ../mail/em-filter-i18n.h:59
+#: ../mail/em-filter-i18n.h:38
 msgid "Regex Match"
 msgstr "Regizr odgovara"
 
-#: ../mail/em-filter-i18n.h:60
+#: ../mail/em-filter-i18n.h:39
 msgid "Replied to"
 msgstr "Odgovoreno"
 
-#: ../mail/em-filter-i18n.h:61
-msgid "returns"
-msgstr "povratno"
-
-#: ../mail/em-filter-i18n.h:62
-msgid "returns greater than"
-msgstr "povratno veće od"
-
-#: ../mail/em-filter-i18n.h:63
-msgid "returns less than"
-msgstr "povratno manje od"
-
-#: ../mail/em-filter-i18n.h:64
+#: ../mail/em-filter-i18n.h:40
 msgid "Run Program"
 msgstr "Pokreni program"
 
-#: ../mail/em-filter-i18n.h:65 ../mail/message-list.etspec.h:3
+#: ../mail/em-filter-i18n.h:41 ../mail/message-list.etspec.h:3
 msgid "Score"
 msgstr "Rezultat"
 
-#: ../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:67
+#: ../mail/em-filter-i18n.h:42
 msgid "Sender or Recipients"
 msgstr "Pošiljalac ili primaoci"
 
-#: ../mail/em-filter-i18n.h:68
+#: ../mail/em-filter-i18n.h:43 ../mail/message-list.etspec.h:15
+msgid "Sender"
+msgstr "Pošiljalac"
+
+#: ../mail/em-filter-i18n.h:44
 msgid "Set Label"
 msgstr "Postavi oznaku"
 
-#: ../mail/em-filter-i18n.h:69
+#: ../mail/em-filter-i18n.h:45
 msgid "Set Status"
 msgstr "Postavi status"
 
-#: ../mail/em-filter-i18n.h:70
+#: ../mail/em-filter-i18n.h:46
 msgid "Size (kB)"
 msgstr "Veličina (kB)"
 
-#: ../mail/em-filter-i18n.h:71
-msgid "sounds like"
-msgstr "zvuči kao"
-
-#: ../mail/em-filter-i18n.h:72
+#: ../mail/em-filter-i18n.h:47
 msgid "Source Account"
 msgstr "Izvorni nalog"
 
-#: ../mail/em-filter-i18n.h:73
+#: ../mail/em-filter-i18n.h:48
 msgid "Specific header"
 msgstr "Određeno zaglavlje"
 
-#: ../mail/em-filter-i18n.h:74
-msgid "starts with"
-msgstr "počinje sa"
-
-#: ../mail/em-filter-i18n.h:76
+#: ../mail/em-filter-i18n.h:50
 msgid "Stop Processing"
 msgstr "Prekini obradu"
 
-#: ../mail/em-filter-i18n.h:79
+#: ../mail/em-filter-i18n.h:53
 msgid "Unset Color"
 msgstr "Nepostavljena boja"
 
-#: ../mail/em-filter-i18n.h:80
+#: ../mail/em-filter-i18n.h:54
 msgid "Unset Status"
 msgstr "Nepostavljen status"
 
+#: ../mail/em-filter-i18n.h:57
+msgid "does not end with"
+msgstr "ne završava se sa"
+
+#: ../mail/em-filter-i18n.h:58
+msgid "does not exist"
+msgstr "ne postoji"
+
+#: ../mail/em-filter-i18n.h:59
+msgid "does not have words"
+msgstr "ne sadrži reči"
+
+#: ../mail/em-filter-i18n.h:60
+msgid "does not return"
+msgstr "ne vraća"
+
+#: ../mail/em-filter-i18n.h:61
+msgid "does not sound like"
+msgstr "ne zvuči kao"
+
+#: ../mail/em-filter-i18n.h:62
+msgid "does not start with"
+msgstr "ne počinje sa"
+
+#: ../mail/em-filter-i18n.h:63
+msgid "ends with"
+msgstr "završava se sa"
+
+#: ../mail/em-filter-i18n.h:64
+msgid "exists"
+msgstr "postoji"
+
+#: ../mail/em-filter-i18n.h:65
+msgid "has words"
+msgstr "sadrži reči"
+
+#: ../mail/em-filter-i18n.h:66
+msgid "is Flagged"
+msgstr "je označeno"
+
+#: ../mail/em-filter-i18n.h:67
+msgid "is after"
+msgstr "je posle"
+
+#: ../mail/em-filter-i18n.h:68
+msgid "is before"
+msgstr "je pre"
+
+#: ../mail/em-filter-i18n.h:71
+msgid "is not Flagged"
+msgstr "nije označeno"
+
+#: ../mail/em-filter-i18n.h:72
+msgid "is not set"
+msgstr "nije podešeno"
+
+#: ../mail/em-filter-i18n.h:74
+msgid "is set"
+msgstr "podešeno"
+
+#: ../mail/em-filter-i18n.h:76
+msgid "returns greater than"
+msgstr "povratno veće od"
+
+#: ../mail/em-filter-i18n.h:77
+msgid "returns less than"
+msgstr "povratno manje od"
+
+#: ../mail/em-filter-i18n.h:78
+msgid "returns"
+msgstr "povratno"
+
+#: ../mail/em-filter-i18n.h:79
+msgid "sounds like"
+msgstr "zvuči kao"
+
+#: ../mail/em-filter-i18n.h:80
+msgid "starts with"
+msgstr "počinje sa"
+
 #. and now for the action area
-#: ../mail/em-filter-rule.c:583
+#: ../mail/em-filter-rule.c:587
 msgid "Then"
 msgstr "Potom"
 
-#: ../mail/em-filter-rule.c:648
+#: ../mail/em-filter-rule.c:652
 msgid "Add Ac_tion"
 msgstr "Dodaj ra_dnju"
 
 # bug: no need for plural-forms
-#: ../mail/em-folder-properties.c:145
+#: ../mail/em-folder-properties.c:177
 msgid "Unread messages:"
 msgid_plural "Unread messages:"
 msgstr[0] "Nepročitanih poruka:"
@@ -13703,7 +14192,7 @@ msgstr[2] "Nepročitanih poruka:"
 msgstr[3] "Nepročitanih poruka:"
 
 # bug: no need for plural-forms here, since text is in front of number
-#: ../mail/em-folder-properties.c:156
+#: ../mail/em-folder-properties.c:188
 msgid "Total messages:"
 msgid_plural "Total messages:"
 msgstr[0] "Ukupno poruka:"
@@ -13712,180 +14201,197 @@ msgstr[2] "Ukupno poruka:"
 msgstr[3] "Ukupno poruka:"
 
 # bug: no need for plural-forms here, since text is in front of number
-#: ../mail/em-folder-properties.c:177
+#: ../mail/em-folder-properties.c:209
 #, c-format
 msgid "Quota usage (%s):"
 msgstr "Iskorišćenost kvote (%s):"
 
 # bug: no need for plural-forms here, since text is in front of number
-#: ../mail/em-folder-properties.c:179
+#: ../mail/em-folder-properties.c:211
 #, c-format
 msgid "Quota usage"
 msgstr "Iskorišćenost kvote"
 
-#: ../mail/em-folder-properties.c:347
+#. Translators: Label of a combo with a list of configured accounts where a user can
+#. choose which account to use as the sender when composing a message in this folder
+#: ../mail/em-folder-properties.c:286
+msgid "_Send Account Override:"
+msgstr "_Prepiši nalog slanja"
+
+#: ../mail/em-folder-properties.c:415
 msgid "Folder Properties"
 msgstr "Osobine fascikle"
 
-#: ../mail/em-folder-selection-button.c:80
+#: ../mail/em-folder-selection-button.c:76
 msgid "<click here to select a folder>"
 msgstr "<kliknite ovde da izaberete fasciklu>"
 
-#: ../mail/em-folder-selector.c:390
+#: ../mail/em-folder-selector.c:387
 msgid "C_reate"
 msgstr "_Napravi"
 
-#: ../mail/em-folder-selector.c:396
+#: ../mail/em-folder-selector.c:393
 msgid "Folder _name:"
 msgstr "Naziv _fascikle:"
 
-#: ../mail/em-folder-tree.c:644
+#: ../mail/em-folder-tree.c:682
 msgid "Folder names cannot contain '/'"
 msgstr "Nazivi fascikli ne mogu da sadrže „/“"
 
-#: ../mail/em-folder-tree.c:781
+#: ../mail/em-folder-tree.c:819
 #, c-format
 msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1609
+#: ../mail/em-folder-tree.c:1661
 msgid "Mail Folder Tree"
 msgstr "Stablo fascikle za poštu"
 
-#: ../mail/em-folder-tree.c:2179 ../mail/em-folder-utils.c:112
+#: ../mail/em-folder-tree.c:2209 ../mail/em-folder-utils.c:100
 #, c-format
 msgid "Moving folder %s"
 msgstr "Premeštam fasciklu „%s“"
 
-#: ../mail/em-folder-tree.c:2182 ../mail/em-folder-utils.c:114
+#: ../mail/em-folder-tree.c:2212 ../mail/em-folder-utils.c:102
 #, c-format
 msgid "Copying folder %s"
 msgstr "Umnožavam fasciklu „%s“"
 
-#: ../mail/em-folder-tree.c:2189 ../mail/message-list.c:2280
+#: ../mail/em-folder-tree.c:2219 ../mail/message-list.c:2284
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Premeštam poruke u fasciklu „%s“"
 
-#: ../mail/em-folder-tree.c:2193 ../mail/message-list.c:2282
+#: ../mail/em-folder-tree.c:2223 ../mail/message-list.c:2286
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Umnožavam poruke u fasciklu „%s“"
 
-#: ../mail/em-folder-tree.c:2212
+#: ../mail/em-folder-tree.c:2242
 #, 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:176 ../mail/em-folder-tree-model.c:178
+#: ../mail/em-folder-tree-model.c:430 ../mail/em-folder-tree-model.c:432
 msgid "UNMATCHED"
 msgstr "NEODGOVARA"
 
-#: ../mail/em-folder-tree-model.c:873 ../mail/em-folder-tree-model.c:1168
+#: ../mail/em-folder-tree-model.c:1244 ../mail/em-folder-tree-model.c:1621
 msgid "Loading..."
 msgstr "Učitavam..."
 
-#: ../mail/em-folder-utils.c:519
+#: ../mail/em-folder-utils.c:506
 msgid "Move Folder To"
 msgstr "Premesti fasciklu u"
 
-#: ../mail/em-folder-utils.c:519
+#: ../mail/em-folder-utils.c:506
 msgid "Copy Folder To"
 msgstr "Umnoži fasciklu u"
 
-#: ../mail/em-folder-utils.c:617
+#: ../mail/em-folder-utils.c:604
 msgid "Create Folder"
 msgstr "Napravi fasciklu"
 
-#: ../mail/em-folder-utils.c:618
+#: ../mail/em-folder-utils.c:605
 msgid "Specify where to create the folder:"
 msgstr "Navedite gde napraviti fasciklu:"
 
-#: ../mail/em-subscription-editor.c:867
+#: ../mail/em-subscription-editor.c:855
 msgid "_Subscribe"
 msgstr "Prijavi _se"
 
-#: ../mail/em-subscription-editor.c:876
+#: ../mail/em-subscription-editor.c:864
 msgid "Su_bscribe To Shown"
 msgstr "Prijavi se na _prikazane"
 
-#: ../mail/em-subscription-editor.c:884
+#: ../mail/em-subscription-editor.c:872
 msgid "Subscribe To _All"
 msgstr "Prijavi se _na sve"
 
-#: ../mail/em-subscription-editor.c:981 ../mail/em-subscription-editor.c:1871
-#: ../modules/mail/e-mail-shell-view-actions.c:1641
+#: ../mail/em-subscription-editor.c:969 ../mail/em-subscription-editor.c:1867
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
 msgid "_Unsubscribe"
 msgstr "_Odjavi se"
 
-#: ../mail/em-subscription-editor.c:990
+#: ../mail/em-subscription-editor.c:978
 msgid "Unsu_bscribe From Hidden"
 msgstr "O_djavi se sa skrivenih"
 
-#: ../mail/em-subscription-editor.c:998
+#: ../mail/em-subscription-editor.c:986
 msgid "Unsubscribe From _All"
 msgstr "Odja_vi se sa svih"
 
-#: ../mail/em-subscription-editor.c:1708
+#: ../mail/em-subscription-editor.c:1704
 msgid "Folder Subscriptions"
 msgstr "Prijave na fascikle"
 
-#: ../mail/em-subscription-editor.c:1747
+#: ../mail/em-subscription-editor.c:1743
 msgid "_Account:"
 msgstr "_Nalog:"
 
-#: ../mail/em-subscription-editor.c:1760
+#: ../mail/em-subscription-editor.c:1756
 msgid "Clear Search"
 msgstr "Očisti pretragu"
 
-#: ../mail/em-subscription-editor.c:1777
+#: ../mail/em-subscription-editor.c:1773
 msgid "Sho_w items that contain:"
 msgstr "_Prikaži stavke koje sadrže:"
 
-#: ../mail/em-subscription-editor.c:1824
+#: ../mail/em-subscription-editor.c:1820
 msgid "Subscribe to the selected folder"
 msgstr "Prijavite se na izabranu fasciklu"
 
-#: ../mail/em-subscription-editor.c:1825
+#: ../mail/em-subscription-editor.c:1821
 msgid "Su_bscribe"
 msgstr "P_rijavi se"
 
-#: ../mail/em-subscription-editor.c:1870
-#: ../modules/mail/e-mail-shell-view-actions.c:1643
+#: ../mail/em-subscription-editor.c:1866
+#: ../modules/mail/e-mail-shell-view-actions.c:1633
 msgid "Unsubscribe from the selected folder"
 msgstr "Odjavite se sa izabrane fascikle"
 
-#: ../mail/em-subscription-editor.c:1910
+#: ../mail/em-subscription-editor.c:1906
 msgid "Collapse all folders"
 msgstr "Skupite sve fascikle"
 
-#: ../mail/em-subscription-editor.c:1911
+#: ../mail/em-subscription-editor.c:1907
 msgid "C_ollapse All"
 msgstr "_Skupi sve"
 
-#: ../mail/em-subscription-editor.c:1921
+#: ../mail/em-subscription-editor.c:1917
 msgid "Expand all folders"
 msgstr "Razgranajte sve fascikle"
 
-#: ../mail/em-subscription-editor.c:1922
+#: ../mail/em-subscription-editor.c:1918
 msgid "E_xpand All"
 msgstr "_Razgranaj sve"
 
-#: ../mail/em-subscription-editor.c:1932
+#: ../mail/em-subscription-editor.c:1928
 msgid "Refresh the folder list"
 msgstr "Osvežite spisak fascikli"
 
-#: ../mail/em-subscription-editor.c:1944
+#: ../mail/em-subscription-editor.c:1929
+#: ../modules/mail/e-mail-shell-view-actions.c:1533
+#: ../modules/mail/e-mail-shell-view-actions.c:1603
+msgid "_Refresh"
+msgstr "_Osveži"
+
+#: ../mail/em-subscription-editor.c:1940
 msgid "Stop the current operation"
 msgstr "Zaustavite trenutnu operaciju"
 
+#: ../mail/em-subscription-editor.c:1941
+#: ../modules/addressbook/e-book-shell-view-actions.c:934
+msgid "_Stop"
+msgstr "_Zaustavi"
+
 #. Translators: This message is shown only for ten or more
 #. * 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:86
+#: ../mail/em-utils.c:75
 #, 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?"
@@ -13894,154 +14400,154 @@ 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:142
-#: ../modules/mailto-handler/evolution-mailto-handler.c:150
+#: ../mail/em-utils.c:131
+#: ../modules/mailto-handler/evolution-mailto-handler.c:148
 msgid "_Do not show this message again"
 msgstr "_Ne prikazuj više ovu poruku"
 
-#: ../mail/em-utils.c:252
+#: ../mail/em-utils.c:241
 msgid "Message Filters"
 msgstr "Propusnici poruka"
 
-#: ../mail/em-utils.c:982
+#: ../mail/em-utils.c:970
 #, c-format
 msgid "Messages from %s"
 msgstr "Poruke koje je poslao %s"
 
-#: ../mail/em-vfolder-editor.c:105
+#: ../mail/em-vfolder-editor.c:104
 msgid "Search _Folders"
 msgstr "Fas_cikle pretrage"
 
-#: ../mail/em-vfolder-editor-rule.c:397
+#: ../mail/em-vfolder-editor-rule.c:392
 msgid "Add Folder"
 msgstr "Dodaj fasciklu"
 
-#: ../mail/em-vfolder-editor-rule.c:523
+#: ../mail/em-vfolder-editor-rule.c:518
 msgid "Search Folder Sources"
 msgstr "Izvor fascikle pretrage"
 
-#: ../mail/em-vfolder-editor-rule.c:555
+#: ../mail/em-vfolder-editor-rule.c:550
 msgid "Automatically update on any _source folder change"
 msgstr "Sam osveži pri _svakoj izmeni izvorne fascikle"
 
-#: ../mail/em-vfolder-editor-rule.c:567
+#: ../mail/em-vfolder-editor-rule.c:562
 msgid "All local folders"
 msgstr "Sve lokalne fascikle"
 
-#: ../mail/em-vfolder-editor-rule.c:568
+#: ../mail/em-vfolder-editor-rule.c:563
 msgid "All active remote folders"
 msgstr "Sve aktivne mrežne fascikle"
 
-#: ../mail/em-vfolder-editor-rule.c:569
+#: ../mail/em-vfolder-editor-rule.c:564
 msgid "All local and active remote folders"
 msgstr "Sve lokalne i aktivne mrežne fascikle"
 
-#: ../mail/em-vfolder-editor-rule.c:570
+#: ../mail/em-vfolder-editor-rule.c:565
 msgid "Specific folders"
 msgstr "Određene fascikle"
 
-#: ../mail/em-vfolder-editor-rule.c:608
+#: ../mail/em-vfolder-editor-rule.c:603
 msgid "include subfolders"
 msgstr "uključi podfascikle"
 
-#: ../mail/importers/elm-importer.c:178
+#: ../mail/importers/elm-importer.c:173
 msgid "Importing Elm data"
 msgstr "Uvoženje Elm podataka"
 
-#: ../mail/importers/elm-importer.c:378
+#: ../mail/importers/elm-importer.c:374
 msgid "Evolution Elm importer"
 msgstr "Elm uvoznik Evolucije"
 
-#: ../mail/importers/elm-importer.c:379
+#: ../mail/importers/elm-importer.c:375
 msgid "Import mail from Elm."
 msgstr "Uvozi poštu iz Elma."
 
-#: ../mail/importers/evolution-mbox-importer.c:140
-#: ../plugins/dbx-import/dbx-importer.c:250
+#: ../mail/importers/evolution-mbox-importer.c:134
+#: ../plugins/dbx-import/dbx-importer.c:246
 msgid "_Destination folder:"
 msgstr "_Odredišna fascikla:"
 
-#: ../mail/importers/evolution-mbox-importer.c:146
-#: ../plugins/dbx-import/dbx-importer.c:256
-#: ../plugins/pst-import/pst-importer.c:545
+#: ../mail/importers/evolution-mbox-importer.c:140
+#: ../plugins/dbx-import/dbx-importer.c:252
+#: ../plugins/pst-import/pst-importer.c:541
 msgid "Select folder"
 msgstr "Izaberite fasciklu"
 
-#: ../mail/importers/evolution-mbox-importer.c:147
-#: ../plugins/dbx-import/dbx-importer.c:257
-#: ../plugins/pst-import/pst-importer.c:546
+#: ../mail/importers/evolution-mbox-importer.c:141
+#: ../plugins/dbx-import/dbx-importer.c:253
+#: ../plugins/pst-import/pst-importer.c:542
 msgid "Select folder to import into"
 msgstr "Izaberite fasciklu za uvoz"
 
-#: ../mail/importers/evolution-mbox-importer.c:437
+#: ../mail/importers/evolution-mbox-importer.c:435
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Naslov"
 
-#: ../mail/importers/evolution-mbox-importer.c:442
+#: ../mail/importers/evolution-mbox-importer.c:440
 msgctxt "mboxImp"
 msgid "From"
 msgstr "Šalje"
 
-#: ../mail/importers/evolution-mbox-importer.c:486
-#: ../shell/e-shell-utils.c:172
+#: ../mail/importers/evolution-mbox-importer.c:493
+#: ../shell/e-shell-utils.c:171
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Berkli poštansko sanduče (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:487
+#: ../mail/importers/evolution-mbox-importer.c:494
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Uvoznik za fascikle oblika Berkli poštanskog sandučeta"
 
-#: ../mail/importers/mail-importer.c:63
+#: ../mail/importers/mail-importer.c:54
 msgid "Importing mailbox"
 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:612
-#: ../plugins/pst-import/pst-importer.c:764
+#: ../mail/importers/mail-importer.c:144
+#: ../plugins/dbx-import/dbx-importer.c:609
+#: ../plugins/pst-import/pst-importer.c:760
 #, c-format
 msgid "Importing '%s'"
 msgstr "Uvozim „%s“"
 
-#: ../mail/importers/mail-importer.c:316
+#: ../mail/importers/mail-importer.c:309
 #, c-format
 msgid "Scanning %s"
 msgstr "Pretražujem „%s“"
 
 #: ../mail/importers/pine-importer.c:247
 msgid "Importing Pine data"
-msgstr "Uvoženje Pine podatke"
+msgstr "Uvoženje Pine podataka"
 
-#: ../mail/importers/pine-importer.c:474
+#: ../mail/importers/pine-importer.c:475
 msgid "Evolution Pine importer"
-msgstr "Pine uvoznik Evolucije"
+msgstr "Evolucijin Pine uvoznik"
 
-#: ../mail/importers/pine-importer.c:475
+#: ../mail/importers/pine-importer.c:476
 msgid "Import mail from Pine."
 msgstr "Uvozi poštu iz programa Pine."
 
-#: ../mail/mail-autofilter.c:70
+#: ../mail/mail-autofilter.c:63
 #, c-format
 msgid "Mail to %s"
 msgstr "Pošta za %s"
 
-#: ../mail/mail-autofilter.c:226 ../mail/mail-autofilter.c:269
+#: ../mail/mail-autofilter.c:219 ../mail/mail-autofilter.c:262
 #, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: ../mail/mail-autofilter.c:252
+#: ../mail/mail-autofilter.c:245
 #, c-format
 msgid "Subject is %s"
 msgstr "Naslov je %s"
 
-#: ../mail/mail-autofilter.c:293
+#: ../mail/mail-autofilter.c:286
 #, c-format
 msgid "%s mailing list"
 msgstr "%s dopisna lista"
 
-#: ../mail/mail-autofilter.c:403
+#: ../mail/mail-autofilter.c:396
 msgid "Add Filter Rule"
 msgstr "Dodaj pravilo filtriranja"
 
@@ -14050,7 +14556,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:512
+#: ../mail/mail-autofilter.c:505
 #, c-format
 msgid ""
 "The filter rule \"%s\" has been modified to account for the deleted folder\n"
@@ -14076,7 +14582,7 @@ msgstr[3] ""
 msgid "Set custom junk header"
 msgstr "Postavite proizvoljno zaglavlje neželjene"
 
-#: ../mail/mail-config.ui.h:2
+#: ../mail/mail-config.ui.h:4
 msgid ""
 "All new emails with header that matches given content will be automatically "
 "filtered as junk"
@@ -14084,138 +14590,138 @@ msgstr ""
 "Sve nove el. poruke sa zaglavljem koje se podudara sa datim sadržajem će biti "
 "automatski filtrirane kao neželjene"
 
-#: ../mail/mail-config.ui.h:3
+#: ../mail/mail-config.ui.h:5
 msgid "Header name"
 msgstr "Naziv zaglavlja"
 
-#: ../mail/mail-config.ui.h:4
+#: ../mail/mail-config.ui.h:6
 msgid "Header content"
 msgstr "Zaglavlje sadrži"
 
-#: ../mail/mail-config.ui.h:5
+#: ../mail/mail-config.ui.h:7
 msgid "Default Behavior"
 msgstr "Podrazumevano ponašanje"
 
-#: ../mail/mail-config.ui.h:6
+#: ../mail/mail-config.ui.h:8
 msgid "For_mat messages in HTML"
 msgstr "Oblikuj poruke u HTM_L"
 
-#: ../mail/mail-config.ui.h:7
+#: ../mail/mail-config.ui.h:9
 msgid "Automatically insert _emoticon images"
 msgstr "Uvek umetni slike _smajlića"
 
-#: ../mail/mail-config.ui.h:8
+#: ../mail/mail-config.ui.h:10
 msgid "Always request rea_d receipt"
 msgstr "Uvek traži _povratnicu"
 
-#: ../mail/mail-config.ui.h:9
+#: ../mail/mail-config.ui.h:11
 msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "Kodiraj nazive datoteka na način _Autluka/Gpošte"
 
-#: ../mail/mail-config.ui.h:10
+#: ../mail/mail-config.ui.h:12
 msgid "Ch_aracter encoding:"
 msgstr "Kodna st_rana:"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:13
 msgid "Replies and Forwards"
 msgstr "Odgovori i prosleđivanja"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:14
 msgid "_Reply style:"
 msgstr "_Stil odgovora:"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:15
 msgid "_Forward style:"
 msgstr "Stil _prosleđivanja:"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:16
 msgid "Start _typing at the bottom on replying"
 msgstr "U odgovoru započni _kucanje pri dnu"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:17
 msgid "_Keep signature above the original message on replying"
 msgstr "Zadrži potpis _iznad originalne poruke pri odgovoru"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:18
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "_Zanemari „Odgovor-za:“ za dopisne liste"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:19
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr "Odgovor _grupi ide samo na dopisnu listu, ako je moguće"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:20
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr ""
 "Digitalno _potpiši poruke kada je originalna poruka potpisana (PGP ili S/"
 "MIME)"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:21
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Priloži"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:22
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "Unutar (Autluk stil)"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:23
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Citirano"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:24
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Ne citiraj"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:25
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "Unutar"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:27
 msgid "Sig_natures"
 msgstr "Pot_pisi"
 
-#: ../mail/mail-config.ui.h:26
+#: ../mail/mail-config.ui.h:28
 msgid "Signatures"
 msgstr "Potpisi"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:29
 msgid "_Languages"
 msgstr "_Jezici"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:30
 msgid "Languages Table"
 msgstr "Tabela jezika"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:31
 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:31
+#: ../mail/mail-config.ui.h:33
 msgid "Check spelling while I _type"
 msgstr "Proveri pravopis dok _kucam"
 
-#: ../mail/mail-config.ui.h:32
+#: ../mail/mail-config.ui.h:34
 msgid "Color for _misspelled words:"
 msgstr "Boja za _pogrešno napisane reči:"
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:35
 #: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Pick a color"
 msgstr "Izaberite boju"
 
-#: ../mail/mail-config.ui.h:34
+#: ../mail/mail-config.ui.h:36
 msgid "Spell Checking"
 msgstr "Provera pravopisa"
 
-#: ../mail/mail-config.ui.h:35
+#: ../mail/mail-config.ui.h:37
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -14224,261 +14730,265 @@ msgstr ""
 "pre izvršavanja sledećih označenih radnji:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:39
 msgid "Sending a message with an _empty subject line"
 msgstr "Slanja poruke sa praznom linijom _naslova"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:41
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Slanja poruke koja sadrži određene samo _Bcc primaoce"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:43
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Slanja privatnog _odgovora na poruku dopisne liste"
 
 # bug(slobo): verovatno izveštaj o dostavi
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:45
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Slanja odgovora _većem broju primalaca"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:47
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "Dozvoljavanja _dopisnoj listi da preusmeri privatnu poruku na listu"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:49
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "Slanja poruke sa _primaocima koji nisu unešeni kao adrese pošte"
 
-#: ../mail/mail-config.ui.h:48
+#: ../mail/mail-config.ui.h:50
 msgid "Confirmations"
 msgstr "Potvrđivanja"
 
-#: ../mail/mail-config.ui.h:54 ../smime/gui/smime-ui.ui.h:1
-msgid "a"
-msgstr "a"
-
-#: ../mail/mail-config.ui.h:55 ../smime/gui/smime-ui.ui.h:2
-msgid "b"
-msgstr "b"
+#. Translators: Label of a frame with a list of folders for which to use selected account in Send account overrides
+#: ../mail/mail-config.ui.h:54
+#| msgid "Search Folders"
+msgid "Use for Folders"
+msgstr "Koristi za fascikle"
 
-#: ../mail/mail-config.ui.h:56
-msgid "Proxy Settings"
-msgstr "Podešavanja posrednika"
+#: ../mail/mail-config.ui.h:55
+msgid "A_dd"
+msgstr "_Dodaj"
 
 #: ../mail/mail-config.ui.h:57
-msgid "_Use system defaults"
-msgstr "_Koristi sistemske postavke"
-
-#: ../mail/mail-config.ui.h:58
-msgid "_Direct connection to the Internet"
-msgstr "_Direktna veza sa Internetom"
+#| msgid "_Remove"
+msgid "Re_move"
+msgstr "_Ukloni"
 
+# bug(slobo): verovatno izveštaj o dostavi
+#. Translators: Label of a frame with a list of recipients for whom to use selected account in Send account overrides
 #: ../mail/mail-config.ui.h:59
-msgid "_Manual proxy configuration:"
-msgstr "_Ručno podešavanje posrednika:"
+#| msgid "Sender or Recipients"
+msgid "Use for Recipients"
+msgstr "Koristi za primaoce"
 
-#: ../mail/mail-config.ui.h:60
-msgid "H_TTP Proxy:"
-msgstr "HTTP _posrednik:"
-
-#: ../mail/mail-config.ui.h:61
-msgid "_Secure HTTP Proxy:"
-msgstr "_Bezbedan HTTP posrednik:"
+#. Translators: Label of a frame with a list of configured accounts in Send account overrides
+#: ../mail/mail-config.ui.h:61 ../modules/mail/em-composer-prefs.c:870
+#| msgid "_Account:"
+msgid "Account"
+msgstr "Nalog"
 
 #: ../mail/mail-config.ui.h:62
-msgid "SOC_KS Proxy:"
-msgstr "Posrednik _SOCKS-a:"
+msgid "Send account overrides"
+msgstr "Prepisivanja naloga slanja"
 
 #: ../mail/mail-config.ui.h:63
-msgid "No _Proxy for:"
-msgstr "Bez _posrednika za:"
+msgid ""
+"Assign which account should be used as a send account for respective folders "
+"or recipients, an override for usual send account detection. List of "
+"recipients can contain partial addresses or names. The name and the address "
+"parts are compared separately."
+msgstr ""
+"Dodelite koji nalog treba biti korišćen kao nalog slanja za odgovarajuće "
+"fascikle ili primaoce, prepisivanje za uobičajeno otkrivanje naloga slanja. "
+"Spisak primaoca može da sadrži delimične adrese ili nazive. Delovi adrese i "
+"naziva se upoređuju zasebno."
 
 #: ../mail/mail-config.ui.h:64
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:614
-msgid "Port:"
-msgstr "Port:"
+msgid "_Folder override has precedence over Recipient override"
+msgstr "Prepisivanje _fascikle ima prednost nad prepisivanjem primaoca"
 
 #: ../mail/mail-config.ui.h:65
-msgid "Use Authe_ntication"
-msgstr "Koristi _potvrđivanje identiteta"
+#| msgid "Source Account"
+msgid "Send Account"
+msgstr "Nalog slanja"
 
-#: ../mail/mail-config.ui.h:66
-msgid "Us_ername:"
-msgstr "Korisničko_ime:"
+#: ../mail/mail-config.ui.h:71 ../smime/gui/smime-ui.ui.h:1
+msgid "a"
+msgstr "a"
 
-#: ../mail/mail-config.ui.h:67
-msgid "Pass_word:"
-msgstr "_Lozinka:"
+#: ../mail/mail-config.ui.h:72 ../smime/gui/smime-ui.ui.h:2
+msgid "b"
+msgstr "b"
 
-#: ../mail/mail-config.ui.h:68
+#: ../mail/mail-config.ui.h:73
 msgid "Start up"
 msgstr "Pokretanje"
 
-#: ../mail/mail-config.ui.h:69
+#: ../mail/mail-config.ui.h:74
 msgid "Check for new _messages on start"
 msgstr "Proveri nove _poruke prilikom pokretanja"
 
-#: ../mail/mail-config.ui.h:70
+#: ../mail/mail-config.ui.h:75
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Proveri nove _poruke u svim aktivnim nalozima"
 
-#: ../mail/mail-config.ui.h:71
+#: ../mail/mail-config.ui.h:76
 msgid "Message Display"
 msgstr "Prikaz poruke"
 
-#: ../mail/mail-config.ui.h:72
+#: ../mail/mail-config.ui.h:77
 msgid "_Use the same fonts as other applications"
 msgstr "_Koristi iste fontove kao drugi programi"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:78
 msgid "S_tandard Font:"
 msgstr "_Standardni font:"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:79
 msgid "Select HTML fixed width font"
 msgstr "Izaberite HTML font stalne veličine"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:80
 msgid "Select HTML variable width font"
 msgstr "Izaberite HTML font promenljive veličine"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:81
 msgid "Fix_ed Width Font:"
 msgstr "Font _stalne širine:"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:82
 msgid "_Mark messages as read after"
 msgstr "_Označi poruke kao pročitane posle"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:84
 msgid "Highlight _quotations with"
 msgstr "Naglasi _citate sa"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:85
 msgid "color"
 msgstr "boja"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:86
 msgid "Default character e_ncoding:"
 msgstr "Podrazumevana _kodna strana:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:87
 msgid "Apply the same _view settings to all folders"
 msgstr "Primeni ista podešavanja _pregleda na svim fasciklama"
 
-#: ../mail/mail-config.ui.h:83
+#: ../mail/mail-config.ui.h:88
 msgid "F_all back to threading messages by subject"
 msgstr "Vra_ti se na nizanje poruka po naslovu"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:89
 msgid "Delete Mail"
 msgstr "Obriši poštu"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:90
 msgid "Empty _trash folders"
 msgstr "Isprazni fascikle _smeća"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:91
 msgid "Confirm _when expunging a folder"
 msgstr "_Potvrdi kada prazniš fasciklu"
 
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:93
 msgid "_Show animated images"
 msgstr "Prikaži _animirane slike"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:94
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr "_Upozori pri slanju HTML pošte kontaktima koji ih ne žele"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:95
 msgid "Loading Images"
 msgstr "Učitavanje slika"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:96
 msgid "_Never load images from the Internet"
 msgstr "_Nikada ne učitavaj slike sa Interneta"
 
-#: ../mail/mail-config.ui.h:92
+#: ../mail/mail-config.ui.h:97
 msgid "_Load images only in messages from contacts"
 msgstr "_Učitaj slike samo u porukama od kontakta"
 
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:98
 msgid "_Always load images from the Internet"
 msgstr "_Uvek učitaj slike sa Interneta"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:99
 msgid "HTML Messages"
 msgstr "HTML poruke"
 
-#: ../mail/mail-config.ui.h:95 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:100 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Oznake"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:101
 msgid "Sender Photograph"
 msgstr "Fotografija pošiljaoca"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:102
 msgid "_Show the photograph of sender in the message preview"
 msgstr "_Prikaži fotografiju pošiljaoca u pregledu pošte"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:103
 msgid "Displayed Message Headers"
 msgstr "Prikazana zaglavlja poruka"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:104
 msgid "Mail Headers Table"
 msgstr "Tabela zaglavlja pošte"
 
-#: ../mail/mail-config.ui.h:100
-#: ../modules/addressbook/autocompletion-config.c:117
+#: ../mail/mail-config.ui.h:105
+#: ../modules/addressbook/autocompletion-config.c:116
 #: ../modules/calendar/e-calendar-preferences.ui.h:54
 msgid "Date/Time Format"
 msgstr "Format datum/vreme"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:107
 msgid "Check incoming _messages for junk"
 msgstr "Proveri ima li đubreta u _pristigloj pošti"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:108
 msgid "_Delete junk messages"
 msgstr "_Obriši poruke đubra"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:109
 msgid "Check cu_stom headers for junk"
 msgstr "Proveri ima li đubreta u _prilagođenim zaglavljima"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:110
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "Ne označava_j poruke kao đubre ako je pošiljalac u mom adresaru"
 
-#: ../mail/mail-config.ui.h:106
+#: ../mail/mail-config.ui.h:111
 msgid "_Lookup in local address book only"
 msgstr "_Potraži samo u lokalnom adresaru"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:112
 msgid "Option is ignored if a match for custom junk headers is found."
 msgstr ""
 "Opcija se zanemaruje ukoliko je pronađeno poklapanje sa proizvoljnim zaglavljem "
 "đubreta."
 
-#: ../mail/mail-config.ui.h:109
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:225
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:159
+#: ../mail/mail-config.ui.h:114
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:224
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:158
 msgid "No encryption"
 msgstr "Bez šifrovanja"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:115
 msgid "TLS encryption"
 msgstr "TLS šifrovanje"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:116
 msgid "SSL encryption"
 msgstr "SSL šifrovanje"
 
@@ -14500,63 +15010,63 @@ msgstr "_Rok:"
 
 # timezone.
 #. Translators: Flag Completed
-#: ../mail/mail-dialogs.ui.h:6
+#: ../mail/mail-dialogs.ui.h:7
 msgid "Co_mpleted"
 msgstr "Za_vršeno"
 
-#: ../mail/mail-dialogs.ui.h:7
+#: ../mail/mail-dialogs.ui.h:8
 msgid "Call"
 msgstr "Poziv"
 
-#: ../mail/mail-dialogs.ui.h:8
+#: ../mail/mail-dialogs.ui.h:9
 msgid "Do Not Forward"
 msgstr "Ne prosleđuj"
 
-#: ../mail/mail-dialogs.ui.h:9
+#: ../mail/mail-dialogs.ui.h:10
 msgid "Follow-Up"
 msgstr "Sledi"
 
-#: ../mail/mail-dialogs.ui.h:10
+#: ../mail/mail-dialogs.ui.h:11
 msgid "For Your Information"
 msgstr "Za vašu informaciju"
 
-#: ../mail/mail-dialogs.ui.h:11
+#: ../mail/mail-dialogs.ui.h:12
 msgid "Forward"
 msgstr "Prosledi"
 
-#: ../mail/mail-dialogs.ui.h:12
+#: ../mail/mail-dialogs.ui.h:13
 msgid "No Response Necessary"
 msgstr "Nije neophodan odgovor"
 
-#: ../mail/mail-dialogs.ui.h:16
+#: ../mail/mail-dialogs.ui.h:17
 msgid "Reply to All"
 msgstr "Odgovori svima"
 
-#: ../mail/mail-dialogs.ui.h:17
+#: ../mail/mail-dialogs.ui.h:18
 msgid "Review"
 msgstr "Pregledaj"
 
-#: ../mail/mail-dialogs.ui.h:18
+#: ../mail/mail-dialogs.ui.h:19
 msgid "License Agreement"
 msgstr "Ugovor o korišćenju"
 
-#: ../mail/mail-dialogs.ui.h:19
+#: ../mail/mail-dialogs.ui.h:20
 msgid "_Tick this to accept the license agreement"
 msgstr "Oz_načite ovo da prihvatite ugovor o licenci"
 
-#: ../mail/mail-dialogs.ui.h:20
+#: ../mail/mail-dialogs.ui.h:22
 msgid "_Accept License"
 msgstr "_Prihvati licencu"
 
-#: ../mail/mail-dialogs.ui.h:21
+#: ../mail/mail-dialogs.ui.h:23
 msgid "Security Information"
 msgstr "Podaci bezbednosti"
 
-#: ../mail/mail-dialogs.ui.h:22
+#: ../mail/mail-dialogs.ui.h:24
 msgid "Digital Signature"
 msgstr "Digitalni potpis"
 
-#: ../mail/mail-dialogs.ui.h:23
+#: ../mail/mail-dialogs.ui.h:25
 msgid "Encryption"
 msgstr "Šifrovanje"
 
@@ -14761,7 +15271,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:1529
+#: ../modules/mail/e-mail-shell-view-actions.c:1519
 msgid "_Empty Trash"
 msgstr "_Izbaci smeće"
 
@@ -14981,7 +15491,7 @@ msgid "Do _Not Disable"
 msgstr "Nemoj _isključiti"
 
 #: ../mail/mail.error.xml.h:90
-#: ../plugins/publish-calendar/publish-calendar.c:649
+#: ../plugins/publish-calendar/publish-calendar.c:655
 msgid "_Disable"
 msgstr "_Isključi"
 
@@ -15196,14 +15706,6 @@ msgid "Are you sure you want to copy folder '{0}' to folder '{1}'?"
 msgstr ""
 "Da li ste sigurni da želite da umnožite fasciklu „{0}“ u fasciklu „{1}“?"
 
-#: ../mail/mail.error.xml.h:138
-msgid "_Yes"
-msgstr "_Da"
-
-#: ../mail/mail.error.xml.h:139
-msgid "_No"
-msgstr "_Ne"
-
 #: ../mail/mail.error.xml.h:140
 msgid "_Always"
 msgstr "_Uvek"
@@ -15339,123 +15841,127 @@ msgstr "Ne mogu da izvršim ovu radnju nad „{0}“."
 msgid "You must be working online to complete this operation."
 msgstr "Morate da budete na mreži da biste završili ovu radnju."
 
-#: ../mail/mail-send-recv.c:202
+#: ../mail/mail.error.xml.h:173
+msgid "Message from &quot;{0}&quot; account:"
+msgstr "Poruka sa „{0}“ naloga:"
+
+#: ../mail/mail-send-recv.c:188
 msgid "Canceling..."
 msgstr "Otkazujem..."
 
-#: ../mail/mail-send-recv.c:546
+#: ../mail/mail-send-recv.c:526
 msgid "Send & Receive Mail"
 msgstr "Slanje i primanje pošte"
 
-#: ../mail/mail-send-recv.c:562
+#: ../mail/mail-send-recv.c:542
 msgid "Cancel _All"
 msgstr "Otkaži _sve"
 
-#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:1047
+#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:1024
 msgid "Updating..."
 msgstr "Osvežavam..."
 
-#: ../mail/mail-send-recv.c:655 ../mail/mail-send-recv.c:736
+#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:714
 msgid "Waiting..."
 msgstr "Čekam..."
 
-#: ../mail/mail-send-recv.c:1020
+#: ../mail/mail-send-recv.c:997
 #, c-format
 msgid "Checking for new mail at '%s'"
 msgstr "Vršim proveru za novom poštom na „%s“"
 
-#: ../mail/mail-vfolder-ui.c:78
+#: ../mail/mail-vfolder-ui.c:66
 msgid "Search Folders"
 msgstr "Fascikle pretrage"
 
-#: ../mail/mail-vfolder-ui.c:158
+#: ../mail/mail-vfolder-ui.c:146
 msgid "Edit Search Folder"
 msgstr "Uredi fasciklu pretrage"
 
-#: ../mail/mail-vfolder-ui.c:279
+#: ../mail/mail-vfolder-ui.c:267
 msgid "New Search Folder"
 msgstr "Nova fascikla pretrage"
 
-#: ../mail/message-list.c:298
+#: ../mail/message-list.c:287
 msgid "Unseen"
 msgstr "Neviđeno"
 
-#: ../mail/message-list.c:299
+#: ../mail/message-list.c:288
 msgid "Seen"
 msgstr "Viđeno"
 
-#: ../mail/message-list.c:300
+#: ../mail/message-list.c:289
 msgid "Answered"
 msgstr "Odgovoreno"
 
-#: ../mail/message-list.c:301
+#: ../mail/message-list.c:290
 msgid "Forwarded"
 msgstr "Prosleđeno"
 
-#: ../mail/message-list.c:302
+#: ../mail/message-list.c:291
 msgid "Multiple Unseen Messages"
 msgstr "Višestruke neviđene poruke"
 
-#: ../mail/message-list.c:303
+#: ../mail/message-list.c:292
 msgid "Multiple Messages"
 msgstr "Višestruke poruke"
 
-#: ../mail/message-list.c:316
+#: ../mail/message-list.c:305
 msgid "Lowest"
 msgstr "Najniže"
 
-#: ../mail/message-list.c:317
+#: ../mail/message-list.c:306
 msgid "Lower"
 msgstr "Niže"
 
-#: ../mail/message-list.c:321
+#: ../mail/message-list.c:310
 msgid "Higher"
 msgstr "Više"
 
-#: ../mail/message-list.c:322
+#: ../mail/message-list.c:311
 msgid "Highest"
 msgstr "Najviše"
 
-#: ../mail/message-list.c:466 ../mail/message-list.c:5719
+#: ../mail/message-list.c:455 ../mail/message-list.c:5749
 msgid "Generating message list"
 msgstr "Pravljenje liste poruka"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1858 ../modules/itip-formatter/itip-view.c:244
+#: ../mail/message-list.c:1860 ../modules/itip-formatter/itip-view.c:237
 msgid "Today %l:%M %p"
 msgstr "Danas u %l:%M %p"
 
-#: ../mail/message-list.c:1867
+#: ../mail/message-list.c:1869
 msgid "Yesterday %l:%M %p"
 msgstr "Juče u %l:%M %p"
 
-#: ../mail/message-list.c:1879
+#: ../mail/message-list.c:1881
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: ../mail/message-list.c:1887
+#: ../mail/message-list.c:1889
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: ../mail/message-list.c:1889
+#: ../mail/message-list.c:1891
 msgid "%b %d %Y"
 msgstr "%d. %b %Y."
 
-#: ../mail/message-list.c:2767
+#: ../mail/message-list.c:2771
 msgid "Select all visible messages"
 msgstr "Izaberi sve vidljive poruke"
 
-#: ../mail/message-list.c:3395 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3399 ../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:4764
+#: ../mail/message-list.c:4706
 msgid "Follow-up"
 msgstr "Sledi"
 
-#: ../mail/message-list.c:5657
+#: ../mail/message-list.c:5687
 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 "
@@ -15467,7 +15973,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:5665
+#: ../mail/message-list.c:5695
 msgid "There are no messages in this folder."
 msgstr "Nema poruka u ovoj fascikli."
 
@@ -15504,394 +16010,374 @@ msgid "Subject or Addresses contains"
 msgstr "Naslov ili adrese sadrže"
 
 #: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:2012
+#: ../modules/mail/e-mail-shell-view-actions.c:2002
 msgid "Recipients contain"
 msgstr "Primaoci sadrže"
 
 #: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:2005
+#: ../modules/mail/e-mail-shell-view-actions.c:1995
 msgid "Message contains"
 msgstr "Poruka sadrži"
 
 #: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:2026
+#: ../modules/mail/e-mail-shell-view-actions.c:2016
 msgid "Subject contains"
 msgstr "Naslov sadrži"
 
 #: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:2019
+#: ../modules/mail/e-mail-shell-view-actions.c:2009
 msgid "Sender contains"
 msgstr "Pošiljalac sadrži"
 
 #: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1998
+#: ../modules/mail/e-mail-shell-view-actions.c:1988
 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:123
-#: ../modules/mail/em-mailer-prefs.c:1213
+#: ../modules/addressbook/autocompletion-config.c:122
+#: ../modules/mail/em-mailer-prefs.c:1212
 msgid "_Table column:"
 msgstr "Kolona _tabele:"
 
-#: ../modules/addressbook/autocompletion-config.c:126
+#: ../modules/addressbook/autocompletion-config.c:125
 msgid "Address formatting"
 msgstr "Oblikovanje adrese"
 
-#: ../modules/addressbook/autocompletion-config.c:129
+#: ../modules/addressbook/autocompletion-config.c:128
 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:137
+#: ../modules/addressbook/autocompletion-config.c:136
 msgid "Autocompletion"
 msgstr "Samodovršavanje"
 
-#: ../modules/addressbook/autocompletion-config.c:140
+#: ../modules/addressbook/autocompletion-config.c:139
 msgid "Always _show address of the autocompleted contact"
 msgstr "Uvek _prikazuj adresu samodopunjenog kontakta"
 
-#: ../modules/addressbook/eab-composer-util.c:148
+#: ../modules/addressbook/eab-composer-util.c:147
 msgid "Multiple vCards"
 msgstr "Višestruke vKarte"
 
-#: ../modules/addressbook/eab-composer-util.c:156
+#: ../modules/addressbook/eab-composer-util.c:155
 #, c-format
 msgid "vCard for %s"
 msgstr "vKarta za %s"
 
-#: ../modules/addressbook/eab-composer-util.c:168
-#: ../modules/addressbook/eab-composer-util.c:195
+#: ../modules/addressbook/eab-composer-util.c:167
+#: ../modules/addressbook/eab-composer-util.c:194
 #, c-format
 msgid "Contact information"
 msgstr "Podaci za stupanje u vezu"
 
-#: ../modules/addressbook/eab-composer-util.c:197
+#: ../modules/addressbook/eab-composer-util.c:196
 #, c-format
 msgid "Contact information for %s"
 msgstr "Podaci o kontaktu za %s"
 
-#: ../modules/addressbook/e-book-shell-backend.c:259
-#: ../modules/addressbook/e-book-shell-view-actions.c:125
+#: ../modules/addressbook/e-book-shell-backend.c:258
+#: ../modules/addressbook/e-book-shell-view-actions.c:124
 msgid "New Address Book"
 msgstr "Novi adresar"
 
-#: ../modules/addressbook/e-book-shell-backend.c:268
+#: ../modules/addressbook/e-book-shell-backend.c:267
 msgctxt "New"
 msgid "_Contact"
 msgstr "_Kontakt"
 
-#: ../modules/addressbook/e-book-shell-backend.c:270
-#: ../modules/addressbook/e-book-shell-view-actions.c:979
+#: ../modules/addressbook/e-book-shell-backend.c:269
+#: ../modules/addressbook/e-book-shell-view-actions.c:978
 msgid "Create a new contact"
 msgstr "Napravite novi kontakt"
 
-#: ../modules/addressbook/e-book-shell-backend.c:275
+#: ../modules/addressbook/e-book-shell-backend.c:274
 msgctxt "New"
 msgid "Contact _List"
 msgstr "Li_sta kontakta"
 
-#: ../modules/addressbook/e-book-shell-backend.c:277
-#: ../modules/addressbook/e-book-shell-view-actions.c:986
+#: ../modules/addressbook/e-book-shell-backend.c:276
+#: ../modules/addressbook/e-book-shell-view-actions.c:985
 msgid "Create a new contact list"
 msgstr "Napravite novi spisak kontakta"
 
-#: ../modules/addressbook/e-book-shell-backend.c:285
+#: ../modules/addressbook/e-book-shell-backend.c:284
 msgctxt "New"
 msgid "Address _Book"
 msgstr "_Adresar"
 
-#: ../modules/addressbook/e-book-shell-backend.c:287
-#: ../modules/addressbook/e-book-shell-view-actions.c:902
+#: ../modules/addressbook/e-book-shell-backend.c:286
+#: ../modules/addressbook/e-book-shell-view-actions.c:901
 msgid "Create a new address book"
 msgstr "Napravite novi adresar"
 
-#: ../modules/addressbook/e-book-shell-backend.c:315
+#: ../modules/addressbook/e-book-shell-backend.c:314
 msgid "Certificates"
 msgstr "Uverenja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:198
+#: ../modules/addressbook/e-book-shell-view-actions.c:197
 msgid "Address Book Properties"
 msgstr "Postavke adresara"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:476
-#: ../modules/addressbook/e-book-shell-view-actions.c:772
+#: ../modules/addressbook/e-book-shell-view-actions.c:475
+#: ../modules/addressbook/e-book-shell-view-actions.c:771
 msgid "Save as vCard"
 msgstr "Sačuvajte kao vKartu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:879
+#: ../modules/addressbook/e-book-shell-view-actions.c:878
 msgid "Co_py All Contacts To..."
 msgstr "Umnoži _sve kontakte u..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:881
+#: ../modules/addressbook/e-book-shell-view-actions.c:880
 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:886
+#: ../modules/addressbook/e-book-shell-view-actions.c:885
 msgid "D_elete Address Book"
 msgstr "O_briši adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:888
+#: ../modules/addressbook/e-book-shell-view-actions.c:887
 msgid "Delete the selected address book"
 msgstr "Obrišite izabrani adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:893
+#: ../modules/addressbook/e-book-shell-view-actions.c:892
 msgid "Mo_ve All Contacts To..."
 msgstr "Premesti _sve kontakte u..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:895
+#: ../modules/addressbook/e-book-shell-view-actions.c:894
 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:900
+#: ../modules/addressbook/e-book-shell-view-actions.c:899
 msgid "_New Address Book"
 msgstr "_Novi adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:907
+#: ../modules/addressbook/e-book-shell-view-actions.c:906
 msgid "Address _Book Properties"
 msgstr "Podešavanja adresa_ra"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:909
+#: ../modules/addressbook/e-book-shell-view-actions.c:908
 msgid "Show properties of the selected address book"
 msgstr "Prikažite svojstva izabranog adresara"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:914
-#: ../modules/calendar/e-cal-shell-view-actions.c:1414
-#: ../modules/calendar/e-memo-shell-view-actions.c:636
-#: ../modules/calendar/e-task-shell-view-actions.c:760
+#: ../modules/addressbook/e-book-shell-view-actions.c:913
+#: ../modules/calendar/e-cal-shell-view-actions.c:1413
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
+#: ../modules/calendar/e-task-shell-view-actions.c:759
 msgid "Re_fresh"
 msgstr "O_sveži"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:916
+#: ../modules/addressbook/e-book-shell-view-actions.c:915
 msgid "Refresh the selected address book"
 msgstr "Osvežite izabrani adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:921
+#: ../modules/addressbook/e-book-shell-view-actions.c:920
 msgid "Address Book _Map"
 msgstr "_Mapa adresara"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:923
+#: ../modules/addressbook/e-book-shell-view-actions.c:922
 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:928
-#: ../modules/calendar/e-cal-shell-view-actions.c:1421
-#: ../modules/calendar/e-memo-shell-view-actions.c:643
-#: ../modules/calendar/e-task-shell-view-actions.c:767
-#: ../modules/mail/e-mail-shell-view-actions.c:1620
+#: ../modules/addressbook/e-book-shell-view-actions.c:927
+#: ../modules/calendar/e-cal-shell-view-actions.c:1420
+#: ../modules/calendar/e-memo-shell-view-actions.c:642
+#: ../modules/calendar/e-task-shell-view-actions.c:766
+#: ../modules/mail/e-mail-shell-view-actions.c:1610
 msgid "_Rename..."
 msgstr "_Preimenuj..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:930
+#: ../modules/addressbook/e-book-shell-view-actions.c:929
 msgid "Rename the selected address book"
 msgstr "Preimenujte izabrani adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:937
+#: ../modules/addressbook/e-book-shell-view-actions.c:936
 msgid "Stop loading"
 msgstr "Prekini učitavanje"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:942
+#: ../modules/addressbook/e-book-shell-view-actions.c:941
 msgid "_Copy Contact To..."
 msgstr "_Umnoži kontakt u..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:944
+#: ../modules/addressbook/e-book-shell-view-actions.c:943
 msgid "Copy selected contacts to another address book"
 msgstr "Umnožite izabrane kontakte u drugi adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:949
+#: ../modules/addressbook/e-book-shell-view-actions.c:948
 msgid "_Delete Contact"
 msgstr "_Ukloni Kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:956
+#: ../modules/addressbook/e-book-shell-view-actions.c:955
 msgid "_Find in Contact..."
 msgstr "_Pronađi u kontaktu..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/addressbook/e-book-shell-view-actions.c:957
 msgid "Search for text in the displayed contact"
 msgstr "Pretražite tekst u prikazanom kontaktu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:963
+#: ../modules/addressbook/e-book-shell-view-actions.c:962
 msgid "_Forward Contact..."
 msgstr "_Prosledi kontakt..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:965
+#: ../modules/addressbook/e-book-shell-view-actions.c:964
 msgid "Send selected contacts to another person"
 msgstr "Pošaljite izabrane kontakte drugoj osobi"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:970
+#: ../modules/addressbook/e-book-shell-view-actions.c:969
 msgid "_Move Contact To..."
 msgstr "_Premesti kontakt u..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:972
+#: ../modules/addressbook/e-book-shell-view-actions.c:971
 msgid "Move selected contacts to another address book"
 msgstr "Premestite izabrane kontakte u drugi adresar"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:977
+#: ../modules/addressbook/e-book-shell-view-actions.c:976
 msgid "_New Contact..."
 msgstr "Novi kon_takt..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:984
+#: ../modules/addressbook/e-book-shell-view-actions.c:983
 msgid "New Contact _List..."
 msgstr "Nova _lista kontakta..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:991
+#: ../modules/addressbook/e-book-shell-view-actions.c:990
 msgid "_Open Contact"
 msgstr "_Otvori kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:993
+#: ../modules/addressbook/e-book-shell-view-actions.c:992
 msgid "View the current contact"
 msgstr "Pregledajte tekući kontakt"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:998
+#: ../modules/addressbook/e-book-shell-view-actions.c:997
 msgid "_Send Message to Contact..."
 msgstr "_Pošalji poruku kontaktu..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1000
+#: ../modules/addressbook/e-book-shell-view-actions.c:999
 msgid "Send a message to the selected contacts"
 msgstr "Pošaljite poruku izabranim kontaktima"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1007
-#: ../modules/calendar/e-cal-shell-view-actions.c:1577
-#: ../modules/calendar/e-task-shell-view-actions.c:825
+#: ../modules/addressbook/e-book-shell-view-actions.c:1006
+#: ../modules/calendar/e-cal-shell-view-actions.c:1576
+#: ../modules/calendar/e-task-shell-view-actions.c:824
 msgid "_Actions"
 msgstr "_Radnje"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1014
-#: ../modules/calendar/e-memo-shell-view-actions.c:680
-#: ../modules/calendar/e-task-shell-view-actions.c:832
-#: ../modules/mail/e-mail-shell-view-actions.c:1785
+#: ../modules/addressbook/e-book-shell-view-actions.c:1013
+#: ../modules/calendar/e-memo-shell-view-actions.c:679
+#: ../modules/calendar/e-task-shell-view-actions.c:831
+#: ../modules/mail/e-mail-shell-view-actions.c:1775
 msgid "_Preview"
 msgstr "_Pregled"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1023
-#: ../modules/calendar/e-cal-shell-view-actions.c:1594
-#: ../modules/calendar/e-memo-shell-view-actions.c:693
-#: ../modules/calendar/e-task-shell-view-actions.c:845
-msgid "_Delete"
-msgstr "_Obriši"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:1027
-#: ../modules/mail/e-mail-shell-view-actions.c:1536
-msgid "_Properties"
-msgstr "_Svojstva"
-
-#: ../modules/addressbook/e-book-shell-view-actions.c:1035
+#: ../modules/addressbook/e-book-shell-view-actions.c:1034
 msgid "Address Book Map"
 msgstr "Mapa adresara"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1067
+#: ../modules/addressbook/e-book-shell-view-actions.c:1066
 msgid "Contact _Preview"
 msgstr "Pre_gled kontakta"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1069
+#: ../modules/addressbook/e-book-shell-view-actions.c:1068
 msgid "Show contact preview window"
 msgstr "Prikažite prozor za pregled kontakta"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1075
+#: ../modules/addressbook/e-book-shell-view-actions.c:1074
 msgid "Show _Maps"
 msgstr "Prikaži _mape"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1077
+#: ../modules/addressbook/e-book-shell-view-actions.c:1076
 msgid "Show maps in contact preview window"
 msgstr "Prikažite mape u prozoru za pregled kontakata"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1096
-#: ../modules/calendar/e-memo-shell-view-actions.c:750
-#: ../modules/calendar/e-task-shell-view-actions.c:914
-#: ../modules/mail/e-mail-shell-view-actions.c:1915
+#: ../modules/addressbook/e-book-shell-view-actions.c:1095
+#: ../modules/calendar/e-memo-shell-view-actions.c:749
+#: ../modules/calendar/e-task-shell-view-actions.c:913
+#: ../modules/mail/e-mail-shell-view-actions.c:1905
 msgid "_Classic View"
 msgstr "_Klasični prikaz"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1098
+#: ../modules/addressbook/e-book-shell-view-actions.c:1097
 msgid "Show contact preview below the contact list"
 msgstr "Prikažite pregled kontakta ispod kontakt liste"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1103
-#: ../modules/calendar/e-memo-shell-view-actions.c:757
-#: ../modules/calendar/e-task-shell-view-actions.c:921
-#: ../modules/mail/e-mail-shell-view-actions.c:1922
+#: ../modules/addressbook/e-book-shell-view-actions.c:1102
+#: ../modules/calendar/e-memo-shell-view-actions.c:756
+#: ../modules/calendar/e-task-shell-view-actions.c:920
+#: ../modules/mail/e-mail-shell-view-actions.c:1912
 msgid "_Vertical View"
 msgstr "_Uspravni pregled"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1105
+#: ../modules/addressbook/e-book-shell-view-actions.c:1104
 msgid "Show contact preview alongside the contact list"
 msgstr "Prikažite pregled kontakta pored kontakt liste"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1120
-#: ../modules/calendar/e-cal-shell-view-actions.c:1754
-#: ../modules/calendar/e-memo-shell-view-actions.c:774
-#: ../modules/calendar/e-task-shell-view-actions.c:973
+#: ../modules/addressbook/e-book-shell-view-actions.c:1119
+#: ../modules/calendar/e-cal-shell-view-actions.c:1753
+#: ../modules/calendar/e-memo-shell-view-actions.c:773
+#: ../modules/calendar/e-task-shell-view-actions.c:972
 msgid "Unmatched"
 msgstr "Ne odgovara"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1130
-#: ../modules/calendar/e-cal-shell-view-actions.c:1764
-#: ../modules/calendar/e-memo-shell-view-actions.c:784
-#: ../modules/calendar/e-task-shell-view-actions.c:983
-#: ../modules/mail/e-mail-shell-view-actions.c:1991
-#: ../shell/e-shell-content.c:658
+#: ../modules/addressbook/e-book-shell-view-actions.c:1129
+#: ../modules/calendar/e-cal-shell-view-actions.c:1763
+#: ../modules/calendar/e-memo-shell-view-actions.c:783
+#: ../modules/calendar/e-task-shell-view-actions.c:982
+#: ../modules/mail/e-mail-shell-view-actions.c:1981
+#: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Napredna pretraga"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1163
+#: ../modules/addressbook/e-book-shell-view-actions.c:1162
 msgid "Print all shown contacts"
 msgstr "Štampaj sve prikazane kontakte"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1170
+#: ../modules/addressbook/e-book-shell-view-actions.c:1169
 msgid "Preview the contacts to be printed"
 msgstr "Pregled kontakata pred štampu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1177
+#: ../modules/addressbook/e-book-shell-view-actions.c:1176
 msgid "Print selected contacts"
 msgstr "Štampa izabrane kontakte"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1192
+#: ../modules/addressbook/e-book-shell-view-actions.c:1191
 msgid "S_ave Address Book as vCard"
 msgstr "_Sačuvaj adresar kao vKartu"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1194
+#: ../modules/addressbook/e-book-shell-view-actions.c:1193
 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:1200
-#: ../modules/addressbook/e-book-shell-view-actions.c:1210
+#: ../modules/addressbook/e-book-shell-view-actions.c:1199
+#: ../modules/addressbook/e-book-shell-view-actions.c:1209
 msgid "_Save as vCard..."
 msgstr "_Sačuvaj kao vKartu..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1202
+#: ../modules/addressbook/e-book-shell-view-actions.c:1201
 msgid "Save selected contacts as a vCard"
 msgstr "Sačuvaj izabrane kontakte kao VKartu"
 
-#: ../modules/addressbook/e-book-shell-view.c:312
+#: ../modules/addressbook/e-book-shell-view.c:311
 msgid "_Forward Contacts"
 msgstr "Prosledi kont_akte"
 
-#: ../modules/addressbook/e-book-shell-view.c:314
+#: ../modules/addressbook/e-book-shell-view.c:313
 msgid "_Forward Contact"
 msgstr "Prosle_di kontakt"
 
-#: ../modules/addressbook/e-book-shell-view.c:345
+#: ../modules/addressbook/e-book-shell-view.c:344
 msgid "_Send Message to Contacts"
 msgstr "_Pošalji poruku kontaktima"
 
-#: ../modules/addressbook/e-book-shell-view.c:347
+#: ../modules/addressbook/e-book-shell-view.c:346
 msgid "_Send Message to List"
 msgstr "_Pošalji poruku na listu"
 
-#: ../modules/addressbook/e-book-shell-view.c:349
+#: ../modules/addressbook/e-book-shell-view.c:348
 msgid "_Send Message to Contact"
 msgstr "_Pošalji poruku kontaktu"
 
-#: ../modules/audio-inline/e-mail-formatter-audio.c:316
-msgid "Audio Player"
-msgstr "Zvučni uređaj"
-
-#: ../modules/audio-inline/e-mail-formatter-audio.c:317
-msgid "Play the attachment in embedded audio player"
-msgstr "Pusti prilog u ugrađenom programu"
-
-#: ../modules/backup-restore/e-mail-config-restore-page.c:165
+#: ../modules/backup-restore/e-mail-config-restore-page.c:164
 msgid ""
 "You can restore Evolution from a backup file.\n"
 "\n"
@@ -15901,134 +16387,134 @@ 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:180
+#: ../modules/backup-restore/e-mail-config-restore-page.c:179
 msgid "_Restore from a backup file:"
 msgstr "_Vrati iz datoteke rezerve:"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:191
+#: ../modules/backup-restore/e-mail-config-restore-page.c:190
 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:311
-#: ../modules/backup-restore/e-mail-config-restore-ready-page.c:57
+#: ../modules/backup-restore/e-mail-config-restore-page.c:310
+#: ../modules/backup-restore/e-mail-config-restore-ready-page.c:56
 msgid "Restore from Backup"
 msgstr "Vrati iz rezerve"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:217
+#: ../modules/backup-restore/evolution-backup-restore.c:216
 msgid "Select name of the Evolution backup file"
 msgstr "Izaberite naziv za datoteku rezerve Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:250
+#: ../modules/backup-restore/evolution-backup-restore.c:249
 msgid "_Restart Evolution after backup"
 msgstr "_Ponovo pokreni Evoluciju nakon pravljenja rezerve"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:277
+#: ../modules/backup-restore/evolution-backup-restore.c:276
 msgid "Select name of the Evolution backup file to restore"
 msgstr "Izaberite naziv datoteke rezerve Evolucije za povraćaj"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:290
+#: ../modules/backup-restore/evolution-backup-restore.c:289
 msgid "_Restart Evolution after restore"
 msgstr "_Ponovo pokreni Evoluciju nakon povraćaja"
 
-#: ../modules/backup-restore/evolution-backup-restore.c:308
+#: ../modules/backup-restore/evolution-backup-restore.c:307
 msgid "_Back up Evolution Data..."
 msgstr "Napravi _rezervu podataka Evolucije..."
 
-#: ../modules/backup-restore/evolution-backup-restore.c:310
+#: ../modules/backup-restore/evolution-backup-restore.c:309
 msgid "Back up Evolution data and settings to an archive file"
 msgstr "Napravite rezervu podataka i postavki Evolucije u arhivu"
 
 # shell:noshell-reason title
-#: ../modules/backup-restore/evolution-backup-restore.c:315
+#: ../modules/backup-restore/evolution-backup-restore.c:314
 msgid "R_estore Evolution Data..."
 msgstr "_Vrati podatke Evolucije..."
 
-#: ../modules/backup-restore/evolution-backup-restore.c:317
+#: ../modules/backup-restore/evolution-backup-restore.c:316
 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:84
+#: ../modules/backup-restore/evolution-backup-tool.c:83
 msgid "Back up Evolution directory"
 msgstr "Direktorijum za rezervu Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:86
+#: ../modules/backup-restore/evolution-backup-tool.c:85
 msgid "Restore Evolution directory"
 msgstr "Direktorijum za povraćaj Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:88
+#: ../modules/backup-restore/evolution-backup-tool.c:87
 msgid "Check Evolution Back up"
 msgstr "Proveri rezervu Evolucije"
 
 # shell:noshell-reason title
-#: ../modules/backup-restore/evolution-backup-tool.c:90
+#: ../modules/backup-restore/evolution-backup-tool.c:89
 msgid "Restart Evolution"
 msgstr "Ponovo pokreće Evoluciju"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:92
+#: ../modules/backup-restore/evolution-backup-tool.c:91
 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:322
-#: ../modules/backup-restore/evolution-backup-tool.c:516
+#: ../modules/backup-restore/evolution-backup-tool.c:321
+#: ../modules/backup-restore/evolution-backup-tool.c:515
 msgid "Shutting down Evolution"
 msgstr "Gašenje Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:331
+#: ../modules/backup-restore/evolution-backup-tool.c:330
 msgid "Backing Evolution accounts and settings"
 msgstr "Izradite rezervnu kopiju naloga i postavke Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:348
+#: ../modules/backup-restore/evolution-backup-tool.c:347
 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:364
+#: ../modules/backup-restore/evolution-backup-tool.c:363
 msgid "Back up complete"
 msgstr "Izrada rezervne kopije je završena"
 
 # shell:noshell-reason title
-#: ../modules/backup-restore/evolution-backup-tool.c:371
-#: ../modules/backup-restore/evolution-backup-tool.c:703
+#: ../modules/backup-restore/evolution-backup-tool.c:370
+#: ../modules/backup-restore/evolution-backup-tool.c:702
 msgid "Restarting Evolution"
 msgstr "Ponovno pokretanje Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:522
+#: ../modules/backup-restore/evolution-backup-tool.c:521
 msgid "Back up current Evolution data"
 msgstr "Napravite rezervu trenutnih podataka Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:529
+#: ../modules/backup-restore/evolution-backup-tool.c:528
 msgid "Extracting files from back up"
 msgstr "Izvlačim datoteke iz rezervne kopije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:611
+#: ../modules/backup-restore/evolution-backup-tool.c:610
 msgid "Loading Evolution settings"
 msgstr "Učitavam podešavanja Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:677
+#: ../modules/backup-restore/evolution-backup-tool.c:676
 msgid "Removing temporary back up files"
 msgstr "Uklanjanje privremenih rezervnih datoteka"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:688
+#: ../modules/backup-restore/evolution-backup-tool.c:687
 msgid "Reloading registry service"
 msgstr "Ponovo učitavam uslugu zavođenja"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:915
+#: ../modules/backup-restore/evolution-backup-tool.c:916
 msgid "Evolution Back Up"
 msgstr "Rezervni primerak Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:916
+#: ../modules/backup-restore/evolution-backup-tool.c:917
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Smeštam rezervni primerak u fasciklu „%s“"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:920
+#: ../modules/backup-restore/evolution-backup-tool.c:921
 msgid "Evolution Restore"
 msgstr "Povraćaj Evolucije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:921
+#: ../modules/backup-restore/evolution-backup-tool.c:922
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Vraćam iz fascikle „%s“"
@@ -16109,88 +16595,92 @@ 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:145
+#: ../modules/bogofilter/evolution-bogofilter.c:144
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr "Nisam uspeo da izrodim Bogofilter (%s): "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:163
+#: ../modules/bogofilter/evolution-bogofilter.c:162
 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:212
+#: ../modules/bogofilter/evolution-bogofilter.c:211
 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:308
+#: ../modules/bogofilter/evolution-bogofilter.c:307
 msgid "Bogofilter Options"
 msgstr "Opcije Bogofiltera"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:317
+#: ../modules/bogofilter/evolution-bogofilter.c:316
 msgid "Convert message text to _Unicode"
 msgstr "Prebaci tekst poruke u _Unikod"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:474
+#: ../modules/bogofilter/evolution-bogofilter.c:473
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:447
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
 msgid "Standard LDAP Port"
 msgstr "Standardni LDAP port"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:453
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:625
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
 msgid "LDAP over SSL (deprecated)"
 msgstr "LDAP ili SSL (prevaziđeno)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:459
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
 msgid "Microsoft Global Catalog"
 msgstr "Majkrosoftov opšti katalog"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:465
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:464
 msgid "Microsoft Global Catalog over SSL"
 msgstr "Majkrosoftov opšti katalog preko SSL"
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:570
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:569
 msgid "Connecting to LDAP"
 msgstr "Povezujem se na LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:587
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:586
 msgid "Server Information"
 msgstr "Podaci servera"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:628
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:613
+msgid "Port:"
+msgstr "Port:"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:627
 msgid "StartTLS (recommended)"
 msgstr "PočetniTLS (preporučeno)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:630
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:629
 msgid "Encryption:"
 msgstr "Šifrovanje:"
 
-#: ../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
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:653
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:245
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:179
 msgid "Authentication"
 msgstr "Potvrđivanje identiteta"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
 msgid "Anonymous"
 msgstr "Anonimno"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:680
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
 msgid "Using email address"
 msgstr "Koristi adresu el. pošte"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:683
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:682
 msgid "Using distinguished name (DN)"
 msgstr "Koristi poseban naziv (DN)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:685
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid "Method:"
 msgstr "Način:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:690
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:689
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Using email address\" requires anonymous access to your "
@@ -16201,36 +16691,36 @@ msgstr ""
 "pristup na vaš LDAP server."
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:705
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:704
 msgid "Using LDAP"
 msgstr "Koristi LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:722
-#: ../modules/mail/e-mail-shell-view.c:117
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:721
+#: ../modules/mail/e-mail-shell-view.c:115
 msgid "Searching"
 msgstr "Pretražujem"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:744
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:743
 msgid "Search Base:"
 msgstr "Osnova pretrage:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:749
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:747
 msgid "Find Possible Search Bases"
 msgstr "Nađi moguće baze za pretragu"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:774
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:769
 msgid "One Level"
 msgstr "Jedan nivo"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:776
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:771
 msgid "Subtree"
 msgstr "Podstablo"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
 msgid "Search Scope:"
 msgstr "Obim pretrage:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:783
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
 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 "
@@ -16242,165 +16732,199 @@ msgstr ""
 "za pretragu.  Obim pretrage „Jedan nivo“ će uključiti samo unose jedan nivo "
 "ispod vaše baze pretrage."
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:792
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:787
 msgid "Search Filter:"
 msgstr "Filter pretrage:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:804
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:799
 msgid "Downloading"
 msgstr "Preuzimam"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:825
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:820
 msgid "Limit:"
 msgstr "Ograničenje:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
 msgid "contacts"
 msgstr "kontakti"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:841
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
 msgid "Browse until limit is reached"
 msgstr "Razgledaj sve dok se ne dostigne ograničenje"
 
-#: ../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
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:135
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:204
+#: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
 msgid "URL:"
 msgstr "Adresa:"
 
-#: ../modules/book-config-webdav/evolution-book-config-webdav.c:146
+#: ../modules/book-config-webdav/evolution-book-config-webdav.c:145
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Izbegavaj ako-poklapa (potrebno na Apaču < 2.2.8)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:447
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:441
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP greška: %s"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:475
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:469
 msgid "Could not parse response"
 msgstr "Ne mogu da obradim odgovor"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:484
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:478
 msgid "Empty response"
 msgstr "Prazan odgovor"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:492
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:486
 msgid "Unexpected reply from server"
 msgstr "Neočekivan odgovor sa servera"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1124
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1118
 msgid "Could not locate user's calendars"
 msgstr "Ne mogu da pronađem korisnikov kalendar."
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1348
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1342
 msgid "Path"
 msgstr "Putanja"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:264
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:200
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:263
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:199
 msgid "Choose a Calendar"
 msgstr "Izaberite kalendar"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:267
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:266
 msgid "Choose a Memo List"
 msgstr "Izaberite spisak beleški"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:270
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:269
 msgid "Choose a Task List"
 msgstr "Izaberite spisak sadataka"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:219
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:218
 msgid "Find Calendars"
 msgstr "Pronađite kalendare"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:222
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:221
 msgid "Find Memo Lists"
 msgstr "Pronađite spiskove beleški"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:225
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:224
 msgid "Find Task Lists"
 msgstr "Pronađite spiskove zadataka"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:243
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:242
 msgid "Email:"
 msgstr "El. pošta:"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:248
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:247
 msgid "Server handles meeting invitations"
 msgstr "Server upravlja pozivima na sastanak"
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:71
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:70
 msgid "Choose which address books to use."
 msgstr "Izaberite adresare koji ćete koristiti."
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:201
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:200
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "Koristi u kalendaru za rođendane i godišnjice"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:127
+#: ../modules/cal-config-google/e-google-chooser-button.c:126
 msgid "Default User Calendar"
 msgstr "Osnovni korisnički kalendar"
 
-#: ../modules/cal-config-google/e-google-chooser.c:515
+#: ../modules/cal-config-google/e-google-chooser.c:514
 #, c-format
 msgid "Enter Google password for user '%s'."
 msgstr "Unesite Guglovu lozinku za „%s“."
 
-#: ../modules/cal-config-google/e-google-chooser.c:532
+#: ../modules/cal-config-google/e-google-chooser.c:531
 msgid "User declined to provide a password"
 msgstr "Korisnik je odbio da dostavi lozinku"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:160
+#: ../modules/cal-config-local/evolution-cal-config-local.c:159
 msgid "Use an existing iCalendar (ics) file"
 msgstr "Koristite postojeću datoteku iKalendara (ics)"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:185
+#: ../modules/cal-config-local/evolution-cal-config-local.c:184
 msgid "iCalendar File"
 msgstr "Datoteka iKalendara"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:197
+#: ../modules/cal-config-local/evolution-cal-config-local.c:196
 msgid "Choose an iCalendar file"
 msgstr "Izaberite datoteku iKalendara"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:200
+#: ../modules/cal-config-local/evolution-cal-config-local.c:199
 msgid "File:"
 msgstr "Datoteka:"
 
-#: ../modules/cal-config-local/evolution-cal-config-local.c:215
+#: ../modules/cal-config-local/evolution-cal-config-local.c:214
 msgid "Allow Evolution to update the file"
 msgstr "Dopušta Evoluciji da osveži datoteku"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:320
+#. Translators: Please indicate whether your locale uses the
+#. * metric or imperial measurement system by changing this to
+#. * either "default:mm" or "default:inch", respectively.
+#. *
+#. * This string is just a fallback mechanism for systems on
+#. * which _NL_MEASUREMENT_MEASUREMENT is not available.
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:187
+#| msgid "Default"
+msgctxt "locale-metric"
+msgid "default:mm"
+msgstr "default:mm"
+
+#. Translators: This is the temperature in degrees
+#. * Fahrenheit. (\302\260 is U+00B0 DEGREE SIGN)
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:259
+msgid "Fahrenheit (°F)"
+msgstr "Farenhajt (°F)"
+
+#. Translators: This is the temperature in degrees
+#. * Celsius. (\302\260 is U+00B0 DEGREE SIGN)
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:264
+msgid "Centigrade (°C)"
+msgstr "Celzijus (°C)"
+
+#. Translators: This is the temperature in kelvin.
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:268
+msgid "Kelvin (K)"
+msgstr "Kelvin (K)"
+
+#: ../modules/cal-config-weather/evolution-cal-config-weather.c:270
+#| msgid "Unit"
+msgid "Units:"
+msgstr "Jedinice:"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:319
 #: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
 msgstr "U_vezi"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:406
+#: ../modules/calendar/e-cal-attachment-handler.c:405
 msgid "Select a Calendar"
 msgstr "Izaberite kalendar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:433
+#: ../modules/calendar/e-cal-attachment-handler.c:432
 msgid "Select a Task List"
 msgstr "Izaberite spisak zadataka"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:443
+#: ../modules/calendar/e-cal-attachment-handler.c:442
 msgid "I_mport to Calendar"
 msgstr "U_vezi u kalendar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:450
+#: ../modules/calendar/e-cal-attachment-handler.c:449
 msgid "I_mport to Tasks"
 msgstr "U_vezi u zadatke"
 
-#: ../modules/calendar/e-calendar-preferences.c:517
+#: ../modules/calendar/e-calendar-preferences.c:516
 msgid "Selected Calendars for Alarms"
 msgstr "Izabrani kalendari za alarme"
 
-#: ../modules/calendar/e-calendar-preferences.c:925
+#: ../modules/calendar/e-calendar-preferences.c:924
 msgid "Ti_me and date:"
 msgstr "_Vreme i datum:"
 
-#: ../modules/calendar/e-calendar-preferences.c:926
+#: ../modules/calendar/e-calendar-preferences.c:925
 msgid "_Date only:"
 msgstr "Samo _datum:"
 
@@ -16461,7 +16985,7 @@ msgid "_24 hour"
 msgstr "_24 - časovni"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
-#: ../modules/calendar/e-cal-shell-view-actions.c:1716
+#: ../modules/calendar/e-cal-shell-view-actions.c:1715
 msgid "Work Week"
 msgstr "Radna nedelja"
 
@@ -16615,72 +17139,72 @@ 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:313
-#: ../modules/calendar/e-cal-shell-view-actions.c:191
+#: ../modules/calendar/e-cal-shell-backend.c:312
+#: ../modules/calendar/e-cal-shell-view-actions.c:190
 msgid "New Calendar"
 msgstr "Novi kalendar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:322
+#: ../modules/calendar/e-cal-shell-backend.c:321
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:324
-#: ../modules/calendar/e-cal-shell-view-actions.c:1521
+#: ../modules/calendar/e-cal-shell-backend.c:323
+#: ../modules/calendar/e-cal-shell-view-actions.c:1520
 msgid "Create a new appointment"
 msgstr "Pravi novo zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:329
+#: ../modules/calendar/e-cal-shell-backend.c:328
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Celodnevno za_kazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:331
+#: ../modules/calendar/e-cal-shell-backend.c:330
 msgid "Create a new all-day appointment"
 msgstr "Pravi novo celodnevno zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:336
+#: ../modules/calendar/e-cal-shell-backend.c:335
 msgctxt "New"
 msgid "M_eeting"
 msgstr "S_astanak"
 
-#: ../modules/calendar/e-cal-shell-backend.c:338
+#: ../modules/calendar/e-cal-shell-backend.c:337
 msgid "Create a new meeting request"
 msgstr "Pravi novi zahtev za sastankom"
 
-#: ../modules/calendar/e-cal-shell-backend.c:346
+#: ../modules/calendar/e-cal-shell-backend.c:345
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "Kale_ndar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:348
-#: ../modules/calendar/e-cal-shell-view-actions.c:1395
+#: ../modules/calendar/e-cal-shell-backend.c:347
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "Create a new calendar"
 msgstr "Pravi novi kalendar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:703
+#: ../modules/calendar/e-cal-shell-backend.c:702
 msgid "Calendar and Tasks"
 msgstr "Kalendar i zadaci"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:119
+#: ../modules/calendar/e-cal-shell-sidebar.c:118
 #, c-format
 msgid "Opening calendar '%s'"
 msgstr "Otvaram kalendar „%s“"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:591
+#: ../modules/calendar/e-cal-shell-sidebar.c:589
 msgid "Calendar Selector"
 msgstr "Izbornik kalendara"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:216
-#: ../modules/calendar/e-cal-shell-view-actions.c:245
+#: ../modules/calendar/e-cal-shell-view-actions.c:215
+#: ../modules/calendar/e-cal-shell-view-actions.c:244
 msgid "Print"
 msgstr "Štampaj"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:291
+#: ../modules/calendar/e-cal-shell-view-actions.c:290
 msgid "Calendar Properties"
 msgstr "Osobine kalendara"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:322
+#: ../modules/calendar/e-cal-shell-view-actions.c:321
 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 "
@@ -16691,343 +17215,359 @@ 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:339
+#: ../modules/calendar/e-cal-shell-view-actions.c:338
 msgid "Purge events older than"
 msgstr "Izbaci događaje starije od"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:585
+#: ../modules/calendar/e-cal-shell-view-actions.c:584
 msgid "Copying Items"
 msgstr "Umnožavanje stavki"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:878
+#: ../modules/calendar/e-cal-shell-view-actions.c:877
 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:1211
+#: ../modules/calendar/e-cal-shell-view-actions.c:1210
 msgid "event"
 msgstr "događaj"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1213
-#: ../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:527
-#: ../modules/calendar/e-task-shell-view-actions.c:644
+#: ../modules/calendar/e-cal-shell-view-actions.c:1212
+#: ../modules/calendar/e-cal-shell-view-memopad.c:230
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:297
+#: ../modules/calendar/e-memo-shell-view-actions.c:526
+#: ../modules/calendar/e-task-shell-view-actions.c:643
 msgid "Save as iCalendar"
 msgstr "Sačuvaj kao iKalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1351
-#: ../modules/calendar/e-memo-shell-view-actions.c:608
+#: ../modules/calendar/e-cal-shell-view-actions.c:1350
+#: ../modules/calendar/e-memo-shell-view-actions.c:607
+#: ../modules/calendar/e-task-shell-view-actions.c:731
 msgid "_Copy..."
 msgstr "_Umnoži..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1358
+#: ../modules/calendar/e-cal-shell-view-actions.c:1357
 msgid "D_elete Calendar"
 msgstr "Ob_riši kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1360
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
 msgid "Delete the selected calendar"
 msgstr "Obrišite izabrani kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1367
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
 msgid "Go Back"
 msgstr "Idi nazad"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1374
+#: ../modules/calendar/e-cal-shell-view-actions.c:1373
 msgid "Go Forward"
 msgstr "Idi napred"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1381
+#: ../modules/calendar/e-cal-shell-view-actions.c:1380
 msgid "Select today"
 msgstr "Izaberi današnji dan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1386
+#: ../modules/calendar/e-cal-shell-view-actions.c:1385
 msgid "Select _Date"
 msgstr "Izaberi _datum"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1388
+#: ../modules/calendar/e-cal-shell-view-actions.c:1387
 msgid "Select a specific date"
 msgstr "Izaberite određeni datum"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1393
+#: ../modules/calendar/e-cal-shell-view-actions.c:1392
 msgid "_New Calendar"
 msgstr "Novi _kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1407
-#: ../modules/calendar/e-task-shell-view-actions.c:816
+#: ../modules/calendar/e-cal-shell-view-actions.c:1406
+#: ../modules/calendar/e-task-shell-view-actions.c:815
 msgid "Purg_e"
 msgstr "Izba_ci"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1409
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
 msgid "Purge old appointments and meetings"
 msgstr "Izbacite stara zakazivanja i sastanke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1416
+#: ../modules/calendar/e-cal-shell-view-actions.c:1415
 msgid "Refresh the selected calendar"
 msgstr "Osvežite izabrani kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1423
+#: ../modules/calendar/e-cal-shell-view-actions.c:1422
 msgid "Rename the selected calendar"
 msgstr "Preimenujte izabrani kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1428
-msgid "Find _next"
-msgstr "Pronađi _sledeće"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1427
+#| msgid "Find _next"
+msgid "Find _Next"
+msgstr "Nađi _sledeće"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1430
+#: ../modules/calendar/e-cal-shell-view-actions.c:1429
 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:1435
-msgid "Find _previous"
-msgstr "Pronađi _prethodno"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#| msgid "Find _previous"
+msgid "Find _Previous"
+msgstr "Nađi _prethodno"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1437
+#: ../modules/calendar/e-cal-shell-view-actions.c:1436
 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:1442
-msgid "Stop _running search"
+#: ../modules/calendar/e-cal-shell-view-actions.c:1441
+#| msgid "Stop _running search"
+msgid "Stop _Running Search"
 msgstr "Zaustavi _tekuću pretragu"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1444
+#: ../modules/calendar/e-cal-shell-view-actions.c:1443
 msgid "Stop currently running search"
 msgstr "Zaustavite trenutno pokrenutu pretragu"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1449
+#: ../modules/calendar/e-cal-shell-view-actions.c:1448
 msgid "Show _Only This Calendar"
 msgstr "Prikaži _samo ovaj kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1456
+#: ../modules/calendar/e-cal-shell-view-actions.c:1455
 msgid "Cop_y to Calendar..."
 msgstr "_Umnoži u kalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1463
+#: ../modules/calendar/e-cal-shell-view-actions.c:1462
 msgid "_Delegate Meeting..."
 msgstr "_Delegiraj sastanak..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1470
+#: ../modules/calendar/e-cal-shell-view-actions.c:1469
 msgid "_Delete Appointment"
 msgstr "_Obriši zakazano"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1472
+#: ../modules/calendar/e-cal-shell-view-actions.c:1471
 msgid "Delete selected appointments"
 msgstr "Obrišite izabrana zakazivanja"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1477
+#: ../modules/calendar/e-cal-shell-view-actions.c:1476
 msgid "Delete This _Occurrence"
 msgstr "Obriši ovu _pojavu"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1479
+#: ../modules/calendar/e-cal-shell-view-actions.c:1478
 msgid "Delete this occurrence"
 msgstr "Obrišite ovu pojavu"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1484
+#: ../modules/calendar/e-cal-shell-view-actions.c:1483
 msgid "Delete All Occ_urrences"
 msgstr "Obriši sve po_jave"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1486
+#: ../modules/calendar/e-cal-shell-view-actions.c:1485
 msgid "Delete all occurrences"
 msgstr "Obrišite sve pojave"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1491
+#: ../modules/calendar/e-cal-shell-view-actions.c:1490
 msgid "New All Day _Event..."
 msgstr "Novi celodnevni _događaj..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1493
+#: ../modules/calendar/e-cal-shell-view-actions.c:1492
 msgid "Create a new all day event"
 msgstr "Napravite novi celodnevni događaj"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1498
-#: ../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:601
-#: ../modules/calendar/e-task-shell-view-actions.c:725
+#: ../modules/calendar/e-cal-shell-view-actions.c:1497
+#: ../modules/calendar/e-cal-shell-view-memopad.c:264
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
+#: ../modules/calendar/e-memo-shell-view-actions.c:600
+#: ../modules/calendar/e-task-shell-view-actions.c:724
 msgid "_Forward as iCalendar..."
 msgstr "_Prosledi kao iKalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1505
+#: ../modules/calendar/e-cal-shell-view-actions.c:1504
 msgid "New _Meeting..."
 msgstr "Novi _sastanak..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1507
+#: ../modules/calendar/e-cal-shell-view-actions.c:1506
 msgid "Create a new meeting"
 msgstr "Napravite novi sastanak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1512
+#: ../modules/calendar/e-cal-shell-view-actions.c:1511
 msgid "Mo_ve to Calendar..."
 msgstr "Pren_esi u kalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1519
+#: ../modules/calendar/e-cal-shell-view-actions.c:1518
 msgid "New _Appointment..."
 msgstr "Novo _zakazivanje..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1526
+#: ../modules/calendar/e-cal-shell-view-actions.c:1525
 msgid "Make this Occurrence _Movable"
 msgstr "Neka ova pojava bude _pokretna"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1533
+#: ../modules/calendar/e-cal-shell-view-actions.c:1532
 msgid "_Open Appointment"
 msgstr "_Otvori sastanak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1535
+#: ../modules/calendar/e-cal-shell-view-actions.c:1534
 msgid "View the current appointment"
 msgstr "Pregledajte tekuće zakazivanje"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1540
+#: ../modules/calendar/e-cal-shell-view-actions.c:1539
 msgid "_Reply"
 msgstr "_Odgovori"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1554
+#: ../modules/calendar/e-cal-shell-view-actions.c:1553
 msgid "_Schedule Meeting..."
 msgstr "_Zakaži sastanak..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1556
+#: ../modules/calendar/e-cal-shell-view-actions.c:1555
 msgid "Converts an appointment to a meeting"
 msgstr "Pretvorite zakazano u sastanak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1561
+#: ../modules/calendar/e-cal-shell-view-actions.c:1560
 msgid "Conv_ert to Appointment..."
 msgstr "Pre_tvori u zakazano..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1563
+#: ../modules/calendar/e-cal-shell-view-actions.c:1562
 msgid "Converts a meeting to an appointment"
 msgstr "Pretvorite sastanak u zakazano"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1568
+#: ../modules/calendar/e-cal-shell-view-actions.c:1567
 msgid "Quit"
 msgstr "Izađi"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1688
+#: ../modules/calendar/e-cal-shell-view-actions.c:1687
 msgid "Day"
 msgstr "Dan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1690
+#: ../modules/calendar/e-cal-shell-view-actions.c:1689
 msgid "Show one day"
 msgstr "Prikaži jedan dan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1695
+#: ../modules/calendar/e-cal-shell-view-actions.c:1694
 msgid "List"
 msgstr "Spisak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1697
+#: ../modules/calendar/e-cal-shell-view-actions.c:1696
 msgid "Show as list"
 msgstr "Prikaži kao spisak"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1702
+#: ../modules/calendar/e-cal-shell-view-actions.c:1701
 msgid "Month"
 msgstr "Mesec"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1704
+#: ../modules/calendar/e-cal-shell-view-actions.c:1703
 msgid "Show one month"
 msgstr "Prikaži jedan mesec"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1709
+#: ../modules/calendar/e-cal-shell-view-actions.c:1708
 msgid "Week"
 msgstr "Nedelja"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1711
+#: ../modules/calendar/e-cal-shell-view-actions.c:1710
 msgid "Show one week"
 msgstr "Prikaži jednu nedelju"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1718
+#: ../modules/calendar/e-cal-shell-view-actions.c:1717
 msgid "Show one work week"
 msgstr "Prikaži jednu radnu nedelju"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1726
+#: ../modules/calendar/e-cal-shell-view-actions.c:1725
 msgid "Active Appointments"
 msgstr "Aktivna zakazivanja"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1740
+#: ../modules/calendar/e-cal-shell-view-actions.c:1739
 msgid "Next 7 Days' Appointments"
 msgstr "Zakazano za sledeću nedelju"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1747
+#: ../modules/calendar/e-cal-shell-view-actions.c:1746
 msgid "Occurs Less Than 5 Times"
 msgstr "Dešava se manje od 5 puta"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1778
-#: ../modules/calendar/e-memo-shell-view-actions.c:798
-#: ../modules/calendar/e-task-shell-view-actions.c:997
+#: ../modules/calendar/e-cal-shell-view-actions.c:1777
+#: ../modules/calendar/e-memo-shell-view-actions.c:797
+#: ../modules/calendar/e-task-shell-view-actions.c:996
 msgid "Description contains"
 msgstr "Opis sadrži"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1785
-#: ../modules/calendar/e-memo-shell-view-actions.c:805
-#: ../modules/calendar/e-task-shell-view-actions.c:1004
+#: ../modules/calendar/e-cal-shell-view-actions.c:1784
+#: ../modules/calendar/e-memo-shell-view-actions.c:804
+#: ../modules/calendar/e-task-shell-view-actions.c:1003
 msgid "Summary contains"
 msgstr "Sažetak sadrži"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1797
+#: ../modules/calendar/e-cal-shell-view-actions.c:1794
+#: ../modules/calendar/e-cal-shell-view-actions.c:1808
+#: ../modules/calendar/e-cal-shell-view-memopad.c:295
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:382
+#: ../modules/calendar/e-memo-shell-view-actions.c:814
+#: ../modules/calendar/e-memo-shell-view-actions.c:828
+#: ../modules/calendar/e-task-shell-view-actions.c:1013
+#: ../modules/calendar/e-task-shell-view-actions.c:1027
+#| msgid "_Print..."
+msgid "Print..."
+msgstr "Štampaj..."
+
+#: ../modules/calendar/e-cal-shell-view-actions.c:1796
 msgid "Print this calendar"
 msgstr "Štampa ovaj kalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1804
+#: ../modules/calendar/e-cal-shell-view-actions.c:1803
 msgid "Preview the calendar to be printed"
 msgstr "Pregled kalendara pred štampu"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1826
-#: ../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:846
-#: ../modules/calendar/e-task-shell-view-actions.c:1045
+#: ../modules/calendar/e-cal-shell-view-actions.c:1825
+#: ../modules/calendar/e-cal-shell-view-memopad.c:305
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:392
+#: ../modules/calendar/e-memo-shell-view-actions.c:845
+#: ../modules/calendar/e-task-shell-view-actions.c:1044
 msgid "_Save as iCalendar..."
 msgstr "_Sačuvaj kao iKalendar..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1903
+#: ../modules/calendar/e-cal-shell-view-actions.c:1902
 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:525
+#: ../modules/calendar/e-cal-shell-view-memopad.c:228
+#: ../modules/calendar/e-memo-shell-view-actions.c:524
 msgid "memo"
 msgstr "beleška"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:272
-#: ../modules/calendar/e-memo-shell-view-actions.c:657
+#: ../modules/calendar/e-cal-shell-view-memopad.c:271
+#: ../modules/calendar/e-memo-shell-view-actions.c:656
 msgid "New _Memo"
 msgstr "Nova _beleška"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:274
-#: ../modules/calendar/e-memo-shell-backend.c:219
-#: ../modules/calendar/e-memo-shell-view-actions.c:659
+#: ../modules/calendar/e-cal-shell-view-memopad.c:273
+#: ../modules/calendar/e-memo-shell-backend.c:218
+#: ../modules/calendar/e-memo-shell-view-actions.c:658
 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:664
+#: ../modules/calendar/e-cal-shell-view-memopad.c:278
+#: ../modules/calendar/e-memo-shell-view-actions.c:663
 msgid "_Open Memo"
 msgstr "_Otvori belešku"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:281
-#: ../modules/calendar/e-memo-shell-view-actions.c:666
+#: ../modules/calendar/e-cal-shell-view-memopad.c:280
+#: ../modules/calendar/e-memo-shell-view-actions.c:665
 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:671
-#: ../modules/calendar/e-task-shell-view-actions.c:809
+#: ../modules/calendar/e-cal-shell-view-memopad.c:285
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:372
+#: ../modules/calendar/e-memo-shell-view-actions.c:670
+#: ../modules/calendar/e-task-shell-view-actions.c:808
 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:831
+#: ../modules/calendar/e-cal-shell-view-memopad.c:297
+#: ../modules/calendar/e-memo-shell-view-actions.c:830
 msgid "Print the selected memo"
 msgstr "Štampajte izabranu belešku"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1566
+#: ../modules/calendar/e-cal-shell-view-private.c:1561
 msgid "Searching next matching event"
 msgstr "Tražim sledeći odgovarajući događaj"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1567
+#: ../modules/calendar/e-cal-shell-view-private.c:1562
 msgid "Searching previous matching event"
 msgstr "Tražim prethodni odgovarajući događaj"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1588
+#: ../modules/calendar/e-cal-shell-view-private.c:1583
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
@@ -17036,7 +17576,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:1592
+#: ../modules/calendar/e-cal-shell-view-private.c:1587
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
@@ -17045,7 +17585,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:1617
+#: ../modules/calendar/e-cal-shell-view-private.c:1612
 msgid "Cannot search with no active calendar"
 msgstr "Ne mogu da tražim ako nema aktivnog kalendara"
 
@@ -17053,177 +17593,177 @@ msgstr "Ne mogu da tražim ako nema aktivnog kalendara"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:296
-#: ../modules/calendar/e-task-shell-view-actions.c:642
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:295
+#: ../modules/calendar/e-task-shell-view-actions.c:641
 msgid "task"
 msgstr "zadatak"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:331
-#: ../modules/calendar/e-task-shell-view-actions.c:704
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
+#: ../modules/calendar/e-task-shell-view-actions.c:703
 msgid "_Assign Task"
 msgstr "_Dodeli zadatak"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:345
-#: ../modules/calendar/e-task-shell-view-actions.c:781
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
+#: ../modules/calendar/e-task-shell-view-actions.c:780
 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:783
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
+#: ../modules/calendar/e-task-shell-view-actions.c:782
 msgid "Mark selected tasks as complete"
 msgstr "Obeležite izabrane zadatke kao završene"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:352
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
 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:790
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
+#: ../modules/calendar/e-task-shell-view-actions.c:789
 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:795
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
+#: ../modules/calendar/e-task-shell-view-actions.c:794
 msgid "New _Task"
 msgstr "Novi zad_atak"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
-#: ../modules/calendar/e-task-shell-backend.c:216
-#: ../modules/calendar/e-task-shell-view-actions.c:797
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:360
+#: ../modules/calendar/e-task-shell-backend.c:215
+#: ../modules/calendar/e-task-shell-view-actions.c:796
 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:802
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
+#: ../modules/calendar/e-task-shell-view-actions.c:801
 msgid "_Open Task"
 msgstr "_Otvori zadatak"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:368
-#: ../modules/calendar/e-task-shell-view-actions.c:804
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:367
+#: ../modules/calendar/e-task-shell-view-actions.c:803
 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:1030
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:384
+#: ../modules/calendar/e-task-shell-view-actions.c:1029
 msgid "Print the selected task"
 msgstr "Štampa izabrani zadatak"
 
-#: ../modules/calendar/e-memo-shell-backend.c:208
-#: ../modules/calendar/e-memo-shell-view-actions.c:196
+#: ../modules/calendar/e-memo-shell-backend.c:207
+#: ../modules/calendar/e-memo-shell-view-actions.c:195
 msgid "New Memo List"
 msgstr "Novi spisak beleške"
 
-#: ../modules/calendar/e-memo-shell-backend.c:217
+#: ../modules/calendar/e-memo-shell-backend.c:216
 msgctxt "New"
 msgid "Mem_o"
 msgstr "Belešk_a"
 
-#: ../modules/calendar/e-memo-shell-backend.c:224
+#: ../modules/calendar/e-memo-shell-backend.c:223
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Deljena beleška"
 
-#: ../modules/calendar/e-memo-shell-backend.c:226
+#: ../modules/calendar/e-memo-shell-backend.c:225
 msgid "Create a new shared memo"
 msgstr "Napravite novu deljenu belešku"
 
-#: ../modules/calendar/e-memo-shell-backend.c:234
+#: ../modules/calendar/e-memo-shell-backend.c:233
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "Spi_sak beleški"
 
-#: ../modules/calendar/e-memo-shell-backend.c:236
-#: ../modules/calendar/e-memo-shell-view-actions.c:624
+#: ../modules/calendar/e-memo-shell-backend.c:235
+#: ../modules/calendar/e-memo-shell-view-actions.c:623
 msgid "Create a new memo list"
 msgstr "Sastavite novi spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:117
+#: ../modules/calendar/e-memo-shell-sidebar.c:116
 #, c-format
 msgid "Opening memo list '%s'"
 msgstr "Otvaram spisak beleški „%s“"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:547
+#: ../modules/calendar/e-memo-shell-sidebar.c:545
 msgid "Memo List Selector"
 msgstr "Izbornik spiskova beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:212
-#: ../modules/calendar/e-memo-shell-view-actions.c:227
+#: ../modules/calendar/e-memo-shell-view-actions.c:211
+#: ../modules/calendar/e-memo-shell-view-actions.c:226
 msgid "Print Memos"
 msgstr "Štampaj beleške"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:268
+#: ../modules/calendar/e-memo-shell-view-actions.c:267
 msgid "Memo List Properties"
 msgstr "Osobine spiska zadataka"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:587
+#: ../modules/calendar/e-memo-shell-view-actions.c:586
 msgid "_Delete Memo"
 msgstr "_Obriši belešku"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:594
+#: ../modules/calendar/e-memo-shell-view-actions.c:593
 msgid "_Find in Memo..."
 msgstr "P_ronađi u belešci..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:596
+#: ../modules/calendar/e-memo-shell-view-actions.c:595
 msgid "Search for text in the displayed memo"
 msgstr "Pretražite tekst u prikazanoj belešci"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:615
+#: ../modules/calendar/e-memo-shell-view-actions.c:614
 msgid "D_elete Memo List"
 msgstr "Ob_riši spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:617
+#: ../modules/calendar/e-memo-shell-view-actions.c:616
 msgid "Delete the selected memo list"
 msgstr "Obrišite izabrani spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-memo-shell-view-actions.c:621
 msgid "_New Memo List"
 msgstr "_Novi spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:638
+#: ../modules/calendar/e-memo-shell-view-actions.c:637
 msgid "Refresh the selected memo list"
 msgstr "Osvežite izabrani spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:645
+#: ../modules/calendar/e-memo-shell-view-actions.c:644
 msgid "Rename the selected memo list"
 msgstr "Preimenujte izabrani spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:650
+#: ../modules/calendar/e-memo-shell-view-actions.c:649
 msgid "Show _Only This Memo List"
 msgstr "Prikaži _samo ovaj spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:729
+#: ../modules/calendar/e-memo-shell-view-actions.c:728
 msgid "Memo _Preview"
 msgstr "_Pregled beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:731
+#: ../modules/calendar/e-memo-shell-view-actions.c:730
 msgid "Show memo preview pane"
 msgstr "Prikažite pregled beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:752
+#: ../modules/calendar/e-memo-shell-view-actions.c:751
 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:759
+#: ../modules/calendar/e-memo-shell-view-actions.c:758
 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:817
+#: ../modules/calendar/e-memo-shell-view-actions.c:816
 msgid "Print the list of memos"
 msgstr "Štampajte spisak beleški"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:824
+#: ../modules/calendar/e-memo-shell-view-actions.c:823
 msgid "Preview the list of memos to be printed"
 msgstr "Pregledajte spisak beleški za štampu"
 
-#: ../modules/calendar/e-memo-shell-view.c:239
+#: ../modules/calendar/e-memo-shell-view.c:238
 msgid "Delete Memos"
 msgstr "Obriši beleške"
 
-#: ../modules/calendar/e-memo-shell-view.c:241
+#: ../modules/calendar/e-memo-shell-view.c:240
 msgid "Delete Memo"
 msgstr "Obriši belešku"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:538
+#: ../modules/calendar/e-memo-shell-view-private.c:537
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -17232,60 +17772,60 @@ msgstr[1] "%d beleške"
 msgstr[2] "%d beleški"
 msgstr[3] "%d beleška"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:542
-#: ../modules/calendar/e-task-shell-view-private.c:746
+#: ../modules/calendar/e-memo-shell-view-private.c:541
+#: ../modules/calendar/e-task-shell-view-private.c:747
 #, c-format
 msgid "%d selected"
 msgstr "izabranih — %d"
 
-#: ../modules/calendar/e-task-shell-backend.c:205
-#: ../modules/calendar/e-task-shell-view-actions.c:219
+#: ../modules/calendar/e-task-shell-backend.c:204
+#: ../modules/calendar/e-task-shell-view-actions.c:218
 msgid "New Task List"
 msgstr "Novi spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-backend.c:214
+#: ../modules/calendar/e-task-shell-backend.c:213
 msgctxt "New"
 msgid "_Task"
 msgstr "_Zadatak"
 
-#: ../modules/calendar/e-task-shell-backend.c:221
+#: ../modules/calendar/e-task-shell-backend.c:220
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "Dodeljen_i zadatak"
 
-#: ../modules/calendar/e-task-shell-backend.c:223
+#: ../modules/calendar/e-task-shell-backend.c:222
 msgid "Create a new assigned task"
 msgstr "Napravite novi dodeljeni zadatak"
 
-#: ../modules/calendar/e-task-shell-backend.c:231
+#: ../modules/calendar/e-task-shell-backend.c:230
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Spisak za_dataka"
 
-#: ../modules/calendar/e-task-shell-backend.c:233
-#: ../modules/calendar/e-task-shell-view-actions.c:748
+#: ../modules/calendar/e-task-shell-backend.c:232
+#: ../modules/calendar/e-task-shell-view-actions.c:747
 msgid "Create a new task list"
 msgstr "Napravite novi spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:117
+#: ../modules/calendar/e-task-shell-sidebar.c:116
 #, c-format
 msgid "Opening task list '%s'"
 msgstr "Otvaram spisak zadataka „%s“"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:547
+#: ../modules/calendar/e-task-shell-sidebar.c:545
 msgid "Task List Selector"
 msgstr "Izbornik spiska zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:235
-#: ../modules/calendar/e-task-shell-view-actions.c:250
+#: ../modules/calendar/e-task-shell-view-actions.c:234
+#: ../modules/calendar/e-task-shell-view-actions.c:249
 msgid "Print Tasks"
 msgstr "Štampaj zadatke"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:291
+#: ../modules/calendar/e-task-shell-view-actions.c:290
 msgid "Task List Properties"
 msgstr "Osobine spiska zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:586
+#: ../modules/calendar/e-task-shell-view-actions.c:585
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -17297,115 +17837,111 @@ msgstr ""
 "\n"
 "Da obrišem ove zadatke?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:593
+#: ../modules/calendar/e-task-shell-view-actions.c:592
 msgid "Do not ask me again"
 msgstr "Ne pitaj me ponovo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:711
+#: ../modules/calendar/e-task-shell-view-actions.c:710
 msgid "_Delete Task"
 msgstr "_Obriši zadatak"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:718
+#: ../modules/calendar/e-task-shell-view-actions.c:717
 msgid "_Find in Task..."
 msgstr "_Pronađi u zadatku..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:720
+#: ../modules/calendar/e-task-shell-view-actions.c:719
 msgid "Search for text in the displayed task"
 msgstr "Pretraži tekst u prikazanom zadatku"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:732
-msgid "Copy..."
-msgstr "Umnoži..."
-
-#: ../modules/calendar/e-task-shell-view-actions.c:739
+#: ../modules/calendar/e-task-shell-view-actions.c:738
 msgid "D_elete Task List"
 msgstr "O_briši spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:741
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 msgid "Delete the selected task list"
 msgstr "Obrišite izabrani spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:746
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "_New Task List"
 msgstr "No_vi spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:762
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "Refresh the selected task list"
 msgstr "Osvežite izabrani spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:769
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "Rename the selected task list"
 msgstr "Preimenujte izabrani spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:774
+#: ../modules/calendar/e-task-shell-view-actions.c:773
 msgid "Show _Only This Task List"
 msgstr "Prikaži _samo ovaj spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:787
 msgid "Mar_k as Incomplete"
 msgstr "O_znači kao nezavršeno"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:818
+#: ../modules/calendar/e-task-shell-view-actions.c:817
 msgid "Delete completed tasks"
 msgstr "Obrišite završene zadatke"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:893
+#: ../modules/calendar/e-task-shell-view-actions.c:892
 msgid "Task _Preview"
 msgstr "Pregled za_dataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:895
+#: ../modules/calendar/e-task-shell-view-actions.c:894
 msgid "Show task preview pane"
 msgstr "Prikažite pregled zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:916
+#: ../modules/calendar/e-task-shell-view-actions.c:915
 msgid "Show task preview below the task list"
 msgstr "Prikažite pregled ispod spiska zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:923
+#: ../modules/calendar/e-task-shell-view-actions.c:922
 msgid "Show task preview alongside the task list"
 msgstr "Prikažite pregled pored spiska zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:931
+#: ../modules/calendar/e-task-shell-view-actions.c:930
 msgid "Active Tasks"
 msgstr "Aktivni zadaci"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:945
+#: ../modules/calendar/e-task-shell-view-actions.c:944
 msgid "Completed Tasks"
 msgstr "Završeni zadaci"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:952
+#: ../modules/calendar/e-task-shell-view-actions.c:951
 msgid "Next 7 Days' Tasks"
 msgstr "Zadaci za sledeću nedelju"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:959
+#: ../modules/calendar/e-task-shell-view-actions.c:958
 msgid "Overdue Tasks"
 msgstr "Prekoračeni zadaci"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:966
+#: ../modules/calendar/e-task-shell-view-actions.c:965
 msgid "Tasks with Attachments"
 msgstr "Zadaci sa prilozima"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1016
+#: ../modules/calendar/e-task-shell-view-actions.c:1015
 msgid "Print the list of tasks"
 msgstr "Štampajte spisak zadataka"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1023
+#: ../modules/calendar/e-task-shell-view-actions.c:1022
 msgid "Preview the list of tasks to be printed"
 msgstr "Pregledajte spisak zadataka pred štampu"
 
-#: ../modules/calendar/e-task-shell-view.c:374
+#: ../modules/calendar/e-task-shell-view.c:373
 msgid "Delete Tasks"
 msgstr "Obriši zadatke"
 
-#: ../modules/calendar/e-task-shell-view.c:376
+#: ../modules/calendar/e-task-shell-view.c:375
 msgid "Delete Task"
 msgstr "Obriši zadatak"
 
-#: ../modules/calendar/e-task-shell-view-private.c:631
+#: ../modules/calendar/e-task-shell-view-private.c:632
 msgid "Expunging"
 msgstr "Izbacivanje"
 
-#: ../modules/calendar/e-task-shell-view-private.c:742
+#: ../modules/calendar/e-task-shell-view-private.c:743
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -17424,49 +17960,49 @@ msgstr "Prikazuje delove kao pozivnicu"
 
 #. strftime format of a time,
 #. * in 24-hour format, without seconds.
-#: ../modules/itip-formatter/itip-view.c:235
+#: ../modules/itip-formatter/itip-view.c:228
 msgid "Today %H:%M"
 msgstr "Danas u %H:%M"
 
 #. strftime format of a time,
 #. * in 24-hour format.
-#: ../modules/itip-formatter/itip-view.c:239
+#: ../modules/itip-formatter/itip-view.c:232
 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:248
+#: ../modules/itip-formatter/itip-view.c:241
 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:263
+#: ../modules/itip-formatter/itip-view.c:256
 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:267
+#: ../modules/itip-formatter/itip-view.c:260
 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:272
+#: ../modules/itip-formatter/itip-view.c:265
 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:276
+#: ../modules/itip-formatter/itip-view.c:269
 msgid "Tomorrow %l:%M:%S %p"
 msgstr "Sutra u %l:%M %S %p"
 
 #. strftime format of a weekday.
-#: ../modules/itip-formatter/itip-view.c:295
+#: ../modules/itip-formatter/itip-view.c:288
 #, c-format
 msgid "%A"
 msgstr "%A"
@@ -17476,69 +18012,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:300
+#: ../modules/itip-formatter/itip-view.c:293
 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:304
+#: ../modules/itip-formatter/itip-view.c:297
 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:309
+#: ../modules/itip-formatter/itip-view.c:302
 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:313
+#: ../modules/itip-formatter/itip-view.c:306
 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:322
+#: ../modules/itip-formatter/itip-view.c:315
 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:328
+#: ../modules/itip-formatter/itip-view.c:321
 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:332
+#: ../modules/itip-formatter/itip-view.c:325
 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:337
+#: ../modules/itip-formatter/itip-view.c:330
 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:341
+#: ../modules/itip-formatter/itip-view.c:334
 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:347
+#: ../modules/itip-formatter/itip-view.c:340
 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:352
+#: ../modules/itip-formatter/itip-view.c:345
 msgid "%A, %B %e, %Y %H:%M"
 msgstr "%A, %B %e, %Y. %H:%M"
 
@@ -17548,167 +18084,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:356
+#: ../modules/itip-formatter/itip-view.c:349
 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:361
+#: ../modules/itip-formatter/itip-view.c:354
 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:365
+#: ../modules/itip-formatter/itip-view.c:358
 msgid "%A, %B %e, %Y %l:%M:%S %p"
 msgstr "%A, %B %e, %Y. %l:%M:%S %p"
 
-#: ../modules/itip-formatter/itip-view.c:403
-#: ../modules/itip-formatter/itip-view.c:404
-#: ../modules/itip-formatter/itip-view.c:493
-#: ../modules/itip-formatter/itip-view.c:494
-#: ../modules/itip-formatter/itip-view.c:583
+#: ../modules/itip-formatter/itip-view.c:396
+#: ../modules/itip-formatter/itip-view.c:397
+#: ../modules/itip-formatter/itip-view.c:486
+#: ../modules/itip-formatter/itip-view.c:487
+#: ../modules/itip-formatter/itip-view.c:576
 msgid "An unknown person"
 msgstr "Nepoznata osoba"
 
-#: ../modules/itip-formatter/itip-view.c:408
-#: ../modules/itip-formatter/itip-view.c:498
-#: ../modules/itip-formatter/itip-view.c:587
+#: ../modules/itip-formatter/itip-view.c:401
+#: ../modules/itip-formatter/itip-view.c:491
+#: ../modules/itip-formatter/itip-view.c:580
 #, c-format
 msgid "Please respond on behalf of %s"
 msgstr "Odgovorite u ime %s"
 
-#: ../modules/itip-formatter/itip-view.c:410
-#: ../modules/itip-formatter/itip-view.c:500
-#: ../modules/itip-formatter/itip-view.c:589
+#: ../modules/itip-formatter/itip-view.c:403
+#: ../modules/itip-formatter/itip-view.c:493
+#: ../modules/itip-formatter/itip-view.c:582
 #, c-format
 msgid "Received on behalf of %s"
 msgstr "Primljeno u ime %s"
 
-#: ../modules/itip-formatter/itip-view.c:415
+#: ../modules/itip-formatter/itip-view.c:408
 #, 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:417
+#: ../modules/itip-formatter/itip-view.c:410
 #, c-format
 msgid "%s has published the following meeting information:"
 msgstr "%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 delegated the following meeting to you:"
 msgstr "%s vam delegira sledeći sastanak:"
 
-#: ../modules/itip-formatter/itip-view.c:425
+#: ../modules/itip-formatter/itip-view.c:418
 #, 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:427
+#: ../modules/itip-formatter/itip-view.c:420
 #, 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:433
+#: ../modules/itip-formatter/itip-view.c:426
 #, 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:435
+#: ../modules/itip-formatter/itip-view.c:428
 #, 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:439
+#: ../modules/itip-formatter/itip-view.c:432
 #, 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:441
+#: ../modules/itip-formatter/itip-view.c:434
 #, 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:445
+#: ../modules/itip-formatter/itip-view.c:438
 #, 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:447
+#: ../modules/itip-formatter/itip-view.c:440
 #, 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:451
+#: ../modules/itip-formatter/itip-view.c:444
 #, 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:453
+#: ../modules/itip-formatter/itip-view.c:446
 #, c-format
 msgid "%s has canceled the following meeting:"
 msgstr "%s otkazuje sledeći sastanak:"
 
-#: ../modules/itip-formatter/itip-view.c:457
+#: ../modules/itip-formatter/itip-view.c:450
 #, 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:459
+#: ../modules/itip-formatter/itip-view.c:452
 #, c-format
 msgid "%s has proposed the following meeting changes:"
 msgstr "%s predlaže sledeće izmene sastanka:"
 
-#: ../modules/itip-formatter/itip-view.c:463
+#: ../modules/itip-formatter/itip-view.c:456
 #, 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:465
+#: ../modules/itip-formatter/itip-view.c:458
 #, c-format
 msgid "%s has declined the following meeting changes:"
 msgstr "%s odbija sledeće izmene sastanka:"
 
-#: ../modules/itip-formatter/itip-view.c:505
+#: ../modules/itip-formatter/itip-view.c:498
 #, 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:507
+#: ../modules/itip-formatter/itip-view.c:500
 #, c-format
 msgid "%s has published the following task:"
 msgstr "%s objavi sledeće zaduženje:"
 
-#: ../modules/itip-formatter/itip-view.c:512
+#: ../modules/itip-formatter/itip-view.c:505
 #, 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:515
+#: ../modules/itip-formatter/itip-view.c:508
 #, c-format
 msgid "%s through %s has assigned you a task:"
 msgstr "%s preko %s vam dodeljuje zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:517
+#: ../modules/itip-formatter/itip-view.c:510
 #, c-format
 msgid "%s has assigned you a task:"
 msgstr "%s vam dodeljuje zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:523
+#: ../modules/itip-formatter/itip-view.c:516
 #, 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:525
+#: ../modules/itip-formatter/itip-view.c:518
 #, 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:529
+#: ../modules/itip-formatter/itip-view.c:522
 #, c-format
 msgid ""
 "%s through %s wishes to receive the latest information for the following "
@@ -17716,334 +18252,334 @@ msgid ""
 msgstr ""
 "%s preko %s želi da dobije najnovije informacije za sledeći dodeljeni zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:531
+#: ../modules/itip-formatter/itip-view.c:524
 #, 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:535
+#: ../modules/itip-formatter/itip-view.c:528
 #, 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:537
+#: ../modules/itip-formatter/itip-view.c:530
 #, 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:541
+#: ../modules/itip-formatter/itip-view.c:534
 #, 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:543
+#: ../modules/itip-formatter/itip-view.c:536
 #, c-format
 msgid "%s has canceled the following assigned task:"
 msgstr "%s otkazuje sledeći dodeljeni zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:547
+#: ../modules/itip-formatter/itip-view.c:540
 #, 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:549
+#: ../modules/itip-formatter/itip-view.c:542
 #, 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:553
+#: ../modules/itip-formatter/itip-view.c:546
 #, 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:555
+#: ../modules/itip-formatter/itip-view.c:548
 #, c-format
 msgid "%s has declined the following assigned task:"
 msgstr "%s odbija sledeći dodeljeni zadatak:"
 
-#: ../modules/itip-formatter/itip-view.c:594
+#: ../modules/itip-formatter/itip-view.c:587
 #, 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:596
+#: ../modules/itip-formatter/itip-view.c:589
 #, c-format
 msgid "%s has published the following memo:"
 msgstr "%s objavljuje sledeću belešku:"
 
-#: ../modules/itip-formatter/itip-view.c:601
+#: ../modules/itip-formatter/itip-view.c:594
 #, 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:603
+#: ../modules/itip-formatter/itip-view.c:596
 #, 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:607
+#: ../modules/itip-formatter/itip-view.c:600
 #, 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:609
+#: ../modules/itip-formatter/itip-view.c:602
 #, c-format
 msgid "%s has canceled the following shared memo:"
 msgstr "%s otkazuje sledeće deljenu belešku:"
 
-#: ../modules/itip-formatter/itip-view.c:682
+#: ../modules/itip-formatter/itip-view.c:675
 msgid "All day:"
 msgstr "Celodnevno:"
 
-#: ../modules/itip-formatter/itip-view.c:688
+#: ../modules/itip-formatter/itip-view.c:681
 msgid "Start day:"
 msgstr "Početak dana:"
 
-#: ../modules/itip-formatter/itip-view.c:688
-#: ../modules/itip-formatter/itip-view.c:1502
+#: ../modules/itip-formatter/itip-view.c:681
+#: ../modules/itip-formatter/itip-view.c:1504
 msgid "Start time:"
 msgstr "Vreme početka:"
 
-#: ../modules/itip-formatter/itip-view.c:697
+#: ../modules/itip-formatter/itip-view.c:690
 msgid "End day:"
 msgstr "Kraj dana:"
 
-#: ../modules/itip-formatter/itip-view.c:697
-#: ../modules/itip-formatter/itip-view.c:1503
+#: ../modules/itip-formatter/itip-view.c:690
+#: ../modules/itip-formatter/itip-view.c:1505
 msgid "End time:"
 msgstr "Vreme završetka:"
 
-#: ../modules/itip-formatter/itip-view.c:1028
+#: ../modules/itip-formatter/itip-view.c:1030
 msgid "Ope_n Calendar"
 msgstr "O_tvori kalendar"
 
-#: ../modules/itip-formatter/itip-view.c:1031
+#: ../modules/itip-formatter/itip-view.c:1033
 msgid "_Decline all"
 msgstr "Od_bij sve"
 
-#: ../modules/itip-formatter/itip-view.c:1034
+#: ../modules/itip-formatter/itip-view.c:1036
 msgid "_Decline"
 msgstr "_Odbij"
 
-#: ../modules/itip-formatter/itip-view.c:1037
+#: ../modules/itip-formatter/itip-view.c:1039
 msgid "_Tentative all"
 msgstr "Sve sa re_zervom"
 
-#: ../modules/itip-formatter/itip-view.c:1040
+#: ../modules/itip-formatter/itip-view.c:1042
 msgid "_Tentative"
 msgstr "Sa _rezervom"
 
-#: ../modules/itip-formatter/itip-view.c:1043
+#: ../modules/itip-formatter/itip-view.c:1045
 msgid "Acce_pt all"
 msgstr "P_rihvati sve"
 
-#: ../modules/itip-formatter/itip-view.c:1046
+#: ../modules/itip-formatter/itip-view.c:1048
 msgid "Acce_pt"
 msgstr "Prih_vaćeno"
 
-#: ../modules/itip-formatter/itip-view.c:1049
+#: ../modules/itip-formatter/itip-view.c:1051
 msgid "Send _Information"
 msgstr "Pošalji _podatke"
 
-#: ../modules/itip-formatter/itip-view.c:1052
+#: ../modules/itip-formatter/itip-view.c:1054
 msgid "_Update Attendee Status"
 msgstr "Ažuriraj stanje učesni_ka"
 
-#: ../modules/itip-formatter/itip-view.c:1055
+#: ../modules/itip-formatter/itip-view.c:1057
 msgid "_Update"
 msgstr "_Osveži"
 
-#: ../modules/itip-formatter/itip-view.c:1505
-#: ../modules/itip-formatter/itip-view.c:1553
-#: ../modules/itip-formatter/itip-view.c:1624
+#: ../modules/itip-formatter/itip-view.c:1507
+#: ../modules/itip-formatter/itip-view.c:1555
+#: ../modules/itip-formatter/itip-view.c:1626
 msgid "Comment:"
 msgstr "Napomena:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1541
+#: ../modules/itip-formatter/itip-view.c:1543
 msgid "Send reply to sender"
 msgstr "Odgovori pošiljaocu"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1556
+#: ../modules/itip-formatter/itip-view.c:1558
 msgid "Send _updates to attendees"
 msgstr "Pošalji _ažurirane podatke učesnicima"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1559
+#: ../modules/itip-formatter/itip-view.c:1561
 msgid "_Apply to all instances"
 msgstr "Pri_meni na sve nivoe"
 
-#: ../modules/itip-formatter/itip-view.c:1560
+#: ../modules/itip-formatter/itip-view.c:1562
 msgid "Show time as _free"
 msgstr "Prikaži vreme kao _slobodno"
 
-#: ../modules/itip-formatter/itip-view.c:1561
+#: ../modules/itip-formatter/itip-view.c:1563
 msgid "_Preserve my reminder"
 msgstr "_Očuvaj moj podsetnik"
 
-#: ../modules/itip-formatter/itip-view.c:1562
+#: ../modules/itip-formatter/itip-view.c:1564
 msgid "_Inherit reminder"
 msgstr "_Nasledi podsetnik"
 
-#: ../modules/itip-formatter/itip-view.c:1892
+#: ../modules/itip-formatter/itip-view.c:1894
 msgid "_Tasks:"
 msgstr "_Zadaci:"
 
-#: ../modules/itip-formatter/itip-view.c:1895
+#: ../modules/itip-formatter/itip-view.c:1897
 msgid "_Memos:"
 msgstr "_Beleške:"
 
-#: ../modules/itip-formatter/itip-view.c:3123
+#: ../modules/itip-formatter/itip-view.c:3125
 msgid "Sa_ve"
 msgstr "Sa_čuvaj"
 
-#: ../modules/itip-formatter/itip-view.c:3583
-#: ../modules/itip-formatter/itip-view.c:5028
+#: ../modules/itip-formatter/itip-view.c:3585
+#: ../modules/itip-formatter/itip-view.c:5032
 msgid "Attendee status updated"
 msgstr "Status učesnika je ažuriran"
 
-#: ../modules/itip-formatter/itip-view.c:3762
+#: ../modules/itip-formatter/itip-view.c:3764
 #, 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:3791
+#: ../modules/itip-formatter/itip-view.c:3793
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Pronašao sam zakazivanje u kalendaru „%s“"
 
-#: ../modules/itip-formatter/itip-view.c:3904
+#: ../modules/itip-formatter/itip-view.c:3906
 msgid "Unable to find any calendars"
 msgstr "Ne mogu da pronađem nijedan kalendar"
 
-#: ../modules/itip-formatter/itip-view.c:3912
+#: ../modules/itip-formatter/itip-view.c:3914
 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:3917
+#: ../modules/itip-formatter/itip-view.c:3919
 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:3922
+#: ../modules/itip-formatter/itip-view.c:3924
 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:4266
+#: ../modules/itip-formatter/itip-view.c:4268
 msgid "Opening the calendar. Please wait..."
 msgstr "Otvaram kalendar. Molim sačekajte..."
 
-#: ../modules/itip-formatter/itip-view.c:4271
+#: ../modules/itip-formatter/itip-view.c:4273
 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:4664
+#: ../modules/itip-formatter/itip-view.c:4668
 #, 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:4679
+#: ../modules/itip-formatter/itip-view.c:4683
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Poslato kalendaru „%s“ kao prihvaćeno"
 
-#: ../modules/itip-formatter/itip-view.c:4684
+#: ../modules/itip-formatter/itip-view.c:4688
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Poslato kalendaru „%s“ kao pokušaj"
 
-#: ../modules/itip-formatter/itip-view.c:4690
+#: ../modules/itip-formatter/itip-view.c:4694
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Poslato kalendaru „%s“ kao odbijeno"
 
-#: ../modules/itip-formatter/itip-view.c:4696
+#: ../modules/itip-formatter/itip-view.c:4700
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Poslato kalendaru „%s“ kao otkazano"
 
-#: ../modules/itip-formatter/itip-view.c:4717
-#: ../modules/itip-formatter/itip-view.c:5174
-#: ../modules/itip-formatter/itip-view.c:5280
+#: ../modules/itip-formatter/itip-view.c:4721
+#: ../modules/itip-formatter/itip-view.c:5178
+#: ../modules/itip-formatter/itip-view.c:5284
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Čuvam izmene u kalendar. Molim sačekajte..."
 
-#: ../modules/itip-formatter/itip-view.c:4758
+#: ../modules/itip-formatter/itip-view.c:4762
 msgid "Unable to parse item"
 msgstr "Ne mogu da obradim stavku"
 
-#: ../modules/itip-formatter/itip-view.c:4951
+#: ../modules/itip-formatter/itip-view.c:4955
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizator je uklonio delegata „%s“ "
 
-#: ../modules/itip-formatter/itip-view.c:4968
+#: ../modules/itip-formatter/itip-view.c:4972
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Delegatu je poslato obaveštenje o otkazivanju"
 
-#: ../modules/itip-formatter/itip-view.c:4972
+#: ../modules/itip-formatter/itip-view.c:4976
 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:5020
+#: ../modules/itip-formatter/itip-view.c:5024
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Ne mogu da ažuriram učesnika. %s"
 
-#: ../modules/itip-formatter/itip-view.c:5063
+#: ../modules/itip-formatter/itip-view.c:5067
 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:5139
+#: ../modules/itip-formatter/itip-view.c:5143
 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:5211
-#: ../modules/itip-formatter/itip-view.c:5250
+#: ../modules/itip-formatter/itip-view.c:5215
+#: ../modules/itip-formatter/itip-view.c:5254
 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:5313
+#: ../modules/itip-formatter/itip-view.c:5317
 msgid "Meeting information sent"
 msgstr "Podatak o sastanku je poslat"
 
-#: ../modules/itip-formatter/itip-view.c:5318
+#: ../modules/itip-formatter/itip-view.c:5322
 msgid "Task information sent"
 msgstr "Podatak o zadatku je poslat"
 
-#: ../modules/itip-formatter/itip-view.c:5323
+#: ../modules/itip-formatter/itip-view.c:5327
 msgid "Memo information sent"
 msgstr "Podatak o belešci je poslat"
 
-#: ../modules/itip-formatter/itip-view.c:5334
+#: ../modules/itip-formatter/itip-view.c:5338
 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:5339
+#: ../modules/itip-formatter/itip-view.c:5343
 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:5344
+#: ../modules/itip-formatter/itip-view.c:5348
 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:5409
+#: ../modules/itip-formatter/itip-view.c:5413
 msgid "calendar.ics"
 msgstr "calendar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5414
+#: ../modules/itip-formatter/itip-view.c:5418
 msgid "Save Calendar"
 msgstr "Sačuvaj kalendar"
 
-#: ../modules/itip-formatter/itip-view.c:5463
-#: ../modules/itip-formatter/itip-view.c:5476
+#: ../modules/itip-formatter/itip-view.c:5467
+#: ../modules/itip-formatter/itip-view.c:5480
 msgid "The calendar attached is not valid"
 msgstr "Priložen kalendar nije ispravan"
 
-#: ../modules/itip-formatter/itip-view.c:5464
-#: ../modules/itip-formatter/itip-view.c:5477
+#: ../modules/itip-formatter/itip-view.c:5468
+#: ../modules/itip-formatter/itip-view.c:5481
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
@@ -18051,15 +18587,15 @@ msgstr ""
 "Poruka prijavljuje da sadrži kalendar, ali taj kalendar nije ispravan "
 "iKalendar."
 
-#: ../modules/itip-formatter/itip-view.c:5519
-#: ../modules/itip-formatter/itip-view.c:5549
-#: ../modules/itip-formatter/itip-view.c:5650
+#: ../modules/itip-formatter/itip-view.c:5523
+#: ../modules/itip-formatter/itip-view.c:5553
+#: ../modules/itip-formatter/itip-view.c:5654
 msgid "The item in the calendar is not valid"
 msgstr "Stavka u kalendaru nije ispravna"
 
-#: ../modules/itip-formatter/itip-view.c:5520
-#: ../modules/itip-formatter/itip-view.c:5550
-#: ../modules/itip-formatter/itip-view.c:5651
+#: ../modules/itip-formatter/itip-view.c:5524
+#: ../modules/itip-formatter/itip-view.c:5554
+#: ../modules/itip-formatter/itip-view.c:5655
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18067,11 +18603,11 @@ msgstr ""
 "Poruka sadrži kalendar, ali on ne sadrži događaje, zadatke ili podatke "
 "slobodno/zauzeto."
 
-#: ../modules/itip-formatter/itip-view.c:5565
+#: ../modules/itip-formatter/itip-view.c:5569
 msgid "The calendar attached contains multiple items"
 msgstr "Kalendar u prilogu sadrži više stavki"
 
-#: ../modules/itip-formatter/itip-view.c:5566
+#: ../modules/itip-formatter/itip-view.c:5570
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
@@ -18083,24 +18619,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:6067
+#: ../modules/itip-formatter/itip-view.c:6072
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Ništa"
 
-#: ../modules/itip-formatter/itip-view.c:6083
+#: ../modules/itip-formatter/itip-view.c:6088
 msgid "Tentatively Accepted"
 msgstr "Prihvaćeno s rezervom"
 
-#: ../modules/itip-formatter/itip-view.c:6243
+#: ../modules/itip-formatter/itip-view.c:6248
 msgid "This meeting recurs"
 msgstr "Ovaj sastanak se ponavlja"
 
-#: ../modules/itip-formatter/itip-view.c:6246
+#: ../modules/itip-formatter/itip-view.c:6251
 msgid "This task recurs"
 msgstr "Ovaj zadatak se ponavlja"
 
-#: ../modules/itip-formatter/itip-view.c:6249
+#: ../modules/itip-formatter/itip-view.c:6254
 msgid "This memo recurs"
 msgstr "Ova beleška se ponavlja"
 
@@ -18117,21 +18653,21 @@ msgstr "Ovaj sastanak je delegiran"
 msgid "'{0}' has delegated the meeting. Do you want to add the delegate '{1}'?"
 msgstr "„{0}“ delegira sastanak. Želite li da dodate delegata „{1}“?"
 
-#: ../modules/itip-formatter/plugin/config-ui.c:82
+#: ../modules/itip-formatter/plugin/config-ui.c:81
 msgid "Meeting Invitations"
 msgstr "Pozivnice za sastanak"
 
-#: ../modules/itip-formatter/plugin/config-ui.c:108
+#: ../modules/itip-formatter/plugin/config-ui.c:107
 msgid "_Delete message after acting"
 msgstr "_Obriši poruku nakon radnje"
 
-#: ../modules/itip-formatter/plugin/config-ui.c:122
-#: ../modules/itip-formatter/plugin/config-ui.c:153
+#: ../modules/itip-formatter/plugin/config-ui.c:121
+#: ../modules/itip-formatter/plugin/config-ui.c:152
 msgid "Conflict Search"
 msgstr "Pretraga preklapanja"
 
 #. Source selector
-#: ../modules/itip-formatter/plugin/config-ui.c:137
+#: ../modules/itip-formatter/plugin/config-ui.c:136
 msgid "Select the calendars to search for meeting conflicts"
 msgstr "Bira kalendare za pretragu preklapanja u sastancima"
 
@@ -18143,114 +18679,114 @@ msgstr "Itip formatiranje"
 msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "Prikazuje MIME delove „text/calendar“ u porukama."
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:252
+#: ../modules/mail-config/e-mail-config-google-summary.c:251
 msgid "Google Features"
 msgstr "Gugl mogućnosti"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:261
+#: ../modules/mail-config/e-mail-config-google-summary.c:260
 msgid "Add Google Ca_lendar to this account"
 msgstr "Dodaj ka_lendar Gugla ovom nalogu"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:269
+#: ../modules/mail-config/e-mail-config-google-summary.c:268
 msgid "Add Google Con_tacts to this account"
 msgstr "Dodaj ko_ntakte Gugla ovom nalogu"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:277
+#: ../modules/mail-config/e-mail-config-google-summary.c:276
 msgid "You may need to enable IMAP access"
 msgstr "Možda ćete morati da omogućite IMAP pristup"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:246
-#: ../modules/mail-config/e-mail-config-local-accounts.c:292
+#: ../modules/mail-config/e-mail-config-local-accounts.c:245
+#: ../modules/mail-config/e-mail-config-local-accounts.c:291
 msgid "Mail _Directory:"
 msgstr "Direktorijum _pošte:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:247
+#: ../modules/mail-config/e-mail-config-local-accounts.c:246
 msgid "Choose a MH mail directory"
 msgstr "Izaberite MH direktorijum pošte"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:269
+#: ../modules/mail-config/e-mail-config-local-accounts.c:268
 msgid "Local Delivery _File:"
 msgstr "Mesna datoteka _dostave:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:270
+#: ../modules/mail-config/e-mail-config-local-accounts.c:269
 msgid "Choose a local delivery file"
 msgstr "Izaberite mesnu datoteku dostave"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:293
+#: ../modules/mail-config/e-mail-config-local-accounts.c:292
 msgid "Choose a Maildir mail directory"
 msgstr "Izaberite Mejldir direktorijum pošte"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:315
+#: ../modules/mail-config/e-mail-config-local-accounts.c:314
 msgid "Spool _File:"
 msgstr "Datoteka _pripreme:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:316
+#: ../modules/mail-config/e-mail-config-local-accounts.c:315
 msgid "Choose a mbox spool file"
 msgstr "Izaberite datoteku mboks pripreme"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:338
+#: ../modules/mail-config/e-mail-config-local-accounts.c:337
 msgid "Spool _Directory:"
 msgstr "Direktorijum _pripreme:"
 
-#: ../modules/mail-config/e-mail-config-local-accounts.c:339
+#: ../modules/mail-config/e-mail-config-local-accounts.c:338
 msgid "Choose a mbox spool directory"
 msgstr "Izaberite direktorijum mboks pripreme"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:137
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:80
-#: ../modules/plugin-manager/evolution-plugin-manager.c:159
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:136
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:53
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:79
+#: ../modules/plugin-manager/evolution-plugin-manager.c:158
 msgid "Configuration"
 msgstr "Podešavanje"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:155
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:98
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:154
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:97
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:169
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:111
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:168
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:181
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:227
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:180
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:226
 msgid "User_name:"
 msgstr "Korisničko_ime:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:214
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:148
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:213
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:147
 msgid "Encryption _method:"
 msgstr "Način _šifrovanja:"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:229
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:163
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:228
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:162
 msgid "STARTTLS after connecting"
 msgstr "STARTTLS nakon povezivanja"
 
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:233
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:167
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:232
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:166
 msgid "SSL on a dedicated port"
 msgstr "SSL na odeđenom portu"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:70
+#: ../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:74
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:73
 msgid "_Custom binary:"
 msgstr "_Proizvoljni izvršni:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:91
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:90
 msgid "U_se custom arguments"
 msgstr "Koristi _proizvoljne argumente"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:95
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:94
 msgid "Cus_tom arguments:"
 msgstr "Proizvoljni _argumenti:"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:113
+#: ../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"
@@ -18260,27 +18796,27 @@ msgstr ""
 "   %F — označava adresu pošiljaoca\n"
 "   %R — označava adrese primalaca"
 
-#: ../modules/mail-config/e-mail-config-sendmail-backend.c:128
+#: ../modules/mail-config/e-mail-config-sendmail-backend.c:127
 msgid "Send mail also when in offline _mode"
 msgstr "Pošalji poštu takođe u režimu _van mreže"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:122
 msgid "Ser_ver requires authentication"
 msgstr "Ser_ver traži potvrđivanje identiteta"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:209
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:208
 msgid "T_ype:"
 msgstr "_Vrsta:"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:247
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:246
 msgid "Yahoo! Features"
 msgstr "Jahu! mogućnosti"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:256
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:255
 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:425
+#: ../modules/mail/e-mail-attachment-handler.c:424
 #, c-format
 msgid "%d attached message"
 msgid_plural "%d attached messages"
@@ -18289,46 +18825,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:321
+#: ../modules/mail/e-mail-shell-backend.c:314
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Poruka"
 
-#: ../modules/mail/e-mail-shell-backend.c:323
+#: ../modules/mail/e-mail-shell-backend.c:316
 msgid "Compose a new mail message"
 msgstr "Sastavite novu poruku"
 
-#: ../modules/mail/e-mail-shell-backend.c:331
+#: ../modules/mail/e-mail-shell-backend.c:324
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "Poštanski _nalog"
 
-#: ../modules/mail/e-mail-shell-backend.c:333
+#: ../modules/mail/e-mail-shell-backend.c:326
 msgid "Create a new mail account"
 msgstr "Napravite novi nalog za poštu"
 
-#: ../modules/mail/e-mail-shell-backend.c:338
+#: ../modules/mail/e-mail-shell-backend.c:331
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "_Fascikla za poštu"
 
-#: ../modules/mail/e-mail-shell-backend.c:340
+#: ../modules/mail/e-mail-shell-backend.c:333
 msgid "Create a new mail folder"
 msgstr "Napravite novu fasciklu za poštu"
 
-#: ../modules/mail/e-mail-shell-backend.c:636
+#: ../modules/mail/e-mail-shell-backend.c:644
 msgid "Mail Accounts"
 msgstr "Poštanski nalozi"
 
-#: ../modules/mail/e-mail-shell-backend.c:645
+#: ../modules/mail/e-mail-shell-backend.c:653
 msgid "Mail Preferences"
 msgstr "Postavke pošte"
 
-#: ../modules/mail/e-mail-shell-backend.c:654
+#: ../modules/mail/e-mail-shell-backend.c:662
 msgid "Composer Preferences"
 msgstr "Postavke sastavljača"
 
-#: ../modules/mail/e-mail-shell-backend.c:663
+#: ../modules/mail/e-mail-shell-backend.c:672
 msgid "Network Preferences"
 msgstr "Postavke mreže"
 
@@ -18339,135 +18875,131 @@ msgstr "Postavke mreže"
 # is not permitted.
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:954
+#: ../modules/mail/e-mail-shell-backend.c:964
 msgctxt "label"
 msgid "None"
 msgstr "Ništa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:672
+#: ../modules/mail/e-mail-shell-view-actions.c:670
 msgid "Marking messages as read..."
 msgstr "Označavam poruke pročitanim..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1522
+#: ../modules/mail/e-mail-shell-view-actions.c:1512
 msgid "_Disable Account"
 msgstr "_Onemogući nalog"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1524
+#: ../modules/mail/e-mail-shell-view-actions.c:1514
 msgid "Disable this account"
 msgstr "Isključite ovaj nalog"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1531
+#: ../modules/mail/e-mail-shell-view-actions.c:1521
 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:1538
+#: ../modules/mail/e-mail-shell-view-actions.c:1528
 msgid "Edit properties of this account"
 msgstr "Izmenite osobine ovog naloga"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1543
-msgid "_Refresh"
-msgstr "_Osveži"
-
-#: ../modules/mail/e-mail-shell-view-actions.c:1545
+#: ../modules/mail/e-mail-shell-view-actions.c:1535
 msgid "Refresh list of folders of this account"
 msgstr "Osvežite spisak fascikli za ovaj nalog"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1550
+#: ../modules/mail/e-mail-shell-view-actions.c:1540
 msgid "_Download Messages for Offline Usage"
 msgstr "_Preuzmi poruke za rad van mreže"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1552
+#: ../modules/mail/e-mail-shell-view-actions.c:1542
 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:1557
+#: ../modules/mail/e-mail-shell-view-actions.c:1547
 msgid "Fl_ush Outbox"
 msgstr "Is_prazni „Za slanje“"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1564
+#: ../modules/mail/e-mail-shell-view-actions.c:1554
 msgid "_Copy Folder To..."
 msgstr "_Umnoži fasciklu u..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1566
+#: ../modules/mail/e-mail-shell-view-actions.c:1556
 msgid "Copy the selected folder into another folder"
 msgstr "Umnožite izabranu fasciklu u drugu fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1573
+#: ../modules/mail/e-mail-shell-view-actions.c:1563
 msgid "Permanently remove this folder"
 msgstr "Trajno uklonite ovu fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1578
+#: ../modules/mail/e-mail-shell-view-actions.c:1568
 msgid "E_xpunge"
 msgstr "Izba_ci"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1580
+#: ../modules/mail/e-mail-shell-view-actions.c:1570
 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:1585
-#: ../modules/mail/e-mail-shell-view-actions.c:1685
+#: ../modules/mail/e-mail-shell-view-actions.c:1575
+#: ../modules/mail/e-mail-shell-view-actions.c:1675
 msgid "Mar_k All Messages as Read"
 msgstr "Označi sve po_ruke kao pročitane"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1587
-#: ../modules/mail/e-mail-shell-view-actions.c:1687
+#: ../modules/mail/e-mail-shell-view-actions.c:1577
+#: ../modules/mail/e-mail-shell-view-actions.c:1677
 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:1592
+#: ../modules/mail/e-mail-shell-view-actions.c:1582
 msgid "_Move Folder To..."
 msgstr "_Premesti fasciklu u..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1594
+#: ../modules/mail/e-mail-shell-view-actions.c:1584
 msgid "Move the selected folder into another folder"
 msgstr "Premestite izabranu fasciklu u drugu fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1599
+#: ../modules/mail/e-mail-shell-view-actions.c:1589
 msgid "_New..."
 msgstr "_Novo..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1601
+#: ../modules/mail/e-mail-shell-view-actions.c:1591
 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:1608
+#: ../modules/mail/e-mail-shell-view-actions.c:1598
 msgid "Change the properties of this folder"
 msgstr "Izmenite osobine ove fascikle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1615
+#: ../modules/mail/e-mail-shell-view-actions.c:1605
 msgid "Refresh the folder"
 msgstr "Osvežite fasciklu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1622
+#: ../modules/mail/e-mail-shell-view-actions.c:1612
 msgid "Change the name of this folder"
 msgstr "Promenite naziv ove fascikle"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1627
+#: ../modules/mail/e-mail-shell-view-actions.c:1617
 msgid "Select Message _Thread"
 msgstr "Izaberi _raspravu"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1629
+#: ../modules/mail/e-mail-shell-view-actions.c:1619
 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:1634
+#: ../modules/mail/e-mail-shell-view-actions.c:1624
 msgid "Select Message S_ubthread"
 msgstr "Izaberi p_odniz poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1636
+#: ../modules/mail/e-mail-shell-view-actions.c:1626
 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:1648
+#: ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "Empty _Trash"
 msgstr "Izbaci _smeće"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1650
+#: ../modules/mail/e-mail-shell-view-actions.c:1640
 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:1655
+#: ../modules/mail/e-mail-shell-view-actions.c:1645
 msgid "_New Label"
 msgstr "_Nova oznaka"
 
@@ -18476,201 +19008,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:1664
+#: ../modules/mail/e-mail-shell-view-actions.c:1654
 msgid "N_one"
 msgstr "N_išta"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1678
+#: ../modules/mail/e-mail-shell-view-actions.c:1668
 msgid "_Manage Subscriptions"
 msgstr "_Upravljaj prijavama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1680
-#: ../modules/mail/e-mail-shell-view-actions.c:1764
+#: ../modules/mail/e-mail-shell-view-actions.c:1670
+#: ../modules/mail/e-mail-shell-view-actions.c:1754
 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:1692
-#: ../modules/mail/e-mail-shell-view-actions.c:1713
+#: ../modules/mail/e-mail-shell-view-actions.c:1682
+#: ../modules/mail/e-mail-shell-view-actions.c:1703
 msgid "Send / _Receive"
 msgstr "Slanje / p_rimanje"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1694
+#: ../modules/mail/e-mail-shell-view-actions.c:1684
 msgid "Send queued items and retrieve new items"
 msgstr "Pošaljite pripremljene i dovucite nove stavke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1699
+#: ../modules/mail/e-mail-shell-view-actions.c:1689
 msgid "R_eceive All"
 msgstr "P_rimi sve"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1701
+#: ../modules/mail/e-mail-shell-view-actions.c:1691
 msgid "Receive new items from all accounts"
 msgstr "Primite nove stavke sa svih naloga"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1706
+#: ../modules/mail/e-mail-shell-view-actions.c:1696
 msgid "_Send All"
 msgstr "P_ošalji sve"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1708
+#: ../modules/mail/e-mail-shell-view-actions.c:1698
 msgid "Send queued items in all accounts"
 msgstr "Pošaljite stavke na čekanju u svim nalozima"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1736
+#: ../modules/mail/e-mail-shell-view-actions.c:1726
 msgid "Cancel the current mail operation"
 msgstr "Otkažite trenutnu operaciju sa poštom"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1741
+#: ../modules/mail/e-mail-shell-view-actions.c:1731
 msgid "Collapse All _Threads"
 msgstr "Skupi sve _rasprave"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1743
+#: ../modules/mail/e-mail-shell-view-actions.c:1733
 msgid "Collapse all message threads"
 msgstr "Skupite celokupno grananje rasprava"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1748
+#: ../modules/mail/e-mail-shell-view-actions.c:1738
 msgid "E_xpand All Threads"
 msgstr "Razgranaj sve ra_sprave"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1750
+#: ../modules/mail/e-mail-shell-view-actions.c:1740
 msgid "Expand all message threads"
 msgstr "Razgranajte sve poruke u raspravama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1755
+#: ../modules/mail/e-mail-shell-view-actions.c:1745
 msgid "_Message Filters"
 msgstr "_Propusnici poruka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1757
+#: ../modules/mail/e-mail-shell-view-actions.c:1747
 msgid "Create or edit rules for filtering new mail"
 msgstr "Napravite ili uredite pravila za izdvajanje nove pošte"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1762
+#: ../modules/mail/e-mail-shell-view-actions.c:1752
 msgid "_Subscriptions..."
 msgstr "_Prijave..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1771
+#: ../modules/mail/e-mail-shell-view-actions.c:1761
 msgid "F_older"
 msgstr "_Fascikla"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1778
+#: ../modules/mail/e-mail-shell-view-actions.c:1768
 msgid "_Label"
 msgstr "_Natpis"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1795
+#: ../modules/mail/e-mail-shell-view-actions.c:1785
 msgid "C_reate Search Folder From Search..."
 msgstr "Napravi _fasciklu pretrage iz pretrage..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1802
+#: ../modules/mail/e-mail-shell-view-actions.c:1792
 msgid "Search F_olders"
 msgstr "Fas_cikle pretrage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1804
+#: ../modules/mail/e-mail-shell-view-actions.c:1794
 msgid "Create or edit search folder definitions"
 msgstr "Napravite ili uredite definicije fascikle pretrage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1843
+#: ../modules/mail/e-mail-shell-view-actions.c:1833
 msgid "_New Folder..."
 msgstr "_Nova fascikla..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1871
+#: ../modules/mail/e-mail-shell-view-actions.c:1861
 msgid "Show Message _Preview"
 msgstr "Prika_ži pregled poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1873
+#: ../modules/mail/e-mail-shell-view-actions.c:1863
 msgid "Show message preview pane"
 msgstr "Prikažite pregled poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1879
+#: ../modules/mail/e-mail-shell-view-actions.c:1869
 msgid "Show _Deleted Messages"
 msgstr "Prikaži o_brisane poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1881
+#: ../modules/mail/e-mail-shell-view-actions.c:1871
 msgid "Show deleted messages with a line through them"
 msgstr "Prikažite obrisane poruke (kao precrtane)"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1887
+#: ../modules/mail/e-mail-shell-view-actions.c:1877
 msgid "_Group By Threads"
 msgstr "Grupiši po _raspravama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1889
+#: ../modules/mail/e-mail-shell-view-actions.c:1879
 msgid "Threaded message list"
 msgstr "Spisak poruka po temama"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1895
+#: ../modules/mail/e-mail-shell-view-actions.c:1885
 msgid "_Unmatched Folder Enabled"
 msgstr "Uključena _nepoklopljena fascikla"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1897
+#: ../modules/mail/e-mail-shell-view-actions.c:1887
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Okida prilikom uključivanja nepoklopljene fascikle pretrage"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1917
+#: ../modules/mail/e-mail-shell-view-actions.c:1907
 msgid "Show message preview below the message list"
 msgstr "Prikažite pregled poruke ispod liste poruka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1924
+#: ../modules/mail/e-mail-shell-view-actions.c:1914
 msgid "Show message preview alongside the message list"
 msgstr "Prikažite pregled poruke pored spiska poruka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1932
+#: ../modules/mail/e-mail-shell-view-actions.c:1922
 msgid "All Messages"
 msgstr "Sve poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1939
+#: ../modules/mail/e-mail-shell-view-actions.c:1929
 msgid "Important Messages"
 msgstr "Važne poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1946
+#: ../modules/mail/e-mail-shell-view-actions.c:1936
 msgid "Last 5 Days' Messages"
 msgstr "Poruke u zadnjih 5 dana"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1953
+#: ../modules/mail/e-mail-shell-view-actions.c:1943
 msgid "Messages Not Junk"
 msgstr "Poruke nisu đubre"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1960
+#: ../modules/mail/e-mail-shell-view-actions.c:1950
 msgid "Messages with Attachments"
 msgstr "Poruke sa prilozima"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1967
+#: ../modules/mail/e-mail-shell-view-actions.c:1957
 msgid "No Label"
 msgstr "Bez oznake"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1974
+#: ../modules/mail/e-mail-shell-view-actions.c:1964
 msgid "Read Messages"
 msgstr "Pročitane poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1981
+#: ../modules/mail/e-mail-shell-view-actions.c:1971
 msgid "Unread Messages"
 msgstr "Nepročitane poruke"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2033
+#: ../modules/mail/e-mail-shell-view-actions.c:2023
 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:2043
+#: ../modules/mail/e-mail-shell-view-actions.c:2033
 msgid "All Accounts"
 msgstr "svim nalozima"
 
 # bug: requires a comment on usage
-#: ../modules/mail/e-mail-shell-view-actions.c:2050
+#: ../modules/mail/e-mail-shell-view-actions.c:2040
 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:2057
+#: ../modules/mail/e-mail-shell-view-actions.c:2047
 msgid "Current Folder"
 msgstr "tekućoj fascikli"
 
-#: ../modules/mail/e-mail-shell-view.c:638
+#: ../modules/mail/e-mail-shell-view.c:636
 msgid "All Account Search"
 msgstr "Pretraga svih naloga"
 
-#: ../modules/mail/e-mail-shell-view.c:746
+#: ../modules/mail/e-mail-shell-view.c:744
 msgid "Account Search"
 msgstr "Pretraga naloga"
 
-#: ../modules/mail/e-mail-shell-view-private.c:988
+#: ../modules/mail/e-mail-shell-view-private.c:972
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -18679,8 +19211,8 @@ msgstr[1] "%d izabrane, "
 msgstr[2] "%d izabranih, "
 msgstr[3] "%d izabrana, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:997
-#: ../modules/mail/e-mail-shell-view-private.c:1014
+#: ../modules/mail/e-mail-shell-view-private.c:981
+#: ../modules/mail/e-mail-shell-view-private.c:998
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -18689,8 +19221,8 @@ msgstr[1] "%d obrisane"
 msgstr[2] "%d obrisanih"
 msgstr[3] "%d obrisana"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1023
-#: ../modules/mail/e-mail-shell-view-private.c:1029
+#: ../modules/mail/e-mail-shell-view-private.c:1007
+#: ../modules/mail/e-mail-shell-view-private.c:1013
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -18699,7 +19231,7 @@ msgstr[1] "%d nepoželjne"
 msgstr[2] "%d nepoželjnih"
 msgstr[3] "%d nepoželjna"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1036
+#: ../modules/mail/e-mail-shell-view-private.c:1020
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -18708,7 +19240,7 @@ msgstr[1] "%d nacrta"
 msgstr[2] "%d nacrta"
 msgstr[3] "%d nacrt"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1042
+#: ../modules/mail/e-mail-shell-view-private.c:1026
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -18717,7 +19249,7 @@ msgstr[1] "%d neposlate"
 msgstr[2] "%d neposlatih"
 msgstr[3] "%d neposlata"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1048
+#: ../modules/mail/e-mail-shell-view-private.c:1032
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -18726,7 +19258,7 @@ msgstr[1] "%d poslate"
 msgstr[2] "%d poslatih"
 msgstr[3] "%d poslata"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1060
+#: ../modules/mail/e-mail-shell-view-private.c:1044
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -18735,7 +19267,7 @@ msgstr[1] "%d nepročitane, "
 msgstr[2] "%d nepročitanih, "
 msgstr[3] "%d nepročitana, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1063
+#: ../modules/mail/e-mail-shell-view-private.c:1047
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -18744,84 +19276,99 @@ msgstr[1] "%d ukupno"
 msgstr[2] "%d ukupno"
 msgstr[3] "%d ukupno"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1084
+#: ../modules/mail/e-mail-shell-view-private.c:1068
 msgid "Trash"
 msgstr "Smeće"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1522
+#: ../modules/mail/e-mail-shell-view-private.c:1505
 msgid "Send / Receive"
 msgstr "Pošalji / Primi"
 
-#: ../modules/mail/em-composer-prefs.c:447
+#: ../modules/mail/em-composer-prefs.c:443
+#| msgid "Select Folder"
+msgid "Select Folder to Add"
+msgstr "Izaberite fasciklu za dodavanje"
+
+#: ../modules/mail/em-composer-prefs.c:888
+#| msgid "F_older"
+msgid "Folder"
+msgstr "Fascikla"
+
+#: ../modules/mail/em-composer-prefs.c:924
+#| msgid "Recipients"
+msgid "Recipient"
+msgstr "Primalac"
+
+#: ../modules/mail/em-composer-prefs.c:1195
 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:81
+#: ../modules/mail/em-mailer-prefs.c:80
 msgid "On exit, every time"
 msgstr "Pri izlasku, svaki put"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:82
+#: ../modules/mail/em-mailer-prefs.c:81
 msgid "On exit, once per day"
 msgstr "Pri izlasku, jednom dnevno"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:83
+#: ../modules/mail/em-mailer-prefs.c:82
 msgid "On exit, once per week"
 msgstr "Pri izlasku, jednom nedeljeno"
 
 # bug: requires a comment on usage
-#: ../modules/mail/em-mailer-prefs.c:84
+#: ../modules/mail/em-mailer-prefs.c:83
 msgid "On exit, once per month"
 msgstr "Pri izlasku, jednom mesečno"
 
-#: ../modules/mail/em-mailer-prefs.c:85
+#: ../modules/mail/em-mailer-prefs.c:84
 msgid "Immediately, on folder leave"
 msgstr "Odmah, pri napuštanju fascikle"
 
-#: ../modules/mail/em-mailer-prefs.c:356
+#: ../modules/mail/em-mailer-prefs.c:355
 msgid "Header"
 msgstr "Zaglavlje"
 
-#: ../modules/mail/em-mailer-prefs.c:360
+#: ../modules/mail/em-mailer-prefs.c:359
 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:1215
+#: ../modules/mail/em-mailer-prefs.c:1214
 msgid "_Date header:"
 msgstr "Zaglavlje _datuma:"
 
-#: ../modules/mail/em-mailer-prefs.c:1216
+#: ../modules/mail/em-mailer-prefs.c:1215
 msgid "Show _original header value"
 msgstr "Prikaži _originalnu vrednost zaglavlja"
 
-#: ../modules/mailto-handler/evolution-mailto-handler.c:142
+#: ../modules/mailto-handler/evolution-mailto-handler.c:140
 msgid "Do you want to make Evolution your default email client?"
 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:311
+#: ../modules/mdn/evolution-mdn.c:307
 #, 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:378
+#: ../modules/mdn/evolution-mdn.c:374
 #, 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:539
 #, 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:544
 msgid "_Notify Sender"
 msgstr "Obavesti _pošiljaoca"
 
@@ -18853,68 +19400,68 @@ msgstr ""
 "Evolucija će se vratiti u režim na mreži kada mrežna veza bude bila "
 "uspostavljena."
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:68
+#: ../modules/plugin-manager/evolution-plugin-manager.c:67
 msgid "Author(s)"
 msgstr "Autor(i)"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:254
+#: ../modules/plugin-manager/evolution-plugin-manager.c:253
 msgid "Plugin Manager"
 msgstr "Upravnik priključaka"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:269
+#: ../modules/plugin-manager/evolution-plugin-manager.c:268
 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:298
+#: ../modules/plugin-manager/evolution-plugin-manager.c:297
 msgid "Overview"
 msgstr "Pregled"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:367
-#: ../modules/plugin-manager/evolution-plugin-manager.c:450
+#: ../modules/plugin-manager/evolution-plugin-manager.c:366
+#: ../modules/plugin-manager/evolution-plugin-manager.c:449
 msgid "Plugin"
 msgstr "Priključak"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:488
+#: ../modules/plugin-manager/evolution-plugin-manager.c:487
 msgid "_Plugins"
 msgstr "_Priključci"
 
-#: ../modules/plugin-manager/evolution-plugin-manager.c:489
+#: ../modules/plugin-manager/evolution-plugin-manager.c:488
 msgid "Enable and disable plugins"
 msgstr "Uključuje i isključuje dodatke"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:140
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:139
 msgid "Display plain text version"
 msgstr "Prikaži izdanje običnog teksta"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:142
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:141
 msgid "Display plain text version of multipart/alternative message"
 msgstr "Prikazuje izdanje običnog teksta poruke iz više delova ili neke druge"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:148
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:147
 msgid "Display HTML version"
 msgstr "Prikaži HTML izdanje"
 
-#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:150
+#: ../modules/prefer-plain/e-mail-display-popup-prefer-plain.c:149
 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:78
-#: ../modules/prefer-plain/plugin/config-ui.c:44
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:77
+#: ../modules/prefer-plain/plugin/config-ui.c:43
 msgid "Show HTML if present"
 msgstr "Prikaži HTML ako postoji"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
-#: ../modules/prefer-plain/plugin/config-ui.c:45
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../modules/prefer-plain/plugin/config-ui.c:44
 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:82
-#: ../modules/prefer-plain/plugin/config-ui.c:48
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:81
+#: ../modules/prefer-plain/plugin/config-ui.c:47
 msgid "Show plain text if present"
 msgstr "Prikaži običan tekst ako postoji"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
-#: ../modules/prefer-plain/plugin/config-ui.c:49
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../modules/prefer-plain/plugin/config-ui.c:48
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
 "part to show."
@@ -18922,13 +19469,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:87
-#: ../modules/prefer-plain/plugin/config-ui.c:53
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:86
+#: ../modules/prefer-plain/plugin/config-ui.c:52
 msgid "Only ever show plain text"
 msgstr "Isključivo prikazuj običan tekst"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
-#: ../modules/prefer-plain/plugin/config-ui.c:54
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../modules/prefer-plain/plugin/config-ui.c:53
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
 "requested."
@@ -18936,11 +19483,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:105
+#: ../modules/prefer-plain/plugin/config-ui.c:104
 msgid "Show s_uppressed HTML parts as attachments"
 msgstr "Prikaži po_tisnute HTML delove kao priloge"
 
-#: ../modules/prefer-plain/plugin/config-ui.c:127
+#: ../modules/prefer-plain/plugin/config-ui.c:126
 msgid "HTML _Mode"
 msgstr "HTML _režim"
 
@@ -18957,61 +19504,61 @@ 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:151
+#: ../modules/spamassassin/evolution-spamassassin.c:150
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr "Nisam uspeo da izrodim Ubicu spama (%s): "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:174
+#: ../modules/spamassassin/evolution-spamassassin.c:173
 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:193
+#: ../modules/spamassassin/evolution-spamassassin.c:192
 #, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr "Nisam uspeo da zapišem „%s“ u Ubici spama: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:221
+#: ../modules/spamassassin/evolution-spamassassin.c:220
 msgid "Failed to read output from SpamAssassin: "
 msgstr "Nisam uspeo da pročitam izlaz iz Ubice spama: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:276
+#: ../modules/spamassassin/evolution-spamassassin.c:275
 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:356
+#: ../modules/spamassassin/evolution-spamassassin.c:355
 msgid "SpamAssassin Options"
 msgstr "Opcije Ubice spama"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:371
+#: ../modules/spamassassin/evolution-spamassassin.c:370
 msgid "I_nclude remote tests"
 msgstr "U_ključi mrežne provere"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:385
+#: ../modules/spamassassin/evolution-spamassassin.c:384
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr "Ovo će Ubicu spama učiniti pouzdanijim , ali sporijim."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:559
+#: ../modules/spamassassin/evolution-spamassassin.c:558
 msgid "SpamAssassin"
 msgstr "Ubica spama"
 
 #. 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:262
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:342
+#: ../modules/startup-wizard/e-mail-config-import-page.c:261
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:340
 msgid "Importing Files"
 msgstr "Uvozim datoteke"
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:261
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:259
 msgid "Import cancelled."
 msgstr "Uvoženje je otkazano."
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:278
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:276
 msgid "Import complete."
 msgstr "Uvoženje je završeno."
 
-#: ../modules/startup-wizard/e-startup-assistant.c:156
+#: ../modules/startup-wizard/e-startup-assistant.c:155
 msgid ""
 "Welcome to Evolution.\n"
 "\n"
@@ -19023,263 +19570,263 @@ 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:229
+#: ../modules/startup-wizard/evolution-startup-wizard.c:228
 msgid "Loading accounts..."
 msgstr "Učitavam naloge..."
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:95
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:94
 msgid "_Format as..."
 msgstr "Oblikuj _kao..."
 
-#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:103
+#: ../modules/text-highlight/e-mail-display-popup-text-highlight.c:102
 msgid "_Other languages"
 msgstr "_Drugi jezici"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:337
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:481
 msgid "Text Highlight"
 msgstr "Isticanje teksta"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:338
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:482
 msgid "Syntax highlighting of mail parts"
 msgstr "Isticanje sadržaja delova pošte"
 
-#: ../modules/text-highlight/languages.c:32
+#: ../modules/text-highlight/languages.c:31
 msgid "_Plain text"
 msgstr "_Običan tekst"
 
 #  Translators: Menu item Verb/Connect/Couple/Assemble
-#: ../modules/text-highlight/languages.c:38
+#: ../modules/text-highlight/languages.c:37
 msgid "_Assembler"
 msgstr "_Spajač"
 
-#: ../modules/text-highlight/languages.c:43
+#: ../modules/text-highlight/languages.c:42
 msgid "_Bash"
 msgstr "_Baš"
 
-#: ../modules/text-highlight/languages.c:54
+#: ../modules/text-highlight/languages.c:53
 msgid "_C/C++"
 msgstr "_C/C++"
 
-#: ../modules/text-highlight/languages.c:63
+#: ../modules/text-highlight/languages.c:62
 msgid "_C#"
 msgstr "_C#"
 
-#: ../modules/text-highlight/languages.c:68
+#: ../modules/text-highlight/languages.c:67
 msgid "_Cascade Style Sheet"
 msgstr "_Kaskadni stil lista"
 
-#: ../modules/text-highlight/languages.c:73
+#: ../modules/text-highlight/languages.c:72
 msgid "_HTML"
 msgstr "_HTML"
 
-#: ../modules/text-highlight/languages.c:81
+#: ../modules/text-highlight/languages.c:80
 msgid "_Java"
 msgstr "_Java"
 
-#: ../modules/text-highlight/languages.c:87
+#: ../modules/text-highlight/languages.c:86
 msgid "_JavaScript"
 msgstr "_Java skript"
 
-#: ../modules/text-highlight/languages.c:93
+#: ../modules/text-highlight/languages.c:92
 msgid "_Patch/diff"
 msgstr "_Zakrpe/razlike"
 
-#: ../modules/text-highlight/languages.c:99
+#: ../modules/text-highlight/languages.c:98
 msgid "_Perl"
 msgstr "_Perl"
 
-#: ../modules/text-highlight/languages.c:110
+#: ../modules/text-highlight/languages.c:109
 msgid "_PHP"
 msgstr "_PHP"
 
-#: ../modules/text-highlight/languages.c:123
+#: ../modules/text-highlight/languages.c:122
 msgid "_Python"
 msgstr "_Piton"
 
-#: ../modules/text-highlight/languages.c:128
+#: ../modules/text-highlight/languages.c:127
 msgid "_Ruby"
 msgstr "_Rubi"
 
-#: ../modules/text-highlight/languages.c:135
+#: ../modules/text-highlight/languages.c:134
 msgid "_Tcl/Tk"
 msgstr "_Tcl/Tk"
 
-#: ../modules/text-highlight/languages.c:141
+#: ../modules/text-highlight/languages.c:140
 msgid "_TeX/LaTeX"
 msgstr "_TeKs/LaTeKs"
 
-#: ../modules/text-highlight/languages.c:147
+#: ../modules/text-highlight/languages.c:146
 msgid "_Vala"
 msgstr "_Vala"
 
-#: ../modules/text-highlight/languages.c:152
+#: ../modules/text-highlight/languages.c:151
 msgid "_Visual Basic"
 msgstr "_Vizuel bejzik"
 
-#: ../modules/text-highlight/languages.c:159
+#: ../modules/text-highlight/languages.c:158
 msgid "_XML"
 msgstr "_IksML"
 
-#: ../modules/text-highlight/languages.c:177
+#: ../modules/text-highlight/languages.c:176
 msgid "_ActionScript"
 msgstr "_Skripta radnje"
 
-#: ../modules/text-highlight/languages.c:182
+#: ../modules/text-highlight/languages.c:181
 msgid "_ADA95"
 msgstr "_ADA95"
 
-#: ../modules/text-highlight/languages.c:189
+#: ../modules/text-highlight/languages.c:188
 msgid "_ALGOL 68"
 msgstr "_ALGOL 68"
 
-#: ../modules/text-highlight/languages.c:194
+#: ../modules/text-highlight/languages.c:193
 msgid "(_G)AWK"
 msgstr "(_G)AVK"
 
-#: ../modules/text-highlight/languages.c:199
+#: ../modules/text-highlight/languages.c:198
 msgid "_COBOL"
 msgstr "_KOBOL"
 
-#: ../modules/text-highlight/languages.c:204
+#: ../modules/text-highlight/languages.c:203
 msgid "_DOS Batch"
 msgstr "_DOS grupa"
 
-#: ../modules/text-highlight/languages.c:209
+#: ../modules/text-highlight/languages.c:208
 msgid "_D"
 msgstr "_D"
 
-#: ../modules/text-highlight/languages.c:214
+#: ../modules/text-highlight/languages.c:213
 msgid "_Erlang"
 msgstr "_Erlang"
 
-#: ../modules/text-highlight/languages.c:219
+#: ../modules/text-highlight/languages.c:218
 msgid "_FORTRAN 77"
 msgstr "_FORTRAN 77"
 
-#: ../modules/text-highlight/languages.c:225
+#: ../modules/text-highlight/languages.c:224
 msgid "_FORTRAN 90"
 msgstr "_FORTRAN 90"
 
-#: ../modules/text-highlight/languages.c:230
+#: ../modules/text-highlight/languages.c:229
 msgid "_F#"
 msgstr "_F#"
 
-#: ../modules/text-highlight/languages.c:235
+#: ../modules/text-highlight/languages.c:234
 msgid "_Go"
 msgstr "_Gou"
 
-#: ../modules/text-highlight/languages.c:240
+#: ../modules/text-highlight/languages.c:239
 msgid "_Haskell"
 msgstr "_Haskel"
 
-#: ../modules/text-highlight/languages.c:245
+#: ../modules/text-highlight/languages.c:244
 msgid "_JSP"
 msgstr "_JSP"
 
-#: ../modules/text-highlight/languages.c:250
+#: ../modules/text-highlight/languages.c:249
 msgid "_Lisp"
 msgstr "_Lisp"
 
-#: ../modules/text-highlight/languages.c:258
+#: ../modules/text-highlight/languages.c:257
 msgid "_Lotus"
 msgstr "_Lotus"
 
-#: ../modules/text-highlight/languages.c:263
+#: ../modules/text-highlight/languages.c:262
 msgid "_Lua"
 msgstr "_Lua"
 
-#: ../modules/text-highlight/languages.c:268
+#: ../modules/text-highlight/languages.c:267
 msgid "_Maple"
 msgstr "_Mejpl"
 
-#: ../modules/text-highlight/languages.c:273
+#: ../modules/text-highlight/languages.c:272
 msgid "_Matlab"
 msgstr "_Matlab"
 
-#: ../modules/text-highlight/languages.c:278
+#: ../modules/text-highlight/languages.c:277
 msgid "_Maya"
 msgstr "_Maja"
 
-#: ../modules/text-highlight/languages.c:283
+#: ../modules/text-highlight/languages.c:282
 msgid "_Oberon"
 msgstr "_Oberon"
 
-#: ../modules/text-highlight/languages.c:288
+#: ../modules/text-highlight/languages.c:287
 msgid "_Objective C"
 msgstr "_Objektni C"
 
-#: ../modules/text-highlight/languages.c:294
+#: ../modules/text-highlight/languages.c:293
 msgid "_OCaml"
 msgstr "_OKeml"
 
-#: ../modules/text-highlight/languages.c:299
+#: ../modules/text-highlight/languages.c:298
 msgid "_Octave"
 msgstr "_Oktava"
 
 # Mozda ipak "Portret"?
-#: ../modules/text-highlight/languages.c:304
+#: ../modules/text-highlight/languages.c:303
 msgid "_Object Script"
 msgstr "_Objektni skript"
 
-#: ../modules/text-highlight/languages.c:309
+#: ../modules/text-highlight/languages.c:308
 msgid "_Pascal"
 msgstr "_Paskal"
 
-#: ../modules/text-highlight/languages.c:314
+#: ../modules/text-highlight/languages.c:313
 msgid "_POV-Ray"
 msgstr "_POV-rej"
 
-#: ../modules/text-highlight/languages.c:319
+#: ../modules/text-highlight/languages.c:318
 msgid "_Prolog"
 msgstr "_Prolog"
 
-#: ../modules/text-highlight/languages.c:324
+#: ../modules/text-highlight/languages.c:323
 msgid "_PostScript"
 msgstr "_Postskript"
 
-#: ../modules/text-highlight/languages.c:329
+#: ../modules/text-highlight/languages.c:328
 msgid "_R"
 msgstr "_R"
 
-#: ../modules/text-highlight/languages.c:334
+#: ../modules/text-highlight/languages.c:333
 msgid "_RPM Spec"
 msgstr "_RPM navod"
 
-#: ../modules/text-highlight/languages.c:339
+#: ../modules/text-highlight/languages.c:338
 msgid "_Scala"
 msgstr "_Razmera"
 
-#: ../modules/text-highlight/languages.c:344
+#: ../modules/text-highlight/languages.c:343
 msgid "_Smalltalk"
 msgstr "_Smoltok"
 
-#: ../modules/text-highlight/languages.c:350
+#: ../modules/text-highlight/languages.c:349
 msgid "_TCSH"
 msgstr "_TCSH"
 
-#: ../modules/text-highlight/languages.c:355
+#: ../modules/text-highlight/languages.c:354
 msgid "_VHDL"
 msgstr "_VHDL"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:129
-#: ../modules/vcard-inline/e-mail-part-vcard.c:152
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:131
+#: ../modules/vcard-inline/e-mail-part-vcard.c:151
 msgid "Show F_ull vCard"
 msgstr "Prikaži _punu vKartu"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:132
-#: ../modules/vcard-inline/e-mail-part-vcard.c:170
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:134
+#: ../modules/vcard-inline/e-mail-part-vcard.c:169
 msgid "Show Com_pact vCard"
 msgstr "Prikaži _sažetu vKartu"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:157
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:162
 msgid "Save _To Addressbook"
 msgstr "Sačuvaj _u adresar"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:178
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
 msgid "There is one other contact."
 msgstr "Postoji još jedan kontakt."
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:184
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:189
 #, c-format
 msgid "There is %d other contact."
 msgid_plural "There are %d other contacts."
@@ -19288,24 +19835,24 @@ 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.c:209
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:215
 msgid "Addressbook Contact"
 msgstr "Kontakt adresara"
 
-#: ../modules/vcard-inline/e-mail-formatter-vcard.c:210
+#: ../modules/vcard-inline/e-mail-formatter-vcard.c:216
 msgid "Display the part as an addressbook contact"
 msgstr "Prikažite delove kao kontakt adresara"
 
-#: ../modules/web-inspector/evolution-web-inspector.c:96
+#: ../modules/web-inspector/evolution-web-inspector.c:95
 msgid "Evolution Web Inspector"
 msgstr "Nadzornik veba Evolucije"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:121
+#: ../plugins/attachment-reminder/attachment-reminder.c:122
 msgid "_Do not show this message again."
 msgstr "_Ne prikazuj ponovo ovu poruku."
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:583
-#: ../plugins/templates/templates.c:480
+#: ../plugins/attachment-reminder/attachment-reminder.c:584
+#: ../plugins/templates/templates.c:478
 msgid "Keywords"
 msgstr "Ključne reči"
 
@@ -19337,35 +19884,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:635 ../plugins/bbdb/bbdb.c:644
+#: ../plugins/bbdb/bbdb.c:636 ../plugins/bbdb/bbdb.c:645
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Automatski kontakti"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:659
+#: ../plugins/bbdb/bbdb.c:660
 msgid "Create _address book entries when sending mails"
 msgstr "Napravi unose u _adresar pri slanju pošte"
 
-#: ../plugins/bbdb/bbdb.c:666
+#: ../plugins/bbdb/bbdb.c:667
 msgid "Select Address book for Automatic Contacts"
 msgstr "Izaberi adresar za Automatske kontakte"
 
-#: ../plugins/bbdb/bbdb.c:683
+#: ../plugins/bbdb/bbdb.c:684
 msgid "Instant Messaging Contacts"
 msgstr "Kontakti trenutnih poruka"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:698
+#: ../plugins/bbdb/bbdb.c:699
 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:705
+#: ../plugins/bbdb/bbdb.c:706
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Bira adresar za listu prijatelja Pidžina"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:718
+#: ../plugins/bbdb/bbdb.c:719
 msgid "Synchronize with _buddy list now"
 msgstr "Uskladi sa _listom drugara sada"
 
@@ -19387,7 +19934,7 @@ msgstr ""
 "poruke.  Takođe popunjava podatke za kontakt brzim glasnikom iz spiska "
 "drugara."
 
-#: ../plugins/dbx-import/dbx-importer.c:282
+#: ../plugins/dbx-import/dbx-importer.c:278
 msgid "Importing Outlook Express data"
 msgstr "Uvozim podatke Autluk Ekspresa"
 
@@ -19403,7 +19950,7 @@ msgstr "Lične fascikle Autluk Ekspresa 5/6 (.pst)"
 msgid "Import Outlook Express messages from DBX file"
 msgstr "Uvozi poruke Autluk Ekspresa iz DBH datoteke"
 
-#: ../plugins/email-custom-header/email-custom-header.c:291
+#: ../plugins/email-custom-header/email-custom-header.c:293
 msgctxt "email-custom-header-Security"
 msgid "Security:"
 msgstr "Sigurnost:"
@@ -19411,32 +19958,32 @@ msgstr "Sigurnost:"
 # Create the default Person calendar
 # Create the default Person task list
 # orange
-#: ../plugins/email-custom-header/email-custom-header.c:295
+#: ../plugins/email-custom-header/email-custom-header.c:297
 msgctxt "email-custom-header-Security"
 msgid "Personal"
 msgstr "Lično"
 
-#: ../plugins/email-custom-header/email-custom-header.c:296
+#: ../plugins/email-custom-header/email-custom-header.c:298
 msgctxt "email-custom-header-Security"
 msgid "Unclassified"
 msgstr "Nerazvrstano"
 
-#: ../plugins/email-custom-header/email-custom-header.c:297
+#: ../plugins/email-custom-header/email-custom-header.c:299
 msgctxt "email-custom-header-Security"
 msgid "Protected"
 msgstr "Zaštićeno"
 
-#: ../plugins/email-custom-header/email-custom-header.c:298
+#: ../plugins/email-custom-header/email-custom-header.c:300
 msgctxt "email-custom-header-Security"
 msgid "Confidential"
 msgstr "Poverljivo"
 
-#: ../plugins/email-custom-header/email-custom-header.c:299
+#: ../plugins/email-custom-header/email-custom-header.c:301
 msgctxt "email-custom-header-Security"
 msgid "Secret"
 msgstr "Tajno"
 
-#: ../plugins/email-custom-header/email-custom-header.c:300
+#: ../plugins/email-custom-header/email-custom-header.c:302
 msgctxt "email-custom-header-Security"
 msgid "Top secret"
 msgstr "Strogo poverljivo"
@@ -19446,17 +19993,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:360
+#: ../plugins/email-custom-header/email-custom-header.c:362
 msgctxt "email-custom-header"
 msgid "None"
 msgstr "Ništa"
 
-#: ../plugins/email-custom-header/email-custom-header.c:536
+#: ../plugins/email-custom-header/email-custom-header.c:538
 msgid "_Custom Header"
 msgstr "_Prilagođeno zaglavlje"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:806
+#: ../plugins/email-custom-header/email-custom-header.c:808
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -19464,12 +20011,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:859
+#: ../plugins/email-custom-header/email-custom-header.c:861
 msgid "Key"
 msgstr "Ključ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:876
-#: ../plugins/templates/templates.c:489
+#: ../plugins/email-custom-header/email-custom-header.c:878
+#: ../plugins/templates/templates.c:487
 msgid "Values"
 msgstr "Vrednosti"
 
@@ -19486,11 +20033,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:112
+#: ../plugins/external-editor/external-editor.c:113
 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:113
+#: ../plugins/external-editor/external-editor.c:114
 msgid ""
 "For XEmacs use \"xemacs\"\n"
 "For Vim use \"gvim -f\""
@@ -19498,12 +20045,12 @@ msgstr ""
 "Za iKsEmaks koristite „xemacs“\n"
 "Za Vim koristite „gvim -f“"
 
-#: ../plugins/external-editor/external-editor.c:123
+#: ../plugins/external-editor/external-editor.c:124
 msgid "_Automatically launch when a new mail is edited"
 msgstr "_Sam pokreni kada je nova poruka izmenjena"
 
-#: ../plugins/external-editor/external-editor.c:413
-#: ../plugins/external-editor/external-editor.c:415
+#: ../plugins/external-editor/external-editor.c:417
+#: ../plugins/external-editor/external-editor.c:419
 msgid "Compose in External Editor"
 msgstr "Sastavlja u spoljnom uređivaču"
 
@@ -19551,27 +20098,23 @@ msgstr ""
 "Pokrenut je spoljni uređivač. Prozor sastavljača poruke nije moguće zatvoriti "
 "dok je aktivan uređivač."
 
-#: ../plugins/face/face.c:171 ../smime/gui/certificate-manager.c:322
-msgid "Unknown error"
-msgstr "Nepoznata greška"
-
-#: ../plugins/face/face.c:289
+#: ../plugins/face/face.c:288
 msgid "Select a Face Picture"
 msgstr "Izaberite sliku lica"
 
-#: ../plugins/face/face.c:299
+#: ../plugins/face/face.c:298
 msgid "Image files"
 msgstr "Datoteke slika"
 
-#: ../plugins/face/face.c:358
+#: ../plugins/face/face.c:357
 msgid "_Insert Face picture by default"
 msgstr "_Unapred umetni sliku kontakta"
 
-#: ../plugins/face/face.c:371
+#: ../plugins/face/face.c:370
 msgid "Load new _Face picture"
 msgstr "Učitaj novu _sliku kontakta"
 
-#: ../plugins/face/face.c:432
+#: ../plugins/face/face.c:431
 msgid "Include _Face"
 msgstr "Uključi _sliku"
 
@@ -19612,55 +20155,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:368
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:364
 msgid "Get List _Archive"
 msgstr "Pribavi _arhivu liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:370
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:366
 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:375
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:371
 msgid "Get List _Usage Information"
 msgstr "Pribavi podatke o _korišćenju liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:377
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:373
 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:382
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:378
 msgid "Contact List _Owner"
 msgstr "_Vlasnik kontakt liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:384
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:380
 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:389
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:385
 msgid "_Post Message to List"
 msgstr "_Pošalji poruku na listu"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:391
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:387
 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:396
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:392
 msgid "_Subscribe to List"
 msgstr "Pri_javi se na listu"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:398
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:394
 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:403
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:399
 msgid "_Unsubscribe from List"
 msgstr "O_djavi se sa liste"
 
-#: ../plugins/mailing-list-actions/mailing-list-actions.c:405
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:401
 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:412
+#: ../plugins/mailing-list-actions/mailing-list-actions.c:408
 msgid "Mailing _List"
 msgstr "Dopisna _lista"
 
@@ -19749,8 +20292,8 @@ msgstr ""
 "\n"
 "Zaglavlje: {0}"
 
-#: ../plugins/mail-notification/mail-notification.c:384
-#: ../plugins/mail-notification/mail-notification.c:420
+#: ../plugins/mail-notification/mail-notification.c:382
+#: ../plugins/mail-notification/mail-notification.c:418
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -19761,55 +20304,55 @@ msgstr[3] "Primili ste novu poruku."
 
 #. Translators: "From:" is preceding a new mail
 #. * sender address, like "From: user@example.com"
-#: ../plugins/mail-notification/mail-notification.c:395
+#: ../plugins/mail-notification/mail-notification.c:393
 #, c-format
 msgid "From: %s"
 msgstr "Šalje: %s"
 
 #. Translators: "Subject:" is preceding a new mail
 #. * subject, like "Subject: It happened again"
-#: ../plugins/mail-notification/mail-notification.c:409
+#: ../plugins/mail-notification/mail-notification.c:407
 #, c-format
 msgid "Subject: %s"
 msgstr "Naslov: %s"
 
 # shell:noshell-reason title
-#: ../plugins/mail-notification/mail-notification.c:426
+#: ../plugins/mail-notification/mail-notification.c:424
 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:461
+#: ../plugins/mail-notification/mail-notification.c:459
 #, c-format
 msgid "Show %s"
 msgstr "Prikaži %s"
 
-#: ../plugins/mail-notification/mail-notification.c:663
+#: ../plugins/mail-notification/mail-notification.c:661
 msgid "_Play sound when a new message arrives"
 msgstr "Zvučno _obavesti kada stigne nova poruka"
 
-#: ../plugins/mail-notification/mail-notification.c:695
+#: ../plugins/mail-notification/mail-notification.c:693
 msgid "_Beep"
 msgstr "_Zapišti"
 
-#: ../plugins/mail-notification/mail-notification.c:708
+#: ../plugins/mail-notification/mail-notification.c:706
 msgid "Use sound _theme"
 msgstr "Koristi zvuk _teme"
 
-#: ../plugins/mail-notification/mail-notification.c:727
+#: ../plugins/mail-notification/mail-notification.c:725
 msgid "Play _file:"
 msgstr "Pusti zvučnu _datoteku:"
 
-#: ../plugins/mail-notification/mail-notification.c:736
+#: ../plugins/mail-notification/mail-notification.c:734
 msgid "Select sound file"
 msgstr "Izaberite zvučnu datoteku"
 
-#: ../plugins/mail-notification/mail-notification.c:792
+#: ../plugins/mail-notification/mail-notification.c:790
 msgid "Notify new messages for _Inbox only"
 msgstr "Obavesti o novim porukama samo za _Sanduče"
 
-#: ../plugins/mail-notification/mail-notification.c:802
+#: ../plugins/mail-notification/mail-notification.c:800
 msgid "Show _notification when a new message arrives"
 msgstr "Prikaži _obaveštenje kada pristigne nova poruka"
 
@@ -19822,12 +20365,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:232
+#: ../plugins/mail-to-task/mail-to-task.c:229
 #, 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:616
+#: ../plugins/mail-to-task/mail-to-task.c:613
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -19836,7 +20379,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:619
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -19844,7 +20387,7 @@ msgid ""
 msgstr ""
 "Izabrani spisak već sadrži zadatak „%s“. Želite li da uredite stari zadatak?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:622
+#: ../plugins/mail-to-task/mail-to-task.c:619
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -19852,7 +20395,7 @@ msgid ""
 msgstr ""
 "Izabrani spisak već sadrži belešku „%s“. Želite li da uredite staru belešku?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:642
+#: ../plugins/mail-to-task/mail-to-task.c:639
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -19873,7 +20416,7 @@ msgstr[3] ""
 "Izabrali ste %d pošta da prevedete u događaje. Da li zaista želite sve da ih "
 "dodate?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:649
+#: ../plugins/mail-to-task/mail-to-task.c:646
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -19894,7 +20437,7 @@ msgstr[3] ""
 "Izabrali ste %d pošta da prevedete u zadatke. Da li zaista želite sve da ih "
 "dodate?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:656
+#: ../plugins/mail-to-task/mail-to-task.c:653
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -19915,29 +20458,29 @@ msgstr[3] ""
 "Izabrali ste %d pošta da prevedete u beleške. Da li zaista želite sve da ih "
 "dodate?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:677
+#: ../plugins/mail-to-task/mail-to-task.c:674
 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:753
+#: ../plugins/mail-to-task/mail-to-task.c:750
 msgid "[No Summary]"
 msgstr "[Bez sažetka]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:766
+#: ../plugins/mail-to-task/mail-to-task.c:763
 msgid "Invalid object returned from a server"
 msgstr "Neispravan objekat vraćen sa servera"
 
-#: ../plugins/mail-to-task/mail-to-task.c:821
+#: ../plugins/mail-to-task/mail-to-task.c:818
 #, 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:855
+#: ../plugins/mail-to-task/mail-to-task.c:852
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Ne mogu da otvorim kalendar. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:862
+#: ../plugins/mail-to-task/mail-to-task.c:856
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -19945,7 +20488,7 @@ msgstr ""
 "Izabrani kalendar je samo za čitanje, stoga ne možete napraviti događaj. "
 "Izaberite drugi kalendar."
 
-#: ../plugins/mail-to-task/mail-to-task.c:865
+#: ../plugins/mail-to-task/mail-to-task.c:859
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
@@ -19953,7 +20496,7 @@ msgstr ""
 "Izabrani spisak zadataka je samo za čitanje, stoga ne možete napraviti "
 "zadatak. Izaberite drugi spisak zadataka."
 
-#: ../plugins/mail-to-task/mail-to-task.c:868
+#: ../plugins/mail-to-task/mail-to-task.c:862
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
@@ -19961,39 +20504,35 @@ msgstr ""
 "Izabrani spisak beleški je samo za čitanje, stoga ne možete napraviti "
 "belešku. Izaberite drugi spisak beleški."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1203
-msgid "No writable calendar is available."
-msgstr "Nema dostupnog kalendara za upisivanje."
-
-#: ../plugins/mail-to-task/mail-to-task.c:1280
+#: ../plugins/mail-to-task/mail-to-task.c:1261
 msgid "Create an _Appointment"
 msgstr "Napravi _zakazivanje"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1282
+#: ../plugins/mail-to-task/mail-to-task.c:1263
 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:1287
+#: ../plugins/mail-to-task/mail-to-task.c:1268
 msgid "Create a Mem_o"
 msgstr "Napravi belešk_u"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1289
+#: ../plugins/mail-to-task/mail-to-task.c:1270
 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:1294
+#: ../plugins/mail-to-task/mail-to-task.c:1275
 msgid "Create a _Task"
 msgstr "Napravi _zadatak"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1296
+#: ../plugins/mail-to-task/mail-to-task.c:1277
 msgid "Create a new task from the selected message"
 msgstr "Pravi novi zadatak od izabrane poruke"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1304
+#: ../plugins/mail-to-task/mail-to-task.c:1285
 msgid "Create a _Meeting"
 msgstr "Napravi _sastanak"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1306
+#: ../plugins/mail-to-task/mail-to-task.c:1287
 msgid "Create a new meeting from the selected message"
 msgstr "Pravi novi sastanak od izabrane poruke"
 
@@ -20013,37 +20552,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:530
+#: ../plugins/pst-import/pst-importer.c:526
 msgid "_Mail"
 msgstr "_Pošta"
 
-#: ../plugins/pst-import/pst-importer.c:559
+#: ../plugins/pst-import/pst-importer.c:555
 msgid "Destination folder:"
 msgstr "Odredišna fascikla:"
 
-#: ../plugins/pst-import/pst-importer.c:569
+#: ../plugins/pst-import/pst-importer.c:565
 msgid "_Address Book"
 msgstr "_Adresar"
 
-#: ../plugins/pst-import/pst-importer.c:574
+#: ../plugins/pst-import/pst-importer.c:570
 msgid "A_ppointments"
 msgstr "Za_kazano"
 
-#: ../plugins/pst-import/pst-importer.c:579 ../views/tasks/galview.xml.h:1
+#: ../plugins/pst-import/pst-importer.c:575 ../views/tasks/galview.xml.h:1
 msgid "_Tasks"
 msgstr "_Zadaci"
 
-#: ../plugins/pst-import/pst-importer.c:584
+#: ../plugins/pst-import/pst-importer.c:580
 msgid "_Journal entries"
 msgstr "Unosi _dnevnika"
 
-#: ../plugins/pst-import/pst-importer.c:701
+#: ../plugins/pst-import/pst-importer.c:697
 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:141
-#: ../plugins/publish-calendar/publish-calendar.c:148
+#: ../plugins/publish-calendar/publish-calendar.c:140
+#: ../plugins/publish-calendar/publish-calendar.c:147
 msgid "Calendar Publishing"
 msgstr "Objavljivanje kalendara"
 
@@ -20076,23 +20615,23 @@ msgstr "Objavljivanje na %s je uspešno završeno"
 msgid "Mount of %s failed:"
 msgstr "Nisam uspeo da montiram %s:"
 
-#: ../plugins/publish-calendar/publish-calendar.c:649
-#: ../plugins/publish-calendar/publish-calendar.ui.h:33
+#: ../plugins/publish-calendar/publish-calendar.c:655
+#: ../plugins/publish-calendar/publish-calendar.ui.h:35
 msgid "E_nable"
 msgstr "O_mogući"
 
-#: ../plugins/publish-calendar/publish-calendar.c:799
+#: ../plugins/publish-calendar/publish-calendar.c:805
 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:1138
+#: ../plugins/publish-calendar/publish-calendar.c:1142
 msgid "Could not create publish thread."
 msgstr "Ne mogu da objavim raspravu."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1148
+#: ../plugins/publish-calendar/publish-calendar.c:1152
 msgid "_Publish Calendar Information"
 msgstr "Objavi raspored iz _kalendara"
 
@@ -20184,100 +20723,100 @@ msgstr "_Zapamti lozinku"
 msgid "Publishing Location"
 msgstr "Mesto objavljivanja"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:100
-#: ../plugins/publish-calendar/publish-format-ical.c:103
+#: ../plugins/publish-calendar/publish-format-fb.c:99
+#: ../plugins/publish-calendar/publish-format-ical.c:102
 #, c-format
 msgid "Invalid source UID '%s'"
 msgstr "Neispravan JIB izvora „%s“"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:540
+#: ../plugins/publish-calendar/url-editor-dialog.c:544
 msgid "New Location"
 msgstr "Novo mesto"
 
-#: ../plugins/publish-calendar/url-editor-dialog.c:542
+#: ../plugins/publish-calendar/url-editor-dialog.c:546
 msgid "Edit Location"
 msgstr "Izmenite mesto"
 
 #. Translators: the %F %T is the third argument for a
 #. * strftime function.  It lets you define the formatting
 #. * of the date in the csv-file.
-#: ../plugins/save-calendar/csv-format.c:161
+#: ../plugins/save-calendar/csv-format.c:160
 msgid "%F %T"
 msgstr "%F %T"
 
-#: ../plugins/save-calendar/csv-format.c:375
+#: ../plugins/save-calendar/csv-format.c:374
 msgid "UID"
 msgstr "JIB"
 
-#: ../plugins/save-calendar/csv-format.c:377
+#: ../plugins/save-calendar/csv-format.c:376
 msgid "Description List"
 msgstr "Spisak opisa"
 
-#: ../plugins/save-calendar/csv-format.c:378
+#: ../plugins/save-calendar/csv-format.c:377
 msgid "Categories List"
 msgstr "Spisak kategorija"
 
-#: ../plugins/save-calendar/csv-format.c:379
+#: ../plugins/save-calendar/csv-format.c:378
 msgid "Comment List"
 msgstr "Spisak komentara"
 
-#: ../plugins/save-calendar/csv-format.c:382
+#: ../plugins/save-calendar/csv-format.c:381
 msgid "Contact List"
 msgstr "Spisak kontakata"
 
-#: ../plugins/save-calendar/csv-format.c:383
+#: ../plugins/save-calendar/csv-format.c:382
 msgid "Start"
 msgstr "Početak"
 
-#: ../plugins/save-calendar/csv-format.c:384
+#: ../plugins/save-calendar/csv-format.c:383
 msgid "End"
 msgstr "Kraj"
 
-#: ../plugins/save-calendar/csv-format.c:385
+#: ../plugins/save-calendar/csv-format.c:384
 msgid "Due"
 msgstr "Rok"
 
-#: ../plugins/save-calendar/csv-format.c:386
+#: ../plugins/save-calendar/csv-format.c:385
 msgid "percent Done"
 msgstr "postotak završenog"
 
-#: ../plugins/save-calendar/csv-format.c:388
+#: ../plugins/save-calendar/csv-format.c:387
 msgid "URL"
 msgstr "Adresa"
 
-#: ../plugins/save-calendar/csv-format.c:389
+#: ../plugins/save-calendar/csv-format.c:388
 msgid "Attendees List"
 msgstr "Spisak učesnika"
 
-#: ../plugins/save-calendar/csv-format.c:391
+#: ../plugins/save-calendar/csv-format.c:390
 msgid "Modified"
 msgstr "Izmenjeno"
 
-#: ../plugins/save-calendar/csv-format.c:564
+#: ../plugins/save-calendar/csv-format.c:563
 msgid "A_dvanced options for the CSV format"
 msgstr "Na_predne opcije za CVS format"
 
-#: ../plugins/save-calendar/csv-format.c:572
+#: ../plugins/save-calendar/csv-format.c:571
 msgid "Prepend a _header"
 msgstr "Prvo uključi _zaglavlje"
 
-#: ../plugins/save-calendar/csv-format.c:581
+#: ../plugins/save-calendar/csv-format.c:580
 msgid "_Value delimiter:"
 msgstr "Graničnik _vrednosti:"
 
-#: ../plugins/save-calendar/csv-format.c:592
+#: ../plugins/save-calendar/csv-format.c:591
 msgid "_Record delimiter:"
 msgstr "Graničnik _zapisa:"
 
-#: ../plugins/save-calendar/csv-format.c:603
+#: ../plugins/save-calendar/csv-format.c:602
 msgid "_Encapsulate values with:"
 msgstr "_Obavij vrednosti sa:"
 
-#: ../plugins/save-calendar/csv-format.c:629
+#: ../plugins/save-calendar/csv-format.c:628
 msgid "Comma separated values (.csv)"
 msgstr "Vrednosti razdvojene zarezom (.csv)"
 
-#: ../plugins/save-calendar/ical-format.c:184 ../shell/e-shell-utils.c:178
+#: ../plugins/save-calendar/ical-format.c:183 ../shell/e-shell-utils.c:177
 msgid "iCalendar (.ics)"
 msgstr "iKalendar (.ics)"
 
@@ -20302,23 +20841,28 @@ msgstr "%FT%T"
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:121
+#: ../plugins/save-calendar/save-calendar.c:120
 msgid "_Format:"
 msgstr "_Format:"
 
-#: ../plugins/save-calendar/save-calendar.c:187
+#: ../plugins/save-calendar/save-calendar.c:186
 msgid "Select destination file"
 msgstr "Izaberite odredišnu datoteku"
 
-#: ../plugins/save-calendar/save-calendar.c:343
+#: ../plugins/save-calendar/save-calendar.c:190
+#| msgid "_Save"
+msgid "_Save As"
+msgstr "_Sačuvaj kao"
+
+#: ../plugins/save-calendar/save-calendar.c:347
 msgid "Save the selected calendar to disk"
 msgstr "Sačuvaj izabrani kalendar na disk"
 
-#: ../plugins/save-calendar/save-calendar.c:374
+#: ../plugins/save-calendar/save-calendar.c:378
 msgid "Save the selected memo list to disk"
 msgstr "Sačuvaj izabranu belešku na disk"
 
-#: ../plugins/save-calendar/save-calendar.c:405
+#: ../plugins/save-calendar/save-calendar.c:409
 msgid "Save the selected task list to disk"
 msgstr "Sačuvaj izabrani spisak zadataka na disk"
 
@@ -20332,39 +20876,39 @@ msgstr ""
 "$ORIG[tema], $ORIG[šalje], $ORIG[prima] or $ORIG[poruka], koje će biti "
 "zamenjene vrednostima iz el. pošte na koju odgovarate."
 
-#: ../plugins/templates/templates.c:1148
+#: ../plugins/templates/templates.c:1146
 msgid "No Title"
 msgstr "Bez zvanja"
 
-#: ../plugins/templates/templates.c:1257
+#: ../plugins/templates/templates.c:1255
 msgid "Save as _Template"
 msgstr "Sačuvaj kao _šablon"
 
-#: ../plugins/templates/templates.c:1259
+#: ../plugins/templates/templates.c:1257
 msgid "Save as Template"
 msgstr "Čuva kao šablon"
 
-#: ../shell/e-shell.c:279
+#: ../shell/e-shell.c:302
 msgid "Preparing to go offline..."
 msgstr "Pripremam se za rad van mreže..."
 
-#: ../shell/e-shell.c:332
+#: ../shell/e-shell.c:355
 msgid "Preparing to go online..."
 msgstr "Pripremam se za rad na mreži..."
 
-#: ../shell/e-shell.c:413
+#: ../shell/e-shell.c:436
 msgid "Preparing to quit"
 msgstr "Pripremam se da izađem"
 
-#: ../shell/e-shell.c:419
+#: ../shell/e-shell.c:442
 msgid "Preparing to quit..."
 msgstr "Pripremam se da izađem..."
 
-#: ../shell/e-shell-content.c:721 ../shell/e-shell-content.c:722
+#: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
 msgid "Searches"
 msgstr "Pretrage"
 
-#: ../shell/e-shell-content.c:765
+#: ../shell/e-shell-content.c:764
 msgid "Save Search"
 msgstr "Sačuvaj pretragu"
 
@@ -20372,38 +20916,38 @@ 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:938
+#: ../shell/e-shell-searchbar.c:937
 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:963
+#: ../shell/e-shell-searchbar.c:962
 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:1031
+#: ../shell/e-shell-searchbar.c:1030
 msgid "i_n"
 msgstr " _u "
 
-#: ../shell/e-shell-utils.c:175
+#: ../shell/e-shell-utils.c:174
 msgid "vCard (.vcf)"
 msgstr "vKarta (.vcf)"
 
-#: ../shell/e-shell-utils.c:199
+#: ../shell/e-shell-utils.c:198
 msgid "All Files (*)"
 msgstr "Sve datoteke (*)"
 
-#: ../shell/e-shell-view.c:292
+#: ../shell/e-shell-view.c:291
 msgid "Saving user interface state"
 msgstr "Čuvam stanje korisničkog sučelja"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:74
+#: ../shell/e-shell-window-actions.c:73
 msgid "translator-credits"
 msgstr ""
 "Igor Nestorović <igor@prevod.org>\n"
@@ -20412,282 +20956,290 @@ msgstr ""
 "\n"
 "http://prevod.org — prevod na srpski jezik."
 
-#: ../shell/e-shell-window-actions.c:85
+#: ../shell/e-shell-window-actions.c:84
 msgid "Evolution Website"
 msgstr "Veb stranica Evolucije"
 
-#: ../shell/e-shell-window-actions.c:341
+#: ../shell/e-shell-window-actions.c:340
 msgid "Categories Editor"
 msgstr "Uređivač kategorija"
 
-#: ../shell/e-shell-window-actions.c:672
+#: ../shell/e-shell-window-actions.c:716
 msgid "Bug Buddy is not installed."
 msgstr "Bubaždajin pomoćnik nije instaliran."
 
-#: ../shell/e-shell-window-actions.c:673
+#: ../shell/e-shell-window-actions.c:717
 msgid "Bug Buddy could not be run."
 msgstr "Bubaždajin pomoćnik ne može biti pokrenut."
 
-#: ../shell/e-shell-window-actions.c:853
+#: ../shell/e-shell-window-actions.c:895
+msgid "_About"
+msgstr "_O programu"
+
+#: ../shell/e-shell-window-actions.c:897
 msgid "Show information about Evolution"
 msgstr "Prikazuje podatke o Evoluciji"
 
-#: ../shell/e-shell-window-actions.c:858 ../shell/e-shell-window-actions.c:872
+#: ../shell/e-shell-window-actions.c:902 ../shell/e-shell-window-actions.c:916
 msgid "_Close Window"
 msgstr "_Zatvori prozor"
 
-#: ../shell/e-shell-window-actions.c:879
+#: ../shell/e-shell-window-actions.c:923
 msgid "_Contents"
 msgstr "_Sadržaj"
 
-#: ../shell/e-shell-window-actions.c:881
+#: ../shell/e-shell-window-actions.c:925
 msgid "Open the Evolution User Guide"
 msgstr "Otvorite korisničko uputstvo Evolucije"
 
-#: ../shell/e-shell-window-actions.c:907
+#: ../shell/e-shell-window-actions.c:951
 msgid "I_mport..."
 msgstr "_Uvezi..."
 
-#: ../shell/e-shell-window-actions.c:909
+#: ../shell/e-shell-window-actions.c:953
 msgid "Import data from other programs"
 msgstr "Uvezite podatke iz drugih programa"
 
-#: ../shell/e-shell-window-actions.c:914
+#: ../shell/e-shell-window-actions.c:958
 msgid "New _Window"
 msgstr "Novi _prozor"
 
-#: ../shell/e-shell-window-actions.c:916
+#: ../shell/e-shell-window-actions.c:960
 msgid "Create a new window displaying this view"
 msgstr "Otvorite nov prozor za prikaz ovog pregleda"
 
-#: ../shell/e-shell-window-actions.c:928
+#: ../shell/e-shell-window-actions.c:972
 msgid "Available Cate_gories"
 msgstr "Dostupne _kategorije"
 
-#: ../shell/e-shell-window-actions.c:930
+#: ../shell/e-shell-window-actions.c:974
 msgid "Manage available categories"
 msgstr "Upravljajte dostupnim kategorijama"
 
-#: ../shell/e-shell-window-actions.c:942
+#: ../shell/e-shell-window-actions.c:986
 msgid "_Quick Reference"
 msgstr "_Kratak podsetnik"
 
-#: ../shell/e-shell-window-actions.c:944
+#: ../shell/e-shell-window-actions.c:988
 msgid "Show Evolution's shortcut keys"
 msgstr "Prikažite prečice tastature Evolucije"
 
-#: ../shell/e-shell-window-actions.c:951
+#: ../shell/e-shell-window-actions.c:993
+#| msgid "Quit"
+msgid "_Quit"
+msgstr "_Izađi"
+
+#: ../shell/e-shell-window-actions.c:995
 msgid "Exit the program"
 msgstr "Izađite iz programa"
 
-#: ../shell/e-shell-window-actions.c:956
+#: ../shell/e-shell-window-actions.c:1000
 msgid "_Advanced Search..."
 msgstr "_Napredna pretraga..."
 
-#: ../shell/e-shell-window-actions.c:958
+#: ../shell/e-shell-window-actions.c:1002
 msgid "Construct a more advanced search"
 msgstr "Obrazujte napredniju pretragu"
 
-#: ../shell/e-shell-window-actions.c:965
+#: ../shell/e-shell-window-actions.c:1009
 msgid "Clear the current search parameters"
 msgstr "Očistite parametre trenutne pretrage"
 
-#: ../shell/e-shell-window-actions.c:970
+#: ../shell/e-shell-window-actions.c:1014
 msgid "_Edit Saved Searches..."
 msgstr "_Uredi sačuvane pretrage..."
 
-#: ../shell/e-shell-window-actions.c:972
+#: ../shell/e-shell-window-actions.c:1016
 msgid "Manage your saved searches"
 msgstr "Upravljajte vašim sačuvanim pretragama"
 
-#: ../shell/e-shell-window-actions.c:979
+#: ../shell/e-shell-window-actions.c:1023
 msgid "Click here to change the search type"
 msgstr "Kliknite ovde da promenite vrstu pretrage"
 
-#: ../shell/e-shell-window-actions.c:984
+#: ../shell/e-shell-window-actions.c:1028
 msgid "_Find Now"
 msgstr "Pro_nađi sada"
 
-#. Block the default Ctrl+F.
-#: ../shell/e-shell-window-actions.c:986
+#: ../shell/e-shell-window-actions.c:1030
 msgid "Execute the current search parameters"
 msgstr "Izvršite parametre trenutne pretrage"
 
-#: ../shell/e-shell-window-actions.c:991
+#: ../shell/e-shell-window-actions.c:1035
 msgid "_Save Search..."
 msgstr "_Sačuvaj pretragu..."
 
-#: ../shell/e-shell-window-actions.c:993
+#: ../shell/e-shell-window-actions.c:1037
 msgid "Save the current search parameters"
 msgstr "Sačuvajte parametre trenutne pretrage"
 
-#: ../shell/e-shell-window-actions.c:1005
+#: ../shell/e-shell-window-actions.c:1049
 msgid "Submit _Bug Report..."
 msgstr "Pošalji izveštaj o _grešci..."
 
-#: ../shell/e-shell-window-actions.c:1007
+#: ../shell/e-shell-window-actions.c:1051
 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:1012
+#: ../shell/e-shell-window-actions.c:1056
 msgid "_Work Offline"
 msgstr "Rad _van mreže"
 
-#: ../shell/e-shell-window-actions.c:1014
+#: ../shell/e-shell-window-actions.c:1058
 msgid "Put Evolution into offline mode"
 msgstr "Postavite Evoluciju u rad van mreže"
 
-#: ../shell/e-shell-window-actions.c:1019
+#: ../shell/e-shell-window-actions.c:1063
 msgid "_Work Online"
 msgstr "_Rad na mreži"
 
-#: ../shell/e-shell-window-actions.c:1021
+#: ../shell/e-shell-window-actions.c:1065
 msgid "Put Evolution into online mode"
 msgstr "Postavite Evoluciju u rad na mreži"
 
-#: ../shell/e-shell-window-actions.c:1049
+#: ../shell/e-shell-window-actions.c:1093
 msgid "Lay_out"
 msgstr "_Raspored"
 
-#: ../shell/e-shell-window-actions.c:1056
-msgid "_New"
-msgstr "_Novo"
-
-#: ../shell/e-shell-window-actions.c:1063
+#: ../shell/e-shell-window-actions.c:1107
 msgid "_Search"
 msgstr "Pre_traži"
 
-#: ../shell/e-shell-window-actions.c:1070
+#: ../shell/e-shell-window-actions.c:1114
 msgid "_Switcher Appearance"
 msgstr "_Izgled prebacivača"
 
-#: ../shell/e-shell-window-actions.c:1084
+#: ../shell/e-shell-window-actions.c:1128
 msgid "_Window"
 msgstr "Pro_zor"
 
-#: ../shell/e-shell-window-actions.c:1113
+#: ../shell/e-shell-window-actions.c:1157
 msgid "Show Side _Bar"
 msgstr "Prikaži _bočnu površ"
 
-#: ../shell/e-shell-window-actions.c:1115
+#: ../shell/e-shell-window-actions.c:1159
 msgid "Show the side bar"
 msgstr "Prikažite bočnu površ"
 
-#: ../shell/e-shell-window-actions.c:1121
+#: ../shell/e-shell-window-actions.c:1165
 msgid "Show _Buttons"
 msgstr "Prikaži _dugmad"
 
-#: ../shell/e-shell-window-actions.c:1123
+#: ../shell/e-shell-window-actions.c:1167
 msgid "Show the switcher buttons"
 msgstr "Prikažite dugmad prebacivača"
 
-#: ../shell/e-shell-window-actions.c:1129
+#: ../shell/e-shell-window-actions.c:1173
 msgid "Show _Status Bar"
 msgstr "Prikaži traku _stanja"
 
-#: ../shell/e-shell-window-actions.c:1131
+#: ../shell/e-shell-window-actions.c:1175
 msgid "Show the status bar"
 msgstr "Prikažite traku stanja"
 
-#: ../shell/e-shell-window-actions.c:1137
+#: ../shell/e-shell-window-actions.c:1181
 msgid "Show _Tool Bar"
 msgstr "Prikaži traku _alata"
 
-#: ../shell/e-shell-window-actions.c:1139
+#: ../shell/e-shell-window-actions.c:1183
 msgid "Show the tool bar"
 msgstr "Prikažite traku alata"
 
-#: ../shell/e-shell-window-actions.c:1161
+#: ../shell/e-shell-window-actions.c:1205
 msgid "_Icons Only"
 msgstr "Samo _ikonice"
 
-#: ../shell/e-shell-window-actions.c:1163
+#: ../shell/e-shell-window-actions.c:1207
 msgid "Display window buttons with icons only"
 msgstr "Prikažite dugmad prozora samo sa ikonicama"
 
-#: ../shell/e-shell-window-actions.c:1168
+#: ../shell/e-shell-window-actions.c:1212
 msgid "_Text Only"
 msgstr "Samo _tekst"
 
-#: ../shell/e-shell-window-actions.c:1170
+#: ../shell/e-shell-window-actions.c:1214
 msgid "Display window buttons with text only"
 msgstr "Prikažite dugmad prozora samo sa tekstom"
 
-#: ../shell/e-shell-window-actions.c:1175
+#: ../shell/e-shell-window-actions.c:1219
 msgid "Icons _and Text"
 msgstr "Ikonice _i tekst"
 
-#: ../shell/e-shell-window-actions.c:1177
+#: ../shell/e-shell-window-actions.c:1221
 msgid "Display window buttons with icons and text"
 msgstr "Prikažite dugmad prozora sa ikonicama i tekstom"
 
-#: ../shell/e-shell-window-actions.c:1182
+#: ../shell/e-shell-window-actions.c:1226
 msgid "Tool_bar Style"
 msgstr "Stil tra_ke alata"
 
-#: ../shell/e-shell-window-actions.c:1184
+#: ../shell/e-shell-window-actions.c:1228
 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:1192
+#: ../shell/e-shell-window-actions.c:1236
 msgid "Delete Current View"
 msgstr "Obriši trenutni pregled"
 
-#: ../shell/e-shell-window-actions.c:1199
+#: ../shell/e-shell-window-actions.c:1243
 msgid "Save Custom View..."
 msgstr "Sačuvaj prilagođen pregled..."
 
-#: ../shell/e-shell-window-actions.c:1201
+#: ../shell/e-shell-window-actions.c:1245
 msgid "Save current custom view"
 msgstr "Sačuvajte trenutni korisnički pregled"
 
-#: ../shell/e-shell-window-actions.c:1208
+#: ../shell/e-shell-window-actions.c:1252
 msgid "C_urrent View"
 msgstr "T_renutni pregled"
 
-#: ../shell/e-shell-window-actions.c:1218
+#: ../shell/e-shell-window-actions.c:1262
 msgid "Custom View"
 msgstr "Prilagođen pregled"
 
-#: ../shell/e-shell-window-actions.c:1220
+#: ../shell/e-shell-window-actions.c:1264
 msgid "Current view is a customized view"
 msgstr "Trenutan pregled je podesio korisnik"
 
-#: ../shell/e-shell-window-actions.c:1230
+#: ../shell/e-shell-window-actions.c:1272
+msgid "Page Set_up..."
+msgstr "Podešavanje _stranice..."
+
+#: ../shell/e-shell-window-actions.c:1274
 msgid "Change the page settings for your current printer"
 msgstr "Izmenite postavke stranice za trenutni štampač"
 
-#: ../shell/e-shell-window-actions.c:1591
+#: ../shell/e-shell-window-actions.c:1635
 #, c-format
 msgid "Switch to %s"
 msgstr "Pređi na %s"
 
-#: ../shell/e-shell-window-actions.c:1714
+#: ../shell/e-shell-window-actions.c:1758
 #, c-format
 msgid "Select view: %s"
 msgstr "Izaberi pregled: %s"
 
-#: ../shell/e-shell-window-actions.c:1731
+#: ../shell/e-shell-window-actions.c:1775
 #, c-format
 msgid "Delete view: %s"
 msgstr "Obriši pregled: %s"
 
-#: ../shell/e-shell-window-actions.c:1825
+#: ../shell/e-shell-window-actions.c:1869
 msgid "Execute these search parameters"
 msgstr "Izvršite ove parametre pretrage"
 
-#: ../shell/e-shell-window.c:504
+#: ../shell/e-shell-window.c:503
 msgid "New"
 msgstr "Novo"
 
 #. Translators: This is used for the main window title.
-#: ../shell/e-shell-window-private.c:580
+#: ../shell/e-shell-window-private.c:579
 #, c-format
 msgid "%s - Evolution"
 msgstr "%s — Evolucija"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:183
+#: ../shell/main.c:182
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -20722,7 +21274,7 @@ msgstr ""
 "Nadamo se da ćete uživati u plodovima našeg napornog rada, i \n"
 "željno iščekujemo vaš doprinos!\n"
 
-#: ../shell/main.c:207
+#: ../shell/main.c:206
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -20730,13 +21282,13 @@ msgstr ""
 "Hvala\n"
 "Tim Evolucije\n"
 
-#: ../shell/main.c:213
+#: ../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:302
+#: ../shell/main.c:301
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -20744,40 +21296,40 @@ msgstr ""
 "Pokreće Evoluciju prikazujući određene komponente. Dostupne opcije su: "
 "„mail“, „calendar“, „contacts“, „tasks“ i „memos“"
 
-#: ../shell/main.c:306
+#: ../shell/main.c:305
 msgid "Apply the given geometry to the main window"
 msgstr "Primeni datu geometriju na glavni prozor"
 
-#: ../shell/main.c:310
+#: ../shell/main.c:309
 msgid "Start in online mode"
 msgstr "Počni rad na mreži"
 
-#: ../shell/main.c:312
+#: ../shell/main.c:311
 msgid "Ignore network availability"
 msgstr "Zanemari dostupnost mreže"
 
-#: ../shell/main.c:315
+#: ../shell/main.c:314
 msgid "Forcibly shut down Evolution"
 msgstr "Silom ugasi Evoluciju"
 
-#: ../shell/main.c:318
+#: ../shell/main.c:317
 msgid "Disable loading of any plugins."
 msgstr "Isključi učitavanje svih dodataka."
 
-#: ../shell/main.c:320
+#: ../shell/main.c:319
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Isključi okno za pregled pošte, kontakta i zadataka."
 
-#: ../shell/main.c:324
+#: ../shell/main.c:323
 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:326
+#: ../shell/main.c:325
 msgid "Request a running Evolution process to quit"
 msgstr "Zahteva kraj pokrenutog procesa Evolucije"
 
-#: ../shell/main.c:403
+#: ../shell/main.c:402
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
@@ -20786,11 +21338,11 @@ msgstr ""
 "Ne mogu da pokrenem Evoluciju.  Drugi primerak Evolucije možda ne odgovara. "
 "Greška sistema: %s"
 
-#: ../shell/main.c:499 ../shell/main.c:504
+#: ../shell/main.c:496 ../shell/main.c:501
 msgid "- The Evolution PIM and Email Client"
 msgstr "— Evolucija rukovodilac ličnim podatacima i klijent el. pošte"
 
-#: ../shell/main.c:571
+#: ../shell/main.c:568
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -20799,7 +21351,7 @@ msgstr ""
 "%s: „--online“ i „--offline“ se ne mogu koristiti zajedno.\n"
 "  Pokrenite „%s --help“ za više podataka.\n"
 
-#: ../shell/main.c:577
+#: ../shell/main.c:574
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -20847,7 +21399,7 @@ msgstr ""
 "rešenje možete prvo da pokušate da nadogradite na Evoluciju 2, a zatim na "
 "Evoluciju 3."
 
-#: ../smime/gui/ca-trust-dialog.c:109
+#: ../smime/gui/ca-trust-dialog.c:108
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -20858,175 +21410,105 @@ msgstr ""
 "\n"
 "Uredite postavke poverenja:"
 
-#: ../smime/gui/certificate-manager.c:73 ../smime/gui/certificate-manager.c:92
-#: ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:80 ../smime/gui/certificate-manager.c:99
+#: ../smime/gui/certificate-manager.c:119
 msgid "Certificate Name"
 msgstr "Naziv uverenja"
 
-#: ../smime/gui/certificate-manager.c:74 ../smime/gui/certificate-manager.c:94
+#: ../smime/gui/certificate-manager.c:81
+#: ../smime/gui/certificate-manager.c:101
 msgid "Issued To Organization"
 msgstr "Izdato je organizaciji"
 
-#: ../smime/gui/certificate-manager.c:75 ../smime/gui/certificate-manager.c:95
+#: ../smime/gui/certificate-manager.c:82
+#: ../smime/gui/certificate-manager.c:102
 msgid "Issued To Organizational Unit"
 msgstr "Izdato je organizacionoj jedinici"
 
-#: ../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
+#: ../smime/gui/certificate-manager.c:83
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:121
 msgid "Serial Number"
 msgstr "Serijski broj"
 
-#: ../smime/gui/certificate-manager.c:77 ../smime/gui/certificate-manager.c:97
-#: ../smime/gui/certificate-manager.c:115
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:122
 msgid "Purposes"
 msgstr "Namene"
 
-#: ../smime/gui/certificate-manager.c:78 ../smime/gui/certificate-manager.c:98
-#: ../smime/gui/certificate-manager.c:116
-#: ../smime/gui/certificate-viewer.c:640
+#: ../smime/gui/certificate-manager.c:85
+#: ../smime/gui/certificate-manager.c:105
+#: ../smime/gui/certificate-manager.c:123
 msgid "Issued By"
 msgstr "Izdavač"
 
-#: ../smime/gui/certificate-manager.c:79 ../smime/gui/certificate-manager.c:99
-#: ../smime/gui/certificate-manager.c:117
+#: ../smime/gui/certificate-manager.c:86
+#: ../smime/gui/certificate-manager.c:106
+#: ../smime/gui/certificate-manager.c:124
 msgid "Issued By Organization"
 msgstr "Izdala je organizacija"
 
-#: ../smime/gui/certificate-manager.c:80
-#: ../smime/gui/certificate-manager.c:100
-#: ../smime/gui/certificate-manager.c:118
+#: ../smime/gui/certificate-manager.c:87
+#: ../smime/gui/certificate-manager.c:107
+#: ../smime/gui/certificate-manager.c:125
 msgid "Issued By Organizational Unit"
 msgstr "Izdala je organizaciona jedinica"
 
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:101
-#: ../smime/gui/certificate-manager.c:119
+#: ../smime/gui/certificate-manager.c:88
+#: ../smime/gui/certificate-manager.c:108
+#: ../smime/gui/certificate-manager.c:126
 msgid "Issued"
 msgstr "Izdato"
 
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:102
-#: ../smime/gui/certificate-manager.c:120
+#: ../smime/gui/certificate-manager.c:89
+#: ../smime/gui/certificate-manager.c:109
+#: ../smime/gui/certificate-manager.c:127
 msgid "Expires"
 msgstr "Ističe"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121
-#: ../smime/gui/certificate-viewer.c:650
+#: ../smime/gui/certificate-manager.c:90
+#: ../smime/gui/certificate-manager.c:110
+#: ../smime/gui/certificate-manager.c:128
 msgid "SHA1 Fingerprint"
 msgstr "SHA1 otisak"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122
-#: ../smime/gui/certificate-viewer.c:651
+#: ../smime/gui/certificate-manager.c:91
+#: ../smime/gui/certificate-manager.c:111
+#: ../smime/gui/certificate-manager.c:129
 msgid "MD5 Fingerprint"
 msgstr "MD5 Otisak"
 
-#: ../smime/gui/certificate-manager.c:93
-#: ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:100
+#: ../smime/gui/certificate-manager.c:120
 msgid "Email Address"
 msgstr "Adresa el. pošte"
 
-#: ../smime/gui/certificate-manager.c:614
+#: ../smime/gui/certificate-manager.c:621
 msgid "Select a certificate to import..."
 msgstr "Izaberite uverenje za uvoz..."
 
-#: ../smime/gui/certificate-manager.c:628
+#: ../smime/gui/certificate-manager.c:635
 msgid "All files"
 msgstr "Sve datoteke"
 
-#: ../smime/gui/certificate-manager.c:664
+#: ../smime/gui/certificate-manager.c:671
 msgid "Failed to import certificate"
 msgstr "Nisam uspeo da uvezem uverenje"
 
-#: ../smime/gui/certificate-manager.c:1046
+#: ../smime/gui/certificate-manager.c:1053
 msgid "All PKCS12 files"
 msgstr "Sve PKCS12 datoteke"
 
-#: ../smime/gui/certificate-manager.c:1063
+#: ../smime/gui/certificate-manager.c:1070
 msgid "All email certificate files"
 msgstr "Sve datoteke uverenja pošte"
 
-#: ../smime/gui/certificate-manager.c:1080
+#: ../smime/gui/certificate-manager.c:1087
 msgid "All CA certificate files"
 msgstr "Sve datoteke CA uverenja"
 
-#: ../smime/gui/certificate-viewer.c:292
-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/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
+#: ../smime/gui/cert-trust-dialog.c:152
 msgid ""
 "Because you trust the certificate authority that issued this certificate, "
 "then you trust the authenticity of this certificate unless otherwise "
@@ -21035,7 +21517,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:158
+#: ../smime/gui/cert-trust-dialog.c:157
 msgid ""
 "Because you do not trust the certificate authority that issued this "
 "certificate, then you do not trust the authenticity of this certificate "
@@ -21044,27 +21526,27 @@ 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:56
+#: ../smime/gui/component.c:55
 #, c-format
 msgid "Enter the password for '%s', token '%s'"
 msgstr "Unesite lozinku za „%s“, prsten „%s“"
 
-#: ../smime/gui/component.c:58
+#: ../smime/gui/component.c:57
 #, c-format
 msgid "Enter the password for '%s'"
 msgstr "Unesite lozinku za „%s“"
 
 #. we're setting the password initially
-#: ../smime/gui/component.c:86
+#: ../smime/gui/component.c:85
 msgid "Enter new password for certificate database"
 msgstr "Unesite novu lozinku za bazu uverenja"
 
-#: ../smime/gui/component.c:89
+#: ../smime/gui/component.c:88
 msgid "Enter new password"
 msgstr "Unesite novu lozinku"
 
 #. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:122
+#: ../smime/gui/e-cert-selector.c:121
 #, c-format
 msgid ""
 "Issued to:\n"
@@ -21073,7 +21555,7 @@ msgstr ""
 "Kome je izdato:\n"
 "  Naslov: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:123
+#: ../smime/gui/e-cert-selector.c:122
 #, c-format
 msgid ""
 "Issued by:\n"
@@ -21082,7 +21564,7 @@ msgstr ""
 "Izdao je:\n"
 "  Naslov: %s\n"
 
-#: ../smime/gui/e-cert-selector.c:176
+#: ../smime/gui/e-cert-selector.c:175
 msgid "Select certificate"
 msgstr "Izaberite uverenje"
 
@@ -21103,44 +21585,44 @@ msgstr "Napravi _rezervu"
 msgid "Backup _All"
 msgstr "Napravi rezervu _svega"
 
-#: ../smime/gui/smime-ui.ui.h:10
+#: ../smime/gui/smime-ui.ui.h:11
 msgid "Your Certificates"
 msgstr "Vaša uverenja"
 
-#: ../smime/gui/smime-ui.ui.h:11
+#: ../smime/gui/smime-ui.ui.h:12
 msgid "You have certificates on file that identify these people:"
 msgstr "Posedujete uverenja koja određuju ove osobe:"
 
-#: ../smime/gui/smime-ui.ui.h:12
+#: ../smime/gui/smime-ui.ui.h:14
 msgid "Contact Certificates"
 msgstr "Uverenja kontakta"
 
-#: ../smime/gui/smime-ui.ui.h:13
+#: ../smime/gui/smime-ui.ui.h:15
 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:14
+#: ../smime/gui/smime-ui.ui.h:16
 msgid "Authorities"
 msgstr "Izdavaoci"
 
-#: ../smime/gui/smime-ui.ui.h:15
+#: ../smime/gui/smime-ui.ui.h:17
 msgid "Certificate Authority Trust"
 msgstr "Poverenje izdavaocu uverenja"
 
-#: ../smime/gui/smime-ui.ui.h:16
+#: ../smime/gui/smime-ui.ui.h:18
 msgid "Trust this CA to identify _websites."
 msgstr "Veruj ovom izdavaocu uverenja za prepoznavanje _veb stranica."
 
-#: ../smime/gui/smime-ui.ui.h:17
+#: ../smime/gui/smime-ui.ui.h:19
 msgid "Trust this CA to identify _email users."
 msgstr "Veruj ovom izdavaocu uverenja za prepoznavanje _el. adresa."
 
-#: ../smime/gui/smime-ui.ui.h:18
+#: ../smime/gui/smime-ui.ui.h:20
 msgid "Trust this CA to identify _software developers."
 msgstr "Veruj ovom izdavaocu uverenja za prepoznavanje _programera."
 
-#: ../smime/gui/smime-ui.ui.h:19
+#: ../smime/gui/smime-ui.ui.h:21
 msgid ""
 "Before trusting this CA for any purpose, you should examine its certificate "
 "and its policy and procedures (if available)."
@@ -21148,214 +21630,44 @@ msgstr ""
 "Pre verovanja ovom izdavaocu uverenja, prvo pregledajte njegovo uverenje, "
 "politiku i procedure (ako su dostupni)."
 
-#: ../smime/gui/smime-ui.ui.h:21 ../smime/lib/e-asn1-object.c:658
+#: ../smime/gui/smime-ui.ui.h:25
 msgid "Certificate"
 msgstr "Uverenje"
 
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../smime/gui/smime-ui.ui.h:26
 msgid "Certificate details"
 msgstr "Detalji uverenja"
 
-#: ../smime/gui/smime-ui.ui.h:23
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Email Certificate Trust Settings"
 msgstr "Podešavanja poverenja u uverenja el. pošte"
 
-#: ../smime/gui/smime-ui.ui.h:24
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Trust the authenticity of this certificate"
 msgstr "Veruj u verodostojnost ovog uverenja"
 
-#: ../smime/gui/smime-ui.ui.h:25
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Ne veruj u verodostojnost ovog uverenja"
 
-#: ../smime/gui/smime-ui.ui.h:26
+#: ../smime/gui/smime-ui.ui.h:30
 msgid "_Edit CA Trust"
 msgstr "_Uredi CA poverenje"
 
-#: ../smime/lib/e-asn1-object.c:95
-msgid "Version"
-msgstr "Izdanje"
-
-#: ../smime/lib/e-asn1-object.c:110
-msgid "Version 1"
-msgstr "Izdanje 1"
-
-#: ../smime/lib/e-asn1-object.c:113
-msgid "Version 2"
-msgstr "Izdanje 2"
-
-#: ../smime/lib/e-asn1-object.c:116
-msgid "Version 3"
-msgstr "Izdanje 3"
-
-#: ../smime/lib/e-asn1-object.c:192
-msgid "PKCS #1 MD2 With RSA Encryption"
-msgstr "PKCS #1 MD2 sa RSA šifrovanjem"
-
-#: ../smime/lib/e-asn1-object.c:195
-msgid "PKCS #1 MD5 With RSA Encryption"
-msgstr "PKCS #1 MD5 sa RSA šifrovanjem"
-
-#: ../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-asn1-object.c:201
-msgid "PKCS #1 SHA-256 With RSA Encryption"
-msgstr "PKCS #1 SHA-256 sa RSA šifrovanjem"
-
-#: ../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-asn1-object.c:207
-msgid "PKCS #1 SHA-512 With RSA Encryption"
-msgstr "PKCS #1 SHA-512 sa RSA šifrovanjem"
-
-#: ../smime/lib/e-asn1-object.c:234
-msgid "PKCS #1 RSA Encryption"
-msgstr "PKCS #1 RSA šifrovanje"
-
-#: ../smime/lib/e-asn1-object.c:237
-msgid "Certificate Key Usage"
-msgstr "Upotreba ključa uverenja"
-
-#: ../smime/lib/e-asn1-object.c:240
-msgid "Netscape Certificate Type"
-msgstr "Vrsta Netskejp uverenja"
-
-#: ../smime/lib/e-asn1-object.c:243
-msgid "Certificate Authority Key Identifier"
-msgstr "Određivač ključa izdavaoca uverenja"
-
-#: ../smime/lib/e-asn1-object.c:255
-#, c-format
-msgid "Object Identifier (%s)"
-msgstr "Određivač predmeta (%s)"
-
-#: ../smime/lib/e-asn1-object.c:306
-msgid "Algorithm Identifier"
-msgstr "Određivač algoritma"
-
-#: ../smime/lib/e-asn1-object.c:314
-msgid "Algorithm Parameters"
-msgstr "Parametri algoritma"
-
-#: ../smime/lib/e-asn1-object.c:336
-msgid "Subject Public Key Info"
-msgstr "Podaci o javnom ključu subjekta"
-
-#: ../smime/lib/e-asn1-object.c:341
-msgid "Subject Public Key Algorithm"
-msgstr "Algoritam javnog ključa subjekta"
-
-#: ../smime/lib/e-asn1-object.c:356
-msgid "Subject's Public Key"
-msgstr "Javni ključ subjekta"
-
-#: ../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-asn1-object.c:399 ../smime/lib/e-asn1-object.c:411
-msgid "Object Signer"
-msgstr "Potpisnik predmeta"
-
-#: ../smime/lib/e-asn1-object.c:403
-msgid "SSL Certificate Authority"
-msgstr "Izdavač SSL uverenja"
-
-#: ../smime/lib/e-asn1-object.c:407
-msgid "Email Certificate Authority"
-msgstr "Izdavač uverenja el. pošte"
-
-#: ../smime/lib/e-asn1-object.c:436
-msgid "Signing"
-msgstr "Potpisivanje"
-
-#: ../smime/lib/e-asn1-object.c:440
-msgid "Non-repudiation"
-msgstr "Bez odricanja"
-
-#: ../smime/lib/e-asn1-object.c:444
-msgid "Key Encipherment"
-msgstr "Zamućivanje ključa"
-
-#: ../smime/lib/e-asn1-object.c:448
-msgid "Data Encipherment"
-msgstr "Zamućivanje podataka"
-
-#: ../smime/lib/e-asn1-object.c:452
-msgid "Key Agreement"
-msgstr "Saglasnost ključa"
-
-#: ../smime/lib/e-asn1-object.c:456
-msgid "Certificate Signer"
-msgstr "Potpisnik uverenja"
-
-#: ../smime/lib/e-asn1-object.c:460
-msgid "CRL Signer"
-msgstr "CRL potpisnik"
-
-#: ../smime/lib/e-asn1-object.c:509
-msgid "Critical"
-msgstr "Kritično"
-
-#: ../smime/lib/e-asn1-object.c:511 ../smime/lib/e-asn1-object.c:514
-msgid "Not Critical"
-msgstr "Nije kritično"
-
-#: ../smime/lib/e-asn1-object.c:535
-msgid "Extensions"
-msgstr "Proširenja"
-
-#. Translators: This string is used in Certificate
-#. * details for fields like Issuer or Subject, which
-#. * shows the field name on the left and its respective
-#. * value on the right, both as stored in the
-#. * certificate itself.  You probably do not need to
-#. * change this string, unless changing the order of
-#. * name and value.  As a result example:
-#. * "OU = VeriSign Trust Network"
-#: ../smime/lib/e-asn1-object.c:615
-#, c-format
-msgid "%s = %s"
-msgstr "%s = %s"
-
-#: ../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-asn1-object.c:681
-msgid "Issuer"
-msgstr "Izdavač"
-
-#: ../smime/lib/e-asn1-object.c:735
-msgid "Issuer Unique ID"
-msgstr "Jedinstveni IB izdavača"
-
-#: ../smime/lib/e-asn1-object.c:754
-msgid "Subject Unique ID"
-msgstr "Jedinstveni IB subjekta"
-
-#: ../smime/lib/e-asn1-object.c:813
-msgid "Certificate Signature Value"
-msgstr "Vrednost potpisa uverenja"
-
-#: ../smime/lib/e-cert.c:201 ../smime/lib/e-cert.c:213
+#: ../smime/lib/e-cert.c:236 ../smime/lib/e-cert.c:248
 msgid "%d/%m/%Y"
 msgstr "%d. %m. %Y."
 
 #. x509 certificate usage types
-#: ../smime/lib/e-cert.c:392
+#: ../smime/lib/e-cert.c:404
 msgid "Sign"
 msgstr "Potpiši"
 
-#: ../smime/lib/e-cert.c:393
+#: ../smime/lib/e-cert.c:405
 msgid "Encrypt"
 msgstr "Šifruj"
 
-#: ../smime/lib/e-cert-db.c:864
+#: ../smime/lib/e-cert-db.c:718
 msgid "Certificate already exists"
 msgstr "Uverenje već postoji"
 
@@ -21442,3 +21754,222 @@ msgstr "Sa _rokom"
 #: ../views/tasks/galview.xml.h:3
 msgid "With _Status"
 msgstr "Sa _stanjem"
+
+#~ msgid "Original Contact:"
+#~ msgstr "Originalan kontakt:"
+
+#~ msgid "Ellipsize mode for folder names in side bar"
+#~ msgstr "Isključuje ili omogućava skraćivanje naziva fascikli u bočnoj površi"
+
+#~ msgid "Pinging %s"
+#~ msgstr "Ispitujem dostupnost za %s"
+
+#~ msgid "_Restore Default"
+#~ msgstr "Povrati _podrazumevano"
+
+#~ msgid "Proxy Settings"
+#~ msgstr "Podešavanja posrednika"
+
+#~ msgid "_Use system defaults"
+#~ msgstr "_Koristi sistemske postavke"
+
+#~ msgid "_Direct connection to the Internet"
+#~ msgstr "_Direktna veza sa Internetom"
+
+#~ msgid "_Manual proxy configuration:"
+#~ msgstr "_Ručno podešavanje posrednika:"
+
+#~ msgid "_Secure HTTP Proxy:"
+#~ msgstr "_Bezbedan HTTP posrednik:"
+
+#~ msgid "No _Proxy for:"
+#~ msgstr "Bez _posrednika za:"
+
+#~ msgid "Use Authe_ntication"
+#~ msgstr "Koristi _potvrđivanje identiteta"
+
+#~ msgid "Us_ername:"
+#~ msgstr "Korisničko_ime:"
+
+#~ msgid "Pass_word:"
+#~ msgstr "_Lozinka:"
+
+#~ msgid "Copy..."
+#~ msgstr "Umnoži..."
+
+#~ msgid "No writable calendar is available."
+#~ msgstr "Nema dostupnog kalendara za upisivanje."
+
+#~ msgid "Not part of certificate"
+#~ msgstr "Nije deo uverenja"
+
+#~ msgid "This certificate has been verified for the following uses:"
+#~ msgstr "Ovo uverenje je provereno za sledeće potrebe:"
+
+#~ msgid "SSL Client Certificate"
+#~ msgstr "Uverenje SSL klijenta"
+
+#~ msgid "SSL Server Certificate"
+#~ msgstr "Uverenje SSL servera"
+
+#~ msgid "Email Signer Certificate"
+#~ msgstr "Uverenje potpisnika el. poruke"
+
+#~ msgid "Email Recipient Certificate"
+#~ msgstr "Uverenje primaoca el. poruke"
+
+#~ msgid "Issued To"
+#~ msgstr "Kome je izdato"
+
+#~ msgid "Common Name (CN)"
+#~ msgstr "Zajedničko ime (CN)"
+
+#~ msgid "Organization (O)"
+#~ msgstr "Organizacija (O)"
+
+#~ msgid "Organizational Unit (OU)"
+#~ msgstr "Organizaciona jedinica (OU)"
+
+#~ msgid "Validity"
+#~ msgstr "Ispravnost"
+
+#~ msgid "Issued On"
+#~ msgstr "Izdato je"
+
+#~ msgid "Expires On"
+#~ msgstr "Ističe"
+
+#~ msgid "Fingerprints"
+#~ msgstr "Otisci"
+
+#~ msgid "Certificate Hierarchy"
+#~ msgstr "Hijerarhija uverenja"
+
+#~ msgid "Certificate Fields"
+#~ msgstr "Polja uverenja"
+
+#~ msgid "Field Value"
+#~ msgstr "Vrednost polja"
+
+#~ msgid "Details"
+#~ msgstr "Pojedinosti"
+
+#~ msgid "Version"
+#~ msgstr "Izdanje"
+
+#~ msgid "Version 1"
+#~ msgstr "Izdanje 1"
+
+#~ msgid "Version 2"
+#~ msgstr "Izdanje 2"
+
+#~ msgid "Version 3"
+#~ msgstr "Izdanje 3"
+
+#~ msgid "PKCS #1 MD2 With RSA Encryption"
+#~ msgstr "PKCS #1 MD2 sa RSA šifrovanjem"
+
+#~ msgid "PKCS #1 MD5 With RSA Encryption"
+#~ msgstr "PKCS #1 MD5 sa RSA šifrovanjem"
+
+#~ msgid "PKCS #1 SHA-1 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-1 sa RSA šifrovanjem"
+
+#~ msgid "PKCS #1 SHA-256 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-256 sa RSA šifrovanjem"
+
+#~ msgid "PKCS #1 SHA-384 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-384 sa RSA šifrovanjem"
+
+#~ msgid "PKCS #1 SHA-512 With RSA Encryption"
+#~ msgstr "PKCS #1 SHA-512 sa RSA šifrovanjem"
+
+#~ msgid "PKCS #1 RSA Encryption"
+#~ msgstr "PKCS #1 RSA šifrovanje"
+
+#~ msgid "Certificate Key Usage"
+#~ msgstr "Upotreba ključa uverenja"
+
+#~ msgid "Netscape Certificate Type"
+#~ msgstr "Vrsta Netskejp uverenja"
+
+#~ msgid "Certificate Authority Key Identifier"
+#~ msgstr "Određivač ključa izdavaoca uverenja"
+
+#~ msgid "Object Identifier (%s)"
+#~ msgstr "Određivač predmeta (%s)"
+
+#~ msgid "Algorithm Identifier"
+#~ msgstr "Određivač algoritma"
+
+#~ msgid "Algorithm Parameters"
+#~ msgstr "Parametri algoritma"
+
+#~ msgid "Subject Public Key Info"
+#~ msgstr "Podaci o javnom ključu subjekta"
+
+#~ msgid "Subject Public Key Algorithm"
+#~ msgstr "Algoritam javnog ključa subjekta"
+
+#~ msgid "Subject's Public Key"
+#~ msgstr "Javni ključ subjekta"
+
+#~ msgid "Error: Unable to process extension"
+#~ msgstr "Greška: ne mogu da obradim proširenje"
+
+#~ msgid "Object Signer"
+#~ msgstr "Potpisnik predmeta"
+
+#~ msgid "SSL Certificate Authority"
+#~ msgstr "Izdavač SSL uverenja"
+
+#~ msgid "Email Certificate Authority"
+#~ msgstr "Izdavač uverenja el. pošte"
+
+#~ msgid "Signing"
+#~ msgstr "Potpisivanje"
+
+#~ msgid "Non-repudiation"
+#~ msgstr "Bez odricanja"
+
+#~ msgid "Key Encipherment"
+#~ msgstr "Zamućivanje ključa"
+
+#~ msgid "Data Encipherment"
+#~ msgstr "Zamućivanje podataka"
+
+#~ msgid "Key Agreement"
+#~ msgstr "Saglasnost ključa"
+
+#~ msgid "Certificate Signer"
+#~ msgstr "Potpisnik uverenja"
+
+#~ msgid "CRL Signer"
+#~ msgstr "CRL potpisnik"
+
+#~ msgid "Critical"
+#~ msgstr "Kritično"
+
+#~ msgid "Not Critical"
+#~ msgstr "Nije kritično"
+
+#~ msgid "Extensions"
+#~ msgstr "Proširenja"
+
+#~ msgid "%s = %s"
+#~ msgstr "%s = %s"
+
+#~ msgid "Certificate Signature Algorithm"
+#~ msgstr "Algoritam potpisa uverenja"
+
+#~ msgid "Issuer"
+#~ msgstr "Izdavač"
+
+#~ msgid "Issuer Unique ID"
+#~ msgstr "Jedinstveni IB izdavača"
+
+#~ msgid "Subject Unique ID"
+#~ msgstr "Jedinstveni IB subjekta"
+
+#~ msgid "Certificate Signature Value"
+#~ msgstr "Vrednost potpisa uverenja"
author	Мирослав Николић <miroslavnikolic@rocketmail.com>	2014-03-18 05:19:53 +0800
committer	Мирослав Николић <miroslavnikolic@rocketmail.com>	2014-03-18 05:19:53 +0800
commit	3ab4126820c4521fa07bbdeb0489a1b3fb20f9de (patch)
tree	bc260a78617fb43d3c3fcf79817425b5442e32fa /po
parent	28bed602297d0c62a7012f6707caa74ba3b301d9 (diff)
download	gsoc2013-evolution-3ab4126820c4521fa07bbdeb0489a1b3fb20f9de.tar gsoc2013-evolution-3ab4126820c4521fa07bbdeb0489a1b3fb20f9de.tar.gz gsoc2013-evolution-3ab4126820c4521fa07bbdeb0489a1b3fb20f9de.tar.bz2 gsoc2013-evolution-3ab4126820c4521fa07bbdeb0489a1b3fb20f9de.tar.lz gsoc2013-evolution-3ab4126820c4521fa07bbdeb0489a1b3fb20f9de.tar.xz gsoc2013-evolution-3ab4126820c4521fa07bbdeb0489a1b3fb20f9de.tar.zst gsoc2013-evolution-3ab4126820c4521fa07bbdeb0489a1b3fb20f9de.zip