[evolution] Updated Slovenian translation



commit 3ad2878b16b1eccb781854e29d674e64a691d949
Author: Matej Urbančič <mateju svn gnome org>
Date:   Sun Mar 8 21:50:36 2015 +0100

    Updated Slovenian translation

 po/sl.po |10826 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 6878 insertions(+), 3948 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 9d8e9b8..6c7bb12 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,15 +4,15 @@
 #
 # Andraž Tori <andraz tori1 guest arnes si>, 2002.
 # Andrej Žnidaršič <andrej znidarsic gmail com>, 2009-2010.
-# Matej Urbančič <mateju svn gnome org>, 2006-2014.
+# Matej Urbančič <mateju svn gnome org>, 2006-2015.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=evolution&keywords=I18N+L10N&component=Miscellaneous\n"
-"POT-Creation-Date: 2014-04-28 18:37+0000\n"
-"PO-Revision-Date: 2014-04-28 20:39+0100\n"
+"POT-Creation-Date: 2015-03-08 20:25+0000\n"
+"PO-Revision-Date: 2015-03-08 21:49+0100\n"
 "Last-Translator: Matej Urbančič <mateju svn gnome org>\n"
 "Language-Team: Slovenščina <gnome-si googlegroups com>\n"
 "Language: Slovenian\n"
@@ -123,24 +123,29 @@ msgid "Unable to perform search."
 msgstr "Iskanja ni mogoče izvesti."
 
 #: ../addressbook/addressbook.error.xml.h:20
+#, fuzzy
+msgid "Failed to refresh address book '{0}'"
+msgstr "Ni mogoče odpreti imenika '{0}'"
+
+#: ../addressbook/addressbook.error.xml.h:21
 msgid "Would you like to save your changes?"
 msgstr "Ali želite shraniti svoje spremembe?"
 
-#: ../addressbook/addressbook.error.xml.h:21
+#: ../addressbook/addressbook.error.xml.h:22
 msgid ""
 "You have made modifications to this contact. Do you want to save these "
 "changes?"
 msgstr "Spremenili ste podatke o stiku. Ali želite spremembe shraniti?"
 
-#: ../addressbook/addressbook.error.xml.h:22
+#: ../addressbook/addressbook.error.xml.h:23
 msgid "_Discard"
 msgstr "_Zavrzi"
 
-#: ../addressbook/addressbook.error.xml.h:23
+#: ../addressbook/addressbook.error.xml.h:24
 msgid "Cannot move contact."
 msgstr "Ni mogoče premakniti stika."
 
-#: ../addressbook/addressbook.error.xml.h:24
+#: ../addressbook/addressbook.error.xml.h:25
 msgid ""
 "You are attempting to move a contact from one address book to another but it "
 "cannot be removed from the source. Do you want to save a copy instead?"
@@ -148,36 +153,36 @@ msgstr ""
 "Stik poskušate prenesti iz enega imenika v drugega, vendar ga ni mogoče "
 "izbrisati iz vira. Ali želite namesto tega shraniti kopijo?"
 
-#: ../addressbook/addressbook.error.xml.h:25
+#: ../addressbook/addressbook.error.xml.h:26
 msgid ""
 "The image you have selected is large. Do you want to resize and store it?"
 msgstr "Izbrana slika je velika. Ali jo želite zmanjšati in shraniti?"
 
-#: ../addressbook/addressbook.error.xml.h:26
+#: ../addressbook/addressbook.error.xml.h:27
 msgid "_Resize"
 msgstr "_Spremeni velikost"
 
-#: ../addressbook/addressbook.error.xml.h:27
+#: ../addressbook/addressbook.error.xml.h:28
 msgid "_Use as it is"
 msgstr "_Uporabi kot je"
 
-#: ../addressbook/addressbook.error.xml.h:28
+#: ../addressbook/addressbook.error.xml.h:29
 msgid "_Do not save"
 msgstr "_Ne shrani"
 
-#: ../addressbook/addressbook.error.xml.h:29
+#: ../addressbook/addressbook.error.xml.h:30
 msgid "Unable to save {0}."
 msgstr "Ni mogoče shraniti {0}."
 
-#: ../addressbook/addressbook.error.xml.h:30
+#: ../addressbook/addressbook.error.xml.h:31
 msgid "Error saving {0} to {1}: {2}"
 msgstr "Napaka med shranjevanjem {0} v {1}: {2}"
 
-#: ../addressbook/addressbook.error.xml.h:31
+#: ../addressbook/addressbook.error.xml.h:32
 msgid "Address '{0}' already exists."
 msgstr "Naslov '{0}' že obstaja."
 
-#: ../addressbook/addressbook.error.xml.h:32
+#: ../addressbook/addressbook.error.xml.h:33
 msgid ""
 "A contact already exists with this address. Would you like to add a new card "
 "with the same address anyway?"
@@ -185,69 +190,69 @@ msgstr ""
 "Stik s tem naslovom že obstaja. Ali želite vseeno dodati novo vizitko z "
 "enakim naslovom?"
 
-#: ../addressbook/addressbook.error.xml.h:33
+#: ../addressbook/addressbook.error.xml.h:34
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:8
-#: ../addressbook/gui/widgets/eab-contact-merging.c:626
+#: ../addressbook/gui/widgets/eab-contact-merging.c:723
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:4
 #: ../calendar/gui/dialogs/event-page.ui.h:22
 #: ../calendar/gui/dialogs/recurrence-page.ui.h:19
-#: ../calendar/gui/dialogs/task-page.ui.h:30 ../e-util/filter.ui.h:16
+#: ../calendar/gui/dialogs/task-page.ui.h:30
 #: ../e-util/e-mail-signature-manager.c:327
-#: ../e-util/e-name-selector-dialog.c:995 ../mail/e-mail-account-manager.c:719
-#: ../mail/e-mail-label-manager.c:373 ../mail/em-vfolder-editor-rule.c:392
-#: ../mail/em-vfolder-editor-rule.c:622 ../mail/mail-config.ui.h:51
-#: ../modules/mail/em-composer-prefs.c:443
+#: ../e-util/e-name-selector-dialog.c:995 ../e-util/filter.ui.h:16
+#: ../mail/e-mail-account-manager.c:718 ../mail/e-mail-label-manager.c:373
+#: ../mail/em-vfolder-editor-rule.c:396 ../mail/em-vfolder-editor-rule.c:625
+#: ../mail/mail-config.ui.h:54 ../modules/mail/em-composer-prefs.c:397
 #: ../plugins/attachment-reminder/attachment-reminder.c:557
-#: ../plugins/email-custom-header/email-custom-header.c:838
+#: ../plugins/email-custom-header/email-custom-header.c:839
 #: ../plugins/publish-calendar/publish-calendar.ui.h:32
 #: ../plugins/templates/templates.c:453
 msgid "_Add"
 msgstr "_Dodaj"
 
-#: ../addressbook/addressbook.error.xml.h:34
+#: ../addressbook/addressbook.error.xml.h:35
 msgid "Some addresses already exist in this contact list."
 msgstr "Nekateri naslovi že obstajajo na tem seznamu stikov."
 
-#: ../addressbook/addressbook.error.xml.h:35
+#: ../addressbook/addressbook.error.xml.h:36
 msgid ""
 "You are trying to add addresses that are part of this list already. Would "
 "you like to add them anyway?"
 msgstr "Ti naslovi so že del seznama. Ali želite podatke vseeno dodati?"
 
-#: ../addressbook/addressbook.error.xml.h:36
+#: ../addressbook/addressbook.error.xml.h:37
 msgid "Skip duplicates"
 msgstr "Preskoči dvojnike"
 
-#: ../addressbook/addressbook.error.xml.h:37
+#: ../addressbook/addressbook.error.xml.h:38
 msgid "Add with duplicates"
 msgstr "Dodaj z dvojniki"
 
-#: ../addressbook/addressbook.error.xml.h:38
+#: ../addressbook/addressbook.error.xml.h:39
 msgid "List '{0}' is already in this contact list."
 msgstr "Seznam '{0}' je že na seznamu stikov."
 
-#: ../addressbook/addressbook.error.xml.h:39
+#: ../addressbook/addressbook.error.xml.h:40
 msgid ""
 "A contact list named '{0}' is already in this contact list. Would you like "
 "to add it anyway?"
 msgstr ""
 "Seznam stikov '{0}' že obstaja na tem seznamu. Ali ga želite vseeno dodati?"
 
-#: ../addressbook/addressbook.error.xml.h:40
+#: ../addressbook/addressbook.error.xml.h:41
 #: ../addressbook/gui/widgets/e-addressbook-view.c:1250
 msgid "Failed to delete contact"
 msgstr "Izbris stika ni uspel"
 
-#: ../addressbook/addressbook.error.xml.h:41
+#: ../addressbook/addressbook.error.xml.h:42
 msgid "You do not have permission to delete contacts in this address book."
 msgstr "Nimate dovoljenja za izbris stika iz imenika."
 
-#: ../addressbook/addressbook.error.xml.h:42
+#: ../addressbook/addressbook.error.xml.h:43
 msgid "Cannot add new contact"
 msgstr "Ni mogoče dodati novega stika"
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:44
+#: ../addressbook/addressbook.error.xml.h:45
 msgid ""
 "'{0}' is a read-only address book and cannot be modified. Please select a "
 "different address book from the side bar in the Contacts view."
@@ -255,12 +260,12 @@ msgstr ""
 "'{0}' je imenik le za branje in ga ni mogoče spreminjati. Izberite drug "
 "imenik iz stranske vrstice v pogledu stikov."
 
-#: ../addressbook/addressbook.error.xml.h:45
+#: ../addressbook/addressbook.error.xml.h:46
 msgid "Cannot save a contact, address book is still opening"
 msgstr "Stika ni mogoče shraniti, saj imenik še vedno ni odprt"
 
 #. For Translators: {0} is the name of the address book source
-#: ../addressbook/addressbook.error.xml.h:47
+#: ../addressbook/addressbook.error.xml.h:48
 msgid ""
 "Cannot save a contact to the address book '{0}', because it is still "
 "opening. Either wait till it's opened, or select a different address book."
@@ -269,9 +274,9 @@ msgstr ""
 "na izbranega ali pa izberite drug imenik."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:1
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:734
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:756
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3037
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:722
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:744
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3087
 msgid "Contact Editor"
 msgstr "Urejevalnik stikov"
 
@@ -304,81 +309,81 @@ msgid "Full _Name..."
 msgstr "_Polno ime ..."
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:8
-msgid "_Wants to receive HTML mail"
-msgstr "Želi prejemati pošto _HTML"
-
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
-#: ../addressbook/gui/widgets/eab-contact-merging.c:408
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:749
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1163
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:6
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:596
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:980
 msgid "Email"
 msgstr "Elektronska pošta"
 
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:9
+msgid "_Wants to receive HTML mail"
+msgstr "Želi prejemati pošto _HTML"
+
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:10
 msgid "Telephone"
 msgstr "Telefon"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:11
+#, fuzzy
+msgid "SIP Address"
+msgstr "Naslov"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
 msgid "Instant Messaging"
 msgstr "Hipno sporočanje"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:12
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
 #: ../addressbook/importers/evolution-vcard-importer.c:971
 msgid "Contact"
 msgstr "Stik"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:13
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
 msgid "_Home Page:"
 msgstr "Do_mača stran:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:14
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
 #: ../calendar/gui/dialogs/event-page.c:709
 #: ../calendar/gui/dialogs/event-page.ui.h:25
-#: ../modules/itip-formatter/itip-view.c:1891
+#: ../modules/itip-formatter/itip-view.c:1908
 msgid "_Calendar:"
 msgstr "_Koledar:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:15
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
 msgid "_Free/Busy:"
 msgstr "_Zasedenost:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:16
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
 msgid "_Video Chat:"
 msgstr "_Video klepet:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:17
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
 msgid "Home Page:"
 msgstr "Domača stran:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:18
-#: ../modules/cal-config-google/evolution-cal-config-google.c:96
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../modules/cal-config-google/e-cal-config-google.c:93
 msgid "Calendar:"
 msgstr "Koledar:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:19
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
 msgid "Free/Busy:"
 msgstr "Zasedenost:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:20
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
 msgid "Video Chat:"
 msgstr "Video klepet:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:21
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:22
 msgid "_Blog:"
 msgstr "_Blog:"
 
 #. Translators: an accessibility name
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:23
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
 msgid "Blog:"
 msgstr "Blog:"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:24
-msgid "Web Addresses"
-msgstr "Spletni naslovi"
-
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:25
-msgid "Web addresses"
+msgid "Web Addresses"
 msgstr "Spletni naslovi"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:26
@@ -427,8 +432,8 @@ msgid "_Anniversary:"
 msgstr "Ob_letnica:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:37
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:692
-#: ../calendar/gui/e-calendar-view.c:2292
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:875
+#: ../calendar/gui/e-calendar-view.c:1996
 msgid "Anniversary"
 msgstr "Obletnica"
 
@@ -438,8 +443,8 @@ msgstr "Obletnica"
 #. * which, so long as it has an icon.  We're just interested in
 #. * the directory components.
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:38
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:691
-#: ../calendar/gui/e-calendar-view.c:2291 ../shell/main.c:127
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:874
+#: ../calendar/gui/e-calendar-view.c:1995 ../shell/main.c:127
 msgid "Birthday"
 msgstr "Rojstni dan"
 
@@ -472,32 +477,30 @@ msgid "_PO Box:"
 msgstr "_Poštni predal:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:46
+#: ../composer/e-composer-from-header.c:123
 msgid "_Address:"
 msgstr "_Naslov:"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:47
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:192
-#: ../addressbook/gui/widgets/e-contact-map.c:371
 #: ../addressbook/gui/widgets/eab-contact-display.c:356
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:80
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:82
+#: ../addressbook/gui/widgets/e-contact-map.c:369
 msgid "Home"
 msgstr "Doma"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:48
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:191
-#: ../addressbook/gui/widgets/e-contact-map.c:384
 #: ../addressbook/gui/widgets/eab-contact-display.c:353
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:79
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:673
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:842
+#: ../addressbook/gui/widgets/e-contact-map.c:382
 msgid "Work"
 msgstr "Delo"
 
 #: ../addressbook/gui/contact-editor/contact-editor.ui.h:49
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:193
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:81
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:367
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:726
-#: ../calendar/gui/e-cal-model.c:3951
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:83
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:512
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:909
+#: ../calendar/gui/e-cal-model.c:3034
 msgid "Other"
 msgstr "Drugo"
 
@@ -510,171 +513,197 @@ msgid "Notes"
 msgstr "Opombe"
 
 #: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1249
+#: ../calendar/gui/dialogs/comp-editor.c:1335
+#: ../e-util/e-preferences-window.c:379 ../e-util/e-send-options.ui.h:41
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:2
-#: ../shell/e-shell-window-actions.c:1086
+#: ../shell/e-shell-window-actions.c:1085
 msgid "_Help"
 msgstr "Pomo_č"
 
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:53
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:35
+msgid "Options"
+msgstr "Možnosti"
+
 #. 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/contact-editor.ui.h:54
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3683
 #: ../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-contact-merging.c:474
+#: ../addressbook/gui/widgets/eab-contact-merging.c:718
 #: ../addressbook/gui/widgets/eab-gui-util.c:318
+#: ../addressbook/gui/widgets/e-addressbook-view.c:1330
 #: ../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:336 ../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
+#: ../composer/e-composer-actions.c:267 ../e-util/e-activity-bar.c:340
+#: ../e-util/e-attachment-dialog.c:311 ../e-util/e-attachment-store.c:491
+#: ../e-util/e-attachment-store.c:635 ../e-util/e-attachment-view.c: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-color-chooser-widget.c:127 ../e-util/e-filter-datespec.c:291
+#: ../e-util/e-html-editor-actions.c:484 ../e-util/e-html-editor-actions.c:578
+#: ../e-util/e-image-chooser-dialog.c:171
+#: ../e-util/e-mail-signature-script-dialog.c:365 ../e-util/e-passwords.c:470
 #: ../e-util/e-rule-context.c:815 ../e-util/e-rule-editor.c:180
 #: ../e-util/e-rule-editor.c:282 ../e-util/e-rule-editor.c:776
-#: ../e-util/e-source-config-dialog.c:375
-#: ../e-util/e-source-selector-dialog.c:348 ../e-util/e-table-config.c:548
-#: ../e-util/e-web-view.c:3097 ../e-util/evolution-source-viewer.c:833
+#: ../e-util/e-send-options.ui.h:42 ../e-util/e-source-config-dialog.c:379
+#: ../e-util/e-source-selector-dialog.c:350 ../e-util/e-table-config.c:548
+#: ../e-util/e-table-config.ui.h:1 ../e-util/e-timezone-dialog.ui.h:2
+#: ../e-util/evolution-source-viewer.c:834 ../e-util/e-web-view.c:3131
 #: ../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/e-mail-config-window.c:330 ../mail/e-mail-label-dialog.c:196
+#: ../mail/e-mail-tag-editor.c:242 ../mail/em-folder-selector.c:317
+#: ../mail/mail-config.ui.h:2 ../mail/mail-send-recv.c:738
+#: ../mail/mail-send-recv.c:820 ../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
+#: ../modules/backup-restore/evolution-backup-tool.c:900
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:363
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:363
+#: ../modules/calendar/e-cal-attachment-handler.c:285
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:3
-#: ../plugins/face/face.c:291 ../plugins/mail-to-task/mail-to-task.c:593
+#: ../plugins/face/face.c:291
 #: ../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
+#: ../plugins/save-calendar/save-calendar.c:187 ../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
+#: ../shell/e-shell-utils.c:134 ../smime/gui/certificate-manager.c:652
+#: ../smime/gui/certificate-manager.c:729
+#: ../smime/gui/certificate-manager.c:953
+#: ../smime/gui/certificate-manager.c:1335 ../smime/gui/e-cert-selector.c:237
+#: ../smime/gui/smime-ui.ui.h:23
 msgid "_Cancel"
 msgstr "_Prekliči"
 
-#: ../addressbook/gui/contact-editor/contact-editor.ui.h:54
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:55
 #: ../addressbook/gui/contact-list-editor/contact-list-editor.ui.h:18
-#: ../addressbook/gui/widgets/eab-contact-merging.c:624
+#: ../addressbook/gui/widgets/eab-contact-merging.c:721
 #: ../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:3098
+#: ../calendar/gui/dialogs/comp-editor.c:1277
+#: ../composer/e-composer-actions.c:268 ../composer/e-composer-actions.c:408
+#: ../e-util/e-attachment-store.c:636
+#: ../e-util/e-mail-signature-script-dialog.c:369 ../e-util/e-web-view.c:3132
 #: ../e-util/gal-view-instance-save-as-dialog.c:270
 #: ../shell/e-shell-content.c:660 ../shell/e-shell-utils.c:135
+#: ../smime/gui/certificate-manager.c:653
+#: ../smime/gui/certificate-manager.c:730
 msgid "_Save"
 msgstr "_Shrani"
 
-#: ../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/contact-editor.ui.h:56
+#, fuzzy
+msgid "Show Telephone"
+msgstr "Telefon"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:172
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:602
-msgid "Jabber"
-msgstr "Jabber"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:57
+#, fuzzy
+msgid "Show SIP Address"
+msgstr "_Za ta naslov"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:173
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:604
-msgid "Yahoo"
-msgstr "Yahoo"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:58
+#, fuzzy
+msgid "Show Instant Messaging"
+msgstr "Hipno sporočanje"
 
-#: ../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/contact-editor.ui.h:59
+#, fuzzy
+msgid "Show Web Addresses"
+msgstr "Spletni naslovi"
 
-#: ../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/contact-editor.ui.h:60
+#, fuzzy
+msgid "Show Job section"
+msgstr "Pokaži drug časovni pas"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:176
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:601
-msgid "ICQ"
-msgstr "ICQ"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:61
+#, fuzzy
+msgid "Show Miscellaneous"
+msgstr "Razno"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:177
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:600
-msgid "GroupWise"
-msgstr "GroupWise"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:62
+#, fuzzy
+msgid "Show Home Mailing Address"
+msgstr "Poštni naslovi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:178
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:606
-msgid "Skype"
-msgstr "Skype"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:63
+#, fuzzy
+msgid "Show Work Mailing Address"
+msgstr "Poštni naslovi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:179
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:607
-msgid "Twitter"
-msgstr "Twitter"
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:64
+#, fuzzy
+msgid "Show Other Mailing Address"
+msgstr "Poštni naslovi"
+
+#: ../addressbook/gui/contact-editor/contact-editor.ui.h:65
+msgid "Show Notes"
+msgstr "Pokaži sporočila"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:257
+#: ../calendar/gui/dialogs/comp-editor.c:1298
+#: ../e-util/e-html-editor-actions.c:999
+msgid "_Undo"
+msgstr "_Razveljavi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:269
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:271
-#: ../calendar/gui/dialogs/comp-editor.c:1299
-#: ../calendar/gui/dialogs/comp-editor.c:1301 ../e-util/e-focus-tracker.c:121
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:259
+#: ../calendar/gui/dialogs/comp-editor.c:1300 ../e-util/e-focus-tracker.c:122
 msgid "Undo"
 msgstr "Razveljavi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:276
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:278
-#: ../calendar/gui/dialogs/comp-editor.c:1306
-#: ../calendar/gui/dialogs/comp-editor.c:1308 ../e-util/e-focus-tracker.c:137
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:264
+#: ../calendar/gui/dialogs/comp-editor.c:1305
+#: ../e-util/e-html-editor-actions.c:985
+msgid "_Redo"
+msgstr "_Ponovno uveljavi"
+
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:266
+#: ../calendar/gui/dialogs/comp-editor.c:1307 ../e-util/e-focus-tracker.c:138
 msgid "Redo"
 msgstr "Ponovno uveljavi"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:310
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:298
 #: ../addressbook/gui/widgets/eab-gui-util.c:503
 msgid "Error adding contact"
 msgstr "Napaka med dodajanjem stika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:330
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:318
 msgid "Error modifying contact"
 msgstr "Napaka med spreminjanjem stika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:350
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:338
 msgid "Error removing contact"
 msgstr "Napaka med odstranjevanjem stika"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:750
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3031
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:738
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3081
 #, c-format
 msgid "Contact Editor - %s"
 msgstr "Urejevalnik stikov - %s"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3572
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3680
 msgid "Please select an image for this contact"
 msgstr "Izberite sliko za ta stik"
 
-#: ../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
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3684
+#: ../e-util/e-attachment-store.c:489 ../e-util/e-category-editor.c:146
+#: ../e-util/e-html-editor-actions.c:485 ../e-util/e-html-editor-actions.c:579
+#: ../e-util/e-image-chooser-dialog.c:174 ../plugins/face/face.c:292
+#: ../shell/e-shell-utils.c:71 ../smime/gui/certificate-manager.c:954
 msgid "_Open"
 msgstr "_Odpri"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3577
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:3685
 msgid "_No image"
 msgstr "_Brez slike"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3926
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4034
 msgid ""
 "The contact data is invalid:\n"
 "\n"
@@ -682,28 +711,28 @@ msgstr ""
 "Podatki o stiku so neveljavni:\n"
 "\n"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3932
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4040
 #, c-format
 msgid "'%s' has an invalid format"
 msgstr "'%s' ima neveljavno obliko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3940
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4048
 #, c-format
 msgid "'%s' cannot be a future date"
 msgstr "'%s' mora biti datum v preteklosti"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3948
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4056
 #, c-format
 msgid "%s'%s' has an invalid format"
 msgstr "%s'%s' ima neveljavno obliko"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3961
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3975
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4069
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4083
 #, c-format
 msgid "%s'%s' is empty"
 msgstr "%s'%s' je prazen"
 
-#: ../addressbook/gui/contact-editor/e-contact-editor.c:3990
+#: ../addressbook/gui/contact-editor/e-contact-editor.c:4098
 msgid "Invalid contact."
 msgstr "Neveljaven stik."
 
@@ -715,23 +744,24 @@ msgstr "Neveljaven stik."
 #: ../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
+#: ../e-util/e-attachment-dialog.c:313 ../e-util/e-categories-dialog.c:83
+#: ../e-util/e-category-editor.c:209 ../e-util/e-charset-combo-box.c:102
+#: ../e-util/e-color-chooser-widget.c:128 ../e-util/e-filter-datespec.c:292
+#: ../e-util/e-html-editor-link-dialog.c:381 ../e-util/e-passwords.c:471
+#: ../e-util/e-rule-context.c:816 ../e-util/e-rule-editor.c:181
+#: ../e-util/e-rule-editor.c:283 ../e-util/e-rule-editor.c:777
+#: ../e-util/e-send-options.ui.h:43 ../e-util/e-source-config-dialog.c:380
+#: ../e-util/e-source-selector-dialog.c:351 ../e-util/e-table-config.c:549
+#: ../e-util/e-table-config.ui.h:3 ../e-util/e-timezone-dialog.ui.h:3
+#: ../mail/e-mail-config-window.c:331 ../mail/e-mail-tag-editor.c:243
+#: ../mail/em-folder-selector.c:43 ../mail/mail-config.ui.h:3
 #: ../mail/mail-dialogs.ui.h:26 ../mail/mail-vfolder-ui.c:149
 #: ../mail/mail-vfolder-ui.c:271
 #: ../plugins/email-custom-header/org-gnome-email-custom-header.ui.h:4
 #: ../plugins/publish-calendar/url-editor-dialog.c:422
 #: ../shell/e-shell-content.c:661 ../shell/e-shell-content.c:767
-#: ../shell/main.c:167 ../smime/gui/e-cert-selector.c:233
-#: ../smime/gui/smime-ui.ui.h:24
+#: ../shell/main.c:168 ../smime/gui/certificate-manager.c:1336
+#: ../smime/gui/e-cert-selector.c:238 ../smime/gui/smime-ui.ui.h:24
 msgid "_OK"
 msgstr "_V redu"
 
@@ -743,15 +773,15 @@ msgstr "Hitro dodaj stik"
 msgid "_Edit Full"
 msgstr "_Uredi celoto"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:507
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:505
 msgid "_Full name"
 msgstr "_Polno ime"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:520
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:518
 msgid "E_mail"
 msgstr "Elektronska _pošta"
 
-#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:533
+#: ../addressbook/gui/contact-editor/e-contact-quick-add.c:531
 msgid "_Select Address Book"
 msgstr "_Izbor imenika"
 
@@ -859,14 +889,13 @@ msgstr "Odstrani elektronski naslov s seznama"
 #: ../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
+#: ../calendar/gui/dialogs/task-page.ui.h:31 ../e-util/e-attachment-view.c:424
+#: ../e-util/e-filter-rule.c:225 ../e-util/e-mail-signature-manager.c:367
+#: ../e-util/e-name-selector-dialog.c:999 ../e-util/filter.ui.h:18
+#: ../mail/e-mail-label-manager.c:391 ../mail/em-filter-rule.c:440
+#: ../mail/em-vfolder-editor-rule.c:630 ../mail/mail-config.ui.h:55
 #: ../plugins/attachment-reminder/attachment-reminder.c:567
-#: ../plugins/email-custom-header/email-custom-header.c:848
+#: ../plugins/email-custom-header/email-custom-header.c:849
 #: ../plugins/publish-calendar/publish-calendar.c:807
 #: ../plugins/publish-calendar/publish-calendar.ui.h:34
 #: ../plugins/templates/templates.c:463
@@ -905,41 +934,254 @@ msgstr "Na _dno"
 msgid "Contact List Members"
 msgstr "Člani seznama stikov"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1486
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1487
 msgid "_Members"
 msgstr "_Člani"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1626
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1627
 msgid "Error adding list"
 msgstr "Napaka med dodajanjem seznama"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1646
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1647
 msgid "Error modifying list"
 msgstr "Napaka med spreminjanjem seznama"
 
-#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1666
+#: ../addressbook/gui/contact-list-editor/e-contact-list-editor.c:1667
 msgid "Error removing list"
 msgstr "Napaka med odstranjevanjem seznama"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:243
+#: ../addressbook/gui/widgets/addresstypes.xml.h:1
+#: ../modules/addressbook/e-book-shell-view-actions.c:1195
+msgid "Name contains"
+msgstr "Ime vsebuje"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:2
+#: ../modules/addressbook/e-book-shell-view-actions.c:1188
+msgid "Email begins with"
+msgstr "Elektronska pošta se začne z"
+
+#: ../addressbook/gui/widgets/addresstypes.xml.h:3
+#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
+#: ../calendar/gui/tasktypes.xml.h:30
+#: ../modules/addressbook/e-book-shell-view-actions.c:1181
+#: ../modules/calendar/e-cal-shell-view-actions.c:1611
+#: ../modules/calendar/e-memo-shell-view-actions.c:733
+#: ../modules/calendar/e-task-shell-view-actions.c:933
+msgid "Any field contains"
+msgstr "Katerokoli polje vsebuje"
+
+#: ../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 "Imenik Evolutiona"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:149
+msgid "Copy _Email Address"
+msgstr "Kopiraj _elektronski naslov"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:151
+#: ../e-util/e-web-view.c:307
+msgid "Copy the email address to the clipboard"
+msgstr "Kopira elektronski naslov v odložišče"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:156
+#: ../e-util/e-web-view.c:312
+msgid "_Send New Message To..."
+msgstr "Pošlji novo _sporočilo osebi ..."
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:158
+#: ../e-util/e-web-view.c:314
+msgid "Send a mail message to this address"
+msgstr "Pošlji poštno sporočilo na ta naslov"
+
+#: ../addressbook/gui/widgets/eab-contact-display.c:290
+#: ../e-util/e-web-view.c:999
+#, c-format
+msgid "Click to mail %s"
+msgstr "Kliknite za pošiljanje pošte osebi %s"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:141
+msgid "Open map"
+msgstr "Odpri zemljevid"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:437
+msgid "SIP"
+msgstr "SIP"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:681
+msgid "List Members:"
+msgstr "Člani seznama:"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:753
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
+msgid "Nickname"
+msgstr "Vzdevek"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:754
+msgid "AIM"
+msgstr "AIM"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:755
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:756
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:757
+msgid "Jabber"
+msgstr "Jabber"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:758
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:759
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:760
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:761
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:762
+msgid "Twitter"
+msgstr "Twitter"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:819
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
+msgid "Company"
+msgstr "Podjetje"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:820
+msgid "Department"
+msgstr "Oddelek"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:821
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
+msgid "Office"
+msgstr "Pisarna"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:822
+msgid "Profession"
+msgstr "Poklic"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:823
+msgid "Position"
+msgstr "Položaj"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:824
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
+msgid "Manager"
+msgstr "Upravljalnik"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:825
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
+msgid "Assistant"
+msgstr "Pomočnik"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:826
+msgid "Video Chat"
+msgstr "Video klepet"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:827
+#: ../e-util/e-send-options.c:546
+#: ../modules/calendar/e-cal-shell-view-actions.c:181
+#: ../modules/calendar/e-cal-shell-view.c:570
+#: ../plugins/publish-calendar/publish-calendar.ui.h:21
+msgid "Calendar"
+msgstr "Koledar"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:828
+#: ../calendar/gui/dialogs/event-editor.c:115
+#: ../calendar/gui/dialogs/event-editor.c:342
+#: ../plugins/publish-calendar/publish-calendar.ui.h:2
+msgid "Free/Busy"
+msgstr "Zasedenost"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:829
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:870
+msgid "Phone"
+msgstr "Telefon"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:830
+msgid "Fax"
+msgstr "Faks"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:832
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:873
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:899
+msgid "Address"
+msgstr "Naslov"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:868
+msgid "Home Page"
+msgstr "Domača stran"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:869
+msgid "Web Log"
+msgstr "Spletni dnevnik"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:871
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
+msgid "Mobile Phone"
+msgstr "Prenosni telefon"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:876
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
+msgid "Spouse"
+msgstr "Partner(ka)"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:886
+msgid "Personal"
+msgstr "Osebno"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:931
+#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
+msgid "Note"
+msgstr "Opomba"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1127
+msgid "List Members"
+msgstr "Člani seznama"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1148
+msgid "Job Title"
+msgstr "Službeni naziv"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1189
+msgid "Home page"
+msgstr "Domača stran"
+
+#: ../addressbook/gui/widgets/eab-contact-formatter.c:1199
+msgid "Blog"
+msgstr "Blog"
+
+#: ../addressbook/gui/widgets/eab-contact-merging.c:261
 #: ../calendar/gui/tasktypes.xml.h:14
 msgid "Cancelled"
 msgstr "Preklicano"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:345
+#: ../addressbook/gui/widgets/eab-contact-merging.c:457
 msgid "Merge Contact"
 msgstr "Združi stik"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:363
-#: ../addressbook/gui/widgets/eab-contact-merging.c:627
+#: ../addressbook/gui/widgets/eab-contact-merging.c:475
+#: ../addressbook/gui/widgets/eab-contact-merging.c:724
 msgid "_Merge"
 msgstr "_Združi"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:616
+#: ../addressbook/gui/widgets/eab-contact-merging.c:713
 msgid "Duplicate Contact Detected"
 msgstr "Zaznan je bil podvojen stik"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:674
+#: ../addressbook/gui/widgets/eab-contact-merging.c:771
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to save the changes anyway?"
@@ -947,7 +1189,7 @@ msgstr ""
 "Ime ali naslov elektronske pošte stika že obstaja\n"
 "v tej mapi. Ali želite spremembe vseeno shraniti?"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:677
+#: ../addressbook/gui/widgets/eab-contact-merging.c:774
 msgid ""
 "The name or email address of this contact already exists\n"
 "in this folder. Would you like to add it anyway?"
@@ -955,41 +1197,133 @@ msgstr ""
 "Ime ali naslov elektronske pošte tega stika že obstaja\n"
 "v tej mapi. Ali želite podatke vseeno dodati?"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:692
+#: ../addressbook/gui/widgets/eab-contact-merging.c:789
 msgid "Changed Contact:"
 msgstr "Spremenjeni stik:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:694
+#: ../addressbook/gui/widgets/eab-contact-merging.c:791
 msgid "New Contact:"
 msgstr "Nov stik:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:733
+#: ../addressbook/gui/widgets/eab-contact-merging.c:830
 msgid "Conflicting Contact:"
 msgstr "Sporni stik:"
 
-#: ../addressbook/gui/widgets/eab-contact-merging.c:735
+#: ../addressbook/gui/widgets/eab-contact-merging.c:832
 msgid "Old Contact:"
 msgstr "Star stik: "
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:1
-#: ../modules/addressbook/e-book-shell-view-actions.c:1150
-msgid "Name contains"
-msgstr "Ime vsebuje"
+#: ../addressbook/gui/widgets/eab-gui-util.c:121
+msgid ""
+"This address book cannot be opened. This either means this book is not "
+"marked for offline usage or not yet downloaded for offline usage. Please "
+"load the address book once in online mode to download its contents."
+msgstr ""
+"Tega imenika ni mogoče odpreti. To pomeni, da imenik ni bil označen za "
+"uporabo brez povezave ali pa še ni bil prejet. Za prejem vsebine imenika, ga "
+"je treba še enkrat naložiti v načinu s povezavo."
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:2
-#: ../modules/addressbook/e-book-shell-view-actions.c:1143
-msgid "Email begins with"
-msgstr "Elektronska pošta se začne z"
+#: ../addressbook/gui/widgets/eab-gui-util.c:140
+#, c-format
+msgid ""
+"This address book cannot be opened.  Please check that the path %s exists "
+"and that permissions are set to access it."
+msgstr ""
+"Tega imenika ni mogoče odpreti. Preverite, ali pot %s obstaja in ali imate "
+"dovoljenje za dostop."
 
-#: ../addressbook/gui/widgets/addresstypes.xml.h:3
-#: ../calendar/gui/caltypes.xml.h:26 ../calendar/gui/memotypes.xml.h:19
-#: ../calendar/gui/tasktypes.xml.h:30
-#: ../modules/addressbook/e-book-shell-view-actions.c:1136
-#: ../modules/calendar/e-cal-shell-view-actions.c:1770
-#: ../modules/calendar/e-memo-shell-view-actions.c:790
-#: ../modules/calendar/e-task-shell-view-actions.c:989
-msgid "Any field contains"
-msgstr "Katerokoli polje vsebuje"
+#: ../addressbook/gui/widgets/eab-gui-util.c:153
+msgid ""
+"This version of Evolution does not have LDAP support compiled in to it.  To "
+"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
+msgstr ""
+"Trenutna različica programa Evolution nima prevedene podpore za LDAP. V "
+"primeru, da želite možnost omogočiti, morate namestiti paket programa "
+"Evolution s podporo LDAP."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:162
+msgid ""
+"This address book cannot be opened.  This either means that an incorrect URI "
+"was entered, or the server is unreachable."
+msgstr ""
+"Tega imenika ni mogoče odpreti. To pomeni, da je vnesen nepravilen naslov "
+"URI ali pa je strežnik nedosegljiv."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:172
+msgid "Detailed error message:"
+msgstr "Podrobno sporočilo o napaki:"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:211
+msgid ""
+"More cards matched this query than either the server is \n"
+"configured to return or Evolution is configured to display.\n"
+"Please make your search more specific or raise the result limit in\n"
+"the directory server preferences for this address book."
+msgstr ""
+"Poizvedbi ustreza več vizitk kot jih lahko vrne strežnik \n"
+"ali kot jih lahko prikaže Evolution.\n"
+"Vnesite bolj natančne pogoje iskanja ali povečajte omejitev števila\n"
+"rezultatov iskanja za ta imenik v možnostih strežnika map."
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:218
+msgid ""
+"The time to execute this query exceeded the server limit or the limit\n"
+"configured for this address book.  Please make your search\n"
+"more specific or raise the time limit in the directory server\n"
+"preferences for this address book."
+msgstr ""
+"Čas za izvedbo poizvedbe je presegel omejitev strežnika ali\n"
+"omejitev, ki ste jo nastavili za imenik. Vnesite bolj natančne pogoje\n"
+"iskanja ali pa povečajte časovno omejitev za ta imenik v\n"
+"možnostih strežnika map."
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:226
+#, c-format
+msgid "The backend for this address book was unable to parse this query. %s"
+msgstr "Zaledje imenika ni uspelo razčleniti te poizvedbe. %s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:231
+#, c-format
+msgid "The backend for this address book refused to perform this query. %s"
+msgstr "Zaledje imenika je zavrnilo izvajanje poizvedbe. %s"
+
+#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
+#: ../addressbook/gui/widgets/eab-gui-util.c:237
+#: ../addressbook/gui/widgets/eab-gui-util.c:243
+#, c-format
+msgid "This query did not complete successfully. %s"
+msgstr "Poizvedba se ni izvedla v celoti. %s"
+
+#. This is a filename. Translators take note.
+#: ../addressbook/gui/widgets/eab-gui-util.c:265
+msgid "card.vcf"
+msgstr "vizitka.vcf"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:316
+msgid "Select Address Book"
+msgstr "Izbor imenika"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:398
+msgid "list"
+msgstr "seznam"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:587
+msgid "Move contact to"
+msgstr "Premakni stik v"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:589
+msgid "Copy contact to"
+msgstr "Kopiraj stik v"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:592
+msgid "Move contacts to"
+msgstr "Premakni stike v"
+
+#: ../addressbook/gui/widgets/eab-gui-util.c:594
+msgid "Copy contacts to"
+msgstr "Kopiraj stike v"
 
 #: ../addressbook/gui/widgets/e-addressbook-model.c:162
 msgid "No contacts"
@@ -1030,7 +1364,7 @@ msgid "Paste contacts from the clipboard"
 msgstr "Prilepi stike iz odložišča"
 
 #: ../addressbook/gui/widgets/e-addressbook-view.c:666
-#: ../modules/addressbook/e-book-shell-view-actions.c:950
+#: ../modules/addressbook/e-book-shell-view-actions.c:995
 msgid "Delete selected contacts"
 msgstr "Izbriši izbrane stike"
 
@@ -1065,16 +1399,16 @@ msgid "Are you sure you want to delete this contact (%s)?"
 msgstr "Ali ste prepričani, da želite izbrisati stik (%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:804
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1242 ../e-util/e-focus-tracker.c:785
+#: ../e-util/evolution-source-viewer.c:805
+#: ../mail/e-mail-account-manager.c:736
+#: ../modules/addressbook/e-book-shell-view-actions.c:1067
+#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#: ../modules/calendar/e-memo-shell-view-actions.c:635
+#: ../modules/calendar/e-task-shell-view-actions.c:788
+#: ../modules/mail/e-mail-shell-view-actions.c:1615
+#: ../shell/e-shell-window-actions.c:943
+#: ../smime/gui/certificate-manager.c:1659 ../smime/gui/smime-ui.ui.h:10
 msgid "_Delete"
 msgstr "_Izbriši"
 
@@ -1120,11 +1454,6 @@ msgstr "Rojstno ime"
 msgid "Family Name"
 msgstr "Družinsko ime"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:5
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:598
-msgid "Nickname"
-msgstr "Vzdevek"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:7
 msgid "Email 2"
 msgstr "Naslov elektronske pošte 2"
@@ -1177,11 +1506,6 @@ msgstr "Domači faks"
 msgid "ISDN Phone"
 msgstr "Telefon ISDN"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:20
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:689
-msgid "Mobile Phone"
-msgstr "Prenosni telefon"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:21
 msgid "Other Phone"
 msgstr "Drug telefon"
@@ -1216,20 +1540,10 @@ msgstr "Teleks"
 msgid "TTYTDD"
 msgstr "TTYTDD"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:34
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:651
-msgid "Company"
-msgstr "Podjetje"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:35
 msgid "Unit"
 msgstr "Enota"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:36
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:653
-msgid "Office"
-msgstr "Pisarna"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:37
 msgid "Title"
 msgstr "Naziv"
@@ -1240,16 +1554,6 @@ msgstr "Naziv"
 msgid "Role"
 msgstr "Vloga"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:39
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:656
-msgid "Manager"
-msgstr "Upravljalnik"
-
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:40
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:657
-msgid "Assistant"
-msgstr "Pomočnik"
-
 #: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:41
 msgid "Web Site"
 msgstr "Spletna stran"
@@ -1266,34 +1570,59 @@ msgstr "Dnevnik"
 msgid "Categories"
 msgstr "Kategorije"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:44
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:693
-msgid "Spouse"
-msgstr "Partner(ka)"
+#: ../addressbook/gui/widgets/ea-minicard.c:33
+msgid "Open"
+msgstr "Odpri"
 
-#: ../addressbook/gui/widgets/e-addressbook-view.etspec.h:45
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:748
-msgid "Note"
-msgstr "Opomba"
+#: ../addressbook/gui/widgets/ea-minicard.c:159
+msgid "Contact List: "
+msgstr "Seznam stikov: "
 
-#: ../addressbook/gui/widgets/e-contact-map-window.c:375
+#: ../addressbook/gui/widgets/ea-minicard.c:160
+msgid "Contact: "
+msgstr "Stik: "
+
+#: ../addressbook/gui/widgets/ea-minicard.c:187
+msgid "evolution minicard"
+msgstr "evolution minicard"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:35
+msgid "New Contact"
+msgstr "Nov stik"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:36
+msgid "New Contact List"
+msgstr "Nov seznam stikov"
+
+#: ../addressbook/gui/widgets/ea-minicard-view.c:176
+#, c-format
+msgid "current address book folder %s has %d card"
+msgid_plural "current address book folder %s has %d cards"
+msgstr[0] "mapa trenutnega imenika %s ima %d vizitk"
+msgstr[1] "mapa trenutnega imenika %s ima %d vizitko"
+msgstr[2] "mapa trenutnega imenika %s ima %d vizitki"
+msgstr[3] "mapa trenutnega imenika %s ima %d vizitke"
+
+#: ../addressbook/gui/widgets/e-contact-map-window.c:377
 msgid "Contacts Map"
 msgstr "Zemljevid stikov"
 
 #. Zoom-in button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:410
+#: ../addressbook/gui/widgets/e-contact-map-window.c:412
 msgid "Zoom _In"
 msgstr "_Približaj"
 
 #. Zoom-out button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:418
-#: ../mail/e-mail-reader.c:2222
+#: ../addressbook/gui/widgets/e-contact-map-window.c:420
+#: ../mail/e-mail-reader.c:2360
 msgid "Zoom _Out"
 msgstr "_Oddalji"
 
 #. Search button
-#: ../addressbook/gui/widgets/e-contact-map-window.c:448
-#: ../shell/e-shell-window-actions.c:1021
+#: ../addressbook/gui/widgets/e-contact-map-window.c:450
+#: ../e-util/e-html-editor-actions.c:1978
+#: ../e-util/e-html-editor-find-dialog.c:195
+#: ../shell/e-shell-window-actions.c:1020
 msgid "_Find"
 msgstr "_Najdi"
 
@@ -1355,284 +1684,12 @@ msgstr ""
 "\n"
 "V tem pogledu ni predmetov za prikaz."
 
-#: ../addressbook/gui/widgets/e-minicard.c:92
-msgid "Work Email"
-msgstr "Službena elektronska pošta"
-
-#: ../addressbook/gui/widgets/e-minicard.c:93
-msgid "Home Email"
-msgstr "Domača elektronska pošta"
-
-#: ../addressbook/gui/widgets/e-minicard.c:94
-#: ../addressbook/gui/widgets/e-minicard.c:828
-msgid "Other Email"
-msgstr "Druga elektronska pošta"
-
-#: ../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 "Imenik Evolutiona"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:35
-msgid "New Contact"
-msgstr "Nov stik"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:36
-msgid "New Contact List"
-msgstr "Nov seznam stikov"
-
-#: ../addressbook/gui/widgets/ea-minicard-view.c:176
-#, c-format
-msgid "current address book folder %s has %d card"
-msgid_plural "current address book folder %s has %d cards"
-msgstr[0] "mapa trenutnega imenika %s ima %d vizitk"
-msgstr[1] "mapa trenutnega imenika %s ima %d vizitko"
-msgstr[2] "mapa trenutnega imenika %s ima %d vizitki"
-msgstr[3] "mapa trenutnega imenika %s ima %d vizitke"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:33
-msgid "Open"
-msgstr "Odpri"
-
-#: ../addressbook/gui/widgets/ea-minicard.c:159
-msgid "Contact List: "
-msgstr "Seznam stikov: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:160
-msgid "Contact: "
-msgstr "Stik: "
-
-#: ../addressbook/gui/widgets/ea-minicard.c:187
-msgid "evolution minicard"
-msgstr "evolution minicard"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:149
-msgid "Copy _Email Address"
-msgstr "Kopiraj _elektronski naslov"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:151
-#: ../e-util/e-web-view-gtkhtml.c:427 ../e-util/e-web-view.c:308
-msgid "Copy the email address to the clipboard"
-msgstr "Kopira elektronski naslov v odložišče"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:156
-#: ../e-util/e-web-view-gtkhtml.c:432 ../e-util/e-web-view.c:313
-msgid "_Send New Message To..."
-msgstr "Pošlji novo _sporočilo osebi ..."
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:158
-#: ../e-util/e-web-view-gtkhtml.c:434 ../e-util/e-web-view.c:315
-msgid "Send a mail message to this address"
-msgstr "Pošlji poštno sporočilo na ta naslov"
-
-#: ../addressbook/gui/widgets/eab-contact-display.c:290
-#: ../e-util/e-web-view-gtkhtml.c:969 ../e-util/e-web-view.c:996
-#, c-format
-msgid "Click to mail %s"
-msgstr "Kliknite za pošiljanje pošte osebi %s"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:136
-msgid "Open map"
-msgstr "Odpri zemljevid"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:535
-msgid "List Members:"
-msgstr "Člani seznama:"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:652
-msgid "Department"
-msgstr "Oddelek"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:654
-msgid "Profession"
-msgstr "Poklic"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:655
-msgid "Position"
-msgstr "Položaj"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:658
-msgid "Video Chat"
-msgstr "Video klepet"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:659
-#: ../e-util/e-send-options.c:546
-#: ../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 "Koledar"
-
-#: ../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 "Zasedenost"
-
-#: ../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:662
-msgid "Fax"
-msgstr "Faks"
-
-#: ../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 "Naslov"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:686
-msgid "Home Page"
-msgstr "Domača stran"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:687
-msgid "Web Log"
-msgstr "Spletni dnevnik"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:703
-msgid "Personal"
-msgstr "Osebno"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:944
-msgid "List Members"
-msgstr "Člani seznama"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:965
-msgid "Job Title"
-msgstr "Službeni naziv"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1006
-msgid "Home page"
-msgstr "Domača stran"
-
-#: ../addressbook/gui/widgets/eab-contact-formatter.c:1016
-msgid "Blog"
-msgstr "Blog"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:121
-msgid ""
-"This address book cannot be opened. This either means this book is not "
-"marked for offline usage or not yet downloaded for offline usage. Please "
-"load the address book once in online mode to download its contents."
-msgstr ""
-"Tega imenika ni mogoče odpreti. To pomeni, da imenik ni bil označen za "
-"uporabo brez povezave ali pa še ni bil prejet. Za prejem vsebine imenika, ga "
-"je treba še enkrat naložiti v načinu s povezavo."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:140
-#, c-format
-msgid ""
-"This address book cannot be opened.  Please check that the path %s exists "
-"and that permissions are set to access it."
-msgstr ""
-"Tega imenika ni mogoče odpreti. Preverite, ali pot %s obstaja in ali imate "
-"dovoljenje za dostop."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:153
-msgid ""
-"This version of Evolution does not have LDAP support compiled in to it.  To "
-"use LDAP in Evolution an LDAP-enabled Evolution package must be installed."
-msgstr ""
-"Trenutna različica programa Evolution nima prevedene podpore za LDAP. V "
-"primeru, da želite možnost omogočiti, morate namestiti paket programa "
-"Evolution s podporo LDAP."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:162
-msgid ""
-"This address book cannot be opened.  This either means that an incorrect URI "
-"was entered, or the server is unreachable."
-msgstr ""
-"Tega imenika ni mogoče odpreti. To pomeni, da je vnesen nepravilen naslov "
-"URI ali pa je strežnik nedosegljiv."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:172
-msgid "Detailed error message:"
-msgstr "Podrobno sporočilo o napaki:"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:211
-msgid ""
-"More cards matched this query than either the server is \n"
-"configured to return or Evolution is configured to display.\n"
-"Please make your search more specific or raise the result limit in\n"
-"the directory server preferences for this address book."
-msgstr ""
-"Poizvedbi ustreza več vizitk kot jih lahko vrne strežnik \n"
-"ali kot jih lahko prikaže Evolution.\n"
-"Vnesite bolj natančne pogoje iskanja ali povečajte omejitev števila\n"
-"rezultatov iskanja za ta imenik v možnostih strežnika map."
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:218
-msgid ""
-"The time to execute this query exceeded the server limit or the limit\n"
-"configured for this address book.  Please make your search\n"
-"more specific or raise the time limit in the directory server\n"
-"preferences for this address book."
-msgstr ""
-"Čas za izvedbo poizvedbe je presegel omejitev strežnika ali\n"
-"omejitev, ki ste jo nastavili za imenik. Vnesite bolj natančne pogoje\n"
-"iskanja ali pa povečajte časovno omejitev za ta imenik v\n"
-"možnostih strežnika map."
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:226
-#, c-format
-msgid "The backend for this address book was unable to parse this query. %s"
-msgstr "Zaledje imenika ni uspelo razčleniti te poizvedbe. %s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:231
-#, c-format
-msgid "The backend for this address book refused to perform this query. %s"
-msgstr "Zaledje imenika je zavrnilo izvajanje poizvedbe. %s"
-
-#. Translators: %s is replaced with a detailed error message, or an empty string, if not provided
-#: ../addressbook/gui/widgets/eab-gui-util.c:237
-#: ../addressbook/gui/widgets/eab-gui-util.c:243
-#, c-format
-msgid "This query did not complete successfully. %s"
-msgstr "Poizvedba se ni izvedla v celoti. %s"
-
-#. This is a filename. Translators take note.
-#: ../addressbook/gui/widgets/eab-gui-util.c:265
-msgid "card.vcf"
-msgstr "vizitka.vcf"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:316
-msgid "Select Address Book"
-msgstr "Izbor imenika"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:398
-msgid "list"
-msgstr "seznam"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:587
-msgid "Move contact to"
-msgstr "Premakni stik v"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:589
-msgid "Copy contact to"
-msgstr "Kopiraj stik v"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:592
-msgid "Move contacts to"
-msgstr "Premakni stike v"
-
-#: ../addressbook/gui/widgets/eab-gui-util.c:594
-msgid "Copy contacts to"
-msgstr "Kopiraj stike v"
-
 #: ../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:440
-#: ../calendar/importers/icalendar-importer.c:935
-#: ../calendar/importers/icalendar-importer.c:974 ../shell/shell.error.xml.h:1
+#: ../calendar/importers/icalendar-importer.c:430
+#: ../calendar/importers/icalendar-importer.c:925
+#: ../calendar/importers/icalendar-importer.c:964 ../shell/shell.error.xml.h:1
 msgid "Importing..."
 msgstr "Uvažanje ..."
 
@@ -1678,46 +1735,46 @@ msgstr "Uvoznik vCard Evolution"
 
 #. Uncomment next if it is successful to get total number if pages in list view
 #. * g_object_get (operation, "n-pages", &n_pages, NULL)
-#: ../addressbook/printing/e-contact-print.c:763
+#: ../addressbook/printing/e-contact-print.c:874
 #, c-format
 msgid "Page %d"
 msgstr "Stran %d"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:58
+#: ../addressbook/tools/evolution-addressbook-export.c:54
 msgid "Specify the output file instead of standard output"
 msgstr "Navedite izhodno datoteko namesto standardnega izhoda"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:59
+#: ../addressbook/tools/evolution-addressbook-export.c:55
 msgid "OUTPUTFILE"
 msgstr "IZHODNADATOTEKA"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:62
+#: ../addressbook/tools/evolution-addressbook-export.c:58
 msgid "List local address book folders"
 msgstr "Naštej krajevne mape imenikov"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:65
+#: ../addressbook/tools/evolution-addressbook-export.c:61
 msgid "Show cards as vcard or csv file"
 msgstr "Pokaži vizitke kot datoteke vcard ali csv"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:66
+#: ../addressbook/tools/evolution-addressbook-export.c:62
 msgid "[vcard|csv]"
 msgstr "[vcard|csv]"
 
-#: ../addressbook/tools/evolution-addressbook-export.c:133
+#: ../addressbook/tools/evolution-addressbook-export.c:111
 msgid ""
 "Command line arguments error, please use --help option to see the usage."
 msgstr ""
 "Napaka argumentov ukazne vrstice. Uporabite možnost --help za ogled uporabe."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:147
+#: ../addressbook/tools/evolution-addressbook-export.c:125
 msgid "Only support csv or vcard format."
 msgstr "Podpira le zapisa csv ali vcard."
 
-#: ../addressbook/tools/evolution-addressbook-export.c:178
+#: ../addressbook/tools/evolution-addressbook-export.c:156
 msgid "Unhandled error"
 msgstr "Neobravnavana napaka"
 
-#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:624
+#: ../addressbook/tools/evolution-addressbook-export-list-cards.c:635
 #: ../addressbook/tools/evolution-addressbook-export-list-folders.c:45
 msgid "Can not open file"
 msgstr "Ni mogoče odpreti datoteke"
@@ -1727,6 +1784,131 @@ msgstr "Ni mogoče odpreti datoteke"
 msgid "Failed to open client '%s': %s"
 msgstr "Odpiranje odjemalca '%s' je spodletelo: %s"
 
+#: ../addressbook/util/eab-book-util.c:36
+#, fuzzy
+msgctxt "addressbook-label"
+msgid "Work Email"
+msgstr "Službena elektronska pošta"
+
+#: ../addressbook/util/eab-book-util.c:37
+#, fuzzy
+msgctxt "addressbook-label"
+msgid "Home Email"
+msgstr "Domača elektronska pošta"
+
+#: ../addressbook/util/eab-book-util.c:38
+#, fuzzy
+msgctxt "addressbook-label"
+msgid "Other Email"
+msgstr "Druga elektronska pošta"
+
+#: ../addressbook/util/eab-book-util.c:44
+#, fuzzy
+msgctxt "addressbook-label"
+msgid "Work SIP"
+msgstr "Delo"
+
+#: ../addressbook/util/eab-book-util.c:45
+#, fuzzy
+msgctxt "addressbook-label"
+msgid "Home SIP"
+msgstr "Domača stran"
+
+#: ../addressbook/util/eab-book-util.c:46
+#, fuzzy
+msgctxt "addressbook-label"
+msgid "Other SIP"
+msgstr "Drugo"
+
+#: ../addressbook/util/eab-book-util.c:74
+msgctxt "addressbook-label"
+msgid "AIM"
+msgstr "AIM"
+
+#: ../addressbook/util/eab-book-util.c:75
+msgctxt "addressbook-label"
+msgid "Jabber"
+msgstr "Jabber"
+
+#: ../addressbook/util/eab-book-util.c:76
+msgctxt "addressbook-label"
+msgid "Yahoo"
+msgstr "Yahoo"
+
+#: ../addressbook/util/eab-book-util.c:77
+msgctxt "addressbook-label"
+msgid "Gadu-Gadu"
+msgstr "Gadu-Gadu"
+
+#: ../addressbook/util/eab-book-util.c:78
+msgctxt "addressbook-label"
+msgid "MSN"
+msgstr "MSN"
+
+#: ../addressbook/util/eab-book-util.c:79
+msgctxt "addressbook-label"
+msgid "ICQ"
+msgstr "ICQ"
+
+#: ../addressbook/util/eab-book-util.c:80
+msgctxt "addressbook-label"
+msgid "GroupWise"
+msgstr "GroupWise"
+
+#: ../addressbook/util/eab-book-util.c:81
+msgctxt "addressbook-label"
+msgid "Skype"
+msgstr "Skype"
+
+#: ../addressbook/util/eab-book-util.c:82
+msgctxt "addressbook-label"
+msgid "Twitter"
+msgstr "Twitter"
+
+#: ../addressbook/util/eab-book-util.c:83
+msgctxt "addressbook-label"
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#. To Translators:
+#. * if an email address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#.
+#: ../addressbook/util/eab-book-util.c:126
+msgctxt "addressbook-label"
+msgid "Email"
+msgstr "Elektronski naslov"
+
+#. To Translators:
+#. * if a SIP address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#. * SIP=Session Initiation Protocol, used for voice over IP
+#.
+#: ../addressbook/util/eab-book-util.c:173
+msgctxt "addressbook-label"
+msgid "SIP"
+msgstr "SIP"
+
+#. To Translators:
+#. * if an IM address type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#. * IM=Instant Messaging
+#.
+#: ../addressbook/util/eab-book-util.c:216
+msgctxt "addressbook-label"
+msgid "IM"
+msgstr "IM"
+
+#. To Translators:
+#. * if a phone number type is not one of the predefined types,
+#. * this generic label is used instead of one of the predefined labels.
+#.
+#: ../addressbook/util/eab-book-util.c:271
+#, fuzzy
+msgctxt "addressbook-label"
+msgid "Phone"
+msgstr "Telefon"
+
 #: ../calendar/alarm-notify/alarm-notify-dialog.c:105
 msgid "minute"
 msgid_plural "minutes"
@@ -1773,19 +1955,18 @@ msgstr "_Dremež"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:4
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:6
-#: ../calendar/gui/dialogs/comp-editor.c:1322
+#: ../calendar/gui/dialogs/comp-editor.c:1321
 #: ../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
+#: ../calendar/gui/dialogs/task-page.ui.h:32
+#: ../e-util/e-html-editor-actions.c:1008
+#: ../e-util/e-mail-signature-manager.c:357 ../e-util/filter.ui.h:17
+#: ../mail/e-mail-account-manager.c:727 ../mail/e-mail-browser.c:170
+#: ../mail/e-mail-label-manager.c:382 ../mail/mail-config.ui.h:59
 #: ../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/email-custom-header/email-custom-header.c:844
 #: ../plugins/publish-calendar/publish-calendar.ui.h:33
-#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1072
+#: ../plugins/templates/templates.c:458 ../shell/e-shell-window-actions.c:1071
 #: ../smime/gui/smime-ui.ui.h:13
 msgid "_Edit"
 msgstr "_Uredi"
@@ -1794,16 +1975,16 @@ msgstr "_Uredi"
 msgid "_Print"
 msgstr "_Natisni"
 
-#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:165
+#: ../calendar/alarm-notify/alarm-notify.ui.h:6 ../e-util/e-alert-dialog.c:164
 msgid "_Dismiss"
 msgstr "_Opusti"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:7
-#: ../calendar/alarm-notify/alarm-queue.c:1835
-#: ../calendar/alarm-notify/alarm-queue.c:1845
+#: ../calendar/alarm-notify/alarm-queue.c:1844
+#: ../calendar/alarm-notify/alarm-queue.c:1854
 #: ../modules/cal-config-weather/evolution-cal-config-weather.c:249
-#: ../modules/itip-formatter/itip-view.c:1503
-#: ../modules/itip-formatter/itip-view.c:1614
+#: ../modules/itip-formatter/itip-view.c:1516
+#: ../modules/itip-formatter/itip-view.c:1627
 msgid "Location:"
 msgstr "Mesto:"
 
@@ -1818,49 +1999,49 @@ msgstr "Čas _dremeža:"
 #. Translators: This is the last part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
 #: ../calendar/alarm-notify/alarm-notify.ui.h:10
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6 ../e-util/filter.ui.h:8
-#: ../e-util/e-interval-chooser.c:142
-#: ../modules/calendar/e-cal-shell-view-actions.c:351
+#: ../calendar/gui/dialogs/alarm-dialog.ui.h:6
+#: ../e-util/e-interval-chooser.c:143 ../e-util/filter.ui.h:8
+#: ../modules/calendar/e-cal-shell-view-actions.c:326
 #: ../plugins/publish-calendar/publish-calendar.ui.h:6
 msgid "days"
 msgstr "dni"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:11
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:5
-#: ../calendar/gui/dialogs/event-page.ui.h:18 ../e-util/filter.ui.h:7
-#: ../e-util/e-interval-chooser.c:140
+#: ../calendar/gui/dialogs/event-page.ui.h:18
+#: ../e-util/e-interval-chooser.c:141 ../e-util/filter.ui.h:7
 msgid "hours"
 msgstr "ur"
 
 #: ../calendar/alarm-notify/alarm-notify.ui.h:12
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:4
-#: ../calendar/gui/dialogs/event-page.ui.h:19 ../e-util/filter.ui.h:6
-#: ../e-util/e-interval-chooser.c:138
+#: ../calendar/gui/dialogs/event-page.ui.h:19
+#: ../e-util/e-interval-chooser.c:139 ../e-util/filter.ui.h:6
 #: ../mail/e-mail-config-provider-page.c:526
 msgid "minutes"
 msgstr "minut"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1678
-#: ../calendar/alarm-notify/alarm-queue.c:1815
+#: ../calendar/alarm-notify/alarm-queue.c:1687
+#: ../calendar/alarm-notify/alarm-queue.c:1824
 msgid "No summary available."
 msgstr "Povzetek ni na voljo."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1687
-#: ../calendar/alarm-notify/alarm-queue.c:1689
+#: ../calendar/alarm-notify/alarm-queue.c:1696
+#: ../calendar/alarm-notify/alarm-queue.c:1698
 msgid "No description available."
 msgstr "Opis ni na voljo."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1697
+#: ../calendar/alarm-notify/alarm-queue.c:1706
 msgid "No location information available."
 msgstr "Podatki o mestu niso na voljo."
 
-#: ../calendar/alarm-notify/alarm-queue.c:1702
-#: ../calendar/alarm-notify/alarm-queue.c:1806
-#: ../calendar/alarm-notify/alarm-queue.c:2147
+#: ../calendar/alarm-notify/alarm-queue.c:1711
+#: ../calendar/alarm-notify/alarm-queue.c:1815
+#: ../calendar/alarm-notify/alarm-queue.c:2156
 msgid "Evolution Reminders"
 msgstr "Opomniki Evolution"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1746
+#: ../calendar/alarm-notify/alarm-queue.c:1755
 #, c-format
 msgid "You have %d reminder"
 msgid_plural "You have %d reminders"
@@ -1869,22 +2050,22 @@ msgstr[1] "Imate %d opomnik"
 msgstr[2] "Imate %d opomnika"
 msgstr[3] "Imate %d opomnike"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1965
+#: ../calendar/alarm-notify/alarm-queue.c:1974
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1966 ../mail/mail-dialogs.ui.h:21
+#: ../calendar/alarm-notify/alarm-queue.c:1975 ../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
+#: ../calendar/alarm-notify/alarm-queue.c:1976 ../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
+#: ../calendar/alarm-notify/alarm-queue.c:1980
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -1901,7 +2082,7 @@ msgstr ""
 "\n"
 "Ali ste prepričani, da želite ta program zagnati?"
 
-#: ../calendar/alarm-notify/alarm-queue.c:1986
+#: ../calendar/alarm-notify/alarm-queue.c:1995
 msgid "Do not ask me about this program again."
 msgstr "O tem programu me ne sprašuj več."
 
@@ -2338,64 +2519,213 @@ msgstr "Seznam opomnikov ni označen za uporabo brez povezave."
 
 #. Translators: {0} is the name of the calendar.
 #: ../calendar/calendar.error.xml.h:87
+#, fuzzy
+msgid "Failed to open calendar '{0}'"
+msgstr "Kopiranje dogodka v koledar '{0}' je spodletelo"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:89
+#, fuzzy
+msgid "Failed to open memo list '{0}'"
+msgstr "Kopiranje opomnika na seznam opomnikov '{0}' je spodletelo"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:91
+#, fuzzy
+msgid "Failed to open task list '{0}'"
+msgstr "Kopiranje naloge na seznam nalog '{0}' je spodletelo"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:93
+#, fuzzy
+msgid "Failed to create an event in the calendar '{0}'"
+msgstr "Kopiranje dogodka v koledar '{0}' je spodletelo"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:95
+#, fuzzy
+msgid "Failed to create a memo in the memo list '{0}'"
+msgstr "Kopiranje opomnika na seznam opomnikov '{0}' je spodletelo"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:97
+#, fuzzy
+msgid "Failed to create a task in the task list '{0}'"
+msgstr "Kopiranje naloge na seznam nalog '{0}' je spodletelo"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:99
+#, fuzzy
+msgid "Failed to modify an event in the calendar '{0}'"
+msgstr "Premikanje dogodka v koledar '{0}' je spodletelo"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:101
+#, fuzzy
+msgid "Failed to modify a memo in the memo list '{0}'"
+msgstr "Premikanje opomnika na seznam opomnikov '{0}' je spodletelo"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:103
+#, fuzzy
+msgid "Failed to modify a task in the task list '{0}'"
+msgstr "Premikanje naloge na seznam nalog '{0}' je spodletelo"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:105
+#, fuzzy
+msgid "Failed to delete an event in the calendar '{0}'"
+msgstr "Premikanje dogodka v koledar '{0}' je spodletelo"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:107
+#, fuzzy
+msgid "Failed to delete a memo in the memo list '{0}'"
+msgstr "Premikanje opomnika na seznam opomnikov '{0}' je spodletelo"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:109
+#, fuzzy
+msgid "Failed to delete a task in the task list '{0}'"
+msgstr "Premikanje naloge na seznam nalog '{0}' je spodletelo"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:111
+#, fuzzy
+msgid "Failed to update an event in the calendar '{0}'"
+msgstr "Premikanje dogodka v koledar '{0}' je spodletelo"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:113
+#, fuzzy
+msgid "Failed to update a memo in the memo list '{0}'"
+msgstr "Premikanje opomnika na seznam opomnikov '{0}' je spodletelo"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:115
+#, fuzzy
+msgid "Failed to update a task in the task list '{0}'"
+msgstr "Premikanje naloge na seznam nalog '{0}' je spodletelo"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:117
+#, fuzzy
+msgid "Failed to send an event to the calendar '{0}'"
+msgstr "Premikanje dogodka v koledar '{0}' je spodletelo"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:119
+#, fuzzy
+msgid "Failed to send a memo to the memo list '{0}'"
+msgstr "Premikanje opomnika na seznam opomnikov '{0}' je spodletelo"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:121
+#, fuzzy
+msgid "Failed to send a task to the task list '{0}'"
+msgstr "Premikanje naloge na seznam nalog '{0}' je spodletelo"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:123
+#, fuzzy
+msgid "Error creating view for the calendar '{0}'"
+msgstr "Napaka nalaganja koledarja '{0}'"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:125
+#, fuzzy
+msgid "Error creating view for the task list '{0}'"
+msgstr "Napaka nalaganja seznama nalog '{0}'"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:127
+#, fuzzy
+msgid "Error creating view for the memo list '{0}'"
+msgstr "Napaka nalaganja seznama opomnikov '{0}'"
+
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:129
 msgid "Failed to copy an event into the calendar '{0}'"
 msgstr "Kopiranje dogodka v koledar '{0}' je spodletelo"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:89
+#: ../calendar/calendar.error.xml.h:131
 msgid "Failed to copy a task into the task list '{0}'"
 msgstr "Kopiranje naloge na seznam nalog '{0}' je spodletelo"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:91
+#: ../calendar/calendar.error.xml.h:133
 msgid "Failed to copy a memo into the memo list '{0}'"
 msgstr "Kopiranje opomnika na seznam opomnikov '{0}' je spodletelo"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:93
+#: ../calendar/calendar.error.xml.h:135
 msgid "Failed to move an event into the calendar '{0}'"
 msgstr "Premikanje dogodka v koledar '{0}' je spodletelo"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:95
+#: ../calendar/calendar.error.xml.h:137
 msgid "Failed to move a task into the task list '{0}'"
 msgstr "Premikanje naloge na seznam nalog '{0}' je spodletelo"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:97
+#: ../calendar/calendar.error.xml.h:139
 msgid "Failed to move a memo into the memo list '{0}'"
 msgstr "Premikanje opomnika na seznam opomnikov '{0}' je spodletelo"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:99
+#: ../calendar/calendar.error.xml.h:141
 msgid "Copying an event into the calendar '{0}'"
 msgstr "Kopiranje dogodka v koledar '{0}'"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:101
+#: ../calendar/calendar.error.xml.h:143
 msgid "Copying a task into the task list '{0}'"
 msgstr "Kopiranje naloge na seznam nalog '{0}'"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:103
+#: ../calendar/calendar.error.xml.h:145
 msgid "Copying a memo into the memo list '{0}'"
 msgstr "Kopiranje opomnika na seznam opomnikov '{0}'"
 
 #. Translators: {0} is the name of the calendar.
-#: ../calendar/calendar.error.xml.h:105
+#: ../calendar/calendar.error.xml.h:147
 msgid "Moving an event into the calendar '{0}'"
 msgstr "Premikanje dogodka v koledar '{0}'"
 
 #. Translators: {0} is the name of the task list.
-#: ../calendar/calendar.error.xml.h:107
+#: ../calendar/calendar.error.xml.h:149
 msgid "Moving a task into the task list '{0}'"
 msgstr "Premikanje naloge na seznam nalog '{0}'"
 
 #. Translators: {0} is the name of the memo list.
-#: ../calendar/calendar.error.xml.h:109
+#: ../calendar/calendar.error.xml.h:151
 msgid "Moving a memo into the memo list '{0}'"
 msgstr "Premikanje opomnika na seznam opomnikov '{0}'"
 
+#. Translators: {0} is the name of the calendar.
+#: ../calendar/calendar.error.xml.h:153
+#, fuzzy
+msgid "Failed to refresh calendar '{0}'"
+msgstr "Ali želite izbrisati oddaljeni koledar '{0}'?"
+
+#. Translators: {0} is the name of the task list.
+#: ../calendar/calendar.error.xml.h:155
+#, fuzzy
+msgid "Failed to refresh task list '{0}'"
+msgstr "Premikanje naloge na seznam nalog '{0}' je spodletelo"
+
+#. Translators: {0} is the name of the memo list.
+#: ../calendar/calendar.error.xml.h:157
+#, fuzzy
+msgid "Failed to refresh memo list '{0}'"
+msgstr "Premikanje opomnika na seznam opomnikov '{0}' je spodletelo"
+
+#: ../calendar/calendar.error.xml.h:158
+#, fuzzy
+msgid "Failed to make an occurrence movable"
+msgstr "Naredi to pojavitev _premakljivo"
+
 #: ../calendar/gui/caltypes.xml.h:1
 #: ../calendar/gui/e-calendar-table.etspec.h:4
 #: ../calendar/gui/e-cal-list-view.etspec.h:3
@@ -2405,18 +2735,20 @@ msgid "Summary"
 msgstr "Povzetek"
 
 #: ../calendar/gui/caltypes.xml.h:2 ../calendar/gui/memotypes.xml.h:2
-#: ../calendar/gui/tasktypes.xml.h:2 ../mail/em-filter-i18n.h:55
+#: ../calendar/gui/tasktypes.xml.h:2 ../mail/filtertypes.xml.in.h:2
+#: ../mail/searchtypes.xml.in.h:2 ../mail/vfoldertypes.xml.in.h:2
 msgid "contains"
 msgstr "vsebuje"
 
 #: ../calendar/gui/caltypes.xml.h:3 ../calendar/gui/memotypes.xml.h:3
-#: ../calendar/gui/tasktypes.xml.h:3 ../mail/em-filter-i18n.h:56
+#: ../calendar/gui/tasktypes.xml.h:3 ../mail/filtertypes.xml.in.h:3
+#: ../mail/searchtypes.xml.in.h:3 ../mail/vfoldertypes.xml.in.h:3
 msgid "does not contain"
 msgstr "ne vsebuje"
 
 #: ../calendar/gui/caltypes.xml.h:4 ../calendar/gui/e-cal-list-view.etspec.h:4
 #: ../calendar/gui/memotypes.xml.h:4 ../calendar/gui/tasktypes.xml.h:4
-#: ../e-util/e-table-config.ui.h:7 ../e-util/e-attachment-tree-view.c:527
+#: ../e-util/e-attachment-tree-view.c:527 ../e-util/e-table-config.ui.h:7
 #: ../modules/plugin-manager/evolution-plugin-manager.c:68
 msgid "Description"
 msgstr "Opis"
@@ -2431,35 +2763,37 @@ msgid "Classification"
 msgstr "Razvrstitev"
 
 #: ../calendar/gui/caltypes.xml.h:7 ../calendar/gui/memotypes.xml.h:8
-#: ../calendar/gui/tasktypes.xml.h:9 ../mail/em-filter-i18n.h:75
+#: ../calendar/gui/tasktypes.xml.h:9 ../mail/filtertypes.xml.in.h:4
+#: ../mail/searchtypes.xml.in.h:4 ../mail/vfoldertypes.xml.in.h:4
 msgid "is"
 msgstr "je"
 
 #: ../calendar/gui/caltypes.xml.h:8 ../calendar/gui/memotypes.xml.h:9
-#: ../calendar/gui/tasktypes.xml.h:10 ../mail/em-filter-i18n.h:73
+#: ../calendar/gui/tasktypes.xml.h:10 ../mail/filtertypes.xml.in.h:5
+#: ../mail/searchtypes.xml.in.h:5 ../mail/vfoldertypes.xml.in.h:5
 msgid "is not"
 msgstr "ni"
 
 #. To Translators: This is task classification
 #: ../calendar/gui/caltypes.xml.h:9 ../calendar/gui/dialogs/task-page.ui.h:2
-#: ../calendar/gui/e-cal-list-view.c:249 ../calendar/gui/e-cal-model.c:453
-#: ../calendar/gui/e-cal-model.c:460 ../calendar/gui/e-task-table.c:546
+#: ../calendar/gui/e-cal-list-view.c:246 ../calendar/gui/e-cal-model.c:278
+#: ../calendar/gui/e-cal-model.c:285 ../calendar/gui/e-task-table.c:498
 #: ../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:250 ../calendar/gui/e-cal-model.c:462
-#: ../calendar/gui/e-task-table.c:547 ../calendar/gui/memotypes.xml.h:11
+#: ../calendar/gui/e-cal-list-view.c:247 ../calendar/gui/e-cal-model.c:287
+#: ../calendar/gui/e-task-table.c:499 ../calendar/gui/memotypes.xml.h:11
 msgid "Private"
 msgstr "Zasebno"
 
 #. To Translators: This is task classification
 #: ../calendar/gui/caltypes.xml.h:11 ../calendar/gui/dialogs/task-page.ui.h:6
-#: ../calendar/gui/e-cal-list-view.c:251 ../calendar/gui/e-cal-model.c:464
-#: ../calendar/gui/e-task-table.c:548 ../calendar/gui/memotypes.xml.h:12
-#: ../e-util/e-send-options.ui.h:7
+#: ../calendar/gui/e-cal-list-view.c:248 ../calendar/gui/e-cal-model.c:289
+#: ../calendar/gui/e-task-table.c:500 ../calendar/gui/memotypes.xml.h:12
+#: ../e-util/e-html-editor-page-dialog.c:114 ../e-util/e-send-options.ui.h:7
 msgid "Confidential"
 msgstr "Zaupno"
 
@@ -2483,24 +2817,27 @@ 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:326
+#: ../calendar/gui/tasktypes.xml.h:23 ../e-util/e-categories-selector.c:327
 msgid "Category"
 msgstr "Kategorija"
 
 #: ../calendar/gui/caltypes.xml.h:16 ../calendar/gui/memotypes.xml.h:14
 #: ../calendar/gui/tasktypes.xml.h:15 ../em-format/e-mail-formatter-print.c:53
-#: ../em-format/e-mail-formatter-print-headers.c:203
-#: ../mail/em-filter-i18n.h:6
+#: ../em-format/e-mail-formatter-print-headers.c:157
+#: ../mail/filtertypes.xml.in.h:46 ../mail/searchtypes.xml.in.h:48
+#: ../mail/vfoldertypes.xml.in.h:49
 msgid "Attachments"
 msgstr "Priloge"
 
 #: ../calendar/gui/caltypes.xml.h:17 ../calendar/gui/memotypes.xml.h:15
-#: ../calendar/gui/tasktypes.xml.h:16 ../mail/em-filter-i18n.h:18
+#: ../calendar/gui/tasktypes.xml.h:16 ../mail/filtertypes.xml.in.h:47
+#: ../mail/searchtypes.xml.in.h:49 ../mail/vfoldertypes.xml.in.h:50
 msgid "Exist"
 msgstr "Obstaja"
 
 #: ../calendar/gui/caltypes.xml.h:18 ../calendar/gui/memotypes.xml.h:16
-#: ../calendar/gui/tasktypes.xml.h:17 ../mail/em-filter-i18n.h:16
+#: ../calendar/gui/tasktypes.xml.h:17 ../mail/filtertypes.xml.in.h:48
+#: ../mail/searchtypes.xml.in.h:50 ../mail/vfoldertypes.xml.in.h:51
 msgid "Do Not Exist"
 msgstr "Ne obstaja"
 
@@ -2611,10 +2948,6 @@ msgstr "_Ponovno nastavi opomnik"
 msgid "extra times every"
 msgstr "dodatnih ponovitev vsakih"
 
-#: ../calendar/gui/dialogs/alarm-dialog.ui.h:15 ../mail/mail-config.ui.h:32
-msgid "Options"
-msgstr "Možnosti"
-
 #: ../calendar/gui/dialogs/alarm-dialog.ui.h:16
 msgid "Custom _message"
 msgstr "Sporočilo _po meri"
@@ -2653,7 +2986,7 @@ msgstr "Dejanje/Sprožilec"
 
 #: ../calendar/gui/dialogs/alarm-list-dialog.ui.h:1
 #: ../calendar/gui/dialogs/event-page.ui.h:28
-#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-calendar-preferences.ui.h:63
 msgid "Reminders"
 msgstr "Opomniki"
 
@@ -2709,288 +3042,293 @@ msgstr "%s Narejenih ni nobenih sprememb. Ali naj se urejevalnik posodobi?"
 msgid "Could not save attachments"
 msgstr "Ni mogoče shraniti prilog"
 
-#: ../calendar/gui/dialogs/comp-editor.c:626
+#: ../calendar/gui/dialogs/comp-editor.c:625
 msgid "Could not update object"
 msgstr "Ni mogoče posodobiti predmeta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:760
+#: ../calendar/gui/dialogs/comp-editor.c:759
 msgid "Edit Appointment"
 msgstr "Uredi sestanek"
 
-#: ../calendar/gui/dialogs/comp-editor.c:767
+#: ../calendar/gui/dialogs/comp-editor.c:766
 #, c-format
 msgid "Meeting - %s"
 msgstr "Srečanje - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:769
+#: ../calendar/gui/dialogs/comp-editor.c:768
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sestanek - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:775
+#: ../calendar/gui/dialogs/comp-editor.c:774
 #, c-format
 msgid "Assigned Task - %s"
 msgstr "Dodeljena naloga - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:777
+#: ../calendar/gui/dialogs/comp-editor.c:776
 #, c-format
 msgid "Task - %s"
 msgstr "Naloga - %s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:782
+#: ../calendar/gui/dialogs/comp-editor.c:781
 #, c-format
 msgid "Memo - %s"
 msgstr "Opomnik -%s"
 
-#: ../calendar/gui/dialogs/comp-editor.c:798
+#: ../calendar/gui/dialogs/comp-editor.c:797
 msgid "No Summary"
 msgstr "Brez povzetka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:919
+#: ../calendar/gui/dialogs/comp-editor.c:918
 msgid "Keep original item?"
 msgstr "Ali naj se ohrani izvirni predmet?"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1082
-#: ../calendar/gui/dialogs/comp-editor.c:1110
+#: ../calendar/gui/dialogs/comp-editor.c:1081
+#: ../calendar/gui/dialogs/comp-editor.c:1109
 msgid "Unable to synchronize with the server"
 msgstr "Usklajevanje s strežnikom ni mogoče."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1222
+#. == Button box ==
+#: ../calendar/gui/dialogs/comp-editor.c:1221
 #: ../calendar/gui/dialogs/event-editor.c:116
 #: ../calendar/gui/dialogs/event-editor.c:310
 #: ../calendar/gui/dialogs/event-page.ui.h:29
-#: ../composer/e-composer-actions.c:275
-#: ../e-util/e-mail-signature-editor.c:307
+#: ../composer/e-composer-actions.c:387 ../e-util/e-html-editor-dialog.c:196
+#: ../e-util/e-mail-signature-editor.c:295
 #: ../e-util/e-name-selector-dialog.c:551 ../e-util/e-preferences-window.c:388
 #: ../e-util/e-table-field-chooser-dialog.c:207 ../mail/e-mail-browser.c:126
 #: ../mail/em-folder-properties.c:418 ../mail/em-subscription-editor.c:1714
 #: ../modules/plugin-manager/evolution-plugin-manager.c:256
-#: ../shell/e-shell-window-actions.c:343 ../shell/e-shell-window-actions.c:909
-#: ../smime/gui/certificate-manager.c:1182
+#: ../shell/e-shell-window-actions.c:342 ../shell/e-shell-window-actions.c:908
+#: ../smime/gui/certificate-manager.c:2064
 msgid "_Close"
 msgstr "_Zapri"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1224
+#: ../calendar/gui/dialogs/comp-editor.c:1223
 msgid "Close the current window"
 msgstr "Zapri trenutno okno"
 
 #. 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:340 ../mail/e-mail-browser.c:133
-#: ../shell/e-shell-window-actions.c:930
+#: ../calendar/gui/dialogs/comp-editor.c:1228 ../e-util/e-focus-tracker.c:775
+#: ../e-util/e-html-editor-actions.c:964 ../e-util/e-text.c:2089
+#: ../e-util/e-web-view.c:339 ../mail/e-mail-browser.c:133
+#: ../shell/e-shell-window-actions.c:929
 msgid "_Copy"
 msgstr "_Kopiraj"
 
-#: ../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:342 ../e-util/e-web-view.c:1311
-#: ../mail/e-mail-browser.c:135 ../shell/e-shell-window-actions.c:932
+#: ../calendar/gui/dialogs/comp-editor.c:1230 ../e-util/e-focus-tracker.c:175
+#: ../e-util/e-focus-tracker.c:231 ../e-util/e-focus-tracker.c:284
+#: ../e-util/e-focus-tracker.c:776 ../e-util/e-web-view.c:341
+#: ../e-util/e-web-view.c:1328 ../mail/e-mail-browser.c:135
+#: ../shell/e-shell-window-actions.c:931
 msgid "Copy the selection"
 msgstr "Kopiraj izbor"
 
 #. cut menu item
-#: ../calendar/gui/dialogs/comp-editor.c:1236 ../e-util/e-focus-tracker.c:725
-#: ../e-util/e-text.c:2071 ../mail/e-mail-browser.c:140
-#: ../shell/e-shell-window-actions.c:937
+#: ../calendar/gui/dialogs/comp-editor.c:1235 ../e-util/e-focus-tracker.c:770
+#: ../e-util/e-html-editor-actions.c:971 ../e-util/e-text.c:2075
+#: ../mail/e-mail-browser.c:140 ../shell/e-shell-window-actions.c:936
 msgid "Cu_t"
 msgstr "_Izreži"
 
-#: ../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:1305
-#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:939
+#: ../calendar/gui/dialogs/comp-editor.c:1237 ../e-util/e-focus-tracker.c:168
+#: ../e-util/e-focus-tracker.c:224 ../e-util/e-focus-tracker.c:278
+#: ../e-util/e-focus-tracker.c:771 ../e-util/e-web-view.c:1322
+#: ../mail/e-mail-browser.c:142 ../shell/e-shell-window-actions.c:938
 msgid "Cut the selection"
 msgstr "Izreži izbor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1245 ../e-util/e-focus-tracker.c:188
-#: ../e-util/e-focus-tracker.c:244 ../e-util/e-focus-tracker.c:741
-#: ../shell/e-shell-window-actions.c:946
+#: ../calendar/gui/dialogs/comp-editor.c:1244 ../e-util/e-focus-tracker.c:189
+#: ../e-util/e-focus-tracker.c:245 ../e-util/e-focus-tracker.c:786
+#: ../shell/e-shell-window-actions.c:945
 msgid "Delete the selection"
 msgstr "Izbriši izbor"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1252
+#: ../calendar/gui/dialogs/comp-editor.c:1251
 msgid "View help"
 msgstr "Poglejte pomoč"
 
 #. 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
+#: ../calendar/gui/dialogs/comp-editor.c:1256 ../e-util/e-focus-tracker.c:780
+#: ../e-util/e-html-editor-actions.c:978 ../e-util/e-text.c:2101
+#: ../mail/e-mail-browser.c:147 ../shell/e-shell-window-actions.c:964
 msgid "_Paste"
 msgstr "_Prilepi"
 
-#: ../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:1317
-#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:967
+#: ../calendar/gui/dialogs/comp-editor.c:1258 ../e-util/e-focus-tracker.c:182
+#: ../e-util/e-focus-tracker.c:238 ../e-util/e-focus-tracker.c:290
+#: ../e-util/e-focus-tracker.c:781 ../e-util/e-web-view.c:1334
+#: ../mail/e-mail-browser.c:149 ../shell/e-shell-window-actions.c:966
 msgid "Paste the clipboard"
 msgstr "Prilepi iz odložišča"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1264
-#: ../composer/e-composer-actions.c:329 ../mail/e-mail-reader.c:2124
-#: ../modules/addressbook/e-book-shell-view-actions.c:1160
-#: ../modules/addressbook/e-book-shell-view-actions.c:1174
+#: ../calendar/gui/dialogs/comp-editor.c:1263
+#: ../composer/e-composer-actions.c:441 ../mail/e-mail-reader.c:2262
+#: ../modules/addressbook/e-book-shell-view-actions.c:1205
+#: ../modules/addressbook/e-book-shell-view-actions.c:1219
 msgid "_Print..."
 msgstr "Na_tisni ..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1271 ../mail/e-mail-reader.c:2131
-#: ../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
+#: ../calendar/gui/dialogs/comp-editor.c:1270 ../mail/e-mail-reader.c:2269
+#: ../modules/addressbook/e-book-shell-view-actions.c:1212
+#: ../modules/calendar/e-cal-shell-view-actions.c:1642
+#: ../modules/calendar/e-memo-shell-view-actions.c:764
+#: ../modules/calendar/e-task-shell-view-actions.c:964
 msgid "Pre_view..."
 msgstr "_Predogled ..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1280
+#: ../calendar/gui/dialogs/comp-editor.c:1279
 msgid "Save current changes"
 msgstr "Shrani trenutne spremembe"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1285
-#: ../e-util/e-mail-signature-editor.c:316
+#: ../calendar/gui/dialogs/comp-editor.c:1284
+#: ../e-util/e-mail-signature-editor.c:304
 msgid "Save and Close"
 msgstr "Shrani in zapri"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1287
+#: ../calendar/gui/dialogs/comp-editor.c:1286
 msgid "Save current changes and close editor"
 msgstr "Shrani trenutne spremembe in zapri urejevalnik"
 
-#: ../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:350
-#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1042
+#: ../calendar/gui/dialogs/comp-editor.c:1291 ../e-util/e-focus-tracker.c:790
+#: ../e-util/e-html-editor-actions.c:992 ../e-util/e-web-view.c:349
+#: ../mail/e-mail-browser.c:154 ../shell/e-shell-window-actions.c:1041
 msgid "Select _All"
 msgstr "Izberi _vse"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1294 ../e-util/e-focus-tracker.c:195
-#: ../e-util/e-focus-tracker.c:251 ../e-util/e-focus-tracker.c:746
-#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:1044
+#: ../calendar/gui/dialogs/comp-editor.c:1293 ../e-util/e-focus-tracker.c:196
+#: ../e-util/e-focus-tracker.c:252 ../e-util/e-focus-tracker.c:791
+#: ../mail/e-mail-browser.c:156 ../shell/e-shell-window-actions.c:1043
 msgid "Select all text"
 msgstr "Izberi vse besedilo"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1315
+#: ../calendar/gui/dialogs/comp-editor.c:1314
 msgid "_Classification"
 msgstr "_Razvrstitev"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1329
-#: ../e-util/e-mail-signature-editor.c:321 ../mail/e-mail-browser.c:163
-#: ../shell/e-shell-window-actions.c:1079
+#: ../calendar/gui/dialogs/comp-editor.c:1328
+#: ../e-util/e-html-editor-actions.c:1015
+#: ../e-util/e-mail-signature-editor.c:309 ../mail/e-mail-browser.c:163
+#: ../shell/e-shell-window-actions.c:1078
 msgid "_File"
 msgstr "_Datoteka"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1343
+#: ../calendar/gui/dialogs/comp-editor.c:1342
+#: ../e-util/e-html-editor-actions.c:1036
 msgid "_Insert"
 msgstr "_Vstavi"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1350
-#: ../composer/e-composer-actions.c:319
+#: ../calendar/gui/dialogs/comp-editor.c:1349
+#: ../composer/e-composer-actions.c:431
 msgid "_Options"
 msgstr "M_ožnosti"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1357 ../mail/e-mail-browser.c:177
-#: ../shell/e-shell-window-actions.c:1121 ../smime/gui/smime-ui.ui.h:5
+#: ../calendar/gui/dialogs/comp-editor.c:1356
+#: ../e-util/e-html-editor-actions.c:1057 ../mail/e-mail-browser.c:177
+#: ../shell/e-shell-window-actions.c:1121
+#: ../smime/gui/certificate-manager.c:1649 ../smime/gui/smime-ui.ui.h:5
 msgid "_View"
 msgstr "Po_gled"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1367
-#: ../composer/e-composer-actions.c:268
+#: ../calendar/gui/dialogs/comp-editor.c:1366
+#: ../composer/e-composer-actions.c:380
 msgid "_Attachment..."
 msgstr "_Priloga ..."
 
-#: ../calendar/gui/dialogs/comp-editor.c:1369
-#: ../composer/e-composer-actions.c:270 ../e-util/e-attachment-view.c:412
+#: ../calendar/gui/dialogs/comp-editor.c:1368
+#: ../composer/e-composer-actions.c:382 ../e-util/e-attachment-view.c:412
 msgid "Attach a file"
 msgstr "Priloži datoteko"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1377
+#: ../calendar/gui/dialogs/comp-editor.c:1376
 msgid "_Categories"
 msgstr "_Kategorije"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1379
+#: ../calendar/gui/dialogs/comp-editor.c:1378
 msgid "Toggles whether to display categories"
 msgstr "Preklopi prikaz kategorij"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1385
+#: ../calendar/gui/dialogs/comp-editor.c:1384
 msgid "Time _Zone"
 msgstr "Časovni _pas"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1387
+#: ../calendar/gui/dialogs/comp-editor.c:1386
 msgid "Toggles whether the time zone is displayed"
 msgstr "Preklopi prikaz časovnega pasu"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1396
+#: ../calendar/gui/dialogs/comp-editor.c:1395
 msgid "Pu_blic"
 msgstr "_Javno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1398
+#: ../calendar/gui/dialogs/comp-editor.c:1397
 msgid "Classify as public"
 msgstr "Razvrsti kot javno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1403
+#: ../calendar/gui/dialogs/comp-editor.c:1402
 msgid "_Private"
 msgstr "Z_asebno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1405
+#: ../calendar/gui/dialogs/comp-editor.c:1404
 msgid "Classify as private"
 msgstr "Razvrsti kot zasebno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1410
+#: ../calendar/gui/dialogs/comp-editor.c:1409
 msgid "_Confidential"
 msgstr "_Zaupno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1412
+#: ../calendar/gui/dialogs/comp-editor.c:1411
 msgid "Classify as confidential"
 msgstr "Razvrsti kot zaupno"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1420
+#: ../calendar/gui/dialogs/comp-editor.c:1419
 msgid "R_ole Field"
 msgstr "Polje Vl_oga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1422
+#: ../calendar/gui/dialogs/comp-editor.c:1421
 msgid "Toggles whether the Role field is displayed"
 msgstr "Preklopi prikaz polja Vloga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1428
+#: ../calendar/gui/dialogs/comp-editor.c:1427
 msgid "_RSVP"
 msgstr "_RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1430
+#: ../calendar/gui/dialogs/comp-editor.c:1429
 msgid "Toggles whether the RSVP field is displayed"
 msgstr "Preklopi prikaz polja RSVP"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1436
+#: ../calendar/gui/dialogs/comp-editor.c:1435
 msgid "_Status Field"
 msgstr "Polje _Stanje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1438
+#: ../calendar/gui/dialogs/comp-editor.c:1437
 msgid "Toggles whether the Status field is displayed"
 msgstr "Preklopi prikaz polja Stanje"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1444
+#: ../calendar/gui/dialogs/comp-editor.c:1443
 msgid "_Type Field"
 msgstr "Polje _Vrsta"
 
-#: ../calendar/gui/dialogs/comp-editor.c:1446
+#: ../calendar/gui/dialogs/comp-editor.c:1445
 msgid "Toggles whether the Attendee Type is displayed"
 msgstr "Preklopi prikaz polja Vrsta udeleženca"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2233
-#: ../composer/e-composer-actions.c:487
+#: ../calendar/gui/dialogs/comp-editor.c:2232
+#: ../composer/e-composer-actions.c:665
 msgid "Attach"
 msgstr "Priloži"
 
-#: ../calendar/gui/dialogs/comp-editor.c:2564
-#: ../calendar/gui/dialogs/comp-editor.c:2774
-#: ../calendar/gui/dialogs/comp-editor.c:3787
+#: ../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 "Spremembe tega predmeta bodo morda prezrte, če prispe posodobitev"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3749
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:120
+#: ../calendar/gui/dialogs/comp-editor.c:3748
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:121
 msgid "attachment"
 msgstr "priloga"
 
-#: ../calendar/gui/dialogs/comp-editor.c:3819
+#: ../calendar/gui/dialogs/comp-editor.c:3818
 msgid "Unable to use current version!"
 msgstr "Ni mogoče uporabiti trenutne različice!"
 
@@ -2999,21 +3337,25 @@ msgstr "Ni mogoče uporabiti trenutne različice!"
 msgid "Validation error: %s"
 msgstr "Napaka med potrjevanjem veljavnosti: %s"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:120
-msgid "Could not open destination"
-msgstr "Ni mogoče odpreti cilja"
-
-#: ../calendar/gui/dialogs/copy-source-dialog.c:130
+#: ../calendar/gui/dialogs/copy-source-dialog.c:129
+#: ../calendar/gui/e-cal-ops.c:1940
 msgid "Destination is read only"
 msgstr "Cilj je mogoče le brati"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:172
-msgid "Cannot create object"
-msgstr "Ni mogoče ustvariti predmeta"
+#: ../calendar/gui/dialogs/copy-source-dialog.c:209
+#, fuzzy, c-format
+msgid "Copying events to the calendar '%s'"
+msgstr "Kopiranje dogodka v koledar %s"
+
+#: ../calendar/gui/dialogs/copy-source-dialog.c:215
+#, fuzzy, c-format
+msgid "Copying memos to the memo list '%s'"
+msgstr "Kopiranje opomnika na seznam opomnikov '{0}'"
 
-#: ../calendar/gui/dialogs/copy-source-dialog.c:203
-msgid "Could not open source"
-msgstr "Ni mogoče odpreti vira"
+#: ../calendar/gui/dialogs/copy-source-dialog.c:221
+#, fuzzy, c-format
+msgid "Copying tasks to the task list '%s'"
+msgstr "Kopiranje naloge na seznam nalog '{0}'"
 
 #: ../calendar/gui/dialogs/delete-comp.c:215
 msgid "_Delete this item from all other recipient's mailboxes?"
@@ -3024,70 +3366,6 @@ msgstr ""
 msgid "_Retract comment"
 msgstr "_Umakni opombo"
 
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:54
-#, c-format
-msgid "The event could not be deleted due to a dbus error: %s"
-msgstr "Dogodka ni mogoče izbrisati zaradi napake vodila dbus: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:58
-#, c-format
-msgid "The task could not be deleted due to a dbus error: %s"
-msgstr "Naloge ni mogoče izbrisati zaradi napake vodila dbus: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:62
-#, c-format
-msgid "The memo could not be deleted due to a dbus error: %s"
-msgstr "Opomnika ni mogoče izbrisati zaradi napake vodila dbus: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:66
-#, c-format
-msgid "The item could not be deleted due to a dbus error: %s"
-msgstr "Predmeta ni mogoče izbrisati zaradi napake vodila dbus: %s"
-
-#: ../calendar/gui/dialogs/delete-error.c:73
-msgid "The event could not be deleted because permission was denied"
-msgstr "Dogodka ni mogoče izbrisati zaradi neustreznih dovoljenj"
-
-#: ../calendar/gui/dialogs/delete-error.c:76
-msgid "The task could not be deleted because permission was denied"
-msgstr "Naloge ni mogoče izbrisati zaradi neustreznih dovoljenj"
-
-#: ../calendar/gui/dialogs/delete-error.c:79
-msgid "The memo could not be deleted because permission was denied"
-msgstr "Opomnika ni mogoče izbrisati zaradi neustreznih dovoljenj"
-
-#: ../calendar/gui/dialogs/delete-error.c:82
-msgid "The item could not be deleted because permission was denied"
-msgstr "Predmeta ni mogoče izbrisati zaradi neustreznih dovoljenj"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:90
-#, c-format
-msgid "The event could not be deleted due to an error: %s"
-msgstr "Dogodka ni mogoče izbrisati zaradi napake: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:94
-#, c-format
-msgid "The task could not be deleted due to an error: %s"
-msgstr "Naloge ni mogoče izbrisati zaradi napake: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:98
-#, c-format
-msgid "The memo could not be deleted due to an error: %s"
-msgstr "Opomnika ni mogoče izbrisati zaradi napake: %s"
-
-#. Translators: The '%s' is replaced with a detailed error message
-#: ../calendar/gui/dialogs/delete-error.c:102
-#, c-format
-msgid "The item could not be deleted due to an error: %s"
-msgstr "Predmeta ni mogoče izbrisati zaradi napake: %s"
-
 #: ../calendar/gui/dialogs/e-delegate-dialog.ui.h:1
 msgid "Enter Delegate"
 msgstr "Vnesite pooblaščenca"
@@ -3149,7 +3427,7 @@ msgstr "_Zasedenost"
 msgid "Query free / busy information for the attendees"
 msgstr "Poizvedi o stanju zasedenosti udeležencev"
 
-#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3496
+#: ../calendar/gui/dialogs/event-editor.c:306 ../calendar/gui/print.c:3486
 msgid "Appointment"
 msgstr "Sestanek"
 
@@ -3177,7 +3455,7 @@ msgid "Event cannot be fully edited, because you are not the organizer"
 msgstr "Dogodka ni mogoče polno urejati, ker niste organizator"
 
 #: ../calendar/gui/dialogs/event-page.c:650
-#: ../calendar/gui/dialogs/event-page.c:3172
+#: ../calendar/gui/dialogs/event-page.c:3178
 msgid "This event has reminders"
 msgstr "Dogodek ima opomnike"
 
@@ -3186,52 +3464,52 @@ msgstr "Dogodek ima opomnike"
 msgid "Or_ganizer:"
 msgstr "Or_ganizator:"
 
-#: ../calendar/gui/dialogs/event-page.c:1303
+#: ../calendar/gui/dialogs/event-page.c:1309
 msgid "Event with no start date"
 msgstr "Dogodek brez začetnega datuma"
 
-#: ../calendar/gui/dialogs/event-page.c:1306
+#: ../calendar/gui/dialogs/event-page.c:1312
 msgid "Event with no end date"
 msgstr "Dogodek brez končnega datuma"
 
-#: ../calendar/gui/dialogs/event-page.c:1484
+#: ../calendar/gui/dialogs/event-page.c:1490
 #: ../calendar/gui/dialogs/memo-page.c:732
-#: ../calendar/gui/dialogs/task-page.c:1030
+#: ../calendar/gui/dialogs/task-page.c:1032
 msgid "Start date is wrong"
 msgstr "Začetni datum je napačen"
 
-#: ../calendar/gui/dialogs/event-page.c:1495
+#: ../calendar/gui/dialogs/event-page.c:1501
 msgid "End date is wrong"
 msgstr "Končni datum je napačen"
 
-#: ../calendar/gui/dialogs/event-page.c:1519
+#: ../calendar/gui/dialogs/event-page.c:1525
 msgid "Start time is wrong"
 msgstr "Začetni čas je napačen"
 
-#: ../calendar/gui/dialogs/event-page.c:1527
+#: ../calendar/gui/dialogs/event-page.c:1533
 msgid "End time is wrong"
 msgstr "Končni čas je napačen"
 
-#: ../calendar/gui/dialogs/event-page.c:1691
+#: ../calendar/gui/dialogs/event-page.c:1697
 #: ../calendar/gui/dialogs/memo-page.c:771
-#: ../calendar/gui/dialogs/task-page.c:1084
+#: ../calendar/gui/dialogs/task-page.c:1086
 msgid "An organizer is required."
 msgstr "Zahtevan je organizator."
 
-#: ../calendar/gui/dialogs/event-page.c:1726
-#: ../calendar/gui/dialogs/task-page.c:1119
+#: ../calendar/gui/dialogs/event-page.c:1732
+#: ../calendar/gui/dialogs/task-page.c:1121
 msgid "At least one attendee is required."
 msgstr "Zahtevan je vsaj en udeleženec."
 
-#: ../calendar/gui/dialogs/event-page.c:1932
+#: ../calendar/gui/dialogs/event-page.c:1938
 msgid "_Delegatees"
 msgstr "_Pooblaščenci"
 
-#: ../calendar/gui/dialogs/event-page.c:1934
+#: ../calendar/gui/dialogs/event-page.c:1940
 msgid "Atte_ndees"
 msgstr "Udeleže_nci"
 
-#: ../calendar/gui/dialogs/event-page.c:3452
+#: ../calendar/gui/dialogs/event-page.c:3458
 #, c-format
 msgid "%d day before appointment"
 msgid_plural "%d days before appointment"
@@ -3240,7 +3518,7 @@ msgstr[1] "%d dan pred sestankom"
 msgstr[2] "%d dni pred sestankom"
 msgstr[3] "%d dni pred sestankom"
 
-#: ../calendar/gui/dialogs/event-page.c:3458
+#: ../calendar/gui/dialogs/event-page.c:3464
 #, c-format
 msgid "%d hour before appointment"
 msgid_plural "%d hours before appointment"
@@ -3249,7 +3527,7 @@ msgstr[1] "%d uro pred sestankom"
 msgstr[2] "%d uri pred sestankom"
 msgstr[3] "%d ure pred sestankom"
 
-#: ../calendar/gui/dialogs/event-page.c:3464
+#: ../calendar/gui/dialogs/event-page.c:3470
 #, c-format
 msgid "%d minute before appointment"
 msgid_plural "%d minutes before appointment"
@@ -3258,12 +3536,12 @@ msgstr[1] "%d minuto pred sestankom"
 msgstr[2] "%d minuti pred sestankom"
 msgstr[3] "%d minute pred sestankom"
 
-#: ../calendar/gui/dialogs/event-page.c:3485
-msgid "Customize"
-msgstr "Prilagodi"
+#: ../calendar/gui/dialogs/event-page.c:3491
+msgid "Custom"
+msgstr "Po meri"
 
 #. Translators: "None" for "No reminder set"
-#: ../calendar/gui/dialogs/event-page.c:3492
+#: ../calendar/gui/dialogs/event-page.c:3498
 msgctxt "cal-reminders"
 msgid "None"
 msgstr "Brez"
@@ -3306,6 +3584,8 @@ msgstr "_Mesto:"
 #: ../calendar/gui/dialogs/memo-page.ui.h:2
 #: ../calendar/gui/dialogs/task-page.ui.h:29
 #: ../e-util/e-attachment-dialog.c:356
+#: ../e-util/e-html-editor-image-dialog.c:514
+#: ../e-util/e-html-editor-link-dialog.c:367
 msgid "_Description:"
 msgstr "_Opis:"
 
@@ -3328,7 +3608,7 @@ msgstr "Opis dogodka:"
 
 #: ../calendar/gui/dialogs/event-page.ui.h:26
 #: ../calendar/gui/dialogs/task-page.ui.h:33
-#: ../calendar/gui/e-meeting-time-sel.c:547
+#: ../calendar/gui/e-meeting-time-sel.c:549
 msgid "Atte_ndees..."
 msgstr "Udeleže_nci ..."
 
@@ -3336,10 +3616,6 @@ msgstr "Udeleže_nci ..."
 msgid "_Reminder"
 msgstr "_Opomnik"
 
-#: ../calendar/gui/dialogs/event-page.ui.h:31
-msgid "Custom Reminder:"
-msgstr "Opomnik po meri:"
-
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:1
 msgid "January"
 msgstr "januar"
@@ -3393,11 +3669,11 @@ msgid "Select Date"
 msgstr "Izbor datuma"
 
 #: ../calendar/gui/dialogs/goto-dialog.ui.h:14
-#: ../modules/calendar/e-cal-shell-view-actions.c:1378
+#: ../modules/calendar/e-cal-shell-view-actions.c:1219
 msgid "Select _Today"
 msgstr "Izberi _danes"
 
-#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3500
+#: ../calendar/gui/dialogs/memo-editor.c:105 ../calendar/gui/print.c:3490
 msgid "Memo"
 msgstr "Opomnik"
 
@@ -3420,10 +3696,11 @@ msgid "Memo cannot be fully edited, because you are not the organizer"
 msgstr "Opomnika ni mogoče polno urejati, ker niste organizator"
 
 #: ../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
+#: ../em-format/e-mail-formatter-utils.c:202
+#: ../em-format/e-mail-formatter-utils.c:219
+#: ../em-format/e-mail-part-headers.c:48 ../mail/message-list.etspec.h:9
+#: ../mail/searchtypes.xml.in.h:11 ../mail/vfoldertypes.xml.in.h:11
+#: ../modules/mail/em-mailer-prefs.c:64
 msgid "To"
 msgstr "Za"
 
@@ -3726,7 +4003,7 @@ msgstr "Obvesti _samo nove udeležence"
 msgid "_Send Options"
 msgstr "Možnosti _pošiljanja"
 
-#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3498
+#: ../calendar/gui/dialogs/task-editor.c:148 ../calendar/gui/print.c:3488
 #: ../e-util/e-send-options.c:553
 msgid "Task"
 msgstr "Naloga"
@@ -3760,76 +4037,76 @@ msgstr ""
 "Naloge ni mogoče urejati, ker izbrani seznam nalog ne podpira dodeljenih "
 "nalog."
 
-#: ../calendar/gui/dialogs/task-page.c:1011
+#: ../calendar/gui/dialogs/task-page.c:1013
 msgid "Due date is wrong"
 msgstr "Datum zapadlosti je napačen"
 
-#: ../calendar/gui/dialogs/task-page.c:1179
-#: ../calendar/gui/dialogs/task-page.c:1204
+#: ../calendar/gui/dialogs/task-page.c:1181
+#: ../calendar/gui/dialogs/task-page.c:1206
 msgid "Completed date is wrong"
 msgstr "Datum konca je napačen"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:8
-#: ../calendar/gui/e-cal-component-preview.c:336
-#: ../calendar/gui/e-task-table.c:572 ../calendar/gui/tasktypes.xml.h:19
-#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:309
+#: ../calendar/gui/e-cal-component-preview.c:338
+#: ../calendar/gui/e-task-table.c:524 ../calendar/gui/tasktypes.xml.h:19
+#: ../e-util/e-send-options.ui.h:2 ../mail/message-list.c:313
 msgid "High"
 msgstr "Visoka"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:10
-#: ../calendar/gui/e-cal-component-preview.c:338
-#: ../calendar/gui/e-cal-model.c:1659 ../calendar/gui/e-task-table.c:573
+#: ../calendar/gui/e-cal-component-preview.c:340
+#: ../calendar/gui/e-cal-model.c:1643 ../calendar/gui/e-task-table.c:525
 #: ../calendar/gui/tasktypes.xml.h:20 ../e-util/e-send-options.ui.h:5
-#: ../mail/message-list.c:308
+#: ../mail/message-list.c:312
 msgid "Normal"
 msgstr "Običajno"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:12
-#: ../calendar/gui/e-cal-component-preview.c:340
-#: ../calendar/gui/e-task-table.c:574 ../calendar/gui/tasktypes.xml.h:21
-#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:307
+#: ../calendar/gui/e-cal-component-preview.c:342
+#: ../calendar/gui/e-task-table.c:526 ../calendar/gui/tasktypes.xml.h:21
+#: ../e-util/e-send-options.ui.h:4 ../mail/message-list.c:311
 msgid "Low"
 msgstr "nizka"
 
 #. To Translators: This is task priority
 #: ../calendar/gui/dialogs/task-page.ui.h:14
-#: ../calendar/gui/e-task-table.c:575 ../calendar/gui/tasktypes.xml.h:22
+#: ../calendar/gui/e-task-table.c:527 ../calendar/gui/tasktypes.xml.h:22
 #: ../e-util/e-send-options.ui.h:1
 msgid "Undefined"
 msgstr "Nedoločeno"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:16
-#: ../calendar/gui/e-cal-component-preview.c:321
+#: ../calendar/gui/e-cal-component-preview.c:323
 #: ../calendar/gui/e-cal-model-tasks.c:310
-#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:213
-#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:655
-#: ../calendar/gui/print.c:3582 ../calendar/gui/tasktypes.xml.h:11
+#: ../calendar/gui/e-cal-model-tasks.c:552 ../calendar/gui/e-task-table.c:207
+#: ../calendar/gui/e-task-table.c:222 ../calendar/gui/e-task-table.c:607
+#: ../calendar/gui/print.c:3573 ../calendar/gui/tasktypes.xml.h:11
 msgid "Not Started"
 msgstr "Ni začeto"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:18
-#: ../calendar/gui/e-cal-component-preview.c:311
+#: ../calendar/gui/e-cal-component-preview.c:313
 #: ../calendar/gui/e-cal-model-tasks.c:312
 #: ../calendar/gui/e-cal-model-tasks.c:554
-#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:215
-#: ../calendar/gui/e-task-table.c:230 ../calendar/gui/e-task-table.c:656
-#: ../calendar/gui/print.c:3585
+#: ../calendar/gui/e-cal-model-tasks.c:635 ../calendar/gui/e-task-table.c:209
+#: ../calendar/gui/e-task-table.c:224 ../calendar/gui/e-task-table.c:608
+#: ../calendar/gui/print.c:3576
 msgid "In Progress"
 msgstr "V teku"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:20
-#: ../calendar/gui/e-cal-component-preview.c:314
+#: ../calendar/gui/e-cal-component-preview.c:316
 #: ../calendar/gui/e-cal-model-tasks.c:314
 #: ../calendar/gui/e-cal-model-tasks.c:556
 #: ../calendar/gui/e-meeting-store.c:204 ../calendar/gui/e-meeting-store.c:227
-#: ../calendar/gui/e-task-table.c:217 ../calendar/gui/e-task-table.c:232
-#: ../calendar/gui/e-task-table.c:657 ../calendar/gui/print.c:3588
+#: ../calendar/gui/e-task-table.c:211 ../calendar/gui/e-task-table.c:226
+#: ../calendar/gui/e-task-table.c:609 ../calendar/gui/print.c:3579
 #: ../calendar/gui/tasktypes.xml.h:13
 #: ../plugins/save-calendar/csv-format.c:379
 msgid "Completed"
@@ -3837,11 +4114,11 @@ msgstr "Končano"
 
 #. To Translators: This is task status
 #: ../calendar/gui/dialogs/task-page.ui.h:22
-#: ../calendar/gui/e-cal-component-preview.c:317
+#: ../calendar/gui/e-cal-component-preview.c:319
 #: ../calendar/gui/e-cal-model-tasks.c:316
-#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:219
-#: ../calendar/gui/e-task-table.c:234 ../calendar/gui/e-task-table.c:658
-#: ../calendar/gui/print.c:3591 ../mail/mail-send-recv.c:855
+#: ../calendar/gui/e-cal-model-tasks.c:558 ../calendar/gui/e-task-table.c:213
+#: ../calendar/gui/e-task-table.c:228 ../calendar/gui/e-task-table.c:610
+#: ../calendar/gui/print.c:3582 ../mail/mail-send-recv.c:958
 msgid "Canceled"
 msgstr "Preklicano"
 
@@ -3877,56 +4154,56 @@ msgstr "_Razvrstitev:"
 msgid "_Web Page:"
 msgstr "_Spletna stran:"
 
-#: ../calendar/gui/ea-cal-view.c:281
+#: ../calendar/gui/ea-cal-view.c:284
 msgid "New Appointment"
 msgstr "Nov sestanek"
 
-#: ../calendar/gui/ea-cal-view.c:282
+#: ../calendar/gui/ea-cal-view.c:285
 msgid "New All Day Event"
 msgstr "Nov celodnevni dogodek"
 
-#: ../calendar/gui/ea-cal-view.c:283
+#: ../calendar/gui/ea-cal-view.c:286
 msgid "New Meeting"
 msgstr "Novo srečanje"
 
-#: ../calendar/gui/ea-cal-view.c:284
+#: ../calendar/gui/ea-cal-view.c:287
 msgid "Go to Today"
 msgstr "Pojdi na današnji dan"
 
-#: ../calendar/gui/ea-cal-view.c:285
+#: ../calendar/gui/ea-cal-view.c:288
 msgid "Go to Date"
 msgstr "Pojdi na datum"
 
-#: ../calendar/gui/ea-cal-view-event.c:297
+#: ../calendar/gui/ea-cal-view-event.c:234
 msgid "It has reminders."
 msgstr "Ima opomnike."
 
-#: ../calendar/gui/ea-cal-view-event.c:300
+#: ../calendar/gui/ea-cal-view-event.c:237
 msgid "It has recurrences."
 msgstr "Ima ponovitve."
 
-#: ../calendar/gui/ea-cal-view-event.c:303
+#: ../calendar/gui/ea-cal-view-event.c:240
 msgid "It is a meeting."
 msgstr "Je srečanje."
 
-#: ../calendar/gui/ea-cal-view-event.c:310
+#: ../calendar/gui/ea-cal-view-event.c:247
 #, c-format
 msgid "Calendar Event: Summary is %s."
 msgstr "Dogodek koledarja: povzetek je %s."
 
-#: ../calendar/gui/ea-cal-view-event.c:313
+#: ../calendar/gui/ea-cal-view-event.c:250
 msgid "Calendar Event: It has no summary."
 msgstr "Dogodek koledarja: ni povzetka."
 
-#: ../calendar/gui/ea-cal-view-event.c:336
+#: ../calendar/gui/ea-cal-view-event.c:273
 msgid "calendar view event"
 msgstr "pogled dogodka koledarja"
 
-#: ../calendar/gui/ea-cal-view-event.c:568
+#: ../calendar/gui/ea-cal-view-event.c:505
 msgid "Grab Focus"
 msgstr "Zgrabi žarišče"
 
-#: ../calendar/gui/ea-day-view.c:111 ../calendar/gui/ea-week-view.c:110
+#: ../calendar/gui/ea-day-view.c:107 ../calendar/gui/ea-week-view.c:107
 #, c-format
 msgid "It has %d event."
 msgid_plural "It has %d events."
@@ -3937,89 +4214,33 @@ msgstr[3] "Ima %d dogodke."
 
 #. To translators: Here, "It" is either like "Work Week View: July
 #. 10th - July 14th, 2006." or "Day View: Thursday July 13th, 2006."
-#: ../calendar/gui/ea-day-view.c:118 ../calendar/gui/ea-week-view.c:113
+#: ../calendar/gui/ea-day-view.c:114 ../calendar/gui/ea-week-view.c:110
 msgid "It has no events."
 msgstr "Nima dogodkov."
 
-#: ../calendar/gui/ea-day-view.c:126
+#: ../calendar/gui/ea-day-view.c:121
 #, c-format
 msgid "Work Week View: %s. %s"
 msgstr "Pogled delovnega tedna: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:133
+#: ../calendar/gui/ea-day-view.c:128
 #, c-format
 msgid "Day View: %s. %s"
 msgstr "Dnevni pogled: %s. %s"
 
-#: ../calendar/gui/ea-day-view.c:167
+#: ../calendar/gui/ea-day-view.c:157
 msgid "calendar view for a work week"
 msgstr "pogled koledarja za delovni teden"
 
-#: ../calendar/gui/ea-day-view.c:169
+#: ../calendar/gui/ea-day-view.c:159
 msgid "calendar view for one or more days"
 msgstr "pogled koledarja za enega ali več dni"
 
 #: ../calendar/gui/ea-day-view-main-item.c:266
-#: ../calendar/gui/ea-week-view-main-item.c:293
+#: ../calendar/gui/ea-week-view-main-item.c:295
 msgid "a table to view and select the current time range"
 msgstr "razpredelnica za ogled in izbiro trenutnega časovnega obsega"
 
-#: ../calendar/gui/ea-gnome-calendar.c:47
-#: ../calendar/gui/ea-gnome-calendar.c:55
-#: ../calendar/importers/icalendar-importer.c:1108
-msgid "Gnome Calendar"
-msgstr "Gnome Koledar"
-
-#: ../calendar/gui/ea-gnome-calendar.c:206
-#: ../modules/calendar/e-cal-shell-view-private.c:1190
-msgid "%A %d %b %Y"
-msgstr "%A %d.%m.%Y"
-
-#. strftime format %a = abbreviated weekday name, %d = day of month,
-#. * %b = abbreviated month name. Don't use any other specifiers.
-#. strftime format %a = abbreviated weekday name,
-#. * %d = day of month, %b = abbreviated month name.
-#. * You can change the order but don't change the
-#. * specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:210 ../calendar/gui/e-day-view.c:2798
-#: ../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.%m."
-
-#: ../calendar/gui/ea-gnome-calendar.c:213
-#: ../calendar/gui/ea-gnome-calendar.c:219
-#: ../calendar/gui/ea-gnome-calendar.c:222
-#: ../modules/calendar/e-cal-shell-view-private.c:1197
-#: ../modules/calendar/e-cal-shell-view-private.c:1203
-#: ../modules/calendar/e-cal-shell-view-private.c:1206
-msgid "%a %d %b %Y"
-msgstr "%a %d.%b.%Y"
-
-#: ../calendar/gui/ea-gnome-calendar.c:241
-#: ../calendar/gui/ea-gnome-calendar.c:249
-#: ../calendar/gui/ea-gnome-calendar.c:256
-#: ../calendar/gui/ea-gnome-calendar.c:259
-#: ../modules/calendar/e-cal-shell-view-private.c:1223
-#: ../modules/calendar/e-cal-shell-view-private.c:1234
-#: ../modules/calendar/e-cal-shell-view-private.c:1241
-#: ../modules/calendar/e-cal-shell-view-private.c:1244
-msgid "%d %b %Y"
-msgstr "%d.%m.%Y"
-
-#. strftime format %d = day of month, %b = abbreviated month name.
-#. * Don't use any other specifiers.
-#. strftime format %d = day of month, %b = abbreviated
-#. * month name. You can change the order but don't
-#. * change the specifiers or add anything.
-#: ../calendar/gui/ea-gnome-calendar.c:246 ../calendar/gui/e-day-view.c:2814
-#: ../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.%m."
-
 #: ../calendar/gui/ea-jump-button.c:150
 msgid "Jump button"
 msgstr "Gumb skoči"
@@ -4100,25 +4321,25 @@ msgstr "%s ob %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s za neznano vrsto sprožilca"
 
-#: ../calendar/gui/ea-week-view.c:119
+#: ../calendar/gui/ea-week-view.c:114
 #, c-format
 msgid "Month View: %s. %s"
 msgstr "Mesečni pogled: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:124
+#: ../calendar/gui/ea-week-view.c:119
 #, c-format
 msgid "Week View: %s. %s"
 msgstr "Tedenski pogled: %s. %s"
 
-#: ../calendar/gui/ea-week-view.c:158
+#: ../calendar/gui/ea-week-view.c:148
 msgid "calendar view for a month"
 msgstr "mesečni pogled v koledarju"
 
-#: ../calendar/gui/ea-week-view.c:160
+#: ../calendar/gui/ea-week-view.c:150
 msgid "calendar view for one or more weeks"
 msgstr "pogled koledarja za enega ali več tednov"
 
-#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:757
+#: ../calendar/gui/e-cal-component-preview.c:222 ../e-util/e-filter-rule.c:758
 #: ../mail/e-mail-config-page.c:125
 msgid "Untitled"
 msgstr "Neimenovano"
@@ -4127,52 +4348,55 @@ msgstr "Neimenovano"
 msgid "Categories:"
 msgstr "Kategorije:"
 
-#: ../calendar/gui/e-cal-component-preview.c:262
+#: ../calendar/gui/e-cal-component-preview.c:264
 msgid "Summary:"
 msgstr "Povzetek:"
 
-#: ../calendar/gui/e-cal-component-preview.c:271
+#: ../calendar/gui/e-cal-component-preview.c:273
 msgid "Start Date:"
 msgstr "Začetni datum:"
 
-#: ../calendar/gui/e-cal-component-preview.c:283
+#: ../calendar/gui/e-cal-component-preview.c:285
 msgid "End Date:"
 msgstr "Končni datum:"
 
-#: ../calendar/gui/e-cal-component-preview.c:295
+#: ../calendar/gui/e-cal-component-preview.c:297
 msgid "Due Date:"
 msgstr "Datum zapadlosti:"
 
-#: ../calendar/gui/e-cal-component-preview.c:307
-#: ../modules/itip-formatter/itip-view.c:1506
-#: ../modules/itip-formatter/itip-view.c:1623
+#: ../calendar/gui/e-cal-component-preview.c:309
+#: ../modules/itip-formatter/itip-view.c:1519
+#: ../modules/itip-formatter/itip-view.c:1636
 msgid "Status:"
 msgstr "Stanje:"
 
-#: ../calendar/gui/e-cal-component-preview.c:334
+#: ../calendar/gui/e-cal-component-preview.c:336
 msgid "Priority:"
 msgstr "Prednost:"
 
-#: ../calendar/gui/e-cal-component-preview.c:359
-#: ../mail/e-mail-config-service-page.c:671
+#: ../calendar/gui/e-cal-component-preview.c:361
+#: ../mail/e-mail-config-service-page.c:670
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../calendar/gui/e-cal-component-preview.c:390
+#: ../calendar/gui/e-cal-component-preview.c:392
 msgid "Web Page:"
 msgstr "Spletna stran:"
 
-#: ../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 %s"
-msgstr "Kopiranje dogodka v koledar %s"
+#: ../calendar/gui/e-cal-data-model.c:1608
+#, fuzzy, c-format
+msgid "Creating view for calendar '%s'"
+msgstr "Odpiranje koledarja '%s'"
 
-#: ../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 %s"
-msgstr "Premikanje dogodka v koledar %s"
+#: ../calendar/gui/e-cal-data-model.c:1612
+#, fuzzy, c-format
+msgid "Creating view for task list '%s'"
+msgstr "Odpiranje seznama opravil '%s'"
+
+#: ../calendar/gui/e-cal-data-model.c:1616
+#, fuzzy, c-format
+msgid "Creating view for memo list '%s'"
+msgstr "Odpiranje seznama opomnikov '%s'"
 
 #: ../calendar/gui/e-calendar-table.etspec.h:1
 msgid "Click to add a task"
@@ -4187,7 +4411,7 @@ msgstr "Datum začetka"
 #: ../calendar/gui/e-meeting-time-sel.etspec.h:4
 #: ../calendar/gui/e-memo-table.etspec.h:3
 #: ../e-util/e-attachment-tree-view.c:585
-#: ../mail/e-mail-account-tree-view.c:158
+#: ../mail/e-mail-account-tree-view.c:157
 msgid "Type"
 msgstr "Vrsta"
 
@@ -4195,7 +4419,7 @@ msgstr "Vrsta"
 msgid "Completion date"
 msgstr "Datum zaključka"
 
-#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:857
+#: ../calendar/gui/e-calendar-table.etspec.h:6 ../mail/mail-send-recv.c:960
 msgid "Complete"
 msgstr "Končano"
 
@@ -4217,11 +4441,12 @@ msgstr "Prednost"
 #. 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:4005
+#: ../calendar/gui/e-cal-model.c:3088
 #: ../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:49
-#: ../mail/message-list.etspec.h:1
+#: ../calendar/gui/tasktypes.xml.h:8 ../mail/filtertypes.xml.in.h:34
+#: ../mail/message-list.etspec.h:1 ../mail/searchtypes.xml.in.h:36
+#: ../mail/vfoldertypes.xml.in.h:36
 msgid "Status"
 msgstr "Stanje"
 
@@ -4238,37 +4463,55 @@ msgstr "Ustvarjeno"
 msgid "Last modified"
 msgstr "Zadnjič spremenjeno"
 
-#: ../calendar/gui/e-calendar-view.c:448
+#: ../calendar/gui/e-calendar-view.c:411
 msgid "Cut selected events to the clipboard"
 msgstr "Izreži izbrane dogodke v odložišče"
 
-#: ../calendar/gui/e-calendar-view.c:454
+#: ../calendar/gui/e-calendar-view.c:417
 msgid "Copy selected events to the clipboard"
 msgstr "Kopiraj izbrane dogodke v odložišče"
 
-#: ../calendar/gui/e-calendar-view.c:460
+#: ../calendar/gui/e-calendar-view.c:423
 msgid "Paste events from the clipboard"
 msgstr "Prilepi izbrane dogodke iz odložišča"
 
-#: ../calendar/gui/e-calendar-view.c:466
+#: ../calendar/gui/e-calendar-view.c:429
 msgid "Delete selected events"
 msgstr "Izbriši izbrane dogodke"
 
-#: ../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 "Brisanje izbranih predmetov"
+#: ../calendar/gui/e-calendar-view.c:810
+msgid "Pasted text doesn't contain valid iCalendar data"
+msgstr ""
 
-#: ../calendar/gui/e-calendar-view.c:648 ../calendar/gui/e-memo-table.c:877
-#: ../calendar/gui/e-task-table.c:1175
-msgid "Updating objects"
-msgstr "Posodabljanje predmetov"
+#: ../calendar/gui/e-calendar-view.c:821 ../calendar/gui/e-cal-ops.c:1540
+#, fuzzy
+msgid "Default calendar not found"
+msgstr "Privzeti uporabniški koledar"
+
+#: ../calendar/gui/e-calendar-view.c:826 ../calendar/gui/e-cal-ops.c:1543
+#, fuzzy
+msgid "Default memo list not found"
+msgstr "Označi kot privzet seznam opomnikov"
+
+#: ../calendar/gui/e-calendar-view.c:831 ../calendar/gui/e-cal-ops.c:1546
+#, fuzzy
+msgid "Default task list not found"
+msgstr "Označi kot privzet seznam nalog"
+
+#: ../calendar/gui/e-calendar-view.c:918
+msgid "No suitable component found"
+msgstr ""
+
+#: ../calendar/gui/e-calendar-view.c:988
+#, fuzzy
+msgid "Pasting iCalendar data"
+msgstr "Shrani kot iCalendar"
 
 #. To Translators: It will display "Organiser: NameOfTheUser <email ofuser com>"
 #. To Translators: It will display
 #. * "Organizer: NameOfTheUser <email ofuser com>"
-#: ../calendar/gui/e-calendar-view.c:2094 ../calendar/gui/e-memo-table.c:552
-#: ../calendar/gui/e-task-table.c:839
+#: ../calendar/gui/e-calendar-view.c:1791 ../calendar/gui/e-memo-table.c:495
+#: ../calendar/gui/e-task-table.c:796
 #, c-format
 msgid "Organizer: %s <%s>"
 msgstr "Organizator: %s <%s>"
@@ -4276,25 +4519,65 @@ 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:2098 ../calendar/gui/e-memo-table.c:557
-#: ../calendar/gui/e-task-table.c:843
+#: ../calendar/gui/e-calendar-view.c:1795 ../calendar/gui/e-memo-table.c:500
+#: ../calendar/gui/e-task-table.c:800
 #, c-format
 msgid "Organizer: %s"
 msgstr "Organizator: %s"
 
 #. To Translators: It will display "Location: PlaceOfTheMeeting"
-#: ../calendar/gui/e-calendar-view.c:2114
-#: ../calendar/gui/e-meeting-time-sel.c:2664 ../calendar/gui/print.c:3536
+#: ../calendar/gui/e-calendar-view.c:1811
+#: ../calendar/gui/e-meeting-time-sel.c:2663 ../calendar/gui/print.c:3527
 #, c-format
 msgid "Location: %s"
 msgstr "Mesto: %s"
 
 #. To Translators: It will display "Time: ActualStartDateAndTime (DurationOfTheMeeting)"
-#: ../calendar/gui/e-calendar-view.c:2149
+#: ../calendar/gui/e-calendar-view.c:1851
 #, c-format
 msgid "Time: %s %s"
 msgstr "Čas: %s %s"
 
+#: ../calendar/gui/e-calendar-view.c:2228
+#: ../calendar/gui/e-calendar-view.c:2235
+#: ../calendar/gui/e-calendar-view.c:2242
+#: ../calendar/gui/e-calendar-view.c:2245
+msgid "%d %b %Y"
+msgstr "%d.%m.%Y"
+
+#. strftime format %d = day of month, %b = abbreviated month name.
+#. * Don't use any other specifiers.
+#. strftime format %d = day of month, %b = abbreviated
+#. * month name. You can change the order but don't
+#. * change the specifiers or add anything.
+#: ../calendar/gui/e-calendar-view.c:2233 ../calendar/gui/e-day-view.c:2943
+#: ../calendar/gui/e-day-view-top-item.c:859
+#: ../calendar/gui/e-week-view-main-item.c:230
+msgid "%d %b"
+msgstr "%d.%m."
+
+#: ../calendar/gui/e-calendar-view.c:2255
+msgid "%A %d %b %Y"
+msgstr "%A %d.%m.%Y"
+
+#. strftime format %a = abbreviated weekday name, %d = day of month,
+#. * %b = abbreviated month name. Don't use any other specifiers.
+#. strftime format %a = abbreviated weekday name,
+#. * %d = day of month, %b = abbreviated month name.
+#. * You can change the order but don't change the
+#. * specifiers or add anything.
+#: ../calendar/gui/e-calendar-view.c:2259 ../calendar/gui/e-day-view.c:2927
+#: ../calendar/gui/e-day-view-top-item.c:855
+#: ../calendar/gui/e-week-view-main-item.c:216
+msgid "%a %d %b"
+msgstr "%a %d.%m."
+
+#: ../calendar/gui/e-calendar-view.c:2262
+#: ../calendar/gui/e-calendar-view.c:2268
+#: ../calendar/gui/e-calendar-view.c:2271
+msgid "%a %d %b %Y"
+msgstr "%a %d.%b.%Y"
+
 #: ../calendar/gui/e-cal-list-view.etspec.h:1
 #: ../calendar/gui/e-memo-table.etspec.h:5
 msgid "Start Date"
@@ -4304,77 +4587,102 @@ msgstr "Začetni daum"
 msgid "End Date"
 msgstr "Končni datum"
 
-#: ../calendar/gui/e-cal-model.c:466 ../calendar/gui/e-meeting-list-view.c:184
+#: ../calendar/gui/e-cal-model.c:291 ../calendar/gui/e-meeting-list-view.c:184
 #: ../calendar/gui/e-meeting-list-view.c:198
 #: ../calendar/gui/e-meeting-store.c:134 ../calendar/gui/e-meeting-store.c:169
 #: ../calendar/gui/e-meeting-store.c:232 ../calendar/gui/print.c:1250
 #: ../calendar/gui/print.c:1267 ../e-util/e-charset.c:51
-#: ../modules/itip-formatter/itip-view.c:3510
-#: ../modules/itip-formatter/itip-view.c:6097
+#: ../modules/itip-formatter/itip-view.c:3607
+#: ../modules/itip-formatter/itip-view.c:6197
 #: ../modules/plugin-manager/evolution-plugin-manager.c:99
 msgid "Unknown"
 msgstr "Neznano"
 
-#: ../calendar/gui/e-cal-model.c:1661
+#: ../calendar/gui/e-cal-model.c:1183 ../calendar/gui/e-cal-ops.c:586
+#: ../calendar/gui/e-cal-ops.c:1209
+#: ../modules/calendar/e-cal-base-shell-backend.c:361
+#, c-format
+msgid "Source with UID '%s' not found"
+msgstr ""
+
+#: ../calendar/gui/e-cal-model.c:1267 ../calendar/gui/e-cal-ops.c:184
+#: ../calendar/gui/e-cal-ops.c:1325
+#, fuzzy
+msgid "Creating an event"
+msgstr "Ustvari nov celodnevni sestanek"
+
+#: ../calendar/gui/e-cal-model.c:1271 ../calendar/gui/e-cal-ops.c:188
+#: ../calendar/gui/e-cal-ops.c:1329
+#, fuzzy
+msgid "Creating a memo"
+msgstr "Ustvari _opomnik"
+
+#: ../calendar/gui/e-cal-model.c:1275 ../calendar/gui/e-cal-ops.c:192
+#: ../calendar/gui/e-cal-ops.c:1333
+#, fuzzy
+msgid "Creating a task"
+msgstr "Ustvari _nalogo"
+
+#: ../calendar/gui/e-cal-model.c:1645
 msgid "Recurring"
 msgstr "Ponavljajoče"
 
-#: ../calendar/gui/e-cal-model.c:1663
+#: ../calendar/gui/e-cal-model.c:1647
 msgid "Assigned"
 msgstr "Dodeljeno"
 
-#: ../calendar/gui/e-cal-model.c:1665 ../calendar/gui/e-cal-model-tasks.c:1163
+#: ../calendar/gui/e-cal-model.c:1649 ../calendar/gui/e-cal-model-tasks.c:1139
 #: ../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:1665 ../calendar/gui/e-cal-model-tasks.c:1163
+#: ../calendar/gui/e-cal-model.c:1649 ../calendar/gui/e-cal-model-tasks.c:1139
 #: ../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:3946
+#: ../calendar/gui/e-cal-model.c:3029
 #: ../calendar/gui/e-meeting-list-view.c:220
 #: ../calendar/gui/e-meeting-store.c:196 ../calendar/gui/e-meeting-store.c:219
-#: ../modules/itip-formatter/itip-view.c:6085
+#: ../modules/itip-formatter/itip-view.c:6185
 msgid "Accepted"
 msgstr "Sprejeto"
 
-#: ../calendar/gui/e-cal-model.c:3947
+#: ../calendar/gui/e-cal-model.c:3030
 #: ../calendar/gui/e-meeting-list-view.c:221
 #: ../calendar/gui/e-meeting-store.c:198 ../calendar/gui/e-meeting-store.c:221
-#: ../modules/itip-formatter/itip-view.c:6091
+#: ../modules/itip-formatter/itip-view.c:6191
 msgid "Declined"
 msgstr "Odklonjeno"
 
-#: ../calendar/gui/e-cal-model.c:3948
+#: ../calendar/gui/e-cal-model.c:3031
 #: ../calendar/gui/e-meeting-list-view.c:222
 #: ../calendar/gui/e-meeting-store.c:200 ../calendar/gui/e-meeting-store.c:223
-#: ../calendar/gui/e-meeting-time-sel.c:527
+#: ../calendar/gui/e-meeting-time-sel.c:529
 msgid "Tentative"
 msgstr "Poskusno"
 
-#: ../calendar/gui/e-cal-model.c:3949
+#: ../calendar/gui/e-cal-model.c:3032
 #: ../calendar/gui/e-meeting-list-view.c:223
 #: ../calendar/gui/e-meeting-store.c:202 ../calendar/gui/e-meeting-store.c:225
-#: ../modules/itip-formatter/itip-view.c:6094
+#: ../modules/itip-formatter/itip-view.c:6194
 msgid "Delegated"
 msgstr "Pooblaščeno zastopanje"
 
-#: ../calendar/gui/e-cal-model.c:3950
+#: ../calendar/gui/e-cal-model.c:3033
 msgid "Needs action"
 msgstr "Zahteva dejanje"
 
-#: ../calendar/gui/e-cal-model-calendar.c:124
-#: ../calendar/gui/e-task-table.c:630
+#: ../calendar/gui/e-cal-model-calendar.c:123
+#: ../calendar/gui/e-task-table.c:582
 msgid "Free"
 msgstr "Prosto"
 
-#: ../calendar/gui/e-cal-model-calendar.c:127
-#: ../calendar/gui/e-meeting-time-sel.c:528 ../calendar/gui/e-task-table.c:631
+#: ../calendar/gui/e-cal-model-calendar.c:126
+#: ../calendar/gui/e-meeting-time-sel.c:530 ../calendar/gui/e-task-table.c:583
 msgid "Busy"
 msgstr "Zasedeno"
 
@@ -4394,17 +4702,218 @@ msgctxt "cal-task-status"
 msgid "None"
 msgstr "Brez"
 
+#: ../calendar/gui/e-cal-ops.c:283
+msgid "Modifying an event"
+msgstr ""
+
+#: ../calendar/gui/e-cal-ops.c:287
+#, fuzzy
+msgid "Modifying a memo"
+msgstr "Manjka ime."
+
+#: ../calendar/gui/e-cal-ops.c:291
+msgid "Modifying a task"
+msgstr ""
+
+#: ../calendar/gui/e-cal-ops.c:387
+#, fuzzy
+msgid "Removing an event"
+msgstr "Odstranjevanje prilog"
+
+#: ../calendar/gui/e-cal-ops.c:391
+#, fuzzy
+msgid "Removing a memo"
+msgstr "Odstranjevanje prilog"
+
+#: ../calendar/gui/e-cal-ops.c:395
+#, fuzzy
+msgid "Removing a task"
+msgstr "Odstranjevanje prilog"
+
+#: ../calendar/gui/e-cal-ops.c:484
+#, fuzzy, c-format
+msgid "Deleting an event"
+msgid_plural "Deleting %d events"
+msgstr[0] "Podatki o srečanju so bili uspešno poslani"
+msgstr[1] "Podatki o srečanju so bili uspešno poslani"
+msgstr[2] "Podatki o srečanju so bili uspešno poslani"
+msgstr[3] "Podatki o srečanju so bili uspešno poslani"
+
+#: ../calendar/gui/e-cal-ops.c:488
+#, fuzzy, c-format
+msgid "Deleting a memo"
+msgid_plural "Deleting %d memos"
+msgstr[0] "Izbriši opomnik"
+msgstr[1] "Izbriši opomnik"
+msgstr[2] "Izbriši opomnik"
+msgstr[3] "Izbriši opomnik"
+
+#: ../calendar/gui/e-cal-ops.c:492
+#, fuzzy, c-format
+msgid "Deleting a task"
+msgid_plural "Deleting %d tasks"
+msgstr[0] "Izbriši nalogo"
+msgstr[1] "Izbriši nalogo"
+msgstr[2] "Izbriši nalogo"
+msgstr[3] "Izbriši nalogo"
+
+#: ../calendar/gui/e-cal-ops.c:692
+#, fuzzy, c-format
+msgid "Pasting an event"
+msgid_plural "Pasting %d events"
+msgstr[0] "Natisni ta dogodek"
+msgstr[1] "Natisni ta dogodek"
+msgstr[2] "Natisni ta dogodek"
+msgstr[3] "Natisni ta dogodek"
+
+#: ../calendar/gui/e-cal-ops.c:707
+#, fuzzy, c-format
+msgid "Pasting a memo"
+msgid_plural "Pasting %d memos"
+msgstr[0] "Natisni ta opomnik"
+msgstr[1] "Natisni ta opomnik"
+msgstr[2] "Natisni ta opomnik"
+msgstr[3] "Natisni ta opomnik"
+
+#: ../calendar/gui/e-cal-ops.c:722
+#, fuzzy, c-format
+msgid "Pasting a task"
+msgid_plural "Pasting %d tasks"
+msgstr[0] "Natisni to nalogo"
+msgstr[1] "Natisni to nalogo"
+msgstr[2] "Natisni to nalogo"
+msgstr[3] "Natisni to nalogo"
+
+#: ../calendar/gui/e-cal-ops.c:820
+#, fuzzy
+msgid "Updating an event"
+msgstr "Posodabljanje predmetov"
+
+#: ../calendar/gui/e-cal-ops.c:824
+#, fuzzy
+msgid "Updating a memo"
+msgstr "Posodabljanje predmetov"
+
+#: ../calendar/gui/e-cal-ops.c:828
+#, fuzzy
+msgid "Updating a task"
+msgstr "Posodabljanje predmetov"
+
+#: ../calendar/gui/e-cal-ops.c:933
+#, fuzzy, c-format
+msgid "Getting events to purge in the calendar '%s'"
+msgstr "Premikanje dogodka v koledar %s"
+
+#: ../calendar/gui/e-cal-ops.c:937
+#, fuzzy, c-format
+msgid "Getting memos to purge in the memo list '%s'"
+msgstr "Premikanje opomnika na seznam opomnikov '{0}'"
+
+#: ../calendar/gui/e-cal-ops.c:941
+#, fuzzy, c-format
+msgid "Getting tasks to purge in the task list '%s'"
+msgstr "Premikanje naloge na seznam nalog '{0}'"
+
+#: ../calendar/gui/e-cal-ops.c:962
+#, fuzzy, c-format
+msgid "Purging events in the calendar '%s'"
+msgstr "Premikanje dogodka v koledar %s"
+
+#: ../calendar/gui/e-cal-ops.c:966
+#, fuzzy, c-format
+msgid "Purging memos in the memo list '%s'"
+msgstr "Premikanje opomnika na seznam opomnikov '{0}'"
+
+#: ../calendar/gui/e-cal-ops.c:970
+#, fuzzy, c-format
+msgid "Purging tasks in the task list '%s'"
+msgstr "Premikanje naloge na seznam nalog '{0}'"
+
+#: ../calendar/gui/e-cal-ops.c:1068
+#, fuzzy
+msgid "Purging events"
+msgstr "Čiščenje"
+
+#: ../calendar/gui/e-cal-ops.c:1072
+#, fuzzy
+msgid "Purging memos"
+msgstr "Natisni opomnike"
+
+#: ../calendar/gui/e-cal-ops.c:1076
+#, fuzzy
+msgid "Purging tasks"
+msgstr "Natisni naloge"
+
+#: ../calendar/gui/e-cal-ops.c:1178
+#, fuzzy
+msgid "Expunging completed tasks"
+msgstr "Skrij končane naloge"
+
+#: ../calendar/gui/e-cal-ops.c:2034
+#, c-format
+msgid "Moving an event"
+msgid_plural "Moving %d events"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: ../calendar/gui/e-cal-ops.c:2035
+#, fuzzy, c-format
+msgid "Copying an event"
+msgid_plural "Copying %d events"
+msgstr[0] "Kopiranje predmetov"
+msgstr[1] "Kopiranje predmetov"
+msgstr[2] "Kopiranje predmetov"
+msgstr[3] "Kopiranje predmetov"
+
+#: ../calendar/gui/e-cal-ops.c:2041
+#, fuzzy, c-format
+msgid "Moving a memo"
+msgid_plural "Moving %d memos"
+msgstr[0] "Premikanje predmetov"
+msgstr[1] "Premikanje predmetov"
+msgstr[2] "Premikanje predmetov"
+msgstr[3] "Premikanje predmetov"
+
+#: ../calendar/gui/e-cal-ops.c:2042
+#, fuzzy, c-format
+msgid "Copying a memo"
+msgid_plural "Copying %d memos"
+msgstr[0] "Kopiranje predmetov"
+msgstr[1] "Kopiranje predmetov"
+msgstr[2] "Kopiranje predmetov"
+msgstr[3] "Kopiranje predmetov"
+
+#: ../calendar/gui/e-cal-ops.c:2048
+#, fuzzy, c-format
+msgid "Moving a task"
+msgid_plural "Moving %d tasks"
+msgstr[0] "Premikanje predmetov"
+msgstr[1] "Premikanje predmetov"
+msgstr[2] "Premikanje predmetov"
+msgstr[3] "Premikanje predmetov"
+
+#: ../calendar/gui/e-cal-ops.c:2049
+#, fuzzy, c-format
+msgid "Copying a task"
+msgid_plural "Copying %d tasks"
+msgstr[0] "Kopiranje predmetov"
+msgstr[1] "Kopiranje predmetov"
+msgstr[2] "Kopiranje predmetov"
+msgstr[3] "Kopiranje predmetov"
+
 #. strftime format of a weekday, a date and a time, 24-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:160
+#: ../calendar/gui/e-cell-date-edit-text.c:165
 msgid "%a %m/%d/%Y %H:%M:%S"
 msgstr "%a %d.%m.%Y %H.%M.%S"
 
 #. strftime format of a weekday, a date and a time, 12-hour.
-#: ../calendar/gui/e-cell-date-edit-text.c:163
+#: ../calendar/gui/e-cell-date-edit-text.c:168
 msgid "%a %m/%d/%Y %I:%M:%S %p"
 msgstr "%a %d.%m.%Y %H.%M.%S"
 
-#: ../calendar/gui/e-cell-date-edit-text.c:171
+#: ../calendar/gui/e-cell-date-edit-text.c:176
 #, c-format
 msgid ""
 "The date must be entered in the format: \n"
@@ -4414,16 +4923,16 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: ../calendar/gui/e-day-view.c:1988 ../calendar/gui/e-week-view.c:1540
+#: ../calendar/gui/e-day-view.c:2061 ../calendar/gui/e-week-view.c:1692
 #: ../calendar/gui/print.c:1073 ../calendar/gui/print.c:1092
-#: ../calendar/gui/print.c:2633 ../calendar/gui/print.c:2653
+#: ../calendar/gui/print.c:2622 ../calendar/gui/print.c:2642
 msgid "am"
 msgstr "dop"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: ../calendar/gui/e-day-view.c:1991 ../calendar/gui/e-week-view.c:1543
+#: ../calendar/gui/e-day-view.c:2064 ../calendar/gui/e-week-view.c:1695
 #: ../calendar/gui/print.c:1078 ../calendar/gui/print.c:1094
-#: ../calendar/gui/print.c:2638 ../calendar/gui/print.c:2655
+#: ../calendar/gui/print.c:2627 ../calendar/gui/print.c:2644
 msgid "pm"
 msgstr "pop"
 
@@ -4433,13 +4942,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:2781 ../calendar/gui/e-day-view-top-item.c:854
-#: ../calendar/gui/e-week-view-main-item.c:209 ../calendar/gui/print.c:2089
+#: ../calendar/gui/e-day-view.c:2910 ../calendar/gui/e-day-view-top-item.c:851
+#: ../calendar/gui/e-week-view-main-item.c:207 ../calendar/gui/print.c:2089
 msgid "%A %d %B"
 msgstr "%A %d %B"
 
 #. To Translators: the %d stands for a week number, it's value between 1 and 52/53
-#: ../calendar/gui/e-day-view.c:3445
+#: ../calendar/gui/e-day-view.c:3574
 #, c-format
 msgid "Week %d"
 msgstr "Teden %d"
@@ -4450,17 +4959,17 @@ msgstr "Teden %d"
 #. * day view, e.g. a day is displayed in
 #. * 24 "60 minute divisions" or
 #. * 48 "30 minute divisions".
-#: ../calendar/gui/e-day-view-time-item.c:800
+#: ../calendar/gui/e-day-view-time-item.c:802
 #, c-format
 msgid "%02i minute divisions"
 msgstr "%02i delitev minute"
 
-#: ../calendar/gui/e-day-view-time-item.c:825
+#: ../calendar/gui/e-day-view-time-item.c:827
 msgid "Show the second time zone"
 msgstr "Pokaži drug časovni pas"
 
 #. Translators: "None" indicates no second time zone set for a day view
-#: ../calendar/gui/e-day-view-time-item.c:842
+#: ../calendar/gui/e-day-view-time-item.c:844
 #: ../modules/calendar/e-calendar-preferences.c:305
 #: ../modules/calendar/e-calendar-preferences.c:357
 #: ../modules/calendar/e-calendar-preferences.ui.h:11
@@ -4468,7 +4977,7 @@ msgctxt "cal-second-zone"
 msgid "None"
 msgstr "Brez"
 
-#: ../calendar/gui/e-day-view-time-item.c:876
+#: ../calendar/gui/e-day-view-time-item.c:878
 #: ../calendar/gui/e-timezone-entry.c:323
 #: ../modules/calendar/e-calendar-preferences.c:388
 msgid "Select..."
@@ -4575,67 +5084,67 @@ msgstr "Vzrok napake: %s"
 msgid "Enter password"
 msgstr "Vnesite geslo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:529
+#: ../calendar/gui/e-meeting-time-sel.c:531
 msgid "Out of Office"
 msgstr "Izven pisarne"
 
-#: ../calendar/gui/e-meeting-time-sel.c:531
+#: ../calendar/gui/e-meeting-time-sel.c:533
 msgid "No Information"
 msgstr "Ni podatkov"
 
-#: ../calendar/gui/e-meeting-time-sel.c:566
+#: ../calendar/gui/e-meeting-time-sel.c:568
 msgid "O_ptions"
 msgstr "_Možnosti"
 
-#: ../calendar/gui/e-meeting-time-sel.c:586
+#: ../calendar/gui/e-meeting-time-sel.c:588
 msgid "Show _only working hours"
 msgstr "Pokaži le del_ovne ure"
 
-#: ../calendar/gui/e-meeting-time-sel.c:599
+#: ../calendar/gui/e-meeting-time-sel.c:601
 msgid "Show _zoomed out"
 msgstr "Pokaži _oddaljeno"
 
-#: ../calendar/gui/e-meeting-time-sel.c:617
+#: ../calendar/gui/e-meeting-time-sel.c:619
 msgid "_Update free/busy"
 msgstr "_Posodobi zasedenost"
 
-#: ../calendar/gui/e-meeting-time-sel.c:634
+#: ../calendar/gui/e-meeting-time-sel.c:636
 msgid "_<<"
 msgstr "_<<"
 
-#: ../calendar/gui/e-meeting-time-sel.c:654
+#: ../calendar/gui/e-meeting-time-sel.c:656
 msgid "_Autopick"
 msgstr "_Samodejno izberi"
 
-#: ../calendar/gui/e-meeting-time-sel.c:671
+#: ../calendar/gui/e-meeting-time-sel.c:673
 msgid ">_>"
 msgstr ">_>"
 
-#: ../calendar/gui/e-meeting-time-sel.c:692
+#: ../calendar/gui/e-meeting-time-sel.c:694
 msgid "_All people and resources"
 msgstr "Vsi ljudje in vs_a sredstva"
 
-#: ../calendar/gui/e-meeting-time-sel.c:703
+#: ../calendar/gui/e-meeting-time-sel.c:705
 msgid "All _people and one resource"
 msgstr "Vsi _ljudje in eno sredstvo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:714
+#: ../calendar/gui/e-meeting-time-sel.c:716
 msgid "_Required people"
 msgstr "Za_htevani ljudje"
 
-#: ../calendar/gui/e-meeting-time-sel.c:724
+#: ../calendar/gui/e-meeting-time-sel.c:726
 msgid "Required people and _one resource"
 msgstr "Zahtevani ljudje in _eno sredstvo"
 
-#: ../calendar/gui/e-meeting-time-sel.c:763
+#: ../calendar/gui/e-meeting-time-sel.c:765
 msgid "_Start time:"
 msgstr "_Začetni čas:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:792
+#: ../calendar/gui/e-meeting-time-sel.c:794
 msgid "_End time:"
 msgstr "_Končni čas:"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2660
+#: ../calendar/gui/e-meeting-time-sel.c:2659
 #, c-format
 msgid ""
 "Summary: %s\n"
@@ -4644,7 +5153,7 @@ msgstr ""
 "Povzetek: %s\n"
 "Mesto: %s"
 
-#: ../calendar/gui/e-meeting-time-sel.c:2662 ../calendar/gui/print.c:3525
+#: ../calendar/gui/e-meeting-time-sel.c:2661 ../calendar/gui/print.c:3516
 #, c-format
 msgid "Summary: %s"
 msgstr "Povzetek: %s"
@@ -4673,46 +5182,46 @@ msgstr "Splošno ime"
 msgid "Language"
 msgstr "Jezik"
 
-#: ../calendar/gui/e-memo-table.c:433
-#: ../modules/calendar/e-cal-shell-content.c:481
-#: ../modules/calendar/e-memo-shell-view-actions.c:211
-#: ../modules/calendar/e-memo-shell-view-actions.c:226
-#: ../modules/calendar/e-memo-shell-view.c:306
+#: ../calendar/gui/e-memo-table.c:371
+#: ../modules/calendar/e-cal-shell-content.c:1602
+#: ../modules/calendar/e-memo-shell-view-actions.c:180
+#: ../modules/calendar/e-memo-shell-view-actions.c:195
+#: ../modules/calendar/e-memo-shell-view.c:308
 msgid "Memos"
 msgstr "Opomniki"
 
-#: ../calendar/gui/e-memo-table.c:514 ../calendar/gui/e-task-table.c:802
+#: ../calendar/gui/e-memo-table.c:457 ../calendar/gui/e-task-table.c:759
 msgid "* No Summary *"
 msgstr "* Ni povzetka *"
 
 #. Translators: This is followed by an event's start date/time
-#: ../calendar/gui/e-memo-table.c:601 ../calendar/gui/e-task-table.c:886
+#: ../calendar/gui/e-memo-table.c:544 ../calendar/gui/e-task-table.c:843
 msgid "Start: "
 msgstr "Začetek: "
 
 #. Translators: This is followed by an event's due date/time
-#: ../calendar/gui/e-memo-table.c:620 ../calendar/gui/e-task-table.c:904
+#: ../calendar/gui/e-memo-table.c:563 ../calendar/gui/e-task-table.c:861
 msgid "Due: "
 msgstr "Datum zapadlosti: "
 
-#: ../calendar/gui/e-memo-table.c:741
+#: ../calendar/gui/e-memo-table.c:684
 msgid "Cut selected memos to the clipboard"
 msgstr "Izreži izbrane opomnike v odložišče"
 
-#: ../calendar/gui/e-memo-table.c:747
+#: ../calendar/gui/e-memo-table.c:690
 msgid "Copy selected memos to the clipboard"
 msgstr "Kopiraj izbrane opomnike v odložišče"
 
-#: ../calendar/gui/e-memo-table.c:753
+#: ../calendar/gui/e-memo-table.c:696
 msgid "Paste memos from the clipboard"
 msgstr "Prilepi opomnike iz odložišča"
 
-#: ../calendar/gui/e-memo-table.c:759
-#: ../modules/calendar/e-memo-shell-view-actions.c:588
+#: ../calendar/gui/e-memo-table.c:702
+#: ../modules/calendar/e-memo-shell-view-actions.c:531
 msgid "Delete selected memos"
 msgstr "Izbriši izbrane opomnike"
 
-#: ../calendar/gui/e-memo-table.c:765
+#: ../calendar/gui/e-memo-table.c:708
 msgid "Select all visible memos"
 msgstr "Izberi vse vidne opomnike"
 
@@ -4724,40 +5233,40 @@ msgstr "Kliknite za dodajanje opomnika"
 #. * %d is the actual value, %% is replaced with a percent sign.
 #. * Result values will be 0%, 10%, 20%, ... 100%
 #.
-#: ../calendar/gui/e-task-table.c:603
+#: ../calendar/gui/e-task-table.c:555
 #, c-format
 msgid "%d%%"
 msgstr "%d%%"
 
-#: ../calendar/gui/e-task-table.c:720 ../calendar/gui/print.c:2414
+#: ../calendar/gui/e-task-table.c:672 ../calendar/gui/print.c:2404
 #: ../calendar/importers/icalendar-importer.c:78
-#: ../calendar/importers/icalendar-importer.c:1072
-#: ../modules/calendar/e-calendar-preferences.ui.h:61
-#: ../modules/calendar/e-cal-shell-content.c:438
-#: ../modules/calendar/e-task-shell-view-actions.c:234
-#: ../modules/calendar/e-task-shell-view-actions.c:249
-#: ../modules/calendar/e-task-shell-view.c:461
+#: ../calendar/importers/icalendar-importer.c:1062
+#: ../modules/calendar/e-calendar-preferences.ui.h:62
+#: ../modules/calendar/e-cal-shell-content.c:1560
+#: ../modules/calendar/e-task-shell-view-actions.c:203
+#: ../modules/calendar/e-task-shell-view-actions.c:218
+#: ../modules/calendar/e-task-shell-view.c:466
 msgid "Tasks"
 msgstr "Naloge"
 
-#: ../calendar/gui/e-task-table.c:1039
+#: ../calendar/gui/e-task-table.c:999
 msgid "Cut selected tasks to the clipboard"
 msgstr "Izreži izbrane naloge v odložišče"
 
-#: ../calendar/gui/e-task-table.c:1045
+#: ../calendar/gui/e-task-table.c:1005
 msgid "Copy selected tasks to the clipboard"
 msgstr "Kopiraj izbrane naloge v odložišče"
 
-#: ../calendar/gui/e-task-table.c:1051
+#: ../calendar/gui/e-task-table.c:1011
 msgid "Paste tasks from the clipboard"
 msgstr "Prilepi naloge iz odložišča"
 
-#: ../calendar/gui/e-task-table.c:1057
-#: ../modules/calendar/e-task-shell-view-actions.c:712
+#: ../calendar/gui/e-task-table.c:1017
+#: ../modules/calendar/e-task-shell-view-actions.c:656
 msgid "Delete selected tasks"
 msgstr "Izbriši izbrane naloge"
 
-#: ../calendar/gui/e-task-table.c:1063
+#: ../calendar/gui/e-task-table.c:1023
 msgid "Select all visible tasks"
 msgstr "Izberi vse vidne naloge"
 
@@ -4768,14 +5277,10 @@ msgstr "Izberi časovni pas"
 #. strftime format %d = day of month, %B = full
 #. * month name. You can change the order but don't
 #. * change the specifiers or add anything.
-#: ../calendar/gui/e-week-view-main-item.c:226 ../calendar/gui/print.c:2068
+#: ../calendar/gui/e-week-view-main-item.c:224 ../calendar/gui/print.c:2068
 msgid "%d %B"
 msgstr "%d %B"
 
-#: ../calendar/gui/gnome-cal.c:2371
-msgid "Purging"
-msgstr "Čiščenje"
-
 #: ../calendar/gui/itip-utils.c:649 ../calendar/gui/itip-utils.c:707
 #: ../calendar/gui/itip-utils.c:841
 msgid "An organizer must be set."
@@ -4885,140 +5390,156 @@ msgstr "Podatki o zasedenosti (%s do %s)"
 msgid "iCalendar information"
 msgstr "Podrobnosti iCalendar"
 
-#: ../calendar/gui/itip-utils.c:1147
+#: ../calendar/gui/itip-utils.c:1148
+#, c-format
 msgid "Unable to book a resource, the new event collides with some other."
 msgstr "Ni mogoče rezervirati vira. Nov dogodek je v sporu z drugimi dogodki."
 
-#: ../calendar/gui/itip-utils.c:1155
-#, c-format
-msgid "Unable to book a resource, error: %s"
+#: ../calendar/gui/itip-utils.c:1153
+#, fuzzy
+msgid "Unable to book a resource, error: "
 msgstr "Ni mogoče rezervirati vira, napaka: %s"
 
-#: ../calendar/gui/itip-utils.c:1327
+#: ../calendar/gui/itip-utils.c:1324
 msgid "You must be an attendee of the event."
 msgstr "Biti morate udeleženec dogodka."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/itip-utils.c:1917
+#, fuzzy
+msgid "Sending an event"
+msgstr "Pošiljanje sporočila"
+
+#: ../calendar/gui/itip-utils.c:1921
+#, fuzzy
+msgid "Sending a memo"
+msgstr "Pošiljanje sporočila"
+
+#: ../calendar/gui/itip-utils.c:1925
+#, fuzzy
+msgid "Sending a task"
+msgstr "Pošiljanje elektronske pošte"
+
+#: ../calendar/gui/print.c:664
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/gui/print.c:660
+#: ../calendar/gui/print.c:664
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/gui/print.c:661
+#: ../calendar/gui/print.c:665
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/gui/print.c:662
+#: ../calendar/gui/print.c:666
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/gui/print.c:663
+#: ../calendar/gui/print.c:667
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/gui/print.c:664
+#: ../calendar/gui/print.c:668
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/gui/print.c:665
+#: ../calendar/gui/print.c:669
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/gui/print.c:666
+#: ../calendar/gui/print.c:670
 msgid "31st"
 msgstr "31."
 
@@ -5026,102 +5547,102 @@ msgstr "31."
 #. * e.g. Su=Sunday and Th=thursday
 #. G_DATE_BAD_WEEKDAY
 #. G_DATE_MONDAY
-#: ../calendar/gui/print.c:726
+#: ../calendar/gui/print.c:730
 msgid "Mo"
 msgstr "po"
 
 #. G_DATE_TUESDAY
-#: ../calendar/gui/print.c:727
+#: ../calendar/gui/print.c:731
 msgid "Tu"
 msgstr "to"
 
 #. G_DATE_WEDNESDAY
-#: ../calendar/gui/print.c:728
+#: ../calendar/gui/print.c:732
 msgid "We"
 msgstr "sr"
 
 #. G_DATE_THURSDAY
-#: ../calendar/gui/print.c:729
+#: ../calendar/gui/print.c:733
 msgid "Th"
 msgstr "če"
 
 #. G_DATE_FRIDAY
-#: ../calendar/gui/print.c:730
+#: ../calendar/gui/print.c:734
 msgid "Fr"
 msgstr "pe"
 
 #. G_DATE_SATURDAY
-#: ../calendar/gui/print.c:731
+#: ../calendar/gui/print.c:735
 msgid "Sa"
 msgstr "so"
 
 #. G_DATE_SUNDAY
-#: ../calendar/gui/print.c:732
+#: ../calendar/gui/print.c:736
 msgid "Su"
 msgstr "ne"
 
 #. Translators: This is part of "START to END" text,
 #. * where START and END are date/times.
-#: ../calendar/gui/print.c:3319
+#: ../calendar/gui/print.c:3309
 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:3329
+#: ../calendar/gui/print.c:3319
 msgid " (Completed "
 msgstr " (Končano "
 
 #. Translators: This is part of "Completed COMPLETED",
 #. * where COMPLETED is a completed date/time.
-#: ../calendar/gui/print.c:3335
+#: ../calendar/gui/print.c:3325
 msgid "Completed "
 msgstr "Končano "
 
 #. Translators: This is part of "START (Due DUE)",
 #. * where START and DUE are dates/times.
-#: ../calendar/gui/print.c:3345
+#: ../calendar/gui/print.c:3335
 msgid " (Due "
 msgstr " (Datum zapadlosti "
 
 #. Translators: This is part of "Due DUE",
 #. * where DUE is a date/time due the event
 #. * should be finished.
-#: ../calendar/gui/print.c:3352
+#: ../calendar/gui/print.c:3342
 msgid "Due "
 msgstr "Datum zapadlosti "
 
-#: ../calendar/gui/print.c:3555
+#: ../calendar/gui/print.c:3546
 msgid "Attendees: "
 msgstr "Navzoči: "
 
-#: ../calendar/gui/print.c:3599
+#: ../calendar/gui/print.c:3590
 #, c-format
 msgid "Status: %s"
 msgstr "Stanje: %s"
 
-#: ../calendar/gui/print.c:3615
+#: ../calendar/gui/print.c:3606
 #, c-format
 msgid "Priority: %s"
 msgstr "Prednost: %s"
 
-#: ../calendar/gui/print.c:3633
+#: ../calendar/gui/print.c:3624
 #, c-format
 msgid "Percent Complete: %i"
 msgstr "Odstotkov opravljeno: %i"
 
-#: ../calendar/gui/print.c:3647
+#: ../calendar/gui/print.c:3638
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../calendar/gui/print.c:3661
+#: ../calendar/gui/print.c:3652
 #, c-format
 msgid "Categories: %s"
 msgstr "Kategorije: %s"
 
-#: ../calendar/gui/print.c:3672
+#: ../calendar/gui/print.c:3663
 msgid "Contacts: "
 msgstr "Stiki: "
 
@@ -5134,11 +5655,13 @@ msgstr "V teku"
 msgid "% Completed"
 msgstr "% končano"
 
-#: ../calendar/gui/tasktypes.xml.h:26 ../mail/em-filter-i18n.h:69
+#: ../calendar/gui/tasktypes.xml.h:26 ../mail/filtertypes.xml.in.h:31
+#: ../mail/searchtypes.xml.in.h:33 ../mail/vfoldertypes.xml.in.h:33
 msgid "is greater than"
 msgstr "je večje kot"
 
-#: ../calendar/gui/tasktypes.xml.h:27 ../mail/em-filter-i18n.h:70
+#: ../calendar/gui/tasktypes.xml.h:27 ../mail/filtertypes.xml.in.h:32
+#: ../mail/searchtypes.xml.in.h:34 ../mail/vfoldertypes.xml.in.h:34
 msgid "is less than"
 msgstr "je manjše kot"
 
@@ -5146,177 +5669,181 @@ msgstr "je manjše kot"
 msgid "Appointments and Meetings"
 msgstr "Sestanki in srečanja"
 
-#: ../calendar/importers/icalendar-importer.c:462
-#: ../calendar/importers/icalendar-importer.c:901
+#: ../calendar/importers/icalendar-importer.c:452
+#: ../calendar/importers/icalendar-importer.c:891
 msgid "Opening calendar"
 msgstr "Odpiranje koledarja"
 
-#: ../calendar/importers/icalendar-importer.c:610
+#: ../calendar/importers/icalendar-importer.c:600
 msgid "iCalendar files (.ics)"
 msgstr "Datoteke iCalendar (.ics)"
 
-#: ../calendar/importers/icalendar-importer.c:611
+#: ../calendar/importers/icalendar-importer.c:601
 msgid "Evolution iCalendar importer"
 msgstr "Uvoznik Evolution iCalendar"
 
-#: ../calendar/importers/icalendar-importer.c:703
+#: ../calendar/importers/icalendar-importer.c:693
 msgid "Reminder!"
 msgstr "Opomnik!"
 
-#: ../calendar/importers/icalendar-importer.c:787
+#: ../calendar/importers/icalendar-importer.c:777
 msgid "vCalendar files (.vcs)"
 msgstr "Datoteke vCalendar (.vcf)"
 
-#: ../calendar/importers/icalendar-importer.c:788
+#: ../calendar/importers/icalendar-importer.c:778
 msgid "Evolution vCalendar importer"
 msgstr "Uvoznik Evolution vCalendar"
 
-#: ../calendar/importers/icalendar-importer.c:1065
+#: ../calendar/importers/icalendar-importer.c:1055
 msgid "Calendar Events"
 msgstr "Dogodki koledarja"
 
-#: ../calendar/importers/icalendar-importer.c:1109
+#: ../calendar/importers/icalendar-importer.c:1098
+msgid "Gnome Calendar"
+msgstr "Gnome Koledar"
+
+#: ../calendar/importers/icalendar-importer.c:1099
 msgid "Evolution Calendar intelligent importer"
 msgstr "Pametni uvoznik koledarja Evolutiona"
 
-#: ../calendar/importers/icalendar-importer.c:1180
-#: ../calendar/importers/icalendar-importer.c:1494
+#: ../calendar/importers/icalendar-importer.c:1170
+#: ../calendar/importers/icalendar-importer.c:1484
 msgctxt "iCalImp"
 msgid "Meeting"
 msgstr "Srečanje"
 
-#: ../calendar/importers/icalendar-importer.c:1180
-#: ../calendar/importers/icalendar-importer.c:1494
+#: ../calendar/importers/icalendar-importer.c:1170
+#: ../calendar/importers/icalendar-importer.c:1484
 msgctxt "iCalImp"
 msgid "Event"
 msgstr "Dogodek"
 
-#: ../calendar/importers/icalendar-importer.c:1183
-#: ../calendar/importers/icalendar-importer.c:1495
+#: ../calendar/importers/icalendar-importer.c:1173
+#: ../calendar/importers/icalendar-importer.c:1485
 msgctxt "iCalImp"
 msgid "Task"
 msgstr "Naloga"
 
-#: ../calendar/importers/icalendar-importer.c:1186
-#: ../calendar/importers/icalendar-importer.c:1496
+#: ../calendar/importers/icalendar-importer.c:1176
+#: ../calendar/importers/icalendar-importer.c:1486
 msgctxt "iCalImp"
 msgid "Memo"
 msgstr "Opomnik"
 
-#: ../calendar/importers/icalendar-importer.c:1195
+#: ../calendar/importers/icalendar-importer.c:1185
 msgctxt "iCalImp"
 msgid "has recurrences"
 msgstr "ima ponavljanja"
 
-#: ../calendar/importers/icalendar-importer.c:1200
+#: ../calendar/importers/icalendar-importer.c:1190
 msgctxt "iCalImp"
 msgid "is an instance"
 msgstr "je primerek"
 
-#: ../calendar/importers/icalendar-importer.c:1205
+#: ../calendar/importers/icalendar-importer.c:1195
 msgctxt "iCalImp"
 msgid "has reminders"
 msgstr "ima opomnike"
 
-#: ../calendar/importers/icalendar-importer.c:1210
+#: ../calendar/importers/icalendar-importer.c:1200
 msgctxt "iCalImp"
 msgid "has attachments"
 msgstr "ima priloge"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1223
+#: ../calendar/importers/icalendar-importer.c:1213
 msgctxt "iCalImp"
 msgid "Public"
 msgstr "Javno"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1226
+#: ../calendar/importers/icalendar-importer.c:1216
 msgctxt "iCalImp"
 msgid "Private"
 msgstr "Zasebno"
 
 #. Translators: Appointment's classification
-#: ../calendar/importers/icalendar-importer.c:1229
+#: ../calendar/importers/icalendar-importer.c:1219
 msgctxt "iCalImp"
 msgid "Confidential"
 msgstr "Zaupno"
 
 #. Translators: Appointment's classification section name
-#: ../calendar/importers/icalendar-importer.c:1233
+#: ../calendar/importers/icalendar-importer.c:1223
 msgctxt "iCalImp"
 msgid "Classification"
 msgstr "Razvrstitev"
 
 #. Translators: Appointment's summary
-#: ../calendar/importers/icalendar-importer.c:1238
-#: ../calendar/importers/icalendar-importer.c:1538
+#: ../calendar/importers/icalendar-importer.c:1228
+#: ../calendar/importers/icalendar-importer.c:1528
 msgctxt "iCalImp"
 msgid "Summary"
 msgstr "Povzetek"
 
 #. Translators: Appointment's location
-#: ../calendar/importers/icalendar-importer.c:1244
+#: ../calendar/importers/icalendar-importer.c:1234
 msgctxt "iCalImp"
 msgid "Location"
 msgstr "Mesto"
 
 #. Translators: Appointment's start time
-#: ../calendar/importers/icalendar-importer.c:1252
-#: ../calendar/importers/icalendar-importer.c:1533
+#: ../calendar/importers/icalendar-importer.c:1242
+#: ../calendar/importers/icalendar-importer.c:1523
 msgctxt "iCalImp"
 msgid "Start"
 msgstr "Začetek"
 
 #. Translators: 'Due' like the time due a task should be finished
-#: ../calendar/importers/icalendar-importer.c:1263
+#: ../calendar/importers/icalendar-importer.c:1253
 msgctxt "iCalImp"
 msgid "Due"
 msgstr "Datum zakasnelosti"
 
 #. Translators: Appointment's end time
-#: ../calendar/importers/icalendar-importer.c:1275
+#: ../calendar/importers/icalendar-importer.c:1265
 msgctxt "iCalImp"
 msgid "End"
 msgstr "Konec"
 
 #. Translators: Appointment's categories
-#: ../calendar/importers/icalendar-importer.c:1285
+#: ../calendar/importers/icalendar-importer.c:1275
 msgctxt "iCalImp"
 msgid "Categories"
 msgstr "Kategorije"
 
 #. Translators: Appointment's complete value (either percentage, or a date/time of a completion)
-#: ../calendar/importers/icalendar-importer.c:1309
+#: ../calendar/importers/icalendar-importer.c:1299
 msgctxt "iCalImp"
 msgid "Completed"
 msgstr "Končano"
 
 #. Translators: Appointment's URL
-#: ../calendar/importers/icalendar-importer.c:1317
+#: ../calendar/importers/icalendar-importer.c:1307
 msgctxt "iCalImp"
 msgid "URL"
 msgstr "URL"
 
 #. Translators: Appointment's organizer
-#: ../calendar/importers/icalendar-importer.c:1328
-#: ../calendar/importers/icalendar-importer.c:1331
+#: ../calendar/importers/icalendar-importer.c:1318
+#: ../calendar/importers/icalendar-importer.c:1321
 msgctxt "iCalImp"
 msgid "Organizer"
 msgstr "Organizator"
 
 #. Translators: Appointment's attendees
-#: ../calendar/importers/icalendar-importer.c:1351
-#: ../calendar/importers/icalendar-importer.c:1354
+#: ../calendar/importers/icalendar-importer.c:1341
+#: ../calendar/importers/icalendar-importer.c:1344
 msgctxt "iCalImp"
 msgid "Attendees"
 msgstr "Udeleženci"
 
-#: ../calendar/importers/icalendar-importer.c:1368
+#: ../calendar/importers/icalendar-importer.c:1358
 msgctxt "iCalImp"
 msgid "Description"
 msgstr "Opis"
 
-#: ../calendar/importers/icalendar-importer.c:1528
+#: ../calendar/importers/icalendar-importer.c:1518
 msgctxt "iCalImp"
 msgid "Type"
 msgstr "Vrsta"
@@ -6868,150 +7395,185 @@ msgstr "Tihi_ocean/Wallis"
 msgid "Pacific/Yap"
 msgstr "Tihi_ocean/Yap"
 
-#: ../composer/e-composer-actions.c:202
+#: ../composer/e-composer-actions.c:63 ../mail/em-utils.c:131
+#: ../modules/mailto-handler/evolution-mailto-handler.c:148
+msgid "_Do not show this message again"
+msgstr "_Ne pokaži več tega sporočila"
+
+#: ../composer/e-composer-actions.c:265
 msgid "Save as..."
 msgstr "Shrani kot ..."
 
-#: ../composer/e-composer-actions.c:277
+#: ../composer/e-composer-actions.c:389
 msgid "Close the current file"
 msgstr "Zapri trenutno datoteko"
 
-#: ../composer/e-composer-actions.c:282
+#: ../composer/e-composer-actions.c:394
 msgid "New _Message"
 msgstr "Novo _sporočilo"
 
-#: ../composer/e-composer-actions.c:284
+#: ../composer/e-composer-actions.c:396
 msgid "Open New Message window"
 msgstr "Odpre okno novega sporočila"
 
-#: ../composer/e-composer-actions.c:289 ../shell/e-shell-window-actions.c:979
+#: ../composer/e-composer-actions.c:401 ../shell/e-shell-window-actions.c:978
 msgid "_Preferences"
 msgstr "_Možnosti"
 
-#: ../composer/e-composer-actions.c:291 ../shell/e-shell-window-actions.c:981
+#: ../composer/e-composer-actions.c:403 ../shell/e-shell-window-actions.c:980
 msgid "Configure Evolution"
 msgstr "Nastavitve programa Evolution"
 
-#: ../composer/e-composer-actions.c:298
+#: ../composer/e-composer-actions.c:410
 msgid "Save the current file"
 msgstr "Shrani trenutno datoteko"
 
-#: ../composer/e-composer-actions.c:303
+#: ../composer/e-composer-actions.c:415
 msgid "Save _As..."
 msgstr "Shrani _kot ..."
 
-#: ../composer/e-composer-actions.c:305
+#: ../composer/e-composer-actions.c:417
 msgid "Save the current file with a different name"
 msgstr "Shrani trenutno datoteko z drugim imenom"
 
-#: ../composer/e-composer-actions.c:312
+#: ../composer/e-composer-actions.c:424
 msgid "Character _Encoding"
 msgstr "Znakovno _kodiranje"
 
-#: ../composer/e-composer-actions.c:336
+#: ../composer/e-composer-actions.c:448
 msgid "Print Pre_view"
 msgstr "Predogled _tiskanja"
 
-#: ../composer/e-composer-actions.c:343
+#: ../composer/e-composer-actions.c:455
 msgid "Save as _Draft"
 msgstr "Shrani kot _osnutek"
 
-#: ../composer/e-composer-actions.c:345
+#: ../composer/e-composer-actions.c:457
 msgid "Save as draft"
 msgstr "Shrani kot osnutek"
 
-#: ../composer/e-composer-actions.c:350
+#: ../composer/e-composer-actions.c:462
 msgid "S_end"
 msgstr "_Pošlji"
 
-#: ../composer/e-composer-actions.c:352
+#: ../composer/e-composer-actions.c:464
 msgid "Send this message"
 msgstr "Pošlje to sporočilo"
 
-#: ../composer/e-composer-actions.c:360
+#: ../composer/e-composer-actions.c:472
 msgid "PGP _Encrypt"
 msgstr "Šifriraj s _PGP"
 
-#: ../composer/e-composer-actions.c:362
+#: ../composer/e-composer-actions.c:474
 msgid "Encrypt this message with PGP"
 msgstr "Šifrira to sporočilo s PGP"
 
-#: ../composer/e-composer-actions.c:368
+#: ../composer/e-composer-actions.c:480
 msgid "PGP _Sign"
 msgstr "_Podpiši s PGP"
 
-#: ../composer/e-composer-actions.c:370
+#: ../composer/e-composer-actions.c:482
 msgid "Sign this message with your PGP key"
 msgstr "Podpiše to sporočilo z vašim ključem PGP"
 
-#: ../composer/e-composer-actions.c:376
+#: ../composer/e-composer-actions.c:488
 msgid "_Picture Gallery"
 msgstr "_Galerija slik"
 
-#: ../composer/e-composer-actions.c:378
+#: ../composer/e-composer-actions.c:490
 msgid "Show a collection of pictures that you can drag to your message"
 msgstr "Pokaži zbirko slik, ki jih lahko povlečete v svoje sporočilo"
 
-#: ../composer/e-composer-actions.c:384
+#: ../composer/e-composer-actions.c:496
 msgid "_Prioritize Message"
 msgstr "Naredi sporočilo _prednostno"
 
-#: ../composer/e-composer-actions.c:386
+#: ../composer/e-composer-actions.c:498
 msgid "Set the message priority to high"
 msgstr "Nastavi prednost sporočila na visoko"
 
-#: ../composer/e-composer-actions.c:392
+#: ../composer/e-composer-actions.c:504
 msgid "Re_quest Read Receipt"
 msgstr "Zaht_evaj povratnico"
 
-#: ../composer/e-composer-actions.c:394
+#: ../composer/e-composer-actions.c:506
 msgid "Get delivery notification when your message is read"
 msgstr "Dobi obvestilo o dostavi, ko je vaše sporočilo prebrano"
 
-#: ../composer/e-composer-actions.c:400
+#: ../composer/e-composer-actions.c:512
 msgid "S/MIME En_crypt"
 msgstr "_Šifriraj s S/MIME"
 
-#: ../composer/e-composer-actions.c:402
+#: ../composer/e-composer-actions.c:514
 msgid "Encrypt this message with your S/MIME Encryption Certificate"
 msgstr "Šifrira to sporočilo z vašim šifrirnim potrdilom S/MIME"
 
-#: ../composer/e-composer-actions.c:408
+#: ../composer/e-composer-actions.c:520
 msgid "S/MIME Sig_n"
 msgstr "Podpis _s S/MIME"
 
-#: ../composer/e-composer-actions.c:410
+#: ../composer/e-composer-actions.c:522
 msgid "Sign this message with your S/MIME Signature Certificate"
 msgstr "Podpiši to sporočilo s svojim potrdilom podpisa S/MIME"
 
-#: ../composer/e-composer-actions.c:416
+#: ../composer/e-composer-actions.c:576
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
+#, fuzzy
+msgid "Unicode smileys"
+msgstr "Unicode"
+
+#: ../composer/e-composer-actions.c:578
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
+msgid "Use Unicode characters for smileys."
+msgstr ""
+
+#: ../composer/e-composer-actions.c:584
 msgid "_Bcc Field"
 msgstr "Polje _Skp"
 
-#: ../composer/e-composer-actions.c:418
+#: ../composer/e-composer-actions.c:586
 msgid "Toggles whether the BCC field is displayed"
 msgstr "Preklopi prikaz polja SKP"
 
-#: ../composer/e-composer-actions.c:424
+#: ../composer/e-composer-actions.c:592
 msgid "_Cc Field"
 msgstr "Polje _Kp"
 
-#: ../composer/e-composer-actions.c:426
+#: ../composer/e-composer-actions.c:594
 msgid "Toggles whether the CC field is displayed"
 msgstr "Preklopi prikaz polja KP"
 
-#: ../composer/e-composer-actions.c:432
+#: ../composer/e-composer-actions.c:600
+msgid "_From Override Field"
+msgstr ""
+
+#: ../composer/e-composer-actions.c:602
+#, fuzzy
+msgid ""
+"Toggles whether the From override field to change name or email address is "
+"displayed"
+msgstr "Preklopi prikaz polja Vloga"
+
+#: ../composer/e-composer-actions.c:608
 msgid "_Reply-To Field"
 msgstr "Polje o_dgovori-na"
 
-#: ../composer/e-composer-actions.c:434
+#: ../composer/e-composer-actions.c:610
 msgid "Toggles whether the Reply-To field is displayed"
 msgstr "Preklopi prikaz polja Odgovori na"
 
-#: ../composer/e-composer-actions.c:493
+#: ../composer/e-composer-actions.c:671
 msgid "Save Draft"
 msgstr "Shrani osnutek"
 
+#: ../composer/e-composer-from-header.c:109
+#: ../e-util/e-mail-signature-script-dialog.c:415
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
+#: ../mail/e-mail-config-identity-page.c:327
+#: ../mail/e-mail-config-summary-page.c:339
+msgid "_Name:"
+msgstr "_Ime:"
+
 #: ../composer/e-composer-header-table.c:38
 msgid "Enter the recipients of the message"
 msgstr "Vnesite prejemnike sporočila"
@@ -7028,48 +7590,48 @@ msgstr ""
 "Vnesite naslove, ki bodo prejeli kopijo sporočila, vendar se ne bodo "
 "pojavili na seznamu prejemnikov sporočila"
 
-#: ../composer/e-composer-header-table.c:771
+#: ../composer/e-composer-header-table.c:793
 msgid "Fr_om:"
 msgstr "_Od:"
 
-#: ../composer/e-composer-header-table.c:778
+#: ../composer/e-composer-header-table.c:800
 msgid "_Reply-To:"
 msgstr "Odgovori-_na:"
 
-#: ../composer/e-composer-header-table.c:783
+#: ../composer/e-composer-header-table.c:805
 msgid "_To:"
 msgstr "_Za:"
 
-#: ../composer/e-composer-header-table.c:789
+#: ../composer/e-composer-header-table.c:811
 msgid "_Cc:"
 msgstr "_Kp:"
 
-#: ../composer/e-composer-header-table.c:795
+#: ../composer/e-composer-header-table.c:817
 msgid "_Bcc:"
 msgstr "_Skp:"
 
-#: ../composer/e-composer-header-table.c:800
+#: ../composer/e-composer-header-table.c:822
 msgid "_Post To:"
 msgstr "_Objavi na:"
 
-#: ../composer/e-composer-header-table.c:804
+#: ../composer/e-composer-header-table.c:826
 msgid "S_ubject:"
 msgstr "Z_adeva:"
 
-#: ../composer/e-composer-header-table.c:812
-#: ../mail/e-mail-config-identity-page.c:488
+#: ../composer/e-composer-header-table.c:834
+#: ../mail/e-mail-config-identity-page.c:505
 msgid "Si_gnature:"
 msgstr "_Podpis:"
 
-#: ../composer/e-composer-name-header.c:234
+#: ../composer/e-composer-name-header.c:233
 msgid "Click here for the address book"
 msgstr "Kliknite tukaj za imenik"
 
-#: ../composer/e-composer-post-header.c:183
+#: ../composer/e-composer-post-header.c:182
 msgid "Click here to select folders to post to"
 msgstr "Kliknite tukaj za izbiro map za objavljanje"
 
-#: ../composer/e-msg-composer.c:879
+#: ../composer/e-msg-composer.c:871
 #, c-format
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
@@ -7077,7 +7639,7 @@ msgstr ""
 "Odhodnega sporočila ni mogoče podpisati: za ta račun ni nastavljeno nobeno "
 "potrdilo za podpisovanje"
 
-#: ../composer/e-msg-composer.c:888
+#: ../composer/e-msg-composer.c:880
 #, c-format
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
@@ -7086,19 +7648,15 @@ msgstr ""
 "Odhodnega sporočila ni mogoče šifrirati: za ta račun ni nastavljeno nobeno "
 "potrdilo za šifriranje"
 
-#: ../composer/e-msg-composer.c:1569 ../composer/e-msg-composer.c:1981
+#: ../composer/e-msg-composer.c:1594 ../composer/e-msg-composer.c:2280
 msgid "Compose Message"
 msgstr "Sestavi sporočilo"
 
-#: ../composer/e-msg-composer.c:4243
+#: ../composer/e-msg-composer.c:4568
 msgid "The composer contains a non-text message body, which cannot be edited."
 msgstr ""
 "Sestavljalnik vsebuje nebesedilno telo sporočila, ki ga ni mogoče urejati."
 
-#: ../composer/e-msg-composer.c:4943
-msgid "Untitled Message"
-msgstr "Neimenovano sporočilo"
-
 #: ../composer/mail-composer.error.xml.h:1
 msgid "You cannot attach the file &quot;{0}&quot; to this message."
 msgstr "Sporočilu ni mogoče priložiti datoteke &quot;{0}&quot;."
@@ -7185,39 +7743,45 @@ msgid "_Save Draft"
 msgstr "_Shrani osnutek"
 
 #: ../composer/mail-composer.error.xml.h:20
+#, fuzzy
+msgid "Are you sure you want to discard the message you are composing?"
+msgstr ""
+"Ali ste prepričani, da želite prezreti sporočilo '{0}', ki ga sestavljate?"
+
+#: ../composer/mail-composer.error.xml.h:21
 msgid "Could not create message."
 msgstr "Ni mogoče ustvariti sporočila."
 
-#: ../composer/mail-composer.error.xml.h:21
+#: ../composer/mail-composer.error.xml.h:22
 msgid "Because &quot;{0}&quot;, you may need to select different mail options."
 msgstr ""
 "Zaradi &quot;{0}&quot;, boste morda morali izbrati drugačne možnosti pošte."
 
-#: ../composer/mail-composer.error.xml.h:22
+#: ../composer/mail-composer.error.xml.h:23
 msgid "Could not read signature file &quot;{0}&quot;."
 msgstr "Ni mogoče prebrati datoteke podpisa &quot;{0}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:23
+#: ../composer/mail-composer.error.xml.h:24
 msgid "All accounts have been removed."
 msgstr "Vsi računi so bili odstranjeni."
 
-#: ../composer/mail-composer.error.xml.h:24
+#: ../composer/mail-composer.error.xml.h:25
 msgid "You need to configure an account before you can compose mail."
 msgstr "Pred sestavljanjem pošte morate nastaviti račun."
 
-#: ../composer/mail-composer.error.xml.h:25
+#: ../composer/mail-composer.error.xml.h:26
 msgid "An error occurred while saving to your Outbox folder."
 msgstr "Prišlo je do napake med shranjevanjem v vašo mapo odhodne pošte."
 
-#: ../composer/mail-composer.error.xml.h:26
+#: ../composer/mail-composer.error.xml.h:27
 msgid "The reported error was &quot;{0}&quot;. The message has not been sent."
 msgstr "Javljena napaka je &quot;{0}&quot;. Sporočilo ni bilo poslano."
 
-#: ../composer/mail-composer.error.xml.h:27
+#: ../composer/mail-composer.error.xml.h:28
 msgid "An error occurred while saving to your Drafts folder."
 msgstr "Prišlo je do napake med shranjevanjem v mapo Osnutki"
 
-#: ../composer/mail-composer.error.xml.h:28
+#: ../composer/mail-composer.error.xml.h:29
 msgid ""
 "The reported error was &quot;{0}&quot;. The message has most likely not been "
 "saved."
@@ -7225,31 +7789,31 @@ msgstr ""
 "Javljena napaka je &quot;{0}&quot;. Sporočilo najverjetneje ni bilo "
 "shranjeno."
 
-#: ../composer/mail-composer.error.xml.h:29
+#: ../composer/mail-composer.error.xml.h:30
 msgid "An error occurred while sending. How do you want to proceed?"
 msgstr "Prišlo je do napake med pošiljanje. Kako želite nadaljevati?"
 
-#: ../composer/mail-composer.error.xml.h:30 ../mail/mail.error.xml.h:156
+#: ../composer/mail-composer.error.xml.h:31 ../mail/mail.error.xml.h:163
 msgid "The reported error was &quot;{0}&quot;."
 msgstr "Poročana napaka je bila &quot;{0}&quot;."
 
-#: ../composer/mail-composer.error.xml.h:31
+#: ../composer/mail-composer.error.xml.h:32
 msgid "_Save to Outbox"
 msgstr "_Shrani v mapo odhodne pošte"
 
-#: ../composer/mail-composer.error.xml.h:32
+#: ../composer/mail-composer.error.xml.h:33
 msgid "_Try Again"
 msgstr "_Poskusi znova"
 
-#: ../composer/mail-composer.error.xml.h:33
+#: ../composer/mail-composer.error.xml.h:34
 msgid "Your message was sent, but an error occurred during post-processing."
 msgstr "Vaše sporočilo je poslano, vendar je prišlo do napake med po-obdelavo."
 
-#: ../composer/mail-composer.error.xml.h:34
+#: ../composer/mail-composer.error.xml.h:35
 msgid "Saving message to Outbox."
 msgstr "Shranjevanje sporočila v mapo odhodne pošte."
 
-#: ../composer/mail-composer.error.xml.h:35
+#: ../composer/mail-composer.error.xml.h:36
 msgid ""
 "The message will be saved to your local Outbox folder, because the "
 "destination service is currently unavailable. You can send the message by "
@@ -7259,6 +7823,17 @@ msgstr ""
 "pošte.  Ob povezavi bo sporočilo mogoče poslati s klikom na gumb Pošlji/"
 "Prejmni v orodni vrstici programa."
 
+#: ../composer/mail-composer.error.xml.h:37
+#, fuzzy
+msgid "Are you sure you want to send the message?"
+msgstr "Ali ste prepričani, da želite hkrati odpreti %d sporočil?"
+
+#: ../composer/mail-composer.error.xml.h:38
+msgid ""
+"A keyboard accelerator to send the message has been pressed. Either cancel "
+"sending the message, if it was done by an accident, or send the message."
+msgstr ""
+
 #: ../data/evolution-alarm-notify.desktop.in.in.h:1
 msgid "Evolution Alarm Notify"
 msgstr "Obvestilo o alarmu Evolution"
@@ -7267,34 +7842,13 @@ msgstr "Obvestilo o alarmu Evolution"
 msgid "Calendar event notifications"
 msgstr "Obvestila dogodkov koledarja"
 
-#: ../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 ""
-"Program Evolution je osebni upravljalnik podatkov, povezanih z elektronsko "
-"pošto, koledarjem in imenikom."
-
-#: ../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 ""
-"Program Evulution podpira širok nabor standardnih podatkovnih zapisov in "
-"omrežnih protokolov za izmenjavo podatkov. Poudarjeni so standardi, ki so "
-"znani zaradi splošne uporabnosti in varnosti. Evolution podpira tudi "
-"povezavo s sistemom Microsoft Exchange preko razširitve EWS - \"Exchange Web "
-"Services\"."
-
 #: ../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 "Evolution"
 
-#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:82
+#: ../data/evolution.desktop.in.in.h:2 ../shell/e-shell-window-actions.c:81
 msgid "Groupware Suite"
 msgstr "Zbirka za skupinsko delo"
 
@@ -7414,6 +7968,62 @@ msgstr "Pokaži pladenj predogleda"
 msgid "Whether to show the preview pane."
 msgstr "Ali naj bo prikazan pladenj predogleda."
 
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:21
+msgid "true"
+msgstr ""
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:22
+#, fuzzy
+msgid "Whether to show phone numbers in the editor"
+msgstr ""
+"Ali naj se v urejevalniku dogodkov/srečanj prikaže polje časovnega pasu"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:23
+#, fuzzy
+msgid "Whether to show SIP addresses in the editor"
+msgstr "Ali naj se prikaže polje kategorij v urejevalniku dogodkov/srečanj"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:24
+#, fuzzy
+msgid "Whether to show IM addresses in the editor"
+msgstr "Ali naj se prikaže polje kategorij v urejevalniku dogodkov/srečanj"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:25
+#, fuzzy
+msgid "Whether to show mailing Home addresses in the editor"
+msgstr "Ali naj se prikaže polje kategorij v urejevalniku dogodkov/srečanj"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:26
+#, fuzzy
+msgid "Whether to show mailing addresses Work in the editor"
+msgstr "Ali naj se prikaže polje kategorij v urejevalniku dogodkov/srečanj"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:27
+#, fuzzy
+msgid "Whether to show mailing addresses Other in the editor"
+msgstr "Ali naj se prikaže polje kategorij v urejevalniku dogodkov/srečanj"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:28
+#, fuzzy
+msgid "Whether to show Web Addresses in the editor"
+msgstr "Ali naj se prikaže polje kategorij v urejevalniku dogodkov/srečanj"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:29
+#, fuzzy
+msgid "Whether to show job information in the editor"
+msgstr ""
+"Ali naj se v urejevalniku dogodkov/srečanj prikaže polje časovnega pasu"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:30
+#, fuzzy
+msgid "Whether to show Miscellaneous information in the editor"
+msgstr "Ali naj se prikaže polje kategorij v urejevalniku dogodkov/srečanj"
+
+#: ../data/org.gnome.evolution.addressbook.gschema.xml.in.h:31
+#, fuzzy
+msgid "Whether to show notes in the editor"
+msgstr "Ali naj se prikaže polje kategorij v urejevalniku dogodkov/srečanj"
+
 #: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:1
 msgid "Convert mail messages to Unicode"
 msgstr "Pretvori poštna sporočila v znakovni nabor Unicode"
@@ -7426,6 +8036,17 @@ msgstr ""
 "Pretvori sporočilo v Unikod UTF-8 za poenotenje žetonov vsiljene pošte, ki "
 "so v drugih naborih znakov."
 
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:3
+msgid "Full path command to run Bogofilter"
+msgstr ""
+
+#: ../data/org.gnome.evolution.bogofilter.gschema.xml.in.h:4
+msgid ""
+"Full path to a Bogofilter command. If not set, then a compile-time path is "
+"used, usually /usr/bin/bogofilter. The command should not contain any other "
+"arguments."
+msgstr ""
+
 #: ../data/org.gnome.evolution.calendar.gschema.xml.in.h:1
 msgid "Save directory for reminder audio"
 msgstr "Shrani mapo za zvočne opomnike"
@@ -8175,14 +8796,17 @@ msgid "Automatic emoticon recognition"
 msgstr "Samodejno prepoznavanje izraznih ikon"
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:12
-msgid "Recognize emoticons in text and replace them with images."
+#, fuzzy
+msgid ""
+"Recognize emoticons in text and replace them with images or Unicode "
+"characters."
 msgstr "Prepoznaj izrazne ikone v besedilu in jih zamenjaj s slikami."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:13
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
 msgid "Attribute message"
 msgstr "Sporočilo pripisa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:14
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
 msgid ""
 "The text that is inserted when replying to a message, attributing the "
 "message to the original author"
@@ -8190,11 +8814,11 @@ msgstr ""
 "Besedilo, ki je vstavljeno pri odgovoru na sporočilo, ki pripisuje sporočilo "
 "izvirnemu avtorju."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:15
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
 msgid "Forward message"
 msgstr "Posredovano sporočilo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:16
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
 msgid ""
 "The text that is inserted when forwarding a message, saying that the "
 "forwarded message follows"
@@ -8202,11 +8826,11 @@ msgstr ""
 "Besedilo, ki je vstavljeno ob posredovanju sporočila, ki pravi, da sledi "
 "posredovano sporočilo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:17
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
 msgid "Original message"
 msgstr "Izvirno sporočilo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:18
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
 msgid ""
 "The text that is inserted when replying to a message (top posting), saying "
 "that the original message follows"
@@ -8214,11 +8838,11 @@ msgstr ""
 "Besedilo, ki je vstavljeno pri odgovarjanju na sporočilo (vrhnje "
 "pošiljanje), ki pravi, da sledi izvirno sporočilo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:19
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
 msgid "Group Reply replies to list"
 msgstr "Skupinski odgovor je odgovor na dopisni seznam"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:20
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
 msgid ""
 "Instead of the normal \"Reply to All\" behaviour, this option will make the "
 "'Group Reply' toolbar button try to reply only to the mailing list through "
@@ -8229,11 +8853,11 @@ msgstr ""
 "orodne vrstice za 'skupinski odgovor' za pošiljanje sporočila le na dopisni "
 "seznam preko katerega je bilo prvotno sporočilo prejeto."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:21
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
 msgid "Put the cursor at the bottom of replies"
 msgstr "Postavi kazalec na dno odgovorov"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:22
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
 msgid ""
 "Users get all up in arms over where the cursor should go when replying to a "
 "message. This determines whether the cursor is placed at the top of the "
@@ -8242,30 +8866,22 @@ msgstr ""
 "Uporabniki so različnih mnenj glede mesta kazalca pri odgovorih na "
 "sporočila. Ta možnost določa ali naj bo kazalec na vrhu ali na dnu sporočila."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:23
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
 msgid "Always request read receipt"
 msgstr "Vedno zahtevaj povratnico"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:24
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
 msgid "Whether a read receipt request gets added to every message by default."
 msgstr "Ali se povratnica privzeto samodejno doda k vsakemu sporočilu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:25
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
 msgid "Send HTML mail by default"
 msgstr "Pošto privzeto pošiljaj v obliki HTML"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:26
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
 msgid "Send HTML mail by default."
 msgstr "Pošto privzeto pošiljaj v obliki HTML."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:27
-msgid "Spell checking color"
-msgstr "Barva preverjanja črkovanja"
-
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:28
-msgid "Underline color for misspelled words when using inline spelling."
-msgstr "Barva podčrtane narobe zapisane besede med uporabo črkovalnika."
-
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:29
 msgid "Spell checking languages"
 msgstr "Jeziki za preverjanje črkovanja"
@@ -8299,10 +8915,24 @@ msgstr ""
 "nastaviti v meniju Pogled, ko je izbran poštni račun."
 
 #: ../data/org.gnome.evolution.mail.gschema.xml.in.h:35
+#, fuzzy
+msgid "Show \"From\" override field when sending a mail message"
+msgstr "Pokaži polje \"Kp\" pri pošiljanju poštnega sporočila"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+#, fuzzy
+msgid ""
+"Show the \"From\" override field when sending a mail message. This is "
+"controlled from the View menu when a mail account is chosen."
+msgstr ""
+"Pokaži polje \"Kp\" pri pošiljanju poštnega sporočila. Možnost je mogoče "
+"nastaviti v meniju Pogled, ko je izbran poštni račun."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
 msgid "Show \"Reply To\" field when sending a mail message"
 msgstr "Pokaži polje \"Odgovori\" pri pošiljanju poštnega sporočila"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:36
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
 msgid ""
 "Show the \"Reply To\" field when sending a mail message. This is controlled "
 "from the View menu when a mail account is chosen."
@@ -8310,11 +8940,11 @@ msgstr ""
 "Pokaži polje \"Odgovori\" pri pošiljanju poštnega sporočila. Možnost je "
 "mogoče nastaviti v meniju Pogled, ko je izbran poštni račun."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:37
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
 msgid "Show \"From\" field when posting to a newsgroup"
 msgstr "Pokaži polje \"Od\" pri objavi na novičarski skupini"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:38
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
 msgid ""
 "Show the \"From\" field when posting to a newsgroup. This is controlled from "
 "the View menu when a news account is chosen."
@@ -8322,11 +8952,11 @@ msgstr ""
 "Pokaži polje \"Od\" pri objavi na novičarski skupini. Možnost je mogoče "
 "nastaviti v meniju Pogled, ko je izbran poštni račun."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:39
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
 msgid "Show \"Reply To\" field when posting to a newsgroup"
 msgstr "Pokaži polje \"Odgovori\" pri objavi na novičarski skupini"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:40
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
 msgid ""
 "Show the \"Reply To\" field when posting to a newsgroup. This is controlled "
 "from the View menu when a news account is chosen."
@@ -8334,13 +8964,13 @@ msgstr ""
 "Pokaži polje \"Odgovori\" pri objavi na novičarski skupini. Možnost je "
 "mogoče nastaviti v meniju Pogled, ko je izbran poštni račun."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:41
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
 msgid "Digitally sign replies when the original message is signed"
 msgstr ""
 "Digitalno podpiši odgovore sporočil, kadar je podpisano tudi izvirno "
 "sporočilo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:42
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
 msgid ""
 "Automatically enable PGP or S/MIME signatures when replying to a message "
 "which is also PGP or S/MIME signed."
@@ -8348,11 +8978,11 @@ msgstr ""
 "Samodejno omogoči podpise PGP ali S/MIME pri odgovarjanju na sporočilo, ki "
 "je bilo prav tako podpisano s PGP ali S/MIME"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:43
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
 msgid "Encode filenames in an Outlook/GMail way"
 msgstr "Kodiraj imena datotek v načinu MS Outlook/GMail"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:44
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
 msgid ""
 "Encode filenames in the mail headers same as Outlook or GMail do, to let "
 "them display correctly filenames with UTF-8 letters sent by Evolution, "
@@ -8364,11 +8994,22 @@ msgstr ""
 "z znaki v naboru UTF-8, ki jih pošilja program Evolution. Odjemalca "
 "uporabljata namesto RFC 2231 neveljaven standard RFC 2047."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:45
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+#, fuzzy
+msgid "Send messages through Outbox folder"
+msgstr "Shranjevanje sporočila v mapo odhodne pošte."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+msgid ""
+"Always save messages to Outbox folder when sending, to let a user choose "
+"when the messages should be sent."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
 msgid "Put personalized signatures at the top of replies"
 msgstr "Postavi poosebljene podpise na vrh odgovorov"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:46
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
 msgid ""
 "Users get all up in arms over where their signature should go when replying "
 "to a message. This determines whether the signature is placed at the top of "
@@ -8377,11 +9018,11 @@ msgstr ""
 "Uporabniki so različnih mnenj glede mesta podpisa pri odgovorih na "
 "sporočila. Ta možnost določa ali naj bo podpis na vrhu ali na dnu sporočila."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:47
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
 msgid "Do not add signature delimiter"
 msgstr "Ne dodaj razmejevalnika podpisa"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:48
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
 msgid ""
 "Set to TRUE in case you do not want to add signature delimiter before your "
 "signature when composing a mail."
@@ -8389,11 +9030,11 @@ msgstr ""
 "Izbrana možnost pri sestavljanju sporočila onemogoči dodajanje razmejilnika "
 "podpisa pred podpis."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:49
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
 msgid "Ignore list Reply-To:"
 msgstr "Prezri seznam odgovori-na:"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:50
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
 msgid ""
 "Some mailing lists set a Reply-To: header to trick users into sending "
 "replies to the list, even when they ask Evolution to make a private reply. "
@@ -8409,11 +9050,11 @@ msgstr ""
 "naslov dopisnega seznama. Program Evolution bo zahteval potrdilo za "
 "pošiljanje na zasebni naslov ali na dopisni seznam.."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:51
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
 msgid "List of localized 'Re'"
 msgstr "Seznam krajevno prilagojenih okrajšanih predpon 'Re:'"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:52
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
 msgid ""
 "Comma-separated list of localized 'Re' abbreviations to skip in a subject "
 "text when replying to a message, as an addition to the standard \"Re\" "
@@ -8423,19 +9064,37 @@ msgstr ""
 "sporočilo v vrstici zadeve, ki se izpiše med odgovarjanjem na sporočilo, kot "
 "prevod običajne predpone  \"Re:\". Primer je 'Odg.: ali Odgovor:'."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:53
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+#, fuzzy
+msgid "Enable developer mode"
+msgstr "Omogoči hitri način"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+msgid ""
+"Enables some hidden actions and tools aimed for development and debugging."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+msgid "Number of characters for wrapping"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+msgid "Will autowrap lines after given number of characters."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
 msgid "Save file format for drag-and-drop operation"
 msgstr "Shrani datoteko v obliki primerni za delovanje s povleci in spusti"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:54
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
 msgid "Can be either 'mbox' or 'pdf'."
 msgstr "Lahko je 'mbox' ali 'pdf'."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:55
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
 msgid "Show image animations"
 msgstr "Pokaži animacije slik"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:56
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
 msgid ""
 "Enable animated images in HTML mail. Many users find animated images "
 "annoying and prefer to see a static image instead."
@@ -8443,22 +9102,22 @@ msgstr ""
 "Omogoči animirane slike v pošti HTML. Animirane slike so za veliko "
 "uporabnikov nadležne, zato rajši vidijo običajne slike."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:57
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
 msgid "Enable or disable type ahead search feature"
 msgstr "Omogoči ali onemogoči možnost iskanja med tipkanjem"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:58
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
 msgid ""
 "Enable the side bar search feature to allow interactive searching of folder "
 "names."
 msgstr ""
 "Omogoči zmožnost iskanja v stranski vrstici za vzajemno iskanje imen map."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:59
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
 msgid "Enable or disable magic space bar"
 msgstr "Omogoči ali onemogoči možnost čarobne preslednice"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:60
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
 msgid ""
 "Enable this to use Space bar key to scroll in message preview, message list "
 "and folders."
@@ -8466,73 +9125,73 @@ msgstr ""
 "Izbrana možnost omogoči uporabo preslednice za drsenje v predogledu "
 "sporočila, seznama sporočil in map."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:61
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
 msgid "Enable to use a similar message list view settings for all folders"
 msgstr ""
 "Omogoči uporabo nastavitve ogleda seznama podobnih sporočil za vse mape"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:62
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
 msgid "Enable to use a similar message list view settings for all folders."
 msgstr ""
 "Izbrana možnost omogoči uporabo podobnega seznama sporočil za vse mape."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:63
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
 msgid "Mark citations in the message \"Preview\""
 msgstr "Označi citate v \"Predogledu\" sporočila"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:64
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Označi citate v \"Predogledu\" sporočila."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:65
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
 msgid "Citation highlight color"
 msgstr "Barva poudarjanja citata"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:66
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
 msgid "Citation highlight color."
 msgstr "Barva poudarjanja citata."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:67
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
 msgid "Enable/disable caret mode"
 msgstr "Omogoči/onemogoči način kazalke"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:68
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
 msgid "Enable caret mode, so that you can see a cursor when reading mail."
 msgstr "Omogoči način kazalke, pri katerem je med branjem pošte viden kazalec."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:69
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
 msgid "Default charset in which to display messages"
 msgstr "Privzeti znakovni nabor za prikaz sporočil"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:70
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
 msgid "Default charset in which to display messages."
 msgstr "Privzeti znakovni nabor za prikaz sporočil."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:71
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
 msgid "Automatically load images for HTML messages over HTTP"
 msgstr "Samodejno naloži slike sporočil HTML preko HTTP"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:72
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
 msgid "Show Animations"
 msgstr "Pokaži animacije"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:73
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
 msgid "Show animated images as animations."
 msgstr "Animirane slike prikaži kot animacije."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:74
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
 msgid "Show all message headers"
 msgstr "Pokaži vse glave sporočila"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:75
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
 msgid "Show all the headers when viewing a messages."
 msgstr "Pokaže vse glave med pregledovanjem sporočil"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:76
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
 msgid "List of headers to show when viewing a message."
 msgstr "Seznam glav, ki naj bodo pokazane med ogledom sporočila."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:77
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
 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 "
@@ -8542,42 +9201,51 @@ msgstr ""
 "določa ali je glava omogočena. Onemogočene gleve niso prikazane med "
 "pregledovanjem sporočila, so pa še vedno izpisane med možnostmi."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:78
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
 msgid "Show photo of the sender"
 msgstr "Pokaži fotografijo pošiljatelja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:79
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
 msgid "Show the photo of the sender in the message reading pane."
 msgstr "Pokaži fotografijo pošiljatelja na pladnju branja sporočil."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:80
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#, fuzzy
+msgid "Search gravatar.com for photo of the sender"
+msgstr "Pokaži fotografijo pošiljatelja"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+msgid "Allow searching also at gravatar.com for photo of the sender."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
 msgid "Mark as Seen after specified timeout"
 msgstr "Označi kot Videno po navedeni zakasnitvi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:81
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
 msgid "Mark as Seen after specified timeout."
 msgstr "Označi kot Videno po navedeni zakasnitvi."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:82
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
 msgid "Timeout for marking messages as seen"
 msgstr "Čas po katerem se sporočilo označi kot videno"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:83
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
 msgid "Timeout in milliseconds for marking messages as seen."
 msgstr "Čas v milisekundah po katerem se sporočilo označi kot videno."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:84
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
 msgid "Sender email-address column in the message list"
 msgstr "Stolpec elektronskega naslova na seznamu sporočil"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:85
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
 msgid ""
 "Show the email-address of the sender in a separate column in the message "
 "list."
 msgstr ""
 "Pokaži elektronski naslov pošiljatelja v ločenem stolpcu na seznamu sporočil."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:86
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view"
@@ -8585,7 +9253,7 @@ msgstr ""
 "Določa ali sta v navpičnem pogledu v stolpcu \"Sporočila\" za vrstici \"Od\" "
 "in \"Zadeva\" uporabljeni isti pisavi."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:87
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
 msgid ""
 "Determines whether to use the same fonts for both \"From\" and \"Subject\" "
 "lines in the \"Messages\" column in vertical view."
@@ -8593,19 +9261,19 @@ msgstr ""
 "Določa ali sta v navpičnem pogledu v stolpcu \"Sporočila\" za vrstici \"Od\" "
 "in \"Zadeva\" uporabljeni isti pisavi."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:88
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
 msgid "Show deleted messages in the message-list"
 msgstr "Pokaži izbrisana sporočila na seznamu sporočil"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:89
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
 msgid "Show deleted messages (with a strike-through) in the message-list."
 msgstr "Pokaži izbrisana sporočila (prečrtana) na seznamu sporočil."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:90
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
 msgid "Enable Unmatched search folder"
 msgstr "Omogoči neujemajoče iskalne mape"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:91
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
 msgid ""
 "Enable Unmatched search folder within Search Folders. It does nothing if "
 "Search Folders are disabled."
@@ -8613,11 +9281,11 @@ msgstr ""
 "Omogoči neujemajoče iskalne mape znotraj iskalnih map. Možnost ni dejavna, "
 "če je onemogočena nadrejena možnost iskalnih map."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:92
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
 msgid "Hides the per-folder preview and removes the selection"
 msgstr "Skrije predogled map in odstrani izbiro"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:93
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
 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."
@@ -8626,31 +9294,31 @@ msgstr ""
 "na \"napak\". To odstrani oznako sporočila na seznamu in odstrani predogled "
 "za to mapo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:94
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
 msgid "Height of the message-list pane"
 msgstr "Višina pladnja seznama sporočil"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:95
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
 msgid "Height of the message-list pane."
 msgstr "Višina pladnja seznama sporočil."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:96
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
 msgid "Whether message headers are collapsed in the user interface"
 msgstr "Ali naj bodo glave sporočil zložene v uporabniškem vmesniku"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:97
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
 msgid "Width of the message-list pane"
 msgstr "Širina pladnja s seznamom sporočil"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:98
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
 msgid "Width of the message-list pane."
 msgstr "Širina pladnja s seznamom sporočil."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:99
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
 msgid "Layout style"
 msgstr "Slog razporeditve"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:100
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
 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 "
@@ -8662,35 +9330,35 @@ msgstr ""
 "pod seznamom sporočil, \"1\" pa predstavlja navpični slog, kjer sta okni eno "
 "ob drugem."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:101
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
 msgid "Variable width font"
 msgstr "Pisava spremenljive širine"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:102
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
 msgid "The variable width font for mail display."
 msgstr "Pisava spremenljive širine za prikaz pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:103
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
 msgid "Terminal font"
 msgstr "Pisava terminala"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:104
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
 msgid "The terminal font for mail display."
 msgstr "Pisava terminala za prikaz pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:105
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
 msgid "Use custom fonts"
 msgstr "Uporabi pisave po meri"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:106
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
 msgid "Use custom fonts for displaying mail."
 msgstr "Za prikaz pošte uporabi pisave po meri."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:107
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
 msgid "Compress display of addresses in TO/CC/BCC"
 msgstr "Stisne prikaz naslovov v poljih ZA/KP/SKP"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:108
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
 msgid ""
 "Compress display of addresses in TO/CC/BCC to the number specified in "
 "address_count."
@@ -8698,11 +9366,11 @@ msgstr ""
 "Stisne prikaz naslovov v poljih ZA/KP/SKP na število, navedeno v "
 "address_count."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:109
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
 msgid "Number of addresses to display in TO/CC/BCC"
 msgstr "Število naslovov za prikaz v poljih ZA/KP/SKP"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:110
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
 msgid ""
 "This sets the number of addresses to show in default message list view, "
 "beyond which a '...' is shown."
@@ -8710,11 +9378,11 @@ msgstr ""
 "To določa število naslovov, ki se prikažejo v privzetem pogledu seznama "
 "sporočil, preko katerega se prikaže '...'."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:111
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
 msgid "Thread the message-list based on Subject"
 msgstr "Niten seznam sporočil na podlagi polja Zadeva"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:112
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
 msgid ""
 "Whether or not to fall back on threading by subjects when the messages do "
 "not contain In-Reply-To or References headers."
@@ -8722,11 +9390,11 @@ msgstr ""
 "Ali naj se nitenje, ko sporočila ne vsebujejo glav Kot-Odgovor-Na ali "
 "Reference, navezuje na zadeve."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:113
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
 msgid "Default value for thread expand state"
 msgstr "Privzeta vrednost stanja razširitve niti sporočil"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:114
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
 msgid ""
 "This setting specifies whether the threads should be in expanded or "
 "collapsed state by default. Evolution requires a restart."
@@ -8734,11 +9402,11 @@ msgstr ""
 "Nastavitev določa ali naj niti sporočil ostanejo privzeto razširjene ali "
 "zložene. Spreminjanje nastavitve zahteva ponoven zagon programa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:115
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
 msgid "Whether sort threads based on latest message in that thread"
 msgstr "Ali naj bodo niti razvrščene po zadnjih sporočilih v niti"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:116
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
 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 "
@@ -8748,11 +9416,11 @@ msgstr ""
 "zadnjemu sporočilu v vsakem nizu namesto po datumu sporočila. Spreminjanje "
 "nastavitve zahteva ponovni zagon programa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:117
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
 msgid "Sort accounts alphabetically in a folder tree"
 msgstr "Račune v drevesu map razvrsti abecedno"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:118
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
 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 "
@@ -8764,27 +9432,27 @@ msgstr ""
 "iskalnih map, sicer pa se računi razvrstijo po zaporedju, ki ga določi "
 "uporabnik."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:119
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
 msgid "Log filter actions"
 msgstr "Beleži dejanja filtra"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:120
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
 msgid "Log filter actions to the specified log file."
 msgstr "Beleži dejanja filtra v navedeno dnevniško datoteko."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:121
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
 msgid "Logfile to log filter actions"
 msgstr "Dnevniška datoteka za beleženje dejanj filtra"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:122
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
 msgid "Logfile to log filter actions."
 msgstr "Dnevniška datoteka za beleženje dejanj filtra."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:123
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
 msgid "Flush Outbox after filtering"
 msgstr "Počisti odhodni predal po filtriranju"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:124
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
 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 "
@@ -8794,46 +9462,57 @@ msgstr ""
 "predala se bo zgodilo samo ko je bilo uporabljeno dejanje filtra 'Posreduj "
 "na' in približno eno minuto po preklicu zadnjega dejanja."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:125
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
 msgid "Default forward style"
 msgstr "Privzet način posredovanja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:126
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
 msgid "Default reply style"
 msgstr "Privzet način odgovarjanja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:127
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+msgid "Prompt on send when using key accelerator (Ctrl+Enter)"
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#, fuzzy
+msgid ""
+"Prompt the user when he or she tries to send a message with a key "
+"accelerator."
+msgstr "Opozori uporabnika, ko želi poslati sporočilo brez Zadeve."
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
 msgid "Prompt on empty subject"
 msgstr "Opozori ob prazni zadevi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:128
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Opozori uporabnika, ko želi poslati sporočilo brez Zadeve."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:129
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
 msgid "Prompt when emptying the trash"
 msgstr "Opozori ob praznjenju smeti"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:130
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
 msgid "Prompt the user when he or she tries to empty the trash."
 msgstr "Opozori uporabnika, ko želi izprazniti smeti."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:131
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
 msgid "Prompt when user expunges"
 msgstr "Opozori ob uničenju"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:132
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Opozori uporabnika, ko želi uničiti mapo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:133
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
 msgid "Prompt before sending to recipients not entered as mail addresses"
 msgstr ""
 "Pozovi pred pošiljanjem prejemnikov, ki niso vneseni kot veljavni poštni "
 "naslovi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:134
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
 msgid ""
 "It disables/enables the repeated prompts to warn that you are trying to send "
 "a message to recipients not entered as mail addresses"
@@ -8841,21 +9520,21 @@ msgstr ""
 "Onemogoči ali omogoči možnost ponavljajočih se opozoril, ki vas opozorijo da "
 "poskušate poslati sporočilo prejemnikom, ki niso vneseni kot poštni naslovi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:135
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
 msgid "Prompt when user only fills Bcc"
 msgstr "Opozori uporabnika, ko izpolni le Skp"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:136
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Opozori uporabnika, ko želi poslati sporočilo brez prejemnikov v poljih Za "
 "ali Kp."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:137
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Opozori uporabnika, ko želi poslati neželen HTML"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:138
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
 msgid ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
@@ -8863,11 +9542,11 @@ msgstr ""
 "Opozori uporabnika, ko želi pošto v obliki HTML poslati prejemnikom, ki "
 "morda ne želijo prejemati pošte HTML."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:139
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
 msgid "Prompt when user tries to open 10 or more messages at once"
 msgstr "Opozori uporabnika, ko želi hkrati odpreti 10 ali več sporočil"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:140
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
 msgid ""
 "If a user tries to open 10 or more messages at one time, ask the user if "
 "they really want to do it."
@@ -8875,19 +9554,19 @@ msgstr ""
 "V primeru da uporabnik poskuša odpreti 10 ali več sporočil hkrati, ga "
 "vprašaj, ali želi to res storiti."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:141
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
 msgid "Prompt while marking multiple messages"
 msgstr "Opozori ob označevanju več sporočil"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:142
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
 msgid "Enable or disable the prompt whilst marking multiple messages."
 msgstr "Onemogoči ali omogoči opozorilo pri označevanju več sporočil."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:143
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
 msgid "Prompt when deleting messages in search folder"
 msgstr "Opozori ob brisanju sporočil v iskalni mapi"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:144
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
 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 "
@@ -8897,12 +9576,12 @@ msgstr ""
 "iskalne mape sporočila trajno izbriše in ne zgolj odstrani iz zadetkov "
 "iskanja."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:145
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
 msgid "Asks whether to copy a folder by drag &amp; drop in the folder tree"
 msgstr ""
 "Vpraša za možnost kopiranja mape z načinom povleci in spusti v drevesu map"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:146
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
 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 "
@@ -8914,12 +9593,12 @@ msgstr ""
 "spusti v drevesu map brez poziva in 'vprašaj' - (ali katerakoli druga "
 "vrednost), ki bo pozvala uporabnika."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:147
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
 msgid "Asks whether to move a folder by drag &amp; drop in the folder tree"
 msgstr ""
 "Vpraša za možnost premikanja mape z načinom povleci in spusti v drevesu map"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:148
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
 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 "
@@ -8931,11 +9610,11 @@ msgstr ""
 "in spusti v drevesu map brez poziva in 'vprašaj' - (ali katerakoli druga "
 "vrednost), ki bo pozvala uporabnika."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:149
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
 msgid "Prompt when replying privately to list messages"
 msgstr "Opozori med zasebnim odgovarjanjem na sporočilo dopisnega seznama"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:150
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
 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."
@@ -8943,11 +9622,11 @@ msgstr ""
 "Onemogoči ali omogoči možnost ponavljajočih se opozoril z vprašanjem ali "
 "pošiljate zasebni odgovor na sporočilo prejeto preko dopisnega seznama."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:151
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
 msgid "Prompt when mailing list hijacks private replies"
 msgstr "Opozori kadar dopisni seznam prejema zasebne odgovore"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:152
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
 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 "
@@ -8957,11 +9636,11 @@ msgstr ""
 "zasebni odgovor na sporočilo, ki je prispelo preko dopisnega seznama, "
 "poslano preko odgovori-na možnosti nazaj na dopisni seznam."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:153
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
 msgid "Prompt when replying to many recipients"
 msgstr "Opozori med odgovarjanjem več prejemnikom"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:154
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
 msgid ""
 "It disables/enables the repeated prompts to warn that you are sending a "
 "reply to many people."
@@ -8969,7 +9648,7 @@ msgstr ""
 "Onemogoči ali omogoči možnost ponavljajočih se opozoril z vprašanjem ali "
 "pošiljate odgovor več prejemnikom."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:155
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
 msgid ""
 "Policy for automatically closing the message browser window when forwarding "
 "or replying to the displayed message."
@@ -8977,40 +9656,40 @@ msgstr ""
 "Pravila za samodejno zapiranje okna brskalnika sporočil med odgovarjanjem "
 "ali posredovanjem prikazanega sporočila."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:156
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
 msgid "Empty Trash folders on exit"
 msgstr "Ob izhodu iz programa izprazni mape smeti"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:157
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
 msgid "Empty all Trash folders when exiting Evolution."
 msgstr "Ob izhodu iz programa izprazni vse mape smeti"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:158
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Najmanjše število dni med praznjenji koša ob izhodu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:159
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Najmanjši čas med praznjenji koša ob izhodu v dneh."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:160
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
 msgid "Last time Empty Trash was run"
 msgstr "Čas zadnjega praznjenja koša"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:161
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
 msgid ""
 "The last time Empty Trash was run, in days since January 1st, 1970 (Epoch)."
 msgstr "Čas zadnjega praznjenja koša v dneh od epoha (1. Januar 1970)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:162
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
 msgid "Amount of time in seconds the error should be shown on the status bar."
 msgstr "Čas v sekundah, ko je obvestilo o napaki prikazano v vrstici stanja."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:163
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
 msgid "Level beyond which the message should be logged."
 msgstr "Raven nad katero bi moralo sporočilo biti zabeleženo."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:164
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
 msgid ""
 "This can have three possible values. \"0\" for errors. \"1\" for warnings. "
 "\"2\" for debug messages."
@@ -9018,11 +9697,11 @@ msgstr ""
 "Mogoče so tri vrednosti. \"0\" za napake, \"1\" za opozorila in \"2\" za "
 "sporočila razhroščevanja."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:165
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
 msgid "Show original \"Date\" header value."
 msgstr "Pokaži izvirno vrednost \"Datum\" v glavi sporočila."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:166
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
 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 "
@@ -9032,11 +9711,11 @@ msgstr ""
 "časovni pas različen). V nasprotnem primeru, bo glava \"Datum\" pokazana v "
 "prednostni obliki uporabnika in v krajevnem časovnem pasu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:167
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
 msgid "List of Labels and their associated colors"
 msgstr "Seznam oznak in z njimi povezanih barv"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:168
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
 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."
@@ -9044,45 +9723,45 @@ msgstr ""
 "Seznam oznak, ki jih pozna poštna komponenta Evolutiona. Seznam vsebuje nize "
 "v obliki ime:barva, kjer je barva podana v šestiškem kodiranju HTML."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:169
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
 msgid "Check incoming mail being junk"
 msgstr "Preveri dohodno pošto za vsiljeno pošto"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:170
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
 msgid "Run junk test on incoming mail."
 msgstr "V dohodni pošti izvedi preizkus vsiljene pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:171
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
 msgid "Empty Junk folders on exit"
 msgstr "Ob izhodu iz programa izprazni mapo vsiljene pošte"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:172
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
 msgid "Empty all Junk folders when exiting Evolution."
 msgstr "Ob izhodu iz programa izprazni vse mape vsiljene pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:173
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
 msgid "Minimum days between emptying the junk on exit"
 msgstr "Najmanjše število dni med praznjenji vsiljene pošte ob izhodu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:174
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
 msgid "Minimum time between emptying the junk on exit, in days."
 msgstr "Najmanjši čas med praznjenji vsiljene pošte ob izhodu v dneh."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:175
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
 msgid "Last time Empty Junk was run"
 msgstr "Čas zadnjega praznjenja vsiljene pošte"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:176
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
 msgid ""
 "The last time Empty Junk was run, in days since January 1st, 1970 (Epoch)."
 msgstr ""
 "Čas zadnjega praznjenja vsiljene pošte v dneh od epoha (1. Januar 1970)."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:177
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
 msgid "The default plugin for Junk hook"
 msgstr "Privzeti vstavek za vsiljeno pošto"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:178
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
 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 "
@@ -9092,11 +9771,11 @@ msgstr ""
 "omogočenih več vstavkov. V primeru, da je privzeti vstavek onemogočen, se "
 "preverjanje ne povrne na ostale razpoložljive vstavke."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:179
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
 msgid "Determines whether to lookup in address book for sender email"
 msgstr "Določa ali naj bo imenik pregledan za elektronski naslov pošiljatelja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:180
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
 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 "
@@ -9108,7 +9787,7 @@ msgstr ""
 "pošta. Imena so pregledana v imenikih označenih za samodejno dopolnjevanje. "
 "Postopek je lahko počasen, če uporabljate oddaljene imenike kot je LDAP."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:181
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
 msgid ""
 "Determines whether to look up addresses for junk filtering in local address "
 "book only"
@@ -9116,7 +9795,7 @@ msgstr ""
 "Določa ali naj bo za filtriranje vsiljene pošte imenik pregledan le v "
 "krajevnem imeniku"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:182
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
 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 "
@@ -9126,11 +9805,11 @@ msgstr ""
 "določevanje vpogleda v naslove krajevnega imenika za izločevanje pošte "
 "poslane s strani znanih stikov iz filtriranja vsiljene pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:183
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
 msgid "Determines whether to use custom headers to check for junk"
 msgstr "Določa ali so za preverjanje vsiljene pošte uporabljene glave po meri."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:184
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
 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 "
@@ -9140,11 +9819,11 @@ msgstr ""
 "primeru, da je možnost omogočena in so glave omenjene, se izboljša hitrost "
 "preverjanja vsiljene pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:185
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
 msgid "Custom headers to use while checking for junk."
 msgstr "Glave po meri za uporabo pri preverjanju vsiljene pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:186
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
 msgid ""
 "Custom headers to use while checking for junk. The list elements are string "
 "in the format \"headername=value\"."
@@ -9152,31 +9831,31 @@ msgstr ""
 "Glave po meri za uporabo pri preverjanju vsiljene pošte. Zapis je v obliki "
 "\"imeglave=vrednost\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:187
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
 msgid "UID string of the default account."
 msgstr "Niz UID privzetega računa."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:188
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
 msgid "Save directory"
 msgstr "Shrani mapo"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:189
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
 msgid "Directory for saving mail component files."
 msgstr "Mapa za shranjevanje datotek sestavnih delov pošte."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:190
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
 msgid "Composer load/attach directory"
 msgstr "Mapa nalaganja/prilaganja sestavljalniku"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:191
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
 msgid "Directory for loading/attaching files to composer."
 msgstr "Mapa za nalaganje/pripenjanje datotek k sestavljalniku."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:192
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
 msgid "Check for new messages on start"
 msgstr "Preveri za nova sporočila ob zagonu"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:193
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
 msgid ""
 "Whether to check for new messages when Evolution is started. This includes "
 "also sending messages from Outbox."
@@ -9184,11 +9863,11 @@ msgstr ""
 "Ali naj program preveri za nova sporočilu ob zagonu programa. To dejanje "
 "vključuje tudi pošiljanje sporočil iz odhodne mape."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:194
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
 msgid "Check for new messages in all active accounts"
 msgstr "Preveri za nova sporočila v vseh dejavnih računih"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:195
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
 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 "
@@ -9198,11 +9877,11 @@ msgstr ""
 "programa Evolution ne glede na možnost \"Preveri za nova sporočila vsakih X "
 "minut\". Ta možnost se uporablja le skupaj z možnostjo 'send_recv_on_start'."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:196
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:208
 msgid "Server synchronization interval"
 msgstr "Časovni razmik usklajevanja strežnika"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:197
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:209
 msgid ""
 "Controls how frequently local changes are synchronized with the remote mail "
 "server. The interval must be at least 30 seconds."
@@ -9210,11 +9889,34 @@ msgstr ""
 "Nadzira kako pogosto se krajevne spremembe uskladijo z oddaljenim poštnim "
 "strežnikom. Časovni razmik mora biti vsaj 30 sekund."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:198
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:210
+#, fuzzy
+msgid "Allow expunge in virtual folders"
+msgstr "Potrdi ob _uničevanju mape"
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:211
+msgid ""
+"Enables Expunge in virtual folders, which means that the Folder->Expunge "
+"will be callable in virtual folders, while the expunge itself will be done "
+"in all folders for all deleted messages within the virtual folder, not only "
+"for deleted messages belonging to the virtual folder."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:212
+msgid "An Archive folder for On This Computer folders."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:213
+msgid ""
+"An Archive folder to use for Messages|Archive... feature when in an On This "
+"Computer folder."
+msgstr ""
+
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:214
 msgid "(Deprecated) Default forward style"
 msgstr "(Opuščeno) Privzet način posredovanja"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:199
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:215
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"forward-style-name\" instead."
@@ -9222,11 +9924,11 @@ msgstr ""
 "Ključ je opuščen z različico 3.10 in ne bo več v rabi. Priporočena je "
 "uporaba možnosti \"ime sloga posredovanja\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:200
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:216
 msgid "(Deprecated) Default reply style"
 msgstr "(Opuščeno) Privzet slog odgovora"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:201
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:217
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"reply-style-name\" instead."
@@ -9234,11 +9936,11 @@ msgstr ""
 "Ključ je opuščen z različico 3.10 in ne bo več v rabi. Priporočena je "
 "uporaba možnosti \"ime sloga odgovora\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:202
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:218
 msgid "(Deprecated) List of custom headers and whether they are enabled."
 msgstr "(Opuščeno) Seznam glav po meri in ali so omogočene."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:203
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:219
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"show-headers\" instead."
@@ -9246,11 +9948,11 @@ msgstr ""
 "Ključ je opuščen z različico 3.10 in ne bo več v rabi. Priporočena je "
 "uporaba možnosti \"pokaži glave\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:204
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:220
 msgid "(Deprecated) Load images for HTML messages over HTTP"
 msgstr "(Opuščeno) Naloži slike sporočil HTML preko HTTP"
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:205
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:221
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"image-loading-policy\" instead."
@@ -9258,7 +9960,7 @@ msgstr ""
 "Ključ je opuščen z različico 3.10 in ne bo več v rabi. Priporočena je "
 "uporaba možnosti \"pravila nalaganja slik\"."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:206
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:222
 msgid ""
 "(Deprecated) Asks whether to close the message window when the user forwards "
 "or replies to the message shown in the window"
@@ -9266,7 +9968,7 @@ msgstr ""
 "(Opuščeno) Vpraša ali naj se okno sporočil zapre, ko uporabnik posreduje ali "
 "odgovori na sporočilo prikazano v oknu."
 
-#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:207
+#: ../data/org.gnome.evolution.mail.gschema.xml.in.h:223
 msgid ""
 "This key was deprecated in version 3.10 and should no longer be used. Use "
 "\"browser-close-on-reply-policy\" instead."
@@ -9566,7 +10268,7 @@ msgstr "Začetna mapa izbirnika datotek"
 msgid "Initial folder for GtkFileChooser dialogs."
 msgstr "Začetna mapa za pogovorna okna GtkFileChooser."
 
-#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:307
+#: ../data/org.gnome.evolution.shell.gschema.xml.in.h:7 ../shell/main.c:308
 msgid "Start in offline mode"
 msgstr "Začni v načinu brez povezave"
 
@@ -9660,9 +10362,31 @@ msgstr "Uporabi le krajevno preskušanje vsiljene pošte"
 msgid "Use only the local spam tests (no DNS)."
 msgstr "Uporabi le krajevno preskušanje vsiljene pošte (brez DNS)."
 
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:3
+msgid "Full path command to run spamassassin"
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:4
+msgid ""
+"Full path to a spamassassin command. If not set, then a compile-time path is "
+"used, usually /usr/bin/spamassassin. The command should not contain any "
+"other arguments."
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:5
+msgid "Full path command to run sa-learn"
+msgstr ""
+
+#: ../data/org.gnome.evolution.spamassassin.gschema.xml.in.h:6
+msgid ""
+"Full path to a sa-learn command. If not set, then a compile-time path is "
+"used, usually /usr/bin/sa-learn. The command should not contain any other "
+"arguments."
+msgstr ""
+
 #: ../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
+#: ../e-util/e-attachment-bar.c:101 ../e-util/e-attachment-bar.c:106
+#: ../e-util/e-attachment-paned.c:187 ../e-util/e-attachment-paned.c:192
 #: ../mail/message-list.etspec.h:4
 msgid "Attachment"
 msgid_plural "Attachments"
@@ -9684,8 +10408,8 @@ msgid "Play the attachment in embedded audio player"
 msgstr "Predvajaj prilogo v vgrajnem predvajalniku zvoka"
 
 #: ../em-format/e-mail-formatter-headers.c:102
-#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:273
-#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:63
+#: ../em-format/e-mail-part-headers.c:46 ../mail/e-mail-tag-editor.c:277
+#: ../mail/message-list.etspec.h:5 ../modules/mail/em-mailer-prefs.c:62
 msgid "From"
 msgstr "Od"
 
@@ -9693,7 +10417,7 @@ msgstr "Od"
 msgid "(no subject)"
 msgstr "(brez zadeve)"
 
-#: ../em-format/e-mail-formatter-headers.c:328
+#: ../em-format/e-mail-formatter-headers.c:329
 #, c-format
 msgid "This message was sent by %s on behalf of %s"
 msgstr "To sporočilo je poslano z računa %s v imenu %s"
@@ -9717,8 +10441,8 @@ msgstr "Oblikuj del kot sporočilo RFC822"
 #: ../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/cal-config-caldav/e-caldav-chooser.c:1301
+#: ../modules/cal-config-google/e-google-chooser.c:1303
 #: ../modules/plugin-manager/evolution-plugin-manager.c:66
 msgid "Name"
 msgstr "Ime"
@@ -9728,70 +10452,50 @@ msgstr "Ime"
 msgid "Size"
 msgstr "Velikost"
 
-#: ../em-format/e-mail-formatter-print-headers.c:143
-msgid "GPG signed"
-msgstr "Podpisano z GPG"
-
-#: ../em-format/e-mail-formatter-print-headers.c:149
-msgid "GPG encrpyted"
-msgstr "Šifrirano z GPG"
-
-#: ../em-format/e-mail-formatter-print-headers.c:155
-msgid "S/MIME signed"
-msgstr "Podpisano z S/MIME"
-
-#: ../em-format/e-mail-formatter-print-headers.c:161
-msgid "S/MIME encrpyted"
-msgstr "Šifrirano z S/MIME"
-
-#: ../em-format/e-mail-formatter-print-headers.c:170
-#: ../mail/e-mail-config-security-page.c:645
-#: ../modules/mail-config/e-mail-config-remote-accounts.c:194
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:128
-msgid "Security"
-msgstr "Varnost"
-
-#: ../em-format/e-mail-formatter-quote-headers.c:167
-#: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:278
-#: ../mail/em-filter-i18n.h:51 ../mail/message-list.etspec.h:6
-#: ../modules/mail/em-mailer-prefs.c:68
+#: ../em-format/e-mail-formatter-quote-headers.c:174
+#: ../em-format/e-mail-part-headers.c:51 ../mail/e-mail-tag-editor.c:282
+#: ../mail/filtertypes.xml.in.h:16 ../mail/message-list.etspec.h:6
+#: ../mail/searchtypes.xml.in.h:17 ../mail/vfoldertypes.xml.in.h:17
+#: ../modules/mail/em-mailer-prefs.c:67
+#: ../smime/gui/certificate-manager.c:1630
 msgid "Subject"
 msgstr "Zadeva"
 
 #. pseudo-header
-#: ../em-format/e-mail-formatter-quote-headers.c:186
-#: ../em-format/e-mail-formatter-utils.c:342
-#: ../modules/mail/em-mailer-prefs.c:1144
+#: ../em-format/e-mail-formatter-quote-headers.c:193
+#: ../em-format/e-mail-formatter-utils.c:343
+#: ../modules/mail/em-mailer-prefs.c:1166
 msgid "Mailer"
 msgstr "Poštni odjemalec"
 
 #: ../em-format/e-mail-formatter-quote-text-enriched.c:94
-#: ../em-format/e-mail-formatter-text-enriched.c:98
+#: ../em-format/e-mail-formatter-text-enriched.c:102
 msgid "Richtext"
 msgstr "Obogateno besedilo"
 
 #: ../em-format/e-mail-formatter-quote-text-enriched.c:95
-#: ../em-format/e-mail-formatter-text-enriched.c:99
+#: ../em-format/e-mail-formatter-text-enriched.c:103
 msgid "Display part as enriched text"
 msgstr "Prikaži del kot obogateno besedilo"
 
 #: ../em-format/e-mail-formatter-quote-text-html.c:95
-#: ../em-format/e-mail-formatter-text-html.c:359
+#: ../em-format/e-mail-formatter-text-html.c:360
 msgid "HTML"
 msgstr "HTML"
 
 #: ../em-format/e-mail-formatter-quote-text-html.c:96
-#: ../em-format/e-mail-formatter-text-html.c:360
+#: ../em-format/e-mail-formatter-text-html.c:361
 msgid "Format part as HTML"
 msgstr "Oblikuj del kot HTML"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:121
-#: ../em-format/e-mail-formatter-text-plain.c:197
+#: ../em-format/e-mail-formatter-quote-text-plain.c:123
+#: ../em-format/e-mail-formatter-text-plain.c:198
+#: ../e-util/e-html-editor-actions.c:1414
 msgid "Plain Text"
 msgstr "Običajno besedilo"
 
-#: ../em-format/e-mail-formatter-quote-text-plain.c:122
-#: ../em-format/e-mail-formatter-text-plain.c:198
+#: ../em-format/e-mail-formatter-quote-text-plain.c:124
+#: ../em-format/e-mail-formatter-text-plain.c:199
 msgid "Format part as plain text"
 msgstr "Oblikuj del kot običajno besedilo"
 
@@ -9902,7 +10606,7 @@ msgstr ""
 "razumno kratkemu času zelo težko pogledati njegovo vsebino."
 
 #: ../em-format/e-mail-formatter-secure-button.c:187
-#: ../smime/gui/smime-ui.ui.h:22
+#: ../shell/shell.error.xml.h:23 ../smime/gui/smime-ui.ui.h:22
 msgid "_View Certificate"
 msgstr "_Poglej potrdila"
 
@@ -9918,18 +10622,43 @@ msgstr "Izvorna koda"
 msgid "Display source of a MIME part"
 msgstr "Prikaži izvorno kodo dela MIME"
 
-#: ../em-format/e-mail-formatter-utils.c:202
-#: ../em-format/e-mail-formatter-utils.c:219
-#: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:66
+#: ../em-format/e-mail-formatter-utils.c:203
+#: ../em-format/e-mail-formatter-utils.c:220
+#: ../em-format/e-mail-part-headers.c:49 ../modules/mail/em-mailer-prefs.c:65
 msgid "Cc"
 msgstr "Kp"
 
-#: ../em-format/e-mail-formatter-utils.c:203
-#: ../em-format/e-mail-formatter-utils.c:220
-#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:67
+#: ../em-format/e-mail-formatter-utils.c:204
+#: ../em-format/e-mail-formatter-utils.c:221
+#: ../em-format/e-mail-part-headers.c:50 ../modules/mail/em-mailer-prefs.c:66
 msgid "Bcc"
 msgstr "Skp"
 
+#: ../em-format/e-mail-formatter-utils.c:564
+msgid "GPG signed"
+msgstr "Podpisano z GPG"
+
+#: ../em-format/e-mail-formatter-utils.c:570
+#, fuzzy
+msgid "GPG encrypted"
+msgstr "Šifrirano z GPG"
+
+#: ../em-format/e-mail-formatter-utils.c:576
+msgid "S/MIME signed"
+msgstr "Podpisano z S/MIME"
+
+#: ../em-format/e-mail-formatter-utils.c:582
+#, fuzzy
+msgid "S/MIME encrypted"
+msgstr "Šifrirano z S/MIME"
+
+#: ../em-format/e-mail-formatter-utils.c:591
+#: ../mail/e-mail-config-security-page.c:736
+#: ../modules/mail-config/e-mail-config-remote-accounts.c:194
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:144
+msgid "Security"
+msgstr "Varnost"
+
 #: ../em-format/e-mail-parser-application-mbox.c:87
 #, c-format
 msgid "Error parsing MBOX part: %s"
@@ -9940,12 +10669,12 @@ msgstr "Napaka med razčlenjevanjem dela MBOX: %s"
 msgid "Could not parse S/MIME message: %s"
 msgstr "Ni mogoče razčleniti sporočila S/MIME: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:79
+#: ../em-format/e-mail-parser-inlinepgp-encrypted.c:77
 #, c-format
 msgid "Could not parse PGP message: %s"
 msgstr "Ni mogoče razčleniti sporočila PGP: %s"
 
-#: ../em-format/e-mail-parser-inlinepgp-signed.c:82
+#: ../em-format/e-mail-parser-inlinepgp-signed.c:80
 #: ../em-format/e-mail-parser-multipart-signed.c:135
 #, c-format
 msgid "Error verifying signature: %s"
@@ -9998,358 +10727,42 @@ msgstr "Ni mogoče razčleniti sporočila PGP/MIME: %s"
 msgid "Unsupported signature format"
 msgstr "Nepodprta oblika podpisa"
 
-#: ../em-format/e-mail-part-headers.c:47 ../modules/mail/em-mailer-prefs.c:64
+#: ../em-format/e-mail-part-headers.c:47 ../modules/mail/em-mailer-prefs.c:63
 msgid "Reply-To"
 msgstr "Odgovori-na"
 
 #: ../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
+#: ../modules/mail/em-mailer-prefs.c:68
 msgid "Date"
 msgstr "Datum"
 
-#: ../em-format/e-mail-part-headers.c:53 ../modules/mail/em-mailer-prefs.c:70
+#: ../em-format/e-mail-part-headers.c:53 ../modules/mail/em-mailer-prefs.c:69
 msgid "Newsgroups"
 msgstr "Novičarske skupine"
 
-#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:71
+#: ../em-format/e-mail-part-headers.c:54 ../modules/mail/em-mailer-prefs.c:70
 #: ../plugins/face/org-gnome-face.eplug.xml.h:1
 msgid "Face"
 msgstr "Obraz"
 
-#: ../em-format/e-mail-part-utils.c:508
+#: ../em-format/e-mail-part-utils.c:544
 #, c-format
 msgid "%s attachment"
 msgstr "priloga %s"
 
-#: ../e-util/e-send-options.ui.h:3
-msgid "Standard"
-msgstr "Običajno"
-
-#: ../e-util/e-send-options.ui.h:6
-msgid "Proprietary"
-msgstr "Lastniško"
-
-#: ../e-util/e-send-options.ui.h:8
-msgid "Secret"
-msgstr "Skrivnost"
-
-#: ../e-util/e-send-options.ui.h:9
-msgid "Top Secret"
-msgstr "Najstrožja skrivnost"
-
-#: ../e-util/e-send-options.ui.h:10
-msgid "For Your Eyes Only"
-msgstr "Le za vaše oči"
-
-#. Translators: Used in send options dialog
-#: ../e-util/e-send-options.ui.h:12
-msgctxt "send-options"
-msgid "None"
-msgstr "Brez"
-
-#: ../e-util/e-send-options.ui.h:13
-msgid "Mail Receipt"
-msgstr "Poštna povratnica"
-
-#: ../e-util/e-send-options.ui.h:15
-msgid "R_eply requested"
-msgstr "_Zahtevan odgovor"
-
-#: ../e-util/e-send-options.ui.h:16
-msgctxt "ESendOptionsWithin"
-msgid "Wi_thin"
-msgstr "Zno_traj"
-
-#: ../e-util/e-send-options.ui.h:17
-msgctxt "ESendOptionsWithin"
-msgid "days"
-msgstr "dni"
-
-#: ../e-util/e-send-options.ui.h:18
-msgid "_When convenient"
-msgstr "_Ko je pripravno"
-
-#: ../e-util/e-send-options.ui.h:19 ../e-util/e-filter-rule.c:847
-msgid "Replies"
-msgstr "Odgovori"
-
-#: ../e-util/e-send-options.ui.h:20
-msgid "_Delay message delivery"
-msgstr "Za_drži dostavo sporočila"
-
-#: ../e-util/e-send-options.ui.h:21
-msgctxt "ESendOptionsAfter"
-msgid "_After"
-msgstr "_Po"
-
-#: ../e-util/e-send-options.ui.h:22
-msgctxt "ESendOptionsAfter"
-msgid "days"
-msgstr "dni"
-
-#: ../e-util/e-send-options.ui.h:23
-msgid "_Set expiration date"
-msgstr "Na_stavi čas poteka"
-
-#: ../e-util/e-send-options.ui.h:24
-msgctxt "ESendOptions"
-msgid "_Until"
-msgstr "_Do"
-
-#: ../e-util/e-send-options.ui.h:25
-msgid "Delivery Options"
-msgstr "Možnosti dostave"
-
-#: ../e-util/e-send-options.ui.h:26
-msgid "_Priority:"
-msgstr "_Prednost:"
-
-#: ../e-util/e-send-options.ui.h:27
-msgid "_Classification:"
-msgstr "_Razvrstitev:"
-
-#: ../e-util/e-send-options.ui.h:28
-msgid "Gene_ral Options"
-msgstr "Splošne _možnosti"
-
-#: ../e-util/e-send-options.ui.h:29
-msgid "Creat_e a sent item to track information"
-msgstr "Ustvari poslani predm_et za sledenje podatkov"
-
-#: ../e-util/e-send-options.ui.h:30
-msgid "_Delivered"
-msgstr "_Dostavljeno"
-
-#: ../e-util/e-send-options.ui.h:31
-msgid "Deli_vered and opened"
-msgstr "Dosta_vljeno in odprto"
-
-#: ../e-util/e-send-options.ui.h:32
-msgid "_All information"
-msgstr "_Vsi podatki"
-
-#: ../e-util/e-send-options.ui.h:33
-msgid "A_uto-delete sent item"
-msgstr "S_amodejno izbriši poslani predmet"
-
-#: ../e-util/e-send-options.ui.h:34
-msgid "Status Tracking"
-msgstr "Sledenje stanja"
-
-#: ../e-util/e-send-options.ui.h:35
-msgid "_When opened:"
-msgstr "_Ko je odprto:"
-
-#: ../e-util/e-send-options.ui.h:36
-msgid "When decli_ned:"
-msgstr "Ko je odklo_njeno:"
-
-#: ../e-util/e-send-options.ui.h:37
-msgid "When co_mpleted:"
-msgstr "Ko je ko_nčano:"
-
-#: ../e-util/e-send-options.ui.h:38
-msgid "When acce_pted:"
-msgstr "Ko je s_prejeto:"
-
-#: ../e-util/e-send-options.ui.h:39
-msgid "Return Notification"
-msgstr "Povratno obvestilo"
-
-#: ../e-util/e-send-options.ui.h:40
-msgid "Sta_tus Tracking"
-msgstr "Sledenje s_tanja"
-
-#: ../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 "_Apply"
-msgstr "_Uveljavi"
-
-#: ../e-util/e-table-config.ui.h:4
-msgid "_Sort..."
-msgstr "_Razvrsti ..."
-
-#: ../e-util/e-table-config.ui.h:5
-msgid "_Group By..."
-msgstr "Z_druži po ..."
-
-#: ../e-util/e-table-config.ui.h:6
-msgid "_Fields Shown..."
-msgstr "_Prikazana polja ..."
-
-#: ../e-util/e-table-config.ui.h:9
-msgid "Clear _All"
-msgstr "Počisti _vse"
-
-#: ../e-util/e-table-config.ui.h:10
-msgid "_Show field in View"
-msgstr "_Pokaži polje v meniju pogleda"
-
-#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1753
-msgid "Ascending"
-msgstr "Naraščajoče"
-
-#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1753
-msgid "Descending"
-msgstr "Padajoče"
-
-#: ../e-util/e-table-config.ui.h:13
-msgid "Group Items By"
-msgstr "Združi predmete po"
-
-#: ../e-util/e-table-config.ui.h:14
-msgid "Show _field in View"
-msgstr "Pokaži po_lje v meniju pogleda"
-
-#: ../e-util/e-table-config.ui.h:15
-msgid "Then By"
-msgstr "in nato po"
-
-#: ../e-util/e-table-config.ui.h:16
-msgid "Show field i_n View"
-msgstr "Pokaži polje _v meniju pogleda"
-
-#: ../e-util/e-table-config.ui.h:17
-msgid "Show field in _View"
-msgstr "Pokaži polje v _meniju pogleda"
-
-#: ../e-util/e-table-config.ui.h:18
-msgid "Sort"
-msgstr "Razvrsti"
-
-#: ../e-util/e-table-config.ui.h:19
-msgid "Clear All"
-msgstr "Počisti vse"
-
-#: ../e-util/e-table-config.ui.h:20
-msgid "Sort Items By"
-msgstr "Razvrsti predmete po"
-
-#: ../e-util/e-timezone-dialog.ui.h:1
-msgid "Select a Time Zone"
-msgstr "Izbor časovnega pasu"
-
-#: ../e-util/e-timezone-dialog.ui.h:4
-msgid ""
-"Use the left mouse button to zoom in on an area of the map and select a time "
-"zone.\n"
-"Use the right mouse button to zoom out."
-msgstr ""
-"Uporabite lev miškin gumb za približanje območja zemljevida in izbiro "
-"časovnega pasu.\n"
-"Uporabite desni miškin gumb za oddaljevanje."
-
-#: ../e-util/e-timezone-dialog.ui.h:6
-msgid "Time Zones"
-msgstr "Časovni pasovi"
-
-#: ../e-util/e-timezone-dialog.ui.h:7
-msgid "_Selection"
-msgstr "_Izbor"
-
-#: ../e-util/e-timezone-dialog.ui.h:8
-msgid "Timezone drop-down combination box"
-msgstr "Spustni meni časovnih pasov"
-
-#: ../e-util/filter.ui.h:1 ../e-util/e-filter-rule.c:1243
-#: ../mail/em-utils.c:229
-msgid "Incoming"
-msgstr "Dohodna"
-
-#: ../e-util/filter.ui.h:2
-msgid "the current time"
-msgstr "trenutni čas"
-
-#: ../e-util/filter.ui.h:3
-msgid "the time you specify"
-msgstr "čas, ki ga navedete"
-
-#: ../e-util/filter.ui.h:4
-msgid "a time relative to the current time"
-msgstr "čas relativno na trenutni čas"
-
-#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:83
-msgid "seconds"
-msgstr "sekund"
-
-#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
-msgid "weeks"
-msgstr "tednov"
-
-#: ../e-util/filter.ui.h:10
-#: ../plugins/publish-calendar/publish-calendar.ui.h:8
-msgid "months"
-msgstr "mesecev"
-
-#: ../e-util/filter.ui.h:11
-msgid "years"
-msgstr "let"
-
-#: ../e-util/filter.ui.h:12
-msgid "ago"
-msgstr "nazaj"
-
-#: ../e-util/filter.ui.h:13
-msgid "in the future"
-msgstr "v prihodnosti"
-
-#: ../e-util/filter.ui.h:14
-msgid "Show filters for mail:"
-msgstr "Pokaži filtre za pošto:"
-
-#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
-msgid "_Filter Rules"
-msgstr "Pravila _filtriranja"
-
-#: ../e-util/filter.ui.h:23
-msgid "Compare against"
-msgstr "Primerjaj z"
-
-#: ../e-util/filter.ui.h:24
-msgid ""
-"The message's date will be compared against\n"
-"the current time when filtering occurs."
-msgstr ""
-"Datum tega sporočila bo primerjan s trenutnim\n"
-"časom, ko se izvede filtriranje."
-
-#: ../e-util/filter.ui.h:26
-msgid ""
-"The message's date will be compared against\n"
-"12:00am of the date specified."
-msgstr ""
-"Datum tega sporočila bo primerjan s časom\n"
-"12:00 na navedeni datum."
-
-#: ../e-util/filter.ui.h:28
-msgid ""
-"The message's date will be compared against\n"
-"a time relative to when filtering occurs."
-msgstr ""
-"Datum tega sporočila bo primerjan s časom,\n"
-"relativnim na časa filtriranja."
-
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
-msgid "_Create new view"
-msgstr "Ustvari _nov pogled"
-
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:2
-#: ../e-util/e-mail-signature-script-dialog.c:416
-#: ../mail/e-mail-config-identity-page.c:310
-#: ../mail/e-mail-config-summary-page.c:340
-msgid "_Name:"
-msgstr "_Ime:"
+#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
+msgid "%d %B %Y"
+msgstr "%d. %B %Y"
 
-#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
-msgid "_Replace existing view"
-msgstr "_Zamenjaj obstoječi pogled"
+#: ../e-util/ea-calendar-item.c:326
+#, c-format
+msgid "Calendar: from %s to %s"
+msgstr "Koledar: od %s do %s"
 
-#: ../e-util/e-activity-proxy.c:308
-#: ../modules/mail/e-mail-shell-view-actions.c:1724
-msgid "Cancel"
-msgstr "Prekliči"
+#: ../e-util/ea-calendar-item.c:363
+msgid "evolution calendar item"
+msgstr "predmet koledarja evolution"
 
 #. Translators: This is a cancelled activity.
 #: ../e-util/e-activity.c:258
@@ -10381,24 +10794,97 @@ msgstr "%s (v postopku preklica)"
 msgid "%s"
 msgstr "%s"
 
+#. Translators: This is a running activity whose percent complete is known.
 #: ../e-util/e-activity.c:275
+#: ../modules/calendar/e-cal-base-shell-content.c:144
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% končano)"
 
+#: ../e-util/e-activity-proxy.c:352
+#: ../modules/mail/e-mail-shell-view-actions.c:1779
+msgid "Cancel"
+msgstr "Prekliči"
+
 #. Translators: Escape is a keyboard binding.
 #: ../e-util/e-alert-bar.c:118
 msgid "Close this message (Escape)"
 msgstr "Zapri to sporočilo (ubežna tipka)"
 
-#: ../e-util/e-attachment-bar.c:659 ../e-util/e-attachment-paned.c:702
+#: ../e-util/e-alert-sink.c:246
+#, fuzzy
+msgid "Failed to create a thread: "
+msgstr "Označevanje sporočila kot prebranega je spodletelo."
+
+#: ../e-util/e-attachment-bar.c:660 ../e-util/e-attachment-paned.c:736
 msgid "Icon View"
 msgstr "Ikonski pogled"
 
-#: ../e-util/e-attachment-bar.c:661 ../e-util/e-attachment-paned.c:704
+#: ../e-util/e-attachment-bar.c:662 ../e-util/e-attachment-paned.c:738
 msgid "List View"
 msgstr "Seznamski pogled"
 
+#. To Translators: This text is set as a description of an attached
+#. * message when, for example, attaching it to a composer. When the
+#. * message to be attached has also filled Subject, then this text is
+#. * of form "Attached message - Subject", otherwise it's left as is.
+#: ../e-util/e-attachment.c:1197
+msgid "Attached message"
+msgstr "Priloženo sporočilo"
+
+#: ../e-util/e-attachment.c:2104 ../e-util/e-attachment.c:3101
+#, fuzzy
+msgid "Operation was cancelled"
+msgstr "Uvoz je preklican."
+
+#. Translators: Default attachment filename.
+#: ../e-util/e-attachment.c:2264 ../e-util/e-attachment.c:2963
+#: ../e-util/e-attachment.c:3334 ../e-util/e-attachment-store.c:691
+msgid "attachment.dat"
+msgstr "priloga.dat"
+
+#: ../e-util/e-attachment.c:2345 ../e-util/e-attachment.c:3394
+msgid "A load operation is already in progress"
+msgstr "Dejanje nalaganja je že v teku"
+
+#: ../e-util/e-attachment.c:2353 ../e-util/e-attachment.c:3402
+msgid "A save operation is already in progress"
+msgstr "Dejanje shranjevanja je že v teku"
+
+#: ../e-util/e-attachment.c:2473
+#, c-format
+msgid "Could not load '%s'"
+msgstr "Ni mogoče naložiti '%s'"
+
+#: ../e-util/e-attachment.c:2476
+#, c-format
+msgid "Could not load the attachment"
+msgstr "Ni mogoče naložiti priloge"
+
+#: ../e-util/e-attachment.c:2761
+#, c-format
+msgid "Could not open '%s'"
+msgstr "Ni mogoče odpreti '%s'"
+
+#: ../e-util/e-attachment.c:2764
+#, c-format
+msgid "Could not open the attachment"
+msgstr "Ni mogoče odpreti priloge"
+
+#: ../e-util/e-attachment.c:3411
+msgid "Attachment contents not loaded"
+msgstr "Vsebina priloge ni naložena"
+
+#: ../e-util/e-attachment.c:3502
+#, c-format
+msgid "Could not save '%s'"
+msgstr "Ni mogoče shraniti '%s'"
+
+#: ../e-util/e-attachment.c:3505
+#, c-format
+msgid "Could not save the attachment"
+msgstr "Ni mogoče shraniti priloge"
+
 #: ../e-util/e-attachment-dialog.c:317
 msgid "Attachment Properties"
 msgstr "Lastnosti priloge"
@@ -10411,45 +10897,49 @@ msgstr "_Ime datoteke:"
 msgid "MIME Type:"
 msgstr "Vrsta MIME:"
 
-#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:482
+#: ../e-util/e-attachment-dialog.c:382 ../e-util/e-attachment-store.c:521
 msgid "_Suggest automatic display of attachment"
 msgstr "Predlagaj _samodejen prikaz prilog"
 
-#: ../e-util/e-attachment-handler-image.c:96
+#: ../e-util/e-attachment-handler-image.c:98
 msgid "Could not set as background"
 msgstr "Ni mogoče nastaviti kot ozadje"
 
-#: ../e-util/e-attachment-handler-image.c:146
+#: ../e-util/e-attachment-handler-image.c:148
 msgid "Set as _Background"
 msgstr "Nastavi kot _ozadje"
 
-#: ../e-util/e-attachment-icon-view.c:165
+#: ../e-util/e-attachment-icon-view.c:168
 #: ../e-util/e-attachment-tree-view.c:548
 msgid "Loading"
 msgstr "Nalaganje"
 
-#: ../e-util/e-attachment-icon-view.c:177
+#: ../e-util/e-attachment-icon-view.c:180
 #: ../e-util/e-attachment-tree-view.c:560
 msgid "Saving"
 msgstr "Shranjevanje"
 
-#: ../e-util/e-attachment-paned.c:103
+#: ../e-util/e-attachment-paned.c:107
 msgid "Hide Attachment _Bar"
 msgstr "Skrij _vrstico prilog"
 
-#: ../e-util/e-attachment-paned.c:105 ../e-util/e-attachment-paned.c:718
+#: ../e-util/e-attachment-paned.c:116 ../e-util/e-attachment-paned.c:752
 msgid "Show Attachment _Bar"
 msgstr "Pokaži _vrstico prilog"
 
-#: ../e-util/e-attachment-store.c:462
+#: ../e-util/e-attachment-store.c:486
 msgid "Add Attachment"
 msgstr "Doda prilogo"
 
-#: ../e-util/e-attachment-store.c:465
+#: ../e-util/e-attachment-store.c:493 ../e-util/e-attachment-store.c:495
 msgid "A_ttach"
 msgstr "_Priloži"
 
-#: ../e-util/e-attachment-store.c:536
+#: ../e-util/e-attachment-store.c:533
+msgid "Archive selected directories using this format:"
+msgstr ""
+
+#: ../e-util/e-attachment-store.c:626
 msgid "Save Attachment"
 msgid_plural "Save Attachments"
 msgstr[0] "Shrani priloge"
@@ -10457,11 +10947,18 @@ msgstr[1] "Shrani prilogo"
 msgstr[2] "Shrani prilogi"
 msgstr[3] "Shrani priloge"
 
-#. Translators: Default attachment filename.
-#: ../e-util/e-attachment-store.c:567 ../e-util/e-attachment.c:2058
-#: ../e-util/e-attachment.c:2721
-msgid "attachment.dat"
-msgstr "priloga.dat"
+#: ../e-util/e-attachment-store.c:653
+#, fuzzy
+msgid "Do _not extract files from the attachment"
+msgstr "Ni mogoče naložiti priloge"
+
+#: ../e-util/e-attachment-store.c:658
+msgid "Save extracted files _only"
+msgstr ""
+
+#: ../e-util/e-attachment-store.c:663
+msgid "Save extracted files and the original _archive"
+msgstr ""
 
 #: ../e-util/e-attachment-view.c:377
 msgid "Open With Other Application..."
@@ -10487,12 +10984,12 @@ msgid "A_dd Attachment..."
 msgstr "Dod_aj prilogo ..."
 
 #: ../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
+#: ../modules/addressbook/e-book-shell-view-actions.c:1071
+#: ../modules/calendar/e-cal-shell-view-actions.c:1240
+#: ../modules/calendar/e-memo-shell-view-actions.c:571
+#: ../modules/calendar/e-task-shell-view-actions.c:696
+#: ../modules/mail/e-mail-shell-view-actions.c:1580
+#: ../modules/mail/e-mail-shell-view-actions.c:1651
 msgid "_Properties"
 msgstr "_Lastnosti"
 
@@ -10522,56 +11019,6 @@ msgstr "Odpri z \"%s\""
 msgid "Open this attachment in %s"
 msgstr "Odpri prilogo v %s"
 
-#. To Translators: This text is set as a description of an attached
-#. * message when, for example, attaching it to a composer. When the
-#. * message to be attached has also filled Subject, then this text is
-#. * of form "Attached message - Subject", otherwise it's left as is.
-#: ../e-util/e-attachment.c:1108
-msgid "Attached message"
-msgstr "Priloženo sporočilo"
-
-#: ../e-util/e-attachment.c:2139 ../e-util/e-attachment.c:3027
-msgid "A load operation is already in progress"
-msgstr "Dejanje nalaganja je že v teku"
-
-#: ../e-util/e-attachment.c:2147 ../e-util/e-attachment.c:3035
-msgid "A save operation is already in progress"
-msgstr "Dejanje shranjevanja je že v teku"
-
-#: ../e-util/e-attachment.c:2267
-#, c-format
-msgid "Could not load '%s'"
-msgstr "Ni mogoče naložiti '%s'"
-
-#: ../e-util/e-attachment.c:2270
-#, c-format
-msgid "Could not load the attachment"
-msgstr "Ni mogoče naložiti priloge"
-
-#: ../e-util/e-attachment.c:2574
-#, c-format
-msgid "Could not open '%s'"
-msgstr "Ni mogoče odpreti '%s'"
-
-#: ../e-util/e-attachment.c:2577
-#, c-format
-msgid "Could not open the attachment"
-msgstr "Ni mogoče odpreti priloge"
-
-#: ../e-util/e-attachment.c:3044
-msgid "Attachment contents not loaded"
-msgstr "Vsebina priloge ni naložena"
-
-#: ../e-util/e-attachment.c:3124
-#, c-format
-msgid "Could not save '%s'"
-msgstr "Ni mogoče shraniti '%s'"
-
-#: ../e-util/e-attachment.c:3127
-#, c-format
-msgid "Could not save the attachment"
-msgstr "Ni mogoče shraniti priloge"
-
 #: ../e-util/e-book-source-config.c:97
 msgid "Mark as default address book"
 msgstr "Označi kot privzet imenik"
@@ -10589,6 +11036,44 @@ msgstr "Kopiraj vsebino knjige krajevno za nepovezano opravilo"
 msgid "Ctrl-click to open a link"
 msgstr "S Ctrl+klikom se odpre povezava"
 
+#: ../e-util/e-calendar.c:195
+msgid "Previous month"
+msgstr "Predhodni mesec"
+
+#: ../e-util/e-calendar.c:220
+msgid "Next month"
+msgstr "Naslednji mesec"
+
+#: ../e-util/e-calendar.c:246
+msgid "Previous year"
+msgstr "Predhodno leto"
+
+#: ../e-util/e-calendar.c:271
+msgid "Next year"
+msgstr "Naslednje leto"
+
+#: ../e-util/e-calendar.c:295
+msgid "Month Calendar"
+msgstr "Mesečni koledar"
+
+#. This is a strftime() format. %B = Month name.
+#: ../e-util/e-calendar-item.c:1323 ../e-util/e-calendar-item.c:2201
+msgctxt "CalItem"
+msgid "%B"
+msgstr "%B"
+
+#. This is a strftime() format. %Y = Year.
+#: ../e-util/e-calendar-item.c:1325
+msgctxt "CalItem"
+msgid "%Y"
+msgstr "%Y"
+
+#. This is a strftime() format. %B = Month name, %Y = Year.
+#: ../e-util/e-calendar-item.c:1362
+msgctxt "CalItem"
+msgid "%B %Y"
+msgstr "%B %Y"
+
 #: ../e-util/e-cal-source-config.c:169
 msgid "Mark as default calendar"
 msgstr "Označi kot privzet koledar"
@@ -10617,44 +11102,6 @@ msgstr "Kopiraj vsebino seznama nalog krajevno za delo brez povezave"
 msgid "Copy memo list contents locally for offline operation"
 msgstr "Kopiraj vsebino opomnikov krajevno za delo brez povezave"
 
-#. This is a strftime() format. %B = Month name.
-#: ../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:1328
-msgctxt "CalItem"
-msgid "%Y"
-msgstr "%Y"
-
-#. This is a strftime() format. %B = Month name, %Y = Year.
-#: ../e-util/e-calendar-item.c:1365
-msgctxt "CalItem"
-msgid "%B %Y"
-msgstr "%B %Y"
-
-#: ../e-util/e-calendar.c:189
-msgid "Previous month"
-msgstr "Predhodni mesec"
-
-#: ../e-util/e-calendar.c:214
-msgid "Next month"
-msgstr "Naslednji mesec"
-
-#: ../e-util/e-calendar.c:240
-msgid "Previous year"
-msgstr "Predhodno leto"
-
-#: ../e-util/e-calendar.c:265
-msgid "Next year"
-msgstr "Naslednje leto"
-
-#: ../e-util/e-calendar.c:289
-msgid "Month Calendar"
-msgstr "Mesečni koledar"
-
 #: ../e-util/e-categories-editor.c:223
 msgid "Currently _used categories:"
 msgstr "Trenutno _uporabljene kategorije:"
@@ -10663,17 +11110,26 @@ msgstr "Trenutno _uporabljene kategorije:"
 msgid "_Available Categories:"
 msgstr "Razpoložljive _kategorije"
 
-#: ../e-util/e-categories-editor.c:274 ../mail/em-folder-selector.c:269
-#: ../plugins/mail-to-task/mail-to-task.c:595
-#: ../shell/e-shell-window-actions.c:1100
+#: ../e-util/e-categories-editor.c:274
+msgctxt "category"
 msgid "_New"
-msgstr "_Nova"
+msgstr "_Novo"
+
+#: ../e-util/e-categories-editor.c:278
+msgctxt "category"
+msgid "_Edit"
+msgstr "_Uredi"
 
-#: ../e-util/e-categories-selector.c:321
+#: ../e-util/e-categories-editor.c:282
+msgctxt "category"
+msgid "_Delete"
+msgstr "_Izbriši"
+
+#: ../e-util/e-categories-selector.c:322
 msgid "Icon"
 msgstr "Ikona"
 
-#: ../e-util/e-category-completion.c:299
+#: ../e-util/e-category-completion.c:307
 #, c-format
 msgid "Create category \"%s\""
 msgstr "Ustvari kategorijo \"%s\""
@@ -10710,13 +11166,17 @@ msgstr ""
 msgid "popup list"
 msgstr "pojavni seznam"
 
+#: ../e-util/e-cell-date.c:52 ../mail/message-list.c:2033
+msgid "?"
+msgstr "?"
+
 #: ../e-util/e-cell-date-edit.c:298
 msgid "Now"
 msgstr "Zdaj"
 
 #. strftime format of a weekday and a date.
 #: ../e-util/e-cell-date-edit.c:306 ../e-util/e-datetime-format.c:208
-#: ../modules/calendar/e-cal-shell-view-actions.c:1899
+#: ../modules/calendar/e-cal-shell-view-actions.c:1740
 #: ../modules/itip-formatter/itip-view.c:223
 msgid "Today"
 msgstr "Danes"
@@ -10737,26 +11197,10 @@ msgstr "V redu"
 msgid "The time must be in the format: %s"
 msgstr "Datum mora biti v obliki: %s"
 
-#: ../e-util/e-cell-date.c:50 ../mail/message-list.c:1853
-msgid "?"
-msgstr "?"
-
 #: ../e-util/e-cell-percent.c:81
 msgid "The percent value must be between 0 and 100, inclusive"
 msgstr "Vrednost v odstotkih mora biti med vključno 0 in 100"
 
-#: ../e-util/e-charset-combo-box.c:99
-msgid "Character Encoding"
-msgstr "Znakovno kodiranje"
-
-#: ../e-util/e-charset-combo-box.c:122
-msgid "Enter the character set to use"
-msgstr "Vnesite nabor znakov, ki naj se uporablja"
-
-#: ../e-util/e-charset-combo-box.c:368
-msgid "Other..."
-msgstr "Drugo ..."
-
 #: ../e-util/e-charset.c:52
 msgid "Arabic"
 msgstr "Arabsko"
@@ -10834,11 +11278,197 @@ msgstr "Ukrajinsko"
 msgid "Visual"
 msgstr "Vidno"
 
-#: ../e-util/e-client-cache.c:1189
+#: ../e-util/e-charset-combo-box.c:99
+msgid "Character Encoding"
+msgstr "Znakovno kodiranje"
+
+#: ../e-util/e-charset-combo-box.c:119
+msgid "Enter the character set to use"
+msgstr "Vnesite nabor znakov, ki naj se uporablja"
+
+#: ../e-util/e-charset-combo-box.c:365
+msgid "Other..."
+msgstr "Drugo ..."
+
+#: ../e-util/e-client-cache.c:1266
 #, c-format
 msgid "Cannot create a client object from extension name '%s'"
 msgstr "Iz imena pripone '%s' ni mogoče ustvariti predmeta odjemalca"
 
+#: ../e-util/e-color-chooser-widget.c:124
+#, fuzzy
+msgid "Choose custom color"
+msgstr "Uporabi pisave po meri"
+
+#: ../e-util/e-color-combo.c:81
+msgid "black"
+msgstr "črna"
+
+#: ../e-util/e-color-combo.c:82
+msgid "light brown"
+msgstr "svetlorjava"
+
+#: ../e-util/e-color-combo.c:83
+msgid "brown gold"
+msgstr "zlatorjava"
+
+#: ../e-util/e-color-combo.c:84
+msgid "dark green #2"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:85
+msgid "navy"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:86
+msgid "dark blue"
+msgstr "temno modra"
+
+#: ../e-util/e-color-combo.c:87
+msgid "purple #2"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:88
+msgid "very dark gray"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:90
+msgid "dark red"
+msgstr "temnordeča"
+
+#: ../e-util/e-color-combo.c:91
+msgid "red-orange"
+msgstr "oranžno rdeča"
+
+#: ../e-util/e-color-combo.c:92
+msgid "gold"
+msgstr "zlata"
+
+#: ../e-util/e-color-combo.c:93
+msgid "dark green"
+msgstr "temno zelena"
+
+#: ../e-util/e-color-combo.c:94
+msgid "dull blue"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:95
+msgid "blue"
+msgstr "modra"
+
+#: ../e-util/e-color-combo.c:96
+msgid "dull purple"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:97
+msgid "dark grey"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:99
+msgid "red"
+msgstr "rdeča"
+
+#: ../e-util/e-color-combo.c:100
+msgid "orange"
+msgstr "oranžna"
+
+#: ../e-util/e-color-combo.c:101
+msgid "lime"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:102
+msgid "dull green"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:103
+msgid "dull blue #2"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:104
+msgid "sky blue #2"
+msgstr "nebesno modra"
+
+#: ../e-util/e-color-combo.c:105
+msgid "purple"
+msgstr "škrlatna"
+
+#: ../e-util/e-color-combo.c:106
+msgid "gray"
+msgstr "siva"
+
+#: ../e-util/e-color-combo.c:108
+#, fuzzy
+msgid "magenta"
+msgstr "Slika"
+
+#: ../e-util/e-color-combo.c:109
+msgid "bright orange"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:110
+msgid "yellow"
+msgstr "rumena"
+
+#: ../e-util/e-color-combo.c:111
+msgid "green"
+msgstr "zelena"
+
+#: ../e-util/e-color-combo.c:112
+msgid "cyan"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:113
+msgid "bright blue"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:114
+#, fuzzy
+msgid "red purple"
+msgstr "Za_htevani ljudje"
+
+#: ../e-util/e-color-combo.c:115
+msgid "light grey"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:117
+msgid "pink"
+msgstr "roza"
+
+#: ../e-util/e-color-combo.c:118
+msgid "light orange"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:119
+msgid "light yellow"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:120
+msgid "light green"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:121
+msgid "light cyan"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:122
+msgid "light blue"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:123
+msgid "light purple"
+msgstr ""
+
+#: ../e-util/e-color-combo.c:124
+msgid "white"
+msgstr "bela"
+
+#: ../e-util/e-color-combo.c:639 ../mail/e-mail-account-tree-view.c:134
+#: ../mail/e-mail-config-security-page.c:426
+#: ../mail/e-mail-config-security-page.c:566 ../mail/e-mail-reader.c:3858
+#: ../mail/mail-config.ui.h:69
+msgid "Default"
+msgstr "Privzeto"
+
 #: ../e-util/e-dateedit.c:523
 msgid "Date and Time"
 msgstr "Datum in čas"
@@ -10954,15 +11584,123 @@ msgctxt "DateFmt"
 msgid "Next Sun"
 msgstr "Naslednja ned"
 
-#: ../e-util/e-datetime-format.c:352 ../e-util/e-datetime-format.c:362
-#: ../e-util/e-datetime-format.c:371
+#: ../e-util/e-datetime-format.c:351 ../e-util/e-datetime-format.c:361
+#: ../e-util/e-datetime-format.c:370
 msgid "Use locale default"
 msgstr "Uporabi privzete nastavitve jezikovne oznake"
 
-#: ../e-util/e-datetime-format.c:576
+#: ../e-util/e-datetime-format.c:575
 msgid "Format:"
 msgstr "Oblika:"
 
+#. Translators: :-)
+#: ../e-util/e-emoticon-chooser.c:40
+msgid "_Smile"
+msgstr ""
+
+#. Translators: :-(
+#: ../e-util/e-emoticon-chooser.c:42
+msgid "S_ad"
+msgstr ""
+
+#. Translators: ;-)
+#: ../e-util/e-emoticon-chooser.c:44
+#, fuzzy
+msgid "_Wink"
+msgstr "_Okno"
+
+#. Translators: :-P
+#: ../e-util/e-emoticon-chooser.c:46
+msgid "Ton_gue"
+msgstr ""
+
+#. Translators: :-))
+#: ../e-util/e-emoticon-chooser.c:48
+msgid "Laug_h"
+msgstr ""
+
+#. Translators: :-|
+#: ../e-util/e-emoticon-chooser.c:50
+#, fuzzy
+msgid "_Plain"
+msgstr "_Običajno besedilo"
+
+#. Translators: :-!
+#: ../e-util/e-emoticon-chooser.c:52
+msgid "Smi_rk"
+msgstr ""
+
+#. Translators: :"-)
+#: ../e-util/e-emoticon-chooser.c:54
+msgid "_Embarrassed"
+msgstr ""
+
+#. Translators: :-D
+#: ../e-util/e-emoticon-chooser.c:56
+msgid "_Big Smile"
+msgstr ""
+
+#. Translators: :-/
+#: ../e-util/e-emoticon-chooser.c:58
+msgid "Uncer_tain"
+msgstr ""
+
+#. Translators: :-O
+#: ../e-util/e-emoticon-chooser.c:60
+msgid "S_urprise"
+msgstr ""
+
+#. Translators: :-S
+#: ../e-util/e-emoticon-chooser.c:62
+msgid "W_orried"
+msgstr ""
+
+#. Translators: :-*
+#: ../e-util/e-emoticon-chooser.c:64
+msgid "_Kiss"
+msgstr ""
+
+#. Translators: X-(
+#: ../e-util/e-emoticon-chooser.c:66
+msgid "A_ngry"
+msgstr ""
+
+#. Translators: B-)
+#: ../e-util/e-emoticon-chooser.c:68
+msgid "_Cool"
+msgstr ""
+
+#. Translators: O:-)
+#: ../e-util/e-emoticon-chooser.c:70
+msgid "Ange_l"
+msgstr ""
+
+#. Translators: :'(
+#: ../e-util/e-emoticon-chooser.c:72
+msgid "Cr_ying"
+msgstr ""
+
+#. Translators: :-Q
+#: ../e-util/e-emoticon-chooser.c:74
+msgid "S_ick"
+msgstr ""
+
+#. Translators: |-)
+#: ../e-util/e-emoticon-chooser.c:76
+msgid "Tire_d"
+msgstr ""
+
+#. Translators: >:-)
+#: ../e-util/e-emoticon-chooser.c:78
+msgid "De_vilish"
+msgstr ""
+
+#. Translators: :-(|)
+#: ../e-util/e-emoticon-chooser.c:80
+#, fuzzy
+msgid "_Monkey"
+msgstr "po_n"
+
 #: ../e-util/e-file-utils.c:120
 msgid "(Unknown Filename)"
 msgstr "(Neznano ime datoteke)"
@@ -11130,23 +11868,23 @@ msgstr "Izberite čas s katerim naj se primerja"
 msgid "Choose a File"
 msgstr "Izbor datoteke"
 
-#: ../e-util/e-filter-rule.c:750
+#: ../e-util/e-filter-rule.c:751
 msgid "R_ule name:"
 msgstr "Ime _pravila:"
 
-#: ../e-util/e-filter-rule.c:800
+#: ../e-util/e-filter-rule.c:801
 msgid "all the following conditions"
 msgstr "vsi naslednji pogoji"
 
-#: ../e-util/e-filter-rule.c:801
+#: ../e-util/e-filter-rule.c:802
 msgid "any of the following conditions"
 msgstr "katerikoli od naslednjih pogojev"
 
-#: ../e-util/e-filter-rule.c:807
+#: ../e-util/e-filter-rule.c:808
 msgid "_Find items which match:"
 msgstr "_Najdi predmete, ki se ujemajo z:"
 
-#: ../e-util/e-filter-rule.c:830
+#: ../e-util/e-filter-rule.c:831
 msgid "Find items that meet the following conditions"
 msgstr "Najdi predmete, ki ustrezajo naslednjim pogojem"
 
@@ -11154,38 +11892,1149 @@ msgstr "Najdi predmete, ki ustrezajo naslednjim pogojem"
 #. * part of "Include threads: None"
 #. protocol:
 #. name:
-#: ../e-util/e-filter-rule.c:845 ../e-util/e-mail-identity-combo-box.c:473
-#: ../e-util/e-mail-signature-combo-box.c:368 ../e-util/e-proxy-editor.c:549
+#: ../e-util/e-filter-rule.c:846 ../e-util/e-html-editor-page-dialog.c:60
+#: ../e-util/e-mail-identity-combo-box.c:476
+#: ../e-util/e-mail-signature-combo-box.c:367 ../e-util/e-proxy-editor.c:560
 #: ../libemail-engine/camel-null-store.c:27
 #: ../mail/e-mail-config-summary-page.c:138
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:621
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:616
 msgid "None"
 msgstr "brez"
 
-#: ../e-util/e-filter-rule.c:846
+#: ../e-util/e-filter-rule.c:847
 msgid "All related"
 msgstr "Vse povezano"
 
-#: ../e-util/e-filter-rule.c:848
+#: ../e-util/e-filter-rule.c:848 ../e-util/e-send-options.ui.h:19
+msgid "Replies"
+msgstr "Odgovori"
+
+#: ../e-util/e-filter-rule.c:849
 msgid "Replies and parents"
 msgstr "Odgovori in nadrejeni"
 
-#: ../e-util/e-filter-rule.c:849
+#: ../e-util/e-filter-rule.c:850
 msgid "No reply or parent"
 msgstr "Brez odgovora ali nadrejenega"
 
-#: ../e-util/e-filter-rule.c:852
+#: ../e-util/e-filter-rule.c:853
 msgid "I_nclude threads:"
 msgstr "Vključi _niti:"
 
-#: ../e-util/e-filter-rule.c:929
+#: ../e-util/e-filter-rule.c:930
 msgid "A_dd Condition"
 msgstr "Dodaj _pogoj"
 
-#: ../e-util/e-filter-rule.c:1243 ../mail/em-utils.c:230
+#: ../e-util/e-filter-rule.c:1244 ../e-util/filter.ui.h:1
+#: ../mail/em-utils.c:229
+msgid "Incoming"
+msgstr "Dohodna"
+
+#: ../e-util/e-filter-rule.c:1244 ../mail/em-utils.c:230
 msgid "Outgoing"
 msgstr "Odhodna"
 
+#: ../e-util/e-html-editor-actions.c:57
+#, fuzzy
+msgid "Failed to insert HTML file."
+msgstr "Odpiranje mape je spodletelo."
+
+#: ../e-util/e-html-editor-actions.c:94
+#, fuzzy
+msgid "Failed to insert text file."
+msgstr "Uvažanje potrdila je spodletelo"
+
+#: ../e-util/e-html-editor-actions.c:482
+msgid "Insert HTML File"
+msgstr "Vstavi datoteko HTML"
+
+#: ../e-util/e-html-editor-actions.c:488
+msgid "HTML file"
+msgstr "Datoteka HTML"
+
+#: ../e-util/e-html-editor-actions.c:515
+#, fuzzy
+msgctxt "dialog-title"
+msgid "Insert Image"
+msgstr "Slika znotraj sporočila"
+
+#: ../e-util/e-html-editor-actions.c:576
+#, fuzzy
+msgid "Insert text file"
+msgstr "Poveča velikost besedila"
+
+#: ../e-util/e-html-editor-actions.c:582
+msgid "Text file"
+msgstr "Besedilna datoteka"
+
+#: ../e-util/e-html-editor-actions.c:966
+#, fuzzy
+msgid "Copy selected text to the clipboard"
+msgstr "Kopiraj izbrane dogodke v odložišče"
+
+#: ../e-util/e-html-editor-actions.c:973
+#, fuzzy
+msgid "Cut selected text to the clipboard"
+msgstr "Izreži izbrane dogodke v odložišče"
+
+#. Widgets are treating Ctrl + v shortcut themselves
+#: ../e-util/e-html-editor-actions.c:980
+#, fuzzy
+msgid "Paste text from the clipboard"
+msgstr "Prilepi izbrane dogodke iz odložišča"
+
+#: ../e-util/e-html-editor-actions.c:987
+msgid "Redo the last undone action"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1001
+#, fuzzy
+msgid "Undo the last action"
+msgstr "Kopiraj izbor"
+
+#: ../e-util/e-html-editor-actions.c:1022
+msgid "For_mat"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1029
+#, fuzzy
+msgid "_Paragraph Style"
+msgstr "Slog orodne _vrstice"
+
+#: ../e-util/e-html-editor-actions.c:1043
+#: ../e-util/e-html-editor-image-dialog.c:591
+msgid "_Alignment"
+msgstr "_Poravnava"
+
+#: ../e-util/e-html-editor-actions.c:1050
+msgid "Current _Languages"
+msgstr "Trenutni _jeziki"
+
+#: ../e-util/e-html-editor-actions.c:1067
+msgid "_Increase Indent"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1069
+msgid "Increase Indent"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1074
+msgid "_HTML File..."
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1081
+msgid "Te_xt File..."
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1088
+msgid "Paste _Quotation"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1095
+msgid "_Find..."
+msgstr "_Najdi ..."
+
+#: ../e-util/e-html-editor-actions.c:1097
+#, fuzzy
+msgid "Search for text"
+msgstr ""
+"\n"
+"\n"
+"Iskanje stika."
+
+#: ../e-util/e-html-editor-actions.c:1102
+msgid "Find A_gain"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1109
+msgid "Re_place..."
+msgstr "_Zamenjaj ..."
+
+#: ../e-util/e-html-editor-actions.c:1111
+#, fuzzy
+msgid "Search for and replace text"
+msgstr "Poišči besedilo v prikazanem stiku"
+
+#: ../e-util/e-html-editor-actions.c:1116
+#, fuzzy
+msgid "Check _Spelling..."
+msgstr "Prekinjanje ..."
+
+#: ../e-util/e-html-editor-actions.c:1123
+msgid "_Decrease Indent"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1125
+msgid "Decrease Indent"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1130
+msgid "_Wrap Lines"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1137
+msgid "Open Inspector"
+msgstr ""
+
+#. Center
+#: ../e-util/e-html-editor-actions.c:1147
+#: ../e-util/e-html-editor-paragraph-dialog.c:110
+msgid "_Center"
+msgstr "Na _sredini"
+
+#: ../e-util/e-html-editor-actions.c:1149
+#, fuzzy
+msgid "Center Alignment"
+msgstr "_Poravnava"
+
+#. Left
+#: ../e-util/e-html-editor-actions.c:1154
+#: ../e-util/e-html-editor-paragraph-dialog.c:101
+msgid "_Left"
+msgstr "_Levo"
+
+#: ../e-util/e-html-editor-actions.c:1156
+#, fuzzy
+msgid "Left Alignment"
+msgstr "_Poravnava"
+
+#. Right
+#: ../e-util/e-html-editor-actions.c:1161
+#: ../e-util/e-html-editor-paragraph-dialog.c:119
+msgid "_Right"
+msgstr "_Desno"
+
+#: ../e-util/e-html-editor-actions.c:1163
+#, fuzzy
+msgid "Right Alignment"
+msgstr "_Poravnava"
+
+#: ../e-util/e-html-editor-actions.c:1171
+#: ../modules/text-highlight/languages.c:72
+msgid "_HTML"
+msgstr "_HTML"
+
+#: ../e-util/e-html-editor-actions.c:1173
+msgid "HTML editing mode"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1178
+#, fuzzy
+msgid "Plain _Text"
+msgstr "Običajno besedilo"
+
+#: ../e-util/e-html-editor-actions.c:1180
+#, fuzzy
+msgid "Plain text editing mode"
+msgstr "Način običajnega besedila"
+
+#: ../e-util/e-html-editor-actions.c:1188
+#, fuzzy
+msgid "_Normal"
+msgstr "Običajno"
+
+#: ../e-util/e-html-editor-actions.c:1195
+msgid "Header _1"
+msgstr "Glava _1"
+
+#: ../e-util/e-html-editor-actions.c:1202
+msgid "Header _2"
+msgstr "Glava _2"
+
+#: ../e-util/e-html-editor-actions.c:1209
+msgid "Header _3"
+msgstr "Glava _3"
+
+#: ../e-util/e-html-editor-actions.c:1216
+msgid "Header _4"
+msgstr "Glava _4"
+
+#: ../e-util/e-html-editor-actions.c:1223
+msgid "Header _5"
+msgstr "Glava _5"
+
+#: ../e-util/e-html-editor-actions.c:1230
+msgid "Header _6"
+msgstr "Glava _6"
+
+#: ../e-util/e-html-editor-actions.c:1237
+msgid "_Preformatted"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1244
+msgid "A_ddress"
+msgstr "_Naslov"
+
+#: ../e-util/e-html-editor-actions.c:1251
+msgid "_Blockquote"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1258
+#, fuzzy
+msgid "_Bulleted List"
+msgstr "_Izbriši seznam opomnikov"
+
+#: ../e-util/e-html-editor-actions.c:1265
+msgid "_Roman Numeral List"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1272
+msgid "Numbered _List"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1279
+msgid "_Alphabetical List"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1295
+#: ../e-util/e-html-editor-actions.c:1333
+msgid "_Image..."
+msgstr "_ Slika ..."
+
+#. Translators: This is an action tooltip
+#: ../e-util/e-html-editor-actions.c:1298
+#, fuzzy
+msgid "Insert Image"
+msgstr "Slika znotraj sporočila"
+
+#: ../e-util/e-html-editor-actions.c:1303
+#: ../e-util/e-html-editor-actions.c:1340
+msgid "_Link..."
+msgstr "_Povezava ..."
+
+#: ../e-util/e-html-editor-actions.c:1305
+#, fuzzy
+msgid "Insert Link"
+msgstr "_Vstavi"
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1311
+#: ../e-util/e-html-editor-actions.c:1355
+#, fuzzy
+msgid "_Rule..."
+msgstr "_Preimenuj ..."
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1314
+#, fuzzy
+msgid "Insert Rule"
+msgstr "_Vstavi"
+
+#: ../e-util/e-html-editor-actions.c:1319
+#: ../e-util/e-html-editor-actions.c:1362
+#, fuzzy
+msgid "_Table..."
+msgstr "Razpredelnica"
+
+#: ../e-util/e-html-editor-actions.c:1321
+#, fuzzy
+msgid "Insert Table"
+msgstr "_Vstavi"
+
+#: ../e-util/e-html-editor-actions.c:1326
+msgid "_Cell..."
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1347
+#, fuzzy
+msgid "Pa_ge..."
+msgstr "Shrani _sliko ..."
+
+#: ../e-util/e-html-editor-actions.c:1371
+msgid "Font _Size"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1378
+#, fuzzy
+msgid "_Font Style"
+msgstr "Način _posredovanja:"
+
+#: ../e-util/e-html-editor-actions.c:1385
+msgid "Paste As _Text"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1396
+#: ../e-util/e-html-editor-text-dialog.c:214
+msgid "_Bold"
+msgstr "_Krepko"
+
+#: ../e-util/e-html-editor-actions.c:1398
+msgid "Bold"
+msgstr "Krepko"
+
+#: ../e-util/e-html-editor-actions.c:1404
+#: ../e-util/e-html-editor-text-dialog.c:225
+msgid "_Italic"
+msgstr "_Ležeče"
+
+#: ../e-util/e-html-editor-actions.c:1406
+msgid "Italic"
+msgstr "Ležeče"
+
+#: ../e-util/e-html-editor-actions.c:1412
+#, fuzzy
+msgid "_Plain Text"
+msgstr "Običajno besedilo"
+
+#: ../e-util/e-html-editor-actions.c:1420
+#: ../e-util/e-html-editor-text-dialog.c:246
+msgid "_Strikethrough"
+msgstr "_Prečrtano"
+
+#: ../e-util/e-html-editor-actions.c:1422
+msgid "Strikethrough"
+msgstr "Prečrtano"
+
+#: ../e-util/e-html-editor-actions.c:1428
+#: ../e-util/e-html-editor-text-dialog.c:236
+#, fuzzy
+msgid "_Underline"
+msgstr "Nedoločeno"
+
+#: ../e-util/e-html-editor-actions.c:1430
+#, fuzzy
+msgid "Underline"
+msgstr "Nedoločeno"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1440
+msgid "-2"
+msgstr "-2"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1448
+msgid "-1"
+msgstr "-1"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1456
+msgid "+0"
+msgstr "+0"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1464
+msgid "+1"
+msgstr "+1"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1472
+msgid "+2"
+msgstr "+2"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1480
+msgid "+3"
+msgstr "+3"
+
+#. Translators: This is a font size level. It is shown on a tool bar. Please keep it as short as possible.
+#: ../e-util/e-html-editor-actions.c:1488
+msgid "+4"
+msgstr "+4"
+
+#: ../e-util/e-html-editor-actions.c:1507
+#, fuzzy
+msgid "Cell Contents"
+msgstr "_Vsebina"
+
+#: ../e-util/e-html-editor-actions.c:1514
+#, fuzzy
+msgid "Column"
+msgstr "Dodaj stolpec"
+
+#: ../e-util/e-html-editor-actions.c:1521
+#, fuzzy
+msgid "Row"
+msgstr "nizka"
+
+#: ../e-util/e-html-editor-actions.c:1528
+#: ../e-util/e-html-editor-actions.c:1613
+msgid "Table"
+msgstr "Razpredelnica"
+
+#. Translators: Popup menu item caption, containing all the Delete options for a table
+#: ../e-util/e-html-editor-actions.c:1538
+#, fuzzy
+msgid "Table Delete"
+msgstr "Celica razpredelnice"
+
+#: ../e-util/e-html-editor-actions.c:1545 ../e-util/e-text.c:2127
+msgid "Input Methods"
+msgstr "Načini vnosa"
+
+#. Translators: Popup menu item caption, containing all the Insert options for a table
+#: ../e-util/e-html-editor-actions.c:1553
+#, fuzzy
+msgid "Table Insert"
+msgstr "Celica razpredelnice"
+
+#: ../e-util/e-html-editor-actions.c:1560
+#, fuzzy
+msgid "Properties"
+msgstr "_Lastnosti"
+
+#: ../e-util/e-html-editor-actions.c:1578
+msgid "Column After"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1585
+msgid "Column Before"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1592
+#, fuzzy
+msgid "Insert _Link"
+msgstr "_Vstavi"
+
+#: ../e-util/e-html-editor-actions.c:1599
+msgid "Row Above"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1606
+msgid "Row Below"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1620
+msgid "Cell..."
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1627
+#, fuzzy
+msgid "Image..."
+msgstr "Slika"
+
+#: ../e-util/e-html-editor-actions.c:1634
+msgid "Link..."
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1641
+#, fuzzy
+msgid "Page..."
+msgstr "Pozivnik"
+
+#: ../e-util/e-html-editor-actions.c:1648
+msgid "Paragraph..."
+msgstr ""
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1656
+#, fuzzy
+msgid "Rule..."
+msgstr "_Polno ime ..."
+
+#: ../e-util/e-html-editor-actions.c:1663
+#, fuzzy
+msgid "Table..."
+msgstr "Razpredelnica"
+
+#: ../e-util/e-html-editor-actions.c:1670
+#, fuzzy
+msgid "Text..."
+msgstr "Izb_eri ..."
+
+#: ../e-util/e-html-editor-actions.c:1677
+#, fuzzy
+msgid "Remove Link"
+msgstr "_Odstrani"
+
+#: ../e-util/e-html-editor-actions.c:1694
+#, fuzzy
+msgid "Add Word to Dictionary"
+msgstr "Dodaj \"%s\" v slovar"
+
+#: ../e-util/e-html-editor-actions.c:1701
+#, fuzzy
+msgid "Ignore Misspelled Word"
+msgstr "Barva n_apačno črkovanih besed:"
+
+#: ../e-util/e-html-editor-actions.c:1708
+msgid "Add Word To"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1717
+#, fuzzy
+msgid "More Suggestions"
+msgstr "(ni predlogov)"
+
+#. Translators: %s will be replaced with the actual dictionary
+#. * name, where a user can add a word to. This is part of an
+#. * "Add Word To" submenu.
+#: ../e-util/e-html-editor-actions.c:1825
+#, fuzzy, c-format
+msgid "%s Dictionary"
+msgstr "Dodaj \"%s\" v slovar"
+
+#: ../e-util/e-html-editor-actions.c:1912
+msgid "_Emoticon"
+msgstr ""
+
+#: ../e-util/e-html-editor-actions.c:1913
+#, fuzzy
+msgid "Insert Emoticon"
+msgstr "Znova zaženi Evolution"
+
+#: ../e-util/e-html-editor-actions.c:1981
+#, fuzzy
+msgid "Re_place"
+msgstr "_Zamenjaj"
+
+#: ../e-util/e-html-editor-actions.c:1984
+#, fuzzy
+msgid "_Image"
+msgstr "Slika"
+
+#: ../e-util/e-html-editor-actions.c:1987
+msgid "_Link"
+msgstr "_Povezava"
+
+#. Translators: 'Rule' here means a horizontal line in an HTML text
+#: ../e-util/e-html-editor-actions.c:1991
+#, fuzzy
+msgid "_Rule"
+msgstr "Dodaj pravilo"
+
+#: ../e-util/e-html-editor-actions.c:1994
+#: ../e-util/e-html-editor-cell-dialog.c:668
+#, fuzzy
+msgid "_Table"
+msgstr "Razpredelnica"
+
+#: ../e-util/e-html-editor.c:672
+msgid "Paragraph Style"
+msgstr ""
+
+#: ../e-util/e-html-editor.c:686
+#, fuzzy
+msgid "Editing Mode"
+msgstr "Uredi opomnik"
+
+#: ../e-util/e-html-editor.c:698
+#, fuzzy
+msgid "Font Color"
+msgstr "Odstrani barvo"
+
+#: ../e-util/e-html-editor.c:716
+#, fuzzy
+msgid "Font Size"
+msgstr "Velikost"
+
+#: ../e-util/e-html-editor-cell-dialog.c:628
+msgid "<b>Scope</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:642
+msgid "C_ell"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:655
+msgid "_Row"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:681
+msgid "Col_umn"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:691
+msgid "<b>Alignment &amp; Behavior</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:704
+#: ../e-util/e-html-editor-hrule-dialog.c:365
+#: ../e-util/e-html-editor-table-dialog.c:850
+msgid "Left"
+msgstr "Leva"
+
+#: ../e-util/e-html-editor-cell-dialog.c:705
+#: ../e-util/e-html-editor-hrule-dialog.c:367
+#: ../e-util/e-html-editor-table-dialog.c:851
+msgid "Center"
+msgstr "Sredina"
+
+#: ../e-util/e-html-editor-cell-dialog.c:706
+#: ../e-util/e-html-editor-hrule-dialog.c:369
+#: ../e-util/e-html-editor-table-dialog.c:852
+msgid "Right"
+msgstr "Desna"
+
+#: ../e-util/e-html-editor-cell-dialog.c:714
+msgid "_Horizontal:"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:722
+#: ../e-util/e-html-editor-image-dialog.c:581
+#, fuzzy
+msgid "Top"
+msgstr "Na _vrh"
+
+#: ../e-util/e-html-editor-cell-dialog.c:723
+#: ../e-util/e-html-editor-image-dialog.c:582
+#, fuzzy
+msgid "Middle"
+msgstr "_Drugo ime:"
+
+#: ../e-util/e-html-editor-cell-dialog.c:724
+#: ../e-util/e-html-editor-image-dialog.c:583
+#, fuzzy
+msgid "Bottom"
+msgstr "Na _dno"
+
+#: ../e-util/e-html-editor-cell-dialog.c:732
+#, fuzzy
+msgid "_Vertical:"
+msgstr "_Navpični pogled"
+
+#. Wrap Text
+#: ../e-util/e-html-editor-cell-dialog.c:738
+#, fuzzy
+msgid "_Wrap Text"
+msgstr "Običajno besedilo"
+
+#. Header Style
+#: ../e-util/e-html-editor-cell-dialog.c:746
+#, fuzzy
+msgid "_Header Style"
+msgstr "Vrednost glave"
+
+#: ../e-util/e-html-editor-cell-dialog.c:760
+#: ../e-util/e-html-editor-image-dialog.c:521
+#: ../e-util/e-html-editor-table-dialog.c:762
+msgid "<b>Layout</b>"
+msgstr ""
+
+#. Width
+#: ../e-util/e-html-editor-cell-dialog.c:771
+msgid "_Width"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:810
+msgid "Row S_pan:"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:824
+msgid "Co_lumn Span:"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:831
+#: ../e-util/e-html-editor-table-dialog.c:866
+msgid "<b>Background</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:844
+#: ../e-util/e-html-editor-table-dialog.c:879
+msgid "Transparent"
+msgstr ""
+
+#: ../e-util/e-html-editor-cell-dialog.c:852
+#, fuzzy
+msgid "C_olor:"
+msgstr "Barva:"
+
+#: ../e-util/e-html-editor-cell-dialog.c:860
+#: ../e-util/e-html-editor-image-dialog.c:483
+#: ../e-util/e-html-editor-table-dialog.c:895
+#, fuzzy
+msgid "Choose Background Image"
+msgstr "Ni mogoče nastaviti kot ozadje"
+
+#: ../e-util/e-html-editor-cell-dialog.c:865
+#: ../e-util/e-html-editor-image-dialog.c:489
+#: ../e-util/e-html-editor-table-dialog.c:900
+#, fuzzy
+msgid "Images"
+msgstr "Slika"
+
+#: ../e-util/e-html-editor-cell-dialog.c:878
+#, fuzzy
+msgid "_Image:"
+msgstr "Slika"
+
+#: ../e-util/e-html-editor-cell-dialog.c:885
+#: ../e-util/e-html-editor-page-dialog.c:516
+#: ../e-util/e-html-editor-table-dialog.c:920
+#, fuzzy
+msgid "_Remove image"
+msgstr "_Brez slike"
+
+#: ../e-util/e-html-editor-cell-dialog.c:905
+#, fuzzy
+msgid "Cell Properties"
+msgstr "_Lastnosti"
+
+#: ../e-util/e-html-editor-find-dialog.c:105
+#: ../e-util/e-html-editor-replace-dialog.c:90
+#: ../e-util/e-html-editor-replace-dialog.c:108
+msgid "No match found"
+msgstr ""
+
+#: ../e-util/e-html-editor-find-dialog.c:160
+#: ../e-util/e-html-editor-replace-dialog.c:232
+#, fuzzy
+msgid "Search _backwards"
+msgstr "Iskalne _mape"
+
+#: ../e-util/e-html-editor-find-dialog.c:167
+msgid "Case _Sensitive"
+msgstr ""
+
+#: ../e-util/e-html-editor-find-dialog.c:174
+#, fuzzy
+msgid "_Wrap Search"
+msgstr "I_skanje"
+
+#: ../e-util/e-html-editor-find-dialog.c:213
+#, fuzzy
+msgid "Find"
+msgstr "_Najdi"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:300
+msgid "<b>Size</b>"
+msgstr "<b>Velikost</b>"
+
+#. Width
+#: ../e-util/e-html-editor-hrule-dialog.c:320
+#: ../e-util/e-html-editor-image-dialog.c:539
+#: ../e-util/e-html-editor-table-dialog.c:773
+msgid "_Width:"
+msgstr ""
+
+#: ../e-util/e-html-editor-hrule-dialog.c:345
+#, fuzzy
+msgid "_Size:"
+msgstr "Velikost"
+
+#: ../e-util/e-html-editor-hrule-dialog.c:352
+msgid "<b>Style</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-hrule-dialog.c:377
+#: ../e-util/e-html-editor-table-dialog.c:859
+#, fuzzy
+msgid "_Alignment:"
+msgstr "_Poravnava"
+
+#. Shaded
+#: ../e-util/e-html-editor-hrule-dialog.c:383
+msgid "S_haded"
+msgstr ""
+
+#: ../e-util/e-html-editor-hrule-dialog.c:400
+#, fuzzy
+msgid "Rule properties"
+msgstr "Lastnosti mape"
+
+#: ../e-util/e-html-editor-image-dialog.c:471
+#: ../e-util/e-html-editor-paragraph-dialog.c:66
+#: ../e-util/e-html-editor-table-dialog.c:716
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "Splošno"
+
+#: ../e-util/e-html-editor-image-dialog.c:500
+#, fuzzy
+msgid "_Source:"
+msgstr "Izvorna koda"
+
+#: ../e-util/e-html-editor-image-dialog.c:563
+msgid "_Height:"
+msgstr ""
+
+#: ../e-util/e-html-editor-image-dialog.c:604
+msgid "_X-Padding:"
+msgstr ""
+
+#: ../e-util/e-html-editor-image-dialog.c:620
+msgid "_Y-Padding:"
+msgstr ""
+
+#: ../e-util/e-html-editor-image-dialog.c:636
+#: ../e-util/e-html-editor-table-dialog.c:840
+msgid "_Border:"
+msgstr ""
+
+#: ../e-util/e-html-editor-image-dialog.c:646
+msgid "<b>Link</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-image-dialog.c:664
+#: ../e-util/e-html-editor-link-dialog.c:345
+#, fuzzy
+msgid "_URL:"
+msgstr "Naslov URL:"
+
+#: ../e-util/e-html-editor-image-dialog.c:669
+#: ../e-util/e-html-editor-link-dialog.c:350
+msgid "_Test URL..."
+msgstr ""
+
+#: ../e-util/e-html-editor-image-dialog.c:686
+#, fuzzy
+msgid "Image Properties"
+msgstr "Lastnosti kategorije"
+
+#: ../e-util/e-html-editor-link-dialog.c:374
+#, fuzzy
+msgid "_Remove Link"
+msgstr "_Odstrani"
+
+#: ../e-util/e-html-editor-link-dialog.c:399
+#, fuzzy
+msgid "Link Properties"
+msgstr "_Lastnosti"
+
+#: ../e-util/e-html-editor-page-dialog.c:69
+msgid "Perforated Paper"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:78
+msgid "Blue Ink"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:87
+msgid "Paper"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:96
+msgid "Ribbon"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:105
+msgid "Midnight"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:123 ../mail/filtertypes.xml.in.h:36
+#: ../mail/searchtypes.xml.in.h:39 ../mail/vfoldertypes.xml.in.h:39
+msgid "Draft"
+msgstr "Osnutek"
+
+#: ../e-util/e-html-editor-page-dialog.c:132
+msgid "Graph Paper"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:415
+msgid "<b>Colors</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:434
+#, fuzzy
+msgid "_Text:"
+msgstr "_Le besedilo"
+
+#: ../e-util/e-html-editor-page-dialog.c:449
+msgid "_Link:"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:464
+#, fuzzy
+msgid "_Background:"
+msgstr "Nastavi kot _ozadje"
+
+#: ../e-util/e-html-editor-page-dialog.c:472
+msgid "<b>Background Image</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-page-dialog.c:494
+#, fuzzy
+msgid "_Template:"
+msgstr "Predloga:"
+
+#: ../e-util/e-html-editor-page-dialog.c:502
+#: ../e-util/e-import-assistant.c:283
+msgid "Select a file"
+msgstr "Izbor datoteke"
+
+#: ../e-util/e-html-editor-page-dialog.c:509
+#, fuzzy
+msgid "_Custom:"
+msgstr "_Po meri"
+
+#: ../e-util/e-html-editor-page-dialog.c:536
+#, fuzzy
+msgid "Page Properties"
+msgstr "_Lastnosti"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:83
+#, fuzzy
+msgid "_Style:"
+msgstr "Slog odgovo_ra:"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:90
+#, fuzzy
+msgid "<b>Alignment</b>"
+msgstr "_Poravnava"
+
+#: ../e-util/e-html-editor-paragraph-dialog.c:155
+#, fuzzy
+msgid "Paragraph Properties"
+msgstr "Lastnosti kategorije"
+
+#: ../e-util/e-html-editor-replace-dialog.c:148
+#, c-format
+msgid "%d occurence replaced"
+msgid_plural "%d occurences replaced"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: ../e-util/e-html-editor-replace-dialog.c:212
+#, fuzzy
+msgid "R_eplace:"
+msgstr "_Zamenjaj"
+
+#: ../e-util/e-html-editor-replace-dialog.c:224
+msgid "_With:"
+msgstr ""
+
+#: ../e-util/e-html-editor-replace-dialog.c:236
+msgid "_Case sensitive"
+msgstr ""
+
+#: ../e-util/e-html-editor-replace-dialog.c:240
+#, fuzzy
+msgid "Wra_p search"
+msgstr "I_skanje"
+
+#: ../e-util/e-html-editor-replace-dialog.c:250
+msgid "_Skip"
+msgstr ""
+
+#: ../e-util/e-html-editor-replace-dialog.c:258
+#: ../e-util/e-system.error.xml.h:3
+msgid "_Replace"
+msgstr "_Zamenjaj"
+
+#: ../e-util/e-html-editor-replace-dialog.c:266
+#, fuzzy
+msgid "Replace _All"
+msgstr "Odgovori _vsem"
+
+#: ../e-util/e-html-editor-replace-dialog.c:286
+#, fuzzy
+msgctxt "dialog-title"
+msgid "Replace"
+msgstr "_Zamenjaj"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:87
+#, c-format
+msgid "<b>Suggestions for '%s'</b>"
+msgstr ""
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:501
+msgid "<b>Suggestions</b>"
+msgstr ""
+
+#. Replace
+#: ../e-util/e-html-editor-spell-check-dialog.c:536
+#, fuzzy
+msgid "Replace"
+msgstr "_Zamenjaj"
+
+#. Replace All
+#: ../e-util/e-html-editor-spell-check-dialog.c:545
+#, fuzzy
+msgid "Replace All"
+msgstr "_Zamenjaj"
+
+#. Ignore
+#: ../e-util/e-html-editor-spell-check-dialog.c:554
+#: ../mail/mail.error.xml.h:109
+msgid "Ignore"
+msgstr "Prezri"
+
+#. Skip
+#: ../e-util/e-html-editor-spell-check-dialog.c:563
+msgid "Skip"
+msgstr ""
+
+#. Back
+#: ../e-util/e-html-editor-spell-check-dialog.c:572
+#, fuzzy
+msgid "Back"
+msgstr "Pojdi nazaj"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:581
+msgid "<b>Dictionary</b>"
+msgstr ""
+
+#. Add Word button
+#: ../e-util/e-html-editor-spell-check-dialog.c:601
+#, fuzzy
+msgid "Add word"
+msgstr "Dodaj mapo"
+
+#: ../e-util/e-html-editor-spell-check-dialog.c:618
+#: ../mail/mail-config.ui.h:37
+msgid "Spell Checking"
+msgstr "Preverjanje črkovanja"
+
+#: ../e-util/e-html-editor-table-dialog.c:738
+msgid "_Rows:"
+msgstr ""
+
+#: ../e-util/e-html-editor-table-dialog.c:755
+#, fuzzy
+msgid "C_olumns:"
+msgstr "_Stolpec razpredelnice:"
+
+#: ../e-util/e-html-editor-table-dialog.c:806
+msgid "_Spacing:"
+msgstr ""
+
+#: ../e-util/e-html-editor-table-dialog.c:823
+#, fuzzy
+msgid "_Padding:"
+msgstr "Nalaganje"
+
+#: ../e-util/e-html-editor-table-dialog.c:887
+#: ../e-util/e-html-editor-text-dialog.c:261
+#, fuzzy
+msgid "_Color:"
+msgstr "Barva:"
+
+#: ../e-util/e-html-editor-table-dialog.c:913
+#, fuzzy
+msgid "Image:"
+msgstr "Slika"
+
+#: ../e-util/e-html-editor-table-dialog.c:940
+#, fuzzy
+msgid "Table Properties"
+msgstr "Lastnosti koledarja"
+
+#: ../e-util/e-html-editor-text-dialog.c:281
+msgid "Si_ze:"
+msgstr ""
+
+#: ../e-util/e-html-editor-text-dialog.c:296
+#, fuzzy
+msgid "Text Properties"
+msgstr "_Lastnosti"
+
+#: ../e-util/e-html-editor-view.c:3635
+#, fuzzy
+msgid "Changed property"
+msgstr "Lastnosti koledarja"
+
+#: ../e-util/e-html-editor-view.c:3636
+#, fuzzy
+msgid "Whether editor changed"
+msgstr "Ali naj program zapiska."
+
+#: ../e-util/e-html-editor-view.c:7493
+msgid ""
+"Turning HTML mode off will cause the text to lose all formatting. Do you "
+"want to continue?"
+msgstr ""
+
+#: ../e-util/e-html-editor-view.c:7497
+#, fuzzy
+msgid "_Don't lose formatting"
+msgstr "Oblikovanje naslova"
+
+#: ../e-util/e-html-editor-view.c:7498
+#, fuzzy
+msgid "_Lose formatting"
+msgstr "Oblikovanje naslova"
+
 #: ../e-util/e-import-assistant.c:256
 msgid ""
 "Choose the file that you want to import into Evolution, and select what type "
@@ -11194,10 +13043,6 @@ msgstr ""
 "Izberite datoteko, ki jo želite uvoziti v Evolution in izberite vrsto "
 "datoteke s seznama."
 
-#: ../e-util/e-import-assistant.c:283
-msgid "Select a file"
-msgstr "Izbor datoteke"
-
 #: ../e-util/e-import-assistant.c:297 ../e-util/e-import-assistant.c:472
 msgid "File _type:"
 msgstr "Vrs_ta datoteke:"
@@ -11219,7 +13064,7 @@ msgid "Import a _single file"
 msgstr "Uvozi eno _samo datoteko"
 
 #: ../e-util/e-import-assistant.c:403
-#: ../modules/startup-wizard/e-mail-config-import-page.c:201
+#: ../modules/startup-wizard/e-mail-config-import-page.c:200
 msgid "Please select the information that you would like to import:"
 msgstr "Izberite podatke, ki jih želite uvoziti:"
 
@@ -11234,7 +13079,7 @@ msgstr ""
 "gumb \"Nazaj\"."
 
 #: ../e-util/e-import-assistant.c:559
-#: ../modules/startup-wizard/e-mail-config-import-page.c:230
+#: ../modules/startup-wizard/e-mail-config-import-page.c:229
 #, c-format
 msgid "From %s:"
 msgstr "Od: %s:"
@@ -11291,27 +13136,27 @@ msgstr "Izbor datoteke"
 msgid "Click \"Apply\" to begin importing the file into Evolution."
 msgstr "Kliknite \"Uvozi\" za začetek uvoza datoteke v Evolution."
 
-#: ../e-util/e-mail-signature-combo-box.c:377
+#: ../e-util/e-mail-signature-combo-box.c:376
 msgid "Autogenerated"
 msgstr "Samodejno ustvarjeno"
 
-#: ../e-util/e-mail-signature-editor.c:309
+#: ../e-util/e-mail-signature-editor.c:297
 msgid "Close"
 msgstr "Zapri"
 
-#: ../e-util/e-mail-signature-editor.c:314
+#: ../e-util/e-mail-signature-editor.c:302
 msgid "_Save and Close"
 msgstr "_Shrani in zapri"
 
-#: ../e-util/e-mail-signature-editor.c:528
+#: ../e-util/e-mail-signature-editor.c:531
 msgid "Edit Signature"
 msgstr "Uredi podpis"
 
-#: ../e-util/e-mail-signature-editor.c:548
+#: ../e-util/e-mail-signature-editor.c:564
 msgid "_Signature Name:"
 msgstr "_Ime podpisa:"
 
-#: ../e-util/e-mail-signature-editor.c:594
+#: ../e-util/e-mail-signature-editor.c:600
 msgid "Unnamed"
 msgstr "Neimenovan"
 
@@ -11319,15 +13164,15 @@ msgstr "Neimenovan"
 msgid "Add _Script"
 msgstr "Dodaj _skript"
 
-#: ../e-util/e-mail-signature-manager.c:419
+#: ../e-util/e-mail-signature-manager.c:426
 msgid "Add Signature Script"
 msgstr "Dodaj skript podpisa"
 
-#: ../e-util/e-mail-signature-manager.c:489
+#: ../e-util/e-mail-signature-manager.c:497
 msgid "Edit Signature Script"
 msgstr "Uredi skript podpisa"
 
-#: ../e-util/e-mail-signature-script-dialog.c:394
+#: ../e-util/e-mail-signature-script-dialog.c:393
 msgid ""
 "The output of this script will be used as your\n"
 "signature. The name you specify will be used\n"
@@ -11337,11 +13182,11 @@ msgstr ""
 "podpis. Navedeno ime bo uporabljeno\n"
 "samo za prikaz."
 
-#: ../e-util/e-mail-signature-script-dialog.c:445
+#: ../e-util/e-mail-signature-script-dialog.c:444
 msgid "S_cript:"
 msgstr "_Skript:"
 
-#: ../e-util/e-mail-signature-script-dialog.c:476
+#: ../e-util/e-mail-signature-script-dialog.c:475
 msgid "Script file must be executable."
 msgstr "Datoteka skripta mora biti izvedljiva."
 
@@ -11358,14 +13203,34 @@ msgstr ""
 "Uporabniki tipkovnice lahko časovni pas izberejo iz spodnjega spustnega "
 "polja."
 
-#: ../e-util/e-misc-utils.c:246
+#: ../e-util/e-misc-utils.c:248
 msgid "Could not open the link."
 msgstr "Ni mogoče odpreti povezave."
 
-#: ../e-util/e-misc-utils.c:293
+#: ../e-util/e-misc-utils.c:295
 msgid "Could not display help for Evolution."
 msgstr "Ni mogoče prikazati pomoči za program Evolution."
 
+#: ../e-util/e-misc-utils.c:2348
+#, c-format
+msgid "Opening calendar '%s'"
+msgstr "Odpiranje koledarja '%s'"
+
+#: ../e-util/e-misc-utils.c:2351
+#, c-format
+msgid "Opening memo list '%s'"
+msgstr "Odpiranje seznama opomnikov '%s'"
+
+#: ../e-util/e-misc-utils.c:2354
+#, c-format
+msgid "Opening task list '%s'"
+msgstr "Odpiranje seznama opravil '%s'"
+
+#: ../e-util/e-misc-utils.c:2357
+#, fuzzy, c-format
+msgid "Opening address book '%s'"
+msgstr "Odpiranje koledarja '%s'"
+
 #: ../e-util/e-name-selector-dialog.c:277
 msgid "Show Contacts"
 msgstr "Pokaži stike"
@@ -11384,10 +13249,10 @@ msgstr "_Poišči:"
 
 #: ../e-util/e-name-selector-dialog.c:366
 #: ../e-util/e-name-selector-dialog.c:1274
-#: ../modules/addressbook/e-book-shell-view-actions.c:1112
-#: ../modules/calendar/e-cal-shell-view-actions.c:1732
-#: ../modules/calendar/e-memo-shell-view-actions.c:766
-#: ../modules/calendar/e-task-shell-view-actions.c:937
+#: ../modules/addressbook/e-book-shell-view-actions.c:1157
+#: ../modules/calendar/e-cal-shell-view-actions.c:1573
+#: ../modules/calendar/e-memo-shell-view-actions.c:709
+#: ../modules/calendar/e-task-shell-view-actions.c:881
 msgid "Any Category"
 msgstr "Katerakoli kategorija"
 
@@ -11406,7 +13271,7 @@ msgstr "Imenik"
 
 #: ../e-util/e-name-selector-dialog.c:451
 #: ../modules/addressbook/e-book-shell-backend.c:303
-#: ../modules/addressbook/e-book-shell-view.c:371
+#: ../modules/addressbook/e-book-shell-view.c:373
 msgid "Contacts"
 msgstr "Stiki"
 
@@ -11415,25 +13280,25 @@ msgid "Select Contacts from Address Book"
 msgstr "Izbor stikov iz imenika"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../e-util/e-name-selector-entry.c:3038
+#: ../e-util/e-name-selector-entry.c:3183
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "_Razširi %s"
 
 #. Copy Contact Item
-#: ../e-util/e-name-selector-entry.c:3054
+#: ../e-util/e-name-selector-entry.c:3199
 #, c-format
 msgid "Cop_y %s"
 msgstr "Kop_raj %s"
 
 #. Cut Contact Item
-#: ../e-util/e-name-selector-entry.c:3065
+#: ../e-util/e-name-selector-entry.c:3210
 #, c-format
 msgid "C_ut %s"
 msgstr "Iz_reži %s"
 
 #. Edit Contact item
-#: ../e-util/e-name-selector-entry.c:3083
+#: ../e-util/e-name-selector-entry.c:3228
 #, c-format
 msgid "_Edit %s"
 msgstr "_Uredi %s"
@@ -11443,45 +13308,45 @@ msgstr "_Uredi %s"
 msgid "_Delete %s"
 msgstr "_Izbriši %s"
 
-#: ../e-util/e-online-button.c:30
+#: ../e-util/e-online-button.c:32
 msgid "Evolution is currently online.  Click this button to work offline."
 msgstr ""
 "Program Evolution je povezan v omrežje. Kliknite na gumb za delo brez "
 "povezave."
 
-#: ../e-util/e-online-button.c:33
+#: ../e-util/e-online-button.c:35
 msgid "Evolution is currently offline.  Click this button to work online."
 msgstr ""
 "Program Evolution trenutno ni povezan. Kliknite na gumb za delo s povezavo."
 
-#: ../e-util/e-online-button.c:36
+#: ../e-util/e-online-button.c:38
 msgid "Evolution is currently offline because the network is unavailable."
 msgstr ""
 "Program Evolution trenutno ni povezan, ker omrežna povezava ni na voljo."
 
-#: ../e-util/e-passwords.c:125
+#: ../e-util/e-passwords.c:127
 msgid "Keyring key is unusable: no user or host name"
 msgstr ""
 "Ključ zbirke ključev ni uporaben: ni navedenega imena uporabnika ali "
 "gostitelja."
 
-#: ../e-util/e-passwords.c:445
+#: ../e-util/e-passwords.c:447
 msgid "You have the Caps Lock key on."
 msgstr "Pritisnjena je tipka zaklepa velikih črk."
 
-#: ../e-util/e-passwords.c:576
+#: ../e-util/e-passwords.c:578
 msgid "_Remember this passphrase"
 msgstr "Za_pomni si šifrirno geslo"
 
-#: ../e-util/e-passwords.c:577
+#: ../e-util/e-passwords.c:579
 msgid "_Remember this passphrase for the remainder of this session"
 msgstr "_Zapomni si to šifrirno geslo za preostanek te seje"
 
-#: ../e-util/e-passwords.c:582
+#: ../e-util/e-passwords.c:584
 msgid "_Remember this password"
 msgstr "Za_pomni si geslo"
 
-#: ../e-util/e-passwords.c:583
+#: ../e-util/e-passwords.c:585
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapomni si to geslo za preostanek te seje"
 
@@ -11502,63 +13367,63 @@ msgid ""
 "The printing system did not report any additional details about the error."
 msgstr "Ni dodatnih podrobnosti o napaki sistema tiskanja."
 
-#: ../e-util/e-proxy-editor.c:314
+#: ../e-util/e-proxy-editor.c:325
 msgid "_Method:"
 msgstr "_Način:"
 
-#: ../e-util/e-proxy-editor.c:336
+#: ../e-util/e-proxy-editor.c:347
 msgid "Defer to Desktop Settings"
 msgstr "Preusmeri na nastavitve namizja"
 
-#: ../e-util/e-proxy-editor.c:340
+#: ../e-util/e-proxy-editor.c:351
 msgid "_Open Desktop Settings"
 msgstr "_Odpri nastavitve namizja"
 
-#: ../e-util/e-proxy-editor.c:366
+#: ../e-util/e-proxy-editor.c:377
 msgid "Manual"
 msgstr "ročno"
 
-#: ../e-util/e-proxy-editor.c:385
+#: ../e-util/e-proxy-editor.c:396
 msgid "_HTTP Proxy:"
 msgstr "Posredniški strežnik _HTTP:"
 
-#: ../e-util/e-proxy-editor.c:416
+#: ../e-util/e-proxy-editor.c:427
 msgid "H_TTPS Proxy:"
 msgstr "Posredniški strežnik H_TTP:"
 
-#: ../e-util/e-proxy-editor.c:447
+#: ../e-util/e-proxy-editor.c:458
 msgid "_Socks Proxy:"
 msgstr "Posredniški strežnik SOC_KS:"
 
-#: ../e-util/e-proxy-editor.c:478
+#: ../e-util/e-proxy-editor.c:489
 msgid "_Ignore Hosts:"
 msgstr "Prezri _gostitelje:"
 
-#: ../e-util/e-proxy-editor.c:504
+#: ../e-util/e-proxy-editor.c:515
 msgid "Automatic"
 msgstr "samodejno"
 
-#: ../e-util/e-proxy-editor.c:523
+#: ../e-util/e-proxy-editor.c:534
 msgid "Configuration _URL:"
 msgstr "Naslov _URL nastavitev:"
 
-#: ../e-util/e-proxy-editor.c:552
+#: ../e-util/e-proxy-editor.c:563
 msgid "Use a direct connection, no proxying required."
 msgstr "Uporabi neposredno povezavo brez posredniškega strežnika."
 
-#: ../e-util/e-proxy-preferences.c:177
+#: ../e-util/e-proxy-preferences.c:213
 msgid "Switch to Basic Proxy Preferences"
 msgstr "Preklopi na osnovne možnosti posredniškega strežnika"
 
-#: ../e-util/e-proxy-preferences.c:179
+#: ../e-util/e-proxy-preferences.c:215
 msgid "Switch to Advanced Proxy Preferences"
 msgstr "Preklopi na napredne možnosti posredniškega strežnika"
 
-#: ../e-util/e-proxy-preferences.c:463
+#: ../e-util/e-proxy-preferences.c:526
 msgid "Apply custom proxy settings to these accounts:"
 msgstr "Uveljavi nastavitve posredniškega strežnika po meri za račune:"
 
-#: ../e-util/e-proxy-preferences.c:498
+#: ../e-util/e-proxy-preferences.c:561
 msgid ""
 "<b>Advanced Proxy Preferences</b> lets you define alternate network proxies "
 "and apply them to specific accounts"
@@ -11587,54 +13452,56 @@ msgstr "Dodaj pravilo"
 msgid "Edit Rule"
 msgstr "Uredi pravilo"
 
-#: ../e-util/e-search-bar.c:82
+#: ../e-util/e-search-bar.c:83
 #, c-format
 msgid "Matches: %u"
 msgstr "Zadetki: %u"
 
-#: ../e-util/e-search-bar.c:566
+#: ../e-util/e-search-bar.c:567
 msgid "Close the find bar"
 msgstr "Zapri vrstico iskanja"
 
-#: ../e-util/e-search-bar.c:574
+#: ../e-util/e-search-bar.c:575
 msgid "Fin_d:"
 msgstr "_Najdi:"
 
-#: ../e-util/e-search-bar.c:586
+#: ../e-util/e-search-bar.c:587
 msgid "Clear the search"
 msgstr "Počisti iskanje"
 
-#: ../e-util/e-search-bar.c:610
+#: ../e-util/e-search-bar.c:611
 msgid "_Previous"
 msgstr "_Predhodni"
 
-#: ../e-util/e-search-bar.c:613
+#: ../e-util/e-search-bar.c:614
 msgid "Find the previous occurrence of the phrase"
 msgstr "Najde predhodno ponovitev izraza"
 
-#: ../e-util/e-search-bar.c:622
+#: ../e-util/e-search-bar.c:623
 msgid "_Next"
 msgstr "_Naslednji"
 
-#: ../e-util/e-search-bar.c:625
+#: ../e-util/e-search-bar.c:626
 msgid "Find the next occurrence of the phrase"
 msgstr "Najde naslednjo ponovitev izraza"
 
-#: ../e-util/e-search-bar.c:634
+#: ../e-util/e-search-bar.c:635
 msgid "Mat_ch case"
 msgstr "_Upoštevaj velikost črk"
 
-#: ../e-util/e-search-bar.c:662
+#: ../e-util/e-search-bar.c:663
 msgid "Reached bottom of page, continued from top"
 msgstr "Doseženo je dno strani, nadaljevanje z vrha"
 
-#: ../e-util/e-search-bar.c:684
+#: ../e-util/e-search-bar.c:685
 msgid "Reached top of page, continued from bottom"
 msgstr "Dosežen je bil vrh strani, nadaljevanje z dna"
 
 #: ../e-util/e-send-options.c:538 ../mail/importers/elm-importer.c:327
+#: ../mail/importers/kmail-importer.c:253
 #: ../mail/importers/pine-importer.c:420
-#: ../modules/mail/e-mail-shell-view.c:1097
+#: ../modules/mail/e-mail-shell-view.c:1163
+#: ../smime/gui/certificate-manager.c:1669
 msgid "Mail"
 msgstr "Pošta"
 
@@ -11642,61 +13509,211 @@ msgstr "Pošta"
 msgid "When de_leted:"
 msgstr "Ko je iz_brisano:"
 
-#: ../e-util/e-source-config.c:681 ../e-util/e-source-config.c:685
+#: ../e-util/e-send-options.ui.h:3
+msgid "Standard"
+msgstr "Običajno"
+
+#: ../e-util/e-send-options.ui.h:6
+msgid "Proprietary"
+msgstr "Lastniško"
+
+#: ../e-util/e-send-options.ui.h:8
+msgid "Secret"
+msgstr "Skrivnost"
+
+#: ../e-util/e-send-options.ui.h:9
+msgid "Top Secret"
+msgstr "Najstrožja skrivnost"
+
+#: ../e-util/e-send-options.ui.h:10
+msgid "For Your Eyes Only"
+msgstr "Le za vaše oči"
+
+#. Translators: Used in send options dialog
+#: ../e-util/e-send-options.ui.h:12
+msgctxt "send-options"
+msgid "None"
+msgstr "Brez"
+
+#: ../e-util/e-send-options.ui.h:13
+msgid "Mail Receipt"
+msgstr "Poštna povratnica"
+
+#: ../e-util/e-send-options.ui.h:15
+msgid "R_eply requested"
+msgstr "_Zahtevan odgovor"
+
+#: ../e-util/e-send-options.ui.h:16
+msgctxt "ESendOptionsWithin"
+msgid "Wi_thin"
+msgstr "Zno_traj"
+
+#: ../e-util/e-send-options.ui.h:17
+msgctxt "ESendOptionsWithin"
+msgid "days"
+msgstr "dni"
+
+#: ../e-util/e-send-options.ui.h:18
+msgid "_When convenient"
+msgstr "_Ko je pripravno"
+
+#: ../e-util/e-send-options.ui.h:20
+msgid "_Delay message delivery"
+msgstr "Za_drži dostavo sporočila"
+
+#: ../e-util/e-send-options.ui.h:21
+msgctxt "ESendOptionsAfter"
+msgid "_After"
+msgstr "_Po"
+
+#: ../e-util/e-send-options.ui.h:22
+msgctxt "ESendOptionsAfter"
+msgid "days"
+msgstr "dni"
+
+#: ../e-util/e-send-options.ui.h:23
+msgid "_Set expiration date"
+msgstr "Na_stavi čas poteka"
+
+#: ../e-util/e-send-options.ui.h:24
+msgctxt "ESendOptions"
+msgid "_Until"
+msgstr "_Do"
+
+#: ../e-util/e-send-options.ui.h:25
+msgid "Delivery Options"
+msgstr "Možnosti dostave"
+
+#: ../e-util/e-send-options.ui.h:26
+msgid "_Priority:"
+msgstr "_Prednost:"
+
+#: ../e-util/e-send-options.ui.h:27
+msgid "_Classification:"
+msgstr "_Razvrstitev:"
+
+#: ../e-util/e-send-options.ui.h:28
+msgid "Gene_ral Options"
+msgstr "Splošne _možnosti"
+
+#: ../e-util/e-send-options.ui.h:29
+msgid "Creat_e a sent item to track information"
+msgstr "Ustvari poslani predm_et za sledenje podatkov"
+
+#: ../e-util/e-send-options.ui.h:30
+msgid "_Delivered"
+msgstr "_Dostavljeno"
+
+#: ../e-util/e-send-options.ui.h:31
+msgid "Deli_vered and opened"
+msgstr "Dosta_vljeno in odprto"
+
+#: ../e-util/e-send-options.ui.h:32
+msgid "_All information"
+msgstr "_Vsi podatki"
+
+#: ../e-util/e-send-options.ui.h:33
+msgid "A_uto-delete sent item"
+msgstr "S_amodejno izbriši poslani predmet"
+
+#: ../e-util/e-send-options.ui.h:34
+msgid "Status Tracking"
+msgstr "Sledenje stanja"
+
+#: ../e-util/e-send-options.ui.h:35
+msgid "_When opened:"
+msgstr "_Ko je odprto:"
+
+#: ../e-util/e-send-options.ui.h:36
+msgid "When decli_ned:"
+msgstr "Ko je odklo_njeno:"
+
+#: ../e-util/e-send-options.ui.h:37
+msgid "When co_mpleted:"
+msgstr "Ko je ko_nčano:"
+
+#: ../e-util/e-send-options.ui.h:38
+msgid "When acce_pted:"
+msgstr "Ko je s_prejeto:"
+
+#: ../e-util/e-send-options.ui.h:39
+msgid "Return Notification"
+msgstr "Povratno obvestilo"
+
+#: ../e-util/e-send-options.ui.h:40
+msgid "Sta_tus Tracking"
+msgstr "Sledenje s_tanja"
+
+#: ../e-util/e-source-config.c:690 ../e-util/e-source-config.c:694
 msgid "Type:"
 msgstr "Vrsta:"
 
-#: ../e-util/e-source-config.c:693 ../e-util/e-source-config.c:697
+#: ../e-util/e-source-config.c:702 ../e-util/e-source-config.c:706
 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:1311
 msgid "Refresh every"
 msgstr "Osveži vsakih"
 
-#: ../e-util/e-source-config.c:1332 ../e-util/e-source-config.c:1402
+#: ../e-util/e-source-config.c:1341 ../e-util/e-source-config.c:1411
 msgid "Use a secure connection"
 msgstr "Uporabi varno povezavo"
 
-#: ../e-util/e-source-config.c:1428
+#: ../e-util/e-source-config.c:1437
 msgid "Unset _trust for SSL certificate"
 msgstr "Prezri _zaupljivost potrdila SSL"
 
-#: ../e-util/e-source-config.c:1464
+#: ../e-util/e-source-config.c:1473
 msgid "User"
 msgstr "Uporabnik"
 
-#: ../e-util/e-source-selector-dialog.c:226
+#: ../e-util/e-source-selector-dialog.c:229
 msgid "_Destination"
 msgstr "_Cilj"
 
-#: ../e-util/e-source-selector-dialog.c:339
+#: ../e-util/e-source-selector-dialog.c:342
 msgid "Select destination"
 msgstr "Izbor cilja"
 
+#. Translators: %s is the language ISO code.
+#: ../e-util/e-spell-dictionary.c:266
+#, fuzzy, c-format
+msgctxt "language"
+msgid "Unknown (%s)"
+msgstr "Neznano"
+
+#. Translators: The first %s is the language name, and the
+#. * second is the country name. Example: "French (France)"
+#: ../e-util/e-spell-dictionary.c:281 ../e-util/e-spell-dictionary.c:286
+#, fuzzy, c-format
+msgctxt "language"
+msgid "%s (%s)"
+msgstr "%s (%u%s)"
+
 #. no suggestions. Put something in the menu anyway...
-#: ../e-util/e-spell-entry.c:383
+#: ../e-util/e-spell-entry.c:379
 msgid "(no suggestions)"
 msgstr "(ni predlogov)"
 
-#: ../e-util/e-spell-entry.c:407
+#: ../e-util/e-spell-entry.c:403
 msgid "More..."
 msgstr "Dodatno ..."
 
 #. + Add to Dictionary
-#: ../e-util/e-spell-entry.c:478
+#: ../e-util/e-spell-entry.c:488
 #, c-format
 msgid "Add \"%s\" to Dictionary"
 msgstr "Dodaj \"%s\" v slovar"
 
 #. - Ignore All
-#: ../e-util/e-spell-entry.c:529
+#: ../e-util/e-spell-entry.c:537
 msgid "Ignore All"
 msgstr "Prezri vse"
 
-#: ../e-util/e-spell-entry.c:557
+#: ../e-util/e-spell-entry.c:569
 msgid "Spelling Suggestions"
 msgstr "Predlogi črkovanja"
 
@@ -11710,10 +13727,6 @@ msgid ""
 msgstr ""
 "Datoteka že obstaja v mapi \"{0}\". S prepisom bo izgubljena njena vsebina."
 
-#: ../e-util/e-system.error.xml.h:3
-msgid "_Replace"
-msgstr "_Zamenjaj"
-
 #: ../e-util/e-system.error.xml.h:4
 msgid "Cannot save file \"{0}\"."
 msgstr "Ni mogoče shraniti datoteke \"{0}\"."
@@ -11801,29 +13814,29 @@ msgstr ""
 msgid "The task list backend servicing &quot;{0}&quot; encountered an error."
 msgstr "Ozadnji program seznama nalog &quot;{0}&quot; je naletel na napako."
 
-#: ../e-util/e-table-click-to-add.c:680
+#: ../e-util/e-table-click-to-add.c:684
 #: ../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 za dodajanje"
 
-#: ../e-util/e-table-column-selector.c:265
+#: ../e-util/e-table-column-selector.c:264
 msgid "Move selected column names to top"
 msgstr "Premakni izbrana imena stolpcev na vrh"
 
-#: ../e-util/e-table-column-selector.c:270
+#: ../e-util/e-table-column-selector.c:269
 msgid "Move selected column names up one row"
 msgstr "Premakni izbrana imena stolpcev za eno vrstico višje"
 
-#: ../e-util/e-table-column-selector.c:275
+#: ../e-util/e-table-column-selector.c:274
 msgid "Move selected column names down one row"
 msgstr "Premakni izbrana imena stolpcev za  eno vrstico nižje"
 
-#: ../e-util/e-table-column-selector.c:280
+#: ../e-util/e-table-column-selector.c:279
 msgid "Move selected column names to bottom"
 msgstr "Premakni izbrana imena stolpcev na dno"
 
-#: ../e-util/e-table-column-selector.c:285
+#: ../e-util/e-table-column-selector.c:284
 msgid "Select all column names"
 msgstr "Izbor vseh imen stolpcev"
 
@@ -11851,9 +13864,71 @@ msgstr "Pokaži polja"
 msgid "Choose the order of information to appear in the message list."
 msgstr "Izberite vrstni red podatkov, prikazanih na seznamu sporočil."
 
-#: ../e-util/e-table-field-chooser-dialog.c:226
-msgid "Add a Column"
-msgstr "Dodaj stolpec"
+#: ../e-util/e-table-config.ui.h:2
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:367
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:367
+msgid "_Apply"
+msgstr "_Uveljavi"
+
+#: ../e-util/e-table-config.ui.h:4
+msgid "_Sort..."
+msgstr "_Razvrsti ..."
+
+#: ../e-util/e-table-config.ui.h:5
+msgid "_Group By..."
+msgstr "Z_druži po ..."
+
+#: ../e-util/e-table-config.ui.h:6
+msgid "_Fields Shown..."
+msgstr "_Prikazana polja ..."
+
+#: ../e-util/e-table-config.ui.h:9
+msgid "Clear _All"
+msgstr "Počisti _vse"
+
+#: ../e-util/e-table-config.ui.h:10
+msgid "_Show field in View"
+msgstr "_Pokaži polje v meniju pogleda"
+
+#: ../e-util/e-table-config.ui.h:11 ../e-util/e-table-header-item.c:1755
+msgid "Ascending"
+msgstr "Naraščajoče"
+
+#: ../e-util/e-table-config.ui.h:12 ../e-util/e-table-header-item.c:1755
+msgid "Descending"
+msgstr "Padajoče"
+
+#: ../e-util/e-table-config.ui.h:13
+msgid "Group Items By"
+msgstr "Združi predmete po"
+
+#: ../e-util/e-table-config.ui.h:14
+msgid "Show _field in View"
+msgstr "Pokaži po_lje v meniju pogleda"
+
+#: ../e-util/e-table-config.ui.h:15
+msgid "Then By"
+msgstr "in nato po"
+
+#: ../e-util/e-table-config.ui.h:16
+msgid "Show field i_n View"
+msgstr "Pokaži polje _v meniju pogleda"
+
+#: ../e-util/e-table-config.ui.h:17
+msgid "Show field in _View"
+msgstr "Pokaži polje v _meniju pogleda"
+
+#: ../e-util/e-table-config.ui.h:18
+msgid "Sort"
+msgstr "Razvrsti"
+
+#: ../e-util/e-table-config.ui.h:19
+msgid "Clear All"
+msgstr "Počisti vse"
+
+#: ../e-util/e-table-config.ui.h:20
+msgid "Sort Items By"
+msgstr "Razvrsti predmete po"
 
 #: ../e-util/e-table-field-chooser.c:166
 msgid ""
@@ -11863,6 +13938,10 @@ msgstr ""
 "Za dodajanje stolpca k svoji razpredelnici ga\n"
 "povlecite do mesta kjer naj se pojavi."
 
+#: ../e-util/e-table-field-chooser-dialog.c:226
+msgid "Add a Column"
+msgstr "Dodaj stolpec"
+
 #: ../e-util/e-table-group-container.c:368
 #, c-format
 msgid "%s: %s (%d item)"
@@ -11881,71 +13960,67 @@ msgstr[1] "%s (%d predmet)"
 msgstr[2] "%s (%d predmeta)"
 msgstr[3] "%s (%d predmeti)"
 
-#: ../e-util/e-table-header-item.c:1576
+#: ../e-util/e-table-header-item.c:1578
 msgid "Customize Current View"
 msgstr "Prilagodi trenutni pogled"
 
-#: ../e-util/e-table-header-item.c:1599
+#: ../e-util/e-table-header-item.c:1601
 msgid "Sort _Ascending"
 msgstr "Razvrsti _naraščajoče"
 
-#: ../e-util/e-table-header-item.c:1602
+#: ../e-util/e-table-header-item.c:1604
 msgid "Sort _Descending"
 msgstr "Razvrsti _padajoče"
 
-#: ../e-util/e-table-header-item.c:1605
+#: ../e-util/e-table-header-item.c:1607
 msgid "_Unsort"
 msgstr "O_dstrani razvrstitev"
 
-#: ../e-util/e-table-header-item.c:1608
+#: ../e-util/e-table-header-item.c:1610
 msgid "Group By This _Field"
 msgstr "Združi po tem _polju"
 
-#: ../e-util/e-table-header-item.c:1611
+#: ../e-util/e-table-header-item.c:1613
 msgid "Group By _Box"
 msgstr "Združi po _škatli"
 
-#: ../e-util/e-table-header-item.c:1615
+#: ../e-util/e-table-header-item.c:1617
 msgid "Remove This _Column"
 msgstr "Odstrani ta _stolpec"
 
-#: ../e-util/e-table-header-item.c:1618
+#: ../e-util/e-table-header-item.c:1620
 msgid "Add a C_olumn..."
 msgstr "_Dodaj stolpec ..."
 
-#: ../e-util/e-table-header-item.c:1622
+#: ../e-util/e-table-header-item.c:1624
 msgid "A_lignment"
 msgstr "_Poravnava"
 
-#: ../e-util/e-table-header-item.c:1625
+#: ../e-util/e-table-header-item.c:1627
 msgid "B_est Fit"
 msgstr "Najboljše _prileganje"
 
-#: ../e-util/e-table-header-item.c:1628
+#: ../e-util/e-table-header-item.c:1630
 msgid "Format Column_s..."
 msgstr "_Oblikuj stolpce ..."
 
-#: ../e-util/e-table-header-item.c:1632
+#: ../e-util/e-table-header-item.c:1634
 msgid "Custo_mize Current View..."
 msgstr "Prila_godi trenutni pogled ..."
 
-#: ../e-util/e-table-header-item.c:1703
+#: ../e-util/e-table-header-item.c:1705
 msgid "_Sort By"
 msgstr "_Razvrsti po"
 
 #. Custom
-#: ../e-util/e-table-header-item.c:1726
+#: ../e-util/e-table-header-item.c:1728
 msgid "_Custom"
 msgstr "_Po meri"
 
-#: ../e-util/e-text.c:2110
+#: ../e-util/e-text.c:2114
 msgid "Select All"
 msgstr "Izberi vse"
 
-#: ../e-util/e-text.c:2123
-msgid "Input Methods"
-msgstr "Načini vnosa"
-
 #. Put the "UTC" entry at the top of the combo's list.
 #: ../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
@@ -11953,6 +14028,32 @@ msgstr "Načini vnosa"
 msgid "UTC"
 msgstr "UTC"
 
+#: ../e-util/e-timezone-dialog.ui.h:1
+msgid "Select a Time Zone"
+msgstr "Izbor časovnega pasu"
+
+#: ../e-util/e-timezone-dialog.ui.h:4
+msgid ""
+"Use the left mouse button to zoom in on an area of the map and select a time "
+"zone.\n"
+"Use the right mouse button to zoom out."
+msgstr ""
+"Uporabite lev miškin gumb za približanje območja zemljevida in izbiro "
+"časovnega pasu.\n"
+"Uporabite desni miškin gumb za oddaljevanje."
+
+#: ../e-util/e-timezone-dialog.ui.h:6
+msgid "Time Zones"
+msgstr "Časovni pasovi"
+
+#: ../e-util/e-timezone-dialog.ui.h:7
+msgid "_Selection"
+msgstr "_Izbor"
+
+#: ../e-util/e-timezone-dialog.ui.h:8
+msgid "Timezone drop-down combination box"
+msgstr "Spustni meni časovnih pasov"
+
 #: ../e-util/e-url-entry.c:108
 msgid "Click here to open the URL"
 msgstr "Kliknite tukaj za obisk odpiranje naslova URL"
@@ -11961,72 +14062,97 @@ msgstr "Kliknite tukaj za obisk odpiranje naslova URL"
 msgid "Enter a URL here"
 msgstr "Vnesite naslov URL"
 
-#: ../e-util/e-web-view-gtkhtml.c:405 ../e-util/e-web-view.c:286
+#: ../e-util/evolution-source-viewer.c:637
+msgid "Evolution Source Viewer"
+msgstr "Pregledovalnik virov Evolution"
+
+#. Translators: The name that is displayed in the user interface
+#: ../e-util/evolution-source-viewer.c:667
+msgid "Display Name"
+msgstr "Prikazano ime"
+
+#: ../e-util/evolution-source-viewer.c:676
+msgid "Flags"
+msgstr "Zastavice"
+
+#: ../e-util/evolution-source-viewer.c:728
+#: ../mail/e-mail-config-identity-page.c:722
+msgid "Identity"
+msgstr "Istovetnost"
+
+#: ../e-util/e-web-view.c:285
 msgid "_Copy Link Location"
 msgstr "_Kopiraj mesto povezave"
 
-#: ../e-util/e-web-view-gtkhtml.c:407 ../e-util/e-web-view.c:288
+#: ../e-util/e-web-view.c:287
 msgid "Copy the link to the clipboard"
 msgstr "Kopira povezavo na odložišče"
 
-#: ../e-util/e-web-view-gtkhtml.c:415 ../e-util/e-web-view.c:296
+#: ../e-util/e-web-view.c:295
 msgid "_Open Link in Browser"
 msgstr "_Odpri povezavo v brskalniku"
 
-#: ../e-util/e-web-view-gtkhtml.c:417 ../e-util/e-web-view.c:298
+#: ../e-util/e-web-view.c:297
 msgid "Open the link in a web browser"
 msgstr "Odpre povezavo v spletnemu brskalniku"
 
-#: ../e-util/e-web-view-gtkhtml.c:425 ../e-util/e-web-view.c:306
+#: ../e-util/e-web-view.c:305
 msgid "_Copy Email Address"
 msgstr "Kopiraj _elektronski naslov"
 
-#: ../e-util/e-web-view-gtkhtml.c:442 ../e-util/e-web-view.c:323
+#: ../e-util/e-web-view.c:322
 msgid "_Copy Image"
 msgstr "_Kopiraj sliko"
 
-#: ../e-util/e-web-view-gtkhtml.c:444 ../e-util/e-web-view.c:325
+#: ../e-util/e-web-view.c:324
 msgid "Copy the image to the clipboard"
 msgstr "Kopira sliko v odložišče"
 
-#: ../e-util/e-web-view-gtkhtml.c:464 ../e-util/e-web-view-gtkhtml.c:1307
-#: ../e-util/e-web-view.c:352 ../e-util/e-web-view.c:1323
+#: ../e-util/e-web-view.c:329
+msgid "Save _Image..."
+msgstr "Shrani _sliko ..."
+
+#: ../e-util/e-web-view.c:331
+msgid "Save the image to a file"
+msgstr "Shrani sliko v datoteko"
+
+#: ../e-util/e-web-view.c:351 ../e-util/e-web-view.c:1340
 msgid "Select all text and images"
 msgstr "Izberi vse besedilo in slike"
 
-#: ../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:998
-#: ../e-util/e-web-view.c:1000 ../e-util/e-web-view.c:1002
+#: ../e-util/e-web-view.c:1004
 #, c-format
 msgid "Click to call %s"
 msgstr "Kliknite za klicanje %s"
 
-#: ../e-util/e-web-view-gtkhtml.c:977 ../e-util/e-web-view.c:1004
+#: ../e-util/e-web-view.c:1006
 msgid "Click to hide/unhide addresses"
 msgstr "Kliknite za skritje/prikaz naslovov"
 
-#: ../e-util/e-web-view-gtkhtml.c:979 ../e-util/e-web-view.c:1006
+#: ../e-util/e-web-view.c:1017
+#, fuzzy, c-format
+msgid "Go to the section %s of the message"
+msgstr "Vnesite prejemnike sporočila"
+
+#: ../e-util/e-web-view.c:1019
+#, fuzzy
+msgid "Go to the beginning of the message"
+msgstr "Vnesite prejemnike sporočila"
+
+#: ../e-util/e-web-view.c:1023
 #, c-format
 msgid "Click to open %s"
 msgstr "Kliknite za odpiranje %s"
 
-#: ../e-util/e-web-view.c:330
-msgid "Save _Image..."
-msgstr "Shrani _sliko ..."
-
-#: ../e-util/e-web-view.c:332
-msgid "Save the image to a file"
-msgstr "Shrani sliko v datoteko"
-
-#: ../e-util/e-web-view.c:2907
+#: ../e-util/e-web-view.c:2941
 msgid "Copying image to clipboard"
 msgstr "Poteka kopiranje slike v odložišče"
 
-#: ../e-util/e-web-view.c:3095
+#: ../e-util/e-web-view.c:3129
 msgid "Save Image"
 msgstr "Shrani sliko"
 
-#: ../e-util/e-web-view.c:3131
+#: ../e-util/e-web-view.c:3165
 #, c-format
 msgid "Saving image to '%s'"
 msgstr "Poteka shranjevanje slike v '%s'"
@@ -12047,37 +14173,6 @@ msgstr "Razveljavi 'brisanje besedila'"
 msgid "Redo 'Delete text'"
 msgstr "Ponovno uveljavi 'brisanje besedila'"
 
-#: ../e-util/ea-calendar-item.c:314 ../e-util/ea-calendar-item.c:323
-msgid "%d %B %Y"
-msgstr "%d. %B %Y"
-
-#: ../e-util/ea-calendar-item.c:326
-#, c-format
-msgid "Calendar: from %s to %s"
-msgstr "Koledar: od %s do %s"
-
-#: ../e-util/ea-calendar-item.c:363
-msgid "evolution calendar item"
-msgstr "predmet koledarja evolution"
-
-#: ../e-util/evolution-source-viewer.c:636
-msgid "Evolution Source Viewer"
-msgstr "Pregledovalnik virov Evolution"
-
-#. Translators: The name that is displayed in the user interface
-#: ../e-util/evolution-source-viewer.c:666
-msgid "Display Name"
-msgstr "Prikazano ime"
-
-#: ../e-util/evolution-source-viewer.c:675
-msgid "Flags"
-msgstr "Zastavice"
-
-#: ../e-util/evolution-source-viewer.c:727
-#: ../mail/e-mail-config-identity-page.c:677
-msgid "Identity"
-msgstr "Istovetnost"
-
 #: ../e-util/filter.error.xml.h:1
 msgid "Missing date."
 msgstr "Manjka datum."
@@ -12138,13 +14233,95 @@ msgstr "Manjka vrednost."
 msgid "One or more values cannot be empty."
 msgstr "Ena ali več vrednosti ne sme biti prazna vrednost."
 
+#: ../e-util/filter.ui.h:2
+msgid "the current time"
+msgstr "trenutni čas"
+
+#: ../e-util/filter.ui.h:3
+msgid "the time you specify"
+msgstr "čas, ki ga navedete"
+
+#: ../e-util/filter.ui.h:4
+msgid "a time relative to the current time"
+msgstr "čas relativno na trenutni čas"
+
+#: ../e-util/filter.ui.h:5 ../mail/mail-config.ui.h:86
+msgid "seconds"
+msgstr "sekund"
+
+#: ../e-util/filter.ui.h:9 ../plugins/publish-calendar/publish-calendar.ui.h:7
+msgid "weeks"
+msgstr "tednov"
+
+#: ../e-util/filter.ui.h:10
+#: ../plugins/publish-calendar/publish-calendar.ui.h:8
+msgid "months"
+msgstr "mesecev"
+
+#: ../e-util/filter.ui.h:11
+msgid "years"
+msgstr "let"
+
+#: ../e-util/filter.ui.h:12
+msgid "ago"
+msgstr "nazaj"
+
+#: ../e-util/filter.ui.h:13
+msgid "in the future"
+msgstr "v prihodnosti"
+
+#: ../e-util/filter.ui.h:14
+msgid "Show filters for mail:"
+msgstr "Pokaži filtre za pošto:"
+
+#: ../e-util/filter.ui.h:15 ../mail/em-filter-editor.c:165
+msgid "_Filter Rules"
+msgstr "Pravila _filtriranja"
+
+#: ../e-util/filter.ui.h:23
+msgid "Compare against"
+msgstr "Primerjaj z"
+
+#: ../e-util/filter.ui.h:24
+msgid ""
+"The message's date will be compared against\n"
+"the current time when filtering occurs."
+msgstr ""
+"Datum tega sporočila bo primerjan s trenutnim\n"
+"časom, ko se izvede filtriranje."
+
+#: ../e-util/filter.ui.h:26
+msgid ""
+"The message's date will be compared against\n"
+"12:00am of the date specified."
+msgstr ""
+"Datum tega sporočila bo primerjan s časom\n"
+"12:00 na navedeni datum."
+
+#: ../e-util/filter.ui.h:28
+msgid ""
+"The message's date will be compared against\n"
+"a time relative to when filtering occurs."
+msgstr ""
+"Datum tega sporočila bo primerjan s časom,\n"
+"relativnim na časa filtriranja."
+
+#: ../e-util/gal-a11y-e-cell.c:122
+msgid "Table Cell"
+msgstr "Celica razpredelnice"
+
 #. Translators: description of a "popup" action
 #: ../e-util/gal-a11y-e-cell-popup.c:127
 msgid "popup a child"
 msgstr "prikaže podrejen predmet v pojavnem oknu"
 
+#. Translators: description of an "edit" action
+#: ../e-util/gal-a11y-e-cell-text.c:617
+msgid "begin editing this cell"
+msgstr ""
+
 #. Translators: description of a "toggle" action
-#: ../e-util/gal-a11y-e-cell-toggle.c:179
+#: ../e-util/gal-a11y-e-cell-toggle.c:185
 msgid "toggle the cell"
 msgstr "preklopi celico"
 
@@ -12158,10 +14335,6 @@ msgstr "razširi vrstico v ETree, ki vsebuje to celico"
 msgid "collapses the row in the ETree containing this cell"
 msgstr "zloži vrstico v ETree, ki vsebuje to celico"
 
-#: ../e-util/gal-a11y-e-cell.c:122
-msgid "Table Cell"
-msgstr "Celica razpredelnice"
-
 #: ../e-util/gal-a11y-e-table-click-to-add.c:71
 msgid "click"
 msgstr "kliknite"
@@ -12174,6 +14347,14 @@ msgstr "razvrsti"
 msgid "Save Current View"
 msgstr "Shrani trenutni pogled"
 
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:1
+msgid "_Create new view"
+msgstr "Ustvari _nov pogled"
+
+#: ../e-util/gal-view-instance-save-as-dialog.ui.h:3
+msgid "_Replace existing view"
+msgstr "_Zamenjaj obstoječi pogled"
+
 #: ../e-util/widgets.error.xml.h:1
 msgid "Do you wish to save your changes?"
 msgstr "Ali želite shraniti spremembe?"
@@ -12210,6 +14391,27 @@ msgstr "Ni mogoče naložiti datoteke s podpisom."
 msgid "Could not save signature."
 msgstr "Ni mogoče shraniti datoteke s podpisom."
 
+#: ../evolution.appdata.xml.in.h:1
+msgid ""
+"Evolution is a personal information management application that provides "
+"integrated mail, calendaring and address book functionality."
+msgstr ""
+"Program Evolution je osebni upravljalnik podatkov, povezanih z elektronsko "
+"pošto, koledarjem in imenikom."
+
+#: ../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 ""
+"Program Evulution podpira širok nabor standardnih podatkovnih zapisov in "
+"omrežnih protokolov za izmenjavo podatkov. Poudarjeni so standardi, ki so "
+"znani zaradi splošne uporabnosti in varnosti. Evolution podpira tudi "
+"povezavo s sistemom Microsoft Exchange preko razširitve EWS - \"Exchange Web "
+"Services\"."
+
 #: ../libemail-engine/camel-sasl-xoauth2.c:26
 msgid "OAuth2"
 msgstr "OAuth2"
@@ -12218,11 +14420,6 @@ msgstr "OAuth2"
 msgid "This option will use an OAuth 2.0 access token to connect to the server"
 msgstr "Ta možnost uporablja za povezavo s strežnikom žeton dostopa OAuth 2.0."
 
-#: ../libemail-engine/e-mail-authenticator.c:181
-#, c-format
-msgid "Invalid authentication result code (%d)"
-msgstr "Neveljavna koda rezultata overitve (%d)"
-
 #: ../libemail-engine/e-mail-folder-utils.c:113
 #, c-format
 msgid "Saving message to folder '%s'"
@@ -12278,100 +14475,113 @@ msgstr[3] "Shranjevanje %d sporočil"
 msgid "Invalid folder URI '%s'"
 msgstr "Neveljaven naslov URI mape '%s'"
 
-#: ../libemail-engine/e-mail-session-utils.c:539
-msgid "No mail transport service available"
-msgstr "Na voljo ni nobene storitve za dostop do pošte"
-
-#: ../libemail-engine/e-mail-session-utils.c:639
-#: ../libemail-engine/mail-ops.c:707
-#, c-format
-msgid "Failed to apply outgoing filters: %s"
-msgstr "Uveljavljanje izhodnih filtrov ni uspelo: %s"
-
-#: ../libemail-engine/e-mail-session-utils.c:688
-#: ../libemail-engine/mail-ops.c:750
-#, c-format
-msgid ""
-"Failed to append to %s: %s\n"
-"Appending to local 'Sent' folder instead."
-msgstr ""
-"Pripenjanje v %s ni uspelo: %s\n"
-"Pripenjanje v krajevno mapo 'Poslano'."
-
-#: ../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 "Pripenjanje v krajevno mapo 'Poslano' ni uspelo: %s"
-
-#: ../libemail-engine/e-mail-session-utils.c:915
-#: ../libemail-engine/mail-ops.c:906 ../libemail-engine/mail-ops.c:1008
-msgid "Sending message"
-msgstr "Pošiljanje sporočila"
-
-#: ../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
+#. Some local folders
+#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-properties.c:410
+#: ../mail/em-folder-tree-model.c:1174 ../mail/importers/kmail-libs.c:141
+#: ../modules/mail/e-mail-shell-view-private.c:1074
+#: ../modules/mail/e-mail-shell-view-private.c:1085
 msgid "Inbox"
 msgstr "Dohodna pošta"
 
 #. E_MAIL_LOCAL_FOLDER_INBOX
-#: ../libemail-engine/e-mail-session.c:121 ../mail/em-folder-tree-model.c:1153
-#: ../modules/mail/e-mail-shell-view-private.c:1058
+#: ../libemail-engine/e-mail-session.c:125 ../mail/em-folder-tree-model.c:1167
+#: ../mail/importers/kmail-libs.c:147
+#: ../modules/mail/e-mail-shell-view-private.c:1072
 msgid "Drafts"
 msgstr "Osnutki"
 
 #. E_MAIL_LOCAL_FOLDER_DRAFTS
-#: ../libemail-engine/e-mail-session.c:122 ../mail/em-folder-tree-model.c:1164
-#: ../modules/mail/e-mail-shell-view-private.c:1062
+#: ../libemail-engine/e-mail-session.c:126 ../mail/em-folder-tree-model.c:1178
+#: ../mail/importers/kmail-libs.c:143
+#: ../modules/mail/e-mail-shell-view-private.c:1076
 msgid "Outbox"
 msgstr "Odhodni predal"
 
 #. E_MAIL_LOCAL_FOLDER_OUTBOX
-#: ../libemail-engine/e-mail-session.c:123 ../mail/em-folder-tree-model.c:1168
-#: ../modules/mail/e-mail-shell-view-private.c:1064
+#: ../libemail-engine/e-mail-session.c:127 ../mail/em-folder-tree-model.c:1182
+#: ../mail/importers/kmail-libs.c:145
+#: ../modules/mail/e-mail-shell-view-private.c:1078
 msgid "Sent"
 msgstr "Poslano"
 
 #. E_MAIL_LOCAL_FOLDER_SENT
-#: ../libemail-engine/e-mail-session.c:124 ../mail/em-folder-tree-model.c:1156
-#: ../modules/mail/e-mail-shell-view-private.c:1066
+#: ../libemail-engine/e-mail-session.c:128 ../mail/em-folder-tree-model.c:1170
+#: ../mail/importers/kmail-libs.c:149
+#: ../modules/mail/e-mail-shell-view-private.c:1080
 #: ../plugins/templates/org-gnome-templates.eplug.xml.h:1
-#: ../plugins/templates/templates.c:1080 ../plugins/templates/templates.c:1379
-#: ../plugins/templates/templates.c:1389
+#: ../plugins/templates/templates.c:1130 ../plugins/templates/templates.c:1432
+#: ../plugins/templates/templates.c:1442
 msgid "Templates"
 msgstr "Predloge"
 
-#: ../libemail-engine/e-mail-session.c:1245
+#: ../libemail-engine/e-mail-session.c:1261
 #, c-format
 msgid "User cancelled operation"
 msgstr "Uporabnik je preklical opravilo"
 
-#: ../libemail-engine/e-mail-session.c:1373
-#, c-format
-msgid "%s authentication failed"
-msgstr "Overitev %s je spodletela."
-
-#: ../libemail-engine/e-mail-session.c:1423
-#, c-format
-msgid "No data source found for UID '%s'"
-msgstr "Vira podatkov za UID '%s' ni bilo mogoče najti."
-
-#: ../libemail-engine/e-mail-session.c:1486
+#: ../libemail-engine/e-mail-session.c:1318
 #, c-format
 msgid ""
 "No destination address provided, forwarding of the message has been "
 "cancelled."
 msgstr "Ciljni naslov ni določen, posredovanje sporočila je preklicano."
 
-#: ../libemail-engine/e-mail-session.c:1499
+#: ../libemail-engine/e-mail-session.c:1331
 #, c-format
 msgid "No identity found to use, forwarding of the message has been cancelled."
 msgstr ""
 "Najdene ni nobene istovetnosti za uporabo, posredovanje sporočila je "
 "preklicano."
 
+#: ../libemail-engine/e-mail-session.c:2360
+#, fuzzy, c-format
+msgid "Waiting for '%s'"
+msgstr "Shranjevanje mape '%s'"
+
+#: ../libemail-engine/e-mail-session-utils.c:539
+msgid "No mail transport service available"
+msgstr "Na voljo ni nobene storitve za dostop do pošte"
+
+#: ../libemail-engine/e-mail-session-utils.c:629
+#: ../libemail-engine/mail-ops.c:718
+#, fuzzy, c-format
+msgid "Posting message to '%s'"
+msgstr "Premikanje sporočil v '%s'"
+
+#: ../libemail-engine/e-mail-session-utils.c:666
+#: ../libemail-engine/mail-ops.c:754
+#, c-format
+msgid "Failed to apply outgoing filters: %s"
+msgstr "Uveljavljanje izhodnih filtrov ni uspelo: %s"
+
+#: ../libemail-engine/e-mail-session-utils.c:696
+#: ../libemail-engine/e-mail-session-utils.c:731
+#: ../libemail-engine/mail-ops.c:778 ../libemail-engine/mail-ops.c:813
+#, fuzzy, c-format
+msgid "Storing sent message to '%s'"
+msgstr "Premikanje sporočil v '%s'"
+
+#: ../libemail-engine/e-mail-session-utils.c:720
+#: ../libemail-engine/mail-ops.c:802
+#, c-format
+msgid ""
+"Failed to append to %s: %s\n"
+"Appending to local 'Sent' folder instead."
+msgstr ""
+"Pripenjanje v %s ni uspelo: %s\n"
+"Pripenjanje v krajevno mapo 'Poslano'."
+
+#: ../libemail-engine/e-mail-session-utils.c:750
+#: ../libemail-engine/mail-ops.c:830
+#, c-format
+msgid "Failed to append to local 'Sent' folder: %s"
+msgstr "Pripenjanje v krajevno mapo 'Poslano' ni uspelo: %s"
+
+#: ../libemail-engine/e-mail-session-utils.c:952
+#: ../libemail-engine/mail-ops.c:978 ../libemail-engine/mail-ops.c:1080
+msgid "Sending message"
+msgstr "Pošiljanje sporočila"
+
 #: ../libemail-engine/e-mail-store-utils.c:189
 #, c-format
 msgid "Disconnecting from '%s'"
@@ -12409,7 +14619,7 @@ msgstr ""
 msgid "Fetching mail from '%s'"
 msgstr "Pridobivanje pošte s strežnika '%s'"
 
-#: ../libemail-engine/mail-ops.c:701
+#: ../libemail-engine/mail-ops.c:748
 #, c-format
 msgid ""
 "Failed to apply outgoing filters. One reason can be that folder location set "
@@ -12422,12 +14632,12 @@ msgstr ""
 "Uredi->Filtri sporočil.\n"
 "Izvorna napaka: %s"
 
-#: ../libemail-engine/mail-ops.c:917
+#: ../libemail-engine/mail-ops.c:989
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Pošiljanje sporočila %d od %d"
 
-#: ../libemail-engine/mail-ops.c:969
+#: ../libemail-engine/mail-ops.c:1041
 #, c-format
 msgid "Failed to send a message"
 msgid_plural "Failed to send %d of %d messages"
@@ -12436,44 +14646,49 @@ msgstr[1] "Pošiljanje %d od %d sporočila je spodletelo."
 msgstr[2] "Pošiljanje %d od %d sporočil je spodletelo."
 msgstr[3] "Pošiljanje %d od %d sporočil je spodletelo."
 
-#: ../libemail-engine/mail-ops.c:975
+#: ../libemail-engine/mail-ops.c:1047
 msgid "Canceled."
 msgstr "Preklicano."
 
-#: ../libemail-engine/mail-ops.c:977
+#: ../libemail-engine/mail-ops.c:1049
 msgid "Complete."
 msgstr "Končano."
 
-#: ../libemail-engine/mail-ops.c:1089
+#: ../libemail-engine/mail-ops.c:1163
 #, c-format
 msgid "Moving messages to '%s'"
 msgstr "Premikanje sporočil v '%s'"
 
-#: ../libemail-engine/mail-ops.c:1090
+#: ../libemail-engine/mail-ops.c:1164
 #, c-format
 msgid "Copying messages to '%s'"
 msgstr "Kopiranje sporočil v '%s'"
 
-#: ../libemail-engine/mail-ops.c:1209
+#: ../libemail-engine/mail-ops.c:1283
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Shranjevanje mape '%s'"
 
-#: ../libemail-engine/mail-ops.c:1337
+#: ../libemail-engine/mail-ops.c:1411
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Uničevanje in shranjevanje računa '%s'"
 
-#: ../libemail-engine/mail-ops.c:1338
+#: ../libemail-engine/mail-ops.c:1412
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Shranjevanje računa '%s'"
 
-#: ../libemail-engine/mail-ops.c:1413
+#: ../libemail-engine/mail-ops.c:1487
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Praznjenje smeti v '%s'"
 
+#: ../libemail-engine/mail-ops.c:1579
+#, fuzzy, c-format
+msgid "Processing folder changes in '%s'"
+msgstr "Shranjevanje mape '%s'"
+
 #: ../libemail-engine/mail-tools.c:70
 #, c-format
 msgid "Could not create spool directory '%s': %s"
@@ -12542,51 +14757,40 @@ msgstr "Odpri _spletni račun"
 msgid "This account was created through the Online Accounts service."
 msgstr "Račun je bil ustvarjen preko storitve spletnih računov."
 
-#: ../mail/e-mail-account-manager.c:690
+#: ../mail/e-mail-account-manager.c:689
 msgid "_Reset Order"
 msgstr "_Počisti zahtevo"
 
-#: ../mail/e-mail-account-manager.c:703
+#: ../mail/e-mail-account-manager.c:702
 msgid "You can drag and drop account names to reorder them."
 msgstr ""
 "Imena računov je mogoče prerazporediti tako, da jih povlečete in spustite."
 
-#: ../mail/e-mail-account-manager.c:746
+#: ../mail/e-mail-account-manager.c:745
 msgid "De_fault"
 msgstr "_Privzeto"
 
-#: ../mail/e-mail-account-tree-view.c:84
-#: ../modules/mail/em-composer-prefs.c:1191
+#: ../mail/e-mail-account-tree-view.c:83
+#: ../modules/mail/em-composer-prefs.c:1234
 #: ../modules/plugin-manager/evolution-plugin-manager.c:358
 #: ../plugins/publish-calendar/publish-calendar.c:896
 msgid "Enabled"
 msgstr "Omogočeno"
 
-#: ../mail/e-mail-account-tree-view.c:108
+#: ../mail/e-mail-account-tree-view.c:107
 msgid "Account Name"
 msgstr "Ime računa"
 
-#: ../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:3604
-#: ../mail/mail-config.ui.h:66
-msgid "Default"
-msgstr "Privzeto"
-
-#: ../mail/e-mail-autoconfig.c:611
+#: ../mail/e-mail-autoconfig.c:619
 msgid "No email address provided"
 msgstr "Elektronski naslov ni naveden"
 
-#: ../mail/e-mail-autoconfig.c:620
+#: ../mail/e-mail-autoconfig.c:628
 msgid "Missing domain in email address"
 msgstr "V elektronskem naslovu manjka del z domeno"
 
-#: ../mail/e-mail-backend.c:855
-msgid "Unknown background operation"
-msgstr "Neznano ozadnje opravilo"
-
-#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:904
-#: ../shell/e-shell-window-actions.c:911 ../shell/e-shell-window-actions.c:918
+#: ../mail/e-mail-browser.c:128 ../shell/e-shell-window-actions.c:903
+#: ../shell/e-shell-window-actions.c:910 ../shell/e-shell-window-actions.c:917
 msgid "Close this window"
 msgstr "Zapri to okno"
 
@@ -12600,23 +14804,23 @@ msgid "Go _Back"
 msgstr "Pojdi _nazaj"
 
 #. GtkAssistant sinks the floating button reference.
-#: ../mail/e-mail-config-assistant.c:114
+#: ../mail/e-mail-config-assistant.c:115
 msgid "_Skip Lookup"
 msgstr "_Preskoči poizvedbo"
 
-#: ../mail/e-mail-config-assistant.c:654
+#: ../mail/e-mail-config-assistant.c:660
 msgid "Evolution Account Assistant"
 msgstr "Pomočnik za račune Evolutiona"
 
-#: ../mail/e-mail-config-assistant.c:936
+#: ../mail/e-mail-config-assistant.c:952
 msgid "_Revise Details"
 msgstr "_Preglej podrobnosti"
 
-#: ../mail/e-mail-config-auth-check.c:350
+#: ../mail/e-mail-config-auth-check.c:349
 msgid "Check for Supported Types"
 msgstr "Preveri za podprte vrste"
 
-#: ../mail/e-mail-config-confirm-page.c:156
+#: ../mail/e-mail-config-confirm-page.c:155
 msgid ""
 "Congratulations, your mail configuration is complete.\n"
 "\n"
@@ -12630,7 +14834,7 @@ msgstr ""
 "\n"
 "S klikom na gumb \"Uveljavi\" bodo spremembe shranjene."
 
-#: ../mail/e-mail-config-confirm-page.c:168
+#: ../mail/e-mail-config-confirm-page.c:167
 msgid "Done"
 msgstr "Končano"
 
@@ -12659,62 +14863,73 @@ msgid "S_ave replies in the folder of the message being replied to"
 msgstr "S_hrani odgovore v mapo sporočila, na katerega se nanaša odgovor"
 
 #: ../mail/e-mail-config-defaults-page.c:628
+#, fuzzy
+msgid "Archi_ve Folder:"
+msgstr "Iskalne mape"
+
+#: ../mail/e-mail-config-defaults-page.c:638
+#: ../modules/mail/em-mailer-prefs.c:1079
+#, fuzzy
+msgid "Choose a folder to archive messages to."
+msgstr "Izberite mape, v katere želite objaviti sporočilo."
+
+#: ../mail/e-mail-config-defaults-page.c:652
 msgid "_Restore Defaults"
 msgstr "_Obnovi privzete nastavitve"
 
-#: ../mail/e-mail-config-defaults-page.c:642
+#: ../mail/e-mail-config-defaults-page.c:666
 msgid "Use a Real Folder for _Trash:"
 msgstr "Uporabi pravo mapo za _smeti:"
 
-#: ../mail/e-mail-config-defaults-page.c:643
+#: ../mail/e-mail-config-defaults-page.c:667
 msgid "Choose a folder for deleted messages."
 msgstr "Izberite mapo za izbrisana sporočila."
 
-#: ../mail/e-mail-config-defaults-page.c:652
+#: ../mail/e-mail-config-defaults-page.c:676
 msgid "Use a Real Folder for _Junk:"
 msgstr "Uporabite pravo mapo za _vsiljena sporočila."
 
-#: ../mail/e-mail-config-defaults-page.c:653
+#: ../mail/e-mail-config-defaults-page.c:677
 msgid "Choose a folder for junk messages."
 msgstr "Izberite mapo za vsiljena sporočila."
 
-#: ../mail/e-mail-config-defaults-page.c:670
+#: ../mail/e-mail-config-defaults-page.c:694
 msgid "Composing Messages"
 msgstr "Sestavljanje sporočil"
 
-#: ../mail/e-mail-config-defaults-page.c:679
+#: ../mail/e-mail-config-defaults-page.c:703
 msgid "Alway_s carbon-copy (cc) to:"
 msgstr "Vedno pošlji _kopije (Kp) na:"
 
-#: ../mail/e-mail-config-defaults-page.c:704
+#: ../mail/e-mail-config-defaults-page.c:728
 msgid "Always _blind carbon-copy (bcc) to:"
 msgstr "Vedno pošlji _slepe kopije (Skp) na:"
 
-#: ../mail/e-mail-config-defaults-page.c:739
+#: ../mail/e-mail-config-defaults-page.c:763
 msgid "Message Receipts"
 msgstr "Povratnice sporočil"
 
-#: ../mail/e-mail-config-defaults-page.c:748
+#: ../mail/e-mail-config-defaults-page.c:772
 msgid "S_end message receipts:"
 msgstr "Pošlji povratnic_e sporočil:"
 
-#: ../mail/e-mail-config-defaults-page.c:773
+#: ../mail/e-mail-config-defaults-page.c:797
 msgid "Never"
 msgstr "Nikoli"
 
-#: ../mail/e-mail-config-defaults-page.c:779
+#: ../mail/e-mail-config-defaults-page.c:803
 msgid "Always"
 msgstr "Vedno"
 
-#: ../mail/e-mail-config-defaults-page.c:785
+#: ../mail/e-mail-config-defaults-page.c:809
 msgid "Ask for each message"
 msgstr "Vprašaj za vsako sporočilo"
 
-#: ../mail/e-mail-config-defaults-page.c:856
+#: ../mail/e-mail-config-defaults-page.c:880
 msgid "Defaults"
 msgstr "Privzeto"
 
-#: ../mail/e-mail-config-identity-page.c:265
+#: ../mail/e-mail-config-identity-page.c:282
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
 "below do not need to be filled in, unless you wish to include this "
@@ -12724,13 +14939,13 @@ msgstr ""
 "treba izpolnjevati, razen če želite tudi te podatke vključiti v elektronsko "
 "pošto, ki jo boste pošiljali."
 
-#: ../mail/e-mail-config-identity-page.c:293
-#: ../mail/e-mail-config-summary-page.c:323
+#: ../mail/e-mail-config-identity-page.c:310
+#: ../mail/e-mail-config-summary-page.c:322
 msgid "Account Information"
 msgstr "Podrobnosti računa"
 
-#: ../mail/e-mail-config-identity-page.c:302
-#: ../mail/e-mail-config-summary-page.c:332
+#: ../mail/e-mail-config-identity-page.c:319
+#: ../mail/e-mail-config-summary-page.c:331
 msgid ""
 "Type the name by which you would like to refer to this account.\n"
 "For example, \"Work\" or \"Personal\"."
@@ -12738,36 +14953,40 @@ msgstr ""
 "Vtipkajte ime, ki bi ga radi uporabili za ta račun.\n"
 "Na primer, \"Delo\" ali \"Osebno\"."
 
-#: ../mail/e-mail-config-identity-page.c:347
+#: ../mail/e-mail-config-identity-page.c:364
 msgid "Required Information"
 msgstr "Zahtevani podatki"
 
-#: ../mail/e-mail-config-identity-page.c:356
+#: ../mail/e-mail-config-identity-page.c:373
 msgid "Full Nam_e:"
 msgstr "Polno im_e:"
 
-#: ../mail/e-mail-config-identity-page.c:383
+#: ../mail/e-mail-config-identity-page.c:400
 msgid "Email _Address:"
 msgstr "_Elektronski naslov:"
 
-#: ../mail/e-mail-config-identity-page.c:430
+#: ../mail/e-mail-config-identity-page.c:447
 #: ../plugins/publish-calendar/publish-calendar.ui.h:26
 msgid "Optional Information"
 msgstr "Dodatne podrobnosti"
 
-#: ../mail/e-mail-config-identity-page.c:439
+#: ../mail/e-mail-config-identity-page.c:456
 msgid "Re_ply-To:"
 msgstr "Od_govori-na:"
 
-#: ../mail/e-mail-config-identity-page.c:466
+#: ../mail/e-mail-config-identity-page.c:483
 msgid "Or_ganization:"
 msgstr "Or_ganizacija:"
 
-#: ../mail/e-mail-config-identity-page.c:521
+#: ../mail/e-mail-config-identity-page.c:538
 msgid "Add Ne_w Signature..."
 msgstr "Dodaj no_v podpis ..."
 
-#: ../mail/e-mail-config-lookup-page.c:67
+#: ../mail/e-mail-config-identity-page.c:556
+msgid "_Look up mail server details based on the entered e-mail address"
+msgstr ""
+
+#: ../mail/e-mail-config-lookup-page.c:70
 msgid "Looking up account details..."
 msgstr "Iskanje podrobnosti računa ..."
 
@@ -12779,7 +14998,7 @@ msgstr "Preverjanje za novo pošto"
 msgid "Check for _new messages every"
 msgstr "Samodejno preveri _novo pošto vsakih"
 
-#: ../mail/e-mail-config-provider-page.c:699
+#: ../mail/e-mail-config-provider-page.c:698
 msgid "Receiving Options"
 msgstr "Možnosti prejemanja"
 
@@ -12787,99 +15006,107 @@ msgstr "Možnosti prejemanja"
 msgid "Receiving Email"
 msgstr "Prejemanje elektronske pošte"
 
-#: ../mail/e-mail-config-security-page.c:260
-#: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:26
+#. Translators: This string is to describe a PGP key in a combo box in mail account's preferences.
+#. The first '%s' is a key ID, the second '%s' is a display name of the key.
+#: ../mail/e-mail-config-security-page.c:251
+#, fuzzy, c-format
+msgctxt "PGPKeyDescription"
+msgid "%s - %s"
+msgstr "Naloga - %s"
+
+#: ../mail/e-mail-config-security-page.c:340
+#: ../mail/em-folder-properties.c:334 ../mail/mail-config.ui.h:29
 #: ../modules/addressbook/autocompletion-config.c:114
-#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#: ../modules/calendar/e-calendar-preferences.ui.h:46
 #: ../modules/itip-formatter/plugin/config-ui.c:90
 #: ../plugins/publish-calendar/publish-calendar.ui.h:16
 msgid "General"
 msgstr "Splošno"
 
-#: ../mail/e-mail-config-security-page.c:269
+#: ../mail/e-mail-config-security-page.c:349
 msgid "_Do not sign meeting requests (for Outlook compatibility)"
 msgstr "Ne po_dpisuj zahtev za srečanja (za združljivost z Outlookom)"
 
-#: ../mail/e-mail-config-security-page.c:291
+#: ../mail/e-mail-config-security-page.c:371
 msgid "Pretty Good Privacy (OpenPGP)"
 msgstr "Precej dobra zasebnost (OpenPGP)"
 
-#: ../mail/e-mail-config-security-page.c:300
+#: ../mail/e-mail-config-security-page.c:380
 msgid "OpenPGP _Key ID:"
 msgstr "_ID ključa OpenPGP:"
 
-#: ../mail/e-mail-config-security-page.c:322
+#: ../mail/e-mail-config-security-page.c:413
 msgid "Si_gning algorithm:"
 msgstr "Po_dpisovalni algoritem:"
 
-#: ../mail/e-mail-config-security-page.c:338
-#: ../mail/e-mail-config-security-page.c:478 ../mail/mail-config.ui.h:67
+#: ../mail/e-mail-config-security-page.c:429
+#: ../mail/e-mail-config-security-page.c:569 ../mail/mail-config.ui.h:70
 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:68
+#: ../mail/e-mail-config-security-page.c:432
+#: ../mail/e-mail-config-security-page.c:572 ../mail/mail-config.ui.h:71
 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:69
+#: ../mail/e-mail-config-security-page.c:435
+#: ../mail/e-mail-config-security-page.c:575 ../mail/mail-config.ui.h:72
 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:70
+#: ../mail/e-mail-config-security-page.c:438
+#: ../mail/e-mail-config-security-page.c:578 ../mail/mail-config.ui.h:73
 msgid "SHA512"
 msgstr "SHA512"
 
-#: ../mail/e-mail-config-security-page.c:363
+#: ../mail/e-mail-config-security-page.c:454
 msgid "Al_ways sign outgoing messages when using this account"
 msgstr "Ob uporabi tega računa _vedno podpiši odhodno pošto"
 
-#: ../mail/e-mail-config-security-page.c:375
+#: ../mail/e-mail-config-security-page.c:466
 msgid "Always encrypt to _myself when sending encrypted messages"
 msgstr "Ob pošiljanju šifrirane pošte vedno šifriraj tudi _sebi"
 
-#: ../mail/e-mail-config-security-page.c:387
+#: ../mail/e-mail-config-security-page.c:478
 msgid "Always _trust keys in my keyring when encrypting"
 msgstr "Med šifriranjem vedno _zaupaj ključem v moji zbirki ključev"
 
-#: ../mail/e-mail-config-security-page.c:411
+#: ../mail/e-mail-config-security-page.c:502
 msgid "Secure MIME (S/MIME)"
 msgstr "Varne vrste MIME (S/MIME)"
 
-#: ../mail/e-mail-config-security-page.c:420
+#: ../mail/e-mail-config-security-page.c:511
 msgid "Sig_ning certificate:"
 msgstr "Po_dpisovanje potrdila:"
 
-#: ../mail/e-mail-config-security-page.c:444
-#: ../mail/e-mail-config-security-page.c:550
+#: ../mail/e-mail-config-security-page.c:535
+#: ../mail/e-mail-config-security-page.c:641
 msgid "Select"
 msgstr "Izberi"
 
-#: ../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
+#: ../mail/e-mail-config-security-page.c:544
+#: ../mail/e-mail-config-security-page.c:650 ../mail/mail-dialogs.ui.h:5
+#: ../shell/e-shell-window-actions.c:1006
 msgid "_Clear"
 msgstr "Po_čisti"
 
-#: ../mail/e-mail-config-security-page.c:462
+#: ../mail/e-mail-config-security-page.c:553
 msgid "Signing _algorithm:"
 msgstr "Podpisovalni _algoritem:"
 
-#: ../mail/e-mail-config-security-page.c:503
+#: ../mail/e-mail-config-security-page.c:594
 msgid "Always sign outgoing messages when using this account"
 msgstr "Vedno ko uporabljaš ta račun, podpiši odhodna sporočila"
 
-#: ../mail/e-mail-config-security-page.c:526
+#: ../mail/e-mail-config-security-page.c:617
 msgid "Encryption certificate:"
 msgstr "Potrdilo za šifriranje:"
 
-#: ../mail/e-mail-config-security-page.c:568
+#: ../mail/e-mail-config-security-page.c:659
 msgid "Always encrypt outgoing messages when using this account"
 msgstr "Vedno ko uporabljaš ta račun, šifriraj odhodna sporočila"
 
-#: ../mail/e-mail-config-security-page.c:588
+#: ../mail/e-mail-config-security-page.c:679
 msgid "Always encrypt to myself when sending encrypted messages"
 msgstr "Vedno šifriraj sebi, ko pošiljaš šifrirana sporočila"
 
@@ -12887,7 +15114,7 @@ msgstr "Vedno šifriraj sebi, ko pošiljaš šifrirana sporočila"
 msgid "Sending Email"
 msgstr "Pošiljanje elektronske pošte"
 
-#: ../mail/e-mail-config-service-page.c:639
+#: ../mail/e-mail-config-service-page.c:638
 msgid "Server _Type:"
 msgstr "Vrs_ta strežnika:"
 
@@ -12899,101 +15126,165 @@ msgstr "SSL"
 msgid "TLS"
 msgstr "TLS"
 
-#: ../mail/e-mail-config-summary-page.c:306
+#: ../mail/e-mail-config-summary-page.c:305
 msgid ""
 "This is a summary of the settings which will be used to access your mail."
 msgstr ""
 "To je povzetek nastavitev, ki bodo uporabljene za dostop do elektronske "
 "pošte."
 
-#: ../mail/e-mail-config-summary-page.c:371
+#: ../mail/e-mail-config-summary-page.c:370
 msgid "Personal Details"
 msgstr "Osebne podrobnosti"
 
-#: ../mail/e-mail-config-summary-page.c:380
+#: ../mail/e-mail-config-summary-page.c:379
 msgid "Full Name:"
 msgstr "Polno Ime:"
 
-#: ../mail/e-mail-config-summary-page.c:394
+#: ../mail/e-mail-config-summary-page.c:393
 msgid "Email Address:"
 msgstr "Elektronski naslov:"
 
-#: ../mail/e-mail-config-summary-page.c:408
+#: ../mail/e-mail-config-summary-page.c:407
 msgid "Receiving"
 msgstr "Prejemanje"
 
-#: ../mail/e-mail-config-summary-page.c:420
+#: ../mail/e-mail-config-summary-page.c:419
 msgid "Sending"
 msgstr "Pošiljanje"
 
-#: ../mail/e-mail-config-summary-page.c:432
+#: ../mail/e-mail-config-summary-page.c:431
 msgid "Server Type:"
 msgstr "Vrsta strežnika:"
 
-#: ../mail/e-mail-config-summary-page.c:453
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:607
+#: ../mail/e-mail-config-summary-page.c:452
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:602
 msgid "Server:"
 msgstr "Strežnik:"
 
-#: ../mail/e-mail-config-summary-page.c:474
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:696
+#: ../mail/e-mail-config-summary-page.c:473
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:691
 msgid "Username:"
 msgstr "Uporabniško ime:"
 
-#: ../mail/e-mail-config-summary-page.c:495
+#: ../mail/e-mail-config-summary-page.c:494
 msgid "Security:"
 msgstr "Varnost:"
 
-#: ../mail/e-mail-config-summary-page.c:786
+#: ../mail/e-mail-config-summary-page.c:785
 msgid "Account Summary"
 msgstr "Povzetek računa"
 
-#: ../mail/e-mail-config-welcome-page.c:157
+#: ../mail/e-mail-config-welcome-page.c:156
+#, fuzzy
 msgid ""
 "Welcome to the Evolution Mail Configuration Assistant.\n"
 "\n"
-"Click \"Continue\" to begin."
+"Click \"Next\" to begin."
 msgstr ""
 "Dobrodošli v pomočniku za poštne nastavitve programa Evolution.\n"
 "\n"
 "Kliknite \"Nadaljuj\" za začetek."
 
-#: ../mail/e-mail-config-welcome-page.c:167
+#: ../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:326
+#: ../mail/e-mail-config-window.c:325
 msgid "Account Editor"
 msgstr "Urejevalnik računov"
 
-#: ../mail/e-mail-display.c:95
+#: ../mail/e-mail-display.c:97
 msgid "_Add to Address Book..."
 msgstr "Dod_aj v imenik ..."
 
-#: ../mail/e-mail-display.c:102
+#: ../mail/e-mail-display.c:104
 msgid "_To This Address"
 msgstr "_Za ta naslov"
 
-#: ../mail/e-mail-display.c:109
+#: ../mail/e-mail-display.c:111
 msgid "_From This Address"
 msgstr "_Iz tega naslova"
 
-#: ../mail/e-mail-display.c:116
+#: ../mail/e-mail-display.c:118
 msgid "Send _Reply To..."
 msgstr "_Odgovori pošiljatelju ..."
 
-#: ../mail/e-mail-display.c:118
+#: ../mail/e-mail-display.c:120
 msgid "Send a reply message to this address"
 msgstr "Pošlji odgovor na sporočilo na ta naslov"
 
-#: ../mail/e-mail-display.c:125
+#: ../mail/e-mail-display.c:127
 msgid "Create Search _Folder"
 msgstr "Ustvari _iskalno mapo"
 
-#. Label + combo box has a 12px left margin so it's
-#. * aligned with the junk mail options above it.
-#: ../mail/e-mail-junk-options.c:297
+#: ../mail/e-mail-folder-create-dialog.c:327
+msgid "Create Folder"
+msgstr "Ustvari mapo"
+
+#: ../mail/e-mail-folder-create-dialog.c:331
+msgid "Specify where to create the folder:"
+msgstr "Določite kje naj se ustvari mapa:"
+
+#: ../mail/e-mail-folder-create-dialog.c:334
+msgid "C_reate"
+msgstr "Ustva_ri"
+
+#: ../mail/e-mail-folder-create-dialog.c:351
+msgid "Folder _name:"
+msgstr "Ime _mape:"
+
+#. Translators: This is a name of a flag, the same as all strings in the 'ffe' context.
+#. The translated value should not contain spaces.
+#: ../mail/e-mail-free-form-exp.c:226
+#, fuzzy
+msgctxt "ffe"
+msgid "Answered"
+msgstr "Odgovorjeno"
+
+#: ../mail/e-mail-free-form-exp.c:227
+#, fuzzy
+msgctxt "ffe"
+msgid "Deleted"
+msgstr "Izbrisano"
+
+#: ../mail/e-mail-free-form-exp.c:228
+#, fuzzy
+msgctxt "ffe"
+msgid "Draft"
+msgstr "Osnutek"
+
+#: ../mail/e-mail-free-form-exp.c:229
+#, fuzzy
+msgctxt "ffe"
+msgid "Flagged"
+msgstr "Označeno z zastavico"
+
+#: ../mail/e-mail-free-form-exp.c:230
+#, fuzzy
+msgctxt "ffe"
+msgid "Seen"
+msgstr "Videno"
+
+#: ../mail/e-mail-free-form-exp.c:231
+#, fuzzy
+msgctxt "ffe"
+msgid "Attachment"
+msgstr "Prilog"
+
+#: ../mail/e-mail-free-form-exp.c:479
+#, fuzzy
+msgctxt "ffe"
+msgid "no"
+msgstr "sedaj"
+
+#: ../mail/e-mail-free-form-exp.c:480
+msgctxt "ffe"
+msgid "false"
+msgstr ""
+
+#: ../mail/e-mail-junk-options.c:295
 msgid "Junk filtering software:"
 msgstr "Filtriranje vsiljene pošte:"
 
@@ -13001,32 +15292,32 @@ msgstr "Filtriranje vsiljene pošte:"
 msgid "_Label name:"
 msgstr "_Ime oznake:"
 
-#: ../mail/e-mail-label-list-store.c:56
+#: ../mail/e-mail-label-list-store.c:57
 msgid "I_mportant"
 msgstr "Po_membno"
 
 #. red
-#: ../mail/e-mail-label-list-store.c:57
+#: ../mail/e-mail-label-list-store.c:58
 msgid "_Work"
 msgstr "_Služba"
 
 #. orange
-#: ../mail/e-mail-label-list-store.c:58
+#: ../mail/e-mail-label-list-store.c:59
 msgid "_Personal"
 msgstr "_Osebno"
 
 #. green
-#: ../mail/e-mail-label-list-store.c:59
+#: ../mail/e-mail-label-list-store.c:60
 msgid "_To Do"
 msgstr "_Seznam opravil"
 
 #. blue
-#: ../mail/e-mail-label-list-store.c:60
+#: ../mail/e-mail-label-list-store.c:61
 msgid "_Later"
 msgstr "_Pozneje"
 
 #: ../mail/e-mail-label-manager.c:171
-#: ../modules/mail/e-mail-shell-view-actions.c:1028
+#: ../modules/mail/e-mail-shell-view-actions.c:1078
 msgid "Add Label"
 msgstr "Dodaj oznako"
 
@@ -13046,35 +15337,35 @@ msgstr ""
 msgid "Color"
 msgstr "Barva"
 
-#: ../mail/e-mail-print-config-headers.c:166
+#: ../mail/e-mail-print-config-headers.c:165
 msgid "Move selected headers to top"
 msgstr "Premakni izbrane glave na vrh"
 
-#: ../mail/e-mail-print-config-headers.c:171
+#: ../mail/e-mail-print-config-headers.c:170
 msgid "Move selected headers up one row"
 msgstr "Premakni izbrane glave eno vrstico višje"
 
-#: ../mail/e-mail-print-config-headers.c:176
+#: ../mail/e-mail-print-config-headers.c:175
 msgid "Move selected headers down one row"
 msgstr "Premakni izbrane glave eno vrstico nižje"
 
-#: ../mail/e-mail-print-config-headers.c:181
+#: ../mail/e-mail-print-config-headers.c:180
 msgid "Move selected headers to bottom"
 msgstr "Premakni izbrane glave na dno"
 
-#: ../mail/e-mail-print-config-headers.c:186
+#: ../mail/e-mail-print-config-headers.c:185
 msgid "Select all headers"
 msgstr "Izberi vse glave"
 
-#: ../mail/e-mail-print-config-headers.c:205
+#: ../mail/e-mail-print-config-headers.c:204
 msgid "Header Name"
 msgstr "Ime glave"
 
-#: ../mail/e-mail-print-config-headers.c:214
+#: ../mail/e-mail-print-config-headers.c:213
 msgid "Header Value"
 msgstr "Vrednost glave"
 
-#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:106
+#: ../mail/e-mail-printer.c:124 ../mail/mail-config.ui.h:114
 msgid "Headers"
 msgstr "Glave"
 
@@ -13083,598 +15374,661 @@ msgstr "Glave"
 msgid "Page %d of %d"
 msgstr "Stran %d od %d"
 
-#: ../mail/e-mail-reader.c:348 ../mail/em-filter-i18n.h:11
-msgid "Copy to Folder"
-msgstr "Kopira v mapo"
-
-#: ../mail/e-mail-reader.c:348 ../mail/em-folder-utils.c:505
-msgid "C_opy"
-msgstr "K_opiraj"
-
-#: ../mail/e-mail-reader.c:848 ../mail/em-filter-i18n.h:33
+#: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:63
 msgid "Move to Folder"
 msgstr "Premakne v mapo"
 
-#: ../mail/e-mail-reader.c:848 ../mail/em-folder-utils.c:505
+#: ../mail/e-mail-reader.c:346 ../mail/filtertypes.xml.in.h:64
+msgid "Copy to Folder"
+msgstr "Kopira v mapo"
+
+#: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
 msgid "_Move"
 msgstr "Pre_makni"
 
-#: ../mail/e-mail-reader.c:1170 ../mail/e-mail-reader.c:1382
-#: ../mail/e-mail-reader.c:1422
+#: ../mail/e-mail-reader.c:350 ../mail/em-folder-utils.c:487
+msgid "C_opy"
+msgstr "K_opiraj"
+
+#: ../mail/e-mail-reader.c:1268 ../mail/e-mail-reader.c:1480
+#: ../mail/e-mail-reader.c:1520
 msgid "_Do not ask me again."
 msgstr "_Ne vprašaj več"
 
-#: ../mail/e-mail-reader.c:1428
+#: ../mail/e-mail-reader.c:1526
 msgid "_Always ignore Reply-To: for mailing lists."
 msgstr "_Vedno prezri dogovore-na: za dopisne sezname"
 
-#: ../mail/e-mail-reader.c:1630
+#: ../mail/e-mail-reader.c:1728
 msgid "Failed to retrieve message:"
 msgstr "Pridobivanje poročila je spodletelo:"
 
-#: ../mail/e-mail-reader.c:1670 ../mail/e-mail-reader.c:2845
+#: ../mail/e-mail-reader.c:1773 ../mail/e-mail-reader.c:3014
 #, c-format
 msgid "Retrieving message '%s'"
 msgstr "Pridobivanje sporočila '%s'"
 
-#: ../mail/e-mail-reader.c:1858
+#: ../mail/e-mail-reader.c:1961
 msgid "A_dd Sender to Address Book"
 msgstr "_Dodaj pošiljatelja v imenik"
 
-#: ../mail/e-mail-reader.c:1860
+#: ../mail/e-mail-reader.c:1963
 msgid "Add sender to address book"
 msgstr "Doda pošiljatelja v imenik"
 
-#: ../mail/e-mail-reader.c:1865
+#: ../mail/e-mail-reader.c:1968
+msgid "_Archive..."
+msgstr ""
+
+#: ../mail/e-mail-reader.c:1970
+#, fuzzy
+msgid "Move selected messages to the Archive folder for the account"
+msgstr "Izbrana sporočila premakne v drugo mapo"
+
+#: ../mail/e-mail-reader.c:1975
 msgid "Check for _Junk"
 msgstr "Preveri _vsiljeno pošto"
 
-#: ../mail/e-mail-reader.c:1867
+#: ../mail/e-mail-reader.c:1977
 msgid "Filter the selected messages for junk status"
 msgstr "Preveri, ali so izbrana sporočila vsiljena"
 
-#: ../mail/e-mail-reader.c:1872
+#: ../mail/e-mail-reader.c:1982
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj v mapo ..."
 
-#: ../mail/e-mail-reader.c:1874
+#: ../mail/e-mail-reader.c:1984
 msgid "Copy selected messages to another folder"
 msgstr "Kopira izbrana sporočila v drugo mapo"
 
-#: ../mail/e-mail-reader.c:1879
+#: ../mail/e-mail-reader.c:1989
 msgid "_Delete Message"
 msgstr "_Izbriši sporočilo"
 
-#: ../mail/e-mail-reader.c:1881
+#: ../mail/e-mail-reader.c:1991
 msgid "Mark the selected messages for deletion"
 msgstr "Označi izbrana sporočila za brisanje"
 
-#: ../mail/e-mail-reader.c:1886
+#: ../mail/e-mail-reader.c:1996
 msgid "Create a Filter Rule for Mailing _List..."
 msgstr "Ustvari novo pravilo filtriranja za dopisni _seznam ..."
 
-#: ../mail/e-mail-reader.c:1888
+#: ../mail/e-mail-reader.c:1998
 msgid "Create a rule to filter messages to this mailing list"
 msgstr "Ustvari pravilo za filtriranje sporočil temu dopisnemu seznamu"
 
-#: ../mail/e-mail-reader.c:1893
+#: ../mail/e-mail-reader.c:2003
 msgid "Create a Filter Rule for _Recipients..."
 msgstr "Ustvari novo pravilo filtriranja za _prejemnike ..."
 
-#: ../mail/e-mail-reader.c:1895
+#: ../mail/e-mail-reader.c:2005
 msgid "Create a rule to filter messages to these recipients"
 msgstr "Ustvari pravilo za filtriranje sporočil tem prejemnikom"
 
-#: ../mail/e-mail-reader.c:1900
+#: ../mail/e-mail-reader.c:2010
 msgid "Create a Filter Rule for Se_nder..."
 msgstr "Ustvari pravilo filtriranja za _pošiljatelja ..."
 
-#: ../mail/e-mail-reader.c:1902
+#: ../mail/e-mail-reader.c:2012
 msgid "Create a rule to filter messages from this sender"
 msgstr "Ustvari pravilo za filtriranje sporočil tega pošiljatelja"
 
-#: ../mail/e-mail-reader.c:1907
+#: ../mail/e-mail-reader.c:2017
 msgid "Create a Filter Rule for _Subject..."
 msgstr "Ustvari novo pravilo filtriranja za _zadevo ..."
 
-#: ../mail/e-mail-reader.c:1909
+#: ../mail/e-mail-reader.c:2019
 msgid "Create a rule to filter messages with this subject"
 msgstr "Ustvari pravilo za filtriranje sporočil s to zadevo"
 
-#: ../mail/e-mail-reader.c:1914
+#: ../mail/e-mail-reader.c:2024
 msgid "A_pply Filters"
 msgstr "_Uveljavi filtre"
 
-#: ../mail/e-mail-reader.c:1916
+#: ../mail/e-mail-reader.c:2026
 msgid "Apply filter rules to the selected messages"
 msgstr "Uveljavi pravila filtra na izbranih sporočilih"
 
-#: ../mail/e-mail-reader.c:1921
+#: ../mail/e-mail-reader.c:2031
 msgid "_Find in Message..."
 msgstr "_Najdi v sporočilu ..."
 
-#: ../mail/e-mail-reader.c:1923
+#: ../mail/e-mail-reader.c:2033
 msgid "Search for text in the body of the displayed message"
 msgstr "Išče besedilo v telesu prikazanega sporočila"
 
-#: ../mail/e-mail-reader.c:1928
+#: ../mail/e-mail-reader.c:2038
 msgid "_Clear Flag"
 msgstr "Po_čisti zastavico"
 
-#: ../mail/e-mail-reader.c:1930
+#: ../mail/e-mail-reader.c:2040
 msgid "Remove the follow-up flag from the selected messages"
 msgstr "Odstrani zastavico navezave iz izbranih sporočil"
 
-#: ../mail/e-mail-reader.c:1935
+#: ../mail/e-mail-reader.c:2045
 msgid "_Flag Completed"
 msgstr "_Zastavica je končana"
 
-#: ../mail/e-mail-reader.c:1937
+#: ../mail/e-mail-reader.c:2047
 msgid "Set the follow-up flag to completed on the selected messages"
 msgstr "Nastavi zastavico navezave kot končano na izbranih sporočilih"
 
-#: ../mail/e-mail-reader.c:1942
+#: ../mail/e-mail-reader.c:2052
 msgid "Follow _Up..."
 msgstr "Na_vezava ..."
 
-#: ../mail/e-mail-reader.c:1944
+#: ../mail/e-mail-reader.c:2054
 msgid "Flag the selected messages for follow-up"
 msgstr "Z zastavico označi izbrana sporočila za navezavo"
 
-#: ../mail/e-mail-reader.c:1949
+#: ../mail/e-mail-reader.c:2059
 msgid "_Attached"
 msgstr "_Priloženo"
 
-#: ../mail/e-mail-reader.c:1951 ../mail/e-mail-reader.c:1958
+#: ../mail/e-mail-reader.c:2061 ../mail/e-mail-reader.c:2068
 msgid "Forward the selected message to someone as an attachment"
 msgstr "Posreduje izbrano sporočilo kot prilogo"
 
-#: ../mail/e-mail-reader.c:1956
+#: ../mail/e-mail-reader.c:2066
 msgid "Forward As _Attached"
 msgstr "P_osreduj kot priloženo ..."
 
-#: ../mail/e-mail-reader.c:1963
+#: ../mail/e-mail-reader.c:2073
 msgid "_Inline"
 msgstr "Kot del sporoč_ila"
 
-#: ../mail/e-mail-reader.c:1965 ../mail/e-mail-reader.c:1972
+#: ../mail/e-mail-reader.c:2075 ../mail/e-mail-reader.c:2082
 msgid "Forward the selected message in the body of a new message"
 msgstr "Posreduje izbrano sporočilo v telesu novega sporočila"
 
-#: ../mail/e-mail-reader.c:1970
+#: ../mail/e-mail-reader.c:2080
 msgid "Forward As _Inline"
 msgstr "P_osreduj v novem sporočilu"
 
-#: ../mail/e-mail-reader.c:1977
+#: ../mail/e-mail-reader.c:2087
 msgid "_Quoted"
 msgstr "_Citirano"
 
-#: ../mail/e-mail-reader.c:1979 ../mail/e-mail-reader.c:1986
+#: ../mail/e-mail-reader.c:2089 ../mail/e-mail-reader.c:2096
 msgid "Forward the selected message quoted like a reply"
 msgstr "Posreduj izbrano sporočilo citirano kot odgovor"
 
-#: ../mail/e-mail-reader.c:1984
+#: ../mail/e-mail-reader.c:2094
 msgid "Forward As _Quoted"
 msgstr "P_osreduj kot citirano ..."
 
-#: ../mail/e-mail-reader.c:1991
+#: ../mail/e-mail-reader.c:2101
 msgid "_Load Images"
 msgstr "Na_loži slike"
 
-#: ../mail/e-mail-reader.c:1993
+#: ../mail/e-mail-reader.c:2103
 msgid "Force images in HTML mail to be loaded"
 msgstr "Prisili, da bodo slike v pošti HTML naložene"
 
-#: ../mail/e-mail-reader.c:1998
+#: ../mail/e-mail-reader.c:2108 ../mail/e-mail-reader.c:2486
+msgid "_Ignore Subthread"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2110
+msgid "Mark new mails in a subthread as read automatically"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2115 ../mail/e-mail-reader.c:2490
+#, fuzzy
+msgid "_Ignore Thread"
+msgstr "Naslednja ni_t"
+
+#: ../mail/e-mail-reader.c:2117
+msgid "Mark new mails in this thread as read automatically"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2122
 msgid "_Important"
 msgstr "_Pomembno"
 
-#: ../mail/e-mail-reader.c:2000
+#: ../mail/e-mail-reader.c:2124
 msgid "Mark the selected messages as important"
 msgstr "Izbrana sporočila označi kot pomembna"
 
-#: ../mail/e-mail-reader.c:2005
+#: ../mail/e-mail-reader.c:2129
 msgid "_Junk"
 msgstr "_Vsiljena pošta"
 
-#: ../mail/e-mail-reader.c:2007
+#: ../mail/e-mail-reader.c:2131
 msgid "Mark the selected messages as junk"
 msgstr "Izbrana sporočila označi kot vsiljena"
 
-#: ../mail/e-mail-reader.c:2012
+#: ../mail/e-mail-reader.c:2136
 msgid "_Not Junk"
 msgstr "_Ni vsiljeno"
 
-#: ../mail/e-mail-reader.c:2014
+#: ../mail/e-mail-reader.c:2138
 msgid "Mark the selected messages as not being junk"
 msgstr "Izbrana sporočila označi kot zaželena"
 
-#: ../mail/e-mail-reader.c:2019
+#: ../mail/e-mail-reader.c:2143
 msgid "_Read"
 msgstr "_Preberano"
 
-#: ../mail/e-mail-reader.c:2021
+#: ../mail/e-mail-reader.c:2145
 msgid "Mark the selected messages as having been read"
 msgstr "Izbrana sporočila označi kot že prebrana"
 
-#: ../mail/e-mail-reader.c:2026
+#: ../mail/e-mail-reader.c:2150 ../mail/e-mail-reader.c:2510
+#, fuzzy
+msgid "Do not _Ignore Subthread"
+msgstr "Ni mogoče objaviti niti sporočil."
+
+#: ../mail/e-mail-reader.c:2152
+msgid "Do not mark new mails in a subthread as read automatically"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2157 ../mail/e-mail-reader.c:2514
+msgid "Do not _Ignore Thread"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2159
+msgid "Do not mark new mails in this thread as read automatically"
+msgstr ""
+
+#: ../mail/e-mail-reader.c:2164
 msgid "Uni_mportant"
 msgstr "Nepo_membno"
 
-#: ../mail/e-mail-reader.c:2028
+#: ../mail/e-mail-reader.c:2166
 msgid "Mark the selected messages as unimportant"
 msgstr "Izbrana sporočila označi kot nepomembna"
 
-#: ../mail/e-mail-reader.c:2033
+#: ../mail/e-mail-reader.c:2171
 msgid "_Unread"
 msgstr "_Neprebrano"
 
-#: ../mail/e-mail-reader.c:2035
+#: ../mail/e-mail-reader.c:2173
 msgid "Mark the selected messages as not having been read"
 msgstr "Izbrana sporočila označi kot še ne prebrana"
 
-#: ../mail/e-mail-reader.c:2040
+#: ../mail/e-mail-reader.c:2178
 msgid "_Edit as New Message..."
 msgstr "_Uredi kot novo sporočilo ..."
 
-#: ../mail/e-mail-reader.c:2042
+#: ../mail/e-mail-reader.c:2180
 msgid "Open the selected messages in the composer for editing"
 msgstr "Odpri izbrana sporočila v sestavljalniku za urejanje"
 
-#: ../mail/e-mail-reader.c:2047
+#: ../mail/e-mail-reader.c:2185
 msgid "Compose _New Message"
 msgstr "Sestavi _novo sporočilo"
 
-#: ../mail/e-mail-reader.c:2049
+#: ../mail/e-mail-reader.c:2187
 msgid "Open a window for composing a mail message"
 msgstr "Odpri okno za sestavljanje novega sporočila elektronske pošte"
 
-#: ../mail/e-mail-reader.c:2054
+#: ../mail/e-mail-reader.c:2192
 msgid "_Open in New Window"
 msgstr "_Odpri v novem oknu"
 
-#: ../mail/e-mail-reader.c:2056
+#: ../mail/e-mail-reader.c:2194
 msgid "Open the selected messages in a new window"
 msgstr "Izbrana sporočila odpre v novem oknu"
 
-#: ../mail/e-mail-reader.c:2061
+#: ../mail/e-mail-reader.c:2199
 msgid "_Move to Folder..."
 msgstr "Premakne v _mapo ..."
 
-#: ../mail/e-mail-reader.c:2063
+#: ../mail/e-mail-reader.c:2201
 msgid "Move selected messages to another folder"
 msgstr "Izbrana sporočila premakne v drugo mapo"
 
-#: ../mail/e-mail-reader.c:2068
+#: ../mail/e-mail-reader.c:2206
 msgid "_Next Message"
 msgstr "_Naslednje sporočilo"
 
-#: ../mail/e-mail-reader.c:2070
+#: ../mail/e-mail-reader.c:2208
 msgid "Display the next message"
 msgstr "Pokaže naslednje sporočilo"
 
-#: ../mail/e-mail-reader.c:2075
+#: ../mail/e-mail-reader.c:2213
 msgid "Next _Important Message"
 msgstr "Naslednje po_membno sporočilo"
 
-#: ../mail/e-mail-reader.c:2077
+#: ../mail/e-mail-reader.c:2215
 msgid "Display the next important message"
 msgstr "Pokaže naslednje pomembno sporočilo"
 
-#: ../mail/e-mail-reader.c:2082
+#: ../mail/e-mail-reader.c:2220
 msgid "Next _Thread"
 msgstr "Naslednja ni_t"
 
-#: ../mail/e-mail-reader.c:2084
+#: ../mail/e-mail-reader.c:2222
 msgid "Display the next thread"
 msgstr "Pokaže naslednjo nit"
 
-#: ../mail/e-mail-reader.c:2089
+#: ../mail/e-mail-reader.c:2227
 msgid "Next _Unread Message"
 msgstr "Naslednje n_eprebrano sporočilo"
 
-#: ../mail/e-mail-reader.c:2091
+#: ../mail/e-mail-reader.c:2229
 msgid "Display the next unread message"
 msgstr "Pokaže naslednje neprebrano sporočilo"
 
-#: ../mail/e-mail-reader.c:2096
+#: ../mail/e-mail-reader.c:2234
 msgid "_Previous Message"
 msgstr "_Predhodno sporočilo"
 
-#: ../mail/e-mail-reader.c:2098
+#: ../mail/e-mail-reader.c:2236
 msgid "Display the previous message"
 msgstr "Pokaže predhodno sporočilo"
 
-#: ../mail/e-mail-reader.c:2103
+#: ../mail/e-mail-reader.c:2241
 msgid "Pr_evious Important Message"
 msgstr "Pr_edhodno pomembno sporočilo"
 
-#: ../mail/e-mail-reader.c:2105
+#: ../mail/e-mail-reader.c:2243
 msgid "Display the previous important message"
 msgstr "Pokaže predhodno pomembno sporočilo"
 
-#: ../mail/e-mail-reader.c:2110
+#: ../mail/e-mail-reader.c:2248
 msgid "Previous T_hread"
 msgstr "_Predhodna nit"
 
-#: ../mail/e-mail-reader.c:2112
+#: ../mail/e-mail-reader.c:2250
 msgid "Display the previous thread"
 msgstr "Pokaže predhodno sporočilno nit"
 
-#: ../mail/e-mail-reader.c:2117
+#: ../mail/e-mail-reader.c:2255
 msgid "P_revious Unread Message"
 msgstr "P_redhodno neprebrano sporočilo"
 
-#: ../mail/e-mail-reader.c:2119
+#: ../mail/e-mail-reader.c:2257
 msgid "Display the previous unread message"
 msgstr "Pokaže predhodno neprebrano sporočilo"
 
-#: ../mail/e-mail-reader.c:2126
+#: ../mail/e-mail-reader.c:2264
 msgid "Print this message"
 msgstr "Natisni to sporočilo"
 
-#: ../mail/e-mail-reader.c:2133
+#: ../mail/e-mail-reader.c:2271
 msgid "Preview the message to be printed"
 msgstr "Predogled sporočila pred tiskanjem"
 
-#: ../mail/e-mail-reader.c:2138
+#: ../mail/e-mail-reader.c:2276
 msgid "Re_direct"
 msgstr "_Preusmeri"
 
-#: ../mail/e-mail-reader.c:2140
+#: ../mail/e-mail-reader.c:2278
 msgid "Redirect (bounce) the selected message to someone"
 msgstr "Preusmeri izbrano sporočilo k nekomu"
 
-#: ../mail/e-mail-reader.c:2145
+#: ../mail/e-mail-reader.c:2283
 msgid "Remo_ve Attachments"
 msgstr "_Odstrani priloge"
 
-#: ../mail/e-mail-reader.c:2147
+#: ../mail/e-mail-reader.c:2285
 msgid "Remove attachments"
 msgstr "Odstrani priloge"
 
-#: ../mail/e-mail-reader.c:2152
+#: ../mail/e-mail-reader.c:2290
 msgid "Remove Du_plicate Messages"
 msgstr "Odstrani po_dvojena sporočila"
 
-#: ../mail/e-mail-reader.c:2154
+#: ../mail/e-mail-reader.c:2292
 msgid "Checks selected messages for duplicates"
 msgstr "Preveri izbrana sporočila za dvojnike"
 
-#: ../mail/e-mail-reader.c:2159 ../mail/mail.error.xml.h:27
-#: ../modules/calendar/e-cal-shell-view-actions.c:1546
+#: ../mail/e-mail-reader.c:2297 ../mail/mail.error.xml.h:27
+#: ../modules/calendar/e-cal-shell-view-actions.c:1387
 #: ../modules/mail/e-mail-attachment-handler.c:213
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: ../mail/e-mail-reader.c:2161
+#: ../mail/e-mail-reader.c:2299
 msgid "Compose a reply to all the recipients of the selected message"
 msgstr "Sestavi odgovor vsem prejemnikom izbranega sporočila"
 
-#: ../mail/e-mail-reader.c:2166 ../mail/mail.error.xml.h:25
+#: ../mail/e-mail-reader.c:2304 ../mail/mail.error.xml.h:25
 msgid "Reply to _List"
 msgstr "Odgovori na _seznam"
 
-#: ../mail/e-mail-reader.c:2168
+#: ../mail/e-mail-reader.c:2306
 msgid "Compose a reply to the mailing list of the selected message"
 msgstr "Sestavi odgovor dopisnemu seznamu izbranega sporočila"
 
-#: ../mail/e-mail-reader.c:2173
+#: ../mail/e-mail-reader.c:2311
 #: ../modules/mail/e-mail-attachment-handler.c:220
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: ../mail/e-mail-reader.c:2175
+#: ../mail/e-mail-reader.c:2313
 msgid "Compose a reply to the sender of the selected message"
 msgstr "Sestavi odgovor pošiljatelju izbranega sporočila"
 
-#: ../mail/e-mail-reader.c:2180
+#: ../mail/e-mail-reader.c:2318
 msgid "_Save as mbox..."
 msgstr "_Shrani kot mbox..."
 
-#: ../mail/e-mail-reader.c:2182
+#: ../mail/e-mail-reader.c:2320
 msgid "Save selected messages as an mbox file"
 msgstr "Shrani izbrana sporočila kot datoteko mbox"
 
-#: ../mail/e-mail-reader.c:2187
+#: ../mail/e-mail-reader.c:2325
 msgid "_Message Source"
 msgstr "_Vir sporočil"
 
-#: ../mail/e-mail-reader.c:2189
+#: ../mail/e-mail-reader.c:2327
 msgid "Show the raw email source of the message"
 msgstr "Pokaže surov vir elektronskega sporočila"
 
-#: ../mail/e-mail-reader.c:2201
+#: ../mail/e-mail-reader.c:2339
 msgid "_Undelete Message"
 msgstr "_Povrni izbrisano sporočilo"
 
-#: ../mail/e-mail-reader.c:2203
+#: ../mail/e-mail-reader.c:2341
 msgid "Undelete the selected messages"
 msgstr "Povrne izbrana izbrisana sporočila"
 
-#: ../mail/e-mail-reader.c:2208
+#: ../mail/e-mail-reader.c:2346
 msgid "_Normal Size"
 msgstr "Običaj_na velikost"
 
-#: ../mail/e-mail-reader.c:2210
+#: ../mail/e-mail-reader.c:2348
 msgid "Reset the text to its original size"
 msgstr "Ponastavi besedilo na njegovo izvorno velikost"
 
-#: ../mail/e-mail-reader.c:2215
+#: ../mail/e-mail-reader.c:2353
 msgid "_Zoom In"
 msgstr "_Približaj"
 
-#: ../mail/e-mail-reader.c:2217
+#: ../mail/e-mail-reader.c:2355
 msgid "Increase the text size"
 msgstr "Poveča velikost besedila"
 
-#: ../mail/e-mail-reader.c:2224
+#: ../mail/e-mail-reader.c:2362
 msgid "Decrease the text size"
 msgstr "Zmanjša velikost besedila"
 
-#: ../mail/e-mail-reader.c:2231
+#: ../mail/e-mail-reader.c:2369
 msgid "Cre_ate"
 msgstr "Ust_vari"
 
-#: ../mail/e-mail-reader.c:2238
+#: ../mail/e-mail-reader.c:2376
 msgid "Ch_aracter Encoding"
 msgstr "Zn_akovno kodiranje"
 
-#: ../mail/e-mail-reader.c:2245
+#: ../mail/e-mail-reader.c:2383
 msgid "F_orward As"
 msgstr "P_osreduj kot"
 
-#: ../mail/e-mail-reader.c:2252
+#: ../mail/e-mail-reader.c:2390
 msgid "_Group Reply"
 msgstr "_Skupinski odgovor"
 
-#: ../mail/e-mail-reader.c:2259
+#: ../mail/e-mail-reader.c:2397
 msgid "_Go To"
 msgstr "Po_jdi na"
 
-#: ../mail/e-mail-reader.c:2266
+#: ../mail/e-mail-reader.c:2404
 msgid "Mar_k As"
 msgstr "Označi _kot"
 
-#: ../mail/e-mail-reader.c:2273
+#: ../mail/e-mail-reader.c:2411
 msgid "_Message"
 msgstr "_Sporočilo"
 
-#: ../mail/e-mail-reader.c:2280
+#: ../mail/e-mail-reader.c:2418
 msgid "_Zoom"
 msgstr "_Približaj"
 
-#: ../mail/e-mail-reader.c:2290
+#: ../mail/e-mail-reader.c:2428
 msgid "Create a Search Folder from Mailing _List..."
 msgstr "Ustvari iskalno mapo iz dopisnega _seznama ..."
 
-#: ../mail/e-mail-reader.c:2292
+#: ../mail/e-mail-reader.c:2430
 msgid "Create a search folder for this mailing list"
 msgstr "Ustvari iskalno mapo za ta dopisni seznam"
 
-#: ../mail/e-mail-reader.c:2297
+#: ../mail/e-mail-reader.c:2435
 msgid "Create a Search Folder from Recipien_ts..."
 msgstr "Iskanje mape za _prejemnike ..."
 
-#: ../mail/e-mail-reader.c:2299
+#: ../mail/e-mail-reader.c:2437
 msgid "Create a search folder for these recipients"
 msgstr "Ustvari iskalno mapo za te prejemnike"
 
-#: ../mail/e-mail-reader.c:2304
+#: ../mail/e-mail-reader.c:2442
 msgid "Create a Search Folder from Sen_der..."
 msgstr "Iskala mapa za p_ošiljatelja ..."
 
-#: ../mail/e-mail-reader.c:2306
+#: ../mail/e-mail-reader.c:2444
 msgid "Create a search folder for this sender"
 msgstr "Ustvari iskalno mapo za tega pošiljatelja"
 
-#: ../mail/e-mail-reader.c:2311
+#: ../mail/e-mail-reader.c:2449
 msgid "Create a Search Folder from S_ubject..."
 msgstr "Ustvari iskalno mapo iz _Zadeve ..."
 
-#: ../mail/e-mail-reader.c:2313
+#: ../mail/e-mail-reader.c:2451
 msgid "Create a search folder for this subject"
 msgstr "Ustvari iskalno mapo za to zadevo"
 
-#: ../mail/e-mail-reader.c:2336
+#: ../mail/e-mail-reader.c:2478
 msgid "Mark for Follo_w Up..."
 msgstr "Označi kot na_vezujoče ..."
 
-#: ../mail/e-mail-reader.c:2344
+#: ../mail/e-mail-reader.c:2494
 msgid "Mark as _Important"
 msgstr "Označi kot p_omembno"
 
-#: ../mail/e-mail-reader.c:2348
+#: ../mail/e-mail-reader.c:2498
 msgid "Mark as _Junk"
 msgstr "Označi kot _vsiljeno"
 
-#: ../mail/e-mail-reader.c:2352
+#: ../mail/e-mail-reader.c:2502
 msgid "Mark as _Not Junk"
 msgstr "Označi kot _zaželeno"
 
-#: ../mail/e-mail-reader.c:2356
+#: ../mail/e-mail-reader.c:2506
 msgid "Mar_k as Read"
 msgstr "Označi kot _prebrano"
 
-#: ../mail/e-mail-reader.c:2360
+#: ../mail/e-mail-reader.c:2518
 msgid "Mark as Uni_mportant"
 msgstr "Označi kot nepo_membno"
 
-#: ../mail/e-mail-reader.c:2364
+#: ../mail/e-mail-reader.c:2522
 msgid "Mark as _Unread"
 msgstr "Označi kot _neprebrano"
 
-#: ../mail/e-mail-reader.c:2408
+#: ../mail/e-mail-reader.c:2566
 msgid "_Caret Mode"
 msgstr "Način _kazalke"
 
-#: ../mail/e-mail-reader.c:2410
+#: ../mail/e-mail-reader.c:2568
 msgid "Show a blinking cursor in the body of displayed messages"
 msgstr "Pokaže utripajoč kazalec v telesu prikazanih sporočil"
 
-#: ../mail/e-mail-reader.c:2416
+#: ../mail/e-mail-reader.c:2574
 msgid "All Message _Headers"
 msgstr "Vse _glave sporočil"
 
-#: ../mail/e-mail-reader.c:2418
+#: ../mail/e-mail-reader.c:2576
 msgid "Show messages with all email headers"
 msgstr "Pokaži sporočila z vsemi glavami elektronske pošte"
 
-#: ../mail/e-mail-reader.c:2851
+#: ../mail/e-mail-reader.c:3020
 msgid "Retrieving message"
 msgstr "Pridobivanje sporočila"
 
-#: ../mail/e-mail-reader.c:3774
+#: ../mail/e-mail-reader.c:4028
 #: ../modules/mail/e-mail-attachment-handler.c:206
 msgid "_Forward"
 msgstr "_Posreduj naprej"
 
-#: ../mail/e-mail-reader.c:3775
+#: ../mail/e-mail-reader.c:4029
 msgid "Forward the selected message to someone"
 msgstr "Nekomu posreduje izbrano sporočilo"
 
-#: ../mail/e-mail-reader.c:3794
+#: ../mail/e-mail-reader.c:4048
 msgid "Group Reply"
 msgstr "Skupinski odgovor"
 
-#: ../mail/e-mail-reader.c:3795
+#: ../mail/e-mail-reader.c:4049
 msgid "Reply to the mailing list, or to all recipients"
 msgstr "Ali je odgovor namenjen dopisnemu seznamu ali vsem prejemnikom"
 
-#: ../mail/e-mail-reader.c:3861 ../mail/em-filter-i18n.h:14
+#: ../mail/e-mail-reader.c:4115 ../mail/filtertypes.xml.in.h:65
 msgid "Delete"
 msgstr "Izbriši"
 
-#: ../mail/e-mail-reader.c:3873
-#: ../modules/calendar/e-cal-shell-view-actions.c:1371
+#: ../mail/e-mail-reader.c:4127
+#: ../modules/calendar/e-cal-shell-view-actions.c:1212
 msgid "Next"
 msgstr "Naslednji"
 
-#: ../mail/e-mail-reader.c:3877
-#: ../modules/calendar/e-cal-shell-view-actions.c:1364
+#: ../mail/e-mail-reader.c:4131
+#: ../modules/calendar/e-cal-shell-view-actions.c:1205
 msgid "Previous"
 msgstr "Predhodni"
 
-#: ../mail/e-mail-reader.c:3886 ../mail/mail-dialogs.ui.h:16
+#: ../mail/e-mail-reader.c:4140 ../mail/mail-dialogs.ui.h:16
 msgid "Reply"
 msgstr "Odgovori"
 
-#: ../mail/e-mail-reader-utils.c:147
+#: ../mail/e-mail-reader-utils.c:146
 msgid "Do not warn me again"
 msgstr "Ne opozori več"
 
-#: ../mail/e-mail-reader-utils.c:557 ../plugins/face/face.c:170
-#: ../smime/gui/certificate-manager.c:329
+#: ../mail/e-mail-reader-utils.c:556
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1806
+#: ../modules/cal-config-google/e-google-chooser.c:1843
+#: ../plugins/face/face.c:170 ../shell/e-shell.c:861 ../shell/e-shell.c:882
+#: ../smime/gui/certificate-manager.c:346
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
-#: ../mail/e-mail-reader-utils.c:976
+#: ../mail/e-mail-reader-utils.c:1043
+#, fuzzy
+msgid "Marking thread to be ignored"
+msgstr "Predogled podatkov za uvoz"
+
+#: ../mail/e-mail-reader-utils.c:1047
+msgid "Unmarking thread from being ignored"
+msgstr ""
+
+#: ../mail/e-mail-reader-utils.c:1051
+msgid "Marking subthread to be ignored"
+msgstr ""
+
+#: ../mail/e-mail-reader-utils.c:1055
+msgid "Unmarking subthread from being ignored"
+msgstr ""
+
+#: ../mail/e-mail-reader-utils.c:1290
 msgid "Printing"
 msgstr "Tiskanje"
 
 #. Translators: %s is replaced with a folder
 #. * name %u with count of duplicate messages.
-#: ../mail/e-mail-reader-utils.c:1211
+#: ../mail/e-mail-reader-utils.c:1525
 #, c-format
 msgid ""
 "Folder '%s' contains %u duplicate message. Are you sure you want to delete "
@@ -13695,7 +16049,7 @@ msgstr[3] ""
 "Mapa '%s' vsebuje %u podvojena sporočila. Ali ste prepričani, da želite "
 "sporočila izbrisati?"
 
-#: ../mail/e-mail-reader-utils.c:2026
+#: ../mail/e-mail-reader-utils.c:2355
 msgid "Save Message"
 msgid_plural "Save Messages"
 msgstr[0] "Shrani sporočila"
@@ -13708,7 +16062,7 @@ msgstr[3] "Shrani sporočila"
 #. * mbox format, when the first message doesn't have a
 #. * subject.  The extension ".mbox" is appended to the
 #. * string; for example "Message.mbox".
-#: ../mail/e-mail-reader-utils.c:2047
+#: ../mail/e-mail-reader-utils.c:2376
 msgid "Message"
 msgid_plural "Messages"
 msgstr[0] "Sporočila"
@@ -13716,7 +16070,7 @@ msgstr[1] "Sporočilo"
 msgstr[2] "Sporočili"
 msgstr[3] "Sporočila"
 
-#: ../mail/e-mail-reader-utils.c:2416
+#: ../mail/e-mail-reader-utils.c:2749
 msgid "Parsing message"
 msgstr "Razčlenjevanje sporočila"
 
@@ -13728,11 +16082,21 @@ msgstr "Sporočilo nima besedilne vsebine."
 msgid "Flag to Follow Up"
 msgstr "Zastavica za navezavo"
 
+#: ../mail/e-mail-ui-session.c:801
+#, c-format
+msgid "%s authentication failed"
+msgstr "Overitev %s je spodletela."
+
+#: ../mail/e-mail-ui-session.c:851
+#, c-format
+msgid "No data source found for UID '%s'"
+msgstr "Vira podatkov za UID '%s' ni bilo mogoče najti."
+
 #. Note to translators: this is the attribution string used
 #. * when quoting messages.  Each ${Variable} gets replaced
 #. * with a value.  To see a full list of available variables,
 #. * see mail/em-composer-utils.c:attribvars array.
-#: ../mail/em-composer-utils.c:1454
+#: ../mail/em-composer-utils.c:1507
 msgid ""
 "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} "
 "${TimeZone}, ${Sender} wrote:"
@@ -13740,23 +16104,24 @@ msgstr ""
 "Dne ${Day}.${Month}.${Year} (${AbbrevWeekdayName}) ob ${24Hour}:${Minute} "
 "${TimeZone} je ${Sender} napisal(a):"
 
-#: ../mail/em-composer-utils.c:1460
+#: ../mail/em-composer-utils.c:1513
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Posredovano sporočilo --------"
 
-#: ../mail/em-composer-utils.c:1465
+#: ../mail/em-composer-utils.c:1518
 msgid "-----Original Message-----"
 msgstr "-------- Izvirno sporočilo --------"
 
-#: ../mail/em-composer-utils.c:2615
+#: ../mail/em-composer-utils.c:2668
 msgid "an unknown sender"
 msgstr "neznan pošiljatelj"
 
-#: ../mail/em-composer-utils.c:3040
+#. FIXME GTK_WINDOW (composer)
+#: ../mail/em-composer-utils.c:3107
 msgid "Posting destination"
 msgstr "Cilj objave"
 
-#: ../mail/em-composer-utils.c:3041
+#: ../mail/em-composer-utils.c:3112
 msgid "Choose folders to post the message to."
 msgstr "Izberite mape, v katere želite objaviti sporočilo."
 
@@ -13764,264 +16129,6 @@ msgstr "Izberite mape, v katere želite objaviti sporočilo."
 msgid "Select Folder"
 msgstr "Izbor mape"
 
-#. Automatically generated. Do not edit.
-#: ../mail/em-filter-i18n.h:2
-msgid "Adjust Score"
-msgstr "Prilagodi točke"
-
-#: ../mail/em-filter-i18n.h:3
-msgid "Any header"
-msgstr "Katerakoli glava"
-
-#: ../mail/em-filter-i18n.h:4
-msgid "Assign Color"
-msgstr "Dodeli barvo"
-
-#: ../mail/em-filter-i18n.h:5
-msgid "Assign Score"
-msgstr "Dodeli rezultat"
-
-#: ../mail/em-filter-i18n.h:7
-msgid "BCC"
-msgstr "SKP"
-
-#: ../mail/em-filter-i18n.h:8
-msgid "Beep"
-msgstr "Pisk"
-
-#: ../mail/em-filter-i18n.h:9
-msgid "CC"
-msgstr "KP"
-
-#: ../mail/em-filter-i18n.h:10
-msgid "Completed On"
-msgstr "Dokončano dne"
-
-#: ../mail/em-filter-i18n.h:12
-msgid "Date received"
-msgstr "Datum prejema"
-
-#: ../mail/em-filter-i18n.h:13
-msgid "Date sent"
-msgstr "Datum pošiljanja"
-
-#: ../mail/em-filter-i18n.h:15
-msgid "Deleted"
-msgstr "Izbrisano"
-
-#: ../mail/em-filter-i18n.h:17
-msgid "Draft"
-msgstr "Osnutek"
-
-#: ../mail/em-filter-i18n.h:19
-msgid "Expression"
-msgstr "Izraz"
-
-#: ../mail/em-filter-i18n.h:20
-msgid "Follow Up"
-msgstr "Navezava"
-
-#: ../mail/em-filter-i18n.h:21
-msgid "Forward to"
-msgstr "Posreduj na"
-
-#: ../mail/em-filter-i18n.h:22
-msgid "Important"
-msgstr "Pomembno"
-
-#: ../mail/em-filter-i18n.h:23
-msgid "Junk Test"
-msgstr "Preizkus vsiljene pošte"
-
-#: ../mail/em-filter-i18n.h:24 ../mail/mail-config.ui.h:113
-msgid "Junk"
-msgstr "Vsiljena pošta"
-
-#: ../mail/em-filter-i18n.h:25
-msgid "Label"
-msgstr "Oznaka"
-
-#: ../mail/em-filter-i18n.h:26
-msgid "Mailing list"
-msgstr "Dopisni seznam"
-
-#: ../mail/em-filter-i18n.h:27
-msgid "Match All"
-msgstr "Skladaj vse"
-
-#: ../mail/em-filter-i18n.h:28
-msgid "Message Body"
-msgstr "Telo sporočila"
-
-#: ../mail/em-filter-i18n.h:29
-msgid "Message Header"
-msgstr "Glava sporočila"
-
-#: ../mail/em-filter-i18n.h:30
-msgid "Message Location"
-msgstr "Mesto sporočila"
-
-#: ../mail/em-filter-i18n.h:31
-msgid "Message is Junk"
-msgstr "Sporočilo je vsiljeno"
-
-#: ../mail/em-filter-i18n.h:32
-msgid "Message is not Junk"
-msgstr "Sporočilo ni vsiljeno"
-
-#: ../mail/em-filter-i18n.h:34
-msgid "Pipe to Program"
-msgstr "Pipa za program"
-
-#: ../mail/em-filter-i18n.h:35
-msgid "Play Sound"
-msgstr "Predvajaj zvok"
-
-#. Past tense, as in "has been read".
-#: ../mail/em-filter-i18n.h:36 ../mail/mail-dialogs.ui.h:15
-msgid "Read"
-msgstr "Prebrano"
-
-#: ../mail/em-filter-i18n.h:37 ../mail/message-list.etspec.h:16
-msgid "Recipients"
-msgstr "Prejemniki"
-
-#: ../mail/em-filter-i18n.h:38
-msgid "Regex Match"
-msgstr "Skladanje z logičnim izrazom"
-
-#: ../mail/em-filter-i18n.h:39
-msgid "Replied to"
-msgstr "Odgovorjeno na"
-
-#: ../mail/em-filter-i18n.h:40
-msgid "Run Program"
-msgstr "Zaženi program"
-
-#: ../mail/em-filter-i18n.h:41 ../mail/message-list.etspec.h:3
-msgid "Score"
-msgstr "Točke"
-
-#: ../mail/em-filter-i18n.h:42
-msgid "Sender or Recipients"
-msgstr "Pošiljatelj ali prejemniki"
-
-#: ../mail/em-filter-i18n.h:43 ../mail/message-list.etspec.h:15
-msgid "Sender"
-msgstr "Pošiljatelj"
-
-#: ../mail/em-filter-i18n.h:44
-msgid "Set Label"
-msgstr "Nastavi oznako"
-
-#: ../mail/em-filter-i18n.h:45
-msgid "Set Status"
-msgstr "Nastavi stanje"
-
-#: ../mail/em-filter-i18n.h:46
-msgid "Size (kB)"
-msgstr "Velikost (kB)"
-
-#: ../mail/em-filter-i18n.h:47
-msgid "Source Account"
-msgstr "Izvirni račun"
-
-#: ../mail/em-filter-i18n.h:48
-msgid "Specific header"
-msgstr "Navedena glava"
-
-#: ../mail/em-filter-i18n.h:50
-msgid "Stop Processing"
-msgstr "Zaustavi obdelavo"
-
-#: ../mail/em-filter-i18n.h:53
-msgid "Unset Color"
-msgstr "Odstrani barvo"
-
-#: ../mail/em-filter-i18n.h:54
-msgid "Unset Status"
-msgstr "Nenastavljeno stanje"
-
-#: ../mail/em-filter-i18n.h:57
-msgid "does not end with"
-msgstr "se ne konča z"
-
-#: ../mail/em-filter-i18n.h:58
-msgid "does not exist"
-msgstr "ne obstaja"
-
-#: ../mail/em-filter-i18n.h:59
-msgid "does not have words"
-msgstr "ne vsebuje besed"
-
-#: ../mail/em-filter-i18n.h:60
-msgid "does not return"
-msgstr "ne vrne"
-
-#: ../mail/em-filter-i18n.h:61
-msgid "does not sound like"
-msgstr "ne zveni kot"
-
-#: ../mail/em-filter-i18n.h:62
-msgid "does not start with"
-msgstr "se ne začne z"
-
-#: ../mail/em-filter-i18n.h:63
-msgid "ends with"
-msgstr "se konča z"
-
-#: ../mail/em-filter-i18n.h:64
-msgid "exists"
-msgstr "obstaja"
-
-#: ../mail/em-filter-i18n.h:65
-msgid "has words"
-msgstr "vsebuje besede"
-
-#: ../mail/em-filter-i18n.h:66
-msgid "is Flagged"
-msgstr "je označeno z zastavico"
-
-#: ../mail/em-filter-i18n.h:67
-msgid "is after"
-msgstr "je po"
-
-#: ../mail/em-filter-i18n.h:68
-msgid "is before"
-msgstr "je pred"
-
-#: ../mail/em-filter-i18n.h:71
-msgid "is not Flagged"
-msgstr "ni označeno z zastavico"
-
-#: ../mail/em-filter-i18n.h:72
-msgid "is not set"
-msgstr "ni nastavljeno"
-
-#: ../mail/em-filter-i18n.h:74
-msgid "is set"
-msgstr "je nastavljeno"
-
-#: ../mail/em-filter-i18n.h:76
-msgid "returns greater than"
-msgstr "vrne večje kot"
-
-#: ../mail/em-filter-i18n.h:77
-msgid "returns less than"
-msgstr "vrne manjše kot"
-
-#: ../mail/em-filter-i18n.h:78
-msgid "returns"
-msgstr "vrne"
-
-#: ../mail/em-filter-i18n.h:79
-msgid "sounds like"
-msgstr "zveni kot"
-
-#: ../mail/em-filter-i18n.h:80
-msgid "starts with"
-msgstr "se začne z"
-
 #. and now for the action area
 #: ../mail/em-filter-rule.c:587
 msgid "Then"
@@ -14071,13 +16178,10 @@ msgstr "Lastnosti mape"
 msgid "<click here to select a folder>"
 msgstr "<kliknite tukaj za izbiro mape>"
 
-#: ../mail/em-folder-selector.c:387
-msgid "C_reate"
-msgstr "Ustva_ri"
-
-#: ../mail/em-folder-selector.c:393
-msgid "Folder _name:"
-msgstr "Ime _mape:"
+#: ../mail/em-folder-selector.c:398
+#, fuzzy
+msgid "Create a new folder"
+msgstr "Ustvari novo poštno mapo"
 
 #: ../mail/em-folder-tree.c:682
 msgid "Folder names cannot contain '/'"
@@ -14089,31 +16193,31 @@ msgctxt "folder-display"
 msgid "%s (%u%s)"
 msgstr "%s (%u%s)"
 
-#: ../mail/em-folder-tree.c:1667
+#: ../mail/em-folder-tree.c:1668
 msgid "Mail Folder Tree"
 msgstr "Drevesna razporeditev poštnih map"
 
-#: ../mail/em-folder-tree.c:2215 ../mail/em-folder-utils.c:100
+#: ../mail/em-folder-tree.c:2216 ../mail/em-folder-utils.c:82
 #, c-format
 msgid "Moving folder %s"
 msgstr "Premikanje mape %s"
 
-#: ../mail/em-folder-tree.c:2218 ../mail/em-folder-utils.c:102
+#: ../mail/em-folder-tree.c:2219 ../mail/em-folder-utils.c:84
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopiranje mape %s"
 
-#: ../mail/em-folder-tree.c:2225 ../mail/message-list.c:2284
+#: ../mail/em-folder-tree.c:2226 ../mail/message-list.c:2477
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Premikanje sporočil v mapo %s"
 
-#: ../mail/em-folder-tree.c:2229 ../mail/message-list.c:2286
+#: ../mail/em-folder-tree.c:2230 ../mail/message-list.c:2479
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopiranje sporočil v mapo %s"
 
-#: ../mail/em-folder-tree.c:2248
+#: ../mail/em-folder-tree.c:2249
 #, c-format
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Sporočil(a) ni mogoče spustiti  v vrhnjo shrambo"
@@ -14123,26 +16227,18 @@ msgstr "Sporočil(a) ni mogoče spustiti  v vrhnjo shrambo"
 msgid "UNMATCHED"
 msgstr "Brez zadetka"
 
-#: ../mail/em-folder-tree-model.c:1244 ../mail/em-folder-tree-model.c:1620
+#: ../mail/em-folder-tree-model.c:1258 ../mail/em-folder-tree-model.c:1634
 msgid "Loading..."
 msgstr "Nalaganje ..."
 
-#: ../mail/em-folder-utils.c:506
+#: ../mail/em-folder-utils.c:488
 msgid "Move Folder To"
 msgstr "Premakni mapo v"
 
-#: ../mail/em-folder-utils.c:506
+#: ../mail/em-folder-utils.c:488
 msgid "Copy Folder To"
 msgstr "Kopiraj mapo v"
 
-#: ../mail/em-folder-utils.c:604
-msgid "Create Folder"
-msgstr "Ustvari mapo"
-
-#: ../mail/em-folder-utils.c:605
-msgid "Specify where to create the folder:"
-msgstr "Določite kje naj se ustvari mapa:"
-
 #: ../mail/em-subscription-editor.c:855
 msgid "_Subscribe"
 msgstr "_Naroči se"
@@ -14156,7 +16252,7 @@ msgid "Subscribe To _All"
 msgstr "Naroči se na _vse"
 
 #: ../mail/em-subscription-editor.c:969 ../mail/em-subscription-editor.c:1867
-#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../modules/mail/e-mail-shell-view-actions.c:1686
 msgid "_Unsubscribe"
 msgstr "_Prekliči naročnino"
 
@@ -14193,7 +16289,7 @@ msgid "Su_bscribe"
 msgstr "_Naroči"
 
 #: ../mail/em-subscription-editor.c:1866
-#: ../modules/mail/e-mail-shell-view-actions.c:1633
+#: ../modules/mail/e-mail-shell-view-actions.c:1688
 msgid "Unsubscribe from the selected folder"
 msgstr "Prekliče naročnino na izbrano mapo"
 
@@ -14218,8 +16314,8 @@ msgid "Refresh the folder list"
 msgstr "Osveži seznam map"
 
 #: ../mail/em-subscription-editor.c:1929
-#: ../modules/mail/e-mail-shell-view-actions.c:1533
-#: ../modules/mail/e-mail-shell-view-actions.c:1603
+#: ../modules/mail/e-mail-shell-view-actions.c:1587
+#: ../modules/mail/e-mail-shell-view-actions.c:1658
 msgid "_Refresh"
 msgstr "_Osveži"
 
@@ -14228,7 +16324,7 @@ msgid "Stop the current operation"
 msgstr "Zaustavi trenutno opravilo"
 
 #: ../mail/em-subscription-editor.c:1941
-#: ../modules/addressbook/e-book-shell-view-actions.c:934
+#: ../modules/addressbook/e-book-shell-view-actions.c:979
 msgid "_Stop"
 msgstr "_Zaustavi"
 
@@ -14245,16 +16341,11 @@ msgstr[1] "Ali ste prepričani, da želite hkrati odpreti %d sporočilo?"
 msgstr[2] "Ali ste prepričani, da želite hkrati odpreti %d sporočili?"
 msgstr[3] "Ali ste prepričani, da želite hkrati odpreti %d sporočila?"
 
-#: ../mail/em-utils.c:131
-#: ../modules/mailto-handler/evolution-mailto-handler.c:148
-msgid "_Do not show this message again"
-msgstr "_Ne pokaži več tega sporočila"
-
 #: ../mail/em-utils.c:241
 msgid "Message Filters"
 msgstr "Filtri sporočil"
 
-#: ../mail/em-utils.c:970
+#: ../mail/em-utils.c:983
 #, c-format
 msgid "Messages from %s"
 msgstr "Sporočila od %s"
@@ -14267,34 +16358,329 @@ msgstr "Iskalne _mape"
 msgid "Add Folder"
 msgstr "Dodaj mapo"
 
-#: ../mail/em-vfolder-editor-rule.c:518
+#: ../mail/em-vfolder-editor-rule.c:521
 msgid "Search Folder Sources"
 msgstr "Viri iskalne mape"
 
-#: ../mail/em-vfolder-editor-rule.c:550
+#: ../mail/em-vfolder-editor-rule.c:553
 msgid "Automatically update on any _source folder change"
 msgstr "Samodejno posodobi ob vsaki spremembi _izvorne mape"
 
-#: ../mail/em-vfolder-editor-rule.c:562
+#: ../mail/em-vfolder-editor-rule.c:565
 msgid "All local folders"
 msgstr "Vse krajevne mape"
 
-#: ../mail/em-vfolder-editor-rule.c:563
+#: ../mail/em-vfolder-editor-rule.c:566
 msgid "All active remote folders"
 msgstr "Vse dejavne oddaljene mape"
 
-#: ../mail/em-vfolder-editor-rule.c:564
+#: ../mail/em-vfolder-editor-rule.c:567
 msgid "All local and active remote folders"
 msgstr "Vse krajevne in dejavne oddaljene mape"
 
-#: ../mail/em-vfolder-editor-rule.c:565
+#: ../mail/em-vfolder-editor-rule.c:568
 msgid "Specific folders"
 msgstr "Določene mape"
 
-#: ../mail/em-vfolder-editor-rule.c:603
+#: ../mail/em-vfolder-editor-rule.c:606
 msgid "include subfolders"
 msgstr "vključi podmape"
 
+#: ../mail/filtertypes.xml.in.h:1 ../mail/message-list.etspec.h:15
+#: ../mail/searchtypes.xml.in.h:1 ../mail/vfoldertypes.xml.in.h:1
+msgid "Sender"
+msgstr "Pošiljatelj"
+
+#: ../mail/filtertypes.xml.in.h:6 ../mail/searchtypes.xml.in.h:6
+#: ../mail/vfoldertypes.xml.in.h:6
+msgid "starts with"
+msgstr "se začne z"
+
+#: ../mail/filtertypes.xml.in.h:7 ../mail/searchtypes.xml.in.h:7
+#: ../mail/vfoldertypes.xml.in.h:7
+msgid "does not start with"
+msgstr "se ne začne z"
+
+#: ../mail/filtertypes.xml.in.h:8 ../mail/searchtypes.xml.in.h:8
+#: ../mail/vfoldertypes.xml.in.h:8
+msgid "ends with"
+msgstr "se konča z"
+
+#: ../mail/filtertypes.xml.in.h:9 ../mail/searchtypes.xml.in.h:9
+#: ../mail/vfoldertypes.xml.in.h:9
+msgid "does not end with"
+msgstr "se ne konča z"
+
+#: ../mail/filtertypes.xml.in.h:10 ../mail/searchtypes.xml.in.h:12
+#: ../mail/vfoldertypes.xml.in.h:12
+msgid "sounds like"
+msgstr "zveni kot"
+
+#: ../mail/filtertypes.xml.in.h:11 ../mail/searchtypes.xml.in.h:13
+#: ../mail/vfoldertypes.xml.in.h:13
+msgid "does not sound like"
+msgstr "ne zveni kot"
+
+#: ../mail/filtertypes.xml.in.h:12 ../mail/message-list.etspec.h:16
+#: ../mail/searchtypes.xml.in.h:10 ../mail/vfoldertypes.xml.in.h:10
+msgid "Recipients"
+msgstr "Prejemniki"
+
+#: ../mail/filtertypes.xml.in.h:13 ../mail/searchtypes.xml.in.h:14
+#: ../mail/vfoldertypes.xml.in.h:14
+msgid "CC"
+msgstr "KP"
+
+#: ../mail/filtertypes.xml.in.h:14 ../mail/searchtypes.xml.in.h:15
+#: ../mail/vfoldertypes.xml.in.h:15
+msgid "BCC"
+msgstr "SKP"
+
+#: ../mail/filtertypes.xml.in.h:15 ../mail/searchtypes.xml.in.h:16
+#: ../mail/vfoldertypes.xml.in.h:16
+msgid "Sender or Recipients"
+msgstr "Pošiljatelj ali prejemniki"
+
+#: ../mail/filtertypes.xml.in.h:17 ../mail/searchtypes.xml.in.h:18
+#: ../mail/vfoldertypes.xml.in.h:18
+msgid "has words"
+msgstr "vsebuje besede"
+
+#: ../mail/filtertypes.xml.in.h:18 ../mail/searchtypes.xml.in.h:19
+#: ../mail/vfoldertypes.xml.in.h:19
+msgid "does not have words"
+msgstr "ne vsebuje besed"
+
+#: ../mail/filtertypes.xml.in.h:19 ../mail/searchtypes.xml.in.h:20
+#: ../mail/vfoldertypes.xml.in.h:20
+msgid "Specific header"
+msgstr "Navedena glava"
+
+#: ../mail/filtertypes.xml.in.h:20 ../mail/searchtypes.xml.in.h:21
+#: ../mail/vfoldertypes.xml.in.h:21
+msgid "exists"
+msgstr "obstaja"
+
+#: ../mail/filtertypes.xml.in.h:21 ../mail/searchtypes.xml.in.h:22
+#: ../mail/vfoldertypes.xml.in.h:22
+msgid "does not exist"
+msgstr "ne obstaja"
+
+#: ../mail/filtertypes.xml.in.h:22 ../mail/searchtypes.xml.in.h:24
+#: ../mail/vfoldertypes.xml.in.h:24
+msgid "Message Body"
+msgstr "Telo sporočila"
+
+#: ../mail/filtertypes.xml.in.h:23 ../mail/searchtypes.xml.in.h:25
+#: ../mail/vfoldertypes.xml.in.h:25
+msgid "Expression"
+msgstr "Izraz"
+
+#: ../mail/filtertypes.xml.in.h:24 ../mail/searchtypes.xml.in.h:26
+#: ../mail/vfoldertypes.xml.in.h:26
+#, fuzzy
+msgid "Free Form Expression"
+msgstr "Izraz"
+
+#: ../mail/filtertypes.xml.in.h:25 ../mail/searchtypes.xml.in.h:27
+#: ../mail/vfoldertypes.xml.in.h:27
+msgid "Date sent"
+msgstr "Datum pošiljanja"
+
+#: ../mail/filtertypes.xml.in.h:26 ../mail/searchtypes.xml.in.h:28
+#: ../mail/vfoldertypes.xml.in.h:28
+msgid "is before"
+msgstr "je pred"
+
+#: ../mail/filtertypes.xml.in.h:27 ../mail/searchtypes.xml.in.h:29
+#: ../mail/vfoldertypes.xml.in.h:29
+msgid "is after"
+msgstr "je po"
+
+#: ../mail/filtertypes.xml.in.h:28 ../mail/searchtypes.xml.in.h:30
+#: ../mail/vfoldertypes.xml.in.h:30
+msgid "Date received"
+msgstr "Datum prejema"
+
+#: ../mail/filtertypes.xml.in.h:29 ../mail/searchtypes.xml.in.h:31
+#: ../mail/vfoldertypes.xml.in.h:31
+msgid "Label"
+msgstr "Oznaka"
+
+#: ../mail/filtertypes.xml.in.h:30 ../mail/message-list.etspec.h:3
+#: ../mail/searchtypes.xml.in.h:32 ../mail/vfoldertypes.xml.in.h:32
+msgid "Score"
+msgstr "Točke"
+
+#: ../mail/filtertypes.xml.in.h:33 ../mail/searchtypes.xml.in.h:35
+#: ../mail/vfoldertypes.xml.in.h:35
+msgid "Size (kB)"
+msgstr "Velikost (kB)"
+
+#: ../mail/filtertypes.xml.in.h:35 ../mail/searchtypes.xml.in.h:37
+#: ../mail/vfoldertypes.xml.in.h:37
+msgid "Replied to"
+msgstr "Odgovorjeno na"
+
+#: ../mail/filtertypes.xml.in.h:37 ../mail/searchtypes.xml.in.h:40
+#: ../mail/vfoldertypes.xml.in.h:40
+msgid "Important"
+msgstr "Pomembno"
+
+#. Past tense, as in "has been read".
+#: ../mail/filtertypes.xml.in.h:38 ../mail/mail-dialogs.ui.h:15
+#: ../mail/searchtypes.xml.in.h:41 ../mail/vfoldertypes.xml.in.h:41
+msgid "Read"
+msgstr "Prebrano"
+
+#: ../mail/filtertypes.xml.in.h:39 ../mail/mail-config.ui.h:121
+#: ../mail/vfoldertypes.xml.in.h:42
+msgid "Junk"
+msgstr "Vsiljena pošta"
+
+#: ../mail/filtertypes.xml.in.h:40 ../mail/searchtypes.xml.in.h:42
+#: ../mail/vfoldertypes.xml.in.h:43
+msgid "Follow Up"
+msgstr "Navezava"
+
+#: ../mail/filtertypes.xml.in.h:41 ../mail/searchtypes.xml.in.h:43
+#: ../mail/vfoldertypes.xml.in.h:44
+msgid "is Flagged"
+msgstr "je označeno z zastavico"
+
+#: ../mail/filtertypes.xml.in.h:42 ../mail/searchtypes.xml.in.h:44
+#: ../mail/vfoldertypes.xml.in.h:45
+msgid "is not Flagged"
+msgstr "ni označeno z zastavico"
+
+#: ../mail/filtertypes.xml.in.h:43 ../mail/searchtypes.xml.in.h:45
+#: ../mail/vfoldertypes.xml.in.h:46
+msgid "Completed On"
+msgstr "Dokončano dne"
+
+#: ../mail/filtertypes.xml.in.h:44 ../mail/searchtypes.xml.in.h:46
+#: ../mail/vfoldertypes.xml.in.h:47
+msgid "is set"
+msgstr "je nastavljeno"
+
+#: ../mail/filtertypes.xml.in.h:45 ../mail/searchtypes.xml.in.h:47
+#: ../mail/vfoldertypes.xml.in.h:48
+msgid "is not set"
+msgstr "ni nastavljeno"
+
+#: ../mail/filtertypes.xml.in.h:49 ../mail/searchtypes.xml.in.h:51
+#: ../mail/vfoldertypes.xml.in.h:52
+msgid "Mailing list"
+msgstr "Dopisni seznam"
+
+#: ../mail/filtertypes.xml.in.h:50 ../mail/searchtypes.xml.in.h:52
+#: ../mail/vfoldertypes.xml.in.h:53
+msgid "Regex Match"
+msgstr "Skladanje z logičnim izrazom"
+
+#: ../mail/filtertypes.xml.in.h:51 ../mail/searchtypes.xml.in.h:53
+#: ../mail/vfoldertypes.xml.in.h:54
+msgid "Message Header"
+msgstr "Glava sporočila"
+
+#: ../mail/filtertypes.xml.in.h:52
+msgid "Source Account"
+msgstr "Izvirni račun"
+
+#: ../mail/filtertypes.xml.in.h:53
+msgid "Pipe to Program"
+msgstr "Pipa za program"
+
+#: ../mail/filtertypes.xml.in.h:54
+msgid "returns"
+msgstr "vrne"
+
+#: ../mail/filtertypes.xml.in.h:55
+msgid "does not return"
+msgstr "ne vrne"
+
+#: ../mail/filtertypes.xml.in.h:56
+msgid "returns greater than"
+msgstr "vrne večje kot"
+
+#: ../mail/filtertypes.xml.in.h:57
+msgid "returns less than"
+msgstr "vrne manjše kot"
+
+#: ../mail/filtertypes.xml.in.h:58
+msgid "Junk Test"
+msgstr "Preizkus vsiljene pošte"
+
+#: ../mail/filtertypes.xml.in.h:59
+msgid "Message is Junk"
+msgstr "Sporočilo je vsiljeno"
+
+#: ../mail/filtertypes.xml.in.h:60
+msgid "Message is not Junk"
+msgstr "Sporočilo ni vsiljeno"
+
+#: ../mail/filtertypes.xml.in.h:61 ../mail/vfoldertypes.xml.in.h:55
+msgid "Message Location"
+msgstr "Mesto sporočila"
+
+#: ../mail/filtertypes.xml.in.h:62 ../mail/searchtypes.xml.in.h:54
+#: ../mail/vfoldertypes.xml.in.h:56
+msgid "Match All"
+msgstr "Skladaj vse"
+
+#: ../mail/filtertypes.xml.in.h:66
+msgid "Stop Processing"
+msgstr "Zaustavi obdelavo"
+
+#: ../mail/filtertypes.xml.in.h:67
+msgid "Set Label"
+msgstr "Nastavi oznako"
+
+#: ../mail/filtertypes.xml.in.h:68
+msgid "Assign Color"
+msgstr "Dodeli barvo"
+
+#: ../mail/filtertypes.xml.in.h:69
+msgid "Unset Color"
+msgstr "Odstrani barvo"
+
+#: ../mail/filtertypes.xml.in.h:70
+msgid "Assign Score"
+msgstr "Dodeli rezultat"
+
+#: ../mail/filtertypes.xml.in.h:71
+msgid "Adjust Score"
+msgstr "Prilagodi točke"
+
+#: ../mail/filtertypes.xml.in.h:72
+msgid "Set Status"
+msgstr "Nastavi stanje"
+
+#: ../mail/filtertypes.xml.in.h:73 ../mail/searchtypes.xml.in.h:38
+#: ../mail/vfoldertypes.xml.in.h:38
+msgid "Deleted"
+msgstr "Izbrisano"
+
+#: ../mail/filtertypes.xml.in.h:74
+msgid "Unset Status"
+msgstr "Nenastavljeno stanje"
+
+#: ../mail/filtertypes.xml.in.h:75
+msgid "Beep"
+msgstr "Pisk"
+
+#: ../mail/filtertypes.xml.in.h:76
+msgid "Play Sound"
+msgstr "Predvajaj zvok"
+
+#: ../mail/filtertypes.xml.in.h:77
+msgid "Run Program"
+msgstr "Zaženi program"
+
+#: ../mail/filtertypes.xml.in.h:78
+msgid "Forward to"
+msgstr "Posreduj na"
+
 #: ../mail/importers/elm-importer.c:173
 msgid "Importing Elm data"
 msgstr "Uvažanje podatkov Elm"
@@ -14308,54 +16694,86 @@ msgid "Import mail from Elm."
 msgstr "Uvozi pošto iz Elma."
 
 #: ../mail/importers/evolution-mbox-importer.c:134
+#: ../mail/importers/kmail-importer.c:210
 #: ../plugins/dbx-import/dbx-importer.c:246
 msgid "_Destination folder:"
 msgstr "_Ciljna mapa:"
 
 #: ../mail/importers/evolution-mbox-importer.c:140
+#: ../mail/importers/kmail-importer.c:216
 #: ../plugins/dbx-import/dbx-importer.c:252
 #: ../plugins/pst-import/pst-importer.c:541
 msgid "Select folder"
 msgstr "Izbor mape"
 
 #: ../mail/importers/evolution-mbox-importer.c:141
+#: ../mail/importers/kmail-importer.c:217
 #: ../plugins/dbx-import/dbx-importer.c:253
 #: ../plugins/pst-import/pst-importer.c:542
 msgid "Select folder to import into"
 msgstr "Izberite mapo za uvoz"
 
-#: ../mail/importers/evolution-mbox-importer.c:435
+#: ../mail/importers/evolution-mbox-importer.c:509
 msgctxt "mboxImp"
 msgid "Subject"
 msgstr "Zadeva"
 
-#: ../mail/importers/evolution-mbox-importer.c:440
+#: ../mail/importers/evolution-mbox-importer.c:514
 msgctxt "mboxImp"
 msgid "From"
 msgstr "Od"
 
-#: ../mail/importers/evolution-mbox-importer.c:493
+#: ../mail/importers/evolution-mbox-importer.c:568
 #: ../shell/e-shell-utils.c:171
 msgid "Berkeley Mailbox (mbox)"
 msgstr "Poštni predal Berkeley (mbox)"
 
-#: ../mail/importers/evolution-mbox-importer.c:494
+#: ../mail/importers/evolution-mbox-importer.c:569
 msgid "Importer Berkeley Mailbox format folders"
 msgstr "Uvoznik map v obliki poštnih predalov Berkeley"
 
-#: ../mail/importers/mail-importer.c:54
+#: ../mail/importers/kmail-importer.c:263
+#, fuzzy, c-format
+msgid "%d Address"
+msgid_plural "%d Addresses"
+msgstr[0] "Naslov"
+msgstr[1] "Naslov"
+msgstr[2] "Naslov"
+msgstr[3] "Naslov"
+
+#: ../mail/importers/kmail-importer.c:354
+#, fuzzy
+msgid "Evolution KMail importer"
+msgstr "Uvoznik Elm Evolution"
+
+#: ../mail/importers/kmail-importer.c:355
+#, fuzzy
+msgid "Import mail and contacts from KMail."
+msgstr "Uvozi pošto iz Elma."
+
+#: ../mail/importers/kmail-libs.c:152
+#: ../modules/mail/e-mail-shell-view-private.c:1082
+msgid "Trash"
+msgstr "Smeti"
+
+#: ../mail/importers/mail-importer.c:55
 msgid "Importing mailbox"
 msgstr "Uvažanje poštnega predala"
 
+#: ../mail/importers/mail-importer.c:61
+#, fuzzy
+msgid "Importing mail and contacts from KMail"
+msgstr "Uvozi pošto iz Elma."
+
 #. Destination folder, was set in our widget
-#: ../mail/importers/mail-importer.c:144
+#: ../mail/importers/mail-importer.c:187 ../mail/importers/mail-importer.c:314
 #: ../plugins/dbx-import/dbx-importer.c:609
 #: ../plugins/pst-import/pst-importer.c:760
 #, c-format
 msgid "Importing '%s'"
 msgstr "Uvažanje '%s'"
 
-#: ../mail/importers/mail-importer.c:309
+#: ../mail/importers/mail-importer.c:570
 #, c-format
 msgid "Scanning %s"
 msgstr "Preiskovanje %s"
@@ -14455,121 +16873,122 @@ msgid "For_mat messages in HTML"
 msgstr "Oblikuj sporočila v HTML"
 
 #: ../mail/mail-config.ui.h:9
-msgid "Automatically insert _emoticon images"
+#, fuzzy
+msgid "Automatically insert _emoticons"
 msgstr "Samodejno vstavi slike _izraznih ikon"
 
 #: ../mail/mail-config.ui.h:10
+msgid "Use Unicode characters for smile_ys"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:11
 msgid "Always request rea_d receipt"
 msgstr "Vedno zaht_evaj povratnico"
 
-#: ../mail/mail-config.ui.h:11
+#: ../mail/mail-config.ui.h:12
 msgid "Encode filenames in an _Outlook/GMail way"
 msgstr "Kodiraj imena datotek v načinu MS _Outlook/GMail"
 
-#: ../mail/mail-config.ui.h:12
+#: ../mail/mail-config.ui.h:13
+#, fuzzy
+msgid "Send messages through Outbo_x folder"
+msgstr "Shranjevanje sporočila v mapo odhodne pošte."
+
+#: ../mail/mail-config.ui.h:14
+msgid "Number of characters for word w_rapping:"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:15
 msgid "Ch_aracter encoding:"
 msgstr "Zn_akovni nabor:"
 
-#: ../mail/mail-config.ui.h:13
+#: ../mail/mail-config.ui.h:16
 msgid "Replies and Forwards"
 msgstr "Odgovori in posredovanja"
 
-#: ../mail/mail-config.ui.h:14
+#: ../mail/mail-config.ui.h:17
 msgid "_Reply style:"
 msgstr "Slog odgovo_ra:"
 
-#: ../mail/mail-config.ui.h:15
+#: ../mail/mail-config.ui.h:18
 msgid "_Forward style:"
 msgstr "Način _posredovanja:"
 
-#: ../mail/mail-config.ui.h:16
+#: ../mail/mail-config.ui.h:19
 msgid "Start _typing at the bottom on replying"
 msgstr "Ob odgovarjanju se pisanje se začne na _dnu"
 
-#: ../mail/mail-config.ui.h:17
+#: ../mail/mail-config.ui.h:20
 msgid "_Keep signature above the original message on replying"
 msgstr "_Ohrani podpis nad izvirnim sporočilom ob odgovoru"
 
-#: ../mail/mail-config.ui.h:18
+#: ../mail/mail-config.ui.h:21
 msgid "Ig_nore Reply-To: for mailing lists"
 msgstr "_Prezri dogovor-na: za dopisne sezname"
 
-#: ../mail/mail-config.ui.h:19
+#: ../mail/mail-config.ui.h:22
 msgid "Gro_up Reply goes only to mailing list, if possible"
 msgstr ""
 "Skupinski _odgovor pošlje sporočilo le na dopisni seznam, če je to mogoče"
 
-#: ../mail/mail-config.ui.h:20
+#: ../mail/mail-config.ui.h:23
 msgid "Digitally _sign messages when original message signed (PGP or S/MIME)"
 msgstr ""
 "Digitalno _podpiši sporočila, kadar je podpisano tudi izvirno sporočilo (PGP "
 "ali S/MIME)"
 
-#: ../mail/mail-config.ui.h:21
+#: ../mail/mail-config.ui.h:24
 msgctxt "ReplyForward"
 msgid "Attachment"
 msgstr "Priloga"
 
-#: ../mail/mail-config.ui.h:22
+#: ../mail/mail-config.ui.h:25
 msgctxt "ReplyForward"
 msgid "Inline (Outlook style)"
 msgstr "Medvrtično (slog Outlook)"
 
-#: ../mail/mail-config.ui.h:23
+#: ../mail/mail-config.ui.h:26
 msgctxt "ReplyForward"
 msgid "Quoted"
 msgstr "Navedeno"
 
-#: ../mail/mail-config.ui.h:24
+#: ../mail/mail-config.ui.h:27
 msgctxt "ReplyForward"
 msgid "Do Not Quote"
 msgstr "Ne navajaj"
 
-#: ../mail/mail-config.ui.h:25
+#: ../mail/mail-config.ui.h:28
 msgctxt "ReplyForward"
 msgid "Inline"
 msgstr "Medvrstično"
 
-#: ../mail/mail-config.ui.h:27
+#: ../mail/mail-config.ui.h:30
 msgid "Sig_natures"
 msgstr "Podpi_si"
 
-#: ../mail/mail-config.ui.h:28
+#: ../mail/mail-config.ui.h:31
 msgid "Signatures"
 msgstr "Podpisi"
 
-#: ../mail/mail-config.ui.h:29
+#: ../mail/mail-config.ui.h:32
 msgid "_Languages"
 msgstr "_Jeziki"
 
-#: ../mail/mail-config.ui.h:30
+#: ../mail/mail-config.ui.h:33
 msgid "Languages Table"
 msgstr "Razpredelnica jezikov"
 
-#: ../mail/mail-config.ui.h:31
+#: ../mail/mail-config.ui.h:34
 msgid ""
 "The list of languages here reflects only the languages for which you have a "
 "dictionary installed."
 msgstr "Ta seznam jezikov vsebuje le jezike, katerih slovar imate nameščen."
 
-#: ../mail/mail-config.ui.h:33
+#: ../mail/mail-config.ui.h:36
 msgid "Check spelling while I _type"
 msgstr "Preverjaj črkovanje med _tipkanjem"
 
-#: ../mail/mail-config.ui.h:34
-msgid "Color for _misspelled words:"
-msgstr "Barva n_apačno črkovanih besed:"
-
-#: ../mail/mail-config.ui.h:35
-#: ../modules/calendar/e-calendar-preferences.ui.h:58
-msgid "Pick a color"
-msgstr "Izbor barve"
-
-#: ../mail/mail-config.ui.h:36
-msgid "Spell Checking"
-msgstr "Preverjanje črkovanja"
-
-#: ../mail/mail-config.ui.h:37
+#: ../mail/mail-config.ui.h:38
 msgid ""
 "To help avoid email accidents and embarrassments, ask for confirmation "
 "before taking the following checkmarked actions:"
@@ -14578,67 +16997,73 @@ msgstr ""
 "potrditev pred izvajanjem naslednjih izbranih dejanj:"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:39
+#: ../mail/mail-config.ui.h:40
 msgid "Sending a message with an _empty subject line"
 msgstr "Pošiljanje sporočila s _praznim poljem zadeva"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:41
+#: ../mail/mail-config.ui.h:42
 msgid "Sending a message with only _Bcc recipients defined"
 msgstr "Pošiljanje sporočila le z določenimi prejemniki _Skp"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:43
+#: ../mail/mail-config.ui.h:44
 msgid "Sending a _private reply to a mailing list message"
 msgstr "Pošiljanje _zasebnega odgovora na sporočilo dopisnega seznama"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:45
+#: ../mail/mail-config.ui.h:46
 msgid "Sending a reply to a large _number of recipients"
 msgstr "Pošiljanje odgovora velikemu _številu prejemnikov"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:47
+#: ../mail/mail-config.ui.h:48
 msgid "Allowing a _mailing list to redirect a private reply to the list"
 msgstr "_Dopisnemu seznamu dovoli preusmeritev na zaseben odgovor na seznamu"
 
 #. This is in the context of: Ask for confirmation before...
-#: ../mail/mail-config.ui.h:49
+#: ../mail/mail-config.ui.h:50
 msgid "Sending a message with _recipients not entered as mail addresses"
 msgstr "Pošiljanje sporočila s _prejemniki, ki niso vneseni kot poštni naslovi"
 
-#: ../mail/mail-config.ui.h:50
+#. This is in the context of: Ask for confirmation before...
+#: ../mail/mail-config.ui.h:52
+#, fuzzy
+msgid "Sending a message using _key accelerator (Ctrl+Enter)"
+msgstr "Pošiljanje sporočila s _praznim poljem zadeva"
+
+#: ../mail/mail-config.ui.h:53
 msgid "Confirmations"
 msgstr "Potrjevanje"
 
 #. 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
+#: ../mail/mail-config.ui.h:57
 msgid "Use for Folders"
 msgstr "Uporabi za mape"
 
-#: ../mail/mail-config.ui.h:55
+#: ../mail/mail-config.ui.h:58
 msgid "A_dd"
 msgstr "_Dodaj"
 
-#: ../mail/mail-config.ui.h:57
+#: ../mail/mail-config.ui.h:60
 msgid "Re_move"
 msgstr "_Odstrani"
 
 #. 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
+#: ../mail/mail-config.ui.h:62
 msgid "Use for Recipients"
 msgstr "Uporabi za prejemnike"
 
 #. 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
+#: ../mail/mail-config.ui.h:64 ../modules/mail/em-composer-prefs.c:836
 msgid "Account"
 msgstr "Račun"
 
-#: ../mail/mail-config.ui.h:62
+#: ../mail/mail-config.ui.h:65
 msgid "Send account overrides"
 msgstr "Pošlji spremenjena poverila računa"
 
-#: ../mail/mail-config.ui.h:63
+#: ../mail/mail-config.ui.h:66
 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 "
@@ -14650,186 +17075,208 @@ msgstr ""
 "prejemnikov lahko vsebuje le delne naslove ali imena. Ime in naslov sta "
 "lahko povsem ločeni določili."
 
-#: ../mail/mail-config.ui.h:64
+#: ../mail/mail-config.ui.h:67
 msgid "_Folder override has precedence over Recipient override"
 msgstr ""
 "__Spremenjena poverila mape imajo prednost pred spremenjenim prejemnikom"
 
-#: ../mail/mail-config.ui.h:65
+#: ../mail/mail-config.ui.h:68
 msgid "Send Account"
 msgstr "Pošlji račun"
 
-#: ../mail/mail-config.ui.h:71 ../smime/gui/smime-ui.ui.h:1
+#: ../mail/mail-config.ui.h:74 ../smime/gui/smime-ui.ui.h:1
 msgid "a"
 msgstr "a"
 
-#: ../mail/mail-config.ui.h:72 ../smime/gui/smime-ui.ui.h:2
+#: ../mail/mail-config.ui.h:75 ../smime/gui/smime-ui.ui.h:2
 msgid "b"
 msgstr "b"
 
-#: ../mail/mail-config.ui.h:73
+#: ../mail/mail-config.ui.h:76
 msgid "Start up"
 msgstr "Zagon"
 
-#: ../mail/mail-config.ui.h:74
+#: ../mail/mail-config.ui.h:77
 msgid "Check for new _messages on start"
 msgstr "Preveri za nova _sporočila ob zagonu"
 
-#: ../mail/mail-config.ui.h:75
+#: ../mail/mail-config.ui.h:78
 msgid "Check for new messa_ges in all active accounts"
 msgstr "Samodejno preveri za _novo pošto v vseh dejavnih računih"
 
-#: ../mail/mail-config.ui.h:76
+#: ../mail/mail-config.ui.h:79
 msgid "Message Display"
 msgstr "Prikaz sporočil"
 
-#: ../mail/mail-config.ui.h:77
+#: ../mail/mail-config.ui.h:80
 msgid "_Use the same fonts as other applications"
 msgstr "_Uporabi enake pisave kot drugi programi"
 
-#: ../mail/mail-config.ui.h:78
+#: ../mail/mail-config.ui.h:81
 msgid "S_tandard Font:"
 msgstr "_Običajna pisava:"
 
-#: ../mail/mail-config.ui.h:79
+#: ../mail/mail-config.ui.h:82
 msgid "Select HTML fixed width font"
 msgstr "Izberite pisavo HTML stalne širine"
 
-#: ../mail/mail-config.ui.h:80
+#: ../mail/mail-config.ui.h:83
 msgid "Select HTML variable width font"
 msgstr "Izberite pisavo HTML spremenljive širine"
 
-#: ../mail/mail-config.ui.h:81
+#: ../mail/mail-config.ui.h:84
 msgid "Fix_ed Width Font:"
 msgstr "_Pisava stalne širine:"
 
-#: ../mail/mail-config.ui.h:82
+#: ../mail/mail-config.ui.h:85
 msgid "_Mark messages as read after"
 msgstr "_Označi sporočila kot prebrana po"
 
-#: ../mail/mail-config.ui.h:84
+#: ../mail/mail-config.ui.h:87
 msgid "Highlight _quotations with"
 msgstr "Poudari _citate z"
 
-#: ../mail/mail-config.ui.h:85
+#: ../mail/mail-config.ui.h:88
+#: ../modules/calendar/e-calendar-preferences.ui.h:59
+msgid "Pick a color"
+msgstr "Izbor barve"
+
+#: ../mail/mail-config.ui.h:89
 msgid "color"
 msgstr "barva"
 
-#: ../mail/mail-config.ui.h:86
+#: ../mail/mail-config.ui.h:90
 msgid "Default character e_ncoding:"
 msgstr "Privzet _nabor znakov:"
 
-#: ../mail/mail-config.ui.h:87
+#: ../mail/mail-config.ui.h:91
 msgid "Apply the same _view settings to all folders"
 msgstr "Uporabi enake nastavitve _pogleda za vse mape"
 
-#: ../mail/mail-config.ui.h:88
+#: ../mail/mail-config.ui.h:92
 msgid "F_all back to threading messages by subject"
 msgstr "_Povrni se na nitenje sporočil po zadevi"
 
-#: ../mail/mail-config.ui.h:89
+#: ../mail/mail-config.ui.h:93
 msgid "Delete Mail"
 msgstr "Izbriši pošto"
 
-#: ../mail/mail-config.ui.h:90
+#: ../mail/mail-config.ui.h:94
 msgid "Empty _trash folders"
 msgstr "I_zprazni mape smeti"
 
-#: ../mail/mail-config.ui.h:91
+#: ../mail/mail-config.ui.h:95
 msgid "Confirm _when expunging a folder"
 msgstr "Potrdi ob _uničevanju mape"
 
+#: ../mail/mail-config.ui.h:96
+msgid "Archive Mail"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:97
+msgid "On This Computer A_rchive folder:"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:98
+msgid "Archive folder to use for On This Computer messages"
+msgstr ""
+
 #. If enabled, show animation; if disabled, only display a static image without any animation
-#: ../mail/mail-config.ui.h:93
+#: ../mail/mail-config.ui.h:100
 msgid "_Show animated images"
 msgstr "_Pokaži animirane slike"
 
-#: ../mail/mail-config.ui.h:94
+#: ../mail/mail-config.ui.h:101
 msgid "_Prompt on sending HTML mail to contacts that do not want them"
 msgstr ""
 "O_pozori ob pošiljanju sporočil v obliki HTML tistim stikom, ki tega nočejo"
 
-#: ../mail/mail-config.ui.h:95
+#: ../mail/mail-config.ui.h:102
 msgid "Loading Images"
 msgstr "Nalaganje slik"
 
-#: ../mail/mail-config.ui.h:96
+#: ../mail/mail-config.ui.h:103
 msgid "_Never load images from the Internet"
 msgstr "_Nikoli ne nalagaj slik z medmreja"
 
-#: ../mail/mail-config.ui.h:97
+#: ../mail/mail-config.ui.h:104
 msgid "_Load images only in messages from contacts"
 msgstr "_Naloži slike le v sporočilih s stikov"
 
-#: ../mail/mail-config.ui.h:98
+#: ../mail/mail-config.ui.h:105
 msgid "_Always load images from the Internet"
 msgstr "Vedno n_aloži slike s spleta"
 
-#: ../mail/mail-config.ui.h:99
+#: ../mail/mail-config.ui.h:106
 msgid "HTML Messages"
 msgstr "Sporočila HTML"
 
-#: ../mail/mail-config.ui.h:100 ../mail/message-list.etspec.h:19
+#: ../mail/mail-config.ui.h:107 ../mail/message-list.etspec.h:19
 msgid "Labels"
 msgstr "Oznake"
 
-#: ../mail/mail-config.ui.h:101
+#: ../mail/mail-config.ui.h:108
 msgid "Sender Photograph"
 msgstr "Fotografija pošiljatelja"
 
-#: ../mail/mail-config.ui.h:102
+#: ../mail/mail-config.ui.h:109
 msgid "_Show the photograph of sender in the message preview"
 msgstr "Pokaži sliko pošiljatelja v _predogledu sporočila"
 
-#: ../mail/mail-config.ui.h:103
+#: ../mail/mail-config.ui.h:110
+msgid "Search gra_vatar.com for the photograph of sender"
+msgstr ""
+
+#: ../mail/mail-config.ui.h:111
 msgid "Displayed Message Headers"
 msgstr "Pokaži glave sporočil"
 
-#: ../mail/mail-config.ui.h:104
+#: ../mail/mail-config.ui.h:112
 msgid "Mail Headers Table"
 msgstr "Razpredelnica glav pošte"
 
-#: ../mail/mail-config.ui.h:105
+#: ../mail/mail-config.ui.h:113
 #: ../modules/addressbook/autocompletion-config.c:117
-#: ../modules/calendar/e-calendar-preferences.ui.h:54
+#: ../modules/calendar/e-calendar-preferences.ui.h:45
 msgid "Date/Time Format"
 msgstr "Zapis datuma/časa"
 
-#: ../mail/mail-config.ui.h:107
+#: ../mail/mail-config.ui.h:115
 msgid "Check incoming _messages for junk"
 msgstr "Preveri _dohodno pošto za vsiljena sporočila"
 
-#: ../mail/mail-config.ui.h:108
+#: ../mail/mail-config.ui.h:116
 msgid "_Delete junk messages"
 msgstr "Izbriši _vsiljeno pošto"
 
-#: ../mail/mail-config.ui.h:109
-msgid "Check cu_stom headers for junk"
-msgstr "Preveri glave _po meri za vsiljeno pošto"
+#: ../mail/mail-config.ui.h:117
+#, fuzzy
+msgid "Junk Test Options"
+msgstr "Preizkus vsiljene pošte"
 
-#: ../mail/mail-config.ui.h:110
+#: ../mail/mail-config.ui.h:118
 msgid "Do not mar_k messages as junk if sender is in my address book"
 msgstr "_Ne označi sporočila kot vsiljenega, če je pošiljatelj v mojem imeniku"
 
-#: ../mail/mail-config.ui.h:111
+#: ../mail/mail-config.ui.h:119
 msgid "_Lookup in local address book only"
 msgstr "_Poglej le v krajevni imenik"
 
-#: ../mail/mail-config.ui.h:112
-msgid "Option is ignored if a match for custom junk headers is found."
-msgstr "Možnost je prezrta, če je najdena glava po meri za vsiljeno pošto."
+#: ../mail/mail-config.ui.h:120
+msgid "Check cu_stom headers for junk"
+msgstr "Preveri glave _po meri za vsiljeno pošto"
 
-#: ../mail/mail-config.ui.h:114
+#: ../mail/mail-config.ui.h:122
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:224
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:158
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:174
 msgid "No encryption"
 msgstr "Brez šifriranja"
 
-#: ../mail/mail-config.ui.h:115
+#: ../mail/mail-config.ui.h:123
 msgid "TLS encryption"
 msgstr "Šifriranje TLS"
 
-#: ../mail/mail-config.ui.h:116
+#: ../mail/mail-config.ui.h:124
 msgid "SSL encryption"
 msgstr "Šifriranje SSL"
 
@@ -15115,7 +17562,7 @@ msgstr ""
 "vseh mapah?"
 
 #: ../mail/mail.error.xml.h:39
-#: ../modules/mail/e-mail-shell-view-actions.c:1519
+#: ../modules/mail/e-mail-shell-view-actions.c:1573
 msgid "_Empty Trash"
 msgstr "Izprazni _smeti"
 
@@ -15403,10 +17850,6 @@ msgstr ""
 "\n"
 "Mapo lahko prezrete, prepišete, dodate vsebino ali pa končate."
 
-#: ../mail/mail.error.xml.h:109
-msgid "Ignore"
-msgstr "Prezri"
-
 #: ../mail/mail.error.xml.h:110
 msgid "_Overwrite"
 msgstr "_Prepiši"
@@ -15600,6 +18043,11 @@ msgid "Folder '{0}' doesn't contain any duplicate message."
 msgstr "Mapa '{0}' ne vsebuje podvojenih sporočil."
 
 #: ../mail/mail.error.xml.h:155
+#, fuzzy
+msgid "Failed to connect account &quot;{0}&quot;."
+msgstr "Napaka med prekinitvijo povezave z računom &quot;{0}&quot;."
+
+#: ../mail/mail.error.xml.h:156
 msgid "Failed to disconnect account &quot;{0}&quot;."
 msgstr "Napaka med prekinitvijo povezave z računom &quot;{0}&quot;."
 
@@ -15616,38 +18064,52 @@ msgid "{0}"
 msgstr "{0}"
 
 #: ../mail/mail.error.xml.h:160
+#, fuzzy
+msgid "Message is not available in offline mode."
+msgstr "Sporočilo pošlji tudi v načinu _brez povezave"
+
+#: ../mail/mail.error.xml.h:161
+msgid ""
+"This can be due to the message not being downloaded yet. The folder, or the "
+"account, can be marked for offline synchronization. Then, once the account "
+"is online again, use File-&gt;Download Messages for Offline Usage, when this "
+"folder is selected, to make sure that all the messages in the folder will be "
+"available in offline mode."
+msgstr ""
+
+#: ../mail/mail.error.xml.h:162
 msgid "Failed to open folder."
 msgstr "Odpiranje mape je spodletelo."
 
-#: ../mail/mail.error.xml.h:161
+#: ../mail/mail.error.xml.h:164
 msgid "Failed to find duplicate messages."
 msgstr "Iskanje podvojenih sporočil je spodletelo."
 
-#: ../mail/mail.error.xml.h:162
+#: ../mail/mail.error.xml.h:165
 msgid "Failed to retrieve messages."
 msgstr "Pridobivanje sporočil je spodletelo."
 
-#: ../mail/mail.error.xml.h:163
+#: ../mail/mail.error.xml.h:166
 msgid "Failed to mark messages as read."
 msgstr "Označevanje sporočila kot prebranega je spodletelo."
 
-#: ../mail/mail.error.xml.h:164
+#: ../mail/mail.error.xml.h:167
 msgid "Failed to remove attachments from messages."
 msgstr "Odstranjevanje priloge iz sporočila je spodletelo."
 
-#: ../mail/mail.error.xml.h:165
+#: ../mail/mail.error.xml.h:168
 msgid "Failed to download messages for offline viewing."
 msgstr "Prejemanje sporočil za pregledovanje brez povezave je spodletelo."
 
-#: ../mail/mail.error.xml.h:166
+#: ../mail/mail.error.xml.h:169
 msgid "Failed to save messages to disk."
 msgstr "Shranjevanje sporočila na disk je spodletelo."
 
-#: ../mail/mail.error.xml.h:167
+#: ../mail/mail.error.xml.h:170
 msgid "Hidden file is attached."
 msgstr "Priložena je skrita datoteka."
 
-#: ../mail/mail.error.xml.h:168
+#: ../mail/mail.error.xml.h:171
 msgid ""
 "The attachment named {0} is a hidden file and may contain sensitive data. "
 "Please review it before sending."
@@ -15655,51 +18117,83 @@ msgstr ""
 "Priloga z imenom {0} je skrita datoteka, ki morda vsebuje občutljive "
 "podatke. Preglejte in preverite vsebino pred pošiljanjem sporočila."
 
-#: ../mail/mail.error.xml.h:169
+#: ../mail/mail.error.xml.h:172
 msgid "Printing failed."
 msgstr "Tiskanje je spodletelo."
 
-#: ../mail/mail.error.xml.h:170
+#: ../mail/mail.error.xml.h:173
 msgid "The printer replied &quot;{0}&quot;."
 msgstr "Odziv tiskalnika je &quot;{0}&quot;."
 
-#: ../mail/mail.error.xml.h:171
+#: ../mail/mail.error.xml.h:174
 msgid "Could not perform this operation on {0}."
 msgstr "Tega dejanja ni mogoče izvesti na {0}."
 
-#: ../mail/mail.error.xml.h:172
+#: ../mail/mail.error.xml.h:175
 msgid "You must be working online to complete this operation."
 msgstr "Za dokončanje tega opravila je treba biti povezan v omrežje"
 
-#: ../mail/mail.error.xml.h:173
+#: ../mail/mail.error.xml.h:176
 msgid "Message from &quot;{0}&quot; account:"
 msgstr "Sporočilo z računa &quot;{0}&quot;:"
 
-#: ../mail/mail-send-recv.c:188
+#: ../mail/mail.error.xml.h:177
+#, fuzzy
+msgid "Failed to mark thread to be ignored in folder '{0}'"
+msgstr "Premikanje dogodka v koledar '{0}' je spodletelo"
+
+#: ../mail/mail.error.xml.h:178
+msgid "Failed to unmark thread from being ignored in folder '{0}'"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:179
+msgid "Failed to mark subthread to be ignored in folder '{0}'"
+msgstr ""
+
+#: ../mail/mail.error.xml.h:180
+msgid "Failed to unmark subthread from being ignored in folder '{0}'"
+msgstr ""
+
+#: ../mail/mail-send-recv.c:191
 msgid "Canceling..."
 msgstr "Prekinjanje ..."
 
-#: ../mail/mail-send-recv.c:526
+#: ../mail/mail-send-recv.c:631
 msgid "Send & Receive Mail"
 msgstr "Pošlji in prejmi pošto"
 
-#: ../mail/mail-send-recv.c:542
+#: ../mail/mail-send-recv.c:645
 msgid "Cancel _All"
 msgstr "Prekliči _vse"
 
-#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:1024
+#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:1249
 msgid "Updating..."
 msgstr "Posodabljanje ..."
 
-#: ../mail/mail-send-recv.c:632 ../mail/mail-send-recv.c:714
+#: ../mail/mail-send-recv.c:735 ../mail/mail-send-recv.c:817
 msgid "Waiting..."
 msgstr "Čakanje ..."
 
-#: ../mail/mail-send-recv.c:997
+#: ../mail/mail-send-recv.c:1220
 #, c-format
 msgid "Checking for new mail at '%s'"
 msgstr "Preverjanje za novo pošto na '%s'"
 
+#: ../mail/mail-send-recv.c:1434
+#, c-format
+msgid "Deleting junk and expunging trash at '%s'"
+msgstr ""
+
+#: ../mail/mail-send-recv.c:1436
+#, fuzzy, c-format
+msgid "Deleting junk at '%s'"
+msgstr "Ponovno povezovanje s strežnikom '%s'"
+
+#: ../mail/mail-send-recv.c:1438
+#, fuzzy, c-format
+msgid "Expunging trash at '%s'"
+msgstr "Praznjenje smeti v '%s'"
+
 #: ../mail/mail-vfolder-ui.c:66
 msgid "Search Folders"
 msgstr "Iskalne mape"
@@ -15712,86 +18206,86 @@ msgstr "Uredi iskalno mapo"
 msgid "New Search Folder"
 msgstr "Nova iskalna mapa"
 
-#: ../mail/message-list.c:287
+#: ../mail/message-list.c:291
 msgid "Unseen"
 msgstr "Nepregledano"
 
-#: ../mail/message-list.c:288
+#: ../mail/message-list.c:292
 msgid "Seen"
 msgstr "Videno"
 
-#: ../mail/message-list.c:289
+#: ../mail/message-list.c:293
 msgid "Answered"
 msgstr "Odgovorjeno"
 
-#: ../mail/message-list.c:290
+#: ../mail/message-list.c:294
 msgid "Forwarded"
 msgstr "Posredovano"
 
-#: ../mail/message-list.c:291
+#: ../mail/message-list.c:295
 msgid "Multiple Unseen Messages"
 msgstr "Več nepregledanih sporočil"
 
-#: ../mail/message-list.c:292
+#: ../mail/message-list.c:296
 msgid "Multiple Messages"
 msgstr "Več sporočil"
 
-#: ../mail/message-list.c:305
+#: ../mail/message-list.c:309
 msgid "Lowest"
 msgstr "najnižja"
 
-#: ../mail/message-list.c:306
+#: ../mail/message-list.c:310
 msgid "Lower"
 msgstr "nizka"
 
-#: ../mail/message-list.c:310
+#: ../mail/message-list.c:314
 msgid "Higher"
 msgstr "visoka"
 
-#: ../mail/message-list.c:311
+#: ../mail/message-list.c:315
 msgid "Highest"
 msgstr "najvišja"
 
-#: ../mail/message-list.c:455 ../mail/message-list.c:5750
+#: ../mail/message-list.c:459 ../mail/message-list.c:6043
 msgid "Generating message list"
 msgstr "Ustvarjanje seznama sporočil"
 
 #. strftime format of a time,
 #. * in 12-hour format, without seconds.
-#: ../mail/message-list.c:1860 ../modules/itip-formatter/itip-view.c:237
+#: ../mail/message-list.c:2041 ../modules/itip-formatter/itip-view.c:237
 msgid "Today %l:%M %p"
 msgstr "Danes %H.%M"
 
-#: ../mail/message-list.c:1869
+#: ../mail/message-list.c:2050
 msgid "Yesterday %l:%M %p"
 msgstr "Včeraj %H.%M"
 
-#: ../mail/message-list.c:1881
+#: ../mail/message-list.c:2062
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: ../mail/message-list.c:1889
+#: ../mail/message-list.c:2070
 msgid "%b %d %l:%M %p"
 msgstr "%d. %m. %H.%M"
 
-#: ../mail/message-list.c:1891
+#: ../mail/message-list.c:2072
 msgid "%b %d %Y"
 msgstr "%d. %m. %Y"
 
-#: ../mail/message-list.c:2771
+#: ../mail/message-list.c:2967
 msgid "Select all visible messages"
 msgstr "Izberi vsa vidna sporočila"
 
-#: ../mail/message-list.c:3399 ../mail/message-list.etspec.h:17
+#: ../mail/message-list.c:3629 ../mail/message-list.etspec.h:17
 msgid "Messages"
 msgstr "Sporočila"
 
 #. default follow-up flag name to use when clicked in the message list column
-#: ../mail/message-list.c:4706
+#: ../mail/message-list.c:4985
 msgid "Follow-up"
 msgstr "Navezava"
 
-#: ../mail/message-list.c:5688
+#: ../mail/message-list.c:5980
 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 "
@@ -15802,7 +18296,7 @@ msgstr ""
 "možnosti Pokaži filtre sporočil iz spustnega seznama ali pa z zagonom novega "
 "iskanja s počiščenjem ali pa s spreminjanjem zgornje poizvedbe."
 
-#: ../mail/message-list.c:5696
+#: ../mail/message-list.c:5988
 msgid "There are no messages in this folder."
 msgstr "V tej mapi ni sporočil."
 
@@ -15834,38 +18328,48 @@ msgstr "Sporočila za"
 msgid "Subject - Trimmed"
 msgstr "Zadeva - Okleščeno"
 
-#: ../mail/searchtypes.xml.h:1
+#: ../mail/searchtypes.xml.in.h:23 ../mail/vfoldertypes.xml.in.h:23
+msgid "Any header"
+msgstr "Katerakoli glava"
+
+#: ../mail/searchtypes.xml.in.h:55
 msgid "Subject or Addresses contains"
 msgstr "Zadeva ali Nalovi vsebujejo"
 
-#: ../mail/searchtypes.xml.h:2
-#: ../modules/mail/e-mail-shell-view-actions.c:2002
+#: ../mail/searchtypes.xml.in.h:56
+#: ../modules/mail/e-mail-shell-view-actions.c:2064
 msgid "Recipients contain"
 msgstr "Prejemniki vsebujejo"
 
-#: ../mail/searchtypes.xml.h:3
-#: ../modules/mail/e-mail-shell-view-actions.c:1995
+#: ../mail/searchtypes.xml.in.h:57
+#: ../modules/mail/e-mail-shell-view-actions.c:2057
 msgid "Message contains"
 msgstr "Sporočilo vsebuje"
 
-#: ../mail/searchtypes.xml.h:4
-#: ../modules/mail/e-mail-shell-view-actions.c:2016
+#: ../mail/searchtypes.xml.in.h:58
+#: ../modules/mail/e-mail-shell-view-actions.c:2078
 msgid "Subject contains"
 msgstr "Zadeva vsebuje"
 
-#: ../mail/searchtypes.xml.h:5
-#: ../modules/mail/e-mail-shell-view-actions.c:2009
+#: ../mail/searchtypes.xml.in.h:59
+#: ../modules/mail/e-mail-shell-view-actions.c:2071
 msgid "Sender contains"
 msgstr "Pošiljatelj vsebuje"
 
-#: ../mail/searchtypes.xml.h:6
-#: ../modules/mail/e-mail-shell-view-actions.c:1988
+#: ../mail/searchtypes.xml.in.h:60
+#: ../modules/mail/e-mail-shell-view-actions.c:2043
 msgid "Body contains"
 msgstr "Telo vsebuje"
 
+#: ../mail/searchtypes.xml.in.h:61
+#: ../modules/mail/e-mail-shell-view-actions.c:2050
+#, fuzzy
+msgid "Free form expression"
+msgstr "Izraz"
+
 #. 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:1212
+#: ../modules/mail/em-mailer-prefs.c:1234
 msgid "_Table column:"
 msgstr "_Stolpec razpredelnice:"
 
@@ -15916,7 +18420,7 @@ msgid "_Contact"
 msgstr "_Stik"
 
 #: ../modules/addressbook/e-book-shell-backend.c:269
-#: ../modules/addressbook/e-book-shell-view-actions.c:978
+#: ../modules/addressbook/e-book-shell-view-actions.c:1023
 msgid "Create a new contact"
 msgstr "Ustvari nov stik"
 
@@ -15926,7 +18430,7 @@ msgid "Contact _List"
 msgstr "Seznam _stikov"
 
 #: ../modules/addressbook/e-book-shell-backend.c:276
-#: ../modules/addressbook/e-book-shell-view-actions.c:985
+#: ../modules/addressbook/e-book-shell-view-actions.c:1030
 msgid "Create a new contact list"
 msgstr "Ustvari nov seznam stikov"
 
@@ -15936,7 +18440,7 @@ msgid "Address _Book"
 msgstr "_Imenik"
 
 #: ../modules/addressbook/e-book-shell-backend.c:286
-#: ../modules/addressbook/e-book-shell-view-actions.c:901
+#: ../modules/addressbook/e-book-shell-view-actions.c:946
 msgid "Create a new address book"
 msgstr "Ustvari nov imenik"
 
@@ -15949,264 +18453,264 @@ msgid "Address Book Properties"
 msgstr "Lastnosti imenika"
 
 #. Translators: This is a save dialog title
-#: ../modules/addressbook/e-book-shell-view-actions.c:475
-#: ../modules/addressbook/e-book-shell-view-actions.c:771
+#: ../modules/addressbook/e-book-shell-view-actions.c:520
+#: ../modules/addressbook/e-book-shell-view-actions.c:816
 msgid "Save as vCard"
 msgstr "Shrani kot VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:878
+#: ../modules/addressbook/e-book-shell-view-actions.c:923
 msgid "Co_py All Contacts To..."
 msgstr "Ko_piraj vse stike v ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:880
+#: ../modules/addressbook/e-book-shell-view-actions.c:925
 msgid "Copy the contacts of the selected address book to another"
 msgstr "Kopiraj stike izbranega imenika v drugega"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:885
+#: ../modules/addressbook/e-book-shell-view-actions.c:930
 msgid "D_elete Address Book"
 msgstr "_Izbriši imenik"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:887
+#: ../modules/addressbook/e-book-shell-view-actions.c:932
 msgid "Delete the selected address book"
 msgstr "Izbriše izbrani imenik"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:892
+#: ../modules/addressbook/e-book-shell-view-actions.c:937
 msgid "Mo_ve All Contacts To..."
 msgstr "Premakni _vse stike v ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:894
+#: ../modules/addressbook/e-book-shell-view-actions.c:939
 msgid "Move the contacts of the selected address book to another"
 msgstr "Premakne stike izbranega imenika v drug imenik"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:899
+#: ../modules/addressbook/e-book-shell-view-actions.c:944
 msgid "_New Address Book"
 msgstr "_Nov imenik"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:906
+#: ../modules/addressbook/e-book-shell-view-actions.c:951
 msgid "Address _Book Properties"
 msgstr "Lastnosti _imenika"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:908
+#: ../modules/addressbook/e-book-shell-view-actions.c:953
 msgid "Show properties of the selected address book"
 msgstr "Pokaže lastnosti izbranega imenika"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:913
-#: ../modules/calendar/e-cal-shell-view-actions.c:1413
-#: ../modules/calendar/e-memo-shell-view-actions.c:635
-#: ../modules/calendar/e-task-shell-view-actions.c:759
+#: ../modules/addressbook/e-book-shell-view-actions.c:958
+#: ../modules/calendar/e-cal-shell-view-actions.c:1254
+#: ../modules/calendar/e-memo-shell-view-actions.c:578
+#: ../modules/calendar/e-task-shell-view-actions.c:703
 msgid "Re_fresh"
 msgstr "_Osveži"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:915
+#: ../modules/addressbook/e-book-shell-view-actions.c:960
 msgid "Refresh the selected address book"
 msgstr "Osveži izbrani imenik"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:920
+#: ../modules/addressbook/e-book-shell-view-actions.c:965
 msgid "Address Book _Map"
 msgstr "Zemljevid _imenika"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:922
+#: ../modules/addressbook/e-book-shell-view-actions.c:967
 msgid "Show map with all contacts from selected address book"
 msgstr "Pokaži zemljevid z vsemi stiki izbranega imenika"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:927
-#: ../modules/calendar/e-cal-shell-view-actions.c:1420
-#: ../modules/calendar/e-memo-shell-view-actions.c:642
-#: ../modules/calendar/e-task-shell-view-actions.c:766
-#: ../modules/mail/e-mail-shell-view-actions.c:1610
+#: ../modules/addressbook/e-book-shell-view-actions.c:972
+#: ../modules/calendar/e-cal-shell-view-actions.c:1261
+#: ../modules/calendar/e-memo-shell-view-actions.c:585
+#: ../modules/calendar/e-task-shell-view-actions.c:710
+#: ../modules/mail/e-mail-shell-view-actions.c:1665
 msgid "_Rename..."
 msgstr "_Preimenuj ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:929
+#: ../modules/addressbook/e-book-shell-view-actions.c:974
 msgid "Rename the selected address book"
 msgstr "Preimenuje izbrani imenik"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:936
+#: ../modules/addressbook/e-book-shell-view-actions.c:981
 msgid "Stop loading"
 msgstr "Ustavi nalaganje"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:941
+#: ../modules/addressbook/e-book-shell-view-actions.c:986
 msgid "_Copy Contact To..."
 msgstr "_Kopiraj stik v..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:943
+#: ../modules/addressbook/e-book-shell-view-actions.c:988
 msgid "Copy selected contacts to another address book"
 msgstr "Kopira izbrane stike v drug imenik"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:948
+#: ../modules/addressbook/e-book-shell-view-actions.c:993
 msgid "_Delete Contact"
 msgstr "_Izbriši stik"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:955
+#: ../modules/addressbook/e-book-shell-view-actions.c:1000
 msgid "_Find in Contact..."
 msgstr "_Najdi v stiku ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:957
+#: ../modules/addressbook/e-book-shell-view-actions.c:1002
 msgid "Search for text in the displayed contact"
 msgstr "Poišči besedilo v prikazanem stiku"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:962
+#: ../modules/addressbook/e-book-shell-view-actions.c:1007
 msgid "_Forward Contact..."
 msgstr "_Posreduj stik ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:964
+#: ../modules/addressbook/e-book-shell-view-actions.c:1009
 msgid "Send selected contacts to another person"
 msgstr "Pošlje izbrane stike drugi osebi"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:969
+#: ../modules/addressbook/e-book-shell-view-actions.c:1014
 msgid "_Move Contact To..."
 msgstr "_Premakni stik v ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:971
+#: ../modules/addressbook/e-book-shell-view-actions.c:1016
 msgid "Move selected contacts to another address book"
 msgstr "Premakni izbrane stike v drug imenik"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:976
+#: ../modules/addressbook/e-book-shell-view-actions.c:1021
 msgid "_New Contact..."
 msgstr "_Nov stik ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:983
+#: ../modules/addressbook/e-book-shell-view-actions.c:1028
 msgid "New Contact _List..."
 msgstr "Nov _seznam stikov ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:990
+#: ../modules/addressbook/e-book-shell-view-actions.c:1035
 msgid "_Open Contact"
 msgstr "_Odpri stik"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:992
+#: ../modules/addressbook/e-book-shell-view-actions.c:1037
 msgid "View the current contact"
 msgstr "Ogled trenutnega stika"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:997
+#: ../modules/addressbook/e-book-shell-view-actions.c:1042
 msgid "_Send Message to Contact..."
 msgstr "Pošlji _sporočilo stiku ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:999
+#: ../modules/addressbook/e-book-shell-view-actions.c:1044
 msgid "Send a message to the selected contacts"
 msgstr "Pošlje sporočilo izbranim stikom"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1006
-#: ../modules/calendar/e-cal-shell-view-actions.c:1576
-#: ../modules/calendar/e-task-shell-view-actions.c:824
+#: ../modules/addressbook/e-book-shell-view-actions.c:1051
+#: ../modules/calendar/e-cal-shell-view-actions.c:1417
+#: ../modules/calendar/e-task-shell-view-actions.c:768
 msgid "_Actions"
 msgstr "_Dejanja"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1013
-#: ../modules/calendar/e-memo-shell-view-actions.c:679
-#: ../modules/calendar/e-task-shell-view-actions.c:831
-#: ../modules/mail/e-mail-shell-view-actions.c:1775
+#: ../modules/addressbook/e-book-shell-view-actions.c:1058
+#: ../modules/calendar/e-memo-shell-view-actions.c:622
+#: ../modules/calendar/e-task-shell-view-actions.c:775
+#: ../modules/mail/e-mail-shell-view-actions.c:1830
 msgid "_Preview"
 msgstr "_Predogled"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1034
+#: ../modules/addressbook/e-book-shell-view-actions.c:1079
 msgid "Address Book Map"
 msgstr "Zemljevid imenika"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1066
+#: ../modules/addressbook/e-book-shell-view-actions.c:1111
 msgid "Contact _Preview"
 msgstr "_Predogled stika"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1068
+#: ../modules/addressbook/e-book-shell-view-actions.c:1113
 msgid "Show contact preview window"
 msgstr "Pokaže okno s predogledom stika"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1074
+#: ../modules/addressbook/e-book-shell-view-actions.c:1119
 msgid "Show _Maps"
 msgstr "Pokaži _zemljevide"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1076
+#: ../modules/addressbook/e-book-shell-view-actions.c:1121
 msgid "Show maps in contact preview window"
 msgstr "Pokaže zemljevid v oknu predogleda stika"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1095
-#: ../modules/calendar/e-memo-shell-view-actions.c:749
-#: ../modules/calendar/e-task-shell-view-actions.c:913
-#: ../modules/mail/e-mail-shell-view-actions.c:1905
+#: ../modules/addressbook/e-book-shell-view-actions.c:1140
+#: ../modules/calendar/e-memo-shell-view-actions.c:692
+#: ../modules/calendar/e-task-shell-view-actions.c:857
+#: ../modules/mail/e-mail-shell-view-actions.c:1960
 msgid "_Classic View"
 msgstr "_Običajni pogled"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1097
+#: ../modules/addressbook/e-book-shell-view-actions.c:1142
 msgid "Show contact preview below the contact list"
 msgstr "Pokaži predogled stika pod seznamom stikov"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1102
-#: ../modules/calendar/e-memo-shell-view-actions.c:756
-#: ../modules/calendar/e-task-shell-view-actions.c:920
-#: ../modules/mail/e-mail-shell-view-actions.c:1912
+#: ../modules/addressbook/e-book-shell-view-actions.c:1147
+#: ../modules/calendar/e-memo-shell-view-actions.c:699
+#: ../modules/calendar/e-task-shell-view-actions.c:864
+#: ../modules/mail/e-mail-shell-view-actions.c:1967
 msgid "_Vertical View"
 msgstr "_Navpični pogled"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1104
+#: ../modules/addressbook/e-book-shell-view-actions.c:1149
 msgid "Show contact preview alongside the contact list"
 msgstr "Pokaži predogled stika ob seznamu stikov"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1119
-#: ../modules/calendar/e-cal-shell-view-actions.c:1753
-#: ../modules/calendar/e-memo-shell-view-actions.c:773
-#: ../modules/calendar/e-task-shell-view-actions.c:972
+#: ../modules/addressbook/e-book-shell-view-actions.c:1164
+#: ../modules/calendar/e-cal-shell-view-actions.c:1594
+#: ../modules/calendar/e-memo-shell-view-actions.c:716
+#: ../modules/calendar/e-task-shell-view-actions.c:916
 msgid "Unmatched"
 msgstr "Brez zadetka"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1129
-#: ../modules/calendar/e-cal-shell-view-actions.c:1763
-#: ../modules/calendar/e-memo-shell-view-actions.c:783
-#: ../modules/calendar/e-task-shell-view-actions.c:982
-#: ../modules/mail/e-mail-shell-view-actions.c:1981
+#: ../modules/addressbook/e-book-shell-view-actions.c:1174
+#: ../modules/calendar/e-cal-shell-view-actions.c:1604
+#: ../modules/calendar/e-memo-shell-view-actions.c:726
+#: ../modules/calendar/e-task-shell-view-actions.c:926
+#: ../modules/mail/e-mail-shell-view-actions.c:2036
 #: ../shell/e-shell-content.c:657
 msgid "Advanced Search"
 msgstr "Napredno iskanje"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1162
+#: ../modules/addressbook/e-book-shell-view-actions.c:1207
 msgid "Print all shown contacts"
 msgstr "Natisni vse prikazane stike"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1169
+#: ../modules/addressbook/e-book-shell-view-actions.c:1214
 msgid "Preview the contacts to be printed"
 msgstr "Predogled stikov pred tiskanjem"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1176
+#: ../modules/addressbook/e-book-shell-view-actions.c:1221
 msgid "Print selected contacts"
 msgstr "Natisni izbrane stike"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1191
+#: ../modules/addressbook/e-book-shell-view-actions.c:1236
 msgid "S_ave Address Book as vCard"
 msgstr "Shr_ani imenik kot VCard"
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1193
+#: ../modules/addressbook/e-book-shell-view-actions.c:1238
 msgid "Save the contacts of the selected address book as a vCard"
 msgstr "Shrani stike izbranega imenika kot VCard"
 
 #. Translators: This is an action label
-#: ../modules/addressbook/e-book-shell-view-actions.c:1199
-#: ../modules/addressbook/e-book-shell-view-actions.c:1209
+#: ../modules/addressbook/e-book-shell-view-actions.c:1244
+#: ../modules/addressbook/e-book-shell-view-actions.c:1254
 msgid "_Save as vCard..."
 msgstr "_Shrani kot vCard ..."
 
-#: ../modules/addressbook/e-book-shell-view-actions.c:1201
+#: ../modules/addressbook/e-book-shell-view-actions.c:1246
 msgid "Save selected contacts as a vCard"
 msgstr "Shrani izbrane stike kot VCard"
 
-#: ../modules/addressbook/e-book-shell-view.c:311
+#: ../modules/addressbook/e-book-shell-view.c:313
 msgid "_Forward Contacts"
 msgstr "Posreduj _stike"
 
-#: ../modules/addressbook/e-book-shell-view.c:313
+#: ../modules/addressbook/e-book-shell-view.c:315
 msgid "_Forward Contact"
 msgstr "P_osreduj stik"
 
-#: ../modules/addressbook/e-book-shell-view.c:344
+#: ../modules/addressbook/e-book-shell-view.c:346
 msgid "_Send Message to Contacts"
 msgstr "_Pošlji sporočilo stikom"
 
-#: ../modules/addressbook/e-book-shell-view.c:346
+#: ../modules/addressbook/e-book-shell-view.c:348
 msgid "_Send Message to List"
 msgstr "_Pošlji sporočilo seznamu"
 
-#: ../modules/addressbook/e-book-shell-view.c:348
+#: ../modules/addressbook/e-book-shell-view.c:350
 msgid "_Send Message to Contact"
 msgstr "_Pošlji sporočilo stiku"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:164
+#: ../modules/backup-restore/e-mail-config-restore-page.c:163
 msgid ""
 "You can restore Evolution from a backup file.\n"
 "\n"
@@ -16216,17 +18720,17 @@ msgstr ""
 "\n"
 "To bo obnovilo vse vaše osebne podatke, nastavitve, filtre sporočil, itd."
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:179
+#: ../modules/backup-restore/e-mail-config-restore-page.c:178
 msgid "_Restore from a backup file:"
 msgstr "_Obnovi iz varnostne kopije:"
 
-#: ../modules/backup-restore/e-mail-config-restore-page.c:190
+#: ../modules/backup-restore/e-mail-config-restore-page.c:189
 msgid "Choose a backup file to restore"
 msgstr "Izberite varnostno kopijo za obnovitev"
 
 #. Keep the title identical to EMailConfigRestorePage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/backup-restore/e-mail-config-restore-page.c:310
+#: ../modules/backup-restore/e-mail-config-restore-page.c:309
 #: ../modules/backup-restore/e-mail-config-restore-ready-page.c:56
 msgid "Restore from Backup"
 msgstr "Obnovi iz varnostne kopije"
@@ -16244,7 +18748,8 @@ msgid "Select name of the Evolution backup file to restore"
 msgstr "Izberite ime varnostne kopije za obnovitev"
 
 #: ../modules/backup-restore/evolution-backup-restore.c:289
-msgid "_Restart Evolution after restore"
+#, fuzzy
+msgid "Re_start Evolution after restore"
 msgstr "_Znova zaženi Evolution po obnovitvi"
 
 #: ../modules/backup-restore/evolution-backup-restore.c:307
@@ -16266,106 +18771,106 @@ msgid "Restore Evolution data and settings from an archive file"
 msgstr ""
 "Obnovi podatke in nastavitve iz varnostne kopije podatkov programa Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:83
+#: ../modules/backup-restore/evolution-backup-tool.c:75
 msgid "Back up Evolution directory"
 msgstr "Ustvari varnostno kopijo mape programa Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:85
+#: ../modules/backup-restore/evolution-backup-tool.c:77
 msgid "Restore Evolution directory"
 msgstr "Povrni mapo Evolutiona"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:87
+#: ../modules/backup-restore/evolution-backup-tool.c:79
 msgid "Check Evolution Back up"
 msgstr "Preveri varnostno kopijo Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:89
+#: ../modules/backup-restore/evolution-backup-tool.c:81
 msgid "Restart Evolution"
 msgstr "Znova zaženi Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:91
+#: ../modules/backup-restore/evolution-backup-tool.c:83
 msgid "With Graphical User Interface"
 msgstr "Z grafičnim uporabniškim vmesnikom"
 
 #. FIXME Will the versioned setting always work?
-#: ../modules/backup-restore/evolution-backup-tool.c:321
-#: ../modules/backup-restore/evolution-backup-tool.c:515
+#: ../modules/backup-restore/evolution-backup-tool.c:281
+#: ../modules/backup-restore/evolution-backup-tool.c:485
 msgid "Shutting down Evolution"
 msgstr "Izklapljanje programa Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:330
+#: ../modules/backup-restore/evolution-backup-tool.c:290
 msgid "Backing Evolution accounts and settings"
 msgstr "Varnostno kopiranje računov in nastavitev"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:347
+#: ../modules/backup-restore/evolution-backup-tool.c:307
 msgid "Backing Evolution data (Mails, Contacts, Calendar, Tasks, Memos)"
 msgstr ""
 "Varnostna kopija podatkov Evolution (pošta, imenik, koledar, naloge, "
 "zaznamki)"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:363
+#: ../modules/backup-restore/evolution-backup-tool.c:323
 msgid "Back up complete"
 msgstr "Varnostna kopija je uspešno ustvarjena"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:370
-#: ../modules/backup-restore/evolution-backup-tool.c:702
+#: ../modules/backup-restore/evolution-backup-tool.c:330
+#: ../modules/backup-restore/evolution-backup-tool.c:679
 msgid "Restarting Evolution"
 msgstr "Ponovni zagon programa Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:521
+#: ../modules/backup-restore/evolution-backup-tool.c:491
 msgid "Back up current Evolution data"
 msgstr "Ustvari varnostno kopijo trenutnih podatkov programa Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:528
+#: ../modules/backup-restore/evolution-backup-tool.c:498
 msgid "Extracting files from back up"
 msgstr "Razširjanje datotek iz varnostne kopije"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:610
+#: ../modules/backup-restore/evolution-backup-tool.c:580
 msgid "Loading Evolution settings"
 msgstr "Nalaganje nastavitev programa Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:676
+#: ../modules/backup-restore/evolution-backup-tool.c:650
 msgid "Removing temporary back up files"
 msgstr "Odstranjevanje začasnih datotek varnostnih kopij"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:687
+#: ../modules/backup-restore/evolution-backup-tool.c:664
 msgid "Reloading registry service"
 msgstr "Ponovno nalaganje storitve registra"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:916
+#: ../modules/backup-restore/evolution-backup-tool.c:867
 msgid "Evolution Back Up"
 msgstr "Varnostna kopija programa Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:917
+#: ../modules/backup-restore/evolution-backup-tool.c:868
 #, c-format
 msgid "Backing up to the folder %s"
 msgstr "Shranjevanje varnostne kopije v mapo %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:921
+#: ../modules/backup-restore/evolution-backup-tool.c:872
 msgid "Evolution Restore"
 msgstr "Obnavljanje Evolutiona"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:922
+#: ../modules/backup-restore/evolution-backup-tool.c:873
 #, c-format
 msgid "Restoring from the folder %s"
 msgstr "Obnavljanje podatkov iz mape %s"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:991
+#: ../modules/backup-restore/evolution-backup-tool.c:942
 msgid "Backing up Evolution Data"
 msgstr "Varnostna kopija podatkov programa Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:992
+#: ../modules/backup-restore/evolution-backup-tool.c:943
 msgid "Please wait while Evolution is backing up your data."
 msgstr "Počakajte, dokler program ne naredi varnostne kopije vaših podatkov."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:994
+#: ../modules/backup-restore/evolution-backup-tool.c:945
 msgid "Restoring Evolution Data"
 msgstr "Obnovitev podatkov programa Evolution"
 
-#: ../modules/backup-restore/evolution-backup-tool.c:995
+#: ../modules/backup-restore/evolution-backup-tool.c:946
 msgid "Please wait while Evolution is restoring your data."
 msgstr "Počakajte, dokler program ne obnovi vaših podatkov."
 
-#: ../modules/backup-restore/evolution-backup-tool.c:1017
+#: ../modules/backup-restore/evolution-backup-tool.c:968
 msgid "This may take a while depending on the amount of data in your account."
 msgstr ""
 "Postopek je lahko dolgotrajen, saj je odvisen od količine podatkov na vašemu "
@@ -16392,7 +18897,8 @@ msgstr ""
 "zapreti program Evolution. Najprej seveda shranite vse neshranjene podatke."
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:5
-msgid "Close and Back up Evolution"
+#, fuzzy
+msgid "Close and _Back up Evolution"
 msgstr "Zapri in ustvari varnostno kopijo podatkov programa Evolution"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:6
@@ -16415,7 +18921,8 @@ msgstr ""
 "varnostne kopije."
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:8
-msgid "Close and Restore Evolution"
+#, fuzzy
+msgid "Close and _Restore Evolution"
 msgstr "Zapri in obnovi program Evolution"
 
 #: ../modules/backup-restore/org-gnome-backup-restore.error.xml.h:9
@@ -16426,93 +18933,99 @@ msgstr "Nezadostna dovoljenja"
 msgid "The selected folder is not writable."
 msgstr "V izbrano mapo ni mogoče pisati."
 
-#: ../modules/bogofilter/evolution-bogofilter.c:144
+#: ../modules/bogofilter/evolution-bogofilter.c:161
 #, c-format
 msgid "Failed to spawn Bogofilter (%s): "
 msgstr "Oživitev vstavka Bogofilter je spodletela (%s): "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:162
+#: ../modules/bogofilter/evolution-bogofilter.c:179
 msgid "Failed to stream mail message content to Bogofilter: "
 msgstr ""
 "Pretakanje vsebine elektronskega sporočila na Bogofilter je spodletelo: "
 
-#: ../modules/bogofilter/evolution-bogofilter.c:211
+#: ../modules/bogofilter/evolution-bogofilter.c:228
 msgid "Bogofilter either crashed or failed to process a mail message"
 msgstr "Bogofilter se je ali sesul ali pa ni obdelal elektronskega sporočila"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:307
+#: ../modules/bogofilter/evolution-bogofilter.c:373
 msgid "Bogofilter Options"
 msgstr "Možnosti Bogofilter"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:316
+#: ../modules/bogofilter/evolution-bogofilter.c:382
 msgid "Convert message text to _Unicode"
 msgstr "Pretvori poštna sporočila v znakovni nabor _Unicode"
 
-#: ../modules/bogofilter/evolution-bogofilter.c:473
+#: ../modules/bogofilter/evolution-bogofilter.c:540
+#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:1
 msgid "Bogofilter"
 msgstr "Bogofilter"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:446
+#: ../modules/bogofilter/evolution-bogofilter.metainfo.xml.in.h:2
+#, fuzzy
+msgid "Junk filter using Bogofilter"
+msgstr "Filtriranje vsiljene pošte:"
+
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:441
 msgid "Standard LDAP Port"
 msgstr "Standardna vrata LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:452
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:447
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:619
 msgid "LDAP over SSL (deprecated)"
 msgstr "LDAP pred SSL (opuščeno)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:458
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:453
 msgid "Microsoft Global Catalog"
 msgstr "Katalog Microsoft Global"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:464
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:459
 msgid "Microsoft Global Catalog over SSL"
 msgstr "Katalog Microsoft Global preko SSL"
 
 #. Page 1
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:569
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:564
 msgid "Connecting to LDAP"
 msgstr "Povezovanje z LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:586
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:581
 msgid "Server Information"
 msgstr "Podrobnosti o strežniku"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:613
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:608
 msgid "Port:"
 msgstr "Vrata:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:627
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:622
 msgid "StartTLS (recommended)"
 msgstr "StartTLS (priporočeno)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:629
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:624
 msgid "Encryption:"
 msgstr "Šifriranje:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:653
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:648
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:245
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:179
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:195
 msgid "Authentication"
 msgstr "Overitev"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:676
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:671
 msgid "Anonymous"
 msgstr "Brezimno"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:674
 msgid "Using email address"
 msgstr "Z uporabo elektronskega naslova"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:682
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:677
 msgid "Using distinguished name (DN)"
 msgstr "Z uporabo razločnega imena (DN)"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:679
 msgid "Method:"
 msgstr "Način:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:689
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:684
 msgid ""
 "This is the method Evolution will use to authenticate you.  Note that "
 "setting this to \"Using email address\" requires anonymous access to your "
@@ -16523,36 +19036,36 @@ msgstr ""
 "strežnika LDAP."
 
 #. Page 2
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:704
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:699
 msgid "Using LDAP"
 msgstr "Uporaba LDAP"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:721
-#: ../modules/mail/e-mail-shell-view.c:115
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:716
+#: ../modules/mail/e-mail-shell-view.c:120
 msgid "Searching"
 msgstr "Iskanje"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:743
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:738
 msgid "Search Base:"
 msgstr "Osnova iskanja:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:747
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:742
 msgid "Find Possible Search Bases"
 msgstr "Najdi mogoče iskalne zbirke"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:769
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:764
 msgid "One Level"
 msgstr "Ena raven"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:771
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:766
 msgid "Subtree"
 msgstr "Poddrevo"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:768
 msgid "Search Scope:"
 msgstr "Obseg iskanja:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:778
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:773
 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 "
@@ -16563,28 +19076,28 @@ msgstr ""
 "\"podmapa\" vključi vse vnose pod vašo iskalno zbirko, obseg \"ena raven\" "
 "pa le vnose, ki so eno raven pod vašo zbirko."
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:787
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:782
 msgid "Search Filter:"
 msgstr "Filter iskanja:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:799
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:794
 msgid "Downloading"
 msgstr "Prejemanje"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:820
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:815
 msgid "Limit:"
 msgstr "Omejitev:"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:826
 msgid "contacts"
 msgstr "stiki"
 
-#: ../modules/book-config-ldap/evolution-book-config-ldap.c:836
+#: ../modules/book-config-ldap/evolution-book-config-ldap.c:831
 msgid "Browse until limit is reached"
 msgstr "Brskajte dokler ne dosežete omejitve"
 
 #: ../modules/book-config-webdav/evolution-book-config-webdav.c:135
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:204
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:220
 #: ../modules/cal-config-webcal/evolution-cal-config-webcal.c:127
 msgid "URL:"
 msgstr "Naslov URL:"
@@ -16593,61 +19106,70 @@ msgstr "Naslov URL:"
 msgid "Avoid IfMatch (needed on Apache < 2.2.8)"
 msgstr "Izogibajte se IfMatch (zahtevano na Apache < 2.2.8)"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:441
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:422
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:431
+#: ../modules/cal-config-google/e-google-chooser.c:424
+#: ../modules/cal-config-google/e-google-chooser.c:433
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "Napaka HTTP: %s"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:469
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:460
+#: ../modules/cal-config-google/e-google-chooser.c:462
 msgid "Could not parse response"
 msgstr "Ni mogoče razčleniti odgovora"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:478
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:469
+#: ../modules/cal-config-google/e-google-chooser.c:471
 msgid "Empty response"
 msgstr "Odziv brez vsebine"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:486
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:477
+#: ../modules/cal-config-google/e-google-chooser.c:479
 msgid "Unexpected reply from server"
 msgstr "Nepričakovan odgovor strežnika"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1118
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1099
+#: ../modules/cal-config-google/e-google-chooser.c:1101
 msgid "Could not locate user's calendars"
 msgstr "Uporbnikovega koledarja ni mogoče najti"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser.c:1342
+#: ../modules/cal-config-caldav/e-caldav-chooser.c:1321
 msgid "Path"
 msgstr "Pot"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:263
-#: ../modules/cal-config-google/e-google-chooser-dialog.c:199
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:348
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:348
 msgid "Choose a Calendar"
 msgstr "Izberite koledar"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:266
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:351
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:351
 msgid "Choose a Memo List"
 msgstr "Izberite seznam opomnikov"
 
-#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:269
+#: ../modules/cal-config-caldav/e-caldav-chooser-dialog.c:354
+#: ../modules/cal-config-google/e-google-chooser-dialog.c:354
 msgid "Choose a Task List"
 msgstr "Izberite seznam opravil"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:218
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:234
 msgid "Find Calendars"
 msgstr "Najdi koledarje"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:221
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:237
 msgid "Find Memo Lists"
 msgstr "Najdi sezname opomnikov"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:224
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:240
 msgid "Find Task Lists"
 msgstr "Najdi sezname nalog"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:242
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:258
 msgid "Email:"
 msgstr "Elektronski naslov:"
 
-#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:247
+#: ../modules/cal-config-caldav/evolution-cal-config-caldav.c:263
 msgid "Server handles meeting invitations"
 msgstr "Vabila za sestanke obravnava strežnik"
 
@@ -16655,23 +19177,14 @@ msgstr "Vabila za sestanke obravnava strežnik"
 msgid "Choose which address books to use."
 msgstr "Izberite, kateri imenik želite uporabljati."
 
-#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:200
+#: ../modules/cal-config-contacts/evolution-cal-config-contacts.c:203
 msgid "Use in Birthdays & Anniversaries calendar"
 msgstr "Uporabite v koledarju rojstnih dnevov in obletnic"
 
-#: ../modules/cal-config-google/e-google-chooser-button.c:126
+#: ../modules/cal-config-google/e-google-chooser-button.c:143
 msgid "Default User Calendar"
 msgstr "Privzeti uporabniški koledar"
 
-#: ../modules/cal-config-google/e-google-chooser.c:514
-#, c-format
-msgid "Enter Google password for user '%s'."
-msgstr "Vnesite geslo Google za uporabnika '%s'."
-
-#: ../modules/cal-config-google/e-google-chooser.c:531
-msgid "User declined to provide a password"
-msgstr "Uporabnik je zavrnil vnos gesla"
-
 #: ../modules/cal-config-local/evolution-cal-config-local.c:159
 msgid "Use an existing iCalendar (ics) file"
 msgstr "Uporabi obstoječo datoteko iCalendar (ics)"
@@ -16724,27 +19237,110 @@ msgstr "Kelvin (K)"
 msgid "Units:"
 msgstr "Enote:"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:319
+#: ../modules/calendar/e-cal-attachment-handler.c:287
 #: ../smime/gui/smime-ui.ui.h:9
 msgid "I_mport"
 msgstr "_Uvozi"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:405
+#: ../modules/calendar/e-cal-attachment-handler.c:337
+#, fuzzy
+msgid "Importing an event"
+msgstr "Uvažanje podatkov Pine"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:341
+#, fuzzy
+msgid "Importing a memo"
+msgstr "Uvažanje poštnega predala"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:345
+#, fuzzy
+msgid "Importing a task"
+msgstr "Uvažanje podatkov Elm"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:403
 msgid "Select a Calendar"
 msgstr "Izbor koledarja"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:432
+#: ../modules/calendar/e-cal-attachment-handler.c:410
+#, fuzzy
+msgid "Select a Memo List"
+msgstr "_Izbriši seznam opomnikov"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:417
 msgid "Select a Task List"
 msgstr "Izbor seznama nalog"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:442
+#: ../modules/calendar/e-cal-attachment-handler.c:424
 msgid "I_mport to Calendar"
 msgstr "Uvoz_i v koledar"
 
-#: ../modules/calendar/e-cal-attachment-handler.c:449
-msgid "I_mport to Tasks"
+#: ../modules/calendar/e-cal-attachment-handler.c:431
+#, fuzzy
+msgid "I_mport to Memo List"
+msgstr "Uvoz_i v naloge"
+
+#: ../modules/calendar/e-cal-attachment-handler.c:438
+#, fuzzy
+msgid "I_mport to Task List"
 msgstr "Uvoz_i v naloge"
 
+#: ../modules/calendar/e-cal-base-shell-backend.c:186
+#: ../modules/calendar/e-cal-shell-view-actions.c:162
+msgid "New Calendar"
+msgstr "Nov koledar"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:190
+#: ../modules/calendar/e-memo-shell-view-actions.c:164
+msgid "New Memo List"
+msgstr "Nov seznam opomnikov"
+
+#: ../modules/calendar/e-cal-base-shell-backend.c:194
+#: ../modules/calendar/e-task-shell-view-actions.c:187
+msgid "New Task List"
+msgstr "Nov seznam nalog"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:540
+#, fuzzy, c-format
+msgid "Copying an event into the calendar '%s'"
+msgstr "Kopiranje dogodka v koledar %s"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:541
+#, fuzzy, c-format
+msgid "Moving an event into the calendar '%s'"
+msgstr "Premikanje dogodka v koledar %s"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:546
+#, fuzzy, c-format
+msgid "Copying a memo into the memo list '%s'"
+msgstr "Kopiranje opomnika na seznam opomnikov '{0}'"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:547
+#, fuzzy, c-format
+msgid "Moving a memo into the memo list '%s'"
+msgstr "Premikanje opomnika na seznam opomnikov '{0}'"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:552
+#, fuzzy, c-format
+msgid "Copying a task into the task list '%s'"
+msgstr "Kopiranje naloge na seznam nalog '{0}'"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:553
+#, fuzzy, c-format
+msgid "Moving a task into the task list '%s'"
+msgstr "Premikanje naloge na seznam nalog '{0}'"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:650
+msgid "Calendar Selector"
+msgstr "Izbirnik koledarjev"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:656
+msgid "Memo List Selector"
+msgstr "Izbirnik seznama opomnikov"
+
+#: ../modules/calendar/e-cal-base-shell-sidebar.c:661
+msgid "Task List Selector"
+msgstr "Izbirnik seznama nalog"
+
 #: ../modules/calendar/e-calendar-preferences.c:516
 msgid "Selected Calendars for Alarms"
 msgstr "Izbrani koledarji za alarme"
@@ -16814,7 +19410,7 @@ msgid "_24 hour"
 msgstr "_24 urna"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:18
-#: ../modules/calendar/e-cal-shell-view-actions.c:1715
+#: ../modules/calendar/e-cal-shell-view-actions.c:1556
 msgid "Work Week"
 msgstr "Delovni teden"
 
@@ -16870,13 +19466,10 @@ msgstr "_ned"
 msgid "Day _ends:"
 msgstr "Konec dn_eva:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:45
-msgid "Alerts"
-msgstr "Opozorila"
-
-#: ../modules/calendar/e-calendar-preferences.ui.h:46
-msgid "_Ask for confirmation when deleting items"
-msgstr "_Vprašaj za potrditev ob brisanju predmetov"
+#: ../modules/calendar/e-calendar-preferences.ui.h:47
+#, fuzzy
+msgid "View Options"
+msgstr "Možnosti pošiljanja"
 
 #: ../modules/calendar/e-calendar-preferences.ui.h:48
 msgid "_Time divisions:"
@@ -16903,139 +19496,132 @@ msgstr ""
 msgid "Sc_roll Month View by a week"
 msgstr "D_rsenje po tednih v mesečnem pogledu"
 
+#: ../modules/calendar/e-calendar-preferences.ui.h:54
+msgid "Alerts"
+msgstr "Opozorila"
+
 #: ../modules/calendar/e-calendar-preferences.ui.h:55
+msgid "_Ask for confirmation when deleting items"
+msgstr "_Vprašaj za potrditev ob brisanju predmetov"
+
+#: ../modules/calendar/e-calendar-preferences.ui.h:56
 msgid "Display"
 msgstr "Pokaži"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:56
+#: ../modules/calendar/e-calendar-preferences.ui.h:57
 msgid "Task List"
 msgstr "Seznam nalog"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:57
+#: ../modules/calendar/e-calendar-preferences.ui.h:58
 msgid "Highlight t_asks due today"
 msgstr "Poudari naloge, ki zakasnijo danes"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:59
+#: ../modules/calendar/e-calendar-preferences.ui.h:60
 msgid "Highlight _overdue tasks"
 msgstr "Poudari zakasnele naloge"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:60
+#: ../modules/calendar/e-calendar-preferences.ui.h:61
 msgid "_Hide completed tasks after"
 msgstr "_Skrij opravljene naloge po"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:63
+#: ../modules/calendar/e-calendar-preferences.ui.h:64
 msgid "Display reminders in _notification area only"
 msgstr "Prikaži opomnike v obvestilnem p_odročju"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:65
+#: ../modules/calendar/e-calendar-preferences.ui.h:66
 msgid "Sh_ow a reminder"
 msgstr "Pokaži _opomnik"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every appointment"
-#: ../modules/calendar/e-calendar-preferences.ui.h:67
+#: ../modules/calendar/e-calendar-preferences.ui.h:68
 msgid "before every appointment"
 msgstr "pred vsakim sestankom"
 
 #. This is the first half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:69
+#: ../modules/calendar/e-calendar-preferences.ui.h:70
 msgid "Show a _reminder"
 msgstr "Pokaži o_pomnik"
 
 #. This is the last half of a user preference. "Show a reminder [time-period] before every 
anniversary/birthday"
-#: ../modules/calendar/e-calendar-preferences.ui.h:71
+#: ../modules/calendar/e-calendar-preferences.ui.h:72
 msgid "before every anniversary/birthday"
 msgstr "pred vsako obletnico ali rojstnim dnem"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:72
+#: ../modules/calendar/e-calendar-preferences.ui.h:73
 msgid "Select the calendars for reminder notification"
 msgstr "Izberite koledarje za obvestila opomnikov"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:73
+#: ../modules/calendar/e-calendar-preferences.ui.h:74
 msgid "Default Free/Busy Server"
 msgstr "Privzet strežnik zasedenosti"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:74
+#: ../modules/calendar/e-calendar-preferences.ui.h:75
 msgid "Template:"
 msgstr "Predloga:"
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:76
+#: ../modules/calendar/e-calendar-preferences.ui.h:77
 #, no-c-format
 msgid "%u and %d will be replaced by user and domain from the email address."
 msgstr ""
 "%u in %d bosta zamenjana s podatki uporabnika in domene iz elektronskega "
 "naslova."
 
-#: ../modules/calendar/e-calendar-preferences.ui.h:77
+#: ../modules/calendar/e-calendar-preferences.ui.h:78
 msgid "Publishing Information"
 msgstr "Objavi podrobnosti"
 
-#: ../modules/calendar/e-cal-shell-backend.c:312
-#: ../modules/calendar/e-cal-shell-view-actions.c:190
-msgid "New Calendar"
-msgstr "Nov koledar"
-
-#: ../modules/calendar/e-cal-shell-backend.c:321
+#: ../modules/calendar/e-cal-shell-backend.c:114
 msgctxt "New"
 msgid "_Appointment"
 msgstr "_Sestanek"
 
-#: ../modules/calendar/e-cal-shell-backend.c:323
-#: ../modules/calendar/e-cal-shell-view-actions.c:1520
+#: ../modules/calendar/e-cal-shell-backend.c:116
+#: ../modules/calendar/e-cal-shell-view-actions.c:1361
 msgid "Create a new appointment"
 msgstr "Ustvari nov sestanek"
 
-#: ../modules/calendar/e-cal-shell-backend.c:328
+#: ../modules/calendar/e-cal-shell-backend.c:121
 msgctxt "New"
 msgid "All Day A_ppointment"
 msgstr "Celodnevni _sestanek"
 
-#: ../modules/calendar/e-cal-shell-backend.c:330
+#: ../modules/calendar/e-cal-shell-backend.c:123
 msgid "Create a new all-day appointment"
 msgstr "Ustvari nov celodnevni sestanek"
 
-#: ../modules/calendar/e-cal-shell-backend.c:335
+#: ../modules/calendar/e-cal-shell-backend.c:128
 msgctxt "New"
 msgid "M_eeting"
 msgstr "S_rečanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:337
+#: ../modules/calendar/e-cal-shell-backend.c:130
 msgid "Create a new meeting request"
 msgstr "Ustvari nov zahtevek za srečanje"
 
-#: ../modules/calendar/e-cal-shell-backend.c:345
+#: ../modules/calendar/e-cal-shell-backend.c:138
 msgctxt "New"
 msgid "Cale_ndar"
 msgstr "_Koledar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:347
-#: ../modules/calendar/e-cal-shell-view-actions.c:1394
+#: ../modules/calendar/e-cal-shell-backend.c:140
+#: ../modules/calendar/e-cal-shell-view-actions.c:1235
 msgid "Create a new calendar"
 msgstr "Ustvari nov koledar"
 
-#: ../modules/calendar/e-cal-shell-backend.c:702
+#: ../modules/calendar/e-cal-shell-backend.c:257
 msgid "Calendar and Tasks"
 msgstr "Koledar in naloge"
 
-#: ../modules/calendar/e-cal-shell-sidebar.c:118
-#, c-format
-msgid "Opening calendar '%s'"
-msgstr "Odpiranje koledarja '%s'"
-
-#: ../modules/calendar/e-cal-shell-sidebar.c:589
-msgid "Calendar Selector"
-msgstr "Izbirnik koledarjev"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:215
-#: ../modules/calendar/e-cal-shell-view-actions.c:244
+#: ../modules/calendar/e-cal-shell-view-actions.c:181
 msgid "Print"
 msgstr "Natisni"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:290
+#: ../modules/calendar/e-cal-shell-view-actions.c:267
 msgid "Calendar Properties"
 msgstr "Lastnosti koledarja"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:321
+#: ../modules/calendar/e-cal-shell-view-actions.c:296
 msgid ""
 "This operation will permanently erase all events older than the selected "
 "amount of time. If you continue, you will not be able to recover these "
@@ -17047,355 +19633,352 @@ msgstr ""
 
 #. Translators: This is the first part of the sentence:
 #. * "Purge events older than <<spin-button>> days"
-#: ../modules/calendar/e-cal-shell-view-actions.c:338
+#: ../modules/calendar/e-cal-shell-view-actions.c:313
 msgid "Purge events older than"
 msgstr "Počisti dogodke starejše kot"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:584
-msgid "Copying Items"
-msgstr "Kopiranje predmetov"
-
-#: ../modules/calendar/e-cal-shell-view-actions.c:877
-msgid "Moving Items"
-msgstr "Premikanje predmetov"
+#: ../modules/calendar/e-cal-shell-view-actions.c:895
+#, fuzzy
+msgid "Making an occurrence movable"
+msgstr "Naredi to pojavitev _premakljivo"
 
 #. Translators: Default filename part saving an event to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it.
-#: ../modules/calendar/e-cal-shell-view-actions.c:1210
+#: ../modules/calendar/e-cal-shell-view-actions.c:1055
 msgid "event"
 msgstr "dogodek"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1212
-#: ../modules/calendar/e-cal-shell-view-memopad.c:230
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:297
-#: ../modules/calendar/e-memo-shell-view-actions.c:526
-#: ../modules/calendar/e-task-shell-view-actions.c:643
+#: ../modules/calendar/e-cal-shell-view-actions.c:1057
+#: ../modules/calendar/e-cal-shell-view-memopad.c:208
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:276
+#: ../modules/calendar/e-memo-shell-view-actions.c:469
+#: ../modules/calendar/e-task-shell-view-actions.c:587
 msgid "Save as iCalendar"
 msgstr "Shrani kot iCalendar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1350
-#: ../modules/calendar/e-memo-shell-view-actions.c:607
-#: ../modules/calendar/e-task-shell-view-actions.c:731
+#: ../modules/calendar/e-cal-shell-view-actions.c:1191
+#: ../modules/calendar/e-memo-shell-view-actions.c:550
+#: ../modules/calendar/e-task-shell-view-actions.c:675
 msgid "_Copy..."
 msgstr "_Kopiraj ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1357
+#: ../modules/calendar/e-cal-shell-view-actions.c:1198
 msgid "D_elete Calendar"
 msgstr "_Izbriši koledar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1359
+#: ../modules/calendar/e-cal-shell-view-actions.c:1200
 msgid "Delete the selected calendar"
 msgstr "Izbriše izbrani koledar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1366
+#: ../modules/calendar/e-cal-shell-view-actions.c:1207
 msgid "Go Back"
 msgstr "Pojdi nazaj"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1373
+#: ../modules/calendar/e-cal-shell-view-actions.c:1214
 msgid "Go Forward"
 msgstr "Pojdi naprej"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1380
+#: ../modules/calendar/e-cal-shell-view-actions.c:1221
 msgid "Select today"
 msgstr "Izbere danes"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1385
+#: ../modules/calendar/e-cal-shell-view-actions.c:1226
 msgid "Select _Date"
 msgstr "Izberi _datum"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1387
+#: ../modules/calendar/e-cal-shell-view-actions.c:1228
 msgid "Select a specific date"
 msgstr "Izberi določen datum"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1392
+#: ../modules/calendar/e-cal-shell-view-actions.c:1233
 msgid "_New Calendar"
 msgstr "_Nov koledar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1406
-#: ../modules/calendar/e-task-shell-view-actions.c:815
+#: ../modules/calendar/e-cal-shell-view-actions.c:1247
+#: ../modules/calendar/e-task-shell-view-actions.c:759
 msgid "Purg_e"
 msgstr "Poč_isti"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1408
+#: ../modules/calendar/e-cal-shell-view-actions.c:1249
 msgid "Purge old appointments and meetings"
 msgstr "Počisti stare sestanke in srečanja"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1415
+#: ../modules/calendar/e-cal-shell-view-actions.c:1256
 msgid "Refresh the selected calendar"
 msgstr "Osveži izbrani koledar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1422
+#: ../modules/calendar/e-cal-shell-view-actions.c:1263
 msgid "Rename the selected calendar"
 msgstr "Preimenuj izbrani koledar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1427
+#: ../modules/calendar/e-cal-shell-view-actions.c:1268
 msgid "Find _Next"
 msgstr "Najdi _naslednje"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1429
+#: ../modules/calendar/e-cal-shell-view-actions.c:1270
 msgid "Find next occurrence of the current search string"
 msgstr "Najde naslednjo pojavitev trenutnega iskalnega niza"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1434
+#: ../modules/calendar/e-cal-shell-view-actions.c:1275
 msgid "Find _Previous"
 msgstr "Najdi _predhodno"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1436
+#: ../modules/calendar/e-cal-shell-view-actions.c:1277
 msgid "Find previous occurrence of the current search string"
 msgstr "Najde predhodno pojavitev trenutnega iskalnega niza"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1441
+#: ../modules/calendar/e-cal-shell-view-actions.c:1282
 msgid "Stop _Running Search"
 msgstr "Zaustavi _trenutno iskanje"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1443
+#: ../modules/calendar/e-cal-shell-view-actions.c:1284
 msgid "Stop currently running search"
 msgstr "Ustavi trenutno izvajajoče se iskanje"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1448
+#: ../modules/calendar/e-cal-shell-view-actions.c:1289
 msgid "Show _Only This Calendar"
 msgstr "Pokaži _le ta koledar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1455
+#: ../modules/calendar/e-cal-shell-view-actions.c:1296
 msgid "Cop_y to Calendar..."
 msgstr "Kopiraj v _koledar ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1462
+#: ../modules/calendar/e-cal-shell-view-actions.c:1303
 msgid "_Delegate Meeting..."
 msgstr "_Poblaščeno zastopanje srečanja..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1469
+#: ../modules/calendar/e-cal-shell-view-actions.c:1310
 msgid "_Delete Appointment"
 msgstr "_Izbriši sestanek"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1471
+#: ../modules/calendar/e-cal-shell-view-actions.c:1312
 msgid "Delete selected appointments"
 msgstr "Izbriše izbrane sestanke"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1476
+#: ../modules/calendar/e-cal-shell-view-actions.c:1317
 msgid "Delete This _Occurrence"
 msgstr "Izbriši to _pojavitev"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1478
+#: ../modules/calendar/e-cal-shell-view-actions.c:1319
 msgid "Delete this occurrence"
 msgstr "Izbriše to pojavitev"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1483
+#: ../modules/calendar/e-cal-shell-view-actions.c:1324
 msgid "Delete All Occ_urrences"
 msgstr "Izbriši _vse pojavitve"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1485
+#: ../modules/calendar/e-cal-shell-view-actions.c:1326
 msgid "Delete all occurrences"
 msgstr "Zbriše vse pojavitve"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1490
+#: ../modules/calendar/e-cal-shell-view-actions.c:1331
 msgid "New All Day _Event..."
 msgstr "Nov _celodnevni dogodek ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1492
+#: ../modules/calendar/e-cal-shell-view-actions.c:1333
 msgid "Create a new all day event"
 msgstr "Ustvari nov celodnevni sestanek"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1497
-#: ../modules/calendar/e-cal-shell-view-memopad.c:264
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
-#: ../modules/calendar/e-memo-shell-view-actions.c:600
-#: ../modules/calendar/e-task-shell-view-actions.c:724
+#: ../modules/calendar/e-cal-shell-view-actions.c:1338
+#: ../modules/calendar/e-cal-shell-view-memopad.c:242
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:316
+#: ../modules/calendar/e-memo-shell-view-actions.c:543
+#: ../modules/calendar/e-task-shell-view-actions.c:668
 msgid "_Forward as iCalendar..."
 msgstr "_Posreduj kot iCalendar  ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1504
+#: ../modules/calendar/e-cal-shell-view-actions.c:1345
 msgid "New _Meeting..."
 msgstr "Novo _srečanje ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1506
+#: ../modules/calendar/e-cal-shell-view-actions.c:1347
 msgid "Create a new meeting"
 msgstr "Ustvari novo srečanje"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1511
+#: ../modules/calendar/e-cal-shell-view-actions.c:1352
 msgid "Mo_ve to Calendar..."
 msgstr "Premakni _v koledar ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1518
+#: ../modules/calendar/e-cal-shell-view-actions.c:1359
 msgid "New _Appointment..."
 msgstr "Nov _sestanek ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1525
+#: ../modules/calendar/e-cal-shell-view-actions.c:1366
 msgid "Make this Occurrence _Movable"
 msgstr "Naredi to pojavitev _premakljivo"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1532
+#: ../modules/calendar/e-cal-shell-view-actions.c:1373
 msgid "_Open Appointment"
 msgstr "_Odpri sestanek"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1534
+#: ../modules/calendar/e-cal-shell-view-actions.c:1375
 msgid "View the current appointment"
 msgstr "Ogled trenutnega sestanka"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1539
+#: ../modules/calendar/e-cal-shell-view-actions.c:1380
 msgid "_Reply"
 msgstr "Odgovo_ri"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1553
+#: ../modules/calendar/e-cal-shell-view-actions.c:1394
 msgid "_Schedule Meeting..."
 msgstr "_Načrtuj srečanje ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1555
+#: ../modules/calendar/e-cal-shell-view-actions.c:1396
 msgid "Converts an appointment to a meeting"
 msgstr "Pretvori sestanek v srečanje"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1560
+#: ../modules/calendar/e-cal-shell-view-actions.c:1401
 msgid "Conv_ert to Appointment..."
 msgstr "_Pretvori v sestanek ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1562
+#: ../modules/calendar/e-cal-shell-view-actions.c:1403
 msgid "Converts a meeting to an appointment"
 msgstr "Pretvori srečanje v sestanek"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1567
+#: ../modules/calendar/e-cal-shell-view-actions.c:1408
 msgid "Quit"
 msgstr "Končaj"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1687
+#: ../modules/calendar/e-cal-shell-view-actions.c:1528
 msgid "Day"
 msgstr "Dan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1689
+#: ../modules/calendar/e-cal-shell-view-actions.c:1530
 msgid "Show one day"
 msgstr "Pokaži en dan"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1694
+#: ../modules/calendar/e-cal-shell-view-actions.c:1535
 msgid "List"
 msgstr "Seznam"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1696
+#: ../modules/calendar/e-cal-shell-view-actions.c:1537
 msgid "Show as list"
 msgstr "Pokaži kot seznam"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1701
+#: ../modules/calendar/e-cal-shell-view-actions.c:1542
 msgid "Month"
 msgstr "Mesec"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1703
+#: ../modules/calendar/e-cal-shell-view-actions.c:1544
 msgid "Show one month"
 msgstr "Pokaži en mesec"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1708
+#: ../modules/calendar/e-cal-shell-view-actions.c:1549
 msgid "Week"
 msgstr "Teden"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1710
+#: ../modules/calendar/e-cal-shell-view-actions.c:1551
 msgid "Show one week"
 msgstr "Pokaži en teden"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1717
+#: ../modules/calendar/e-cal-shell-view-actions.c:1558
 msgid "Show one work week"
 msgstr "Pokaži en delovni teden"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1725
+#: ../modules/calendar/e-cal-shell-view-actions.c:1566
 msgid "Active Appointments"
 msgstr "Dejavni sestanki"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1739
+#: ../modules/calendar/e-cal-shell-view-actions.c:1580
 msgid "Next 7 Days' Appointments"
 msgstr "Sestanki naslednjih 7 dni"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1746
+#: ../modules/calendar/e-cal-shell-view-actions.c:1587
 msgid "Occurs Less Than 5 Times"
 msgstr "Ponovi se manj kot petkrat"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1777
-#: ../modules/calendar/e-memo-shell-view-actions.c:797
-#: ../modules/calendar/e-task-shell-view-actions.c:996
+#: ../modules/calendar/e-cal-shell-view-actions.c:1618
+#: ../modules/calendar/e-memo-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:940
 msgid "Description contains"
 msgstr "Opis vsebuje"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1784
-#: ../modules/calendar/e-memo-shell-view-actions.c:804
-#: ../modules/calendar/e-task-shell-view-actions.c:1003
+#: ../modules/calendar/e-cal-shell-view-actions.c:1625
+#: ../modules/calendar/e-memo-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-view-actions.c:947
 msgid "Summary contains"
 msgstr "Povzetek vsebuje"
 
-#: ../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
+#: ../modules/calendar/e-cal-shell-view-actions.c:1635
+#: ../modules/calendar/e-cal-shell-view-actions.c:1649
+#: ../modules/calendar/e-cal-shell-view-memopad.c:273
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:361
+#: ../modules/calendar/e-memo-shell-view-actions.c:757
+#: ../modules/calendar/e-memo-shell-view-actions.c:771
+#: ../modules/calendar/e-task-shell-view-actions.c:957
+#: ../modules/calendar/e-task-shell-view-actions.c:971
 msgid "Print..."
 msgstr "Natisni ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1796
+#: ../modules/calendar/e-cal-shell-view-actions.c:1637
 msgid "Print this calendar"
 msgstr "Natisni ta koledar"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1803
+#: ../modules/calendar/e-cal-shell-view-actions.c:1644
 msgid "Preview the calendar to be printed"
 msgstr "Predogled koledarja pred tiskanjem"
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1825
-#: ../modules/calendar/e-cal-shell-view-memopad.c:305
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:392
-#: ../modules/calendar/e-memo-shell-view-actions.c:845
-#: ../modules/calendar/e-task-shell-view-actions.c:1044
+#: ../modules/calendar/e-cal-shell-view-actions.c:1666
+#: ../modules/calendar/e-cal-shell-view-memopad.c:283
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:371
+#: ../modules/calendar/e-memo-shell-view-actions.c:788
+#: ../modules/calendar/e-task-shell-view-actions.c:988
 msgid "_Save as iCalendar..."
 msgstr "_Shrani kot iCalendar ..."
 
-#: ../modules/calendar/e-cal-shell-view-actions.c:1902
+#: ../modules/calendar/e-cal-shell-view-actions.c:1743
 msgid "Go To"
 msgstr "Pojdi 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:228
-#: ../modules/calendar/e-memo-shell-view-actions.c:524
+#: ../modules/calendar/e-cal-shell-view-memopad.c:206
+#: ../modules/calendar/e-memo-shell-view-actions.c:467
 msgid "memo"
 msgstr "opomnik"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:271
-#: ../modules/calendar/e-memo-shell-view-actions.c:656
+#: ../modules/calendar/e-cal-shell-view-memopad.c:249
+#: ../modules/calendar/e-memo-shell-view-actions.c:599
 msgid "New _Memo"
 msgstr "Nov _opomnik"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:273
-#: ../modules/calendar/e-memo-shell-backend.c:218
-#: ../modules/calendar/e-memo-shell-view-actions.c:658
+#: ../modules/calendar/e-cal-shell-view-memopad.c:251
+#: ../modules/calendar/e-memo-shell-backend.c:65
+#: ../modules/calendar/e-memo-shell-view-actions.c:601
 msgid "Create a new memo"
 msgstr "Ustvari nov opomnik"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:278
-#: ../modules/calendar/e-memo-shell-view-actions.c:663
+#: ../modules/calendar/e-cal-shell-view-memopad.c:256
+#: ../modules/calendar/e-memo-shell-view-actions.c:606
 msgid "_Open Memo"
 msgstr "_Odpri opomnik"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:280
-#: ../modules/calendar/e-memo-shell-view-actions.c:665
+#: ../modules/calendar/e-cal-shell-view-memopad.c:258
+#: ../modules/calendar/e-memo-shell-view-actions.c:608
 msgid "View the selected memo"
 msgstr "Ogled izbranega opomnika"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:285
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:372
-#: ../modules/calendar/e-memo-shell-view-actions.c:670
-#: ../modules/calendar/e-task-shell-view-actions.c:808
+#: ../modules/calendar/e-cal-shell-view-memopad.c:263
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
+#: ../modules/calendar/e-memo-shell-view-actions.c:613
+#: ../modules/calendar/e-task-shell-view-actions.c:752
 msgid "Open _Web Page"
 msgstr "Odpri _spletno stran"
 
-#: ../modules/calendar/e-cal-shell-view-memopad.c:297
-#: ../modules/calendar/e-memo-shell-view-actions.c:830
+#: ../modules/calendar/e-cal-shell-view-memopad.c:275
+#: ../modules/calendar/e-memo-shell-view-actions.c:773
 msgid "Print the selected memo"
 msgstr "Natisni izbrani opomnik"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1561
+#: ../modules/calendar/e-cal-shell-view-private.c:810
 msgid "Searching next matching event"
 msgstr "Iskanje naslednjega ujemajočega se dogodka"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1562
+#: ../modules/calendar/e-cal-shell-view-private.c:811
 msgid "Searching previous matching event"
 msgstr "Iskanje prehodnega ujemajočega se dogodka"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1583
+#: ../modules/calendar/e-cal-shell-view-private.c:832
 #, c-format
 msgid "Cannot find matching event in the next %d year"
 msgid_plural "Cannot find matching event in the next %d years"
@@ -17404,7 +19987,7 @@ msgstr[1] "Ni mogoče najti ujemajočega dogodka v naslednjem %d letu"
 msgstr[2] "Ni mogoče najti ujemajočega dogodka v naslednjih %d letih"
 msgstr[3] "Ni mogoče najti ujemajočega dogodka v naslednjih %d letih"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1587
+#: ../modules/calendar/e-cal-shell-view-private.c:836
 #, c-format
 msgid "Cannot find matching event in the previous %d year"
 msgid_plural "Cannot find matching event in the previous %d years"
@@ -17413,7 +19996,7 @@ msgstr[1] "Ni mogoče najti ujemajočega dogodka v predhodnem %d letu"
 msgstr[2] "Ni mogoče najti ujemajočega dogodka v predhodnih %d letih"
 msgstr[3] "Ni mogoče najti ujemajočega dogodka v predhodnih %d letih"
 
-#: ../modules/calendar/e-cal-shell-view-private.c:1612
+#: ../modules/calendar/e-cal-shell-view-private.c:859
 msgid "Cannot search with no active calendar"
 msgstr "Ni mogoče iskati brez dejavnega koledarja"
 
@@ -17421,177 +20004,163 @@ msgstr "Ni mogoče iskati brez dejavnega koledarja"
 #. * no summary is filed, the '.ics' extension is concatenated to it.
 #. Translators: Default filename part saving a task to a file when
 #. * no summary is filed, the '.ics' extension is concatenated to it
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:295
-#: ../modules/calendar/e-task-shell-view-actions.c:641
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:274
+#: ../modules/calendar/e-task-shell-view-actions.c:585
 msgid "task"
 msgstr "naloga"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
-#: ../modules/calendar/e-task-shell-view-actions.c:703
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:309
+#: ../modules/calendar/e-task-shell-view-actions.c:647
 msgid "_Assign Task"
 msgstr "Dodeli _nalogo"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
-#: ../modules/calendar/e-task-shell-view-actions.c:780
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:323
+#: ../modules/calendar/e-task-shell-view-actions.c:724
 msgid "_Mark as Complete"
 msgstr "_Označi kot opravljeno"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
-#: ../modules/calendar/e-task-shell-view-actions.c:782
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:325
+#: ../modules/calendar/e-task-shell-view-actions.c:726
 msgid "Mark selected tasks as complete"
 msgstr "Označi izbrane naloge kot opravljene"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:351
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:330
 msgid "_Mark as Incomplete"
 msgstr "_Označi kot nedokončano"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:353
-#: ../modules/calendar/e-task-shell-view-actions.c:789
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:332
+#: ../modules/calendar/e-task-shell-view-actions.c:733
 msgid "Mark selected tasks as incomplete"
 msgstr "Označi izbrane naloge kot nedokončane"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:358
-#: ../modules/calendar/e-task-shell-view-actions.c:794
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:337
+#: ../modules/calendar/e-task-shell-view-actions.c:738
 msgid "New _Task"
 msgstr "Nova _naloga"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:360
-#: ../modules/calendar/e-task-shell-backend.c:215
-#: ../modules/calendar/e-task-shell-view-actions.c:796
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:339
+#: ../modules/calendar/e-task-shell-backend.c:64
+#: ../modules/calendar/e-task-shell-view-actions.c:740
 msgid "Create a new task"
 msgstr "Ustvari novo nalogo"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:365
-#: ../modules/calendar/e-task-shell-view-actions.c:801
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:344
+#: ../modules/calendar/e-task-shell-view-actions.c:745
 msgid "_Open Task"
 msgstr "_Odpri nalogo"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:367
-#: ../modules/calendar/e-task-shell-view-actions.c:803
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:346
+#: ../modules/calendar/e-task-shell-view-actions.c:747
 msgid "View the selected task"
 msgstr "Pogled izbrane naloge"
 
-#: ../modules/calendar/e-cal-shell-view-taskpad.c:384
-#: ../modules/calendar/e-task-shell-view-actions.c:1029
+#: ../modules/calendar/e-cal-shell-view-taskpad.c:363
+#: ../modules/calendar/e-task-shell-view-actions.c:973
 msgid "Print the selected task"
 msgstr "Natisni izbrano nalogo"
 
-#: ../modules/calendar/e-memo-shell-backend.c:207
-#: ../modules/calendar/e-memo-shell-view-actions.c:195
-msgid "New Memo List"
-msgstr "Nov seznam opomnikov"
-
-#: ../modules/calendar/e-memo-shell-backend.c:216
+#: ../modules/calendar/e-memo-shell-backend.c:63
 msgctxt "New"
 msgid "Mem_o"
 msgstr "_Opomnik"
 
-#: ../modules/calendar/e-memo-shell-backend.c:223
+#: ../modules/calendar/e-memo-shell-backend.c:70
 msgctxt "New"
 msgid "_Shared Memo"
 msgstr "_Souporabljen opomnik"
 
-#: ../modules/calendar/e-memo-shell-backend.c:225
+#: ../modules/calendar/e-memo-shell-backend.c:72
 msgid "Create a new shared memo"
 msgstr "Ustvari nov souporabljen opomnik"
 
-#: ../modules/calendar/e-memo-shell-backend.c:233
+#: ../modules/calendar/e-memo-shell-backend.c:80
 msgctxt "New"
 msgid "Memo Li_st"
 msgstr "_Seznam opomnikov"
 
-#: ../modules/calendar/e-memo-shell-backend.c:235
-#: ../modules/calendar/e-memo-shell-view-actions.c:623
+#: ../modules/calendar/e-memo-shell-backend.c:82
+#: ../modules/calendar/e-memo-shell-view-actions.c:566
 msgid "Create a new memo list"
 msgstr "Ustvari nov seznam opomnikov"
 
-#: ../modules/calendar/e-memo-shell-sidebar.c:116
-#, c-format
-msgid "Opening memo list '%s'"
-msgstr "Odpiranje seznama opomnikov '%s'"
-
-#: ../modules/calendar/e-memo-shell-sidebar.c:545
-msgid "Memo List Selector"
-msgstr "Izbirnik seznama opomnikov"
-
-#: ../modules/calendar/e-memo-shell-view-actions.c:211
-#: ../modules/calendar/e-memo-shell-view-actions.c:226
+#: ../modules/calendar/e-memo-shell-view-actions.c:180
+#: ../modules/calendar/e-memo-shell-view-actions.c:195
 msgid "Print Memos"
 msgstr "Natisni opomnike"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:267
+#: ../modules/calendar/e-memo-shell-view-actions.c:236
 msgid "Memo List Properties"
 msgstr "Lastnosti seznama opomnikov"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:586
+#: ../modules/calendar/e-memo-shell-view-actions.c:529
 msgid "_Delete Memo"
 msgstr "_Izbriši opomnik"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:593
+#: ../modules/calendar/e-memo-shell-view-actions.c:536
 msgid "_Find in Memo..."
 msgstr "_Najdi v opomniku ..."
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:595
+#: ../modules/calendar/e-memo-shell-view-actions.c:538
 msgid "Search for text in the displayed memo"
 msgstr "Poišči besedilo v prikazanem opomniku"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:614
+#: ../modules/calendar/e-memo-shell-view-actions.c:557
 msgid "D_elete Memo List"
 msgstr "_Izbriši seznam opomnikov"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:616
+#: ../modules/calendar/e-memo-shell-view-actions.c:559
 msgid "Delete the selected memo list"
 msgstr "Izbriši izbran seznam opomnikov"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:621
+#: ../modules/calendar/e-memo-shell-view-actions.c:564
 msgid "_New Memo List"
 msgstr "_Nov seznam opomnikov"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:637
+#: ../modules/calendar/e-memo-shell-view-actions.c:580
 msgid "Refresh the selected memo list"
 msgstr "Osveži izbran seznam opomnikov"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:644
+#: ../modules/calendar/e-memo-shell-view-actions.c:587
 msgid "Rename the selected memo list"
 msgstr "Preimenuj izbran seznam opomnikov"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:649
+#: ../modules/calendar/e-memo-shell-view-actions.c:592
 msgid "Show _Only This Memo List"
 msgstr "Pokaži _le ta seznam opomnikov"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:728
+#: ../modules/calendar/e-memo-shell-view-actions.c:671
 msgid "Memo _Preview"
 msgstr "_Predogled opomnika"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:730
+#: ../modules/calendar/e-memo-shell-view-actions.c:673
 msgid "Show memo preview pane"
 msgstr "Pokaži pladenj predogleda opomnikov"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:751
+#: ../modules/calendar/e-memo-shell-view-actions.c:694
 msgid "Show memo preview below the memo list"
 msgstr "Pokaži predogled opomnikov pod seznamom opomnikov"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:758
+#: ../modules/calendar/e-memo-shell-view-actions.c:701
 msgid "Show memo preview alongside the memo list"
 msgstr "Pokaži predogled opomnikov ob seznamu opomnikov"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:816
+#: ../modules/calendar/e-memo-shell-view-actions.c:759
 msgid "Print the list of memos"
 msgstr "Natisni seznam opomnikov"
 
-#: ../modules/calendar/e-memo-shell-view-actions.c:823
+#: ../modules/calendar/e-memo-shell-view-actions.c:766
 msgid "Preview the list of memos to be printed"
 msgstr "Predogled seznama opomnikov pred tiskanjem"
 
-#: ../modules/calendar/e-memo-shell-view.c:238
+#: ../modules/calendar/e-memo-shell-view.c:212
 msgid "Delete Memos"
 msgstr "Izbriši opomnike"
 
-#: ../modules/calendar/e-memo-shell-view.c:240
+#: ../modules/calendar/e-memo-shell-view.c:214
 msgid "Delete Memo"
 msgstr "Izbriši opomnik"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:537
+#: ../modules/calendar/e-memo-shell-view-private.c:369
 #, c-format
 msgid "%d memo"
 msgid_plural "%d memos"
@@ -17600,60 +20169,46 @@ msgstr[1] "%d opomnik"
 msgstr[2] "%d opomnika"
 msgstr[3] "%d opomniki"
 
-#: ../modules/calendar/e-memo-shell-view-private.c:541
-#: ../modules/calendar/e-task-shell-view-private.c:747
+#: ../modules/calendar/e-memo-shell-view-private.c:373
+#: ../modules/calendar/e-task-shell-view-private.c:539
 #, c-format
 msgid "%d selected"
 msgstr "%d izbranih"
 
-#: ../modules/calendar/e-task-shell-backend.c:204
-#: ../modules/calendar/e-task-shell-view-actions.c:218
-msgid "New Task List"
-msgstr "Nov seznam nalog"
-
-#: ../modules/calendar/e-task-shell-backend.c:213
+#: ../modules/calendar/e-task-shell-backend.c:62
 msgctxt "New"
 msgid "_Task"
 msgstr "_Naloga"
 
-#: ../modules/calendar/e-task-shell-backend.c:220
+#: ../modules/calendar/e-task-shell-backend.c:69
 msgctxt "New"
 msgid "Assigne_d Task"
 msgstr "_Dodeljena naloga"
 
-#: ../modules/calendar/e-task-shell-backend.c:222
+#: ../modules/calendar/e-task-shell-backend.c:71
 msgid "Create a new assigned task"
 msgstr "Ustvari novo dodeljeno nalogo"
 
-#: ../modules/calendar/e-task-shell-backend.c:230
+#: ../modules/calendar/e-task-shell-backend.c:79
 msgctxt "New"
 msgid "Tas_k List"
 msgstr "Seznam _nalog"
 
-#: ../modules/calendar/e-task-shell-backend.c:232
-#: ../modules/calendar/e-task-shell-view-actions.c:747
+#: ../modules/calendar/e-task-shell-backend.c:81
+#: ../modules/calendar/e-task-shell-view-actions.c:691
 msgid "Create a new task list"
 msgstr "Ustvari nov seznam nalog"
 
-#: ../modules/calendar/e-task-shell-sidebar.c:116
-#, c-format
-msgid "Opening task list '%s'"
-msgstr "Odpiranje seznama opravil '%s'"
-
-#: ../modules/calendar/e-task-shell-sidebar.c:545
-msgid "Task List Selector"
-msgstr "Izbirnik seznama nalog"
-
-#: ../modules/calendar/e-task-shell-view-actions.c:234
-#: ../modules/calendar/e-task-shell-view-actions.c:249
+#: ../modules/calendar/e-task-shell-view-actions.c:203
+#: ../modules/calendar/e-task-shell-view-actions.c:218
 msgid "Print Tasks"
 msgstr "Natisni naloge"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:290
+#: ../modules/calendar/e-task-shell-view-actions.c:259
 msgid "Task List Properties"
 msgstr "Lastnosti seznama nalog"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:585
+#: ../modules/calendar/e-task-shell-view-actions.c:529
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
 "continue, you will not be able to recover these tasks.\n"
@@ -17665,111 +20220,107 @@ msgstr ""
 " \n"
 "Ali želite izbrisati te naloge?"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:592
+#: ../modules/calendar/e-task-shell-view-actions.c:536
 msgid "Do not ask me again"
 msgstr "Ne sprašuj več"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:710
+#: ../modules/calendar/e-task-shell-view-actions.c:654
 msgid "_Delete Task"
 msgstr "_Izbriši nalogo"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:717
+#: ../modules/calendar/e-task-shell-view-actions.c:661
 msgid "_Find in Task..."
 msgstr "_Najdi v nalogi ..."
 
-#: ../modules/calendar/e-task-shell-view-actions.c:719
+#: ../modules/calendar/e-task-shell-view-actions.c:663
 msgid "Search for text in the displayed task"
 msgstr "Poišči besedilo v prikazani nalogi"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:738
+#: ../modules/calendar/e-task-shell-view-actions.c:682
 msgid "D_elete Task List"
 msgstr "_Izbriši seznam opravil"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:740
+#: ../modules/calendar/e-task-shell-view-actions.c:684
 msgid "Delete the selected task list"
 msgstr "Izbriši izbrani seznam opravil"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:745
+#: ../modules/calendar/e-task-shell-view-actions.c:689
 msgid "_New Task List"
 msgstr "_Nov seznam nalog"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:761
+#: ../modules/calendar/e-task-shell-view-actions.c:705
 msgid "Refresh the selected task list"
 msgstr "Osveži izbrani seznam nalog"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:768
+#: ../modules/calendar/e-task-shell-view-actions.c:712
 msgid "Rename the selected task list"
 msgstr "Preimenuj izbrani seznam nalog"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:773
+#: ../modules/calendar/e-task-shell-view-actions.c:717
 msgid "Show _Only This Task List"
 msgstr "Pokaži _le ta seznam nalog"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:787
+#: ../modules/calendar/e-task-shell-view-actions.c:731
 msgid "Mar_k as Incomplete"
 msgstr "_Označi kot nedokončano"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:817
+#: ../modules/calendar/e-task-shell-view-actions.c:761
 msgid "Delete completed tasks"
 msgstr "Izbriši končane naloge"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:892
+#: ../modules/calendar/e-task-shell-view-actions.c:836
 msgid "Task _Preview"
 msgstr "_Predogled nalog"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:894
+#: ../modules/calendar/e-task-shell-view-actions.c:838
 msgid "Show task preview pane"
 msgstr "Pokaže pladenj predogleda nalog"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:915
+#: ../modules/calendar/e-task-shell-view-actions.c:859
 msgid "Show task preview below the task list"
 msgstr "Pokaži predogled nalog pod seznamom nalog"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:922
+#: ../modules/calendar/e-task-shell-view-actions.c:866
 msgid "Show task preview alongside the task list"
 msgstr "Pokaži predogled nalog ob seznamu nalog"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:930
+#: ../modules/calendar/e-task-shell-view-actions.c:874
 msgid "Active Tasks"
 msgstr "Dejavne naloge"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:944
+#: ../modules/calendar/e-task-shell-view-actions.c:888
 msgid "Completed Tasks"
 msgstr "Končane naloge"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:951
+#: ../modules/calendar/e-task-shell-view-actions.c:895
 msgid "Next 7 Days' Tasks"
 msgstr "Naloge naslednjih 7 dni"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:958
+#: ../modules/calendar/e-task-shell-view-actions.c:902
 msgid "Overdue Tasks"
 msgstr "Zakasnjene naloge"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:965
+#: ../modules/calendar/e-task-shell-view-actions.c:909
 msgid "Tasks with Attachments"
 msgstr "Naloge s prilogami"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1015
+#: ../modules/calendar/e-task-shell-view-actions.c:959
 msgid "Print the list of tasks"
 msgstr "Natisni seznam nalog"
 
-#: ../modules/calendar/e-task-shell-view-actions.c:1022
+#: ../modules/calendar/e-task-shell-view-actions.c:966
 msgid "Preview the list of tasks to be printed"
 msgstr "Predogled seznama nalog pred tiskanjem"
 
-#: ../modules/calendar/e-task-shell-view.c:373
+#: ../modules/calendar/e-task-shell-view.c:316
 msgid "Delete Tasks"
 msgstr "Izbriši naloge"
 
-#: ../modules/calendar/e-task-shell-view.c:375
+#: ../modules/calendar/e-task-shell-view.c:318
 msgid "Delete Task"
 msgstr "Izbriši nalogo"
 
-#: ../modules/calendar/e-task-shell-view-private.c:632
-msgid "Expunging"
-msgstr "Uničuvanje"
-
-#: ../modules/calendar/e-task-shell-view-private.c:743
+#: ../modules/calendar/e-task-shell-view-private.c:535
 #, c-format
 msgid "%d task"
 msgid_plural "%d tasks"
@@ -18145,273 +20696,274 @@ msgstr "%s je preko %s preklical(a) naslednji zapisek v souporabi:"
 msgid "%s has canceled the following shared memo:"
 msgstr "%s je preklical(a) naslednji opomnik v souporabi:"
 
-#: ../modules/itip-formatter/itip-view.c:675
+#: ../modules/itip-formatter/itip-view.c:676
 msgid "All day:"
 msgstr "Celodnevno:"
 
-#: ../modules/itip-formatter/itip-view.c:681
+#: ../modules/itip-formatter/itip-view.c:682
 msgid "Start day:"
 msgstr "Dan začetka:"
 
-#: ../modules/itip-formatter/itip-view.c:681
-#: ../modules/itip-formatter/itip-view.c:1504
+#: ../modules/itip-formatter/itip-view.c:682
+#: ../modules/itip-formatter/itip-view.c:1517
 msgid "Start time:"
 msgstr "Čas začetka:"
 
-#: ../modules/itip-formatter/itip-view.c:690
+#: ../modules/itip-formatter/itip-view.c:691
 msgid "End day:"
 msgstr "Dan konca:%d dni"
 
-#: ../modules/itip-formatter/itip-view.c:690
-#: ../modules/itip-formatter/itip-view.c:1505
+#: ../modules/itip-formatter/itip-view.c:691
+#: ../modules/itip-formatter/itip-view.c:1518
 msgid "End time:"
 msgstr "Čas konca:"
 
-#: ../modules/itip-formatter/itip-view.c:1030
+#: ../modules/itip-formatter/itip-view.c:1041
 msgid "Ope_n Calendar"
 msgstr "_Odpri koledar"
 
-#: ../modules/itip-formatter/itip-view.c:1033
+#: ../modules/itip-formatter/itip-view.c:1044
 msgid "_Decline all"
 msgstr "_Odkloni vse"
 
-#: ../modules/itip-formatter/itip-view.c:1036
+#: ../modules/itip-formatter/itip-view.c:1047
 msgid "_Decline"
 msgstr "_Odkloni"
 
-#: ../modules/itip-formatter/itip-view.c:1039
+#: ../modules/itip-formatter/itip-view.c:1050
 msgid "_Tentative all"
 msgstr "Vse _poskusno"
 
-#: ../modules/itip-formatter/itip-view.c:1042
+#: ../modules/itip-formatter/itip-view.c:1053
 msgid "_Tentative"
 msgstr "_Poskusno"
 
-#: ../modules/itip-formatter/itip-view.c:1045
+#: ../modules/itip-formatter/itip-view.c:1056
 msgid "Acce_pt all"
 msgstr "Sprejmi _vse"
 
-#: ../modules/itip-formatter/itip-view.c:1048
+#: ../modules/itip-formatter/itip-view.c:1059
 msgid "Acce_pt"
 msgstr "_Sprejmi"
 
-#: ../modules/itip-formatter/itip-view.c:1051
+#: ../modules/itip-formatter/itip-view.c:1062
 msgid "Send _Information"
 msgstr "_Pošlji podatke"
 
-#: ../modules/itip-formatter/itip-view.c:1054
+#: ../modules/itip-formatter/itip-view.c:1065
 msgid "_Update Attendee Status"
 msgstr "_Posodobi stanje udeleženca"
 
-#: ../modules/itip-formatter/itip-view.c:1057
+#: ../modules/itip-formatter/itip-view.c:1068
+#: ../smime/gui/certificate-manager.c:1664
 msgid "_Update"
 msgstr "_Posodobi"
 
-#: ../modules/itip-formatter/itip-view.c:1507
-#: ../modules/itip-formatter/itip-view.c:1555
-#: ../modules/itip-formatter/itip-view.c:1626
+#: ../modules/itip-formatter/itip-view.c:1520
+#: ../modules/itip-formatter/itip-view.c:1568
+#: ../modules/itip-formatter/itip-view.c:1639
 msgid "Comment:"
 msgstr "Opomba:"
 
 #. RSVP area
-#: ../modules/itip-formatter/itip-view.c:1543
+#: ../modules/itip-formatter/itip-view.c:1556
 msgid "Send reply to sender"
 msgstr "Odgovori pošiljatelju"
 
 #. Updates
-#: ../modules/itip-formatter/itip-view.c:1558
+#: ../modules/itip-formatter/itip-view.c:1571
 msgid "Send _updates to attendees"
 msgstr "Pošlji _posodobitve udeležencem"
 
 #. The recurrence check button
-#: ../modules/itip-formatter/itip-view.c:1561
+#: ../modules/itip-formatter/itip-view.c:1574
 msgid "_Apply to all instances"
 msgstr "Uveljavi za vse _primerke"
 
-#: ../modules/itip-formatter/itip-view.c:1562
+#: ../modules/itip-formatter/itip-view.c:1575
 msgid "Show time as _free"
 msgstr "Pokaži čas kot _prosto"
 
-#: ../modules/itip-formatter/itip-view.c:1563
+#: ../modules/itip-formatter/itip-view.c:1576
 msgid "_Preserve my reminder"
 msgstr "_Ohrani opomnik"
 
-#: ../modules/itip-formatter/itip-view.c:1564
+#: ../modules/itip-formatter/itip-view.c:1577
 msgid "_Inherit reminder"
 msgstr "_Prevzemi opomnik"
 
-#: ../modules/itip-formatter/itip-view.c:1894
+#: ../modules/itip-formatter/itip-view.c:1911
 msgid "_Tasks:"
 msgstr "_Naloge:"
 
-#: ../modules/itip-formatter/itip-view.c:1897
+#: ../modules/itip-formatter/itip-view.c:1914
 msgid "_Memos:"
 msgstr "_Opomniki:"
 
-#: ../modules/itip-formatter/itip-view.c:3125
+#: ../modules/itip-formatter/itip-view.c:3220
 msgid "Sa_ve"
 msgstr "Sh_rani"
 
-#: ../modules/itip-formatter/itip-view.c:3585
-#: ../modules/itip-formatter/itip-view.c:5032
+#: ../modules/itip-formatter/itip-view.c:3682
+#: ../modules/itip-formatter/itip-view.c:5131
 msgid "Attendee status updated"
 msgstr "Stanje udeleženca je posodobljeno"
 
-#: ../modules/itip-formatter/itip-view.c:3764
+#: ../modules/itip-formatter/itip-view.c:3862
 #, c-format
 msgid "An appointment in the calendar '%s' conflicts with this meeting"
 msgstr "Sestanek v koledarju '%s' je v sporu s tem srečanjem"
 
-#: ../modules/itip-formatter/itip-view.c:3793
+#: ../modules/itip-formatter/itip-view.c:3891
 #, c-format
 msgid "Found the appointment in the calendar '%s'"
 msgstr "Sestanek je bil najden v koledarju '%s'"
 
-#: ../modules/itip-formatter/itip-view.c:3906
+#: ../modules/itip-formatter/itip-view.c:4004
 msgid "Unable to find any calendars"
 msgstr "Ni mogoče najti nobenega koledarja"
 
-#: ../modules/itip-formatter/itip-view.c:3914
+#: ../modules/itip-formatter/itip-view.c:4012
 msgid "Unable to find this meeting in any calendar"
 msgstr "Srečanja ni mogoče najti v nobenem koledarju"
 
-#: ../modules/itip-formatter/itip-view.c:3919
+#: ../modules/itip-formatter/itip-view.c:4017
 msgid "Unable to find this task in any task list"
 msgstr "Naloge ni mogoče najti v nobenem seznamu nalog"
 
-#: ../modules/itip-formatter/itip-view.c:3924
+#: ../modules/itip-formatter/itip-view.c:4022
 msgid "Unable to find this memo in any memo list"
 msgstr "Opomnika ni mogoče najti v nobenem seznamu opomnikov"
 
-#: ../modules/itip-formatter/itip-view.c:4268
+#: ../modules/itip-formatter/itip-view.c:4367
 msgid "Opening the calendar. Please wait..."
 msgstr "Odpiranje koledarja. Počakajte ..."
 
-#: ../modules/itip-formatter/itip-view.c:4273
+#: ../modules/itip-formatter/itip-view.c:4372
 msgid "Searching for an existing version of this appointment"
 msgstr "Iskanje obstoječe različice tega sestanka"
 
-#: ../modules/itip-formatter/itip-view.c:4668
+#: ../modules/itip-formatter/itip-view.c:4767
 #, c-format
 msgid "Unable to send item to calendar '%s'.  %s"
 msgstr "Ni mogoče poslati predmeta v koledar '%s'. %s"
 
-#: ../modules/itip-formatter/itip-view.c:4683
+#: ../modules/itip-formatter/itip-view.c:4782
 #, c-format
 msgid "Sent to calendar '%s' as accepted"
 msgstr "Poslano koledarju '%s' kot sprejeto"
 
-#: ../modules/itip-formatter/itip-view.c:4688
+#: ../modules/itip-formatter/itip-view.c:4787
 #, c-format
 msgid "Sent to calendar '%s' as tentative"
 msgstr "Poslano koledarju '%s' kot poskusno"
 
-#: ../modules/itip-formatter/itip-view.c:4694
+#: ../modules/itip-formatter/itip-view.c:4793
 #, c-format
 msgid "Sent to calendar '%s' as declined"
 msgstr "Poslano koledarju '%s' kot odklonjeno"
 
-#: ../modules/itip-formatter/itip-view.c:4700
+#: ../modules/itip-formatter/itip-view.c:4799
 #, c-format
 msgid "Sent to calendar '%s' as canceled"
 msgstr "Poslano koledarju '%s' kot preklicano"
 
-#: ../modules/itip-formatter/itip-view.c:4721
-#: ../modules/itip-formatter/itip-view.c:5178
-#: ../modules/itip-formatter/itip-view.c:5284
+#: ../modules/itip-formatter/itip-view.c:4820
+#: ../modules/itip-formatter/itip-view.c:5278
+#: ../modules/itip-formatter/itip-view.c:5384
 msgid "Saving changes to the calendar. Please wait..."
 msgstr "Shranjujejo se spremembe v koledar. Počakajte ..."
 
-#: ../modules/itip-formatter/itip-view.c:4762
+#: ../modules/itip-formatter/itip-view.c:4861
 msgid "Unable to parse item"
 msgstr "Ni mogoče razčleniti predmeta"
 
-#: ../modules/itip-formatter/itip-view.c:4955
+#: ../modules/itip-formatter/itip-view.c:5054
 #, c-format
 msgid "Organizer has removed the delegate %s "
 msgstr "Organizator je odstranil pooblaščenca %s "
 
-#: ../modules/itip-formatter/itip-view.c:4972
+#: ../modules/itip-formatter/itip-view.c:5071
 msgid "Sent a cancelation notice to the delegate"
 msgstr "Pooblaščencu je bilo poslano obvestilo o preklicu"
 
-#: ../modules/itip-formatter/itip-view.c:4976
+#: ../modules/itip-formatter/itip-view.c:5075
 msgid "Could not send the cancelation notice to the delegate"
 msgstr "Pooblaščencu ni mogoče poslati obvestila o preklicu"
 
-#: ../modules/itip-formatter/itip-view.c:5024
+#: ../modules/itip-formatter/itip-view.c:5123
 #, c-format
 msgid "Unable to update attendee. %s"
 msgstr "Ni mogoče posodobiti udeleženca. %s"
 
-#: ../modules/itip-formatter/itip-view.c:5067
+#: ../modules/itip-formatter/itip-view.c:5167
 msgid "The meeting is invalid and cannot be updated"
 msgstr "Srečanje ni veljavno in ga ni mogoče posodobiti"
 
-#: ../modules/itip-formatter/itip-view.c:5143
+#: ../modules/itip-formatter/itip-view.c:5243
 msgid "Attendee status could not be updated because the status is invalid"
 msgstr "Stanja udeleženca ni mogoče posodobiti zaradi neveljavnega stanja"
 
-#: ../modules/itip-formatter/itip-view.c:5215
-#: ../modules/itip-formatter/itip-view.c:5254
+#: ../modules/itip-formatter/itip-view.c:5315
+#: ../modules/itip-formatter/itip-view.c:5354
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Stanja udeleženca ni mogoče posodobiti, ker predmet ne obstaja več"
 
-#: ../modules/itip-formatter/itip-view.c:5317
+#: ../modules/itip-formatter/itip-view.c:5417
 msgid "Meeting information sent"
 msgstr "Podatki o srečanju so bili uspešno poslani"
 
-#: ../modules/itip-formatter/itip-view.c:5322
+#: ../modules/itip-formatter/itip-view.c:5422
 msgid "Task information sent"
 msgstr "Podatki o nalogi so bili uspešno poslani"
 
-#: ../modules/itip-formatter/itip-view.c:5327
+#: ../modules/itip-formatter/itip-view.c:5427
 msgid "Memo information sent"
 msgstr "Podatki o opomniku so bili uspešno poslani"
 
-#: ../modules/itip-formatter/itip-view.c:5338
+#: ../modules/itip-formatter/itip-view.c:5438
 msgid "Unable to send meeting information, the meeting does not exist"
 msgstr "Ni mogoče poslati podrobnosti srečanja, saj srečanje še ni ustvarjeno"
 
-#: ../modules/itip-formatter/itip-view.c:5343
+#: ../modules/itip-formatter/itip-view.c:5443
 msgid "Unable to send task information, the task does not exist"
 msgstr "Podrobnosti naloge ni mogoče poslati, saj ne obstaja"
 
-#: ../modules/itip-formatter/itip-view.c:5348
+#: ../modules/itip-formatter/itip-view.c:5448
 msgid "Unable to send memo information, the memo does not exist"
 msgstr "Ni mogoče poslati opomnika, saj ta še ni ustvarjen"
 
 #. Translators: This is a default filename for a calendar.
-#: ../modules/itip-formatter/itip-view.c:5413
+#: ../modules/itip-formatter/itip-view.c:5513
 msgid "calendar.ics"
 msgstr "koledar.ics"
 
-#: ../modules/itip-formatter/itip-view.c:5418
+#: ../modules/itip-formatter/itip-view.c:5518
 msgid "Save Calendar"
 msgstr "Shrani koledar"
 
-#: ../modules/itip-formatter/itip-view.c:5467
-#: ../modules/itip-formatter/itip-view.c:5480
+#: ../modules/itip-formatter/itip-view.c:5567
+#: ../modules/itip-formatter/itip-view.c:5580
 msgid "The calendar attached is not valid"
 msgstr "Priložen koledar ni veljaven"
 
-#: ../modules/itip-formatter/itip-view.c:5468
-#: ../modules/itip-formatter/itip-view.c:5481
+#: ../modules/itip-formatter/itip-view.c:5568
+#: ../modules/itip-formatter/itip-view.c:5581
 msgid ""
 "The message claims to contain a calendar, but the calendar is not a valid "
 "iCalendar."
 msgstr ""
 "Sporočilo trdi, da vsebuje koledar, vendar ni v veljavni obliki iCalendar."
 
-#: ../modules/itip-formatter/itip-view.c:5523
-#: ../modules/itip-formatter/itip-view.c:5553
-#: ../modules/itip-formatter/itip-view.c:5654
+#: ../modules/itip-formatter/itip-view.c:5623
+#: ../modules/itip-formatter/itip-view.c:5653
+#: ../modules/itip-formatter/itip-view.c:5754
 msgid "The item in the calendar is not valid"
 msgstr "Predmet v koledarju ni veljaven"
 
-#: ../modules/itip-formatter/itip-view.c:5524
-#: ../modules/itip-formatter/itip-view.c:5554
-#: ../modules/itip-formatter/itip-view.c:5655
+#: ../modules/itip-formatter/itip-view.c:5624
+#: ../modules/itip-formatter/itip-view.c:5654
+#: ../modules/itip-formatter/itip-view.c:5755
 msgid ""
 "The message does contain a calendar, but the calendar contains no events, "
 "tasks or free/busy information"
@@ -18419,34 +20971,34 @@ msgstr ""
 "Sporočilo vsebuje koledar, vendar koledar ne vsebuje nobenih dogodkov, nalog "
 "ali podatkov o zasedenosti"
 
-#: ../modules/itip-formatter/itip-view.c:5569
+#: ../modules/itip-formatter/itip-view.c:5669
 msgid "The calendar attached contains multiple items"
 msgstr "Priložen koledar vsebuje več predmetov"
 
-#: ../modules/itip-formatter/itip-view.c:5570
+#: ../modules/itip-formatter/itip-view.c:5670
 msgid ""
 "To process all of these items, the file should be saved and the calendar "
 "imported"
 msgstr "Za obdelavo vseh predmetov morate shraniti datoteko in uvoziti koledar"
 
-#: ../modules/itip-formatter/itip-view.c:6072
+#: ../modules/itip-formatter/itip-view.c:6172
 msgctxt "cal-itip"
 msgid "None"
 msgstr "Brez"
 
-#: ../modules/itip-formatter/itip-view.c:6088
+#: ../modules/itip-formatter/itip-view.c:6188
 msgid "Tentatively Accepted"
 msgstr "Poskusno sprejeto"
 
-#: ../modules/itip-formatter/itip-view.c:6248
+#: ../modules/itip-formatter/itip-view.c:6348
 msgid "This meeting recurs"
 msgstr "Srečanje se ponavlja"
 
-#: ../modules/itip-formatter/itip-view.c:6251
+#: ../modules/itip-formatter/itip-view.c:6351
 msgid "This task recurs"
 msgstr "Ta naloga se ponavlja"
 
-#: ../modules/itip-formatter/itip-view.c:6254
+#: ../modules/itip-formatter/itip-view.c:6354
 msgid "This memo recurs"
 msgstr "Opomnik se ponavlja"
 
@@ -18491,19 +21043,19 @@ msgstr "Oblikovalnik Itip"
 msgid "Display \"text/calendar\" MIME parts in mail messages."
 msgstr "Pokaže MIME dele \"besedil/koledar\" v poštnih sporočilih."
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:251
+#: ../modules/mail-config/e-mail-config-google-summary.c:250
 msgid "Google Features"
 msgstr "Zmožnosti Google"
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:260
+#: ../modules/mail-config/e-mail-config-google-summary.c:259
 msgid "Add Google Ca_lendar to this account"
 msgstr "Dodajanje koledarja Google k računu."
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:268
+#: ../modules/mail-config/e-mail-config-google-summary.c:267
 msgid "Add Google Con_tacts to this account"
 msgstr "Dodajanje stikov Google k računu."
 
-#: ../modules/mail-config/e-mail-config-google-summary.c:276
+#: ../modules/mail-config/e-mail-config-google-summary.c:275
 msgid "You may need to enable IMAP access"
 msgstr "Morda boste morali omogočiti dostop IMAP"
 
@@ -18546,39 +21098,39 @@ msgstr "Izbor vrstilne mape poštnega predala mbox"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:136
 #: ../modules/mail-config/e-mail-config-sendmail-backend.c:54
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:79
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:92
 #: ../modules/plugin-manager/evolution-plugin-manager.c:158
 msgid "Configuration"
 msgstr "Nastavitve"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:154
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:97
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
 #: ../plugins/publish-calendar/publish-calendar.ui.h:24
 msgid "_Server:"
 msgstr "_Strežnik:"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:168
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:110
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:123
 msgid "_Port:"
 msgstr "_Vrata:"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:180
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:226
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:242
 msgid "User_name:"
 msgstr "Uporab_niško ime:"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:213
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:147
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:163
 msgid "Encryption _method:"
 msgstr "_Način šifriranja:"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:228
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:162
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:178
 msgid "STARTTLS after connecting"
 msgstr "STARTTLS po povezovanju"
 
 #: ../modules/mail-config/e-mail-config-remote-accounts.c:232
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:166
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:182
 msgid "SSL on a dedicated port"
 msgstr "SSL na namenskih vratih"
 
@@ -18612,19 +21164,19 @@ msgstr ""
 msgid "Send mail also when in offline _mode"
 msgstr "Sporočilo pošlji tudi v načinu _brez povezave"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:122
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:135
 msgid "Ser_ver requires authentication"
 msgstr "St_režnik zahteva overitev"
 
-#: ../modules/mail-config/e-mail-config-smtp-backend.c:208
+#: ../modules/mail-config/e-mail-config-smtp-backend.c:224
 msgid "T_ype:"
 msgstr "V_rsta:"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:246
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:245
 msgid "Yahoo! Features"
 msgstr "Zmožnosti Yahoo!"
 
-#: ../modules/mail-config/e-mail-config-yahoo-summary.c:255
+#: ../modules/mail-config/e-mail-config-yahoo-summary.c:254
 msgid "Add Yahoo! Ca_lendar and Tasks to this account"
 msgstr "Dodajanje koledarja in nalog Yahoo! k računu."
 
@@ -18637,369 +21189,370 @@ msgstr[1] "%d priloženo sporočilo"
 msgstr[2] "%d priloženi sporočili"
 msgstr[3] "%d priložena sporočila"
 
-#: ../modules/mail/e-mail-shell-backend.c:314
+#: ../modules/mail/e-mail-shell-backend.c:350
 msgctxt "New"
 msgid "_Mail Message"
 msgstr "_Poštno sporočilo"
 
-#: ../modules/mail/e-mail-shell-backend.c:316
+#: ../modules/mail/e-mail-shell-backend.c:352
 msgid "Compose a new mail message"
 msgstr "Sestavi novo poštno sporočilo"
 
-#: ../modules/mail/e-mail-shell-backend.c:324
+#: ../modules/mail/e-mail-shell-backend.c:360
 msgctxt "New"
 msgid "Mail Acco_unt"
 msgstr "Poštni _račun"
 
-#: ../modules/mail/e-mail-shell-backend.c:326
+#: ../modules/mail/e-mail-shell-backend.c:362
 msgid "Create a new mail account"
 msgstr "Ustvari nov poštni račun"
 
-#: ../modules/mail/e-mail-shell-backend.c:331
+#: ../modules/mail/e-mail-shell-backend.c:367
 msgctxt "New"
 msgid "Mail _Folder"
 msgstr "Poštna _mapa"
 
-#: ../modules/mail/e-mail-shell-backend.c:333
+#: ../modules/mail/e-mail-shell-backend.c:369
 msgid "Create a new mail folder"
 msgstr "Ustvari novo poštno mapo"
 
-#: ../modules/mail/e-mail-shell-backend.c:644
+#: ../modules/mail/e-mail-shell-backend.c:684
 msgid "Mail Accounts"
 msgstr "Poštni računi"
 
-#: ../modules/mail/e-mail-shell-backend.c:653
+#: ../modules/mail/e-mail-shell-backend.c:693
 msgid "Mail Preferences"
 msgstr "Možnosti pošte"
 
-#: ../modules/mail/e-mail-shell-backend.c:662
+#: ../modules/mail/e-mail-shell-backend.c:702
 msgid "Composer Preferences"
 msgstr "Možnosti sestavljalnika"
 
-#: ../modules/mail/e-mail-shell-backend.c:672
+#: ../modules/mail/e-mail-shell-backend.c:712
 msgid "Network Preferences"
 msgstr "Možnosti omrežja"
 
 #. Translators: The first item in the list, to be
 #. * able to set rule: [Label] [is/is-not] [None]
-#: ../modules/mail/e-mail-shell-backend.c:964
+#: ../modules/mail/e-mail-shell-backend.c:1004
 msgctxt "label"
 msgid "None"
 msgstr "Brez"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:670
+#: ../modules/mail/e-mail-shell-view-actions.c:706
 msgid "Marking messages as read..."
 msgstr "Poteka označevanje sporočil kot prebrana ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1512
+#: ../modules/mail/e-mail-shell-view-actions.c:1566
 msgid "_Disable Account"
 msgstr "_Onemogoči račun"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1514
+#: ../modules/mail/e-mail-shell-view-actions.c:1568
 msgid "Disable this account"
 msgstr "Onemogoči ta račun"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1521
+#: ../modules/mail/e-mail-shell-view-actions.c:1575
 msgid "Permanently remove all the deleted messages from all folders"
 msgstr "Trajno odstrani vsa izbrisana sporočila iz vseh map"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1528
+#: ../modules/mail/e-mail-shell-view-actions.c:1582
 msgid "Edit properties of this account"
 msgstr "Uredi lastnosti računa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1535
+#: ../modules/mail/e-mail-shell-view-actions.c:1589
 msgid "Refresh list of folders of this account"
 msgstr "Osveži seznam map tega računa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1540
+#: ../modules/mail/e-mail-shell-view-actions.c:1594
 msgid "_Download Messages for Offline Usage"
 msgstr "_Prejmi sporočila za pregledovanje brez povezave"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1542
+#: ../modules/mail/e-mail-shell-view-actions.c:1596
 msgid "Download messages of accounts and folders marked for offline usage"
 msgstr "Prejmi sporočila računov in map označenih za delo brez povezave"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1547
+#: ../modules/mail/e-mail-shell-view-actions.c:1601
 msgid "Fl_ush Outbox"
 msgstr "_Odplakni odhodna sporočila"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1554
+#: ../modules/mail/e-mail-shell-view-actions.c:1608
 msgid "_Copy Folder To..."
 msgstr "_Kopiraj mapo v ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1556
+#: ../modules/mail/e-mail-shell-view-actions.c:1610
 msgid "Copy the selected folder into another folder"
 msgstr "Kopira izbrano mapo v drugo mapo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1563
+#: ../modules/mail/e-mail-shell-view-actions.c:1617
 msgid "Permanently remove this folder"
 msgstr "Trajno odstrani to mapo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1568
+#: ../modules/mail/e-mail-shell-view-actions.c:1622
 msgid "E_xpunge"
 msgstr "_Uniči"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1570
+#: ../modules/mail/e-mail-shell-view-actions.c:1624
 msgid "Permanently remove all deleted messages from this folder"
 msgstr "Trajno odstrani vsa izbrisana sporočila iz te mape"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1575
-#: ../modules/mail/e-mail-shell-view-actions.c:1675
+#: ../modules/mail/e-mail-shell-view-actions.c:1629
+#: ../modules/mail/e-mail-shell-view-actions.c:1730
 msgid "Mar_k All Messages as Read"
 msgstr "Označi vsa sporočila _kot prebrana"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1577
-#: ../modules/mail/e-mail-shell-view-actions.c:1677
+#: ../modules/mail/e-mail-shell-view-actions.c:1631
+#: ../modules/mail/e-mail-shell-view-actions.c:1732
 msgid "Mark all messages in the folder as read"
 msgstr "Označi vsa sporočila v mapi kot prebrana"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1582
+#: ../modules/mail/e-mail-shell-view-actions.c:1636
 msgid "_Move Folder To..."
 msgstr "Premakni _mapo v ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1584
+#: ../modules/mail/e-mail-shell-view-actions.c:1638
 msgid "Move the selected folder into another folder"
 msgstr "Premakne izbrano mapo v drugo mapo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1589
+#. Translators: An action caption to create a new mail folder
+#: ../modules/mail/e-mail-shell-view-actions.c:1644
 msgid "_New..."
 msgstr "_Nova ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1591
+#: ../modules/mail/e-mail-shell-view-actions.c:1646
 msgid "Create a new folder for storing mail"
 msgstr "Ustvari novo mapo za shranjevanje pošte"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1598
+#: ../modules/mail/e-mail-shell-view-actions.c:1653
 msgid "Change the properties of this folder"
 msgstr "Spremeni lastnosti te mape"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1605
+#: ../modules/mail/e-mail-shell-view-actions.c:1660
 msgid "Refresh the folder"
 msgstr "Osveži mapo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1612
+#: ../modules/mail/e-mail-shell-view-actions.c:1667
 msgid "Change the name of this folder"
 msgstr "Spremeni ime te mape"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1617
+#: ../modules/mail/e-mail-shell-view-actions.c:1672
 msgid "Select Message _Thread"
 msgstr "Izberi _nit sporočila"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1619
+#: ../modules/mail/e-mail-shell-view-actions.c:1674
 msgid "Select all messages in the same thread as the selected message"
 msgstr "Izberi vsa sporočila iz iste niti kot izbrano sporočilo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1624
+#: ../modules/mail/e-mail-shell-view-actions.c:1679
 msgid "Select Message S_ubthread"
 msgstr "Izberi pod_nit sporočila"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1626
+#: ../modules/mail/e-mail-shell-view-actions.c:1681
 msgid "Select all replies to the currently selected message"
 msgstr "Izbere vse odgovore na trenutno izbrano sporočilo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1638
+#: ../modules/mail/e-mail-shell-view-actions.c:1693
 msgid "Empty _Trash"
 msgstr "Izprazni _smeti"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1640
+#: ../modules/mail/e-mail-shell-view-actions.c:1695
 msgid "Permanently remove all the deleted messages from all accounts"
 msgstr "Trajno odstrani vsa izbrisana sporočila iz vseh računov"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1645
+#: ../modules/mail/e-mail-shell-view-actions.c:1700
 msgid "_New Label"
 msgstr "_Nova oznaka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1654
+#: ../modules/mail/e-mail-shell-view-actions.c:1709
 msgid "N_one"
 msgstr "_Brez"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1668
+#: ../modules/mail/e-mail-shell-view-actions.c:1723
 msgid "_Manage Subscriptions"
 msgstr "Upravljanje _naročnin"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1670
-#: ../modules/mail/e-mail-shell-view-actions.c:1754
+#: ../modules/mail/e-mail-shell-view-actions.c:1725
+#: ../modules/mail/e-mail-shell-view-actions.c:1809
 msgid "Subscribe or unsubscribe to folders on remote servers"
 msgstr "Naroči se ali prekliče naročnino na mape z oddaljenih strežnikov"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1682
-#: ../modules/mail/e-mail-shell-view-actions.c:1703
+#: ../modules/mail/e-mail-shell-view-actions.c:1737
+#: ../modules/mail/e-mail-shell-view-actions.c:1758
 msgid "Send / _Receive"
 msgstr "Pošlji / p_rejmi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1684
+#: ../modules/mail/e-mail-shell-view-actions.c:1739
 msgid "Send queued items and retrieve new items"
 msgstr "Pošlje čakajočo pošto in prejme novo"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1689
+#: ../modules/mail/e-mail-shell-view-actions.c:1744
 msgid "R_eceive All"
 msgstr "P_rejmi vse"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1691
+#: ../modules/mail/e-mail-shell-view-actions.c:1746
 msgid "Receive new items from all accounts"
 msgstr "Prejemi nove predmete za vse račune"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1696
+#: ../modules/mail/e-mail-shell-view-actions.c:1751
 msgid "_Send All"
 msgstr "_Pošlji vse"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1698
+#: ../modules/mail/e-mail-shell-view-actions.c:1753
 msgid "Send queued items in all accounts"
 msgstr "Pošlje čakajoče predmete v vseh računih"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1726
+#: ../modules/mail/e-mail-shell-view-actions.c:1781
 msgid "Cancel the current mail operation"
 msgstr "Prekliči trenutno opravilo pošte"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1731
+#: ../modules/mail/e-mail-shell-view-actions.c:1786
 msgid "Collapse All _Threads"
 msgstr "Zloži vse ni_ti"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1733
+#: ../modules/mail/e-mail-shell-view-actions.c:1788
 msgid "Collapse all message threads"
 msgstr "Zloži niti vseh sporočil"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1738
+#: ../modules/mail/e-mail-shell-view-actions.c:1793
 msgid "E_xpand All Threads"
 msgstr "_Razširi vse niti"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1740
+#: ../modules/mail/e-mail-shell-view-actions.c:1795
 msgid "Expand all message threads"
 msgstr "Razširi niti vseh sporočil"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1745
+#: ../modules/mail/e-mail-shell-view-actions.c:1800
 msgid "_Message Filters"
 msgstr "Filtri _sporočil"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1747
+#: ../modules/mail/e-mail-shell-view-actions.c:1802
 msgid "Create or edit rules for filtering new mail"
 msgstr "Ustvari ali uredi pravila za filtriranje nove pošte"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1752
+#: ../modules/mail/e-mail-shell-view-actions.c:1807
 msgid "_Subscriptions..."
 msgstr "_Naročnine ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1761
+#: ../modules/mail/e-mail-shell-view-actions.c:1816
 msgid "F_older"
 msgstr "_Mapa"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1768
+#: ../modules/mail/e-mail-shell-view-actions.c:1823
 msgid "_Label"
 msgstr "_Oznaka"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1785
+#: ../modules/mail/e-mail-shell-view-actions.c:1840
 msgid "C_reate Search Folder From Search..."
 msgstr "Ustva_ri iskalno mapo iz iskanja ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1792
+#: ../modules/mail/e-mail-shell-view-actions.c:1847
 msgid "Search F_olders"
 msgstr "Iskalne _mape"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1794
+#: ../modules/mail/e-mail-shell-view-actions.c:1849
 msgid "Create or edit search folder definitions"
 msgstr "Ustvari ali uredi določila iskalnih map"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1833
+#: ../modules/mail/e-mail-shell-view-actions.c:1888
 msgid "_New Folder..."
 msgstr "_Nova mapa ..."
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1861
+#: ../modules/mail/e-mail-shell-view-actions.c:1916
 msgid "Show Message _Preview"
 msgstr "Pokaži _predogled sporočila"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1863
+#: ../modules/mail/e-mail-shell-view-actions.c:1918
 msgid "Show message preview pane"
 msgstr "Pokaži pladenj predogleda sporočila"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1869
+#: ../modules/mail/e-mail-shell-view-actions.c:1924
 msgid "Show _Deleted Messages"
 msgstr "Pokaži _izbrisana sporočila"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1871
+#: ../modules/mail/e-mail-shell-view-actions.c:1926
 msgid "Show deleted messages with a line through them"
 msgstr "Pokaži izbrisana sporočila (prečrtana) na seznamu sporočil"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1877
+#: ../modules/mail/e-mail-shell-view-actions.c:1932
 msgid "_Group By Threads"
 msgstr "_Združi po nitih"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1879
+#: ../modules/mail/e-mail-shell-view-actions.c:1934
 msgid "Threaded message list"
 msgstr "Niten seznam sporočil"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1885
+#: ../modules/mail/e-mail-shell-view-actions.c:1940
 msgid "_Unmatched Folder Enabled"
 msgstr "_Omogoči neujemajoče iskalne mape"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1887
+#: ../modules/mail/e-mail-shell-view-actions.c:1942
 msgid "Toggles whether Unmatched search folder is enabled"
 msgstr "Preklopi možnost omogočanja neujemajočih iskalnih map"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1907
+#: ../modules/mail/e-mail-shell-view-actions.c:1962
 msgid "Show message preview below the message list"
 msgstr "Pokaži predogled sporočil pod seznamom sporočil"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1914
+#: ../modules/mail/e-mail-shell-view-actions.c:1969
 msgid "Show message preview alongside the message list"
 msgstr "Pokaži predogled sporočil ob seznamu sporočil"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1922
+#: ../modules/mail/e-mail-shell-view-actions.c:1977
 msgid "All Messages"
 msgstr "Vsa sporočila"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1929
+#: ../modules/mail/e-mail-shell-view-actions.c:1984
 msgid "Important Messages"
 msgstr "Pomembna sporočila"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1936
+#: ../modules/mail/e-mail-shell-view-actions.c:1991
 msgid "Last 5 Days' Messages"
 msgstr "Sporočila zadnjih 5 dni"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1943
+#: ../modules/mail/e-mail-shell-view-actions.c:1998
 msgid "Messages Not Junk"
 msgstr "Sporočila, ki niso vsiljena"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1950
+#: ../modules/mail/e-mail-shell-view-actions.c:2005
 msgid "Messages with Attachments"
 msgstr "Sporočila s prilogami"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1957
+#: ../modules/mail/e-mail-shell-view-actions.c:2012
 msgid "No Label"
 msgstr "Brez oznake"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1964
+#: ../modules/mail/e-mail-shell-view-actions.c:2019
 msgid "Read Messages"
 msgstr "Prebrana sporočila"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:1971
+#: ../modules/mail/e-mail-shell-view-actions.c:2026
 msgid "Unread Messages"
 msgstr "Neprebrana sporočila"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2023
+#: ../modules/mail/e-mail-shell-view-actions.c:2085
 msgid "Subject or Addresses contain"
 msgstr "Zadeva ali pošiljatelj vsebuje"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2033
+#: ../modules/mail/e-mail-shell-view-actions.c:2095
 msgid "All Accounts"
 msgstr "Vsi računi"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2040
+#: ../modules/mail/e-mail-shell-view-actions.c:2102
 msgid "Current Account"
 msgstr "Trenutni račun"
 
-#: ../modules/mail/e-mail-shell-view-actions.c:2047
+#: ../modules/mail/e-mail-shell-view-actions.c:2109
 msgid "Current Folder"
 msgstr "Trenutna mapa"
 
-#: ../modules/mail/e-mail-shell-view.c:636
+#: ../modules/mail/e-mail-shell-view.c:700
 msgid "All Account Search"
 msgstr "Iskanje po vseh računih"
 
-#: ../modules/mail/e-mail-shell-view.c:744
+#: ../modules/mail/e-mail-shell-view.c:808
 msgid "Account Search"
 msgstr "Iskanje računa"
 
-#: ../modules/mail/e-mail-shell-view-private.c:972
+#: ../modules/mail/e-mail-shell-view-private.c:986
 #, c-format
 msgid "%d selected, "
 msgid_plural "%d selected, "
@@ -19008,8 +21561,8 @@ msgstr[1] "%d izbrano, "
 msgstr[2] "%d izbrani, "
 msgstr[3] "%d izbrana, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:981
-#: ../modules/mail/e-mail-shell-view-private.c:998
+#: ../modules/mail/e-mail-shell-view-private.c:995
+#: ../modules/mail/e-mail-shell-view-private.c:1012
 #, c-format
 msgid "%d deleted"
 msgid_plural "%d deleted"
@@ -19018,8 +21571,8 @@ msgstr[1] "%d izbrisano"
 msgstr[2] "%d izbrisani"
 msgstr[3] "%d izbrisana"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1007
-#: ../modules/mail/e-mail-shell-view-private.c:1013
+#: ../modules/mail/e-mail-shell-view-private.c:1021
+#: ../modules/mail/e-mail-shell-view-private.c:1027
 #, c-format
 msgid "%d junk"
 msgid_plural "%d junk"
@@ -19028,7 +21581,7 @@ msgstr[1] "%d vsiljeno"
 msgstr[2] "%d vsiljeni"
 msgstr[3] "%d vsiljena"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1020
+#: ../modules/mail/e-mail-shell-view-private.c:1034
 #, c-format
 msgid "%d draft"
 msgid_plural "%d drafts"
@@ -19037,7 +21590,7 @@ msgstr[1] "%d osnutek"
 msgstr[2] "%d osnutka"
 msgstr[3] "%d osnutki"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1026
+#: ../modules/mail/e-mail-shell-view-private.c:1040
 #, c-format
 msgid "%d unsent"
 msgid_plural "%d unsent"
@@ -19046,7 +21599,7 @@ msgstr[1] "%d neposlano"
 msgstr[2] "%d neposlani"
 msgstr[3] "%d neposlana"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1032
+#: ../modules/mail/e-mail-shell-view-private.c:1046
 #, c-format
 msgid "%d sent"
 msgid_plural "%d sent"
@@ -19055,7 +21608,7 @@ msgstr[1] "%d poslano"
 msgstr[2] "%d poslani"
 msgstr[3] "%d poslana"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1044
+#: ../modules/mail/e-mail-shell-view-private.c:1058
 #, c-format
 msgid "%d unread, "
 msgid_plural "%d unread, "
@@ -19064,7 +21617,7 @@ msgstr[1] "%d neprebrano, "
 msgstr[2] "%d neprebrani, "
 msgstr[3] "%d neprebrana, "
 
-#: ../modules/mail/e-mail-shell-view-private.c:1047
+#: ../modules/mail/e-mail-shell-view-private.c:1061
 #, c-format
 msgid "%d total"
 msgid_plural "%d total"
@@ -19073,64 +21626,78 @@ msgstr[1] "skupaj: %d"
 msgstr[2] "skupaj: %d"
 msgstr[3] "skupaj: %d"
 
-#: ../modules/mail/e-mail-shell-view-private.c:1068
-msgid "Trash"
-msgstr "Smeti"
-
-#: ../modules/mail/e-mail-shell-view-private.c:1505
+#: ../modules/mail/e-mail-shell-view-private.c:1569
 msgid "Send / Receive"
 msgstr "Oddaja / sprejem"
 
-#: ../modules/mail/em-composer-prefs.c:443
+#: ../modules/mail/em-composer-prefs.c:394
 msgid "Select Folder to Add"
 msgstr "Izbor mape za dodajanje"
 
-#: ../modules/mail/em-composer-prefs.c:888
+#: ../modules/mail/em-composer-prefs.c:854
 msgid "Folder"
 msgstr "Mapa"
 
-#: ../modules/mail/em-composer-prefs.c:924
+#: ../modules/mail/em-composer-prefs.c:890
 msgid "Recipient"
 msgstr "Prejemnik"
 
-#: ../modules/mail/em-composer-prefs.c:1195
+#: ../modules/mail/em-composer-prefs.c:1163
+#, fuzzy
+msgid "Keep in Outbox"
+msgstr "_Shrani v mapo odhodne pošte"
+
+#: ../modules/mail/em-composer-prefs.c:1164
+#, fuzzy
+msgid "Send immediately"
+msgstr "Ali naj se odgovor pošlje zasebno?"
+
+#: ../modules/mail/em-composer-prefs.c:1165
+#, fuzzy
+msgid "Send after 5 minutes"
+msgstr "15 minut"
+
+#: ../modules/mail/em-composer-prefs.c:1238
 msgid "Language(s)"
 msgstr "Jezik(i)"
 
-#: ../modules/mail/em-mailer-prefs.c:80
+#: ../modules/mail/em-mailer-prefs.c:79
 msgid "On exit, every time"
 msgstr "Ob izhodu, vedno"
 
-#: ../modules/mail/em-mailer-prefs.c:81
-msgid "On exit, once per day"
+#: ../modules/mail/em-mailer-prefs.c:80
+#, fuzzy
+msgid "Once per day"
 msgstr "Ob izhodu, enkrat na dan"
 
-#: ../modules/mail/em-mailer-prefs.c:82
-msgid "On exit, once per week"
+#: ../modules/mail/em-mailer-prefs.c:81
+#, fuzzy
+msgid "Once per week"
 msgstr "Ob izhodu, enkrat na teden"
 
-#: ../modules/mail/em-mailer-prefs.c:83
-msgid "On exit, once per month"
+#: ../modules/mail/em-mailer-prefs.c:82
+#, fuzzy
+msgid "Once per month"
 msgstr "Ob izhodu, enkrat na mesec"
 
-#: ../modules/mail/em-mailer-prefs.c:84
+#: ../modules/mail/em-mailer-prefs.c:83
 msgid "Immediately, on folder leave"
 msgstr "Nemudoma, ob zapustitvi mape"
 
-#: ../modules/mail/em-mailer-prefs.c:355
+#: ../modules/mail/em-mailer-prefs.c:356
 msgid "Header"
 msgstr "Glava"
 
-#: ../modules/mail/em-mailer-prefs.c:359
+#: ../modules/mail/em-mailer-prefs.c:360
 msgid "Contains Value"
 msgstr "Vsebuje 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:1214
+#: ../modules/mail/em-mailer-prefs.c:1236
 msgid "_Date header:"
 msgstr "_Glava datuma:"
 
-#: ../modules/mail/em-mailer-prefs.c:1215
+#: ../modules/mail/em-mailer-prefs.c:1237
 msgid "Show _original header value"
 msgstr "Pokaži _izvirno vrednost glave"
 
@@ -19140,24 +21707,24 @@ msgstr "Ali želite, da Evolution postane vaš privzeti poštni odjemalec?"
 
 #. Translators: First %s is an email address, second %s
 #. * is the subject of the email, third %s is the date.
-#: ../modules/mdn/evolution-mdn.c:307
+#: ../modules/mdn/evolution-mdn.c:304
 #, c-format
 msgid "Your message to %s about \"%s\" on %s has been read."
 msgstr "Sporočilo za %s z zadevo \"%s\" poslano dne %s je prebrano."
 
 #. Translators: %s is the subject of the email message.
-#: ../modules/mdn/evolution-mdn.c:374
+#: ../modules/mdn/evolution-mdn.c:370
 #, c-format
 msgid "Delivery Notification for \"%s\""
 msgstr "Obvestilo o prejemu za \"%s\""
 
-#: ../modules/mdn/evolution-mdn.c:539
+#: ../modules/mdn/evolution-mdn.c:531
 #, c-format
 msgid "Send a read receipt to '%s'"
 msgstr "Pošlji povratnico za '%s'"
 
 #. name doesn't matter
-#: ../modules/mdn/evolution-mdn.c:544
+#: ../modules/mdn/evolution-mdn.c:536
 msgid "_Notify Sender"
 msgstr "_Pošlji povratnico"
 
@@ -19235,22 +21802,22 @@ msgstr "Prikaži različico HTML"
 msgid "Display HTML version of multipart/alternative message"
 msgstr "Prikaži različico HTML večdelnega/nadomestnega sporočila"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:77
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
 #: ../modules/prefer-plain/plugin/config-ui.c:43
 msgid "Show HTML if present"
 msgstr "Pokaži HTML, če je na voljo"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:78
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:79
 #: ../modules/prefer-plain/plugin/config-ui.c:44
 msgid "Let Evolution choose the best part to show."
 msgstr "Naj program sam izbere najboljši del za prikaz."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:81
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
 #: ../modules/prefer-plain/plugin/config-ui.c:47
 msgid "Show plain text if present"
 msgstr "Pokaži le običajno besedilo, če je prisotno"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:82
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:83
 #: ../modules/prefer-plain/plugin/config-ui.c:48
 msgid ""
 "Show plain text part, if present, otherwise let Evolution choose the best "
@@ -19259,12 +21826,12 @@ msgstr ""
 "Pokaži le običajno besedilo, v nasprotnem primeru pa naj program Evolution "
 "izbere najboljši način prikaza."
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:86
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
 #: ../modules/prefer-plain/plugin/config-ui.c:52
 msgid "Only ever show plain text"
 msgstr "Pokaži le običajno besedilo"
 
-#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:87
+#: ../modules/prefer-plain/e-mail-parser-prefer-plain.c:88
 #: ../modules/prefer-plain/plugin/config-ui.c:53
 msgid ""
 "Always show plain text part and make attachments from other parts, if "
@@ -19294,59 +21861,65 @@ msgstr "Način običajnega besedila"
 msgid "View mail messages as plain text, even if they contain HTML content."
 msgstr "Ogled sporočil kot običajno besedilo, tudi če vsebujejo vsebino HTML."
 
-#: ../modules/spamassassin/evolution-spamassassin.c:150
+#: ../modules/spamassassin/evolution-spamassassin.c:187
 #, c-format
 msgid "Failed to spawn SpamAssassin (%s): "
 msgstr "Oživitev vstavka SpamAssassin je spodletela (%s): "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:173
+#: ../modules/spamassassin/evolution-spamassassin.c:210
 msgid "Failed to stream mail message content to SpamAssassin: "
 msgstr ""
 "Pretakanje vsebine elektronskega sporočila na SpamAssassin je spodletelo:. "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:192
+#: ../modules/spamassassin/evolution-spamassassin.c:229
 #, c-format
 msgid "Failed to write '%s' to SpamAssassin: "
 msgstr "Ni mogoče zapisati '%s' za SpamAssassin: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:220
+#: ../modules/spamassassin/evolution-spamassassin.c:257
 msgid "Failed to read output from SpamAssassin: "
 msgstr "Branje odvoda vstavka SpamAssassin je spodletelo: "
 
-#: ../modules/spamassassin/evolution-spamassassin.c:275
+#: ../modules/spamassassin/evolution-spamassassin.c:312
 msgid "SpamAssassin either crashed or failed to process a mail message"
 msgstr "SpamAssassin se je ali sesul ali pa ni obdelal elektronskega sporočila"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:355
+#: ../modules/spamassassin/evolution-spamassassin.c:535
 msgid "SpamAssassin Options"
 msgstr "Možnosti SpamAssassin"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:370
+#: ../modules/spamassassin/evolution-spamassassin.c:550
 msgid "I_nclude remote tests"
 msgstr "Vključi oddalje_ne preskuse"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:384
+#: ../modules/spamassassin/evolution-spamassassin.c:564
 msgid "This will make SpamAssassin more reliable, but slower."
 msgstr ""
 "S tem bo postalo delovanje vstavka SpamAssasin bolj zanesljivo, vendar "
 "počasnejše"
 
-#: ../modules/spamassassin/evolution-spamassassin.c:558
+#: ../modules/spamassassin/evolution-spamassassin.c:739
+#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:1
 msgid "SpamAssassin"
 msgstr "SpamAssassin"
 
+#: ../modules/spamassassin/evolution-spamassassin.metainfo.xml.in.h:2
+#, fuzzy
+msgid "Junk filter using SpamAssassin"
+msgstr "Filtriranje vsiljene pošte:"
+
 #. Keep the title identical to EMailConfigImportPage
 #. * so it's only shown once in the assistant sidebar.
-#: ../modules/startup-wizard/e-mail-config-import-page.c:261
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:340
+#: ../modules/startup-wizard/e-mail-config-import-page.c:260
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:339
 msgid "Importing Files"
 msgstr "Uvažanje datotek"
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:259
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:258
 msgid "Import cancelled."
 msgstr "Uvoz je preklican."
 
-#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:276
+#: ../modules/startup-wizard/e-mail-config-import-progress-page.c:275
 msgid "Import complete."
 msgstr "Uvoz je končan."
 
@@ -19374,11 +21947,11 @@ msgstr "_Oblikuj kot ..."
 msgid "_Other languages"
 msgstr "_Drugi jeziki"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:482
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:438
 msgid "Text Highlight"
 msgstr "Poudarjanje besedila"
 
-#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:483
+#: ../modules/text-highlight/e-mail-formatter-text-highlight.c:439
 msgid "Syntax highlighting of mail parts"
 msgstr "Poudarjanje skladnje delov sporočila"
 
@@ -19406,10 +21979,6 @@ msgstr "_C#"
 msgid "_Cascade Style Sheet"
 msgstr "_CSS"
 
-#: ../modules/text-highlight/languages.c:72
-msgid "_HTML"
-msgstr "_HTML"
-
 #: ../modules/text-highlight/languages.c:80
 msgid "_Java"
 msgstr "_Java"
@@ -19571,30 +22140,26 @@ msgid "_Prolog"
 msgstr "_Prolog"
 
 #: ../modules/text-highlight/languages.c:323
-msgid "_PostScript"
-msgstr "_PostScript"
-
-#: ../modules/text-highlight/languages.c:328
 msgid "_R"
 msgstr "_R"
 
-#: ../modules/text-highlight/languages.c:333
+#: ../modules/text-highlight/languages.c:328
 msgid "_RPM Spec"
 msgstr "_RPM Spec"
 
-#: ../modules/text-highlight/languages.c:338
+#: ../modules/text-highlight/languages.c:333
 msgid "_Scala"
 msgstr "_Scala"
 
-#: ../modules/text-highlight/languages.c:343
+#: ../modules/text-highlight/languages.c:338
 msgid "_Smalltalk"
 msgstr "_Smalltalk"
 
-#: ../modules/text-highlight/languages.c:349
+#: ../modules/text-highlight/languages.c:344
 msgid "_TCSH"
 msgstr "_TCSH"
 
-#: ../modules/text-highlight/languages.c:354
+#: ../modules/text-highlight/languages.c:349
 msgid "_VHDL"
 msgstr "_VHDL"
 
@@ -19637,7 +22202,7 @@ msgstr "Prikaži del kot stik imenika"
 msgid "Evolution Web Inspector"
 msgstr "Evolution nadzornik spleta"
 
-#: ../plugins/attachment-reminder/attachment-reminder.c:122
+#: ../plugins/attachment-reminder/attachment-reminder.c:123
 msgid "_Do not show this message again."
 msgstr "Tega sporočila _ne prikaži več."
 
@@ -19674,35 +22239,35 @@ msgstr "Opomnik prilog"
 msgid "Reminds you when you forgot to add an attachment to a mail message."
 msgstr "Opomnik v primeru da pozabite dodati prilogo poštnemu sporočilu."
 
-#: ../plugins/bbdb/bbdb.c:694 ../plugins/bbdb/bbdb.c:703
+#: ../plugins/bbdb/bbdb.c:724 ../plugins/bbdb/bbdb.c:835
 #: ../plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml.h:1
 msgid "Automatic Contacts"
 msgstr "Samodejni stiki"
 
 #. Enable BBDB checkbox
-#: ../plugins/bbdb/bbdb.c:718
+#: ../plugins/bbdb/bbdb.c:739
 msgid "Create _address book entries when sending mails"
 msgstr "_Ustvari vnose v imeniku pri odgovarjanju na sporočila"
 
-#: ../plugins/bbdb/bbdb.c:725
+#: ../plugins/bbdb/bbdb.c:749
 msgid "Select Address book for Automatic Contacts"
 msgstr "Izberite imenik za samodejne stike"
 
-#: ../plugins/bbdb/bbdb.c:742
+#: ../plugins/bbdb/bbdb.c:769
 msgid "Instant Messaging Contacts"
 msgstr "Stiki hipnega sporočanja"
 
 #. Enable Gaim Checkbox
-#: ../plugins/bbdb/bbdb.c:757
+#: ../plugins/bbdb/bbdb.c:784
 msgid "_Synchronize contact info and images from Pidgin buddy list"
 msgstr "_Uskladi podatke in slike stikov s seznama stikov programa Pidgin"
 
-#: ../plugins/bbdb/bbdb.c:764
+#: ../plugins/bbdb/bbdb.c:794
 msgid "Select Address book for Pidgin buddy list"
 msgstr "Izberite imenik za seznam stikov Pidgin"
 
 #. Synchronize now button.
-#: ../plugins/bbdb/bbdb.c:777
+#: ../plugins/bbdb/bbdb.c:810
 msgid "Synchronize with _buddy list now"
 msgstr "Uskladi s _seznamom prijateljev"
 
@@ -19780,12 +22345,12 @@ msgctxt "email-custom-header"
 msgid "None"
 msgstr "Brez"
 
-#: ../plugins/email-custom-header/email-custom-header.c:538
+#: ../plugins/email-custom-header/email-custom-header.c:539
 msgid "_Custom Header"
 msgstr "_Glava sporočila po meri"
 
 #. To translators: This string is used while adding a new message header to configuration, to specifying the 
format of the key values
-#: ../plugins/email-custom-header/email-custom-header.c:808
+#: ../plugins/email-custom-header/email-custom-header.c:809
 msgid ""
 "The format for specifying a Custom Header key value is:\n"
 "Name of the Custom Header key values separated by \";\"."
@@ -19793,11 +22358,11 @@ msgstr ""
 "Oblika za navajanje glave po meri je:\n"
 "Ime vrednosti glave po meri ločenih z znakom \";\"."
 
-#: ../plugins/email-custom-header/email-custom-header.c:861
+#: ../plugins/email-custom-header/email-custom-header.c:862
 msgid "Key"
 msgstr "Ključ"
 
-#: ../plugins/email-custom-header/email-custom-header.c:878
+#: ../plugins/email-custom-header/email-custom-header.c:879
 #: ../plugins/templates/templates.c:487
 msgid "Values"
 msgstr "Vrednosti"
@@ -19831,8 +22396,8 @@ msgstr ""
 msgid "_Automatically launch when a new mail is edited"
 msgstr "_Samodejno zaženi med urejanjem nove pošte"
 
-#: ../plugins/external-editor/external-editor.c:417
-#: ../plugins/external-editor/external-editor.c:419
+#: ../plugins/external-editor/external-editor.c:469
+#: ../plugins/external-editor/external-editor.c:471
 msgid "Compose in External Editor"
 msgstr "Sestavi v zunanjem urejevalniku"
 
@@ -19930,14 +22495,6 @@ msgstr "Ni slika"
 msgid "The file you selected does not look like a valid .png image. Error: {0}"
 msgstr "Izbrana datoteka ni veljavna slika .png. Napaka: {0}"
 
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:1
-msgid "Inline Image"
-msgstr "Slika znotraj sporočila"
-
-#: ../plugins/image-inline/org-gnome-image-inline.eplug.xml.h:2
-msgid "View image attachments directly in mail messages."
-msgstr "Pregled slikovnih prilog neposredno v poštnih sporočilih."
-
 #: ../plugins/mailing-list-actions/mailing-list-actions.c:364
 msgid "Get List _Archive"
 msgstr "Pridobi _arhiv seznama"
@@ -20156,7 +22713,28 @@ msgstr "Ob prejemu novega sporočila se prikaže obvestilo."
 msgid "Created from a mail by %s"
 msgstr "Ustvarjeno iz pošte z %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:613
+#. Translators: Dialog button to Cancel edit of an existing event/memo/task
+#: ../plugins/mail-to-task/mail-to-task.c:594
+#, fuzzy
+msgctxt "mail-to-task"
+msgid "_Cancel"
+msgstr "_Prekliči"
+
+#. Translators: Dialog button to Edit an existing event/memo/task
+#: ../plugins/mail-to-task/mail-to-task.c:596
+#, fuzzy
+msgctxt "mail-to-task"
+msgid "_Edit"
+msgstr "_Uredi"
+
+#. Translators: Dialog button to create a New event/memo/task
+#: ../plugins/mail-to-task/mail-to-task.c:598
+#, fuzzy
+msgctxt "mail-to-task"
+msgid "_New"
+msgstr "_Nova"
+
+#: ../plugins/mail-to-task/mail-to-task.c:616
 #, c-format
 msgid ""
 "Selected calendar contains event '%s' already. Would you like to edit the "
@@ -20164,7 +22742,7 @@ msgid ""
 msgstr ""
 "Izbran koledar že vsebuje dogodek '%s'. Ali želite urejati stari dogodek?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:616
+#: ../plugins/mail-to-task/mail-to-task.c:619
 #, c-format
 msgid ""
 "Selected task list contains task '%s' already. Would you like to edit the "
@@ -20172,7 +22750,7 @@ msgid ""
 msgstr ""
 "Izbran seznam nalog že vsebuje nalogo '%s'. Ali želite urediti staro nalogo?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:619
+#: ../plugins/mail-to-task/mail-to-task.c:622
 #, c-format
 msgid ""
 "Selected memo list contains memo '%s' already. Would you like to edit the "
@@ -20180,7 +22758,7 @@ msgid ""
 msgstr ""
 "Izbran koledar že vsebuje opomnik '%s'. Ali želite urejati star opomnik?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:639
+#: ../plugins/mail-to-task/mail-to-task.c:642
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to events. Do you really want to "
@@ -20201,7 +22779,7 @@ msgstr[3] ""
 "Izbrana so %d elektronska sporočila za pretvarjanje v dogodke koledarja. Ali "
 "zares želite nadaljevati?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:646
+#: ../plugins/mail-to-task/mail-to-task.c:649
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to tasks. Do you really want to "
@@ -20222,7 +22800,7 @@ msgstr[3] ""
 "Izbrana so %d elektronska sporočila za pretvarjanje v naloge. Ali zares "
 "želite nadaljevati?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:653
+#: ../plugins/mail-to-task/mail-to-task.c:656
 #, c-format
 msgid ""
 "You have selected %d mails to be converted to memos. Do you really want to "
@@ -20243,30 +22821,30 @@ msgstr[3] ""
 "Izbrana so %d elektronska sporočila za pretvarjanje v opomnike. Ali zares "
 "želite nadaljevati?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:674
+#: ../plugins/mail-to-task/mail-to-task.c:677
 msgid "Do you wish to continue converting remaining mails?"
 msgstr ""
 "Ali želite nadaljevati s pretvarjanjem preostalih elektronskih sporočil?"
 
-#: ../plugins/mail-to-task/mail-to-task.c:750
+#: ../plugins/mail-to-task/mail-to-task.c:753
 msgid "[No Summary]"
 msgstr "[Brez povzetka]"
 
-#: ../plugins/mail-to-task/mail-to-task.c:763
+#: ../plugins/mail-to-task/mail-to-task.c:766
 msgid "Invalid object returned from a server"
 msgstr "Strežnik je vrnil neveljaven predmet"
 
-#: ../plugins/mail-to-task/mail-to-task.c:818
+#: ../plugins/mail-to-task/mail-to-task.c:821
 #, c-format
 msgid "An error occurred during processing: %s"
 msgstr "Prišlo je do napake med obdelavo: %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:852
+#: ../plugins/mail-to-task/mail-to-task.c:857
 #, c-format
 msgid "Cannot open calendar. %s"
 msgstr "Ni mogoče odpreti koledarja. %s"
 
-#: ../plugins/mail-to-task/mail-to-task.c:856
+#: ../plugins/mail-to-task/mail-to-task.c:861
 msgid ""
 "Selected calendar is read only, thus cannot create event there. Select other "
 "calendar, please."
@@ -20274,7 +22852,7 @@ msgstr ""
 "Izbrani koledar je le za branje, zato dogodka ni mogoče ustvariti. Izberite "
 "drug koledar."
 
-#: ../plugins/mail-to-task/mail-to-task.c:859
+#: ../plugins/mail-to-task/mail-to-task.c:864
 msgid ""
 "Selected task list is read only, thus cannot create task there. Select other "
 "task list, please."
@@ -20282,7 +22860,7 @@ msgstr ""
 "Izbran senzam nalog je le za branje, zato je ni mogoče ustvariti. Izberite "
 "drug seznam."
 
-#: ../plugins/mail-to-task/mail-to-task.c:862
+#: ../plugins/mail-to-task/mail-to-task.c:867
 msgid ""
 "Selected memo list is read only, thus cannot create memo there. Select other "
 "memo list, please."
@@ -20290,35 +22868,35 @@ msgstr ""
 "Izbrani seznam opomnikov je le za branje, zato opomnika ni mogoče ustvariti. "
 "Izberite drug seznam."
 
-#: ../plugins/mail-to-task/mail-to-task.c:1261
+#: ../plugins/mail-to-task/mail-to-task.c:1269
 msgid "Create an _Appointment"
 msgstr "Ustvari _sestanek"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1263
+#: ../plugins/mail-to-task/mail-to-task.c:1271
 msgid "Create a new event from the selected message"
 msgstr "Ustvari nov dogodek iz izbranega sporočila"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1268
+#: ../plugins/mail-to-task/mail-to-task.c:1276
 msgid "Create a Mem_o"
 msgstr "Ustvari _opomnik"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1270
+#: ../plugins/mail-to-task/mail-to-task.c:1278
 msgid "Create a new memo from the selected message"
 msgstr "Ustvari nov opomnik iz izbranega sporočila"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1275
+#: ../plugins/mail-to-task/mail-to-task.c:1283
 msgid "Create a _Task"
 msgstr "Ustvari _nalogo"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1277
+#: ../plugins/mail-to-task/mail-to-task.c:1285
 msgid "Create a new task from the selected message"
 msgstr "Ustvari novo nalogo iz izbranega sporočila"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1285
+#: ../plugins/mail-to-task/mail-to-task.c:1293
 msgid "Create a _Meeting"
 msgstr "Ustvari  _srečanje"
 
-#: ../plugins/mail-to-task/mail-to-task.c:1287
+#: ../plugins/mail-to-task/mail-to-task.c:1295
 msgid "Create a new meeting from the selected message"
 msgstr "Ustvari novo srečanje iz izbranega sporočila"
 
@@ -20413,11 +22991,11 @@ msgstr "Ali ste prepričani, da želite odstraniti to mesto?"
 #. To Translators: This is shown to a user when creation of a new thread,
 #. * where the publishing should be done, fails. Basically, this shouldn't
 #. * ever happen, and if so, then something is really wrong.
-#: ../plugins/publish-calendar/publish-calendar.c:1142
+#: ../plugins/publish-calendar/publish-calendar.c:1144
 msgid "Could not create publish thread."
 msgstr "Ni mogoče objaviti niti sporočil."
 
-#: ../plugins/publish-calendar/publish-calendar.c:1152
+#: ../plugins/publish-calendar/publish-calendar.c:1154
 msgid "_Publish Calendar Information"
 msgstr "Objavi _podatke o koledarju"
 
@@ -20498,6 +23076,7 @@ msgid "_Username:"
 msgstr "_Uporabniško ime:"
 
 #: ../plugins/publish-calendar/publish-calendar.ui.h:29
+#: ../smime/gui/certificate-manager.c:772
 msgid "_Password:"
 msgstr "_Geslo:"
 
@@ -20509,8 +23088,8 @@ msgstr "Za_pomni si geslo"
 msgid "Publishing Location"
 msgstr "Mesto objave"
 
-#: ../plugins/publish-calendar/publish-format-fb.c:99
-#: ../plugins/publish-calendar/publish-format-ical.c:102
+#: ../plugins/publish-calendar/publish-format-fb.c:101
+#: ../plugins/publish-calendar/publish-format-ical.c:104
 #, c-format
 msgid "Invalid source UID '%s'"
 msgstr "Neveljaven naslov URI vira '%s'"
@@ -20627,15 +23206,15 @@ msgstr "%FT%T"
 msgid "RDF (.rdf)"
 msgstr "RDF (.rdf)"
 
-#: ../plugins/save-calendar/save-calendar.c:120
+#: ../plugins/save-calendar/save-calendar.c:119
 msgid "_Format:"
 msgstr "_Oblika:"
 
-#: ../plugins/save-calendar/save-calendar.c:186
+#: ../plugins/save-calendar/save-calendar.c:184
 msgid "Select destination file"
 msgstr "Izberite ciljno datoteko"
 
-#: ../plugins/save-calendar/save-calendar.c:190
+#: ../plugins/save-calendar/save-calendar.c:188
 msgid "_Save As"
 msgstr "_Shrani kot"
 
@@ -20661,34 +23240,38 @@ msgstr ""
 "$ORIG[zadeva], $ORIG[od], $ORIG[za] ali $ORIG[telo], ki bodo zamenjane z "
 "vrednostmi iz elektronskega sporočila, na katerega odgovarjate."
 
-#: ../plugins/templates/templates.c:1146
+#: ../plugins/templates/templates.c:1199
 msgid "No Title"
 msgstr "Brez naslova"
 
-#: ../plugins/templates/templates.c:1255
+#: ../plugins/templates/templates.c:1308
 msgid "Save as _Template"
 msgstr "Shrani kot _predlogo"
 
-#: ../plugins/templates/templates.c:1257
+#: ../plugins/templates/templates.c:1310
 msgid "Save as Template"
 msgstr "Shrani kot predlogo"
 
-#: ../shell/e-shell.c:302
+#: ../shell/e-shell.c:335
 msgid "Preparing to go offline..."
 msgstr "Priprava za delo brez povezave ..."
 
-#: ../shell/e-shell.c:355
+#: ../shell/e-shell.c:388
 msgid "Preparing to go online..."
 msgstr "Priprava za delo v povezavi ..."
 
-#: ../shell/e-shell.c:436
+#: ../shell/e-shell.c:495
 msgid "Preparing to quit"
 msgstr "Priprava na končanje"
 
-#: ../shell/e-shell.c:442
+#: ../shell/e-shell.c:501
 msgid "Preparing to quit..."
 msgstr "Priprava na končanje ..."
 
+#: ../shell/e-shell.c:909
+msgid "Credentials are required to connect to the destination host."
+msgstr ""
+
 #: ../shell/e-shell-content.c:720 ../shell/e-shell-content.c:721
 msgid "Searches"
 msgstr "Iskanja"
@@ -20725,164 +23308,169 @@ msgstr "vCard (.vcf)"
 msgid "All Files (*)"
 msgstr "Vse datoteke (*)"
 
-#: ../shell/e-shell-view.c:291
+#: ../shell/e-shell-view.c:292
 msgid "Saving user interface state"
 msgstr "Shranjevanje stanja uporabniškega vmesnika"
 
 #. The translator-credits string is for translators to list
 #. * per-language credits for translation, displayed in the
 #. * about dialog.
-#: ../shell/e-shell-window-actions.c:73
+#: ../shell/e-shell-window-actions.c:72
 msgid "translator-credits"
 msgstr ""
 "Matjaž Horvat <m owca info>\n"
 "Matej Urbančič <mateju svn gnome org>\n"
 "Andrej Žnidaršič <andrej znidarsic gmail com>"
 
-#: ../shell/e-shell-window-actions.c:84
+#: ../shell/e-shell-window-actions.c:83
 msgid "Evolution Website"
 msgstr "Evolution spletna stran"
 
-#: ../shell/e-shell-window-actions.c:340
+#: ../shell/e-shell-window-actions.c:339
 msgid "Categories Editor"
 msgstr "Urejevalnik kategorij"
 
-#: ../shell/e-shell-window-actions.c:716
+#: ../shell/e-shell-window-actions.c:715
 msgid "Bug Buddy is not installed."
 msgstr "Program Bug buddy ni nameščen."
 
-#: ../shell/e-shell-window-actions.c:717
+#: ../shell/e-shell-window-actions.c:716
 msgid "Bug Buddy could not be run."
 msgstr "Programa Bug buddy ni mogoče zagnati."
 
-#: ../shell/e-shell-window-actions.c:895
+#: ../shell/e-shell-window-actions.c:894
 msgid "_About"
 msgstr "_O programu"
 
-#: ../shell/e-shell-window-actions.c:897
+#: ../shell/e-shell-window-actions.c:896
 msgid "Show information about Evolution"
 msgstr "Pokaže podatke o Evolutionu"
 
-#: ../shell/e-shell-window-actions.c:902 ../shell/e-shell-window-actions.c:916
+#: ../shell/e-shell-window-actions.c:901 ../shell/e-shell-window-actions.c:915
 msgid "_Close Window"
 msgstr "_Zapri okno"
 
-#: ../shell/e-shell-window-actions.c:923
+#: ../shell/e-shell-window-actions.c:922
 msgid "_Contents"
 msgstr "_Vsebina"
 
-#: ../shell/e-shell-window-actions.c:925
+#: ../shell/e-shell-window-actions.c:924
 msgid "Open the Evolution User Guide"
 msgstr "Odpre uporabniško pomoč programa"
 
-#: ../shell/e-shell-window-actions.c:951
+#: ../shell/e-shell-window-actions.c:950
 msgid "I_mport..."
 msgstr "_Uvozi ..."
 
-#: ../shell/e-shell-window-actions.c:953
+#: ../shell/e-shell-window-actions.c:952
 msgid "Import data from other programs"
 msgstr "Uvozi podatke iz drugih programov"
 
-#: ../shell/e-shell-window-actions.c:958
+#: ../shell/e-shell-window-actions.c:957
 msgid "New _Window"
 msgstr "Novo _okno"
 
-#: ../shell/e-shell-window-actions.c:960
+#: ../shell/e-shell-window-actions.c:959
 msgid "Create a new window displaying this view"
 msgstr "Ustvari novo okno s prikazom tega pogleda"
 
-#: ../shell/e-shell-window-actions.c:972
+#: ../shell/e-shell-window-actions.c:971
 msgid "Available Cate_gories"
 msgstr "Razpoložljive _kategorije"
 
-#: ../shell/e-shell-window-actions.c:974
+#: ../shell/e-shell-window-actions.c:973
 msgid "Manage available categories"
 msgstr "Upravljanje z razpoložljivimi kategorijami"
 
-#: ../shell/e-shell-window-actions.c:986
+#: ../shell/e-shell-window-actions.c:985
 msgid "_Quick Reference"
 msgstr "_Hitri priročnik"
 
-#: ../shell/e-shell-window-actions.c:988
+#: ../shell/e-shell-window-actions.c:987
 msgid "Show Evolution's shortcut keys"
 msgstr "Pokaži tipkovne bližnjice programa Evolution"
 
-#: ../shell/e-shell-window-actions.c:993
+#: ../shell/e-shell-window-actions.c:992
 msgid "_Quit"
 msgstr "_Končaj"
 
-#: ../shell/e-shell-window-actions.c:995
+#: ../shell/e-shell-window-actions.c:994
 msgid "Exit the program"
 msgstr "Izhod iz programa"
 
-#: ../shell/e-shell-window-actions.c:1000
+#: ../shell/e-shell-window-actions.c:999
 msgid "_Advanced Search..."
 msgstr "N_apredno iskanje ..."
 
-#: ../shell/e-shell-window-actions.c:1002
+#: ../shell/e-shell-window-actions.c:1001
 msgid "Construct a more advanced search"
 msgstr "Sestavljanje naprednejšega iskanja"
 
-#: ../shell/e-shell-window-actions.c:1009
+#: ../shell/e-shell-window-actions.c:1008
 msgid "Clear the current search parameters"
 msgstr "Počisti trenutne parametre iskanja"
 
-#: ../shell/e-shell-window-actions.c:1014
+#: ../shell/e-shell-window-actions.c:1013
 msgid "_Edit Saved Searches..."
 msgstr "_Uredi shranjena iskanja ..."
 
-#: ../shell/e-shell-window-actions.c:1016
+#: ../shell/e-shell-window-actions.c:1015
 msgid "Manage your saved searches"
 msgstr "Upravljanje s shranjenimi iskanji"
 
-#: ../shell/e-shell-window-actions.c:1023
+#: ../shell/e-shell-window-actions.c:1022
 msgid "Click here to change the search type"
 msgstr "Kliknite tukaj za zamenjavo vrste iskanja"
 
-#: ../shell/e-shell-window-actions.c:1028
+#: ../shell/e-shell-window-actions.c:1027
 msgid "_Find Now"
 msgstr "_Najdi zdaj"
 
-#: ../shell/e-shell-window-actions.c:1030
+#: ../shell/e-shell-window-actions.c:1029
 msgid "Execute the current search parameters"
 msgstr "Izvedi trenutna parametre iskanja"
 
-#: ../shell/e-shell-window-actions.c:1035
+#: ../shell/e-shell-window-actions.c:1034
 msgid "_Save Search..."
 msgstr "_Shrani iskanje ..."
 
-#: ../shell/e-shell-window-actions.c:1037
+#: ../shell/e-shell-window-actions.c:1036
 msgid "Save the current search parameters"
 msgstr "Shrani trenutne parametre iskanja"
 
-#: ../shell/e-shell-window-actions.c:1049
+#: ../shell/e-shell-window-actions.c:1048
 msgid "Submit _Bug Report..."
 msgstr "Pošlji _poročilo o hrošču ..."
 
-#: ../shell/e-shell-window-actions.c:1051
+#: ../shell/e-shell-window-actions.c:1050
 msgid "Submit a bug report using Bug Buddy"
 msgstr "Pošlje poročilo o hrošču z uporabo progama Bug buddy"
 
-#: ../shell/e-shell-window-actions.c:1056
+#: ../shell/e-shell-window-actions.c:1055
 msgid "_Work Offline"
 msgstr "_Delo brez povezave"
 
-#: ../shell/e-shell-window-actions.c:1058
+#: ../shell/e-shell-window-actions.c:1057
 msgid "Put Evolution into offline mode"
 msgstr "Nadaljuje v načinu brez povezave"
 
-#: ../shell/e-shell-window-actions.c:1063
+#: ../shell/e-shell-window-actions.c:1062
 msgid "_Work Online"
 msgstr "_Delo s povezavo"
 
-#: ../shell/e-shell-window-actions.c:1065
+#: ../shell/e-shell-window-actions.c:1064
 msgid "Put Evolution into online mode"
 msgstr "Nadaljuje v povezanem načinu"
 
-#: ../shell/e-shell-window-actions.c:1093
+#: ../shell/e-shell-window-actions.c:1092
 msgid "Lay_out"
 msgstr "Razp_oreditev"
 
+#. Translators: This is a New menu item caption, under File->New
+#: ../shell/e-shell-window-actions.c:1100
+msgid "_New"
+msgstr "_Nova"
+
 #: ../shell/e-shell-window-actions.c:1107
 msgid "_Search"
 msgstr "I_skanje"
@@ -21010,7 +23598,11 @@ msgstr "Izbriši pogled: %s"
 msgid "Execute these search parameters"
 msgstr "Izvedi te parametre iskanja"
 
-#: ../shell/e-shell-window.c:503
+#. Translators: a 'New' toolbar button caption which is context sensitive and
+#. runs one of the actions under File->New menu
+#: ../shell/e-shell-window.c:505
+#, fuzzy
+msgctxt "toolbar-button"
 msgid "New"
 msgstr "Nov"
 
@@ -21021,7 +23613,7 @@ msgid "%s - Evolution"
 msgstr "%s - Evolution"
 
 #. Preview/Alpha/Beta version warning message
-#: ../shell/main.c:182
+#: ../shell/main.c:183
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -21056,7 +23648,7 @@ msgstr ""
 "Upamo, da boste uživali sadove našega trdega dela, in nestrpno\n"
 "pričakujemo vaše prispevke!\n"
 
-#: ../shell/main.c:206
+#: ../shell/main.c:207
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -21064,13 +23656,13 @@ msgstr ""
 "Hvala!\n"
 "Ekipa Evolution\n"
 
-#: ../shell/main.c:212
+#: ../shell/main.c:213
 msgid "Do not tell me again"
 msgstr "Ne opozarjaj več"
 
 #. Translators: Do NOT translate the five component
 #. * names, they MUST remain in English!
-#: ../shell/main.c:301
+#: ../shell/main.c:302
 msgid ""
 "Start Evolution showing the specified component. Available options are "
 "'mail', 'calendar', 'contacts', 'tasks', and 'memos'"
@@ -21078,39 +23670,39 @@ msgstr ""
 "Zaženi Evolution, ki prikazuje določen sestavni del. Razpoložljive možnosti "
 "so 'pošta', 'koledar', 'stiki', 'naloge' in 'opomniki'"
 
-#: ../shell/main.c:305
+#: ../shell/main.c:306
 msgid "Apply the given geometry to the main window"
 msgstr "Uveljavi podane nastavitve velikosti na glavnem oknu"
 
-#: ../shell/main.c:309
+#: ../shell/main.c:310
 msgid "Start in online mode"
 msgstr "Začni v povezanemu načinu"
 
-#: ../shell/main.c:311
+#: ../shell/main.c:312
 msgid "Ignore network availability"
 msgstr "Prezri razpoložljivost omrežja"
 
-#: ../shell/main.c:314
+#: ../shell/main.c:315
 msgid "Forcibly shut down Evolution"
 msgstr "Vsiljeno končaj program Evolution"
 
-#: ../shell/main.c:317
+#: ../shell/main.c:318
 msgid "Disable loading of any plugins."
 msgstr "Onemogoči nalaganje vseh vstavkov."
 
-#: ../shell/main.c:319
+#: ../shell/main.c:320
 msgid "Disable preview pane of Mail, Contacts and Tasks."
 msgstr "Onemogoči pladenj predogleda za pošto, stike in naloge."
 
-#: ../shell/main.c:323
+#: ../shell/main.c:324
 msgid "Import URIs or filenames given as rest of arguments."
 msgstr "Uvozi naslove URI ali imena datotek podana kot argumenti."
 
-#: ../shell/main.c:325
+#: ../shell/main.c:326
 msgid "Request a running Evolution process to quit"
 msgstr "Zahteva po končanju programa Evolution"
 
-#: ../shell/main.c:402
+#: ../shell/main.c:403
 #, c-format
 msgid ""
 "Cannot start Evolution.  Another Evolution instance may be unresponsive. "
@@ -21119,11 +23711,11 @@ msgstr ""
 "Programa Evolution ni mogoče zagnati. Morda se že zagnani program Evolution "
 "ne odziva. Sistemska napaka: %s"
 
-#: ../shell/main.c:496 ../shell/main.c:501
+#: ../shell/main.c:457 ../shell/main.c:462
 msgid "- The Evolution PIM and Email Client"
 msgstr "- Poštni odjemalec in PIM Evolution"
 
-#: ../shell/main.c:568
+#: ../shell/main.c:520
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -21132,7 +23724,7 @@ msgstr ""
 "%s: --online in --offline ne moreta biti uporabljena sočasno.\n"
 " Uporabite '%s --help' za več podrobnosti.\n"
 
-#: ../shell/main.c:574
+#: ../shell/main.c:526
 #, c-format
 msgid ""
 "%s: --force-online and --offline cannot be used together.\n"
@@ -21178,7 +23770,65 @@ msgstr ""
 "Evolution ne podpira neposredne nadgradnje z različice {0}. Namesto tega "
 "poskusite najprej posodobiti na Evolution 2 in nato na Evolution 3."
 
-#: ../smime/gui/ca-trust-dialog.c:108
+#: ../shell/shell.error.xml.h:11
+#, fuzzy
+msgid "Close Evolution with pending background operations?"
+msgstr "Neznano ozadnje opravilo"
+
+#: ../shell/shell.error.xml.h:12
+msgid ""
+"Evolution is taking a long time to shut down, possibly due to network "
+"connectivity issues. Would you like to cancel all pending operations and "
+"close immediately, or keep waiting?"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:13
+msgid "_Close Immediately"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:14
+#, fuzzy
+msgid "Keep _Waiting"
+msgstr "Čakanje ..."
+
+#: ../shell/shell.error.xml.h:15
+#, fuzzy
+msgid "Failed to get values from '{0}'"
+msgstr "Ni mogoče odpreti imenika '{0}'"
+
+#: ../shell/shell.error.xml.h:16
+#, fuzzy
+msgid "Failed to invoke authenticate for '{0}'"
+msgstr "Premikanje dogodka v koledar '{0}' je spodletelo"
+
+#: ../shell/shell.error.xml.h:17
+#, fuzzy
+msgid "Failed to connect to '{0}'"
+msgstr "Kopiranje dogodka v koledar '{0}' je spodletelo"
+
+#: ../shell/shell.error.xml.h:18
+#, fuzzy
+msgid "_Reconnect"
+msgstr "_Obnovi"
+
+#: ../shell/shell.error.xml.h:19
+#, fuzzy
+msgid "Failed to prompt for credentials for '{0}'"
+msgstr "Kopiranje dogodka v koledar '{0}' je spodletelo"
+
+#: ../shell/shell.error.xml.h:20
+msgid "Failed to finish trust prompt for '{0}'"
+msgstr ""
+
+#: ../shell/shell.error.xml.h:21
+msgid "SSL certificate for '{0}' is not trusted."
+msgstr ""
+
+#: ../shell/shell.error.xml.h:22
+msgid "Reason: {1}"
+msgstr ""
+
+#: ../smime/gui/ca-trust-dialog.c:106
 #, c-format
 msgid ""
 "Certificate '%s' is a CA certificate.\n"
@@ -21189,101 +23839,287 @@ msgstr ""
 "\n"
 "Uredi nastavitve zaupanja:"
 
-#: ../smime/gui/certificate-manager.c:80 ../smime/gui/certificate-manager.c:99
-#: ../smime/gui/certificate-manager.c:119
+#: ../smime/gui/certificate-manager.c:84
+#: ../smime/gui/certificate-manager.c:103
+#: ../smime/gui/certificate-manager.c:123
 msgid "Certificate Name"
 msgstr "Ime potrdila"
 
-#: ../smime/gui/certificate-manager.c:81
-#: ../smime/gui/certificate-manager.c:101
+#: ../smime/gui/certificate-manager.c:85
+#: ../smime/gui/certificate-manager.c:105
 msgid "Issued To Organization"
 msgstr "Izdano za organizacijo"
 
-#: ../smime/gui/certificate-manager.c:82
-#: ../smime/gui/certificate-manager.c:102
+#: ../smime/gui/certificate-manager.c:86
+#: ../smime/gui/certificate-manager.c:106
 msgid "Issued To Organizational Unit"
 msgstr "Izdano za oddelek organizacije"
 
-#: ../smime/gui/certificate-manager.c:83
-#: ../smime/gui/certificate-manager.c:103
-#: ../smime/gui/certificate-manager.c:121
+#: ../smime/gui/certificate-manager.c:87
+#: ../smime/gui/certificate-manager.c:107
+#: ../smime/gui/certificate-manager.c:125
 msgid "Serial Number"
 msgstr "Zaporedna številka"
 
-#: ../smime/gui/certificate-manager.c:84
-#: ../smime/gui/certificate-manager.c:104
-#: ../smime/gui/certificate-manager.c:122
+#: ../smime/gui/certificate-manager.c:88
+#: ../smime/gui/certificate-manager.c:108
+#: ../smime/gui/certificate-manager.c:126
 msgid "Purposes"
 msgstr "Nameni"
 
-#: ../smime/gui/certificate-manager.c:85
-#: ../smime/gui/certificate-manager.c:105
-#: ../smime/gui/certificate-manager.c:123
+#: ../smime/gui/certificate-manager.c:89
+#: ../smime/gui/certificate-manager.c:109
+#: ../smime/gui/certificate-manager.c:127
 msgid "Issued By"
 msgstr "Izdajatelj"
 
-#: ../smime/gui/certificate-manager.c:86
-#: ../smime/gui/certificate-manager.c:106
-#: ../smime/gui/certificate-manager.c:124
+#: ../smime/gui/certificate-manager.c:90
+#: ../smime/gui/certificate-manager.c:110
+#: ../smime/gui/certificate-manager.c:128
 msgid "Issued By Organization"
 msgstr "Izdano s strani organizacije"
 
-#: ../smime/gui/certificate-manager.c:87
-#: ../smime/gui/certificate-manager.c:107
-#: ../smime/gui/certificate-manager.c:125
+#: ../smime/gui/certificate-manager.c:91
+#: ../smime/gui/certificate-manager.c:111
+#: ../smime/gui/certificate-manager.c:129
 msgid "Issued By Organizational Unit"
 msgstr "Izdano s strani oddelka organizacije"
 
-#: ../smime/gui/certificate-manager.c:88
-#: ../smime/gui/certificate-manager.c:108
-#: ../smime/gui/certificate-manager.c:126
+#: ../smime/gui/certificate-manager.c:92
+#: ../smime/gui/certificate-manager.c:112
+#: ../smime/gui/certificate-manager.c:130
 msgid "Issued"
 msgstr "Izdano"
 
-#: ../smime/gui/certificate-manager.c:89
-#: ../smime/gui/certificate-manager.c:109
-#: ../smime/gui/certificate-manager.c:127
+#: ../smime/gui/certificate-manager.c:93
+#: ../smime/gui/certificate-manager.c:113
+#: ../smime/gui/certificate-manager.c:131
 msgid "Expires"
 msgstr "Poteče"
 
-#: ../smime/gui/certificate-manager.c:90
-#: ../smime/gui/certificate-manager.c:110
-#: ../smime/gui/certificate-manager.c:128
+#: ../smime/gui/certificate-manager.c:94
+#: ../smime/gui/certificate-manager.c:114
+#: ../smime/gui/certificate-manager.c:132
 msgid "SHA1 Fingerprint"
 msgstr "Prstni odtis SHA1"
 
-#: ../smime/gui/certificate-manager.c:91
-#: ../smime/gui/certificate-manager.c:111
-#: ../smime/gui/certificate-manager.c:129
+#: ../smime/gui/certificate-manager.c:95
+#: ../smime/gui/certificate-manager.c:115
+#: ../smime/gui/certificate-manager.c:133
 msgid "MD5 Fingerprint"
 msgstr "Prstni odtis MD5"
 
-#: ../smime/gui/certificate-manager.c:100
-#: ../smime/gui/certificate-manager.c:120
+#: ../smime/gui/certificate-manager.c:104
+#: ../smime/gui/certificate-manager.c:124
 msgid "Email Address"
 msgstr "Elektronski naslov"
 
-#: ../smime/gui/certificate-manager.c:621
-msgid "Select a certificate to import..."
-msgstr "Izberite potrdilo za uvoz ..."
+#: ../smime/gui/certificate-manager.c:650
+msgid "Select a file to backup your key and certificate..."
+msgstr ""
 
-#: ../smime/gui/certificate-manager.c:635
+#. To Translators:
+#. * %s-backup.p12 is the default file name suggested by the file selection dialog,
+#. * when a user wants to backup one of her/his private keys/certificates.
+#. * For example: gnomedev-backup.p12
+#.
+#: ../smime/gui/certificate-manager.c:662
+#, c-format
+msgid "%s-backup.p12"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:676
+#: ../smime/gui/certificate-manager.c:965
 msgid "All files"
 msgstr "Vse datoteke"
 
-#: ../smime/gui/certificate-manager.c:671
+#: ../smime/gui/certificate-manager.c:728
+#, fuzzy
+msgid "Backup Certificate"
+msgstr "Potrdilo"
+
+#. filename selection
+#: ../smime/gui/certificate-manager.c:742
+msgid "_File name:"
+msgstr "_Ime datoteke:"
+
+#. FIXME when gtk_file_chooser_button allows GTK_FILE_CHOOSER_ACTION_SAVE use it
+#: ../smime/gui/certificate-manager.c:747
+#, fuzzy
+msgid "Please select a file..."
+msgstr "Izberite mapo"
+
+#: ../smime/gui/certificate-manager.c:761
+msgid "_Include certificate chain in the backup"
+msgstr ""
+
+#. To Translators: this text was copied from Firefox
+#: ../smime/gui/certificate-manager.c:767
+msgid ""
+"The certificate backup password you set here protects the backup file that "
+"you are about to create.\n"
+"You must set this password to proceed with the backup."
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:786
+#, fuzzy
+msgid "_Repeat Password:"
+msgstr "_Geslo:"
+
+#: ../smime/gui/certificate-manager.c:805
+msgid "Passwords do not match"
+msgstr ""
+
+#. To Translators: this text was copied from Firefox
+#: ../smime/gui/certificate-manager.c:813
+msgid ""
+"Important:\n"
+"If you forget your certificate backup password, you will not be able to "
+"restore this backup later.\n"
+"Please record it in a safe location."
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:858
+#, fuzzy
+msgid "No file name provided"
+msgstr "Elektronski naslov ni naveden"
+
+#: ../smime/gui/certificate-manager.c:862
+#, fuzzy
+msgid "Failed to backup key and certificate"
+msgstr "Uvažanje potrdila je spodletelo"
+
+#: ../smime/gui/certificate-manager.c:951
+msgid "Select a certificate to import..."
+msgstr "Izberite potrdilo za uvoz ..."
+
+#: ../smime/gui/certificate-manager.c:1001
 msgid "Failed to import certificate"
 msgstr "Uvažanje potrdila je spodletelo"
 
-#: ../smime/gui/certificate-manager.c:1053
+#: ../smime/gui/certificate-manager.c:1117
+msgctxt "CamelTrust"
+msgid "Ask when used"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1119
+#, fuzzy
+msgctxt "CamelTrust"
+msgid "Never"
+msgstr "Nikoli"
+
+#: ../smime/gui/certificate-manager.c:1121
+msgctxt "CamelTrust"
+msgid "Marginal"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1123
+msgctxt "CamelTrust"
+msgid "Fully"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1125
+msgctxt "CamelTrust"
+msgid "Ultimate"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1127
+msgctxt "CamelTrust"
+msgid "Temporary"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1333
+#, fuzzy
+msgid "Change certificate trust"
+msgstr "Zaupanje pooblastitelju potrdil"
+
+#: ../smime/gui/certificate-manager.c:1345
+#, c-format
+msgid "Change trust for the host '%s':"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1369
+msgctxt "CamelTrust"
+msgid "_Ask when used"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1370
+msgctxt "CamelTrust"
+msgid "_Temporary (this session only)"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1371
+#, fuzzy
+msgctxt "CamelTrust"
+msgid "_Never"
+msgstr "Nikoli"
+
+#: ../smime/gui/certificate-manager.c:1372
+msgctxt "CamelTrust"
+msgid "_Marginal"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1373
+#, fuzzy
+msgctxt "CamelTrust"
+msgid "_Fully"
+msgstr "_Polno ime"
+
+#: ../smime/gui/certificate-manager.c:1374
+msgctxt "CamelTrust"
+msgid "_Ultimate"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1378
+#, fuzzy
+msgid ""
+"Before trusting this site, you should examine its certificate and its policy "
+"and procedures (if available)."
+msgstr ""
+"Preden zaupate tej CA za poljuben namen, si oglejte njeno potrdilo, ravnanje "
+"in postopke (če so na voljo)."
+
+#: ../smime/gui/certificate-manager.c:1393
+#, fuzzy
+msgid "_Display certificate"
+msgstr "_Poglej potrdila"
+
+#: ../smime/gui/certificate-manager.c:1598
+#, fuzzy
+msgid "You have certificates on file that identify these mail servers:"
+msgstr "Imate datoteke potrdil, ki ugotavljajo istovetnost naslednjih ljudi:"
+
+#: ../smime/gui/certificate-manager.c:1629
+#, fuzzy
+msgid "Host name"
+msgstr "_Ime seznama:"
+
+#: ../smime/gui/certificate-manager.c:1631
+msgid "Issuer"
+msgstr "Izdajatelj"
+
+#: ../smime/gui/certificate-manager.c:1632
+#, fuzzy
+msgid "Fingerprint"
+msgstr "Prstni odtisi"
+
+#: ../smime/gui/certificate-manager.c:1633
+msgid "Trust"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1654
+msgid "_Edit Trust"
+msgstr ""
+
+#: ../smime/gui/certificate-manager.c:1973
 msgid "All PKCS12 files"
 msgstr "Vse datoteke PKCS12"
 
-#: ../smime/gui/certificate-manager.c:1070
+#: ../smime/gui/certificate-manager.c:1990
 msgid "All email certificate files"
 msgstr "Datoteke potrdil za overjanje elektronske pošte"
 
-#: ../smime/gui/certificate-manager.c:1087
+#: ../smime/gui/certificate-manager.c:2007
 msgid "All CA certificate files"
 msgstr "Vsa CA potrdila"
 
@@ -21324,26 +24160,7 @@ msgstr "Vnesite geslo za podatkovno zbirko potrdil"
 msgid "Enter new password"
 msgstr "Vnesite novo geslo"
 
-#. FIXME: add serial no, validity date, uses
-#: ../smime/gui/e-cert-selector.c:121
-#, c-format
-msgid ""
-"Issued to:\n"
-"  Subject: %s\n"
-msgstr ""
-"Izdano za:\n"
-" Zadeva: %s\n"
-
-#: ../smime/gui/e-cert-selector.c:122
-#, c-format
-msgid ""
-"Issued by:\n"
-"  Subject: %s\n"
-msgstr ""
-"Izdal:\n"
-" Zadeva: %s\n"
-
-#: ../smime/gui/e-cert-selector.c:175
+#: ../smime/gui/e-cert-selector.c:180
 msgid "Select certificate"
 msgstr "Izbor potrdila"
 
@@ -21421,22 +24238,18 @@ msgid "Certificate"
 msgstr "Potrdilo"
 
 #: ../smime/gui/smime-ui.ui.h:26
-msgid "Certificate details"
-msgstr "Podrobnosti potrdila"
-
-#: ../smime/gui/smime-ui.ui.h:27
 msgid "Email Certificate Trust Settings"
 msgstr "Nastavitve zaupanja potrdil elektronske pošte."
 
-#: ../smime/gui/smime-ui.ui.h:28
+#: ../smime/gui/smime-ui.ui.h:27
 msgid "Trust the authenticity of this certificate"
 msgstr "Zaupaj pristnosti tega potrdila"
 
-#: ../smime/gui/smime-ui.ui.h:29
+#: ../smime/gui/smime-ui.ui.h:28
 msgid "Do not trust the authenticity of this certificate"
 msgstr "Ne zaupaj pristnosti tega potrdila"
 
-#: ../smime/gui/smime-ui.ui.h:30
+#: ../smime/gui/smime-ui.ui.h:29
 msgid "_Edit CA Trust"
 msgstr "Ur_edi zaupanje CA"
 
@@ -21453,19 +24266,44 @@ msgstr "Podpiši"
 msgid "Encrypt"
 msgstr "Šifriraj"
 
-#: ../smime/lib/e-cert-db.c:718
+#: ../smime/lib/e-cert-db.c:787
 msgid "Certificate already exists"
 msgstr "Potrdilo že obstaja"
 
-#: ../smime/lib/e-pkcs12.c:199
+#: ../smime/lib/e-pkcs12.c:201
 msgid "PKCS12 File Password"
 msgstr "Geslo datoteke PKCS12"
 
-#: ../smime/lib/e-pkcs12.c:200
+#: ../smime/lib/e-pkcs12.c:202
 msgid "Enter password for PKCS12 file:"
 msgstr "Vnesite geslo za datoteko PKCS12:"
 
-#: ../smime/lib/e-pkcs12.c:307
+#: ../smime/lib/e-pkcs12.c:328
+#, fuzzy, c-format
+msgid "Unable to create export context, err_code: %i"
+msgstr "Ni mogoče rezervirati vira, napaka: %s"
+
+#: ../smime/lib/e-pkcs12.c:335
+#, c-format
+msgid "Unable to setup password integrity, err_code: %i"
+msgstr ""
+
+#: ../smime/lib/e-pkcs12.c:345
+#, fuzzy, c-format
+msgid "Unable to create safe bag, err_code: %i"
+msgstr "Ni mogoče rezervirati vira, napaka: %s"
+
+#: ../smime/lib/e-pkcs12.c:363
+#, fuzzy, c-format
+msgid "Unable to add key/cert to the store, err_code: %i"
+msgstr "Ni mogoče rezervirati vira, napaka: %s"
+
+#: ../smime/lib/e-pkcs12.c:381
+#, fuzzy, c-format
+msgid "Unable to write store to disk, err_code: %i"
+msgstr "Ni mogoče rezervirati vira, napaka: %s"
+
+#: ../smime/lib/e-pkcs12.c:408
 msgid "Imported Certificate"
 msgstr "Uvoženo potrdilo"
 
@@ -21541,6 +24379,110 @@ msgstr "Z _datumom zapadlosti"
 msgid "With _Status"
 msgstr "S _stanjem"
 
+#~ msgid "Web addresses"
+#~ msgstr "Spletni naslovi"
+
+#~ msgid "Could not open destination"
+#~ msgstr "Ni mogoče odpreti cilja"
+
+#~ msgid "Cannot create object"
+#~ msgstr "Ni mogoče ustvariti predmeta"
+
+#~ msgid "Could not open source"
+#~ msgstr "Ni mogoče odpreti vira"
+
+#~ msgid "The event could not be deleted due to a dbus error: %s"
+#~ msgstr "Dogodka ni mogoče izbrisati zaradi napake vodila dbus: %s"
+
+#~ msgid "The task could not be deleted due to a dbus error: %s"
+#~ msgstr "Naloge ni mogoče izbrisati zaradi napake vodila dbus: %s"
+
+#~ msgid "The memo could not be deleted due to a dbus error: %s"
+#~ msgstr "Opomnika ni mogoče izbrisati zaradi napake vodila dbus: %s"
+
+#~ msgid "The item could not be deleted due to a dbus error: %s"
+#~ msgstr "Predmeta ni mogoče izbrisati zaradi napake vodila dbus: %s"
+
+#~ msgid "The event could not be deleted because permission was denied"
+#~ msgstr "Dogodka ni mogoče izbrisati zaradi neustreznih dovoljenj"
+
+#~ msgid "The task could not be deleted because permission was denied"
+#~ msgstr "Naloge ni mogoče izbrisati zaradi neustreznih dovoljenj"
+
+#~ msgid "The memo could not be deleted because permission was denied"
+#~ msgstr "Opomnika ni mogoče izbrisati zaradi neustreznih dovoljenj"
+
+#~ msgid "The item could not be deleted because permission was denied"
+#~ msgstr "Predmeta ni mogoče izbrisati zaradi neustreznih dovoljenj"
+
+#~ msgid "The event could not be deleted due to an error: %s"
+#~ msgstr "Dogodka ni mogoče izbrisati zaradi napake: %s"
+
+#~ msgid "The task could not be deleted due to an error: %s"
+#~ msgstr "Naloge ni mogoče izbrisati zaradi napake: %s"
+
+#~ msgid "The memo could not be deleted due to an error: %s"
+#~ msgstr "Opomnika ni mogoče izbrisati zaradi napake: %s"
+
+#~ msgid "The item could not be deleted due to an error: %s"
+#~ msgstr "Predmeta ni mogoče izbrisati zaradi napake: %s"
+
+#~ msgid "Customize"
+#~ msgstr "Prilagodi"
+
+#~ msgid "Custom Reminder:"
+#~ msgstr "Opomnik po meri:"
+
+#~ msgid "Deleting selected objects"
+#~ msgstr "Brisanje izbranih predmetov"
+
+#~ msgid "Untitled Message"
+#~ msgstr "Neimenovano sporočilo"
+
+#~ msgid "Spell checking color"
+#~ msgstr "Barva preverjanja črkovanja"
+
+#~ msgid "Underline color for misspelled words when using inline spelling."
+#~ msgstr "Barva podčrtane narobe zapisane besede med uporabo črkovalnika."
+
+#~ msgid "Invalid authentication result code (%d)"
+#~ msgstr "Neveljavna koda rezultata overitve (%d)"
+
+#~ msgid "Option is ignored if a match for custom junk headers is found."
+#~ msgstr "Možnost je prezrta, če je najdena glava po meri za vsiljeno pošto."
+
+#~ msgid "Enter Google password for user '%s'."
+#~ msgstr "Vnesite geslo Google za uporabnika '%s'."
+
+#~ msgid "User declined to provide a password"
+#~ msgstr "Uporabnik je zavrnil vnos gesla"
+
+#~ msgid "Expunging"
+#~ msgstr "Uničuvanje"
+
+#~ msgid "_PostScript"
+#~ msgstr "_PostScript"
+
+#~ msgid "View image attachments directly in mail messages."
+#~ msgstr "Pregled slikovnih prilog neposredno v poštnih sporočilih."
+
+#~ msgid ""
+#~ "Issued to:\n"
+#~ "  Subject: %s\n"
+#~ msgstr ""
+#~ "Izdano za:\n"
+#~ " Zadeva: %s\n"
+
+#~ msgid ""
+#~ "Issued by:\n"
+#~ "  Subject: %s\n"
+#~ msgstr ""
+#~ "Izdal:\n"
+#~ " Zadeva: %s\n"
+
+#~ msgid "Certificate details"
+#~ msgstr "Podrobnosti potrdila"
+
 #~ msgid "Original Contact:"
 #~ msgstr "Izvirni stik:"
 
@@ -21637,9 +24579,6 @@ msgstr "S _stanjem"
 #~ msgid "Expires On"
 #~ msgstr "Poteče dne"
 
-#~ msgid "Fingerprints"
-#~ msgstr "Prstni odtisi"
-
 #~ msgid "Certificate Hierarchy"
 #~ msgstr "Hierarhija potrdil"
 
@@ -21760,9 +24699,6 @@ msgstr "S _stanjem"
 #~ msgid "Certificate Signature Algorithm"
 #~ msgstr "Algoritem podpisa potrdila"
 
-#~ msgid "Issuer"
-#~ msgstr "Izdajatelj"
-
 #~ msgid "Issuer Unique ID"
 #~ msgstr "Edinstven ID izdajatelja"
 
@@ -21874,9 +24810,6 @@ msgstr "S _stanjem"
 #~ msgid "Define Views"
 #~ msgstr "Določi poglede"
 
-#~ msgid "Table"
-#~ msgstr "Razpredelnica"
-
 #~ msgid "Define New View"
 #~ msgstr "Določi nov pogled"
 
@@ -21957,9 +24890,6 @@ msgstr "S _stanjem"
 #~ msgid "UID '%s' is not a mail transport"
 #~ msgstr "UID '%s' ni poštni prenos"
 
-#~ msgid "Please select a folder"
-#~ msgstr "Izberite mapo"
-
 #~ msgid "_Switch to Folder"
 #~ msgstr "Preklopi na _mapo"
 


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